test: initrd in /usr

Pulls in flatcar/bootengine#110

Co-authored-by: James Le Cuirot <[email protected]>
Signed-off-by: Kai Lueke <[email protected]>

Author: pothos

sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild

@@ -7,7 +7,8 @@ EGIT_REPO_URI="https://github.com/flatcar/bootengine.git"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	EGIT_COMMIT="31ba2964ce5e77ae5553eb0a3624afcc7078bb09" # flatcar-master
+	#EGIT_COMMIT="31ba2964ce5e77ae5553eb0a3624afcc7078bb09" # flatcar-master
+	EGIT_BRANCH="kai/initrd-in-usr"
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 
@@ -23,6 +24,7 @@ src_install() {
 	insinto /usr/lib/dracut/modules.d/
 	doins -r dracut/.
 	dosbin update-bootengine
+	dosbin minimal-init
 
 	# must be executable since dracut's install scripts just
 	# re-use existing filesystem permissions during initrd creation.

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.44.ebuild

@@ -26,6 +26,7 @@ DEPEND="
 	coreos-base/coreos-init:=
 	sys-apps/azure-vm-utils[dracut]
 	sys-apps/baselayout
+	sys-apps/busybox
 	sys-apps/coreutils
 	sys-apps/findutils
 	sys-apps/grep
@@ -72,6 +73,16 @@ src_prepare() {
 	use amd64 && config_update "CONFIG_EXTRA_FIRMWARE_DIR=\"${fw_dir}\""
 }
 
+copy_in() {
+  # Simple setup, assume we only have /lib64 to care about
+  cp "${ESYSROOT}"/usr/"$1" ./"$1"
+  for LIBFILE in $(patchelf --print-needed ./"$1"); do
+    if [ ! -e ./lib64/"${LIBFILE}" ]; then
+      copy_in /lib64/"${LIBFILE}"
+    fi
+  done
+}
+
 src_compile() {
 	local BE_ARGS=()
 
@@ -89,6 +100,66 @@ src_compile() {
 
 	tc-export PKG_CONFIG
 	"${ESYSROOT}"/usr/bin/update-bootengine -k "${KV_FULL}" -o "${S}"/build/bootengine.cpio "${BE_ARGS[@]}" || die
+	# Copy full initrd over to /usr as filesystem image
+	mkdir "${S}"/build/bootengine || die
+	pushd "${S}"/build/bootengine || die
+	sudo lsinitrd --unpack "${S}"/build/bootengine.cpio || die
+	sudo mksquashfs . "${S}"/build/bootengine.img -noappend -xattrs-exclude ^btrfs. || die
+	popd || die
+	# Create minimal initrd
+	microcode=$(cpio -t < "${S}"/build/bootengine.cpio 2>&1 > /dev/null | cut -d " " -f 1)
+	# Only keep early cpio for microcode
+	truncate -s $((microcode*512)) "${S}"/build/bootengine.cpio || die
+	# Debug: List contents after truncation
+	cpio -t < "${S}"/build/bootengine.cpio
+	mkdir "${S}"/build/minimal || die
+	pushd "${S}"/build/minimal || die
+	mkdir -p {etc,bin,sbin,dev,proc,sys,dev,lib,lib64,usr/bin,usr/sbin,usr/lib,usr/lib64,realinit,sysusr/usr}
+	mkdir -p lib/modules/"${KV_FULL}"/
+	cp "${ESYSROOT}"/usr/lib/modules/"${KV_FULL}"/modules.* lib/modules/"${KV_FULL}"/
+	mkdir -p lib/modprobe.d/
+	cp "${ROOTFS}"/lib/modprobe.d/* lib/modprobe.d/
+	# TODO: the hard part: what to include (networking is out of scope)
+	MODULES=("fs/overlayfs" "fs/squashfs" "drivers/block/loop.ko.xz" "fs/btrfs" "drivers/nvme" "drivers/scsi" "drivers/ata" "drivers/block" "drivers/char/virtio_console.ko.xz" "drivers/hv" "drivers/input/serio" "drivers/mmc" "drivers/usb" "drivers/hid")
+	for MODULE in "${MODULES[@]}"; do
+		if [ -f "${ESYSROOT}"/usr/lib/modules/"${KV_FULL}"/kernel/"${MODULE}" ]; then
+			MODULE_DIR=$(dirname "${MODULE}")
+			mkdir -p lib/modules/"${KV_FULL}"/kernel/"${MODULE_DIR}"
+			cp "${ESYSROOT}"/usr/lib/modules/"${KV_FULL}"/kernel/"${MODULE}" lib/modules/"${KV_FULL}"/kernel/"${MODULE}"
+		elif [ -d "${ESYSROOT}"/usr/lib/modules/"${KV_FULL}"/kernel/"${MODULE}" ]; then
+			mkdir -p lib/modules/"${KV_FULL}"/kernel/"${MODULE}"
+			cp -r "${ESYSROOT}"/usr/lib/modules/"${KV_FULL}"/kernel/"${MODULE}"/* lib/modules/"${KV_FULL}"/kernel/"${MODULE}"/
+		else
+			die "wrong module type/not found: ${ESYSROOT}"/usr/lib/modules/"${KV_FULL}"/kernel/"${MODULE}"
+		fi
+	done
+	for MODULE in $(find ./lib/modules/"${KV_FULL}"/ -type f); do
+		MODULE=$(basename "${MODULE}" | sed "s/\.ko\.xz$//")
+		for DEP in $(modprobe -S "${KV_FULL}" -d "${ESYSROOT}" -D "${MODULE}" | grep "^insmod " | sed "s/^insmod //"); do
+			DEP=$(echo "${DEP}" | sed "s,${ESYSROOT},/,")
+			DEP_DIR=$(dirname "${DEP}")
+			mkdir -p ./"${DEP_DIR}"
+			cp "${ESYSROOT}"/"${DEP}" ./"${DEP}"
+		done
+	done
+	echo '$MODALIAS=.*	0:0 660 @/sbin/modprobe "$MODALIAS"' > ./etc/mdev.conf
+	copy_in /bin/veritysetup
+	copy_in /bin/busybox
+	# We can't use busybox's modprobe because it doesn't support the globs in module.alias, breaking module loading
+	copy_in /sbin/kmod
+	ln -s /sbin/kmod ./sbin/modprobe
+	cp -a "${ESYSROOT}"/usr/bin/minimal-init ./init
+	# Make it easier to debug by not relying too much on the first commands
+	ln -s /bin/busybox ./bin/sh
+	mknod ./dev/console c 5 1
+	mknod ./dev/null c 1 3
+	mknod ./dev/tty c 5 0
+	mknod ./dev/urandom c 1 9
+	mknod ./dev/random c 1 8
+	mknod ./dev/zero c 1 5
+	# No compression because CONFIG_INITRAMFS_COMPRESSION_XZ should take care of it
+	find . -print0 | cpio --null --create --verbose --format=newc >> "${S}"/build/bootengine.cpio
+	popd || die
 	kmake "$(kernel_target)"
 
 	# sanity check :)
@@ -111,4 +182,7 @@ src_install() {
 	# For easy access to vdso debug symbols in gdb:
 	#   set debug-file-directory /usr/lib/debug/usr/lib/modules/${KV_FULL}/vdso/
 	kmake INSTALL_MOD_PATH="${ED}/usr/lib/debug/usr" vdso_install
+
+	insinto "/usr/lib/flatcar"
+	doins build/bootengine.img
 }

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.12.44.ebuild

@@ -43,4 +43,5 @@ UNIPATCH_LIST="
 	${PATCH_DIR}/z0006-mtd-disable-slram-and-phram-when-locked-down.patch \
 	${PATCH_DIR}/z0007-arm64-add-kernel-config-option-to-lock-down-when.patch \
 	${PATCH_DIR}/z0008-tools-hv-fix-cross-compilation-for-ARM64.patch \
+	${PATCH_DIR}/z0009-block-add-partition-uuid-into-uevent.patch \
 "

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.12/z0009-block-add-partition-uuid-into-uevent.patch

@@ -0,0 +1,36 @@
+From 758737d86f8a2d74c0fa9f8b2523fa7fd1e0d0aa Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <[email protected]>
+Date: Fri, 4 Oct 2024 17:13:43 -0700
+Subject: [PATCH] block: add partition uuid into uevent as "PARTUUID"
+
+Both most common formats have uuid in addition to partition name:
+GPT: standard uuid xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+DOS: 4 byte disk signature and 1 byte partition xxxxxxxx-xx
+
+Tools from util-linux use the same notation for them.
+
+Signed-off-by: Konstantin Khlebnikov <[email protected]>
+Reviewed-by: Kyle Fortin <[email protected]>
+[dianders: rebased to modern kernels]
+Signed-off-by: Douglas Anderson <[email protected]>
+Signed-off-by: Douglas Anderson <[email protected]>
+Reviewed-by: Christoph Hellwig <[email protected]>
+Link: https://lore.kernel.org/r/20241004171340.v2.1.I938c91d10e454e841fdf5d64499a8ae8514dc004@changeid
+Signed-off-by: Jens Axboe <[email protected]>
+---
+ block/partitions/core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/block/partitions/core.c b/block/partitions/core.c
+index cdad05f9764768..815ed33caa1b86 100644
+--- a/block/partitions/core.c
++++ b/block/partitions/core.c
+@@ -256,6 +256,8 @@ static int part_uevent(const struct device *dev, struct kobj_uevent_env *env)
+ 	add_uevent_var(env, "PARTN=%u", bdev_partno(part));
+ 	if (part->bd_meta_info && part->bd_meta_info->volname[0])
+ 		add_uevent_var(env, "PARTNAME=%s", part->bd_meta_info->volname);
++	if (part->bd_meta_info && part->bd_meta_info->uuid[0])
++		add_uevent_var(env, "PARTUUID=%s", part->bd_meta_info->uuid);
+ 	return 0;
+ }
+