Merge pull request #1228 from rvykydal/update-packages-instLangs-option

Update packages instLangs and excludeWeakdeps options (gh#1227)
rhinstaller · Jun 24, 2024 · a0d1fba · a0d1fba
2 parents 6f96a65 + d78694d
commit a0d1fba
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 18 deletions.
diff --git a/fragments/platform/rhel8/payload/packages_instlangs_1.ks b/fragments/platform/rhel8/payload/packages_instlangs_1.ks
@@ -0,0 +1,3 @@
+# Only install the en_US locale
+%packages --instLangs=en_US
+%end
diff --git a/fragments/platform/rhel8/payload/packages_instlangs_2.ks b/fragments/platform/rhel8/payload/packages_instlangs_2.ks
@@ -0,0 +1,3 @@
+# Install no locales
+%packages --instLangs=
+%end
diff --git a/fragments/platform/rhel8/payload/packages_instlangs_3.ks b/fragments/platform/rhel8/payload/packages_instlangs_3.ks
@@ -0,0 +1,8 @@
+# Install a short list of languages
+# Use ones with translations in blivet to make them easy to find.
+# Add glibc-all-langpacks to install locale data separately from
+# lang --addsupport.
+%packages --instLangs=es:fr:it
+python3-blivet
+glibc-all-langpacks
+%end
diff --git a/fragments/platform/rhel8/payload/packages_weakdeps.ks b/fragments/platform/rhel8/payload/packages_weakdeps.ks
@@ -0,0 +1,4 @@
+# Install gnupg2 and make sure the packages it recommends are skipped
+%packages --excludeWeakdeps
+gnupg2
+%end
diff --git a/fragments/shared/payload/packages_instlangs_1.ks b/fragments/shared/payload/packages_instlangs_1.ks
@@ -0,0 +1,3 @@
+# Only install the en_US locale
+%packages --inst-langs=en_US
+%end
diff --git a/fragments/shared/payload/packages_instlangs_2.ks b/fragments/shared/payload/packages_instlangs_2.ks
@@ -0,0 +1,3 @@
+# Install no locales
+%packages --inst-langs=
+%end
diff --git a/fragments/shared/payload/packages_instlangs_3.ks b/fragments/shared/payload/packages_instlangs_3.ks
@@ -0,0 +1,8 @@
+# Install a short list of languages
+# Use ones with translations in blivet to make them easy to find.
+# Add glibc-all-langpacks to install locale data separately from
+# lang --addsupport.
+%packages --inst-langs=es:fr:it
+python3-blivet
+glibc-all-langpacks
+%end
diff --git a/fragments/shared/payload/packages_weakdeps.ks b/fragments/shared/payload/packages_weakdeps.ks
@@ -0,0 +1,4 @@
+# Install gnupg2 and make sure the packages it recommends are skipped
+%packages --exclude-weakdeps
+gnupg2
+%end
diff --git a/packages-instlangs-1.ks.in b/packages-instlangs-1.ks.in
@@ -7,9 +7,7 @@
 %ksappend repos/default.ks
 %ksappend common/common_no_payload.ks
 
-# Only install the en_US locale
-%packages --instLangs=en_US
-%end
+%ksappend payload/packages_instlangs_1.ks
 
 %post
 # Make sure no non-english .mo files were installed

diff --git a/packages-instlangs-2.ks.in b/packages-instlangs-2.ks.in
@@ -7,9 +7,7 @@
 %ksappend repos/default.ks
 %ksappend common/common_no_payload.ks
 
-# Install no locales
-%packages --instLangs=
-%end
+%ksappend payload/packages_instlangs_2.ks
 
 %post
 # Make sure no .mo files were installed

diff --git a/packages-instlangs-3.ks.in b/packages-instlangs-3.ks.in
@@ -22,14 +22,7 @@ timezone America/New_York --utc
 # additional langpacks packages don't confuse the locale test
 lang fr_FR.UTF-8
 
-# Install a short list of languages
-# Use ones with translations in blivet to make them easy to find.
-# Add glibc-all-langpacks to install locale data separately from
-# lang --addsupport.
-%packages --instLangs=es:fr:it
-python3-blivet
-glibc-all-langpacks
-%end
+%ksappend payload/packages_instlangs_3.ks
 
 %post
 # Make sure the locales we asked for are installed

diff --git a/packages-weakdeps.ks.in b/packages-weakdeps.ks.in
@@ -8,10 +8,7 @@
 %ksappend repos/default.ks
 %ksappend common/common_no_payload.ks
 
-# Install gnupg2 and make sure the packages it recommends are skipped
-%packages --excludeWeakdeps
-gnupg2
-%end
+%ksappend payload/packages_weakdeps.ks
 
 %post
 # Make sure the --recommends packages from gnupg2 are not installed