From 2b6d5195ee16efc25a25964315acf42ece035b7f Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 6 Apr 2018 13:47:22 +0200
Subject: added archiso32-git for CDROM building

---
 build_stage4.sh                 |  3 ++
 create_cdrom.sh                 | 64 -----------------------------------------
 create_stage1_cdrom.sh          | 64 +++++++++++++++++++++++++++++++++++++++++
 create_stage4_cdrom.sh          | 45 +++++++++++++++++++++++++++++
 default.conf                    |  3 ++
 i486-stage4/archiso32-git/DESCR |  3 ++
 i486-stage4/lynx/DESCR          |  0
 i486-stage4/zstd/DESCR          |  9 ++++++
 8 files changed, 127 insertions(+), 64 deletions(-)
 delete mode 100755 create_cdrom.sh
 create mode 100755 create_stage1_cdrom.sh
 create mode 100755 create_stage4_cdrom.sh
 create mode 100644 i486-stage4/archiso32-git/DESCR
 create mode 100644 i486-stage4/lynx/DESCR
 create mode 100644 i486-stage4/zstd/DESCR

diff --git a/build_stage4.sh b/build_stage4.sh
index 35ca2ea..3353ab7 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -81,6 +81,9 @@ links licenses
 nbd rpcbind ding-libs gssproxy nfs-utils
 mkinitcpio-nfs-utils mkinitcpio-nbd atftp
 zip nspr gyp
+arch-install-scripts
+lynx dosfstools gtest zstd btrfs-progs squashfs-tools
+libburn libisofs libisoburn archiso32-git
 "
 
 # nss still fails as in stage 3
diff --git a/create_cdrom.sh b/create_cdrom.sh
deleted file mode 100755
index d2330bb..0000000
--- a/create_cdrom.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# shellcheck source=./default.conf
-. "./default.conf"
-
-# builds a small ISO image for installing a stage 1 system:
-# no ramdisk, no modules, no fancy startup, just a shell script
-
-sudo rm -rf $STAGE1_ISOLINUX
-
-# copy chroot to ISOlinux dir
-mkdir $STAGE1_ISOLINUX
-sudo cp -a $STAGE1_CHROOT/* $STAGE1_ISOLINUX/.
-sudo chown -R cross:cross $STAGE1_ISOLINUX/.
-cd $STAGE1_ISOLINUX || exit 1
-
-# simple ISOlinux menu, with options for fast choosing a root device
-mkdir boot/isolinux
-cat >boot/isolinux/isolinux.cfg <<EOF
-UI menu.c32
-TIMEOUT 300
-PROMPT 1
-LABEL hda
-	KERNEL /boot/vmlinuz-linux
-	APPEND root=/dev/hda init=/sbin/init console=ttyS0 console=tty0'
-LABEL hdb
-	KERNEL /boot/vmlinuz-linux
-	APPEND root=/dev/hdb init=/sbin/init console=ttyS0 console=tty0'
-LABEL hdc
-	KERNEL /boot/vmlinuz-linux
-	APPEND root=/dev/hdc init=/sbin/init console=ttyS0 console=tty0'
-LABEL hdd
-	KERNEL /boot/vmlinuz-linux
-	APPEND root=/dev/hdd init=/sbin/init console=ttyS0 console=tty0'
-LABEL sr0
-	KERNEL /boot/vmlinuz-linux
-	APPEND root=/dev/sr0 init=/sbin/init console=ttyS0 console=tty0'
-LABEL sr1
-	KERNEL /boot/vmlinuz-linux
-	APPEND root=/dev/sr1 init=/sbin/init console=ttyS0 console=tty0'
-EOF
-sudo chown cross:cross boot/isolinux/isolinux.cfg
-
-mkdir -p etc/init
-
-cat >etc/init/boot <<EOF
-#!/bin/sh
-mount -t proc proc /proc
-ln -s /proc/self/fd /dev/fd
-mount -t sysfs sys /sys
-mount -t tmpfs nodev,nosuid,size=4M /tmp
-exec /usr/bin/bash
-EOF
-sudo chown -R root:root .
-sudo chmod 0775 etc/init/boot
-sudo cp /usr/lib/syslinux/bios/ldlinux.c32 boot/isolinux/.
-sudo cp /usr/lib/syslinux/bios/menu.c32 boot/isolinux/.
-sudo cp /usr/lib/syslinux/bios/libutil.c32 boot/isolinux/.
-sudo cp /usr/lib/syslinux/bios/isolinux.bin boot/isolinux/.
-sudo genisoimage -J -r -o ../arch486.iso -b boot/isolinux/isolinux.bin \
-	-c boot/isolinux/boot.cat -input-charset UTF-8 -no-emul-boot \
-	-boot-load-size 4 -boot-info-table -joliet-long .
-cd .. || exit 1
-
diff --git a/create_stage1_cdrom.sh b/create_stage1_cdrom.sh
new file mode 100755
index 0000000..d2330bb
--- /dev/null
+++ b/create_stage1_cdrom.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# shellcheck source=./default.conf
+. "./default.conf"
+
+# builds a small ISO image for installing a stage 1 system:
+# no ramdisk, no modules, no fancy startup, just a shell script
+
+sudo rm -rf $STAGE1_ISOLINUX
+
+# copy chroot to ISOlinux dir
+mkdir $STAGE1_ISOLINUX
+sudo cp -a $STAGE1_CHROOT/* $STAGE1_ISOLINUX/.
+sudo chown -R cross:cross $STAGE1_ISOLINUX/.
+cd $STAGE1_ISOLINUX || exit 1
+
+# simple ISOlinux menu, with options for fast choosing a root device
+mkdir boot/isolinux
+cat >boot/isolinux/isolinux.cfg <<EOF
+UI menu.c32
+TIMEOUT 300
+PROMPT 1
+LABEL hda
+	KERNEL /boot/vmlinuz-linux
+	APPEND root=/dev/hda init=/sbin/init console=ttyS0 console=tty0'
+LABEL hdb
+	KERNEL /boot/vmlinuz-linux
+	APPEND root=/dev/hdb init=/sbin/init console=ttyS0 console=tty0'
+LABEL hdc
+	KERNEL /boot/vmlinuz-linux
+	APPEND root=/dev/hdc init=/sbin/init console=ttyS0 console=tty0'
+LABEL hdd
+	KERNEL /boot/vmlinuz-linux
+	APPEND root=/dev/hdd init=/sbin/init console=ttyS0 console=tty0'
+LABEL sr0
+	KERNEL /boot/vmlinuz-linux
+	APPEND root=/dev/sr0 init=/sbin/init console=ttyS0 console=tty0'
+LABEL sr1
+	KERNEL /boot/vmlinuz-linux
+	APPEND root=/dev/sr1 init=/sbin/init console=ttyS0 console=tty0'
+EOF
+sudo chown cross:cross boot/isolinux/isolinux.cfg
+
+mkdir -p etc/init
+
+cat >etc/init/boot <<EOF
+#!/bin/sh
+mount -t proc proc /proc
+ln -s /proc/self/fd /dev/fd
+mount -t sysfs sys /sys
+mount -t tmpfs nodev,nosuid,size=4M /tmp
+exec /usr/bin/bash
+EOF
+sudo chown -R root:root .
+sudo chmod 0775 etc/init/boot
+sudo cp /usr/lib/syslinux/bios/ldlinux.c32 boot/isolinux/.
+sudo cp /usr/lib/syslinux/bios/menu.c32 boot/isolinux/.
+sudo cp /usr/lib/syslinux/bios/libutil.c32 boot/isolinux/.
+sudo cp /usr/lib/syslinux/bios/isolinux.bin boot/isolinux/.
+sudo genisoimage -J -r -o ../arch486.iso -b boot/isolinux/isolinux.bin \
+	-c boot/isolinux/boot.cat -input-charset UTF-8 -no-emul-boot \
+	-boot-load-size 4 -boot-info-table -joliet-long .
+cd .. || exit 1
+
diff --git a/create_stage4_cdrom.sh b/create_stage4_cdrom.sh
new file mode 100755
index 0000000..e773c1e
--- /dev/null
+++ b/create_stage4_cdrom.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# shellcheck source=./default.conf
+. "./default.conf"
+
+# builds a small ISO image for installing a stage 4 system:
+# it uses PXE to boot from a TFTP server (kernel and ramdisk),
+# then loads the ISO as NBD block device. This is for installation
+# on old machines with only very limited amount of RAM (currently
+# requires 64 MB minimal)
+
+sudo rm -rf $STAGE4_ISOLINUX
+
+# copy chroot to ISOlinux dir
+mkdir $STAGE4_ISOLINUX
+sudo cp -a $STAGE4_CHROOT/{bin,boot,dev,etc,home,lib,mnt,opt,proc,root,run,sbin,srv,sys,tmp,usr,var} $STAGE4_ISOLINUX/.
+sudo chown -R cross:cross $STAGE4_ISOLINUX/.
+cd $STAGE4_ISOLINUX || exit 1
+
+# on the TFTP server (e. g. as pxelinux.cfg/default)
+mkdir boot/isolinux
+cat >boot/isolinux/isolinux.cfg <<EOF
+default menu.c32
+prompt 0
+timeout 20
+ontimeout linux
+
+label linux
+initrd initramfs-linux.img
+linux vmlinuz-linux
+append rw ip=:::::eth0:dhcp nbd_host=192.168.1.12 nomodeset init=/lib/systemd/systemd nbd_name=archiso root=/dev/nbd0 console=tty0
+EOF
+sudo chown cross:cross boot/isolinux/isolinux.cfg
+
+sudo chown -R root:root .
+sudo chmod 0775 etc/init/boot
+sudo cp /usr/lib/syslinux/bios/ldlinux.c32 boot/isolinux/.
+sudo cp /usr/lib/syslinux/bios/menu.c32 boot/isolinux/.
+sudo cp /usr/lib/syslinux/bios/libutil.c32 boot/isolinux/.
+sudo cp /usr/lib/syslinux/bios/isolinux.bin boot/isolinux/.
+sudo genisoimage -J -r -o ../arch486-stage4.iso -b boot/isolinux/isolinux.bin \
+	-c boot/isolinux/boot.cat -input-charset UTF-8 -no-emul-boot \
+	-boot-load-size 4 -boot-info-table -joliet-long .
+cd .. || exit 1
+
diff --git a/default.conf b/default.conf
index 54ed5e2..51d7e71 100644
--- a/default.conf
+++ b/default.conf
@@ -72,6 +72,9 @@ STAGE4_PACKAGES=$STAGE4_CHROOT/packages/$TARGET_CPU/
 # where build results are stored for stage 4
 STAGE4_BUILD=$CROSS_HOME/$TARGET_CPU-build-stage4
 
+# where to store the directory which go to the ISO image
+STAGE4_ISOLINUX=$CROSS_HOME/isolinux-stage4
+
 # git repository for PKGBUILD diffs and patches for the
 # i686 architecture
 GIT_URL_ARCHLINUX32_PACKAGES=https://github.com/archlinux32/packages.git
diff --git a/i486-stage4/archiso32-git/DESCR b/i486-stage4/archiso32-git/DESCR
new file mode 100644
index 0000000..f4b336c
--- /dev/null
+++ b/i486-stage4/archiso32-git/DESCR
@@ -0,0 +1,3 @@
+# archiso32-git is a fork of archiso-git (on AUR) and using the archlinux32 archiso fork
+FETCH_METHOD="yaourt"
+
diff --git a/i486-stage4/lynx/DESCR b/i486-stage4/lynx/DESCR
new file mode 100644
index 0000000..e69de29
diff --git a/i486-stage4/zstd/DESCR b/i486-stage4/zstd/DESCR
new file mode 100644
index 0000000..1af1150
--- /dev/null
+++ b/i486-stage4/zstd/DESCR
@@ -0,0 +1,9 @@
+#*** zstd command line interface 32-bits v1.3.4, by Yann Collet ***
+#zstd: error 11 : Allocation error : not enough memory
+#zstd: /*stdin*\: unexpected end of file
+#Files tmp1 and tmp2 differ
+#make[1]: Leaving directory '/build/zstd/src/zstd-1.3.4/tests'
+#make[1]: *** [Makefile:307: zstd-playTests] Error 1
+#make: *** [Makefile:82: shortest] Error 2
+#==> ERROR: A failure occurred in check().
+SKIP_CHECK=1
-- 
cgit v1.2.3-70-g09d2