diff options
| -rwxr-xr-x | make_slackware_live.sh | 28 | ||||
| -rw-r--r-- | pkglists/min.lst | 13 | ||||
| -rw-r--r-- | pkglists/xapbase.lst | 2 | ||||
| -rw-r--r-- | pkglists/xbase.lst | 16 | ||||
| -rw-r--r-- | pkglists/xfcebase.lst | 2 |
5 files changed, 47 insertions, 14 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 4694806..feba56b 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -433,13 +433,16 @@ function install_pkgs() { (cd "${2}/usr/doc" && find . -type d -mindepth 2 -maxdepth 2 -exec rm -rf {} \;) rm -rf "$2"/usr/share/gtk-doc rm -rf "$2"/usr/share/help + find "$2"/usr/share/ -type d -name doc |xargs rm -rf # Remove residual bloat: rm -rf "${2}"/usr/doc/*/html rm -f "${2}"/usr/doc/*/*.{html,css,xml,pdf,db,gz,bz2,xz,txt,TXT} + # Remove info pages: + rm -rf "$2"/usr/info fi if [ "$TRIM" = "mandoc" ]; then - # Also remove man and info pages: - rm -rf "$2"/usr/man "$2"/usr/info + # Also remove man pages: + rm -rf "$2"/usr/man fi if [ "$LIVEDE" = "XFCE" ]; then # By pruning stuff that no one likely needs anyway, @@ -458,14 +461,31 @@ function install_pkgs() { rm -rf "$2"/usr/lib${DIRSUFFIX}/clang/*/lib/linux/*.a{,.syms} # Get rid of useless documentation: rm -rf "$2"/usr/share/ghostscript/*/doc/ + # We don't need tests or examples: + find "$2"/usr/ -type d -iname test |xargs rm -rf + find "$2"/usr/ -type d -iname "example*" |xargs rm -rf + # Get rid of most of the screensavers: + KEEPXSCR="julia xflame xjack" + if [ -d "${2}"/usr/libexec/xscreensaver ]; then + cd "${2}"/usr/libexec/xscreensaver + mkdir .keep + for XSCR in ${KEEPXSCR} ; do + mv ${XSCR} .keep/ 2>/dev/null + done + rm -rf [A-Za-z]* + mv .keep/* . 2>/dev/null + rm -rf .keep + cd - 1>/dev/null + fi # Remove unneeded languages from glibc: - KEEPLANG="$(cat ${LIVE_TOOLDIR}/languages|grep -Ev "(^ *#|^$)"|cut -d: -f1)" + KEEPLANG="$(cat ${LIVE_TOOLDIR}/languages|grep -Ev "(^ *#|^$)"|cut -d: -f5)" for LOCALEDIR in /usr/lib${DIRSUFFIX}/locale /usr/share/i18n/locales /usr/share/locale ; do if [ -d "${2}"/${LOCALEDIR} ]; then cd "${2}"/${LOCALEDIR} mkdir .keep for KL in C ${KEEPLANG} ; do - mv ${KL}* .keep 2>/dev/null + mv ${KL%%.utf8}* .keep/ 2>/dev/null # en_US.utf8 -> en_US* + mv ${KL%%_*} .keep/ 2>/dev/null # en_US.utf8 -> en done rm -rf [A-Za-z]* mv .keep/* . 2>/dev/null diff --git a/pkglists/min.lst b/pkglists/min.lst index ee9be89..ff5b630 100644 --- a/pkglists/min.lst +++ b/pkglists/min.lst @@ -6,7 +6,8 @@ attr bash bin binutils -bind +# Add 'bind' at the end because it does a chroot: +#bind bison #bsd-games bzip2 @@ -25,7 +26,7 @@ diffutils dmidecode dnsmasq e2fsprogs -elvis +#elvis etc eudev file @@ -35,7 +36,7 @@ floppy gawk gc gcc -#ghostscript +ghostscript #ghostscript-fonts-std glibc #glibc-solibs @@ -63,15 +64,17 @@ kernel-modules kmod less libassuan +libedit libevent libgcrypt libgpg-error libgudev +libidn2 libksba libmpc libtermcap libunistring -lilo +#lilo links logrotate lvm2 @@ -128,3 +131,5 @@ wget which whois xz +# Bind needs to run at the end: +bind diff --git a/pkglists/xapbase.lst b/pkglists/xapbase.lst index 5abae39..e4843f3 100644 --- a/pkglists/xapbase.lst +++ b/pkglists/xapbase.lst @@ -40,6 +40,6 @@ x3270 xgames #xlockmore #xmms -xpaint +#xpaint xpdf xsane diff --git a/pkglists/xbase.lst b/pkglists/xbase.lst index 3928a23..472398b 100644 --- a/pkglists/xbase.lst +++ b/pkglists/xbase.lst @@ -2,6 +2,12 @@ ConsoleKit2 GConf ModemManager NetworkManager +SDL2 +SDL2_gfx +SDL2_image +SDL2_mixer +SDL2_net +SDL2_ttf a52dec aalib adwaita-icon-theme @@ -32,7 +38,7 @@ dbus-glib dbus-python dejavu-fonts-ttf desktop-file-utils -djvulibre +#djvulibre dmxproto dosfstools dri2proto @@ -93,7 +99,7 @@ gst-plugins-good gst-plugins-good0 gstreamer gstreamer0 -gtk+ +#gtk+ gtk+2 gtk+3 gtkspell @@ -160,6 +166,7 @@ libarchive libart_lgpl libasyncns libatasmart +libbluray libcaca libcanberra libcddb @@ -171,7 +178,7 @@ libdmx libdrm libdvdnav libdvdread -liberation-fonts-ttf +#liberation-fonts-ttf libepoxy libevdev libexif @@ -252,6 +259,7 @@ net-snmp nettle newt nfs-utils +ocl-icd openexr openjpeg orc @@ -402,7 +410,7 @@ xsetroot xsm xstdcmap xtrans -xv +#xv xvidtune xvinfo xwd diff --git a/pkglists/xfcebase.lst b/pkglists/xfcebase.lst index b06597a..3e49027 100644 --- a/pkglists/xfcebase.lst +++ b/pkglists/xfcebase.lst @@ -4,7 +4,7 @@ garcon gtk-xfce-engine libxfce4ui libxfce4util -orage +#orage thunar-volman tumbler xfce4-appfinder |