From 3f50e5118ae4652804e4505f1d63e673624c39ed Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 14:33:30 +0100 Subject: [PATCH 01/17] add src rpm to Makefile --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index dfa227d..956539d 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,11 @@ install : $(TARGETS) 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 $< + tarball : nmbl-builder-$(VERSION).tar.xz clean : From 28a1a23e25e2c49175b6cf1d364ecd800e8e9c35 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 14:50:47 +0100 Subject: [PATCH 02/17] tab not spaces --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 956539d..1d65d59 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ nmbl-builder-$(VERSION).tar.xz : Makefile nmbl-builder: nmbl-builder-$(VR).src.rpm nmbl-builder-$(VR).src.rpm : nmbl-builder.spec nmbl-builder-$(VERSION).tar.xz - rpmbuild $(RPMBUILD_ARGS) -bs $< + rpmbuild $(RPMBUILD_ARGS) -bs $< tarball : nmbl-builder-$(VERSION).tar.xz From 57b8714d1f1cf44df04de7639b0747094d1051be Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 14:56:58 +0100 Subject: [PATCH 03/17] more small fixes --- Makefile | 2 +- utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1d65d59..f934a20 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ install : $(TARGETS) 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 > $@ + git archive --format=tar --prefix=nmbl-builder-$(VERSION)/ --add-file utils.mk HEAD | xz > $@ nmbl-builder: nmbl-builder-$(VR).src.rpm diff --git a/utils.mk b/utils.mk index add430e..bd7b54b 100644 --- a/utils.mk +++ b/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: From 17f20021c61ce2703d7e907ea5359e38e52201d6 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 15:17:41 +0100 Subject: [PATCH 04/17] more changes --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f934a20..3f1fe9a 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,12 @@ nmbl-%.uki : %.initramfs.img "/boot/vmlinuz-$(KVRA)" \ "$*.initramfs.img" -install : $(TARGETS) - install -m 0700 -d "$(DESTDIR)$(ESPDIR)" - install -m 0600 -t "$(DESTDIR)$(ESPDIR)" $(TARGETS) +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 > $@ @@ -36,6 +39,10 @@ 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) + tarball : nmbl-builder-$(VERSION).tar.xz clean : From ce7be6b5737ee17df71a99f8a3740a3b69a9b46a Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 15:28:04 +0100 Subject: [PATCH 05/17] remove or add kernel-core --- nmbl-builder.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index 1620935..60df47a 100644 --- a/nmbl-builder.spec.in +++ b/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 %{expand:%(ls -1 /lib/modules | tail -n1 | cut -d'-' -f1)} +%global krel %{expand:%(ls -1 /lib/modules | tail -n1 | cut -d'-' -f2 | cut -d'.' -f1)} Summary: nmbl proof of concept as a package Name: nmbl-builder From ac8dd487335d9a75ada69b079d4b8cf2dd1a0a2a Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 15:56:15 +0100 Subject: [PATCH 06/17] need version for nmbl --- nmbl-builder.spec.in | 6 ++---- utils.mk | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index 60df47a..31bdc34 100644 --- a/nmbl-builder.spec.in +++ b/nmbl-builder.spec.in @@ -1,6 +1,4 @@ %global debug_package %{nil} -%global kver %{expand:%(ls -1 /lib/modules | tail -n1 | cut -d'-' -f1)} -%global krel %{expand:%(ls -1 /lib/modules | tail -n1 | cut -d'-' -f2 | cut -d'.' -f1)} Summary: nmbl proof of concept as a package Name: nmbl-builder @@ -43,8 +41,8 @@ the linux kernel and grub-emu, using either switchroot or kexec. %package -n nmbl Summary: nmbl proof of concept as a package -Version: %{kver} -Release: %{krel} +Version: @@KVER@@ +Release: @@KREL@@ %description -n nmbl nmbl-poc is a proof of concept for a bootloader for UEFI machines based on diff --git a/utils.mk b/utils.mk index bd7b54b..793162e 100644 --- a/utils.mk +++ b/utils.mk @@ -17,6 +17,8 @@ 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) +KVER := $(ls -1 /lib/modules | tail -n1 | cut -d'-' -f1) +KREL := $(ls -1 /lib/modules | tail -n1 | cut -d'-' -f2 | cut -d'.' -f1) ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL := all @@ -36,6 +38,8 @@ RPMBUILD_ARGS := -D "_topdir $(TOPDIR)" \ @sed \ -e 's,@@VERSION@@,$(VERSION),g' \ -e 's,@@RELEASE@@,$(RELEASE),g' \ + -e 's,@@KVER@@,$(KVER),g' \ + -e 's,@@KREL@@,$(KREL),g' \ $< > $@ # vim:ft=make From 4d0a4f89bfab55b6619d62689cbcb4b703a16fb0 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 16:03:16 +0100 Subject: [PATCH 07/17] running out of ideas --- utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.mk b/utils.mk index 793162e..e26ab7b 100644 --- a/utils.mk +++ b/utils.mk @@ -17,8 +17,8 @@ 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) -KVER := $(ls -1 /lib/modules | tail -n1 | cut -d'-' -f1) -KREL := $(ls -1 /lib/modules | tail -n1 | cut -d'-' -f2 | cut -d'.' -f1) +KVER := $(rpm -q kernel-core --qf '%%{VERSION}' | tail -n 1) +KREL := $(rpm -q kernel-core --qf '%%{RELEASE}' | tail -n 1) ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL := all From d6abd3141491e554f92155618dec254f6aa32755 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 16:24:40 +0100 Subject: [PATCH 08/17] another try using uname --- utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.mk b/utils.mk index e26ab7b..caba849 100644 --- a/utils.mk +++ b/utils.mk @@ -17,8 +17,8 @@ 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) -KVER := $(rpm -q kernel-core --qf '%%{VERSION}' | tail -n 1) -KREL := $(rpm -q kernel-core --qf '%%{RELEASE}' | tail -n 1) +KVER := $(uname -r | rev | cut -d'.' -f2- | rev | cut -d'-' -f1) +KREL := $(uname -r | rev | cut -d'.' -f2- | rev | cut -d'-' -f2) ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL := all From 81bcefb6053273bda56dfa980219df083a3c42a7 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 16:34:14 +0100 Subject: [PATCH 09/17] try kernel modules instead --- utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.mk b/utils.mk index caba849..3bf2105 100644 --- a/utils.mk +++ b/utils.mk @@ -17,8 +17,8 @@ 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) -KVER := $(uname -r | rev | cut -d'.' -f2- | rev | cut -d'-' -f1) -KREL := $(uname -r | rev | cut -d'.' -f2- | rev | cut -d'-' -f2) +KVER := $(shell rpm -q kernel-modules --qf '%{VERSION}\n' | tail -n 1) +KREL := $(shell rpm -q kernel-modules --qf '%{RELEASE}\n' | tail -n 1) ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL := all From 8cb264518d62ab5f5aae018370c44902d66e68dd Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sat, 15 Mar 2025 16:45:54 +0100 Subject: [PATCH 10/17] correct dracut modules for network --- cloud.conf.d/grub2-emu.conf | 2 +- megalith.conf.d/grub2-emu.conf | 2 +- workstation.conf.d/grub2-emu.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud.conf.d/grub2-emu.conf b/cloud.conf.d/grub2-emu.conf index 7bf0429..810b076 100644 --- a/cloud.conf.d/grub2-emu.conf +++ b/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 systemd-networkd rescue watchdog i18n 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 " diff --git a/megalith.conf.d/grub2-emu.conf b/megalith.conf.d/grub2-emu.conf index e8e31d4..f25416a 100644 --- a/megalith.conf.d/grub2-emu.conf +++ b/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 systemd-networkd rescue watchdog i18n 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 " diff --git a/workstation.conf.d/grub2-emu.conf b/workstation.conf.d/grub2-emu.conf index 9e116ed..2332a46 100644 --- a/workstation.conf.d/grub2-emu.conf +++ b/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 systemd-networkd network 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 " From 43c2b0747325b354d63e2a280316a82b6b11e5f1 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sun, 16 Mar 2025 22:35:07 +0100 Subject: [PATCH 11/17] another try at naming after correct kernel --- nmbl-builder.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index 31bdc34..b8ca9e1 100644 --- a/nmbl-builder.spec.in +++ b/nmbl-builder.spec.in @@ -1,4 +1,6 @@ %global debug_package %{nil} +%global kver %{expand:%(rpm -q kernel-modules --qf '%%{VERSION}' | tail -n 1)} +%global krel %{expand:%(rpm -q kernel-modules --qf '%%{RELEASE}' | tail -n 1)} Summary: nmbl proof of concept as a package Name: nmbl-builder @@ -41,8 +43,8 @@ the linux kernel and grub-emu, using either switchroot or kexec. %package -n nmbl Summary: nmbl proof of concept as a package -Version: @@KVER@@ -Release: @@KREL@@ +Version: %{kver} +Release: %{krel} %description -n nmbl nmbl-poc is a proof of concept for a bootloader for UEFI machines based on From c543a9a1900ff24c60e761e609cf9dfa940f9847 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sun, 16 Mar 2025 22:49:32 +0100 Subject: [PATCH 12/17] haven't given up just yet --- nmbl-builder.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index b8ca9e1..821972e 100644 --- a/nmbl-builder.spec.in +++ b/nmbl-builder.spec.in @@ -1,6 +1,6 @@ %global debug_package %{nil} -%global kver %{expand:%(rpm -q kernel-modules --qf '%%{VERSION}' | tail -n 1)} -%global krel %{expand:%(rpm -q kernel-modules --qf '%%{RELEASE}' | tail -n 1)} +%global kver %{expand:%(rpm -q kernel-modules | cut -d'-' -f3 | tail -n 1)} +%global krel %{expand:%(rpm -q kernel-modules | cut -d'-' -f4 | rev | cut -d'.' -f2- | rev | tail -n 1)} Summary: nmbl proof of concept as a package Name: nmbl-builder From 7eb41a310236c483164a15017324b5cb61a23f22 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Sun, 16 Mar 2025 23:10:33 +0100 Subject: [PATCH 13/17] giving up for now --- nmbl-builder.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index 821972e..ae03a1b 100644 --- a/nmbl-builder.spec.in +++ b/nmbl-builder.spec.in @@ -43,8 +43,8 @@ the linux kernel and grub-emu, using either switchroot or kexec. %package -n nmbl Summary: nmbl proof of concept as a package -Version: %{kver} -Release: %{krel} +Version: 666 +Release: 999 %description -n nmbl nmbl-poc is a proof of concept for a bootloader for UEFI machines based on From 0f8e3b4b0e229f5984236c06e1c8eea25f09b66d Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Tue, 22 Apr 2025 14:47:17 +0200 Subject: [PATCH 14/17] rename rpm with kernel name --- nmbl-builder.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index ae03a1b..21fc4d2 100644 --- a/nmbl-builder.spec.in +++ b/nmbl-builder.spec.in @@ -1,6 +1,6 @@ %global debug_package %{nil} -%global kver %{expand:%(rpm -q kernel-modules | cut -d'-' -f3 | tail -n 1)} -%global krel %{expand:%(rpm -q kernel-modules | cut -d'-' -f4 | rev | cut -d'.' -f2- | rev | 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 @@ -43,8 +43,8 @@ the linux kernel and grub-emu, using either switchroot or kexec. %package -n nmbl Summary: nmbl proof of concept as a package -Version: 666 -Release: 999 +Version: %{kver} +Release: %{krel} %description -n nmbl nmbl-poc is a proof of concept for a bootloader for UEFI machines based on From d07bd8308df12d0a1606bb41b79034515fad2b80 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Wed, 23 Apr 2025 14:52:00 +0200 Subject: [PATCH 15/17] conditional buildrequires changes --- nmbl-builder.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nmbl-builder.spec.in b/nmbl-builder.spec.in index 21fc4d2..c25f204 100644 --- a/nmbl-builder.spec.in +++ b/nmbl-builder.spec.in @@ -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 From 4f05dfe70dafe6e64da9871de0ad23ea4537b257 Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Wed, 23 Apr 2025 22:25:05 +0200 Subject: [PATCH 16/17] remove ifcfg for f42 and on --- cloud.conf.d/grub2-emu.conf | 2 +- megalith.conf.d/grub2-emu.conf | 2 +- workstation.conf.d/grub2-emu.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud.conf.d/grub2-emu.conf b/cloud.conf.d/grub2-emu.conf index 810b076..f0eb069 100644 --- a/cloud.conf.d/grub2-emu.conf +++ b/cloud.conf.d/grub2-emu.conf @@ -1 +1 @@ -dracutmodules+=" bash systemd warpclock systemd-networkd rescue watchdog i18n 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 " diff --git a/megalith.conf.d/grub2-emu.conf b/megalith.conf.d/grub2-emu.conf index f25416a..3957503 100644 --- a/megalith.conf.d/grub2-emu.conf +++ b/megalith.conf.d/grub2-emu.conf @@ -1 +1 @@ -dracutmodules+=" bash systemd warpclock systemd-initrd systemd-networkd rescue watchdog i18n 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 " diff --git a/workstation.conf.d/grub2-emu.conf b/workstation.conf.d/grub2-emu.conf index 2332a46..3957503 100644 --- a/workstation.conf.d/grub2-emu.conf +++ b/workstation.conf.d/grub2-emu.conf @@ -1 +1 @@ -dracutmodules+=" bash systemd warpclock systemd-initrd systemd-networkd network 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 " From 0ecb0ff0c699313296e6ffd1d054061d61a71c0d Mon Sep 17 00:00:00 2001 From: Marta Lewandowska Date: Fri, 9 May 2025 12:29:54 +0200 Subject: [PATCH 17/17] remove unnecessary changes --- utils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils.mk b/utils.mk index 3bf2105..bd7b54b 100644 --- a/utils.mk +++ b/utils.mk @@ -17,8 +17,6 @@ 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) -KVER := $(shell rpm -q kernel-modules --qf '%{VERSION}\n' | tail -n 1) -KREL := $(shell rpm -q kernel-modules --qf '%{RELEASE}\n' | tail -n 1) ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL := all @@ -38,8 +36,6 @@ RPMBUILD_ARGS := -D "_topdir $(TOPDIR)" \ @sed \ -e 's,@@VERSION@@,$(VERSION),g' \ -e 's,@@RELEASE@@,$(RELEASE),g' \ - -e 's,@@KVER@@,$(KVER),g' \ - -e 's,@@KREL@@,$(KREL),g' \ $< > $@ # vim:ft=make