From 0aff91dc699e9688ac0b0947d6e65e35f6b30f50 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 22 Jan 2017 16:11:20 -0600
Subject: Make build-cd fully architecture independent

---
 build-cd          | 35 ++++++++++++++---------------------
 iso-params-x86    |  1 +
 iso-params-x86_64 |  1 +
 packages-x86      |  2 ++
 packages-x86_64   |  5 +++++
 post-x86.sh       | 16 ++++++++++++++++
 post-x86_64.sh    | 16 ++++++++++++++++
 7 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100644 iso-params-x86
 create mode 100644 iso-params-x86_64
 create mode 100644 packages-x86
 create mode 100644 packages-x86_64
 create mode 100755 post-x86.sh
 create mode 100755 post-x86_64.sh

diff --git a/build-cd b/build-cd
index babae4a..055d04e 100755
--- a/build-cd
+++ b/build-cd
@@ -86,8 +86,10 @@ while [ -n "$1" ]; do
     shift
 done
 
+set -a
 declare -r ARCH=${MY_ARCH:-$def_arch}
 declare -r LDARCH=${LDARCH:-$ARCH}
+set +a
 
 ensure_commands
 
@@ -122,19 +124,19 @@ declare -r PACKAGES="
 	pciutils libusb1 usbutils \
 	strace \
 	hdparm \
-	dmidecode \
 	less \
 	bzip2 \
 	netifrc netifrc-doc netifrc-openrc \
-	diskdev_cmds exfat-utils hfsutils mtools \
-	efibootmgr elilo mactel-boot syslinux
+	diskdev_cmds exfat-utils hfsutils mtools
 "
 
+declare -r ARCH_PKGS=$(cat packages-$ARCH 2>/dev/null || echo '')
+
 printf '\033[01;32m * \033[37mInstalling base system to squash root...\033[00;39m\n'
 
 mkdir -p squashroot-$ARCH/etc/apk/keys
 cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/
-apk --arch $ARCH -X "https://distfiles.adelielinux.org/adelie/1.0-alpha/$EXTRA_MIRROR" -U --root squashroot-$ARCH --initdb add $PACKAGES
+apk --arch $ARCH -X "https://distfiles.adelielinux.org/adelie/1.0-alpha/$EXTRA_MIRROR" -U --root squashroot-$ARCH --initdb add $PACKAGES $ARCH_PKGS
 mkdir -p squashroot-$ARCH/home/live
 mkdir squashroot-$ARCH/target
 mkdir -p squashroot-$ARCH/media/live
@@ -214,7 +216,8 @@ cat >squashroot-$ARCH/etc/shells <<- SHELLS
 SHELLS
 
 cat >squashroot-$ARCH/etc/resolv.conf <<- RESOLVE
-	nameserver 8.8.8.8
+	nameserver 84.200.69.80
+	nameserver 2001:1608:10:25::1c04:b12f
 RESOLVE
 
 cat >squashroot-$ARCH/etc/apk/repositories <<-REPOS
@@ -302,22 +305,12 @@ printf '\033[01;32m * \033[37mAdding kernel...\033[00;39m\n'
 
 cp squashroot-$ARCH/boot/vmlinuz* cdroot-$ARCH/bzImage
 
-printf '\033[01;32m * \033[37mInstalling ISOLINUX...\033[00;39m\n'
-
-mkdir cdroot-$ARCH/isolinux
-
-cat >cdroot-$ARCH/isolinux/isolinux.cfg <<BOOTCFG
-prompt 1
-default adelie
-
-label adelie
-	kernel /bzImage
-	append initrd=/initrd
-BOOTCFG
-
-cp /usr/share/syslinux/isolinux-debug.bin cdroot-$ARCH/isolinux/isolinux.bin
-cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/
+if test -f post-$ARCH.sh; then
+	printf '\033]01;32m * \033]37mRunning architecture-specific scripts...\033[00;39m\n'
+	sh post-$ARCH.sh
+fi
 
 printf '\033[01;32m * \033[37mCreating the CD...\033[00;39m\n'
 
-mkisofs -o adelie-${DO_FULL:-live}-$ARCH-1.0-ALPHA2-$(date +%Y%m%d).iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -joliet -rational-rock -V "Adélie 1.0a2 $ARCH" cdroot-$ARCH
+declare -r CD_PARAMS=$(cat iso-params-$ARCH)
+mkisofs -o adelie-${DO_FULL:-live}-$ARCH-1.0-ALPHA2-$(date +%Y%m%d).iso ${CD_PARAMS} -joliet -rational-rock -V "Adélie 1.0a2 $ARCH" cdroot-$ARCH
diff --git a/iso-params-x86 b/iso-params-x86
new file mode 100644
index 0000000..f91158b
--- /dev/null
+++ b/iso-params-x86
@@ -0,0 +1 @@
+-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table
diff --git a/iso-params-x86_64 b/iso-params-x86_64
new file mode 100644
index 0000000..f91158b
--- /dev/null
+++ b/iso-params-x86_64
@@ -0,0 +1 @@
+-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table
diff --git a/packages-x86 b/packages-x86
new file mode 100644
index 0000000..4bdfe43
--- /dev/null
+++ b/packages-x86
@@ -0,0 +1,2 @@
+dmidecode
+syslinux
diff --git a/packages-x86_64 b/packages-x86_64
new file mode 100644
index 0000000..1314237
--- /dev/null
+++ b/packages-x86_64
@@ -0,0 +1,5 @@
+dmidecode
+efibootmgr
+elilo
+mactel-boot
+syslinux
diff --git a/post-x86.sh b/post-x86.sh
new file mode 100755
index 0000000..5f9d433
--- /dev/null
+++ b/post-x86.sh
@@ -0,0 +1,16 @@
+printf '\033[01;32m * \033[37mInstalling ISOLINUX...\033[00;39m\n'
+
+mkdir cdroot-$ARCH/isolinux
+
+cat >cdroot-$ARCH/isolinux/isolinux.cfg <<BOOTCFG
+prompt 1
+default adelie
+
+label adelie
+	kernel /bzImage
+	append initrd=/initrd
+BOOTCFG
+
+cp /usr/share/syslinux/isolinux-debug.bin cdroot-$ARCH/isolinux/isolinux.bin
+cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/
+
diff --git a/post-x86_64.sh b/post-x86_64.sh
new file mode 100755
index 0000000..5f9d433
--- /dev/null
+++ b/post-x86_64.sh
@@ -0,0 +1,16 @@
+printf '\033[01;32m * \033[37mInstalling ISOLINUX...\033[00;39m\n'
+
+mkdir cdroot-$ARCH/isolinux
+
+cat >cdroot-$ARCH/isolinux/isolinux.cfg <<BOOTCFG
+prompt 1
+default adelie
+
+label adelie
+	kernel /bzImage
+	append initrd=/initrd
+BOOTCFG
+
+cp /usr/share/syslinux/isolinux-debug.bin cdroot-$ARCH/isolinux/isolinux.bin
+cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/
+
-- 
cgit v1.2.3-70-g09d2