Round of minor updates

Author: substring

builder.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -x
+INRELEASE="$RELEASE"
 RELEASE=${RELEASE:-dev}
 IMAGE_NAME="groovy-ux-os-${RELEASE}"
 
@@ -12,4 +14,4 @@ echo "+++++++++++++++++++++++++++++"
 echo "+++ Running container     +++"
 echo "+++++++++++++++++++++++++++++"
 #docker run --privileged --tty --name "$IMAGE_NAME" --rm -v "$(pwd)/work/output":/work/output -v "$(pwd)/work/fakeroot":/work/fakeroot "$IMAGE_NAME"
-docker run --privileged --tty --name "$IMAGE_NAME" --rm -v "$(pwd)/work/output":/work/output "$IMAGE_NAME"
+docker run --privileged --tty --name "$IMAGE_NAME" -e RELEASE="$INRELEASE" --rm -v "$(pwd)/work/output":/work/output "$IMAGE_NAME"

groovyarcade/airootfs/etc/mkinitcpio.conf

@@ -28,39 +28,53 @@ FILES=(/usr/lib/firmware/edid/arcade_15_25_31.bin /usr/lib/firmware/edid/arcade_
 # 'filesystems' is _required_ unless you specify your fs modules in MODULES
 # Examples:
 ##   This setup specifies all modules in the MODULES setting above.
-##   No raid, lvm2, or encrypted root is needed.
+##   No RAID, lvm2, or encrypted root is needed.
 #    HOOKS=(base)
 #
 ##   This setup will autodetect all modules for your system and should
 ##   work as a sane default
-#    HOOKS=(base udev autodetect block filesystems)
+#    HOOKS=(base udev autodetect modconf block filesystems fsck)
 #
 ##   This setup will generate a 'full' image which supports most systems.
 ##   No autodetection is done.
-#    HOOKS=(base udev block filesystems)
+#    HOOKS=(base udev modconf block filesystems fsck)
 #
-##   This setup assembles a pata mdadm array with an encrypted root FS.
-##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
-#    HOOKS=(base udev block mdadm encrypt filesystems)
+##   This setup assembles a mdadm array with an encrypted root file system.
+##   Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices.
+#    HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck)
 #
-##   This setup loads an lvm2 volume group on a usb device.
-#    HOOKS=(base udev block lvm2 filesystems)
+##   This setup loads an lvm2 volume group.
+#    HOOKS=(base udev modconf block lvm2 filesystems fsck)
+#
+##   This will create a systemd based initramfs which loads an encrypted root filesystem.
+#    HOOKS=(base systemd autodetect modconf kms keyboard sd-vconsole sd-encrypt block filesystems fsck)
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
-#    usr, fsck and shutdown hooks.
+#    usr and fsck hooks.
 HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt kms block filesystems keyboard plymouth)
 
 # COMPRESSION
-# Use this to compress the initramfs image. By default, gzip compression
-# is used. Use 'cat' to create an uncompressed image.
+# Use this to compress the initramfs image. By default, zstd compression
+# is used for Linux ≥ 5.9 and gzip compression is used for Linux < 5.9.
+# Use 'cat' to create an uncompressed image.
+#COMPRESSION="zstd"
 #COMPRESSION="gzip"
 #COMPRESSION="bzip2"
 #COMPRESSION="lzma"
 #COMPRESSION="xz"
 #COMPRESSION="lzop"
 #COMPRESSION="lz4"
-COMPRESSION="zstd"
 
 # COMPRESSION_OPTIONS
 # Additional options for the compressor
 #COMPRESSION_OPTIONS=()
+
+# MODULES_DECOMPRESS
+# Decompress loadable kernel modules and their firmware during initramfs
+# creation. Switch (yes/no).
+# Enable to allow further decreasing image size when using high compression
+# (e.g. xz -9e or zstd --long --ultra -22) at the expense of increased RAM usage
+# at early boot.
+# Note that any compressed files will be placed in the uncompressed early CPIO
+# to avoid double compression.
+#MODULES_DECOMPRESS="no"

settings

@@ -1,8 +1,9 @@
 #!/bin/bash
-
 # GROOVYARCADE details
 export GA_VERSION=testing
-if [[ ! -z ${CI_COMMIT_TAG} ]] ; then
+if [[ ! -z "$RELEASE" ]] ; then
+  GA_VERSION="$RELEASE"
+elif [[ ! -z ${CI_COMMIT_TAG} ]] ; then
   GA_VERSION=${CI_COMMIT_TAG}
 elif [[ ! -z ${CI_COMMIT_REF_SLUG} && ${CI_COMMIT_REF_SLUG} != "master" ]] ; then
   GA_VERSION=${CI_COMMIT_REF_SLUG}