From 457c00b823915c6dd97ea500221a6aea9105f092 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 4 Dec 2015 20:56:49 +0300 Subject: [PATCH] stage2, lowmem: update cleanup hooks for qt5 There's /usr/share/qt5/translations/ now too, handle that. OTOH we've got some CJK support already, time to split up those "cleanups" into some target locale set dependent form. --- features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem | 2 +- sub.in/stage2/image-scripts.d/85-cleanup-cjk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem b/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem index a90c9029..0b472483 100755 --- a/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem +++ b/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem @@ -6,7 +6,7 @@ cd /usr/share/fonts/bitmap/misc/ && # drop unneeded translation # FIXME: whitelist is reasonable -cd /usr/share/qt4/translations/ && +cd /usr/share/qt?/translations/ && rm -f *_ar* *_cs* *_da* *_de* *_es* *_fa* *_fr* \ *_gl* *_he* *_hu* *_ko* *_pl* \ *_sk* *_sl* *_sv* diff --git a/sub.in/stage2/image-scripts.d/85-cleanup-cjk b/sub.in/stage2/image-scripts.d/85-cleanup-cjk index 90648eb5..9d65ce09 100755 --- a/sub.in/stage2/image-scripts.d/85-cleanup-cjk +++ b/sub.in/stage2/image-scripts.d/85-cleanup-cjk @@ -8,7 +8,7 @@ cd /usr/share/fonts/bitmap/misc/ && rm -f *ja.* *ko.* han* gb* jis* k14* rk* *rk.* *kana* cl* *JIS* # drop unneeded translations -cd /usr/share/qt4/translations/ && rm -f *_zh* *_ja* +cd /usr/share/qt?/translations/ && rm -f *_zh* *_ja* # l10n cd /usr/share/X11/locale && rm -rf ja* ko* th* vi* zh*