Compare commits

...

5 Commits

Author SHA256 Message Date
b6165f99cd update to current state 2024-09-30 10:48:50 +02:00
Marco Strigl
c37d42130b Merge pull request '_config: Drop broken selinux targeted workaround.' (#35) from gleidi/SLFO_main:fix_selinux into main
Reviewed-on: https://src.suse.de/products/SLFO_main/pulls/35
Reviewed-by: Marco Strigl <mstrigl@noreply.src.suse.de>
2024-09-27 09:49:19 +02:00
9fdf8ffa2e
_config: Drop broken selinux targeted workaround. 2024-09-26 15:53:42 +02:00
Marco Strigl
624d972ae3 Merge pull request 'Avoiding choice error when using docker build engine' (#32) from adrianSuSE/SLFO_main:main into main
Reviewed-on: https://src.suse.de/products/SLFO_main/pulls/32
Reviewed-by: Marco Strigl <mstrigl@noreply.src.suse.de>
2024-09-26 11:18:36 +02:00
e8679c9c64 Avoiding choice error when using docker build engine
Our default should be podman anyway, but docker requires kernel-default
which leads to a choice error due to the dependency to a
distribution-release package
2024-09-19 11:52:01 +02:00
23 changed files with 29 additions and 30 deletions

9
.gitmodules vendored
View File

@ -1564,9 +1564,6 @@
[submodule "harfbuzz"] [submodule "harfbuzz"]
path = harfbuzz path = harfbuzz
url = ../../SLFO-pool/harfbuzz url = ../../SLFO-pool/harfbuzz
[submodule "hdf5"]
path = hdf5
url = ../../SLFO-pool/hdf5
[submodule "hdparm"] [submodule "hdparm"]
path = hdparm path = hdparm
url = ../../SLFO-pool/hdparm url = ../../SLFO-pool/hdparm
@ -8821,3 +8818,9 @@
[submodule "rust1.81"] [submodule "rust1.81"]
path = rust1.81 path = rust1.81
url = ../../SLFO-pool/rust1.81 url = ../../SLFO-pool/rust1.81
[submodule "libunibreak"]
path = libunibreak
url = ../../SLFO-pool/libunibreak
[submodule "telnet"]
path = telnet
url = ../../SLFO-pool/telnet

11
_config
View File

@ -323,18 +323,18 @@ Macros:
%if "%_project" == "SUSE:SLFO:Main:Build" || "%_project" == "SUSE:ALP:Products:Basalt:1.0" %if "%_project" == "SUSE:SLFO:Main: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: 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:docker kmod kernel-default dummy-release 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 Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
%else %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" %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: 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 Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
%else %else
# That ignore seems not to make sense - we only inject -strict based on specific projects already # That ignore seems not to make sense - we only inject -strict based on specific projects already
Ignore: container-build-checks-strict Ignore: container-build-checks-strict
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE 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:docker kmod kernel-default dummy-release 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 Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE skopeo umoci
%endif %endif
%endif %endif
@ -831,11 +831,6 @@ Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1
Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1 Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1
Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0 Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0
%ifnarch i586
# error: selabel_open: (/etc/selinux/targeted/contexts/files/file_contexts) No such file or directory
Preinstall: selinux-policy-targeted
%endif
#Runscripts: aaa_base #Runscripts: aaa_base
Prefer: libdb-4_8-devel Prefer: libdb-4_8-devel

@ -1 +1 @@
Subproject commit 497a5ad224a7b107c1b7248ddc40bbd382cae77822c19e74a5d7011c8b8f39c4 Subproject commit f325e7b23df9be2d331a7e2a35970c663a32b6d6df534ca1e1cca4e0d463da25

2
cmake

@ -1 +1 @@
Subproject commit 165260042440d9716a300a4230a2b7194aa2478938116529e33c7e6b12533ba7 Subproject commit 25b7f229aafb53b9be146947611ab7f2a5a504c87a785a047ac3762fa24e5dfa

2
curl

@ -1 +1 @@
Subproject commit 63c5ef1c91e43cfd0795af24b3a395ab037e46a62fa0eb453ca86b964b9da50b Subproject commit 69417f5875a96209debed91d8e62514378ebd987c98ad0a7948f3bb00254ebeb

2
git

@ -1 +1 @@
Subproject commit 029e3546e8cfb87d4107c2c29d81afce63506021e2a89298957e22f42bf3b8c6 Subproject commit 95e224ad140df1a406ed09912e7848860fa0145fdbdf409428348d3342c5cb43

@ -1 +1 @@
Subproject commit 66444d2a3f8d7dc69c8c13e621eafd08c457f0db9c8d2cee446a4ba040a249a5 Subproject commit 9c94288c8506ee3999f6c8ae582690d1c94c8d0ba117250892dde0a1adf726f2

1
hdf5

@ -1 +0,0 @@
Subproject commit d2abe55ac035c63f0c2ee774c2b146c827cf9a33c4724ccaac3c367d842a9b50

2
jq

@ -1 +1 @@
Subproject commit 5346ad34b4d75dfa4525e92a80c7620097da434ff50d19ce1e3e0da3111cd2ec Subproject commit cc093f7c78fb9b7835b7a23b909e21893d2266c24c26e091478f839a20e48e09

@ -1 +1 @@
Subproject commit 9eafdb18fba89748be2db6cc39468cc993e06b8ca37234975571d22c5a12fc26 Subproject commit 1f3e0f6fe6a6416648bf4737279a3ab72842bc415bcbff9ea312d4f0ae4b94f9

@ -1 +1 @@
Subproject commit 964a1ff2d491e8dbf569fcbcd30b1699228bff7af204608911091ca7186eebff Subproject commit d37d009de1e6603fad5e040429a06269dd66793fb74b6aa50610c27d359e2791

@ -1 +1 @@
Subproject commit 1aec65da843c0265bdbbe0393f4a3acda8e3d74abbb1d2ce2d12d26094f1198e Subproject commit b99a12afc2f776bf31788476fd27aa1d7c559842b2e0384aa5703a9d2e692295

1
libunibreak Submodule

@ -0,0 +1 @@
Subproject commit a941a9a2989ca9ba87d733e8f42111827bc74ea43f776fa45f564a9006860c83

@ -1 +1 @@
Subproject commit f8e248bb4a1d90bc6ed7e70e836e624200b9ed0db1ecddbce30023df06360c10 Subproject commit a1cd645cc1694552b1d64d4361effe7d2cfea5f0b8890f5a2ba3de2ed2c91ebd

@ -1 +1 @@
Subproject commit 64f620dc3eb177e11c2592ba3d17b9f60b2eb6be9c6445ee016f9d9388a1d788 Subproject commit 8cd77f6191e92c2a2e7a80b839615e1d5a2cc37a3102af34cfc30d8b298476ed

2
qemu

@ -1 +1 @@
Subproject commit 1079bc3adcbed6f1997f2abab0232dc5fa4c10a5709f4d1e73044d6884b13e8c Subproject commit 1eb16dbd3c2cad5938db2d1f008dce90ea2c065367eee66ba3766f557f473907

2
rsync

@ -1 +1 @@
Subproject commit 0154da61390c56ed7c6d0a5a5ee9d66664ce565badc23bfbfb6ed3a098249c1b Subproject commit 207750b25c7204cd0b48dd5d05f49aa98fa3b860a435f63d974db3b66dd1b6bd

2
sevctl

@ -1 +1 @@
Subproject commit 97f4bbeeedd09fc3728b554e38e43fe51760d01211ba868836b9228f7582b432 Subproject commit 9bbc919917fe9b12c4332ea768f75f0345c5f2951b7e94c576725ab92dd39e2c

2
shim

@ -1 +1 @@
Subproject commit 58ba8cc5cfd08dfed0d88ce9adced7279d75ff9b610a271452b0f9c4ecfc1a62 Subproject commit 93d13824d935ba3132daaf864d6dfcf8f87e3467a33612b91cbda4263d5f0bb6

2
tbb

@ -1 +1 @@
Subproject commit 7f98e13466a9eb3379bc84592749753ce76f9d2f792055667fd342bfb1feeda4 Subproject commit b793d253f93bcb458f508915639beedd84968ab15d4ba4a906a14186c9b535a0

1
telnet Submodule

@ -0,0 +1 @@
Subproject commit 6bb55ce0ecdcde91ea510529448cba9fdab81a7c64edbf641229f6c5c4fc0ec5

@ -1 +1 @@
Subproject commit 5b9702bb1e3ead2e3afc785a74a6a2ad1986d89753d603956a0357c25f899d71 Subproject commit d6d06990392c203e8c4452bf4482bb18bc52335a6020cbf36c28248df748550e

@ -1 +1 @@
Subproject commit 16194d5a2d3a401d037717b502f0ae9125c92c1c644722cbdebd898e983b9d3d Subproject commit e3e79a6f88c0e491dd932972b32134efa16b55b2b27a0115a79c05dd7cb30d3d