import toolbox-0.0.99.3-0.2.module+el8.5.0+12395+c8e7922f

2021-10-05 20:33:36 -04:00 · 2021-10-05 20:33:36 -04:00 · 067866e1f5
commit 067866e1f5
parent 1f1a86c26d
7 changed files with 97 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/toolbox-0.0.99-vendored.tar.xz
+SOURCES/toolbox-0.0.99.3-vendored.tar.xz
--- a/.toolbox.metadata
+++ b/.toolbox.metadata
@ -1 +1 @@
-2520d76c13573ab6e543793ab8982026bcaf7882 SOURCES/toolbox-0.0.99-vendored.tar.xz
+925877d2e970cfbf315174de4ceaa921581abed6 SOURCES/toolbox-0.0.99.3-vendored.tar.xz
--- a/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
+++ b/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
@ -1,4 +1,4 @@
-From eac80eca4f0e54e38459438ba56d6172fda8cd32 Mon Sep 17 00:00:00 2001
+From a245af969792bafcfa86090c856a06cb23061816 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's %{gobuild} for PPC64
@ -24,7 +24,7 @@ and should be kept updated to match RHEL's Go guidelines. Use
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/go-build-wrapper b/src/go-build-wrapper
-index 515e1d8a0670..3bd47ce5ae6f 100755
+index 0d27120da052..ef1a03af750a 100755
 --- a/src/go-build-wrapper
 +++ b/src/go-build-wrapper
@@ -27,5 +27,6 @@ if ! cd "$1"; then
@ -36,5 +36,5 @@ index 515e1d8a0670..3bd47ce5ae6f 100755
 +go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox"
 exit "$?"
 -- 
-2.29.2
+2.31.1

--- a/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
+++ b/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
@ -1,4 +1,4 @@
-From 856a7f524b63f9033c47a8169fbf8a1cfdf69683 Mon Sep 17 00:00:00 2001
+From 05722d2861c23554b9741c059e853da9ab38282e 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's %{gobuild}
@ -24,7 +24,7 @@ PPC64, and should be kept updated to match RHEL's Go guidelines. Use
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/go-build-wrapper b/src/go-build-wrapper
-index 515e1d8a0670..453b4cfa872b 100755
+index 0d27120da052..f08f3218560a 100755
 --- a/src/go-build-wrapper
 +++ b/src/go-build-wrapper
@@ -27,5 +27,6 @@ if ! cd "$1"; then
@ -36,5 +36,5 @@ index 515e1d8a0670..453b4cfa872b 100755
 +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox"
 exit "$?"
 -- 
-2.29.2
+2.31.1

--- a/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch
+++ b/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch
@ -0,0 +1,26 @@
+From 786c5065c73703ef46e13905a4672f1b4918310a Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Wed, 18 Aug 2021 17:55:21 +0200
+Subject: [PATCH] cmd/run: Make sosreport work by setting the HOST environment
+ variable
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1940037
+---
+ src/cmd/run.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cmd/run.go b/src/cmd/run.go
+index e8e96932415e..188f0f2394df 100644
+--- a/src/cmd/run.go
+++ b/src/cmd/run.go
+@@ -443,6 +443,7 @@ func constructExecArgs(container string,
+ 	execArgs = append(execArgs, detachKeys...)
+ 
+ 	execArgs = append(execArgs, []string{
+		"--env", "HOST=/run/host",
+ 		"--interactive",
+ 		"--tty",
+ 		"--user", currentUser.Username,
+-- 
+2.31.1
+
--- a/SOURCES/toolbox.conf
+++ b/SOURCES/toolbox.conf
@ -0,0 +1,17 @@
+[general]
+# Create a toolbox container for a different operating system distro than the
+# host. Cannot be used with 'image'.
+## distro = "fedora"
+
+# Create a toolbox container for a different operating system release than the
+# host. Cannot be used with 'image'.
+## release = "33"
+
+# Change the name of the image used to create the toolbox container. This is
+# useful for creating containers from custom-built images. Cannot be used with
+# 'distro' or 'release'.
+#
+# If the name does not contain a registry, the local image storage will be
+# consulted, and if it's not present there then it will be pulled from a
+# suitable remote registry.
+image = "registry.redhat.io/rhel8/support-tools:latest"
--- a/SPECS/toolbox.spec
+++ b/SPECS/toolbox.spec
@ -4,12 +4,12 @@
 %global _find_debuginfo_dwz_opts %{nil}

 Name:          toolbox
-Version:       0.0.99
+Version:       0.0.99.3

 %global goipath github.com/containers/%{name}
 %gometa

-Release:       1%{?dist}
+Release:       0.2%{?dist}
 Summary:       Unprivileged development environment

 License:       ASL 2.0
@ -20,10 +20,12 @@ URL:           https://github.com/containers/%{name}
 # $ cd src
 # $ go mod vendor
 Source0:       %{name}-%{version}-vendored.tar.xz
+Source1:       %{name}.conf

 # RHEL specific
 Patch100:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
 Patch101:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
+Patch102:      toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch

 # https://bugzilla.redhat.com/show_bug.cgi?id=1905383
 ExcludeArch:   %{ix86}
@ -34,6 +36,7 @@ BuildRequires: meson
 BuildRequires: pkgconfig(bash-completion)
 BuildRequires: systemd

+Requires:      containers-common
 Requires:      podman >= 1.4.0


@ -61,6 +64,8 @@ The %{name}-tests package contains system tests for %{name}.
 %patch101 -p1
 %endif

+%patch102 -p1
+
 # %%gomkdir is absent from RHEL 8.
 GOBUILDDIR="$(pwd)/_build"
 GOSOURCEDIR="$(pwd)"
@ -88,6 +93,7 @@ ln -s src/vendor vendor

 %install
 %meson_install
+install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf


 %files
@ -97,6 +103,7 @@ ln -s src/vendor vendor
 %{_datadir}/bash-completion
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/%{name}-*.1*
+%config(noreplace) %{_sysconfdir}/containers/%{name}.conf
 %{_sysconfdir}/profile.d/%{name}.sh
 %{_tmpfilesdir}/%{name}.conf

@ -105,6 +112,43 @@ ln -s src/vendor vendor


 %changelog
+* Thu Aug 26 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.2
+- Make sosreport work by setting the HOST environment variable
+- Related: #1934415
+
+* Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.1
+- change release to 0.x so it is obvious it is devel version
+- Related: #1934415
+
+* Thu Aug 05 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-1
+- Fix the build on CentOS Stream
+- Related: #1934415
+
+* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2^1.git660b6970e998-1
+- Add support for configuration files
+Resolves: #1940082
+- Related: #1934415
+
+* Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-4
+- Instead of offering to log into a registry, just mention 'podman login'
+- Related: #1934415
+
+* Sat Jul 10 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-3
+- Expose the host's entire / in the container at /run/host
+- Related: #1934415
+
+* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-2
+- Actually apply the patch to make 'toolbox' create or fall back to a
+  container if possible
+- Support logging into a registry if necessary
+- Related: #1934415
+
+* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-1
+- Update to 0.0.99.2
+- Make 'toolbox' create or fall back to a container if possible
+Resolves: #1914687
+- Related: #1934415
+
 * Tue Jan 12 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99-1
 - Update to 0.0.99
 - Related: #1883490