Merge lp:~tom-gall/linaro/fix-752843-live-helper.config.natty.nano into lp:~linaro-maintainers/linaro/live-helper.config.natty.nano

[Tom Gall]

add to binary_local-hooks 51-rm-usr-share-parts.sh 52-rm-etc-parts.sh 53-rm-var-lib-parts.sh scripts to throw out uneeded files

set LH_APT_RECOMMENDS to false
in conf_create specifically add linaro-nano to package list

[Steve Langasek (vorlon)]

51-rm-usr-share-parts.sh seems to largely be a recreation of chroot_local-hooks/04-purge-docs.sh from the alip config. Any reason not to use this same hook? (Sorry if you didn't know this was there!)

A few differences between the alip hook and this one that are probably worth discussing:

 - rm -rf ./usr/share/doc - this removes all the copyright files. I think we need to retain these for legal reasons?
 - /usr/share/X11, /usr/share/xul-ext - would it be possible instead to fix the seed to not pull in anything that creates these directories? (which packages install to them?)
 - /usr/share/locale - I recall that we discussed this but can't remember now why it was decided we need to keep the en locales instead of just letting people use the default C locale? (If only the C locale needs to be supported, we can just remove the locales package)
 - /usr/share/i18n/locales - good addition; I wonder why this wasn't already being done in the example I got from Martin Pitt. (I think we should add this to the alip hook also)
 - /usr/share/i18n/charmaps - seems kind of arbitrary. Why are you keeping the DOS and Mac codepages, for instance?
 - /etc/X11, /etc/firefox - again, what is putting stuff here as part of nano?

review: Needs Information

[Tom Gall (tom-gall)]

This script predates the alip script you had created.

I can see adding back in the copyright/license files.

For /usr/share/[X11 | xul-ext] yes going after the original offender would probably be best served but I think that would be lower priority.

Locales, yes there is the step to not include the locales package at all. That's in your inbox to review as well. ;-)

/usr/share/i18n/charmaps is somewhat arbitrary. The set remaining is more a reflection of their size then use, IIRC. There is a point were you have to ask yourself how much time should you spend further deleting a few more K vs other low hanging fruit.

/etc/X11 /etc/firefox - I think it's a combination of branding and live-build making assumptions. At this point it's easy enough to just delete it as part of the script, continue to ask questions and adjust accordingly as the second round of nano review items land.

[lp:~tom-gall/linaro/fix-752843-live-helper.config.natty.nano]

48. By Tom Gall on 2011-04-29

do not remove usr/share/docs to preserve license and copyrightfiles

[Tom Gall (tom-gall)]

removed deletion of /usr/share/docs from script.

=== added file 'binary_local-hooks/51-rm-usr-share-parts.sh'
--- binary_local-hooks/51-rm-usr-share-parts.sh	1970-01-01 00:00:00 +0000
+++ binary_local-hooks/51-rm-usr-share-parts.sh	2011-04-29 16:05:49 +0000
@@ -0,0 +1,105 @@
+#!/bin/sh  
+
+cd binary
+
+echo "I: rm /usr/share/man"
+rm -rf ./usr/share/man/*
+# xkb
+echo "I: rm /usr/share/X11"
+rm -rf ./usr/share/X11
+
+echo "I: rm /usr/share/xul-ext"
+rm -rf ./usr/share/xul-ext
+
+echo "I: slim /usr/share/i18n"
+rm -rf ./usr/share/i18n/locales/a*
+rm -rf ./usr/share/i18n/locales/b*
+rm -rf ./usr/share/i18n/locales/c*
+rm -rf ./usr/share/i18n/locales/d*
+rm -rf ./usr/share/i18n/locales/es*
+rm -rf ./usr/share/i18n/locales/f*
+rm -rf ./usr/share/i18n/locales/g*
+rm -rf ./usr/share/i18n/locales/h*
+rm -rf ./usr/share/i18n/locales/j*
+rm -rf ./usr/share/i18n/locales/k*
+rm -rf ./usr/share/i18n/locales/l*
+rm -rf ./usr/share/i18n/locales/n*
+rm -rf ./usr/share/i18n/locales/m*
+rm -rf ./usr/share/i18n/locales/o*
+rm -rf ./usr/share/i18n/locales/p*
+rm -rf ./usr/share/i18n/locales/r*
+rm -rf ./usr/share/i18n/locales/s*
+rm -rf ./usr/share/i18n/locales/t*
+rm -rf ./usr/share/i18n/locales/u*
+rm -rf ./usr/share/i18n/locales/v*
+rm -rf ./usr/share/i18n/locales/w*
+rm -rf ./usr/share/i18n/locales/y*
+rm -rf ./usr/share/i18n/locales/z*
+rm -rf ./usr/share/i18n/locales/el*
+rm -rf ./usr/share/i18n/locales/eo*
+rm -rf ./usr/share/i18n/locales/et*
+rm -rf ./usr/share/i18n/locales/it*
+rm -rf ./usr/share/i18n/locales/iu*
+rm -rf ./usr/share/i18n/locales/iw*
+
+
+echo "I: pair down zoneinfo to just UTC"
+rm -rf ./usr/share/zoneinfo/A*
+rm -rf ./usr/share/zoneinfo/B*
+rm -rf ./usr/share/zoneinfo/C*
+rm -rf ./usr/share/zoneinfo/E*
+rm -rf ./usr/share/zoneinfo/F*
+rm -rf ./usr/share/zoneinfo/H*
+rm -rf ./usr/share/zoneinfo/I*
+rm -rf ./usr/share/zoneinfo/J*
+rm -rf ./usr/share/zoneinfo/K*
+rm -rf ./usr/share/zoneinfo/L*
+rm -rf ./usr/share/zoneinfo/M*
+rm -rf ./usr/share/zoneinfo/N*
+rm -rf ./usr/share/zoneinfo/P*
+rm -rf ./usr/share/zoneinfo/r*
+rm -rf ./usr/share/zoneinfo/R*
+rm -rf ./usr/share/zoneinfo/Singapore
+rm -rf ./usr/share/zoneinfo/T*
+rm -rf ./usr/share/zoneinfo/US
+rm -rf ./usr/share/zoneinfo/W*
+rm -rf ./usr/share/zoneinfo/Z*
+
+echo "I: pair down /usr/share/locale"
+rm -rf ./usr/share/locale/a*
+rm -rf ./usr/share/locale/b*
+rm -rf ./usr/share/locale/c*
+rm -rf ./usr/share/locale/d*
+rm -rf ./usr/share/locale/e*
+rm -rf ./usr/share/locale/f*
+rm -rf ./usr/share/locale/g*
+rm -rf ./usr/share/locale/h*
+rm -rf ./usr/share/locale/i*
+rm -rf ./usr/share/locale/j*
+rm -rf ./usr/share/locale/k*
+rm -rf ./usr/share/locale/lt
+rm -rf ./usr/share/locale/m*
+rm -rf ./usr/share/locale/n*
+rm -rf ./usr/share/locale/p*
+rm -rf ./usr/share/locale/r*
+rm -rf ./usr/share/locale/s*
+rm -rf ./usr/share/locale/t*
+rm -rf ./usr/share/locale/u*
+rm -rf ./usr/share/locale/z*
+
+echo "I: remove /usr/share/info"
+rm -rf ./usr/share/info
+
+echo "I: pair down /usr/share/i18n/charmaps"
+rm -rf ./usr/share/i18n/charmaps/W*
+rm -rf ./usr/share/i18n/charmaps/V*
+rm -rf ./usr/share/i18n/charmaps/T*
+rm -rf ./usr/share/i18n/charmaps/S*
+rm -rf ./usr/share/i18n/charmaps/R*
+rm -rf ./usr/share/i18n/charmaps/P*
+rm -rf ./usr/share/i18n/charmaps/L*
+rm -rf ./usr/share/i18n/charmaps/K*
+rm -rf ./usr/share/i18n/charmaps/J*
+rm -rf ./usr/share/i18n/charmaps/E*
+rm -rf ./usr/share/i18n/charmaps/H*
+rm -rf ./usr/share/i18n/charmaps/B*

=== added file 'binary_local-hooks/52-rm-etc-parts.sh'
--- binary_local-hooks/52-rm-etc-parts.sh	1970-01-01 00:00:00 +0000
+++ binary_local-hooks/52-rm-etc-parts.sh	2011-04-29 16:05:49 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh  
+
+cd binary
+
+echo "I: rm /etc/X11 and /etc/firefox"
+rm -rf ./etc/X11
+rm -rf ./etc/firefox

=== added file 'binary_local-hooks/53-rm-var-lib-parts.sh'
--- binary_local-hooks/53-rm-var-lib-parts.sh	1970-01-01 00:00:00 +0000
+++ binary_local-hooks/53-rm-var-lib-parts.sh	2011-04-29 16:05:49 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh  
+
+cd binary
+
+echo "I:commented out such that dpkg and apt will work for NOW"
+echo "I: rm /var/lib/dpkg"
+#rm -rf ./var/lib/dpkg
+echo "I: rm /var/lib/apt"
+rm -f ./var/lib/apt/lists/*Packages
+rm -f ./var/lib/apt/lists/*Sources
+rm -f ./var/lib/apt/lists/*Release
+rm -f ./var/lib/apt/lists/*Release.gpg
+echo "I: rm /var/cache/apt"
+rm -f ./var/cache/apt/pkgcache.bin
+rm -f ./var/cache/apt/srcpkgcache.bin

=== modified file 'chroot'
--- chroot	2010-11-24 13:26:04 +0000
+++ chroot	2011-04-29 16:05:49 +0000
@@ -46,7 +46,7 @@
 
 # $LH_PACKAGES: set packages to install
 # (Default: empty)
-LH_PACKAGES="linaro-overlay-minimal"
+LH_PACKAGES="linaro-overlay-minimal linaro-nano"
 
 # $LH_PACKAGES_LISTS: set package list to install
 # (Default: )

=== modified file 'common'
--- common	2010-11-29 16:27:09 +0000
+++ common	2011-04-29 16:05:49 +0000
@@ -25,7 +25,7 @@
 
 # $LH_APT_RECOMMENDS: set apt/aptitude recommends
 # (Default: true)
-LH_APT_RECOMMENDS="true"
+LH_APT_RECOMMENDS="false"
 
 # $LH_APT_SECURE: set apt/aptitude security
 # (Default: true)

=== modified file 'conf_create.sh'
--- conf_create.sh	2011-03-30 15:22:29 +0000
+++ conf_create.sh	2011-04-29 16:05:49 +0000
@@ -6,7 +6,7 @@
 	keyring_packages=ubuntu-keyring
 	linux_flavours=""
 	tasks="minimal"
-	packages="linaro-overlay-minimal"
+	packages="linaro-overlay-minimal linaro-nano"
 	packages_list=""
 	bootstrap_flavour="minimal"
 	distribution=natty
@@ -19,6 +19,7 @@
 
 set_settings_$flavor
 
+export LH_APT_RECOMMENDS="false"
 export LH_BOOTSTRAP_INCLUDE="apt-transport-https gnupg"
 export LH_SYSLINUX_MENU_LIVE_ENTRY="Start $brand Live"