From d58e5b58d64438efb704b8084f2679ae93fb2ba4 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 30 Jun 2017 20:04:54 +0300 Subject: [PATCH] cleanup, install2: don't drop glibc-gconv-modules It's needed for alterator-wizardface ported to guile22. Suggested-by: Sergey Bolshakov --- features.in/cleanup/config.mk | 2 +- features.in/install2/config.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/features.in/cleanup/config.mk b/features.in/cleanup/config.mk index a110a1fb..5195f970 100644 --- a/features.in/cleanup/config.mk +++ b/features.in/cleanup/config.mk @@ -37,7 +37,7 @@ use/cleanup/jeos: use/cleanup/x11-alterator # mostly non-interactive system use/cleanup/jeos/full: use/cleanup/jeos @$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean) - @$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext) + @$(call add,CLEANUP_PACKAGES,gettext) @$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*') @$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login) @$(call add,CLEANUP_PACKAGES,dbus libdbus) diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk index 9b17e2f3..17b5fcf2 100644 --- a/features.in/install2/config.mk +++ b/features.in/install2/config.mk @@ -10,6 +10,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \ @$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator) @$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release) @$(call add,BASE_PACKAGES,installer-common-stage3) + @$(call add,BASE_PACKAGES,glibc-gconv-modules) # for guile22 @$(call add,BASE_LISTS,$(call tags,basesystem)) @$(call xport,BASE_BOOTLOADER) @$(call xport,INSTALL2_CLEANUP_PACKAGES) @@ -116,7 +117,7 @@ use/install2/cleanup/x11-hwdrivers: # massive purge of anything not critical to installer boot (l10n included!) use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \ use/install2/cleanup/vnc use/install2/cleanup/crypto - @$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-gconv-modules glibc-locales) + @$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-locales) @$(call add,INSTALL2_CLEANUP_PACKAGES,libX11-locales alterator-l10n) @$(call add,INSTALL2_CLEANUP_PACKAGES,kbd-data kbd console-scripts) @$(call add,INSTALL2_CLEANUP_PACKAGES,shadow-convert)