Make some "different" packages

This splits things into two source packages: dracut-nmbl, which contains
the dracut plugin, and nmbl-builder, which expect dracut-nmbl to be
installed in the buildroot.

The second package makes three different[0] nmbl UKIs, one "monolith",
which is what we've been building, one "cloud", and one "workstation".

It also deletes 10_linux because we haven't been using it.

Right now I have to build it like `make OS_DIST=.fc38 OS_VERSION=38 KVRA=6.2.9-300.fc38.x86_64 nmbl-6.2.9-300.fc38.x86_64.rpm`,
but that wouldn't be true if my /etc/os-release and the kernel version
in the dnf repo matched better.

[0] These aren't actually different yet.

Signed-off-by: Peter Jones <[email protected]>

Author: vathpela

.gitignore

@@ -1,15 +1,12 @@
 *~
 *.rpm
+*.spec
 *.sw?
 *.tar
 *.tar.?z
 /build.log
 /hw_info.log
 /installed_pkgs.log
-/nmbl*/
-/nmbl.initramfs.img
-/nmbl-builder.spec
-/nmbl.uki
 /root.log
 /state.log
 /temp/

99grub2-emu/grub2-emu.service

@@ -0,0 +1,14 @@
+# Start GRUB emu
+#
+
+[Unit]
+Description=Start GRUB emu
+DefaultDependencies=no
+After=grub2-emu.target sysroot.mount systemd-vconsole-setup.service
+Conflicts=shutdown.target emergency.target
+
+[Service]
+ExecStart=-/bin/grub2-emu --kexec
+ExecStop=-/sbin/reboot
+StandardInput=tty
+StandardOutput=tty

99grub2-emu/grub2-emu.target

@@ -0,0 +1,17 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Start GRUB emulator
+Documentation=man:grub-emu(1)
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
+ConditionPathExists=/etc/initrd-release
+Requires=basic.target
+Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-parse-etc.service
+After=initrd-root-fs.target initrd-root-device.target initrd-fs.target basic.target rescue.service rescue.target
+AllowIsolate=yes

99grub2-emu/grub2-mount-boot.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/bash
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+boot=$(getarg boot=)
+case "$boot" in
+    LABEL=*)
+        boot="$(echo $boot | sed 's,/,\\x2f,g')"
+        boot="block:/dev/disk/by-label/${boot#LABEL=}"
+        ;;
+    UUID=*)
+        boot="/dev/disk/by-uuid/${boot#UUID=}"
+        ;;
+    PARTUUID=*)
+        boot="/dev/disk/by-partuuid/${boot#PARTUUID=}"
+        ;;
+    PARTLABEL=*)
+        boot="/dev/disk/by-partlabel/${boot#PARTLABEL=}"
+        ;;
+    /dev/*)
+        ;;
+    *)
+        die "You have to specify boot=<boot device> as a boot option for grub2-emu"
+        ;;
+esac
+
+if ! [ -e "$boot" ]; then
+    udevadm trigger --action=add >/dev/null 2>&1
+    [ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
+    i=0
+    while ! [ -e $boot ]; do
+        if [ $UDEVVERSION -ge 143 ]; then
+            udevadm settle --exit-if-exists=$boot
+        else
+            udevadm settle --timeout=30
+        fi
+        [ -e $boot ] && break
+        sleep 0.5
+        i=$(($i+1))
+        [ $i -gt 40 ] && break
+    done
+fi
+
+[ -e "$boot" ] || return 1
+
+# This doesn't handle /boot being the same fs as /
+[ -d "/boot" ] || mkdir -p -m 0755 "/boot"
+info "Mounting $boot as /boot"
+mount "$boot" /boot || return 1
+
+exit 0

99grub2-emu/module-setup.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/bash
+
+check() {
+    if ! dracut_module_included "systemd-initrd"; then
+        derror "grub2-emu needs systemd-initrd in the initramfs"
+        return 1
+    fi
+
+    return 0
+}
+
+depends() {
+    echo "systemd-initrd"
+    return 0
+}
+
+install() {
+    local _dir
+    inst_binary grub2-emu
+    inst_hook pre-mount 01 "${moddir}/grub2-mount-boot.sh"
+
+    for i in \
+        grub2-emu.service \
+        grub2-emu.target \
+        ; do
+        inst_simple "${moddir}/${i}" "${systemdsystemunitdir}/${i}"
+    done
+
+    # Running here is too early, but we also need dracut-mount to not run
+    ln_r "/dev/null" "${systemdsystemunitdir}/dracut-mount.service"
+
+    mkdir -p "${initdir}${systemdsystemunitdir}/grub2-emu.target.wants"
+    for i in \
+        dracut-cmdline.service \
+        dracut-initqueue.service \
+        dracut-pre-mount.service \
+        dracut-pre-trigger.service \
+        dracut-pre-udev.service \
+        ; do
+        ln_r "${systemdsystemunitdir}/${i}" "${systemdsystemunitdir}/grub2-emu.target.wants/${i}"
+    done
+
+    # For now, we override initrd-switch-root, which we don't want to
+    # run.  It would be nicer if we were the default target instead.
+    ln_r "${systemdsystemunitdir}/grub2-emu.service" "${systemdsystemunitdir}/initrd-switch-root.service"
+    # ln_r "${systemdsystemunitdir}/grub2-emu.target" "${systemdsystemunitdir}/default.target"
+}

Makefile

@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: GPLv3
+#
+# Makefile
+# Copyright Peter Jones <[email protected]>
+#
+
+TOPDIR ?= .
+DESTDIR ?= temp
+VERSION ?= 0
+
+include $(TOPDIR)/utils.mk
+
+all:
+
+install :
+	install -m 0755 -d "$(DESTDIR)/usr/lib/dracut/modules.d/99grub2-emu"
+	install -m 0644 -t "$(DESTDIR)/usr/lib/dracut/modules.d/99grub2-emu" $(wildcard 99grub2-emu/*)
+	install -m 0755 -d "$(DESTDIR)/etc/dracut.conf.d"
+	install -m 0644 -t "$(DESTDIR)/etc/dracut.conf.d" etc/dracut.conf.d/grub2-emu.conf
+
+dracut-nmbl-$(VERSION).tar.xz : Makefile
+	@git archive --format=tar --prefix=dracut-nmbl-$(VERSION)/ HEAD -- \
+		99grub2-emu/ \
+		etc/ \
+		Makefile \
+	| xz > $@
+
+tarball : dracut-nmbl-$(VERSION).tar.xz
+
+clean :
+	@rm -vf dracut-nmbl-$(VERSION).tar.xz
+
+.PHONY: all install clean tarball
+
+# vim:ft=make

dracut-nmbl.spec.in

@@ -0,0 +1,40 @@
+%global debug_package %{nil}
+%global kver %{expand:%(rpm -q kernel-core --qf '%%{VERSION}' | tail -n 1)}
+%global krel %{expand:%(rpm -q kernel-core --qf '%%{RELEASE}' | tail -n 1)}
+
+Summary: nmbl proof of concept as a dracut module
+Name: dracut-nmbl
+BuildArch: noarch
+Version: @@VERSION@@
+Release: @@RELEASE@@%{?dist}
+Group: System Environment/Base
+License: GPLv3
+URL: https://github.com/rhboot/nmbl-poc
+
+BuildRequires: git
+BuildRequires: make
+
+Source0: dracut-nmbl-%{version}.tar.xz
+
+%description
+nmbl-poc is a proof of concept for a bootloader for UEFI machines based on
+the linux kernel and grub-emu, using either switchroot or kexec.
+
+%prep
+%autosetup -S git_am
+
+%build
+make all
+
+%install
+%make_install
+
+%files
+%defattr(-,root,root,-)
+%{_sysconfdir}/dracut.conf.d/grub2-emu.conf
+%dir /usr/lib/dracut/modules.d/99grub2-emu
+/usr/lib/dracut/modules.d/99grub2-emu/*
+
+%changelog
+* Fri Mar 17 2023 Peter Jones <[email protected]> - 0-0
+- Yeet a spec file into the world

etc/dracut.conf.d/grub2-emu.conf

@@ -0,0 +1 @@
+omit_dracutmodules+=" grub2-emu "

utils.mk

@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: GPLv3
+#
+# utils.mk - make utilities
+# Copyright Peter Jones <[email protected]>
+#
+
+VERSION = 0
+RELEASE = 1
+
+DESTDIR := temp
+DATE=$(shell date "+%Y%m%d")
+ESPDIR := /boot/efi/EFI/BOOT
+KVRA := $(shell rpm -q kernel-core --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' | tail -n 1)
+ARCH := $(shell rpm --eval '%{_build_arch}')
+EFI_ARCH := $(shell rpm --eval '%{efi_arch}')
+OS_NAME := $(shell grep '^ID=' /etc/os-release | sed 's/ID=//')
+OS_VERSION := $(shell grep '^VERSION_ID=' /etc/os-release | sed 's/VERSION_ID=//')
+OS_DIST := $(shell rpm --eval '%{dist}')
+VR := $(VERSION)-$(RELEASE)$(OS_DIST)
+
+ifeq ($(.DEFAULT_GOAL),)
+.DEFAULT_GOAL := all
+endif
+
+RPMBUILD_ARGS := -D "_topdir $(TOPDIR)" \
+		 -D '_builddir %{_topdir}' \
+		 -D '_rpmdir %{_topdir}' \
+		 -D '_sourcedir %{_topdir}' \
+		 -D '_specdir %{_topdir}' \
+		 -D '_srcrpmdir %{_topdir}' \
+		 -D 'dist $(OS_DIST)'
+
+.EXPORT_ALL_VARIABLES:
+
+% : %.in
+	@sed \
+		-e 's,@@VERSION@@,$(VERSION),g' \
+		-e 's,@@RELEASE@@,$(RELEASE),g' \
+		$< > $@
+
+# vim:ft=make