Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubernetes1.26 for openSUSE:Factory checked in at 2024-07-31 13:29:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes1.26 (Old) and /work/SRC/openSUSE:Factory/.kubernetes1.26.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubernetes1.26" Wed Jul 31 13:29:36 2024 rev:15 rq:1190458 version:1.26.15 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes1.26/kubernetes1.26.changes 2024-04-08 17:53:02.135376417 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes1.26.new.7232/kubernetes1.26.changes 2024-07-31 13:29:45.992968189 +0200 @@ -1,0 +2,5 @@ +Tue Jul 30 10:47:52 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com> + +- Add upstream 122680.patch for reproducible builds (boo#1062303) + +------------------------------------------------------------------- New: ---- 122680.patch BETA DEBUG BEGIN: New: - Add upstream 122680.patch for reproducible builds (boo#1062303) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes1.26.spec ++++++ --- /var/tmp/diff_new_pack.MY2EvP/_old 2024-07-31 13:29:47.785041784 +0200 +++ /var/tmp/diff_new_pack.MY2EvP/_new 2024-07-31 13:29:47.789041949 +0200 @@ -51,6 +51,8 @@ Patch5: revert-coredns-image-renaming.patch # Patch to advance autoscaling v2 as the preferred API version, to fix bsc#1219964, CVE-2024-0793 Patch6: autoscaling-advance-v2-as-the-preferred-API-version.patch +# PATCH-FIX-UPSTREAM - make package build reproducible +Patch7: https://github.com/kubernetes/kubernetes/pull/122680.patch BuildRequires: fdupes BuildRequires: git BuildRequires: go >= 1.21.8 @@ -237,6 +239,7 @@ %patch -P 4 -p0 %patch -P 5 -p1 %patch -P 6 -p1 +%patch -P 7 -p1 %build # This is fixing bug bsc#1065972 ++++++ 122680.patch ++++++ From f835cddce06d64a610538eb45fc1043b6ddb9d16 Mon Sep 17 00:00:00 2001 From: Tim Hockin <thockin@google.com> Date: Tue, 14 Nov 2023 18:57:34 -0800 Subject: [PATCH 1/2] build: use -trimpath in non-DBG mode --- hack/lib/golang.sh | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 1ead8597cbcca..5b56c49ed8cc3 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -748,7 +748,7 @@ kube::golang::build_binaries_for_platform() { done V=2 kube::log::info "Env for ${platform}: GOOS=${GOOS-} GOARCH=${GOARCH-} GOROOT=${GOROOT-} CGO_ENABLED=${CGO_ENABLED-} CC=${CC-}" - V=3 kube::log::info "Building binaries with GCFLAGS=${gogcflags} ASMFLAGS=${goasmflags} LDFLAGS=${goldflags}" + V=3 kube::log::info "Building binaries with GCFLAGS=${gogcflags} LDFLAGS=${goldflags}" local -a build_args if [[ "${#statics[@]}" != 0 ]]; then @@ -756,7 +756,6 @@ kube::golang::build_binaries_for_platform() { -installsuffix=static ${goflags:+"${goflags[@]}"} -gcflags="${gogcflags}" - -asmflags="${goasmflags}" -ldflags="${goldflags}" -tags="${gotags:-}" ) @@ -767,7 +766,6 @@ kube::golang::build_binaries_for_platform() { build_args=( ${goflags:+"${goflags[@]}"} -gcflags="${gogcflags}" - -asmflags="${goasmflags}" -ldflags="${goldflags}" -tags="${gotags:-}" ) @@ -783,7 +781,6 @@ kube::golang::build_binaries_for_platform() { go test -c \ ${goflags:+"${goflags[@]}"} \ -gcflags="${gogcflags}" \ - -asmflags="${goasmflags}" \ -ldflags="${goldflags}" \ -tags="${gotags:-}" \ -o "${outfile}" \ @@ -840,26 +837,19 @@ kube::golang::build_binaries() { # These are "local" but are visible to and relied on by functions this # function calls. They are effectively part of the calling API to # build_binaries_for_platform. - local goflags goldflags goasmflags gogcflags gotags + local goflags goldflags gogcflags gotags - # This is $(pwd) because we use run-in-gopath to build. Once that is - # excised, this can become ${KUBE_ROOT}. - local trimroot # two lines to appease shellcheck SC2155 - trimroot=$(pwd) - - goasmflags="all=-trimpath=${trimroot}" + goflags=() + gogcflags="${GOGCFLAGS:-}" + goldflags="all=$(kube::version::ldflags) ${GOLDFLAGS:-}" - gogcflags="all=-trimpath=${trimroot} ${GOGCFLAGS:-}" if [[ "${DBG:-}" == 1 ]]; then # Debugging - disable optimizations and inlining and trimPath - gogcflags="${GOGCFLAGS:-} all=-N -l" - goasmflags="" - fi - - goldflags="all=$(kube::version::ldflags) ${GOLDFLAGS:-}" - if [[ "${DBG:-}" != 1 ]]; then - # Not debugging - disable symbols and DWARF. + gogcflags="${gogcflags} all=-N -l" + else + # Not debugging - disable symbols and DWARF, trim embedded paths goldflags="${goldflags} -s -w" + goflags+=("-trimpath") fi # Extract tags if any specified in GOFLAGS From a469d259603b1f80b3a5c9ddb522b4dfd1f78d3c Mon Sep 17 00:00:00 2001 From: Tim Hockin <thockin@google.com> Date: Sat, 18 Nov 2023 13:35:58 -0800 Subject: [PATCH 2/2] Use DBG=1 for conformance verification --- test/conformance/gen-specsummaries.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/conformance/gen-specsummaries.sh b/test/conformance/gen-specsummaries.sh index f2598cfe7c50b..f1d1f5bb2bebd 100755 --- a/test/conformance/gen-specsummaries.sh +++ b/test/conformance/gen-specsummaries.sh @@ -23,7 +23,12 @@ KUBE_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P) cd "${KUBE_ROOT}" # build ginkgo and e2e.test -hack/make-rules/build.sh github.com/onsi/ginkgo/v2/ginkgo test/e2e/e2e.test +# +# Set DBG=1 to build with embedded filenames as filenames rather than +# module-relative names (e.g. /src/kube/foo/bar.go vs. +# k8s.io/kubernetes/foo/bar.go). These names are used by gingko in +# `--spec-dump` which is consumed later in conformance verification. +DBG=1 hack/make-rules/build.sh github.com/onsi/ginkgo/v2/ginkgo test/e2e/e2e.test # dump spec ./_output/bin/ginkgo --dry-run=true --focus='[Conformance]' ./_output/bin/e2e.test -- --spec-dump "${KUBE_ROOT}/_output/specsummaries.json" > /dev/null