From 5b833f4bcaf12a47dfb551d6bc7d9209c851b720 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 24 Jun 2016 00:22:38 +0200
Subject: Add support for multilib.

New parameter '-M' to the "make_slackware_live.sh" script will add
a squashfs module "0020-slackware_multilib-VERSION-ARCH.sxz" to the iso,
its contents based on the ./pkglists/multilib.* package repo definitions.
Only for the x86_64 architecture of course.

If you already have a USB Live, you can simply copy this module into the
directory "/liveslak/addons" to transform your pure 64bit Slackware Live
Edition into a multilib variant.
---
 make_slackware_live.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'make_slackware_live.sh')

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 0e79070..6c92546 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -129,6 +129,9 @@ MARKER=${MARKER:-"SLACKWARELIVE"}
 # The filesystem label we will be giving our ISO:
 MEDIALABEL=${MEDIALABEL:-"LIVESLAK"}
 
+# For x86_64 you can add multilib:
+MULTILIB=${MULTILIB:-"NO"}
+
 # The name of the directory used for storing persistence data:
 PERSISTENCE=${PERSISTENCE:-"persistence"}
 
@@ -596,7 +599,7 @@ EOL
 # Action!
 # ---------------------------------------------------------------------------
 
-while getopts "a:d:efhm:r:s:t:vz:HO:R:X" Option
+while getopts "a:d:efhm:r:s:t:vz:H:MO:R:X" Option
 do
   case $Option in
     h )
@@ -629,6 +632,7 @@ do
         echo " -v                 Show debug/error output."
         echo " -z version         Define your ${DISTRO^} version (default: $SL_VERSION)."
         echo " -H hostname        Hostname of the Live OS (default: $LIVE_HOSTNAME)."
+        echo " -M                 Add multilib (x86_64 only)."
         echo " -O outfile         Custom filename for the ISO."
         echo " -R runlevel        Runlevel to boot into (default: $RUNLEVEL)."
         echo " -X                 Use xorriso instead of mkisofs/isohybrid."
@@ -656,6 +660,8 @@ do
         ;;
     H ) LIVE_HOSTNAME="${OPTARG}"
         ;;
+    M ) MULTILIB="YES"
+        ;;
     O ) OUTFILE="${OPTARG}"
         OUTPUT="$(cd $(dirname "${OUTFILE}"); pwd)"
         ;;
@@ -692,6 +698,11 @@ if [ $RUNLEVEL -ne 3 -a $RUNLEVEL -ne 4 ]; then
   exit 1
 fi
 
+if [ "$SL_ARCH" != "x86_64" -a "$MULTILIB" = "YES" ]; then
+  echo ">> Multilib is only supported on x86_64 architecture."
+  exit 1
+fi
+
 # Directory suffix, arch dependent:
 if [ "$SL_ARCH" = "x86_64" ]; then
   DIRSUFFIX="64"
@@ -800,8 +811,15 @@ case "$LIVEDE" in
              ;;
 esac
 
+# Do we need to include multilib?
+if [ "$MULTILIB" = "YES" ]; then
+  echo "-- Adding multilib."
+  MSEQ="${MSEQ} pkglist:multilib"
+fi
+
 # Do we need to create/include additional module(s) defined by a pkglist:
 if [ -n "$SEQ_ADDMOD" ]; then
+  echo "-- Adding ${SEQ_ADDMOD}."
   MSEQ="${MSEQ} pkglist:${SEQ_ADDMOD}"
 fi
 
-- 
cgit v1.2.3