From 9731a4fbc1a78d16ba2edc60274fe02a3584e23b16a58a6f7f6e9181d8b4b5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 30 Aug 2024 15:36:14 +0200 Subject: [PATCH 1/5] update to current state --- .gitmodules | 12 ++++++++++++ bcc | 1 + bpftrace | 1 + buildkit | 2 +- cereal | 1 + extra-cmake-modules | 2 +- python-WebOb | 2 +- python-gunicorn | 2 +- python-urllib3 | 2 +- qemu | 2 +- sapstartsrv-resource-agents | 1 + vulkan-headers | 2 +- vulkan-loader | 2 +- 13 files changed, 24 insertions(+), 8 deletions(-) create mode 160000 bcc create mode 160000 bpftrace create mode 160000 cereal create mode 160000 sapstartsrv-resource-agents diff --git a/.gitmodules b/.gitmodules index 3ba25cd..4dc0ec8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8983,3 +8983,15 @@ [submodule "saptune"] path = saptune url = ../../SLFO-pool/saptune +[submodule "bcc"] + path = bcc + url = ../../SLFO-pool/bcc +[submodule "bpftrace"] + path = bpftrace + url = ../../SLFO-pool/bpftrace +[submodule "cereal"] + path = cereal + url = ../../SLFO-pool/cereal +[submodule "sapstartsrv-resource-agents"] + path = sapstartsrv-resource-agents + url = ../../SLFO-pool/sapstartsrv-resource-agents diff --git a/bcc b/bcc new file mode 160000 index 0000000..ab4056c --- /dev/null +++ b/bcc @@ -0,0 +1 @@ +Subproject commit ab4056c97e4ca69bd8785138e90dc592edf5fc6977bc633c553f0e5f1b2522a7 diff --git a/bpftrace b/bpftrace new file mode 160000 index 0000000..4dadf66 --- /dev/null +++ b/bpftrace @@ -0,0 +1 @@ +Subproject commit 4dadf66bc7052fe4a08edd860b2b9a328234819c8758320b86bd9f46ba71af46 diff --git a/buildkit b/buildkit index ee4ca60..746725b 160000 --- a/buildkit +++ b/buildkit @@ -1 +1 @@ -Subproject commit ee4ca6076896bb5376a4aa27415640cedaf04007f187e16de355a9c1487ad070 +Subproject commit 746725b9f9727bc34aed430b596c64b86bdd239ec50344602288ccd256b58c4b diff --git a/cereal b/cereal new file mode 160000 index 0000000..a2732df --- /dev/null +++ b/cereal @@ -0,0 +1 @@ +Subproject commit a2732df9b7c4ba97b17b1022c920368009012960628e66deaa52123d549be044 diff --git a/extra-cmake-modules b/extra-cmake-modules index eddab07..f8cf41a 160000 --- a/extra-cmake-modules +++ b/extra-cmake-modules @@ -1 +1 @@ -Subproject commit eddab0791c592a73b5179c570a943f08d41a69f913381603f85ae1625dbafacf +Subproject commit f8cf41ab09a99c810b740e67c4ff8f07df914b9d8ddc9a82b06cf6493152d360 diff --git a/python-WebOb b/python-WebOb index 2dbe6a0..4d7b79b 160000 --- a/python-WebOb +++ b/python-WebOb @@ -1 +1 @@ -Subproject commit 2dbe6a0c0bdcfde27fb6eaa490289bb97dcab8a8d19c57c4ad82bfc47ceff298 +Subproject commit 4d7b79b3962244c488194e91cefa599e164efee2f92f0046fed7f80de9f1ce48 diff --git a/python-gunicorn b/python-gunicorn index 13708d8..6a5c5e2 160000 --- a/python-gunicorn +++ b/python-gunicorn @@ -1 +1 @@ -Subproject commit 13708d8d39d6d1ada3756143e76bbcfcecce1c15f1fc30863400db0505e7a4d0 +Subproject commit 6a5c5e254dab3c5bde0ef722cbf2fbc04a85e11ed235c29902957848dcbcd559 diff --git a/python-urllib3 b/python-urllib3 index 03d9200..d1fad4d 160000 --- a/python-urllib3 +++ b/python-urllib3 @@ -1 +1 @@ -Subproject commit 03d9200b8b336056906d0ac46b173cd9d0d41736a7f2a2fbf6dfd4b89ae7d634 +Subproject commit d1fad4d39011b840ddd32a09049b38f2b7610cfa0e53344da8825b8c3000b9d9 diff --git a/qemu b/qemu index a494104..1079bc3 160000 --- a/qemu +++ b/qemu @@ -1 +1 @@ -Subproject commit a49410456e0c527b774e5df0eb88bbdd6977f830b931cdb09aa40844ce8ad150 +Subproject commit 1079bc3adcbed6f1997f2abab0232dc5fa4c10a5709f4d1e73044d6884b13e8c diff --git a/sapstartsrv-resource-agents b/sapstartsrv-resource-agents new file mode 160000 index 0000000..673790a --- /dev/null +++ b/sapstartsrv-resource-agents @@ -0,0 +1 @@ +Subproject commit 673790a90922cf02a0b5544eb62a9cb1dab099f6e0b1b264f67767149d855aa7 diff --git a/vulkan-headers b/vulkan-headers index c10661c..7a6655f 160000 --- a/vulkan-headers +++ b/vulkan-headers @@ -1 +1 @@ -Subproject commit c10661c623860dce449137ed76b6f3fb02cf77e1e14ca5e201d17ea57bf52172 +Subproject commit 7a6655fd0f037fdc6118fda4e0366baffaac30333b60deffea159af561d92b79 diff --git a/vulkan-loader b/vulkan-loader index f997b88..65e97b2 160000 --- a/vulkan-loader +++ b/vulkan-loader @@ -1 +1 @@ -Subproject commit f997b88ee4f1c556f85939db097a3e35371cea02eb99e433ac2705362f7f6c02 +Subproject commit 65e97b2af3e7e1bf78444a300fda60466cffee1669c3507adcffa67cb6d8d43f From 5bb7b33c8e7777952fb1813cd10ee0e4f29fddd5220aca30db676c364fa3c9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 30 Aug 2024 15:43:13 +0200 Subject: [PATCH 2/5] update to current state --- audit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audit b/audit index c08b641..214403d 160000 --- a/audit +++ b/audit @@ -1 +1 @@ -Subproject commit c08b6413a21c6e078fa5f93ffa96c9bb801ae9f8c4e2e37e0e8ea780bf7b4dfc +Subproject commit 214403da86b1eb371be66705966a2f5fbcc0c0b29fd0999a08f071da5b1164c3 From effe0dca3854440b41a6b563cce6b86e9af78c76354ef17695d8681381002c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 30 Aug 2024 15:48:52 +0200 Subject: [PATCH 3/5] update to current state --- .gitmodules | 3 --- audit-secondary | 1 - 2 files changed, 4 deletions(-) delete mode 160000 audit-secondary diff --git a/.gitmodules b/.gitmodules index 4dc0ec8..be46ac8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -310,9 +310,6 @@ [submodule "audit"] path = audit url = ../../SLFO-pool/audit -[submodule "audit-secondary"] - path = audit-secondary - url = ../../SLFO-pool/audit-secondary [submodule "augeas"] path = augeas url = ../../SLFO-pool/augeas diff --git a/audit-secondary b/audit-secondary deleted file mode 160000 index b704767..0000000 --- a/audit-secondary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b704767602e424ef47c02ba3fe52b0ff96a21c4384be773830f00fb07c7dded8 From 47f5b3bd90a1ba3c8143c1f500ba680e4207fbb3f91d43bcdb4b40c617ab4b5a Mon Sep 17 00:00:00 2001 From: Jan Zerebecki Date: Fri, 23 Aug 2024 12:15:07 +0200 Subject: [PATCH 4/5] enable reproducible builds https://jira.suse.com/browse/SMO-426 This still needs the changes in rpm from sr 342025 . --- _config | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/_config b/_config index b80f532..ca152ba 100644 --- a/_config +++ b/_config @@ -3839,8 +3839,16 @@ Macros: %_vendor suse # Reproducible builds +%if "%{sub %_project 1 9}" == "openSUSE:" || "%{sub %_project 1 5}" == "SUSE:" +Macros: %source_date_epoch_from_changelog Y -# clamp_mtime_to_source_date_epoch Y +:Macros +%endif +Macros: +%set_mtime_to_source_date_epoch Y +%use_source_date_epoch_as_buildtime Y +%_buildhost reproducible +:Macros # define which postgres is default %postgresql_default_ver 15 From 9b7e9d3fd70cf1ab020ad77c8ce2d072d1219fcb32a8f37fca1eee748ccb1e32 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Fri, 30 Aug 2024 16:30:37 +0200 Subject: [PATCH 5/5] _config: Move reproducible builds macros. --- _config | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/_config b/_config index ca152ba..e58e459 100644 --- a/_config +++ b/_config @@ -3815,6 +3815,18 @@ Substitute: gcc6-c++-32bit Substitute: gcc-c++-32bit %endif +# Reproducible builds +%if "%{sub %_project 1 9}" == "openSUSE:" || "%{sub %_project 1 5}" == "SUSE:" +Macros: +%source_date_epoch_from_changelog Y +:Macros +%endif +Macros: +%set_mtime_to_source_date_epoch Y +%use_source_date_epoch_as_buildtime Y +%_buildhost reproducible +:Macros + Macros: %suse_version 1600 %workbench_version 0100 @@ -3838,18 +3850,6 @@ Macros: %opensuse_bs 1 %_vendor suse -# Reproducible builds -%if "%{sub %_project 1 9}" == "openSUSE:" || "%{sub %_project 1 5}" == "SUSE:" -Macros: -%source_date_epoch_from_changelog Y -:Macros -%endif -Macros: -%set_mtime_to_source_date_epoch Y -%use_source_date_epoch_as_buildtime Y -%_buildhost reproducible -:Macros - # define which postgres is default %postgresql_default_ver 15