From f387312e66979b33d14ce342fdc196d28de11cda Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 25 Feb 2025 01:01:28 +0000 Subject: [PATCH 1/7] netesp: add Debian profile --- mkosi.images/netesp/mkosi.conf.d/debian.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mkosi.images/netesp/mkosi.conf.d/debian.conf diff --git a/mkosi.images/netesp/mkosi.conf.d/debian.conf b/mkosi.images/netesp/mkosi.conf.d/debian.conf new file mode 100644 index 0000000..8132ded --- /dev/null +++ b/mkosi.images/netesp/mkosi.conf.d/debian.conf @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# needssslcertforbuild + +[Match] +Distribution=|debian +Distribution=|ubuntu + +[Content] +Packages= + systemd-boot-efi From 4dba77cfdf344935ebefd08a8e4aaad7d7f4cd6b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 25 Feb 2025 23:11:48 +0000 Subject: [PATCH 2/7] netesp: correct description of profiles to mention booted distro --- .../efi/loader/entries/90-debian-particleos-obs-current.conf | 2 +- .../efi/loader/entries/90-fedora-41-particleos-obs-current.conf | 2 +- .../entries/90-fedora-rawhide-particleos-obs-current.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-debian-particleos-obs-current.conf b/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-debian-particleos-obs-current.conf index 61ffee0..430d809 100644 --- a/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-debian-particleos-obs-current.conf +++ b/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-debian-particleos-obs-current.conf @@ -1,3 +1,3 @@ -title Debian ParticleOS Current from OBS (Network Boot) +title Debian Testing ParticleOS Current from OBS (Network Boot) architecture x64 uki-url http://downloadcontentcdn.opensuse.org/repositories/system:/systemd/Debian_Testing_images/ParticleOS-x86-64.efi diff --git a/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-41-particleos-obs-current.conf b/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-41-particleos-obs-current.conf index c174572..0ba0a65 100644 --- a/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-41-particleos-obs-current.conf +++ b/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-41-particleos-obs-current.conf @@ -1,3 +1,3 @@ -title Debian ParticleOS Current from OBS (Network Boot) +title Fedora 41 ParticleOS Current from OBS (Network Boot) architecture x64 uki-url http://downloadcontentcdn.opensuse.org/repositories/system:/systemd/Fedora_41_images/ParticleOS-x86-64.efi diff --git a/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-rawhide-particleos-obs-current.conf b/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-rawhide-particleos-obs-current.conf index 53a53e0..7740f82 100644 --- a/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-rawhide-particleos-obs-current.conf +++ b/mkosi.images/netesp/mkosi.extra/efi/loader/entries/90-fedora-rawhide-particleos-obs-current.conf @@ -1,3 +1,3 @@ -title Debian ParticleOS Current from OBS (Network Boot) +title Fedora Rawhide ParticleOS Current from OBS (Network Boot) architecture x64 uki-url http://downloadcontentcdn.opensuse.org/repositories/system:/systemd/Fedora_Rawhide_images/ParticleOS-x86-64.efi From dcfe87c34c86d52edf23f7aebd5ed15f03b56c43 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 14 Feb 2025 23:55:59 +0000 Subject: [PATCH 3/7] fedora: add lvm2 and xfsprogs to the package list [ 68s] Failed to resolve the transaction: [ 68s] No match for argument: lvm2 [ 68s] No match for argument: xfsprogs --- mkosi.conf.d/20-fedora/mkosi.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkosi.conf.d/20-fedora/mkosi.conf b/mkosi.conf.d/20-fedora/mkosi.conf index f9f0d24..fb90de9 100644 --- a/mkosi.conf.d/20-fedora/mkosi.conf +++ b/mkosi.conf.d/20-fedora/mkosi.conf @@ -21,6 +21,7 @@ Packages= kernel-core libcap-ng-utils libfido2 + lvm2 man-db openssh openssh-clients @@ -45,3 +46,4 @@ Packages= tpm2-tss veritysetup vim-minimal + xfsprogs From 263cd7f967ba8ce2cf774e08da11f8579b44badd Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 14 Feb 2025 23:58:41 +0000 Subject: [PATCH 4/7] Add needed changes to build on OBS All single packages lists need all the packages. Also add keyword to tell the OBS source server to drop the project signing public certificate in the source directory, so that mkosi can pick it up and use it. It needs to be in the mkosi.conf that gets extracted at source runtime. --- mkosi.conf | 3 ++ mkosi.conf.d/20-debian/mkosi.conf | 57 ++++++++++++++++++-- mkosi.conf.d/20-fedora/mkosi.conf | 51 ++++++++++++++++-- mkosi.images/netesp/mkosi.conf.d/fedora.conf | 1 + 4 files changed, 104 insertions(+), 8 deletions(-) diff --git a/mkosi.conf b/mkosi.conf index 58219ca..7914c95 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -90,3 +90,6 @@ Credentials= tty.console.login.noauth=yes tty.virtual.tty1.agetty.autologin=particleos tty.virtual.tty1.login.noauth=yes + +[Include] +Include=mkosi-obs diff --git a/mkosi.conf.d/20-debian/mkosi.conf b/mkosi.conf.d/20-debian/mkosi.conf index cfc0623..7b09a26 100644 --- a/mkosi.conf.d/20-debian/mkosi.conf +++ b/mkosi.conf.d/20-debian/mkosi.conf @@ -1,15 +1,62 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +# needssslcertforbuild [Match] -Distribution=debian - -[Distribution] -Release=trixie +Distribution=|debian +Distribution=|ubuntu [Content] Packages= + acl + attr + bash-completion + btrfs-progs + coreutils + cpio + curl + dbus-broker + diffutils + dmidecode + dosfstools + erofs-utils + findutils + fish + fwupd + gdb + grep + gzip + jq + kbd + kmod + less + man + mtools + nano + nftables + nvme-cli + opensc + openssl + p11-kit + pciutils + pkcs11-provider + sed + socat + strace + systemd + tar + tree + udev + unzip + usbutils + util-linux + which + wireguard-tools + xxd + yubikey-manager + zstd apt bpftool + bsdutils cryptsetup-bin debian-archive-keyring fido2-tools @@ -22,8 +69,8 @@ Packages= libnss-systemd libpam-systemd linux-image-generic - linux-perf login + lvm2 openssh-client openssh-server passwd diff --git a/mkosi.conf.d/20-fedora/mkosi.conf b/mkosi.conf.d/20-fedora/mkosi.conf index fb90de9..8c8d1c8 100644 --- a/mkosi.conf.d/20-fedora/mkosi.conf +++ b/mkosi.conf.d/20-fedora/mkosi.conf @@ -1,13 +1,58 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +# needssslcertforbuild [Match] Distribution=fedora -[Distribution] -Release=rawhide - [Content] Packages= + acl + attr + bash-completion + btrfs-progs + coreutils + cpio + curl + dbus-broker + diffutils + dmidecode + dosfstools + erofs-utils + findutils + fish + fwupd + gdb + grep + gzip + jq + kbd + kmod + less + man + mtools + nano + nftables + nvme-cli + opensc + openssl + p11-kit + pciutils + pkcs11-provider + sed + socat + strace + systemd + tar + tree + udev + unzip + usbutils + util-linux + which + wireguard-tools + xxd + yubikey-manager + zstd bpftool cryptsetup distribution-gpg-keys diff --git a/mkosi.images/netesp/mkosi.conf.d/fedora.conf b/mkosi.images/netesp/mkosi.conf.d/fedora.conf index 73165e7..2477fd0 100644 --- a/mkosi.images/netesp/mkosi.conf.d/fedora.conf +++ b/mkosi.images/netesp/mkosi.conf.d/fedora.conf @@ -1,4 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +# needssslcertforbuild [Match] Distribution=fedora From 490415d7b2f3a746a57b69d0439e9d004b99b9f6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 15 Feb 2025 13:25:41 +0000 Subject: [PATCH 5/7] do not split out partitions, too large mkosi can now operate on the ddi --- mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.conf b/mkosi.conf index 7914c95..5685824 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -11,7 +11,7 @@ Incremental=yes [Output] OutputDirectory=mkosi.output -SplitArtifacts=uki,partitions +SplitArtifacts=uki Format=disk ImageId=ParticleOS ManifestFormat=json From 6d0d210778f958376b3d81ca96ea24aaa24ea3d8 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 18 Feb 2025 10:39:31 +0000 Subject: [PATCH 6/7] temporarily revert naming to id-arch_version OBS looks for this format, can be reverted once this is merged and deployed: https://github.com/openSUSE/open-build-service/pull/17403 --- mkosi.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkosi.conf b/mkosi.conf index 5685824..a725ed9 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -15,10 +15,10 @@ SplitArtifacts=uki Format=disk ImageId=ParticleOS ManifestFormat=json -Output=%i_%v_%a +Output=%i_%a_%v [Content] -UnifiedKernelImageFormat=%i_%v_%a +UnifiedKernelImageFormat=%i_%a_%v KernelCommandLine=rw audit=0 KernelModulesInitrdExclude=.* KernelModulesInitrdInclude=default From 6ecc9bb1e20aee343591b386522d432ccda97ae1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 25 Feb 2025 10:11:29 +0000 Subject: [PATCH 7/7] Build netesp image --- mkosi.conf | 1 + mkosi.images/netesp/mkosi.conf | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mkosi.conf b/mkosi.conf index a725ed9..2fe354b 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -2,6 +2,7 @@ [Config] MinimumVersion=26~devel +Profiles=netesp [Build] ToolsTree=default diff --git a/mkosi.images/netesp/mkosi.conf b/mkosi.images/netesp/mkosi.conf index ae6dbc6..a52dd77 100644 --- a/mkosi.images/netesp/mkosi.conf +++ b/mkosi.images/netesp/mkosi.conf @@ -11,3 +11,6 @@ ImageVersion= [Content] Bootable=yes + +[Include] +Include=mkosi-obs