diff --git a/blacklist b/blacklist index 04a4172..4a097e9 100644 --- a/blacklist +++ b/blacklist @@ -82,4 +82,5 @@ xv # -- Optional: # elilo, lilo, syslinux, grub: Uncomment the ones not used. # k, d: Only needed if you need to compile programs. -# openssl-solibs, glibc-solibs: Useless if d is installed. +# openssl-solibs: Useless if n/openssl is installed. +# glibc-solibs: Useless if l/glibc is installed. diff --git a/etc/astronaut.conf b/etc/astronaut.conf index 12c4c45..58deebe 100644 --- a/etc/astronaut.conf +++ b/etc/astronaut.conf @@ -5,6 +5,7 @@ dir_install="/tmp/astronaut.$(id -u)/install" dir_source='/var/cache/astronaut' [ "$(uname -m)" = "x86_64" ] && dir_libdir='lib64' +dir_sysconfdir='../etc' dir_mandir='man' dir_docdir='doc' dir_infodir='info' @@ -18,11 +19,12 @@ package_options() { python3) echo '!2to3-symlink' ;; python3-setuptools) echo '!easy_install-symlink' ;; texlive) echo '!system-harfbuzz' ;; + wine) echo 'wine32=lib' ;; esac } export CFLAGS='-mtune=atom -pipe -O3' export CXXFLAGS="$CFLAGS" -export MAKEFLAGS="-j $(cat /proc/cpuinfo | grep processor | wc -l)" +export MAKEFLAGS="-j $(grep processor /proc/cpuinfo | wc -l)" export WAFFLAGS="$MAKEFLAGS" export BAMFLAGS="$MAKEFLAGS" diff --git a/etc/rc.d/rc.6 b/etc/rc.d/rc.6 index d29c210..74a6bd1 100644 --- a/etc/rc.d/rc.6 +++ b/etc/rc.d/rc.6 @@ -67,7 +67,7 @@ if [ -x /sbin/hwclock ]; then fi fi -# Save the current alsa mixer level: +# Save the current alsa mixer settings: if [ -x /etc/rc.d/rc.alsa -a -d /proc/asound ]; then echo "Storing ALSA mixer settings: /usr/sbin/alsactl store" /usr/sbin/alsactl store