Changes that allow nmbl to be built in copr on all fedoras

Makefile

@@ -24,13 +24,25 @@ nmbl-%.uki : %.initramfs.img
                 "/boot/vmlinuz-$(KVRA)" \
                 "$*.initramfs.img"
 
+nmbl-$(KVRA).rpm :
+	mock -r "$(MOCK_ROOT_NAME)" --install dracut-nmbl-$(VR).noarch.rpm --cache-alterations --no-cleanup-after
+	mock -r "$(MOCK_ROOT_NAME)" --installdeps nmbl-builder-$(VR).src.rpm --cache-alterations --no-clean --no-cleanup-after
+	mock -r "$(MOCK_ROOT_NAME)" --rebuild nmbl-builder-$(VR).src.rpm --no-clean
+
+rpm: nmbl-$(KVRA).rpm
+
+nmbl-builder-$(VERSION).tar.xz : Makefile
+	git archive --format=tar --prefix=nmbl-builder-$(VERSION)/ --add-file utils.mk HEAD | xz > $@
+
+nmbl-builder: nmbl-builder-$(VR).src.rpm
+
+nmbl-builder-$(VR).src.rpm : nmbl-builder.spec nmbl-builder-$(VERSION).tar.xz
+	rpmbuild $(RPMBUILD_ARGS) -bs $<
+
 install : $(TARGETS)
 	install -m 0700 -d "$(DESTDIR)$(ESPDIR)"
 	install -m 0600 -t "$(DESTDIR)$(ESPDIR)" $(TARGETS)
 
-nmbl-builder-$(VERSION).tar.xz : Makefile
-	git archive --format=tar --prefix=nmbl-builder-$(VERSION)/ --add-file ../utils.mk HEAD | xz > $@
-
 tarball : nmbl-builder-$(VERSION).tar.xz
 
 clean :

cloud.conf.d/grub2-emu.conf

@@ -1 +1 @@
-dracutmodules+=" bash systemd warpclock systemd-networkd rescue watchdog i18n network-legacy network ifcfg btrfs dm kernel-modules kernel-network-modules lvm qemu qemu-net debug rootfs-block ssh-client terminfo udev-rules virtfs dracut-systemd syslog usrmount base fs-lib grub2-emu-switchroot shutdown uefi-lib "
+dracutmodules+=" bash systemd warpclock rescue watchdog i18n btrfs dm kernel-modules kernel-network-modules lvm qemu qemu-net debug rootfs-block terminfo udev-rules virtfs dracut-systemd syslog usrmount base fs-lib grub2-emu-switchroot shutdown uefi-lib "

megalith.conf.d/grub2-emu.conf

@@ -1 +1 @@
-dracutmodules+=" bash systemd warpclock systemd-initrd systemd-networkd rescue watchdog i18n network-legacy network ifcfg btrfs dm kernel-modules kernel-network-modules lvm qemu qemu-net debug rootfs-block ssh-client terminfo udev-rules virtfs dracut-systemd syslog usrmount base fs-lib grub2-emu-kexec shutdown uefi-lib "
+dracutmodules+=" bash systemd warpclock systemd-initrd rescue watchdog i18n btrfs dm kernel-modules kernel-network-modules lvm qemu qemu-net debug rootfs-block terminfo udev-rules virtfs dracut-systemd syslog usrmount base fs-lib grub2-emu-kexec shutdown uefi-lib "

nmbl-builder.spec.in

@@ -1,6 +1,6 @@
 %global debug_package %{nil}
-%global kver %{expand:%(rpm -q kernel-core --qf '%%{VERSION}\\n' | tail -n 1 )}
-%global krel %{expand:%(rpm -q kernel-core --qf '%%{RELEASE}\\n' | tail -n 1 )}
+%global kver %(kver=$(ls -1 /usr/lib/modules/ | head -1 | cut -d'-' -f1); test -n "$kver" && echo "$kver" || echo 666)
+%global krel %(krel=$(ls -1 /usr/lib/modules/ | head -1 | cut -d'-' -f2 | cut -d'.' -f1-2); test -n "$krel" && echo "$krel" || echo 999)
 
 Summary: nmbl proof of concept as a package
 Name: nmbl-builder
@@ -12,7 +12,13 @@ URL: https:/github.com/rhboot/nmbl-poc
 
 BuildRequires: binutils
 BuildRequires: btrfs-progs
+%if 0%{?rhel} < 10
 BuildRequires: dhcp-client
+BuildRequires: systemd-networkd
+%else
+BuildRequires: kea
+BuildRequires: NetworkManager
+%endif
 BuildRequires: dracut
 BuildRequires: dracut-nmbl
 BuildRequires: dracut-network
@@ -32,7 +38,6 @@ BuildRequires: make
 BuildRequires: openssh-clients
 BuildRequires: pesign
 BuildRequires: systemd-boot
-BuildRequires: systemd-networkd
 BuildRequires: systemd-ukify
 
 Source0: nmbl-builder-%{VERSION}.tar.xz 

utils.mk

@@ -28,7 +28,7 @@ RPMBUILD_ARGS := -D "_topdir $(TOPDIR)" \
 		 -D '_sourcedir %{_topdir}' \
 		 -D '_specdir %{_topdir}' \
 		 -D '_srcrpmdir %{_topdir}' \
-		 -D 'dist $(OS_DIST)'
+		 -D 'dist %nil'
 
 .EXPORT_ALL_VARIABLES:
 

workstation.conf.d/grub2-emu.conf

@@ -1 +1 @@
-dracutmodules+=" bash systemd warpclock systemd-initrd rescue watchdog i18n btrfs dm kernel-modules lvm qemu qemu-net debug rootfs-block ssh-client terminfo udev-rules virtfs dracut-systemd syslog usrmount base fs-lib grub2-emu-kexec shutdown uefi-lib "
+dracutmodules+=" bash systemd warpclock systemd-initrd rescue watchdog i18n btrfs dm kernel-modules kernel-network-modules lvm qemu qemu-net debug rootfs-block terminfo udev-rules virtfs dracut-systemd syslog usrmount base fs-lib grub2-emu-kexec shutdown uefi-lib "