From 0b0ad61b344d3dfb0860f9405b50db69d4d52fe5 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Thu, 14 Jul 2011 23:27:09 +0300
Subject: [PATCH] install2: split 85cleanup-legacy off 85cleanup-cjk

We have several categories of overhead data:
- legacy 8-bit fonts, locales and gconv modules;
- illegible fonts (e.g. 5x7 or 6x10);
- obsolete vendor specific stuff;
- CJK (which would require proper support anyways).

Notes:
- JIS and things like VISCII are 8-bit either
  and thus might be reconsidered as "legacy";
- proper CJK support would probably include
  scalable fonts and an input method helper;
- main target audience is rather ru/uk/be by now.

(dropped wireless from install2 either)
---
 sub.in/install2/image-scripts.d/85cleanup-cjk | 27 +++++++------------
 .../install2/image-scripts.d/85cleanup-legacy | 15 +++++++++++
 sub.in/install2/image-scripts.d/90cleanup     |  1 +
 3 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100755 sub.in/install2/image-scripts.d/85cleanup-legacy

diff --git a/sub.in/install2/image-scripts.d/85cleanup-cjk b/sub.in/install2/image-scripts.d/85cleanup-cjk
index 06739759..db7c44a0 100755
--- a/sub.in/install2/image-scripts.d/85cleanup-cjk
+++ b/sub.in/install2/image-scripts.d/85cleanup-cjk
@@ -2,28 +2,21 @@
 
 # remove unused fonts
 cd /usr/share/fonts/bitmap/misc/ &&
-	rm -f *ja.* *ko.* han* gb* jis* k14* rk* *rk.* *kana* cl* \
-	      *ISO* *JIS* *KOI*
-# TODO: sort out the rest of *x*
+	rm -f *ja.* *ko.* han* gb* jis* k14* rk* *rk.* *kana* cl* *JIS*
 
-# drop unneeded translation
-cd /usr/share/qt4/translations/ &&
-	rm -f *_zh* *_ja*
+# drop unneeded translations
+cd /usr/share/qt4/translations/ && rm -f *_zh* *_ja*
 
-# ...l10n...
-cd /usr/share/X11/locale &&
-	rm -rf *[^C8]/ ja* ko* th* vi* zh* iso*
+# l10n
+cd /usr/share/X11/locale && rm -rf ja* ko* th* vi* zh*
 
 # xkb
-cd /usr/share/X11/xkb/symbols &&
-	rm -rf *_vndr jp kr th vn cn
-
-# gconv
-cd /usr/lib*/gconv &&
-	rm -f CP* ISO* KOI* *JIS* T* HP* MAC*
+cd /usr/share/X11/xkb/symbols && rm -rf jp kr th vn cn
 
 # locales
-cd /usr/lib*/locale &&
-	rm -rf ja_* ko_* th_* zh_*
+cd /usr/lib*/locale && rm -rf ja_* ko_* th_* zh_*
+
+# gconv
+cd /usr/lib*/gconv && rm -f JIS* T*
 
 :
diff --git a/sub.in/install2/image-scripts.d/85cleanup-legacy b/sub.in/install2/image-scripts.d/85cleanup-legacy
new file mode 100755
index 00000000..67958b1b
--- /dev/null
+++ b/sub.in/install2/image-scripts.d/85cleanup-legacy
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# remove unused legacy/tiny fonts
+cd /usr/share/fonts/bitmap/misc/ && rm -f *ISO* *KOI* [1456]*
+
+# l10n
+cd /usr/share/X11/locale/ && rm -rf *[^C8]/ iso*
+
+# xkb
+cd /usr/share/X11/xkb/symbols && rm -rf *_vndr
+
+# gconv
+cd /usr/lib*/gconv && rm -f CP* ISO* *JIS* KOI* HP* MAC*
+
+:
diff --git a/sub.in/install2/image-scripts.d/90cleanup b/sub.in/install2/image-scripts.d/90cleanup
index 3a67a9b9..4d8d6fc7 100755
--- a/sub.in/install2/image-scripts.d/90cleanup
+++ b/sub.in/install2/image-scripts.d/90cleanup
@@ -53,6 +53,7 @@ rm -rf /lib/modules/*/kernel/drivers/media
 rm -rf /lib/modules/*/kernel/drivers/mmc
 rm -rf /lib/modules/*/kernel/drivers/mtd*
 rm -rf /lib/modules/*/kernel/drivers/net/irda
+rm -rf /lib/modules/*/kernel/drivers/net/wireless
 rm -rf /lib/modules/*/kernel/drivers/staging
 rm -rf /lib/modules/*/kernel/drivers/spi
 rm -rf /lib/modules/*/kernel/drivers/telephony