From: Daan De Meyer Date: Thu, 12 Sep 2024 19:27:03 +0000 (+0200) Subject: mkosi: Stop applying device groups patch on Arch X-Git-Tag: v257-rc1~455 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf94f513f055d04d2c46b25e30948ea12adbe25c;p=thirdparty%2Fsystemd.git mkosi: Stop applying device groups patch on Arch It stopped applying so let's stop applying it to make CI green again. --- diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot index 8d501ecb76c..81864448c58 100755 --- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot +++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot @@ -67,10 +67,6 @@ sed --in-place "pkg/$PKG_SUBDIR/PKGBUILD" \ --expression "s/^_tag=.*/_tag=$(cat meson.version)/" \ --expression "s/^pkgrel=.*/pkgrel=$(date "+%Y%m%d%H%M%S" --date "@$TS")/" -# Replace cdrom/dialout/tape groups with optical/uucp/storage. We apply this patch manually because we run -# with --noprepare. -patch -Np1 -i pkg/arch/0001-Use-Arch-Linux-device-access-groups.patch - # We get around makepkg's root check by setting EUID to something else. # shellcheck disable=SC2046 env --chdir="pkg/$PKG_SUBDIR" \