From ea0c6c3b3af5cd68477784419eb82ee196e50334 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 8 Feb 2022 12:09:16 -0800 Subject: [PATCH] runtime-install: drop some unnecessary font packages The dropped google-noto packages contain fonts of scripts for languages that the installer is not translated into. Most are obvious, but for the record, "lao" is for the script and language also called Lao; "thaana" is for the script Thaana, used for the language Maldivian. sil-abyssinica-fonts was an older set of Ethiopic fonts used for e.g. Amharic; we now prefer google-noto-sans-ethiopic-vf-fonts, the installer environment does not need both. Similarly, sil-scheherazade-fonts covers a similar range to google-noto-sans-arabic-vf-fonts and paktype-naskh-basic-fonts, which are now preferred. xorg-x11-fonts-misc contains bitmap fonts for some non-Latin scripts. I'm fairly sure nothing in the installer environment should need bitmap fonts any more. Signed-off-by: Adam Williamson --- share/templates.d/99-generic/runtime-cleanup.tmpl | 1 - share/templates.d/99-generic/runtime-install.tmpl | 8 +------- share/templates.d/99-generic/runtime-postinstall.tmpl | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl index fcc53644..16eedb28 100644 --- a/share/templates.d/99-generic/runtime-cleanup.tmpl +++ b/share/templates.d/99-generic/runtime-cleanup.tmpl @@ -303,7 +303,6 @@ removefrom wget /etc/* /usr/share/locale/* removefrom xorg-x11-drv-intel /usr/${libdir}/libI* removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome* removefrom xorg-x11-drv-wacom /usr/bin/* -removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}* %if branding.release: removefrom ${branding.logos} /usr/share/plymouth/* diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl index fe6d967d..a51bbc59 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -154,14 +154,11 @@ installpkg dmidecode installpkg abattis-cantarell-vf-fonts installpkg bitmap-fangsongti-fonts installpkg google-noto-sans-vf-fonts google-noto-sans-mono-vf-fonts -installpkg google-noto-sans-arabic-vf-fonts google-noto-sans-armenian-vf-fonts -installpkg google-noto-sans-canadian-aboriginal-vf-fonts google-noto-sans-cherokee-vf-fonts +installpkg google-noto-sans-arabic-vf-fonts installpkg google-noto-sans-cjk-ttc-fonts installpkg google-noto-sans-ethiopic-vf-fonts google-noto-sans-georgian-vf-fonts installpkg google-noto-sans-gurmukhi-vf-fonts google-noto-sans-hebrew-vf-fonts -installpkg google-noto-sans-lao-vf-fonts google-noto-sans-math-vf-fonts installpkg google-noto-sans-sinhala-vf-fonts -installpkg google-noto-sans-thaana-vf-fonts installpkg jomolhari-fonts installpkg khmer-os-system-fonts installpkg lohit-assamese-fonts @@ -174,12 +171,9 @@ installpkg lohit-odia-fonts installpkg lohit-tamil-fonts installpkg lohit-telugu-fonts installpkg paktype-naskh-basic-fonts -installpkg sil-abyssinica-fonts installpkg sil-padauk-fonts -installpkg sil-scheherazade-fonts installpkg rit-meera-new-fonts installpkg thai-scalable-waree-fonts -installpkg xorg-x11-fonts-misc ## debugging/bug reporting tools installpkg gdb-gdbserver diff --git a/share/templates.d/99-generic/runtime-postinstall.tmpl b/share/templates.d/99-generic/runtime-postinstall.tmpl index 52b4eeeb..2c6a7dfa 100644 --- a/share/templates.d/99-generic/runtime-postinstall.tmpl +++ b/share/templates.d/99-generic/runtime-postinstall.tmpl @@ -117,8 +117,3 @@ remove etc/lvm/lvm.conf append etc/lvm/lvm.conf "global {\n\tuse_lvmetad = 1\n}\n" ## TODO: we could run prelink here if we wanted? - -## fix fonconfig cache containing timestamps -runcmd chroot ${root} /usr/bin/find /usr/share/fonts /usr/share/X11/fonts -newermt "@${SOURCE_DATE_EPOCH}" -exec \ - touch --no-dereference --date="@${SOURCE_DATE_EPOCH}" {} + -runcmd chroot ${root} /usr/bin/fc-cache -f