summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2024-05-21 21:39:08 +0200
committerGitHub <noreply@github.com>2024-05-21 21:39:08 +0200
commite603a438a7918a2fcc35d7683fd755d3837b7024 (patch)
tree57e2a7d68a879fc77e530086498ac8546b27f1a4
parentMerge pull request #32944 from yuwata/test-74 (diff)
parentmkosi: explicitly install g++ in opensuse (diff)
downloadsystemd-e603a438a7918a2fcc35d7683fd755d3837b7024.tar.xz
systemd-e603a438a7918a2fcc35d7683fd755d3837b7024.zip
Merge pull request #32962 from bluca/suse_mod
pkg/opensuse: switch to SHA1 fork
-rw-r--r--.gitmodules4
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf1
m---------pkg/opensuse0
3 files changed, 3 insertions, 2 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/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
diff --git a/pkg/opensuse b/pkg/opensuse
-Subproject acdb1cd8c5594f66299cc9f8d30d075277eef49
+Subproject c3399411ac70a440ca9080d6df391eb897bba4e