From 34977b7512c95596ee123dc01bdf58ab04a88583 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 21 May 2024 18:19:04 +0100 Subject: [PATCH 1/2] pkg/opensuse: switch to SHA1 fork src.opensuse.org switched to SHA256, which means it can no longer be used as a submodule in a SHA1 repository. Switch to a fork on Pagure that gets synced across and is still SHA1: https://code.opensuse.org/package/systemd.git --- .gitmodules | 4 ++-- pkg/opensuse | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 64d938fbf9..7ae6ace680 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = rawhide [submodule "pkg/opensuse"] path = pkg/opensuse - url = https://src.opensuse.org/rpm/systemd.git - branch = factory + url = https://code.opensuse.org/package/systemd.git + branch = master [submodule "pkg/debian"] path = pkg/debian url = https://salsa.debian.org/systemd-team/systemd.git diff --git a/pkg/opensuse b/pkg/opensuse index acdb1cd8c5..c3399411ac 160000 --- a/pkg/opensuse +++ b/pkg/opensuse @@ -1 +1 @@ -Subproject commit acdb1cd8c5594f66299cc9f8d30d075277eef49b +Subproject commit c3399411ac70a440ca9080d6df391eb897bba4e9 From 386dc7d0fd32b649ecf93dc04748c46bf24950b6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 21 May 2024 19:07:39 +0100 Subject: [PATCH 2/2] mkosi: explicitly install g++ in opensuse Not pulled in by default at build time --- mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf index 5491c28339..922b8338c8 100644 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf @@ -36,6 +36,7 @@ Packages= f2fs-tools gawk git-core + gcc-c++ glibc-locale-base gnutls grep