e4c38fd245
Update the compiler and linker flags for RHEL 9 by keeping '-trimpath'.
Switch to using the GO_BUILDTAGS and GO_LDFLAGS environment variables,
because their unprefixed counterparts have been deprecated [1].
The 'rpminspect --tests=elf' test run by the downstream CI was silenced
because toolbox(1) is only built with the '-z relro' linker flag, but
not '-z now' [2]. Otherwise, it fails with:
/usr/bin/toolbox lost full GNU_RELRO security protection
Stop carrying the downstream patch for the compiler and linker flags for
PPC64. The architecture was already discontinued from Fedora 29 [3],
even before the patch was added [4]. It was added purely for the sake
of completeness, and in the last four years since it was introduced, it
hasn't been tested or used. At this point it's becoming too much of a
maintenance burden, and removing it silences the %ifarch-applied-patch
warning from rpmlint.
Fill in some of the missing Requires for the toolbox-tests sub-package.
[1] go-rpm-macros commit bc7e5cc55c4709e8
https://pagure.io/go-rpm-macros/c/bc7e5cc55c4709e8
[2] Upstream commit 83f28c52e47c2d44
https://github.com/containers/toolbox/commit/83f28c52e47c2d44
https://github.com/containers/toolbox/pull/1548
[3] https://fedoraproject.org/wiki/Changes/DiscontinuePPC64
[4] Fedora toolbox commit ba60453d21
https://src.fedoraproject.org/rpms/toolbox/c/ba60453d216a9226
https://src.fedoraproject.org/rpms/toolbox/pull-request/2
Resolves: RHEL-61578
31 lines
926 B
Diff
31 lines
926 B
Diff
From b524f4cebd8c65746089f898e14a99c7cfded306 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
|
Date: Thu, 3 Oct 2024 22:08:04 +0200
|
|
Subject: [PATCH] pkg/utils: Update fallback release to 40 for non-fedora hosts
|
|
|
|
Fedora 38 reached End of Life on 21st May 2024:
|
|
https://docs.fedoraproject.org/en-US/releases/eol/
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2316312
|
|
https://github.com/containers/toolbox/pull/1561
|
|
---
|
|
src/pkg/utils/utils.go | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
|
|
index eefcd1eeb2cc..37a49fedf772 100644
|
|
--- a/src/pkg/utils/utils.go
|
|
+++ b/src/pkg/utils/utils.go
|
|
@@ -64,7 +64,7 @@ const (
|
|
containerNamePrefixFallback = "fedora-toolbox"
|
|
distroFallback = "fedora"
|
|
idTruncLength = 12
|
|
- releaseFallback = "38"
|
|
+ releaseFallback = "40"
|
|
)
|
|
|
|
const (
|
|
--
|
|
2.46.1
|
|
|