From 40b7e6f04652f5020036e5afab9fb46dd5d647d44f49541c798e85c10d2a8b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 23 Aug 2025 08:31:34 +0200 Subject: [PATCH 1/4] Migrate from legacy _subdirs to _manifest --- _manifest | 5 +++++ _subdirs | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 _manifest delete mode 100644 _subdirs diff --git a/_manifest b/_manifest new file mode 100644 index 0000000..a90014a --- /dev/null +++ b/_manifest @@ -0,0 +1,5 @@ + +# sub directories which provide package sources +subdirectories: + - pkgs/c + diff --git a/_subdirs b/_subdirs deleted file mode 100644 index 47785bd..0000000 --- a/_subdirs +++ /dev/null @@ -1,2 +0,0 @@ -subdirs: -- pkgs/c -- 2.51.1 From 02ddfb4203dfb7ebfb9b2011070104dd55a7c7dc8123e045b1974f79bfc6bcfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 23 Aug 2025 08:15:18 +0200 Subject: [PATCH 2/4] Add chromium package --- .gitmodules | 4 ++++ _maintainership.json | 1 + pkgs/c/chromium | 1 + 3 files changed, 6 insertions(+) create mode 160000 pkgs/c/chromium diff --git a/.gitmodules b/.gitmodules index 5b1abec..4f34972 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,7 @@ [submodule "pkgs/c/cockpit-tukit"] path = pkgs/c/cockpit-tukit url = https://src.opensuse.org/pool/cockpit-tukit +[submodule "pkgs/c/chromium"] + path = pkgs/c/chromium + url = ../../pool/chromium + branch = factory diff --git a/_maintainership.json b/_maintainership.json index e8f70fc..5d6d8a8 100644 --- a/_maintainership.json +++ b/_maintainership.json @@ -1,5 +1,6 @@ { "": ["adamm_super", "dimstar_suse"], + "chromium": ["oertel", "gmbr3", "AndreasStieger"], "cockpit": ["abrooks", "adamm", "jzerebecki", "malikirri"], "cockpit-machines": ["abrooks", "adamm", "jzerebecki", "malikirri"], "cockpit-packages": ["abrooks", "adamm", "jzerebecki", "malikirri"], diff --git a/pkgs/c/chromium b/pkgs/c/chromium new file mode 160000 index 0000000..e557e90 --- /dev/null +++ b/pkgs/c/chromium @@ -0,0 +1 @@ +Subproject commit e557e90812e01ebf657107ff8f1ed8db7548aaf3b9a7af48706899d5db898080 -- 2.51.1 From 77916c36a9edbab36111de0a15ea9b197b1631654a5a69f5112ef47f1c4d9f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 25 Aug 2025 08:58:17 +0200 Subject: [PATCH 3/4] Use openSUSE:Factory:PullRequest as staging base This project allows us to have special settings during staging builds. For example: * reduce used architectures * enable more test suites * add further test builds, for example also building against openSUSE:Factory:ARM * define reduced build set on product builds --- staging.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging.config b/staging.config index 0de70bd..7538fcf 100644 --- a/staging.config +++ b/staging.config @@ -1,4 +1,4 @@ { // Reference build project - "ObsProject": "openSUSE:Factory", + "ObsProject": "openSUSE:Factory:PullRequest", } -- 2.51.1 From 6471cea1b3f6ca0e3906fa2ad39b507ebda3368a1988778212cc320e25dcc807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 25 Aug 2025 11:10:29 +0200 Subject: [PATCH 4/4] Basic README file --- README.md | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..1b2640d --- /dev/null +++ b/README.md @@ -0,0 +1,75 @@ +# The openSUSE Factory project + +This project is managing the entire Factory, aka Tumbleweed distribution. + +It defines the used package sources and additional configuration settings +to build the binaries. + +## Package Sources + +All package sources are organized below the pkgs directory. These are +grouped again in subdirectories to avoid too large directory listings. + +The `_manifest` file needs to get adapted in case a new subdirectory +gets created or an existing one gets renamed. + +Each package source is defined via a git submodule. The submodules +defines + * the origin url of the source (in .gitmodules) + * the branch to follow (in .gitmodules) + * the current used commit hash + +Any submodule reference should be relative to allow a full replication +on other git servers. + +### Add a new package source + + ```shell + git submodule add -b factory ../../pool/$PACKAGE pkg/$DIRECTORY/$PACKAGE + git commit + ``` + +### Remove a package source + + ```shell + git rm pkg/$DIRECTORY/$PACKAGE + git commit -a + ``` + +This modifies also the .gitmodules file + +### Update a package source + +This is usually done via our bot infrastucture. But in case a manual action +is needed run + + ```shell + git submodule update --init pkg/$DIRECTORY/$PACKAGE + cd pkg/$DIRECTORY/$PACKAGE + git pull # or checkout a specific commit/branch + cd - + git add pkg/$DIRECTORY/$PACKAGE + git commit + ``` + +## Additional files + +### `_manifest` + +Is the master git configuration file. Currently it is only used to define +the package source structure of the project. + +### `_config` + +The build configuration (aka prjconf). + +### `workflow.config` + +Rules for the workflow-pr bot. The bot creates for any pull request against +any used pool/$PACKAGE git repository factory branch also a pull request for +this git project here. + +### `staging.config` + +Defines test builds for any pull request to this project + -- 2.51.1