toolbox/toolbox-Update-fallback-release-to-40-for-non-fedo.patch

31 lines
926 B
Diff
Raw Normal View History

Update to 0.0.99.6 Update the compiler and linker flags for RHEL 10 by incorporating the distribution's defaults from RHEL 10.0 Beta, because RHEL 10.0 is still early in its development cycle and the defaults may be in a state of flux. Some exceptions are mentioned below. The '-z pack-relative-relocs' linker flag was left out. It's currently not supported on s390x, so using it would require architecture specific patches, which is a hassle. Support for aarch64 was recently added [1], so hopefully s390x will also be supported soon. The change to use the RPM's %{name}, %{version}, %{release} and the SOURCE_DATE_EPOCH environment variable [2], instead of /dev/urandom, to generate the build ID annotation for the toolbox(1) binary [3] was left out. It will need more work to propagate the RPM's %{name}, %{version} and %{release} to Meson. 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' [4]. 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 [5], even before the patch was added [6]. 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] CentOS Stream redhat-rpm-config commit 3c5a6b17540b2a0b https://gitlab.com/redhat/centos-stream/rpms/redhat-rpm-config/-/commit/3c5a6b17540b2a0b https://gitlab.com/redhat/centos-stream/rpms/redhat-rpm-config/-/merge_requests/42 https://issues.redhat.com/browse/RHEL-40379 [2] https://reproducible-builds.org/docs/source-date-epoch/ [3] go-rpm-macros commit 1980932bf3a21890 https://pagure.io/go-rpm-macros/c/1980932bf3a21890 https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds [4] Upstream commit 83f28c52e47c2d44 https://github.com/containers/toolbox/commit/83f28c52e47c2d44 https://github.com/containers/toolbox/pull/1548 [5] https://fedoraproject.org/wiki/Changes/DiscontinuePPC64 [6] Fedora toolbox commit ba60453d216a9226 https://src.fedoraproject.org/rpms/toolbox/c/ba60453d216a9226 https://src.fedoraproject.org/rpms/toolbox/pull-request/2 Resolves: RHEL-61579
2024-10-04 13:59:13 +00:00
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