From 9ab06cd37b8b41d9a5cf978cddc95a0e72abe0e7 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 16 Dec 2016 08:45:16 +0100 Subject: (e)liloconfig: only try to patch these scripts if they are contained in the ISO. --- make_slackware_live.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 7cee8e3..d2856d6 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1348,8 +1348,12 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then cd - 1>/dev/null # Fix some occurrences of '/mnt' that should not be used in the Live ISO: sed -i -e 's, /mnt, ${T_PX},g' -e 's,=/mnt/,=${T_PX}/,g' -e 's,T_PX=/mnt,T_PX=/setup2hd,g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* - patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/liloconfig.patch - patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/eliloconfig.patch + if [ -f ${LIVE_ROOTDIR}/sbin/liloconfig ]; then + patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/liloconfig.patch + fi + if [ -f ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ]; then + patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/eliloconfig.patch + fi # Fix some occurrences of '/usr/lib/setup/' are covered by $PATH: sed -i -e 's,/usr/lib/setup/,,g' -e 's,:/usr/lib/setup,:/usr/share/${LIVEMAIN},g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* # Add the Slackware Live HD installer: -- cgit v1.2.3 From 12688a3ef0bb833baaef38bc1c0a3d74025b8b5a Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 28 Dec 2016 13:54:02 +0100 Subject: pkglist configuration: use '/var/cache/liveslak' to store repository mirrors. --- pkglists/alien.conf | 2 +- pkglists/alienrest.conf | 12 ++++++++++++ pkglists/cinnamon.conf | 4 ++-- pkglists/lxqt.conf | 2 +- pkglists/lxqtdeps.conf | 2 +- pkglists/mate.conf | 2 +- pkglists/multilib.conf | 2 +- pkglists/plasma5.conf | 2 +- 8 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 pkglists/alienrest.conf diff --git a/pkglists/alien.conf b/pkglists/alien.conf index 4b527b2..a81a7c2 100644 --- a/pkglists/alien.conf +++ b/pkglists/alien.conf @@ -2,7 +2,7 @@ # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed # to the local directory 'SL_REPO'. SL_REPO_URL="rsync://slackware.uk/people/alien/sbrepos/${SL_VERSION}/${SL_ARCH}" -SL_REPO="/mnt/auto/sox/sbrepos/${SL_VERSION}/${SL_ARCH}" +SL_REPO="/var/cache/liveslak/sbrepos/${SL_VERSION}/${SL_ARCH}" # Package root directory: SL_PKGROOT=${SL_REPO} diff --git a/pkglists/alienrest.conf b/pkglists/alienrest.conf new file mode 100644 index 0000000..40c3942 --- /dev/null +++ b/pkglists/alienrest.conf @@ -0,0 +1,12 @@ +# If 'SL_REPO_URL' is a rsync:// URL and 'SL_REPO' points to a non-existent +# or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed +# to the local directory 'SL_REPO'. +SL_REPO_URL="rsync://slackware.uk/people/alien/restricted_sbrepos/${SL_VERSION}/${SL_ARCH}" +SL_REPO="/var/cache/liveslak/restricted_sbrepos/${SL_VERSION}/${SL_ARCH}" + +# Package root directory: +SL_PKGROOT=${SL_REPO} + +# Patches root directory: +SL_PATCHROOT="" + diff --git a/pkglists/cinnamon.conf b/pkglists/cinnamon.conf index cca639d..5e78bd3 100644 --- a/pkglists/cinnamon.conf +++ b/pkglists/cinnamon.conf @@ -3,9 +3,9 @@ # to the local directory 'SL_REPO'. #SL_REPO_URL="rsync://slackware.uk/csb/${SL_VERSION}/${SL_ARCH}" -#SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/csb/${SL_VERSION}/${SL_ARCH}" +#SL_REPO="/var/cache/liveslak/csb/${SL_VERSION}/${SL_ARCH}" SL_REPO_URL="rsync://slackware.uk/csb/14.2/${SL_ARCH}" -SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/csb/14.2/${SL_ARCH}" +SL_REPO="/var/cache/liveslak/csb/14.2/${SL_ARCH}" # Package root directory: SL_PKGROOT=${SL_REPO} diff --git a/pkglists/lxqt.conf b/pkglists/lxqt.conf index 4b527b2..a81a7c2 100644 --- a/pkglists/lxqt.conf +++ b/pkglists/lxqt.conf @@ -2,7 +2,7 @@ # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed # to the local directory 'SL_REPO'. SL_REPO_URL="rsync://slackware.uk/people/alien/sbrepos/${SL_VERSION}/${SL_ARCH}" -SL_REPO="/mnt/auto/sox/sbrepos/${SL_VERSION}/${SL_ARCH}" +SL_REPO="/var/cache/liveslak/sbrepos/${SL_VERSION}/${SL_ARCH}" # Package root directory: SL_PKGROOT=${SL_REPO} diff --git a/pkglists/lxqtdeps.conf b/pkglists/lxqtdeps.conf index 2db46bd..94a0566 100644 --- a/pkglists/lxqtdeps.conf +++ b/pkglists/lxqtdeps.conf @@ -2,7 +2,7 @@ # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed # to the local directory 'SL_REPO'. SL_REPO_URL="rsync://slackware.uk/people/alien-kde/${SL_VERSION}/latest/${SL_ARCH}" -SL_REPO="/mnt/auto/sox/data/slackware/ktown/${SL_VERSION}/latest/${SL_ARCH}" +SL_REPO="/var/cache/liveslak/ktown/${SL_VERSION}/latest/${SL_ARCH}" # Package root directory: SL_PKGROOT=${SL_REPO} diff --git a/pkglists/mate.conf b/pkglists/mate.conf index 1d293c1..a7fb6ce 100644 --- a/pkglists/mate.conf +++ b/pkglists/mate.conf @@ -3,7 +3,7 @@ # to the local directory 'SL_REPO'. SL_REPO_URL="rsync://slackware.uk/msb/${SL_VERSION}/latest/${SL_ARCH}/" -SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/msb/${SL_VERSION}/latest/${SL_ARCH}" +SL_REPO="/car/cache/liveslak/msb/${SL_VERSION}/latest/${SL_ARCH}" # Package root directory: SL_PKGROOT=${SL_REPO} diff --git a/pkglists/multilib.conf b/pkglists/multilib.conf index 1f8d5e6..f9ef635 100644 --- a/pkglists/multilib.conf +++ b/pkglists/multilib.conf @@ -2,7 +2,7 @@ # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed # to the local directory 'SL_REPO'. SL_REPO_URL="rsync://slackware.uk/people/alien/multilib/${SL_VERSION}" -SL_REPO="/mnt/auto/sox/www/sox/slackware/multilib/${SL_VERSION}" +SL_REPO="/var/cache/liveslak/multilib/${SL_VERSION}" # Package root directory: SL_PKGROOT=${SL_REPO} diff --git a/pkglists/plasma5.conf b/pkglists/plasma5.conf index 457ce0b..1ab1a31 100644 --- a/pkglists/plasma5.conf +++ b/pkglists/plasma5.conf @@ -5,7 +5,7 @@ VARIANT=latest SL_REPO_URL="rsync://slackware.uk/people/alien-kde/${SL_VERSION}/${VARIANT}/${SL_ARCH}" -SL_REPO="/mnt/auto/sox/data/slackware/ktown/${SL_VERSION}/${VARIANT}/${SL_ARCH}" +SL_REPO="/var/cache/liveslak/ktown/${SL_VERSION}/${VARIANT}/${SL_ARCH}" # Package root directory: SL_PKGROOT=${SL_REPO} -- cgit v1.2.3 From a554d84e07f436ca302f1a280bacb600b732a7e9 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 28 Dec 2016 13:56:25 +0100 Subject: pkglists: add alien's restricted repository. Add packages from the restricted repository to the PLASMA5 ISO: - ffmpeg - handbrake - lame - libdvdcss - vlc Also, add 'keepassx' to alien's regular package list. --- make_slackware_live.sh | 2 +- pkglists/alien.lst | 4 ++-- pkglists/alienrest.lst | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 pkglists/alienrest.lst diff --git a/make_slackware_live.sh b/make_slackware_live.sh index d2856d6..d087219 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -172,7 +172,7 @@ SEQ_KDE4BASE="pkglist:${MINLIST},xbase,xapbase,kde4base" # List of Slackware package series with Plasma5 instead of KDE 4 (full install): # - each will become a squashfs module: -SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4plasma5,plasma5,alien local:slackpkg+" +SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4plasma5,plasma5,alien,alienrest local:slackpkg+" # List of Slackware package series with MSB instead of KDE 4 (full install): # - each will become a squashfs module: diff --git a/pkglists/alien.lst b/pkglists/alien.lst index ff811d9..5ec8412 100644 --- a/pkglists/alien.lst +++ b/pkglists/alien.lst @@ -12,7 +12,7 @@ gnome-mplayer gst-plugins-ffmpeg0 gst-plugins-libav icedtea-web -libdvdcss +keepassx libreoffice libreoffice-dict-af libreoffice-dict-ar @@ -58,7 +58,7 @@ libreoffice-dict-vi libreoffice-dict-zu libreoffice-kde-integration libstatgrab -libtinfo +#libtinfo libtorrent-rasterbar lumina muparser diff --git a/pkglists/alienrest.lst b/pkglists/alienrest.lst new file mode 100644 index 0000000..75b065b --- /dev/null +++ b/pkglists/alienrest.lst @@ -0,0 +1,6 @@ +avidemux +ffmpeg +handbrake +lame +libdvdcss +vlc -- cgit v1.2.3