Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-04-07 10:23:59 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-04-07 10:23:59 +0200
commitfc2db8469ca6b6061353cae1fd772212b7470ae4 (patch)
treea02e91d800953235f4560fb09d324ef8a5c0f088
parent7e7563260466838d4003f376d38a7bce819dcf7e (diff)
building standard ISO for systems with more than 256 MB of RAM
fixed systemd-sysvcompat and manpages for systemd package in stage4 added dhcp
-rwxr-xr-xbuild_stage4.sh3
-rwxr-xr-xcreate_stage4_cdrom.sh22
-rw-r--r--i486-stage4/systemd/DESCR7
3 files changed, 8 insertions, 24 deletions
diff --git a/build_stage4.sh b/build_stage4.sh
index 50231c9..d67ced0 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -84,9 +84,10 @@ zip nspr gyp
arch-install-scripts
lynx dosfstools gtest zstd btrfs-progs squashfs-tools
libburn libisofs libisoburn
-haveged intel-ucode memtest86+ zsh dhclient
+haveged intel-ucode memtest86+ zsh dhcp
perl-file-slurp gnu-efi-libs sbsigntools efitools
archiso32-git
+asp32
"
# nss still fails as in stage 3
diff --git a/create_stage4_cdrom.sh b/create_stage4_cdrom.sh
index 4e599cd..e773c1e 100755
--- a/create_stage4_cdrom.sh
+++ b/create_stage4_cdrom.sh
@@ -3,28 +3,16 @@
# shellcheck source=./default.conf
. "./default.conf"
-# build the standard Archlinux 32 ISO with stage 4 packages, Check
-# if it works as NBD block device after bootig via (i)PXE and TFTP.
-# For machine with little RAM, no CD-ROM drive or just a 1.44MB floppy.
-# (requires 64 MB minimal currently)
+# 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
-
-# TODO: change to ISOLINUX dir
-
-DOLLAR='\$'
-ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -l -c "'
- cat >/etc/pacman.d/mirrorlist32 <<EOF
-Server = http://archlinux32.andreasbaumann.cc/${DOLLAR}arch/${DOLLAR}repo
-EOF
-'"
-
-exit 0
-
-
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
diff --git a/i486-stage4/systemd/DESCR b/i486-stage4/systemd/DESCR
index d78a0a3..712a0f7 100644
--- a/i486-stage4/systemd/DESCR
+++ b/i486-stage4/systemd/DESCR
@@ -2,14 +2,9 @@
# automatically, sort of counteracts the idea of security..
sed -i 's/\(_validate_tag || return\)/#\1/' PKGBUILD
-# no documentation
+# no documentation (at least nothing but manpages)
sed -i '/makedepends=/,/)/ s/docbook-xsl//' PKGBUILD
-sed -i '/makedepends=/,/)/ s/libxslt//' PKGBUILD
sed -i '/makedepends=/,/)/ s/python-lxml//' PKGBUILD
-sed -i 's/\(rm.*man8\)/#\1/' PKGBUILD
-
-# we don't need systemd-sysvcompat
-#sed -i "/pkgname=/,/)/ s/'systemd-sysvcompat'//" PKGBUILD
# break cyclic dependency with cryptsetup and dbus
#sed -i '/makedepends=/,/)/ s/cryptsetup//' PKGBUILD