Update to 0.1.2
Resolves: RHEL-95210
This commit is contained in:
Debarshi Ray
parent
84e5d828d1
commit
663a0c9ecd
1
.gitignore
vendored
1
.gitignore
vendored
@ -33,3 +33,4 @@
|
||||
/toolbox-0.0.99.5-vendored.tar.xz
|
||||
/toolbox-0.0.99.6-vendored.tar.xz
|
||||
/toolbox-0.1.1-vendored.tar.xz
|
||||
/toolbox-0.1.2-vendored.tar.xz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (toolbox-0.1.1-vendored.tar.xz) = dc3aa19f504de49addfe85fa800a0e553c65292cf0d48bca60946251fb8d7ba8bc53c9411a7db5f83f1d256ec960b0f22d2d5798f022be5b704c2bf3531f4ba1
|
||||
SHA512 (toolbox-0.1.2-vendored.tar.xz) = 1d1b461b84d0c995c4f793eb154815c1ed68ce3545dfb8e711a0061484efb988e796bca43f7ada3c8d9eb0673c6c1fe9f923226eff6e7bc3de9e4b2e2e44485e
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c25ad44b7cb50d470b1533931b7808cc194f0d50 Mon Sep 17 00:00:00 2001
|
||||
From 401abbfb6f820670bc14ca5c555151a0a657b67b Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||
Date: Wed, 18 Aug 2021 17:55:21 +0200
|
||||
Subject: [PATCH 1/2] cmd/run: Make sosreport work by setting the HOST
|
||||
@ -10,10 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1940037
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/cmd/run.go b/src/cmd/run.go
|
||||
index 719c0d6abb20..92a097283f38 100644
|
||||
index 7094c3a4eec9..f6c7acffe76a 100644
|
||||
--- a/src/cmd/run.go
|
||||
+++ b/src/cmd/run.go
|
||||
@@ -566,6 +566,7 @@ func constructExecArgs(container, preserveFDs string,
|
||||
@@ -573,6 +573,7 @@ func constructExecArgs(container, preserveFDs string,
|
||||
execArgs = append(execArgs, envOptions...)
|
||||
|
||||
execArgs = append(execArgs, []string{
|
||||
@ -22,10 +22,10 @@ index 719c0d6abb20..92a097283f38 100644
|
||||
"--preserve-fds", preserveFDs,
|
||||
}...)
|
||||
--
|
||||
2.46.1
|
||||
2.49.0
|
||||
|
||||
|
||||
From e7877a4d1d38dc35aa6da6c012ec9a23397b7aa4 Mon Sep 17 00:00:00 2001
|
||||
From a5d5fdfe8539af0a23af5a5503197389a0a4d0dd Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||
Date: Fri, 10 Dec 2021 13:42:15 +0100
|
||||
Subject: [PATCH 2/2] test/system: Update to test the migration path for
|
||||
@ -42,10 +42,10 @@ ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
|
||||
create mode 100644 test/system/100-root.bats
|
||||
|
||||
diff --git a/test/system/002-help.bats b/test/system/002-help.bats
|
||||
index a8bfbc2c79d2..5dd14025ea0b 100644
|
||||
index 921c23b51a44..192603d71aba 100644
|
||||
--- a/test/system/002-help.bats
|
||||
+++ b/test/system/002-help.bats
|
||||
@@ -33,20 +33,6 @@ teardown() {
|
||||
@@ -34,20 +34,6 @@ teardown_file() {
|
||||
cleanup_all
|
||||
}
|
||||
|
||||
@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c
|
||||
+ skip "Testing of entering toolboxes is not implemented"
|
||||
+}
|
||||
--
|
||||
2.46.1
|
||||
2.49.0
|
||||
|
||||
|
||||
@ -1,11 +1,26 @@
|
||||
From 7dc70160c8ff531473004e879dd57ec303789d71 Mon Sep 17 00:00:00 2001
|
||||
From 767c59c40128dda3d29191be8289ff16af888187 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
||||
|
||||
These reflect the defaults for Fedora 39, which is the oldest supported
|
||||
Fedora, barring some exceptions mentioned below.
|
||||
|
||||
The change to use the RPM's %{name}, %{version}, %{release} and the
|
||||
SOURCE_DATE_EPOCH environment variable [1], instead of /dev/urandom, to
|
||||
generate the build ID annotation for the toolbox(1) binary [2] was left
|
||||
out. It will need more work to propagate the RPM's %{name}, %{version}
|
||||
and %{release} to Meson.
|
||||
|
||||
Note that these flags are meant for every CPU architecture other than
|
||||
PPC64, and should be kept updated to match Fedora's Go guidelines. Use
|
||||
'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
|
||||
|
||||
[1] https://reproducible-builds.org/docs/source-date-epoch/
|
||||
|
||||
[2] go-rpm-macros commit 1980932bf3a21890
|
||||
https://pagure.io/go-rpm-macros/c/1980932bf3a21890
|
||||
https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds
|
||||
---
|
||||
src/go-build-wrapper | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
@ -43,5 +58,5 @@ index a5a1a6a508fb..5978422e9aed 100755
|
||||
|
||||
exit "$?"
|
||||
--
|
||||
2.46.1
|
||||
2.49.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f08f64c0d5f2019055381c3c00426fe8545e5e31 Mon Sep 17 00:00:00 2001
|
||||
From 2090a139dc6b9be6d51fbd7875fda06b6502cda0 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||
Subject: [PATCH] build: Make the build flags match RHEL 10's %{gobuildflags}
|
||||
@ -67,5 +67,5 @@ index a5a1a6a508fb..5978422e9aed 100755
|
||||
|
||||
exit "$?"
|
||||
--
|
||||
2.46.1
|
||||
2.49.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ff1320fa869f1e4952836436ab2ad928cbba0987 Mon Sep 17 00:00:00 2001
|
||||
From 3603ef5eff9615b7df2bf665fd5edc9434d99f6e Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||
Subject: [PATCH] build: Make the build flags match RHEL 9's %{gobuildflags}
|
||||
@ -46,5 +46,5 @@ index a5a1a6a508fb..0a2c7526f210 100755
|
||||
|
||||
exit "$?"
|
||||
--
|
||||
2.46.1
|
||||
2.49.0
|
||||
|
||||
|
||||
40
toolbox.spec
40
toolbox.spec
@ -1,7 +1,7 @@
|
||||
%global __brp_check_rpaths %{nil}
|
||||
|
||||
Name: toolbox
|
||||
Version: 0.1.1
|
||||
Version: 0.1.2
|
||||
|
||||
%global goipath github.com/containers/%{name}
|
||||
|
||||
@ -17,10 +17,10 @@ Version: 0.1.1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%global toolbx_go 1.20
|
||||
%global toolbx_go 1.21
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global toolbx_go 1.22.7
|
||||
%global toolbx_go 1.23.9
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
@ -29,11 +29,11 @@ Version: 0.1.1
|
||||
%elif 0%{?rhel} == 10
|
||||
%global toolbx_go 1.22.5
|
||||
%elif 0%{?rhel} > 10
|
||||
%global toolbx_go 1.23.1
|
||||
%global toolbx_go 1.24.3
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Tool for interactive command line environments on Linux
|
||||
|
||||
License: Apache-2.0
|
||||
@ -60,31 +60,13 @@ BuildRequires: shadow-utils-subid-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%if ! 0%{?rhel}
|
||||
BuildRequires: golang(github.com/HarryMichal/go-version) >= 1.0.1
|
||||
BuildRequires: golang-ipath(github.com/NVIDIA/go-nvlib) >= 0.6.1
|
||||
BuildRequires: golang-ipath(github.com/NVIDIA/go-nvml) >= 0.12.4.0
|
||||
BuildRequires: golang-ipath(github.com/NVIDIA/nvidia-container-toolkit) >= 1.16.2
|
||||
BuildRequires: golang(github.com/acobaugh/osrelease) >= 0.1.0
|
||||
BuildRequires: golang(github.com/briandowns/spinner) >= 1.18.0
|
||||
BuildRequires: golang(github.com/docker/go-units) >= 0.5.0
|
||||
BuildRequires: golang(github.com/fsnotify/fsnotify) >= 1.7.0
|
||||
BuildRequires: golang(github.com/go-logfmt/logfmt) >= 0.5.0
|
||||
BuildRequires: golang(github.com/godbus/dbus) >= 5.0.6
|
||||
BuildRequires: golang(github.com/google/renameio/v2) >= 2.0.0
|
||||
BuildRequires: golang(github.com/sirupsen/logrus) >= 1.9.3
|
||||
BuildRequires: golang(github.com/spf13/cobra) >= 1.3.0
|
||||
BuildRequires: golang(github.com/spf13/viper) >= 1.10.1
|
||||
BuildRequires: golang-ipath(golang.org/x/sys) >= 0.24.0
|
||||
BuildRequires: golang(golang.org/x/text) >= 0.3.8
|
||||
BuildRequires: golang-ipath(gopkg.in/yaml.v3) >= 3.0.1
|
||||
BuildRequires: golang-ipath(tags.cncf.io/container-device-interface) >= 0.8.0
|
||||
BuildRequires: pkgconfig(fish)
|
||||
# for tests
|
||||
# BuildRequires: codespell
|
||||
# BuildRequires: golang(github.com/stretchr/testify) >= 1.9.0
|
||||
# BuildRequires: ShellCheck
|
||||
%endif
|
||||
|
||||
Recommends: p11-kit-server
|
||||
Recommends: skopeo
|
||||
%if ! 0%{?rhel}
|
||||
Recommends: fuse-overlayfs
|
||||
@ -152,12 +134,10 @@ The %{name}-tests package contains system tests for %{name}.
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k}
|
||||
%gomkdir -s %{_builddir}/%{extractdir}/src -k
|
||||
|
||||
|
||||
%build
|
||||
export %{gomodulesmode}
|
||||
export GOPATH=%{gobuilddir}:%{gopath}
|
||||
export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
|
||||
%meson \
|
||||
@ -190,7 +170,7 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
||||
|
||||
%files
|
||||
%doc CODE-OF-CONDUCT.md CONTRIBUTING.md GOALS.md NEWS README.md SECURITY.md
|
||||
%license COPYING %{?rhel:src/vendor/modules.txt}
|
||||
%license COPYING src/vendor/modules.txt
|
||||
%{_bindir}/%{name}
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
%{_mandir}/man1/%{name}-*.1*
|
||||
@ -208,6 +188,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.2-1
|
||||
- Update to 0.1.2
|
||||
Resolves: RHEL-95210
|
||||
|
||||
* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-2
|
||||
- Add 'Requires: flatpak-session-helper'
|
||||
Resolves: RHEL-97099
|
||||
|
||||
Loading…
Reference in New Issue
Block a user