From d615d4e0de3ab631c2f13dd5ba0aaadef6f5b321 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 4 Oct 2024 14:09:48 +0200 Subject: [PATCH] mkosi: Remove particle profile We have https://github.com/systemd/particleos for testing the particle stuff so let's drop it from the systemd repo as it's bit rotting. --- mkosi.conf.d/20-particle/mkosi.conf | 15 --------------- .../mkosi.extra/usr/lib/repart.d/15-swap.conf | 6 ------ .../mkosi.extra/usr/lib/repart.d/20-root.conf | 6 ------ .../mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf | 3 --- mkosi.conf.d/20-particle/mkosi.finalize | 6 ------ mkosi.conf.d/20-particle/mkosi.postinst.chroot | 12 ------------ mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf | 9 --------- mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf | 9 --------- .../20-particle/mkosi.repart/11-usr-verity.conf | 7 ------- .../mkosi.repart/12-usr-verity-sig.conf | 6 ------ mkosi.profiles/particle.conf | 2 -- 11 files changed, 81 deletions(-) delete mode 100644 mkosi.conf.d/20-particle/mkosi.conf delete mode 100644 mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/15-swap.conf delete mode 100644 mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/20-root.conf delete mode 100644 mkosi.conf.d/20-particle/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf delete mode 100755 mkosi.conf.d/20-particle/mkosi.finalize delete mode 100755 mkosi.conf.d/20-particle/mkosi.postinst.chroot delete mode 100644 mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf delete mode 100644 mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf delete mode 100644 mkosi.conf.d/20-particle/mkosi.repart/11-usr-verity.conf delete mode 100644 mkosi.conf.d/20-particle/mkosi.repart/12-usr-verity-sig.conf delete mode 100644 mkosi.profiles/particle.conf diff --git a/mkosi.conf.d/20-particle/mkosi.conf b/mkosi.conf.d/20-particle/mkosi.conf deleted file mode 100644 index 99dad00f5af..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.conf +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Profile=particle - -[Output] -RepartDirectories= -RepartDirectories=mkosi.repart - -[Validation] -SecureBoot=yes -SignExpectedPcr=yes - -[Host] -RuntimeSize=8G diff --git a/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/15-swap.conf b/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/15-swap.conf deleted file mode 100644 index 37552784626..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/15-swap.conf +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Partition] -Type=swap -SizeMinBytes=100M -SizeMaxBytes=100M diff --git a/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/20-root.conf b/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/20-root.conf deleted file mode 100644 index 2f92af248f3..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/20-root.conf +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Partition] -Type=root -Format=btrfs -SizeMinBytes=1G diff --git a/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf b/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf deleted file mode 100644 index dac79ba4ed2..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -C+! /etc - - - - /usr/share/factory/mkosi diff --git a/mkosi.conf.d/20-particle/mkosi.finalize b/mkosi.conf.d/20-particle/mkosi.finalize deleted file mode 100755 index 69f95548648..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.finalize +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: LGPL-2.1-or-later -set -e - -mkdir -p "$BUILDROOT"/usr/share/factory/mkosi -cp --archive --recursive --no-target-directory --reflink=auto "$BUILDROOT"/etc "$BUILDROOT"/usr/share/factory/mkosi diff --git a/mkosi.conf.d/20-particle/mkosi.postinst.chroot b/mkosi.conf.d/20-particle/mkosi.postinst.chroot deleted file mode 100755 index 95e0552d915..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.postinst.chroot +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: LGPL-2.1-or-later -set -e - -# sbsign is not available on CentOS Stream -if command -v sbsign &>/dev/null; then - # Ensure that side-loaded PE addons are loaded if signed, and ignored if not - addons_dir=/efi/loader/addons - mkdir -p "$addons_dir" - ukify build --secureboot-private-key mkosi.key --secureboot-certificate mkosi.crt --cmdline this_should_be_here -o "$addons_dir/good.addon.efi" - ukify build --cmdline this_should_not_be_here -o "$addons_dir/bad.addon.efi" -fi diff --git a/mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf b/mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf deleted file mode 100644 index 391543d1e78..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Partition] -Type=esp -Format=vfat -CopyFiles=/boot:/ -CopyFiles=/efi:/ -SizeMinBytes=1G -SizeMaxBytes=1G diff --git a/mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf b/mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf deleted file mode 100644 index 343761d097a..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Partition] -Type=usr -Format=erofs -CopyFiles=/usr:/ -Verity=data -VerityMatchKey=usr -Minimize=yes diff --git a/mkosi.conf.d/20-particle/mkosi.repart/11-usr-verity.conf b/mkosi.conf.d/20-particle/mkosi.repart/11-usr-verity.conf deleted file mode 100644 index b4d45dd7efb..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.repart/11-usr-verity.conf +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Partition] -Type=usr-verity -Verity=hash -VerityMatchKey=usr -Minimize=yes diff --git a/mkosi.conf.d/20-particle/mkosi.repart/12-usr-verity-sig.conf b/mkosi.conf.d/20-particle/mkosi.repart/12-usr-verity-sig.conf deleted file mode 100644 index 1841d0a6db9..00000000000 --- a/mkosi.conf.d/20-particle/mkosi.repart/12-usr-verity-sig.conf +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Partition] -Type=usr-verity-sig -Verity=signature -VerityMatchKey=usr diff --git a/mkosi.profiles/particle.conf b/mkosi.profiles/particle.conf deleted file mode 100644 index 5f36d58e4d2..00000000000 --- a/mkosi.profiles/particle.conf +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# This file exists to create the particle profile which is matched on by other configuration files. -- 2.47.3