git » mk-desktop-image.git » commit e6139f3

zstd for untested/xz for release, armlfs kernels, always enable serial, couple of pkg

author Urja (ARMLFS builder)
2024-07-31 12:15:31 UTC
committer Urja (ARMLFS builder)
2024-07-31 12:15:31 UTC
parent 23b29f683ca6a94d9f9f48d20e2b95f56e4f4e6b
zstd for untested/xz for release, armlfs kernels, always enable serial, couple of pkg
extlinux.conf +1 -1
make.sh +17 -5
packages.txt +4 -3
pacman.conf +0 -4 
diff --git a/extlinux.conf b/extlinux.conf
index a24583c..aaf77b9 100644
--- a/extlinux.conf
+++ b/extlinux.conf
@@ -3,5 +3,5 @@ timeout 15
 
 label ARMLFS
 	kernel /boot/zImage
-	append console=tty0 init=/sbin/init root=PARTUUID=%PARTUUID% rootwait rw noinitrd
+	append console=ttyS2,115200n8 console=tty0 init=/sbin/init root=PARTUUID=%PARTUUID% rootwait rw noinitrd
 	fdtdir /boot/dtbs
diff --git a/make.sh b/make.sh
index 2cce2c4..bc4406b 100755
--- a/make.sh
+++ b/make.sh
@@ -20,12 +20,17 @@ if [ "$1" == "--untested" ]; then
 	DEBUGINFO_URL=https://a64box.urja.dev/armlfs-debuginfo
 	DEVMODE=1
 	IMGNAME=untested-armlfs
+	COMPFMT=zstd
+	COMPEXT=zst
 else
 	PKG_FS=/mnt/nfs/pkg
 	PKG_URL=https://armlfs.urja.dev/pkg
 	DEBUGINFO_URL=https://armlfs.urja.dev/debuginfo
 	IMGNAME=armlfs-kde5
+	COMPFMT=xz
+	COMPEXT=xz
 fi
+echo "Making $IMGNAME (-base and -showcase) (tar and img) .$COMPEXT"
 
 rm -f $BSN.img{,.zst,.xz}
 truncate -s 15G $BSN.img
@@ -62,7 +67,6 @@ pacman --config $CFG -S --noconfirm  --noscriptlet -b $BS/var/lib/pacman -r $BS
 mkdir -p $BS/usr/share/backgrounds/armlfs/
 cp greeter_bg.jpg $BS/usr/share/backgrounds/armlfs/greeter.jpg
 
-
 # Extlinux configuration
 FS_UUID=$(uuidgen)
 FS_UUID=${FS_UUID^^}
@@ -90,6 +94,14 @@ if grep -q "google,veyron" /proc/device-tree/compatible 2>/dev/null; then
 fi
 EOF
 
+# systemd-coredump
+if [ -z "$DEVMODE" ]; then
+	cat >> etc/systemd/coredump.conf << "EOF"
+Storage=none
+ProcessSizeMax=0
+EOF
+fi
+
 run_in_chroot() {
 mount -t proc proc proc
 mount -t sysfs sys sys
@@ -131,9 +143,9 @@ cp $BSN.img $BSN-stage2-bak.img
 mount $LOOP -t ext4 $BS
 
 tarball_and_image() {
-rm -f $1.tar.xz
+rm -f $1.tar.$COMPEXT
 echo "Tarballing up the system..."
-time tar --xattrs --acls --xz -C $BS -cf $1.tar.xz .
+time tar --xattrs --acls --$COMPFMT -C $BS -cf $1.tar.$COMPEXT .
 echo "Creating the microSD disk image..."
 
 # Adding the repart configuration
@@ -174,8 +186,8 @@ cgpt add -i 1 -t kernel -b 8192 -s 32768 -l Kernel -S 1 -T 5 -P 10 $BSN.img
 cgpt add -i 2 -t data -b 40960 -s $SZ_PART -l Root -u ${FS_UUID} $BSN.img
 cgpt show $BSN.img
 echo Image done - compressing
-xz -5 -v $BSN.img
-mv $BSN.img.xz $1.img.xz
+$COMPFMT -5 -v $BSN.img
+mv $BSN.img.$COMPEXT $1.img.$COMPEXT
 echo Done $1
 return 0
 }
diff --git a/packages.txt b/packages.txt
index 256bf34..669725d 100644
--- a/packages.txt
+++ b/packages.txt
@@ -61,8 +61,8 @@ thunar
 feh
 greetd-regreet
 iotop-c
-linux-c201
-linux-c201-chromebook
+linux-armlfs
+linux-armlfs-chromebook
 xdg-utils
 mosh
 plasma-meta
@@ -77,4 +77,5 @@ ark
 spectacle
 armlfs-kde-skel
 usbutils
-
+linux-firmware
+which
diff --git a/pacman.conf b/pacman.conf
index a5d6ca2..def0924 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -73,10 +73,6 @@ LocalFileSigLevel = Optional
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 
-[kbbpkgs]
-SigLevel = Optional
-Server = https://a64box.urja.dev/kbbpkgs/$arch
-
 [kde5]
 Server = @URL@/$arch/kde5