sig_core/comps
7
0
Fork 0
mirror of https://git.rockylinux.org/rocky/comps.git synced 2024-11-21 20:51:24 +00:00
Code Issues Projects Releases Activity

semi-consistent comps

Browse Source 
rocky 9 lh comps roughly matched centos stream 9. it was missing rhel
specific packages, and sometimes made diff/merges difficult. we added
them back, but the difference here is we are taking advantage of stream
10's "rhel_only" kind of concept, assuming this does not mess up
diff/merges.
This commit is contained in:
Louis Abel 2024-08-08 23:22:51 -07:00
parent b1c05484de
commit d5014e654f
Signed by: label
GPG Key ID: 2A6975660E424560
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
comps-rocky-9-lh.xml
View File

@ -2853,6 +2853,7 @@
<packagereq type="default">hyphen-devel</packagereq> <packagereq type="default">hyphen-devel</packagereq>
<packagereq type="default">ibus-devel</packagereq> <packagereq type="default">ibus-devel</packagereq>
<packagereq type="default">ibus-devel-docs</packagereq> <packagereq type="default">ibus-devel-docs</packagereq>
<packagereq type="default">ibus-gtk4</packagereq>
<packagereq type="default">ima-evm-utils-devel</packagereq> <packagereq type="default">ima-evm-utils-devel</packagereq>
<packagereq type="default">inih-devel</packagereq> <packagereq type="default">inih-devel</packagereq>
<packagereq type="default" arch="x86_64">intel-cmt-cat-devel</packagereq> <packagereq type="default" arch="x86_64">intel-cmt-cat-devel</packagereq>

11
comps-rocky-9-lh.xml.in
View File

@ -272,6 +272,7 @@
<packagereq type="mandatory" variant="BaseOS">selinux-policy-targeted</packagereq> <packagereq type="mandatory" variant="BaseOS">selinux-policy-targeted</packagereq>
<packagereq type="mandatory" variant="BaseOS">setup</packagereq> <packagereq type="mandatory" variant="BaseOS">setup</packagereq>
<packagereq type="mandatory" variant="BaseOS">shadow-utils</packagereq> <packagereq type="mandatory" variant="BaseOS">shadow-utils</packagereq>
<rhel_only><packagereq type="conditional" requires="redhat-release" variant="BaseOS">subscription-manager</packagereq></rhel_only>
<packagereq type="mandatory" variant="BaseOS">sssd-common</packagereq> <packagereq type="mandatory" variant="BaseOS">sssd-common</packagereq>
<packagereq type="mandatory" variant="BaseOS">sssd-kcm</packagereq> <packagereq type="mandatory" variant="BaseOS">sssd-kcm</packagereq>
<packagereq type="mandatory" variant="BaseOS">sudo</packagereq> <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
@ -313,6 +314,8 @@
<packagereq type="default" variant="BaseOS">sg3_utils-libs</packagereq> <packagereq type="default" variant="BaseOS">sg3_utils-libs</packagereq>
<packagereq type="default" variant="BaseOS">initscripts-rename-device</packagereq> <packagereq type="default" variant="BaseOS">initscripts-rename-device</packagereq>
<packagereq type="default" variant="AppStream">python3-libselinux</packagereq> <packagereq type="default" variant="AppStream">python3-libselinux</packagereq>
<rhel_only><packagereq type="default" variant="AppStream">insights-client</packagereq></rhel_only>
<rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
<packagereq type="optional" variant="BaseOS">dracut-config-generic</packagereq> <packagereq type="optional" variant="BaseOS">dracut-config-generic</packagereq>
<packagereq type="optional" variant="BaseOS">dracut-network</packagereq> <packagereq type="optional" variant="BaseOS">dracut-network</packagereq>
<packagereq type="optional" variant="BaseOS" arch="s390x">libzfcphbaapi</packagereq> <packagereq type="optional" variant="BaseOS" arch="s390x">libzfcphbaapi</packagereq>
@ -1145,6 +1148,8 @@
<packagereq type="default" variant="BaseOS">sos</packagereq> <packagereq type="default" variant="BaseOS">sos</packagereq>
<packagereq type="default" variant="BaseOS">sssd</packagereq> <packagereq type="default" variant="BaseOS">sssd</packagereq>
<packagereq type="default" variant="BaseOS">strace</packagereq> <packagereq type="default" variant="BaseOS">strace</packagereq>
<rhel_only><packagereq type="conditional" requires="redhat-release" variant="BaseOS">subscription-manager-cockpit</packagereq></rhel_only>
<rhel_only><packagereq type="conditional" requires="redhat-release" variant="BaseOS">libdnf-plugin-subscription-manager</packagereq></rhel_only>
<packagereq type="default" variant="BaseOS">teamd</packagereq> <packagereq type="default" variant="BaseOS">teamd</packagereq>
<packagereq type="default" variant="BaseOS">time</packagereq> <packagereq type="default" variant="BaseOS">time</packagereq>
<packagereq type="default" variant="BaseOS">unzip</packagereq> <packagereq type="default" variant="BaseOS">unzip</packagereq>
@ -1172,6 +1177,8 @@
<packagereq type="default" variant="AppStream">tcpdump</packagereq> <packagereq type="default" variant="AppStream">tcpdump</packagereq>
<packagereq type="default" variant="AppStream">wget</packagereq> <packagereq type="default" variant="AppStream">wget</packagereq>
<packagereq type="default" variant="AppStream">vim-enhanced</packagereq> <packagereq type="default" variant="AppStream">vim-enhanced</packagereq>
<rhel_only><packagereq type="default" variant="AppStream">insights-client</packagereq></rhel_only>
<rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
</packagelist> </packagelist>
</group> </group>
<group> <group>
@ -1252,6 +1259,8 @@
<packagereq type="default" variant="BaseOS">sos</packagereq> <packagereq type="default" variant="BaseOS">sos</packagereq>
<packagereq type="default" variant="BaseOS">sssd</packagereq> <packagereq type="default" variant="BaseOS">sssd</packagereq>
<packagereq type="default" variant="BaseOS">strace</packagereq> <packagereq type="default" variant="BaseOS">strace</packagereq>
<rhel_only><packagereq type="conditional" requires="redhat-release" variant="BaseOS">subscription-manager-cockpit</packagereq></rhel_only>
<rhel_only><packagereq type="conditional" requires="redhat-release" variant="BaseOS">libdnf-plugin-subscription-manager</packagereq></rhel_only>
<packagereq type="default" variant="BaseOS">teamd</packagereq> <packagereq type="default" variant="BaseOS">teamd</packagereq>
<packagereq type="default" variant="BaseOS">time</packagereq> <packagereq type="default" variant="BaseOS">time</packagereq>
<packagereq type="default" variant="BaseOS">unzip</packagereq> <packagereq type="default" variant="BaseOS">unzip</packagereq>
@ -1279,6 +1288,8 @@
<packagereq type="default" variant="AppStream">tcpdump</packagereq> <packagereq type="default" variant="AppStream">tcpdump</packagereq>
<packagereq type="default" variant="AppStream">wget</packagereq> <packagereq type="default" variant="AppStream">wget</packagereq>
<packagereq type="default" variant="AppStream">vim-enhanced</packagereq> <packagereq type="default" variant="AppStream">vim-enhanced</packagereq>
<rhel_only><packagereq type="default" variant="AppStream">insights-client</packagereq></rhel_only>
<rhel_only><packagereq type="default" variant="AppStream">rhc</packagereq></rhel_only>
</packagelist> </packagelist>
</group> </group>
<group> <group>

3
scripts/update-comps
View File

@ -10,3 +10,6 @@ fi
LANG=C intltool-merge -x -u po/ $COMPSFILE.in $COMPSFILE LANG=C intltool-merge -x -u po/ $COMPSFILE.in $COMPSFILE
xsltproc --stringparam distro $DISTRO --novalid -o $COMPSFILE comps-distro-only.xsl $COMPSFILE xsltproc --stringparam distro $DISTRO --novalid -o $COMPSFILE comps-distro-only.xsl $COMPSFILE
echo "Cleaning up empty space left over"
sed -i '/^ $/d' "${COMPSFILE}"