diff options
| author | Richard Jones <rjones@redhat.com> | 2009-10-22 10:20:56 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-10-22 10:20:56 +0100 |
| commit | e8edb85d783a2fac6ae5f569e002370275e31d06 (patch) | |
| tree | 380f34c7090d44c3efccc8ccd533c586f616cde3 | |
| parent | 4f144d5239fffa50ad28033252ab7e1011815928 (diff) | |
| download | febootstrap-e8edb85d783a2fac6ae5f569e002370275e31d06.tar.gz febootstrap-e8edb85d783a2fac6ae5f569e002370275e31d06.tar.xz febootstrap-e8edb85d783a2fac6ae5f569e002370275e31d06.zip | |
REMOVE upx (pack-executables) option.
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | febootstrap-minimize.pod | 11 | ||||
| -rwxr-xr-x | febootstrap-minimize.sh | 24 |
3 files changed, 5 insertions, 33 deletions
@@ -34,9 +34,6 @@ Requirements MAKEDEV - upx - - Ultimate Packer for eXecutables, for minimizing binaries - qemu - If you want to test-run your systems. diff --git a/febootstrap-minimize.pod b/febootstrap-minimize.pod index e05b1c7..77abf43 100644 --- a/febootstrap-minimize.pod +++ b/febootstrap-minimize.pod @@ -117,15 +117,12 @@ C</var/cache/ldconfig> (the dynamic linking cache). This is not needed. Dynamic linking during program execution will be marginally slower. -=item B<--no-pack-executables> - =item B<--pack-executables> -Pack executables and shell scripts using L<upx(1)>. - -This is not done by default because although it can reduce the image -size, it increases the amount of memory used since those executables -cannot be shared. +This option has been removed in febootstrap 2.5. In previous versions +it was used to pack executables using the external C<upx> program. +However it was not enabled by default and never worked very +effectively. =back diff --git a/febootstrap-minimize.sh b/febootstrap-minimize.sh index 0004d03..15782f7 100755 --- a/febootstrap-minimize.sh +++ b/febootstrap-minimize.sh @@ -22,7 +22,7 @@ unset CDPATH TEMP=`getopt \ -o '' \ - --long help,all,none,keep-locales,drop-locales,keep-docs,drop-docs,keep-cracklib,drop-cracklib,keep-i18n,drop-i18n,keep-zoneinfo,drop-zoneinfo,keep-rpmdb,drop-rpmdb,keep-yum-cache,drop-yum-cache,keep-services,drop-services,keep-sln,drop-sln,keep-ldconfig,drop-ldconfig,no-pack-executables,pack-executables \ + --long help,all,none,keep-locales,drop-locales,keep-docs,drop-docs,keep-cracklib,drop-cracklib,keep-i18n,drop-i18n,keep-zoneinfo,drop-zoneinfo,keep-rpmdb,drop-rpmdb,keep-yum-cache,drop-yum-cache,keep-services,drop-services,keep-sln,drop-sln,keep-ldconfig,drop-ldconfig \ -n febootstrap-minimize -- "$@"` if [ $? != 0 ]; then echo "febootstrap-minimize: problem parsing the command line arguments" @@ -59,7 +59,6 @@ keep_yum_cache=yes } set_all -pack_executables=no usage () { @@ -135,12 +134,6 @@ while true; do --drop-ldconfig) keep_ldconfig=no shift;; - --no-pack-executables) - pack_executables=no - shift;; - --pack-executables) - pack_executables=yes - shift;; --help) usage exit 0;; @@ -286,18 +279,3 @@ if [ "$keep_ldconfig" != "yes" ]; then febootstrap-run "$target" -- rm -rf var/cache/ldconfig febootstrap-run "$target" -- mkdir -p --mode=0755 var/cache/ldconfig fi - -if [ "$pack_executables" = "yes" ]; then - # NB. Be careful to keep the same inode number, since fakeroot - # tracks files by inode number. - for path in $(find "$target" -type f -perm /111 | - xargs file | - grep executable | - awk -F: '{print $1}'); do - base=$(basename "$path") - cp "$path" "$tmpdir" - (cd "$tmpdir" && upx -q -q --best "$base") - cat "$tmpdir"/"$base" > "$path" - rm "$tmpdir"/"$base" - done -fi |