From 9ab06cd37b8b41d9a5cf978cddc95a0e72abe0e7 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
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(-)

(limited to 'make_slackware_live.sh')

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-65-gdbad


From a554d84e07f436ca302f1a280bacb600b732a7e9 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
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

(limited to 'make_slackware_live.sh')

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-65-gdbad