commit: 466dc948eb8fc34948ef2794b44bfff14dc8a620
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Sun Mar 9 01:02:14 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 9 04:35:27 2025 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=466dc948
Clean up removed files on live media
Looks like these weren't touched in years so cleared up a little to match
modern needs.
Also allows just enough Portage to let a user use emerge --root as a recovery
tool.
A non native English speaker requested we keep eselect to allow switching
locales easier for non English speaking users, seems like a fair request to
make and doesn't add much to the size.
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
releases/specs/amd64/installcd-stage2-minimal.spec | 87 ----------------------
.../x86/i486/installcd-stage2-minimal-openrc.spec | 82 +-------------------
2 files changed, 1 insertion(+), 168 deletions(-)
diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec
b/releases/specs/amd64/installcd-stage2-minimal.spec
index ff9ac352..50c4a6c9 100644
--- a/releases/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/specs/amd64/installcd-stage2-minimal.spec
@@ -21,7 +21,6 @@ boot/kernel/gentoo/config:
@REPO_DIR@/releases/kconfig/amd64/dist-amd64-livecd.c
boot/kernel/gentoo/packages: net-wireless/broadcom-sta
livecd/unmerge:
- app-admin/eselect
app-admin/eselect-ctags
app-admin/eselect-vi
app-admin/perl-cleaner
@@ -81,31 +80,8 @@ livecd/empty:
/etc/skel
/root/.ccache
/tmp
- /usr/diet/include
- /usr/diet/man
/usr/include
- /usr/i?86-gentoo-linux-uclibc
- /usr/i?86-pc-linux-uclibc
- /usr/lib/X11/config
- /usr/lib/X11/doc
- /usr/lib/X11/etc
- /usr/lib/awk
- /usr/lib/ccache
- /usr/lib/gcc-config
- /usr/lib/nfs
- /usr/lib/perl5/site_perl
- /usr/lib/portage
- /usr/lib64/X11/config
- /usr/lib64/X11/doc
- /usr/lib64/X11/etc
- /usr/lib64/awk
- /usr/lib64/ccache
- /usr/lib64/gcc-config
- /usr/lib64/nfs
- /usr/lib64/perl5/site_perl
- /usr/lib64/portage
/usr/local
- /usr/portage
/usr/share/aclocal
/usr/share/baselayout
/usr/share/binutils-data
@@ -116,7 +92,6 @@ livecd/empty:
/usr/share/emacs
/usr/share/et
/usr/share/gcc-data
- /usr/share/genkernel
/usr/share/gettext
/usr/share/glib-2.0
/usr/share/gnuconfig
@@ -142,27 +117,15 @@ livecd/empty:
/var/tmp
livecd/rm:
- /boot/System*
- /boot/initr*
- /boot/kernel*
/etc/*-
/etc/*.old
/etc/default/audioctl
/etc/dispatch-conf.conf
- /etc/env.d/05binutils
- /etc/env.d/05gcc
/etc/etc-update.conf
/etc/hosts.bck
/etc/issue*
- /etc/genkernel.conf
- /etc/make.conf*
- /etc/make.globals
- /etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /usr/lib*/*.a
- /usr/lib*/*.la
- /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
/usr/bin/*.static
@@ -172,56 +135,6 @@ livecd/rm:
/usr/bin/mkfs.cramfs
/usr/bin/mkfs.minix
/usr/bin/addr2line
- /usr/bin/ar
- /usr/bin/as
- /usr/bin/audioctl
- /usr/bin/c++*
- /usr/bin/cc
- /usr/bin/cjpeg
- /usr/bin/cpp
- /usr/bin/djpeg
- /usr/bin/ebuild
- /usr/bin/egencache
- /usr/bin/emerge
- /usr/bin/emerge-webrsync
- /usr/bin/emirrordist
- /usr/bin/elftoaout
- /usr/bin/f77
- /usr/bin/g++*
- /usr/bin/g77
- /usr/bin/gcc*
- /usr/bin/genkernel
- /usr/bin/gprof
- /usr/bin/i?86-gentoo-linux-uclibc-*
- /usr/bin/i?86-pc-linux-*
- /usr/bin/jpegtran
- /usr/bin/ld
- /usr/bin/libpng*
- /usr/bin/nm
- /usr/bin/objcopy
- /usr/bin/objdump
- /usr/bin/piggyback*
- /usr/bin/portageq
- /usr/bin/ranlib
- /usr/bin/readelf
- /usr/bin/size
- /usr/bin/strip
- /usr/bin/tbz2tool
- /usr/bin/xpak
- /usr/bin/yacc
- /usr/lib*/*.a
- /usr/lib*/*.la
- /usr/lib*/perl5/site_perl
- /usr/lib*/gcc-lib/*/*/libgcj*
- /usr/bin/archive-conf
- /usr/bin/dispatch-conf
- /usr/bin/emaint
- /usr/bin/env-update
- /usr/bin/etc-update
- /usr/bin/fb*
- /usr/bin/fixpackages
- /usr/bin/quickpkg
- /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
index 205ff096..42db23c4 100644
--- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
+++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
@@ -23,7 +23,6 @@ boot/kernel/gentoo/config:
@REPO_DIR@/releases/kconfig/x86/dist-x86-livecd.confi
boot/kernel/gentoo/packages: --usepkg n broadcom-sta
livecd/unmerge:
- app-admin/eselect
app-admin/eselect-ctags
app-admin/eselect-vi
app-admin/perl-cleaner
@@ -68,6 +67,7 @@ livecd/unmerge:
sys-kernel/gentoo-kernel
sys-kernel/linux-headers
+
livecd/empty:
/boot
/etc/cron.daily
@@ -80,26 +80,10 @@ livecd/empty:
/etc/rsync
/etc/runlevels/single
/etc/skel
- /usr/lib/dev-state
- /usr/lib/udev-state
/root/.ccache
/tmp
- /usr/diet/include
- /usr/diet/man
/usr/include
- /usr/i?86-gentoo-linux-uclibc
- /usr/i?86-pc-linux-uclibc
- /usr/lib/X11/config
- /usr/lib/X11/doc
- /usr/lib/X11/etc
- /usr/lib/awk
- /usr/lib/ccache
- /usr/lib/gcc-config
- /usr/lib/nfs
- /usr/lib/perl5/site_perl
- /usr/lib/portage
/usr/local
- /usr/portage
/usr/share/aclocal
/usr/share/baselayout
/usr/share/binutils-data
@@ -110,7 +94,6 @@ livecd/empty:
/usr/share/emacs
/usr/share/et
/usr/share/gcc-data
- /usr/share/genkernel
/usr/share/gettext
/usr/share/glib-2.0
/usr/share/gnuconfig
@@ -119,7 +102,6 @@ livecd/empty:
/usr/share/info
/usr/share/lcms
/usr/share/libtool
- /usr/share/locale
/usr/share/man
/usr/share/rfc
/usr/share/ss
@@ -137,27 +119,15 @@ livecd/empty:
/var/tmp
livecd/rm:
- /boot/System*
- /boot/initr*
- /boot/kernel*
/etc/*-
/etc/*.old
/etc/default/audioctl
/etc/dispatch-conf.conf
- /etc/env.d/05binutils
- /etc/env.d/05gcc
/etc/etc-update.conf
/etc/hosts.bck
/etc/issue*
- /etc/genkernel.conf
- /etc/make.conf*
- /etc/make.globals
- /etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /usr/lib*/*.a
- /usr/lib*/*.la
- /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
/usr/bin/*.static
@@ -167,56 +137,6 @@ livecd/rm:
/usr/bin/mkfs.cramfs
/usr/bin/mkfs.minix
/usr/bin/addr2line
- /usr/bin/ar
- /usr/bin/as
- /usr/bin/audioctl
- /usr/bin/c++*
- /usr/bin/cc
- /usr/bin/cjpeg
- /usr/bin/cpp
- /usr/bin/djpeg
- /usr/bin/ebuild
- /usr/bin/egencache
- /usr/bin/emerge
- /usr/bin/emerge-webrsync
- /usr/bin/emirrordist
- /usr/bin/elftoaout
- /usr/bin/f77
- /usr/bin/g++*
- /usr/bin/g77
- /usr/bin/gcc*
- /usr/bin/genkernel
- /usr/bin/gprof
- /usr/bin/i?86-gentoo-linux-uclibc-*
- /usr/bin/i?86-pc-linux-*
- /usr/bin/jpegtran
- /usr/bin/ld
- /usr/bin/libpng*
- /usr/bin/nm
- /usr/bin/objcopy
- /usr/bin/objdump
- /usr/bin/piggyback*
- /usr/bin/portageq
- /usr/bin/ranlib
- /usr/bin/readelf
- /usr/bin/size
- /usr/bin/strip
- /usr/bin/tbz2tool
- /usr/bin/xpak
- /usr/bin/yacc
- /usr/lib*/*.a
- /usr/lib*/*.la
- /usr/lib*/perl5/site_perl
- /usr/lib*/gcc-lib/*/*/libgcj*
- /usr/bin/archive-conf
- /usr/bin/dispatch-conf
- /usr/bin/emaint
- /usr/bin/env-update
- /usr/bin/etc-update
- /usr/bin/fb*
- /usr/bin/fixpackages
- /usr/bin/quickpkg
- /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
