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

Proposed by Tom Gall
Status: Merged
Approved by: Tom Gall
Approved revision: 47
Merge reported by: Tom Gall
Merged at revision: not available
Proposed branch: lp:~tom-gall/linaro/fix-752843-live-helper.config.natty.nano
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.nano
Diff against target: 187 lines (+131/-3)
6 files modified
binary_local-hooks/51-rm-usr-share-parts.sh (+105/-0)
binary_local-hooks/52-rm-etc-parts.sh (+7/-0)
binary_local-hooks/53-rm-var-lib-parts.sh (+15/-0)
chroot (+1/-1)
common (+1/-1)
conf_create.sh (+2/-1)
To merge this branch: bzr merge lp:~tom-gall/linaro/fix-752843-live-helper.config.natty.nano
Reviewer Review Type Date Requested Status
Steve Langasek (community) Needs Information
Review via email: mp+57382@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

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
Revision history for this message
Tom Gall (tom-gall) wrote :

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.

48. By Tom Gall

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

Revision history for this message
Tom Gall (tom-gall) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1#!/bin/sh
2
3cd binary
4
5echo "I: rm /usr/share/man"
6rm -rf ./usr/share/man/*
7# xkb
8echo "I: rm /usr/share/X11"
9rm -rf ./usr/share/X11
10
11echo "I: rm /usr/share/xul-ext"
12rm -rf ./usr/share/xul-ext
13
14echo "I: slim /usr/share/i18n"
15rm -rf ./usr/share/i18n/locales/a*
16rm -rf ./usr/share/i18n/locales/b*
17rm -rf ./usr/share/i18n/locales/c*
18rm -rf ./usr/share/i18n/locales/d*
19rm -rf ./usr/share/i18n/locales/es*
20rm -rf ./usr/share/i18n/locales/f*
21rm -rf ./usr/share/i18n/locales/g*
22rm -rf ./usr/share/i18n/locales/h*
23rm -rf ./usr/share/i18n/locales/j*
24rm -rf ./usr/share/i18n/locales/k*
25rm -rf ./usr/share/i18n/locales/l*
26rm -rf ./usr/share/i18n/locales/n*
27rm -rf ./usr/share/i18n/locales/m*
28rm -rf ./usr/share/i18n/locales/o*
29rm -rf ./usr/share/i18n/locales/p*
30rm -rf ./usr/share/i18n/locales/r*
31rm -rf ./usr/share/i18n/locales/s*
32rm -rf ./usr/share/i18n/locales/t*
33rm -rf ./usr/share/i18n/locales/u*
34rm -rf ./usr/share/i18n/locales/v*
35rm -rf ./usr/share/i18n/locales/w*
36rm -rf ./usr/share/i18n/locales/y*
37rm -rf ./usr/share/i18n/locales/z*
38rm -rf ./usr/share/i18n/locales/el*
39rm -rf ./usr/share/i18n/locales/eo*
40rm -rf ./usr/share/i18n/locales/et*
41rm -rf ./usr/share/i18n/locales/it*
42rm -rf ./usr/share/i18n/locales/iu*
43rm -rf ./usr/share/i18n/locales/iw*
44
45
46echo "I: pair down zoneinfo to just UTC"
47rm -rf ./usr/share/zoneinfo/A*
48rm -rf ./usr/share/zoneinfo/B*
49rm -rf ./usr/share/zoneinfo/C*
50rm -rf ./usr/share/zoneinfo/E*
51rm -rf ./usr/share/zoneinfo/F*
52rm -rf ./usr/share/zoneinfo/H*
53rm -rf ./usr/share/zoneinfo/I*
54rm -rf ./usr/share/zoneinfo/J*
55rm -rf ./usr/share/zoneinfo/K*
56rm -rf ./usr/share/zoneinfo/L*
57rm -rf ./usr/share/zoneinfo/M*
58rm -rf ./usr/share/zoneinfo/N*
59rm -rf ./usr/share/zoneinfo/P*
60rm -rf ./usr/share/zoneinfo/r*
61rm -rf ./usr/share/zoneinfo/R*
62rm -rf ./usr/share/zoneinfo/Singapore
63rm -rf ./usr/share/zoneinfo/T*
64rm -rf ./usr/share/zoneinfo/US
65rm -rf ./usr/share/zoneinfo/W*
66rm -rf ./usr/share/zoneinfo/Z*
67
68echo "I: pair down /usr/share/locale"
69rm -rf ./usr/share/locale/a*
70rm -rf ./usr/share/locale/b*
71rm -rf ./usr/share/locale/c*
72rm -rf ./usr/share/locale/d*
73rm -rf ./usr/share/locale/e*
74rm -rf ./usr/share/locale/f*
75rm -rf ./usr/share/locale/g*
76rm -rf ./usr/share/locale/h*
77rm -rf ./usr/share/locale/i*
78rm -rf ./usr/share/locale/j*
79rm -rf ./usr/share/locale/k*
80rm -rf ./usr/share/locale/lt
81rm -rf ./usr/share/locale/m*
82rm -rf ./usr/share/locale/n*
83rm -rf ./usr/share/locale/p*
84rm -rf ./usr/share/locale/r*
85rm -rf ./usr/share/locale/s*
86rm -rf ./usr/share/locale/t*
87rm -rf ./usr/share/locale/u*
88rm -rf ./usr/share/locale/z*
89
90echo "I: remove /usr/share/info"
91rm -rf ./usr/share/info
92
93echo "I: pair down /usr/share/i18n/charmaps"
94rm -rf ./usr/share/i18n/charmaps/W*
95rm -rf ./usr/share/i18n/charmaps/V*
96rm -rf ./usr/share/i18n/charmaps/T*
97rm -rf ./usr/share/i18n/charmaps/S*
98rm -rf ./usr/share/i18n/charmaps/R*
99rm -rf ./usr/share/i18n/charmaps/P*
100rm -rf ./usr/share/i18n/charmaps/L*
101rm -rf ./usr/share/i18n/charmaps/K*
102rm -rf ./usr/share/i18n/charmaps/J*
103rm -rf ./usr/share/i18n/charmaps/E*
104rm -rf ./usr/share/i18n/charmaps/H*
105rm -rf ./usr/share/i18n/charmaps/B*
0106
=== 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 @@
1#!/bin/sh
2
3cd binary
4
5echo "I: rm /etc/X11 and /etc/firefox"
6rm -rf ./etc/X11
7rm -rf ./etc/firefox
08
=== 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 @@
1#!/bin/sh
2
3cd binary
4
5echo "I:commented out such that dpkg and apt will work for NOW"
6echo "I: rm /var/lib/dpkg"
7#rm -rf ./var/lib/dpkg
8echo "I: rm /var/lib/apt"
9rm -f ./var/lib/apt/lists/*Packages
10rm -f ./var/lib/apt/lists/*Sources
11rm -f ./var/lib/apt/lists/*Release
12rm -f ./var/lib/apt/lists/*Release.gpg
13echo "I: rm /var/cache/apt"
14rm -f ./var/cache/apt/pkgcache.bin
15rm -f ./var/cache/apt/srcpkgcache.bin
016
=== modified file 'chroot'
--- chroot 2010-11-24 13:26:04 +0000
+++ chroot 2011-04-29 16:05:49 +0000
@@ -46,7 +46,7 @@
4646
47# $LH_PACKAGES: set packages to install47# $LH_PACKAGES: set packages to install
48# (Default: empty)48# (Default: empty)
49LH_PACKAGES="linaro-overlay-minimal"49LH_PACKAGES="linaro-overlay-minimal linaro-nano"
5050
51# $LH_PACKAGES_LISTS: set package list to install51# $LH_PACKAGES_LISTS: set package list to install
52# (Default: )52# (Default: )
5353
=== modified file 'common'
--- common 2010-11-29 16:27:09 +0000
+++ common 2011-04-29 16:05:49 +0000
@@ -25,7 +25,7 @@
2525
26# $LH_APT_RECOMMENDS: set apt/aptitude recommends26# $LH_APT_RECOMMENDS: set apt/aptitude recommends
27# (Default: true)27# (Default: true)
28LH_APT_RECOMMENDS="true"28LH_APT_RECOMMENDS="false"
2929
30# $LH_APT_SECURE: set apt/aptitude security30# $LH_APT_SECURE: set apt/aptitude security
31# (Default: true)31# (Default: true)
3232
=== 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 @@
6 keyring_packages=ubuntu-keyring6 keyring_packages=ubuntu-keyring
7 linux_flavours=""7 linux_flavours=""
8 tasks="minimal"8 tasks="minimal"
9 packages="linaro-overlay-minimal"9 packages="linaro-overlay-minimal linaro-nano"
10 packages_list=""10 packages_list=""
11 bootstrap_flavour="minimal"11 bootstrap_flavour="minimal"
12 distribution=natty12 distribution=natty
@@ -19,6 +19,7 @@
1919
20set_settings_$flavor20set_settings_$flavor
2121
22export LH_APT_RECOMMENDS="false"
22export LH_BOOTSTRAP_INCLUDE="apt-transport-https gnupg"23export LH_BOOTSTRAP_INCLUDE="apt-transport-https gnupg"
23export LH_SYSLINUX_MENU_LIVE_ENTRY="Start $brand Live"24export LH_SYSLINUX_MENU_LIVE_ENTRY="Start $brand Live"
2425

Subscribers

People subscribed via source and target branches

to all changes: