additionally add LTS kernel

4 files changed, 55 insertions, 0 deletions

diff --git a/grub/grub_void.cfg.in b/grub/grub_void.cfg.in
index 4a199c2..42450be 100644
--- a/grub/grub_void.cfg.in
+++ b/grub/grub_void.cfg.in
@@ -53,4 +53,33 @@ if [ cpuid -l ]; then
                 console=tty0 console=ttyS0,115200n8
         initrd (${voidlive})/boot/initrd
     }
+
+    menuentry "@@BOOT_TITLE@@ @@LTSKVER@@ LTS (@@ARCH@@)" {
+        set gfxpayload="keep"
+        linux (${voidlive})/boot/vmlinuz-lts \
+		root=live:CDLABEL=VOID_LIVE ro init=/sbin/init \
+		rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 gpt add_efi_memmap \
+		vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ \
+		locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@
+        initrd (${voidlive})/boot/initrd-lts
+    }
+    menuentry "@@BOOT_TITLE@@ @@LTSKVER@@ LTS (@@ARCH@@) (RAM)" {
+        set gfxpayload="keep"
+        linux (${voidlive})/boot/vmlinuz-lts \
+		root=live:CDLABEL=VOID_LIVE ro init=/sbin/init \
+		rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 gpt add_efi_memmap \
+		vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ \
+		locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram
+        initrd (${voidlive})/boot/initrd-lts
+    }
+    menuentry "@@BOOT_TITLE@@ @@LTSKVER@@ LTS (@@ARCH@@) (Serial)" {
+        set gfxpayload="keep"
+        linux (${voidlive})/boot/vmlinuz-lts \
+		root=live:CDLABEL=VOID_LIVE ro init=/sbin/init \
+		rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 gpt add_efi_memmap \
+		vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ \
+		locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ \
+                console=tty0 console=ttyS0,115200n8
+        initrd (${voidlive})/boot/initrd-lts
+    }
 fi
diff --git a/hrmpf.packages b/hrmpf.packages
index 2ef9ad6..518e111 100644
--- a/hrmpf.packages
+++ b/hrmpf.packages
@@ -1,3 +1,7 @@
+# lts kernel
+linux-lts
+linux-lts-headers
+
 # diagnosis
 acpi
 atop
diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in
index 671b592..6f1293f 100644
--- a/isolinux/isolinux.cfg.in
+++ b/isolinux/isolinux.cfg.in
@@ -29,6 +29,18 @@ LABEL linuxtext
 MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (Text mode/Serial)
 KERNEL /boot/vmlinuz
 APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ modprobe.blacklist=bochs_drm nomodeset console=tty0 console=ttyS0,115200n8
+LABEL linuxlts
+MENU LABEL @@BOOT_TITLE@@ @@LTSKVER@@ LTS @@ARCH@@
+KERNEL /boot/vmlinuz-lts
+APPEND initrd=/boot/initrd-lts root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@
+LABEL linuxltsram
+MENU LABEL @@BOOT_TITLE@@ @@LTSKVER@@ LTS @@ARCH@@ (RAM)
+KERNEL /boot/vmlinuz-lts
+APPEND initrd=/boot/initrd-lts root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram
+LABEL linuxltstext
+MENU LABEL @@BOOT_TITLE@@ @@LTSKVER@@ LTS @@ARCH@@ (Text mode/Serial)
+KERNEL /boot/vmlinuz-lts
+APPEND initrd=/boot/initrd-lts root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ modprobe.blacklist=bochs_drm nomodeset console=tty0 console=ttyS0,115200n8
 LABEL hdt
 MENU LABEL HDT (Hardware Detection Tool)
 KERNEL hdt.c32
diff --git a/mklive.sh.in b/mklive.sh.in
index c387fa7..e2b601a 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -168,10 +168,14 @@ generate_initramfs() {
         _args="--omit systemd"
     fi
     chroot $ROOTFS env -i /usr/bin/dracut -N --${INITRAMFS_COMPRESSION} \
+        --add-drivers "ahci" --force-add "vmklive" ${_args} "/boot/initrd-lts" $LTSKERNELVERSION
+    chroot $ROOTFS env -i /usr/bin/dracut -N --${INITRAMFS_COMPRESSION} \
         --add-drivers "ahci" --force-add "vmklive" ${_args} "/boot/initrd" $KERNELVERSION
     [ $? -ne 0 ] && die "Failed to generate the initramfs"
 
+    mv $ROOTFS/boot/initrd-lts $BOOT_DIR
     mv $ROOTFS/boot/initrd $BOOT_DIR
+    cp $ROOTFS/boot/vmlinuz-$LTSKERNELVERSION $BOOT_DIR/vmlinuz-lts
     cp $ROOTFS/boot/vmlinuz-$KERNELVERSION $BOOT_DIR/vmlinuz
     if [ "$BOOT_FILES" ]; then
         cp $BOOT_FILES $BOOT_DIR
@@ -207,6 +211,7 @@ generate_isolinux_boot() {
 
     sed -i  -e "s|@@SPLASHIMAGE@@|$(basename ${SPLASH_IMAGE})|" \
         -e "s|@@KERNVER@@|${KERNELVERSION}|" \
+        -e "s|@@LTSKVER@@|${LTSKERNELVERSION}|" \
         -e "s|@@KEYMAP@@|${KEYMAP}|" \
         -e "s|@@ARCH@@|$BASE_ARCH|" \
         -e "s|@@LOCALE@@|${LOCALE}|" \
@@ -220,6 +225,7 @@ generate_grub_efi_boot() {
     cp -f grub/grub_void.cfg.in $GRUB_DIR/grub_void.cfg
     sed -i  -e "s|@@SPLASHIMAGE@@|$(basename ${SPLASH_IMAGE})|" \
         -e "s|@@KERNVER@@|${KERNELVERSION}|" \
+        -e "s|@@LTSKVER@@|${LTSKERNELVERSION}|" \
         -e "s|@@KEYMAP@@|${KEYMAP}|" \
         -e "s|@@ARCH@@|$BASE_ARCH|" \
         -e "s|@@BOOT_TITLE@@|${BOOT_TITLE}|" \
@@ -404,6 +410,10 @@ _linux_series=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITOR
 _kver=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -p pkgver ${_linux_series})
 KERNELVERSION=$($XBPS_UHELPER_CMD getpkgversion ${_kver})
 
+_linux_lts_series=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -x linux-lts|head -1)
+_lts_kver=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -p pkgver ${_linux_lts_series})
+LTSKERNELVERSION=$($XBPS_UHELPER_CMD getpkgversion ${_lts_kver})
+
 : ${OUTPUT_FILE="hrmpf-${BASE_ARCH}-${KERNELVERSION}-$(date +%Y%m%d).iso"}
 
 print_step "Installing software to generate the image: ${REQUIRED_PKGS} ..."