From 527e791c5346846e2bc7d32f7597d70f9a274499 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 25 Apr 2024 04:54:53 +0200 Subject: Merging upstream version 255.5. Signed-off-by: Daniel Baumann --- mkosi.images/base/mkosi.build.chroot | 6 ------ mkosi.images/base/mkosi.conf.d/10-opensuse.conf | 1 - 2 files changed, 7 deletions(-) (limited to 'mkosi.images/base') diff --git a/mkosi.images/base/mkosi.build.chroot b/mkosi.images/base/mkosi.build.chroot index f26098c..02dcbc7 100755 --- a/mkosi.images/base/mkosi.build.chroot +++ b/mkosi.images/base/mkosi.build.chroot @@ -193,12 +193,6 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then ) fi - if grep -q '^ID="opensuse' /usr/lib/os-release; then - CONFIGURE_OPTS+=( - -Dbpf-compiler=gcc - ) - fi - ( set -x; meson setup "$BUILDDIR" "$SRCDIR" "${CONFIGURE_OPTS[@]}" ) fi diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse.conf b/mkosi.images/base/mkosi.conf.d/10-opensuse.conf index ec91b49..5aae0ed 100644 --- a/mkosi.images/base/mkosi.conf.d/10-opensuse.conf +++ b/mkosi.images/base/mkosi.conf.d/10-opensuse.conf @@ -44,7 +44,6 @@ Packages= BuildPackages= audit-devel bpftool - cross-bpf-gcc13 dbus-1-devel fdupes gcc-c++ -- cgit v1.2.3