products/SUSE_ALP_Standard
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: products:6a2136f6a3243e7363d67080dc40a176d2bfa162
Branches Tags
products:1.0
...
compare: products:17f4a00f3e9c7515ea92c43d5a3c24315aef229f
Branches Tags
products:1.0

5 Commits
6a2136f6a3 ... 17f4a00f3e

Author SHA1 Message Date
Adrian Schröter
17f4a00f3e update to current state 2023-09-27 17:29:04 +02:00
Marco Strigl
23f1cd0a69 Merge pull request 'enable container wrapping and additional adaptations for Basalt' (#18) from fcrozat/SUSE_ALP_Standard:1.0 into 1.0 
Reviewed-on: https://src.suse.de/products/SUSE_ALP_Standard/pulls/18
 2023-09-27 15:22:46 +02:00
Frederic Crozat
abccb4023d enable container wrapping and additional adaptations for Basalt 2023-09-27 14:45:37 +02:00
Marco Strigl
27c72441c6 Merge pull request 'break cycle between ovmf and qemu' (#17) from fcrozat/SUSE_ALP_Standard:1.0 into 1.0 
Reviewed-on: https://src.suse.de/products/SUSE_ALP_Standard/pulls/17
 2023-09-26 10:25:10 +02:00
Frederic Crozat
bd83300d32 break cycle between ovmf and qemu 2023-09-25 16:04:35 +02:00
10 changed files with 31 additions and 16 deletions
Show Stats Expand all files Collapse all files

10
.gitmodules vendored
View File

@ -3558,10 +3558,10 @@
url = ../../pool/python-zstandard
[submodule "python310"]
path = python310
url = ../../pool/python310
url = ../../ALP-pool/python310
[submodule "python311"]
path = python311
url = ../../pool/python311
url = ../../ALP-pool/python311
[submodule "qdox"]
path = qdox
url = ../../pool/qdox
@ -3636,7 +3636,7 @@
url = ../../pool/rpm-config-SUSE
[submodule "rpmlint"]
path = rpmlint
url = ../../pool/rpmlint
url = ../../ALP-pool/rpmlint
[submodule "rpmlint-mini"]
path = rpmlint-mini
url = ../../pool/rpmlint-mini
@ -4344,7 +4344,7 @@
url = ../../ALP-pool/libdbus-c__
[submodule "libsolv"]
path = libsolv
url = ../../pool/libsolv
url = ../../ALP-pool/libsolv
[submodule "brltty"]
path = brltty
url = ../../ALP-pool/brltty
@ -5700,7 +5700,7 @@
url = ../../pool/python-jupyter-packaging
[submodule "python-jupyter-server"]
path = python-jupyter-server
url = ../../pool/python-jupyter-server
url = ../../ALP-pool/python-jupyter-server
[submodule "python-k5test"]
path = python-k5test
url = ../../pool/python-k5test

21
_config
View File

@ -44,6 +44,7 @@ RepoType: rpm-md:sha512:filelists-ext
Patterntype: none
Prefer: openSUSE-release-ftp
Support: release-compare
Support: containment-rpm
# BuildFlags: obsgendiff
%endif
@ -59,6 +60,13 @@ RepoType: rpm-md:sha512:filelists-ext
%ifarch x86_64
BuildFlags: dockerarg:TARGETARCH=amd64
%endif
Required: containment-rpm
PreInstall: release-compare
%endif
%if "%_repository" == "helmcharts"
Type: helm
PreInstall: release-compare perl-YAML-LibYAML
%endif
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:zSystems"
@ -242,6 +250,11 @@ Macros:
:Macros
%endif
%if "%_project" == "SUSE:ALP:Source:Standard:Core:1.0:Build" || "%_project" == "SUSE:ALP:Products:Basalt:1.0"
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE container-build-checks-strict
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
%else
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86"
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
@ -249,9 +262,10 @@ Substitute: system-packages:podman podman buildah createrepo_c release-compare c
%else
# That ignore seems not to make sense - we only inject -strict based on specific projects already
Ignore: container-build-checks-strict
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE skopeo umoci
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE skopeo umoci
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE
Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-SUSE skopeo umoci
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE skopeo umoci
%endif
%endif
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:zSystems" || "%_project" == "openSUSE:Factory:LegacyX86"
@ -1532,6 +1546,7 @@ Ignore: avahi:sysvinit(network)
Ignore: cluster-glue:sysvinit(network)
Ignore: dracut:systemd-sysvinit
Ignore: yui_backend
Ignore: qemu-x86:qemu-ovmf-x86_64
%ifarch ppc64le
#Constraint: hostlabel PPC64LE_HOST

2
libsolv

@ -1 +1 @@
Subproject commit d0e9b4c53d3af814f250d5fb6fc9096ee41c2254
Subproject commit b7330fb53895eeb7eae1f58495a0b4e2f7628720

2
libzypp

@ -1 +1 @@
Subproject commit f6b36ee479925e8778bfebfb3e398a6aa326d150
Subproject commit a4746f4d561bfff0cfef81a8838865a03014e81a

2
python-jupyter-server

@ -1 +1 @@
Subproject commit 7780fa95a4e79f1ef3729078db55ccf2592d0159
Subproject commit 854e5120fd0104139299a3cc17aff7cf080c9569

2
python310

@ -1 +1 @@
Subproject commit 5994c69d8323dcdee74ad9bac8b5dc64912b5400
Subproject commit 32ec6998cb60db49051b2f6956be676bf28d37cc

2
python311

@ -1 +1 @@
Subproject commit 9b707ffaba01b805812afd75855a808a1358ac31
Subproject commit 023a6019057275b45b1f1058067713d481b4e109

2
rpmlint

@ -1 +1 @@
Subproject commit f6deb2429eeee3cc0ee8b4796f219c59a4d7b63f
Subproject commit ec32ad6f3c0fb2500301a1379e08ea9ef5b3e0e9

2
shim

@ -1 +1 @@
Subproject commit ba0d3916972e7d21ce9f177777db297cd015c6cd
Subproject commit 13c1deac1b028429bdddc0549ab6d255d3d7c4e4

2
zypper

@ -1 +1 @@
Subproject commit 0165a21ff4d25fbaefef9dbf48e339e0094e2134
Subproject commit 2fd972f9eb841787afa9b1c17b7b36a28f66f088