import toolbox-0.0.99.3-0.14.git660b6970e998.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
commit
aa82992310
|
|
@ -0,0 +1 @@
|
|||
SOURCES/toolbox-0.0.99.3-vendored.tar.xz
|
||||
|
|
@ -0,0 +1 @@
|
|||
925877d2e970cfbf315174de4ceaa921581abed6 SOURCES/toolbox-0.0.99.3-vendored.tar.xz
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
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
|
||||
|
||||
The Go toolchain doesn't play well with passing compiler and linker
|
||||
flags via environment variables. The linker flags require a second
|
||||
level of quoting, which leaves the build system without a quote level
|
||||
to assign the flags to an environment variable like GOFLAGS.
|
||||
|
||||
This is one reason why RHEL doesn't have a RPM macro with only the
|
||||
flags. The %{gobuild} RPM macro includes the entire 'go build ...'
|
||||
invocation.
|
||||
|
||||
The Go toolchain also doesn't like the LDFLAGS environment variable as
|
||||
exported by RHEL's %{meson} RPM macro, and RHEL's RPM toolchain doesn't
|
||||
like the compressed DWARF data generated by the Go toolchain.
|
||||
|
||||
Note that these flags are only meant for the "ppc64" CPU architecture,
|
||||
and should be kept updated to match RHEL's Go guidelines. Use
|
||||
'rpm --eval "%{gobuild}"' to expand the %{gobuild} macro.
|
||||
---
|
||||
src/go-build-wrapper | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/go-build-wrapper b/src/go-build-wrapper
|
||||
index 0d27120da052..ef1a03af750a 100755
|
||||
--- a/src/go-build-wrapper
|
||||
+++ b/src/go-build-wrapper
|
||||
@@ -27,5 +27,6 @@ if ! cd "$1"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-go build -trimpath -ldflags "-extldflags '-Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2/toolbox"
|
||||
+unset LDFLAGS
|
||||
+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.31.1
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
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}
|
||||
|
||||
The Go toolchain doesn't play well with passing compiler and linker
|
||||
flags via environment variables. The linker flags require a second
|
||||
level of quoting, which leaves the build system without a quote level
|
||||
to assign the flags to an environment variable like GOFLAGS.
|
||||
|
||||
This is one reason why RHEL doesn't have a RPM macro with only the
|
||||
flags. The %{gobuild} RPM macro includes the entire 'go build ...'
|
||||
invocation.
|
||||
|
||||
The Go toolchain also doesn't like the LDFLAGS environment variable as
|
||||
exported by RHEL's %{meson} RPM macro, and RHEL's RPM toolchain doesn't
|
||||
like the compressed DWARF data generated by the Go toolchain.
|
||||
|
||||
Note that these flags are meant for every CPU architecture other than
|
||||
PPC64, and should be kept updated to match RHEL's Go guidelines. Use
|
||||
'rpm --eval "%{gobuild}"' to expand the %{gobuild} macro.
|
||||
---
|
||||
src/go-build-wrapper | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/go-build-wrapper b/src/go-build-wrapper
|
||||
index 0d27120da052..f08f3218560a 100755
|
||||
--- a/src/go-build-wrapper
|
||||
+++ b/src/go-build-wrapper
|
||||
@@ -27,5 +27,6 @@ if ! cd "$1"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-go build -trimpath -ldflags "-extldflags '-Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2/toolbox"
|
||||
+unset LDFLAGS
|
||||
+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.31.1
|
||||
|
||||
|
|
@ -0,0 +1,220 @@
|
|||
From b3eda81c7143221c78fd23d8a645e28f033b3963 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Gutierrez <ogutsua@gmail.com>
|
||||
Date: Tue, 14 Sep 2021 13:41:17 +0100
|
||||
Subject: [PATCH] Tests fixes for gating
|
||||
|
||||
|
||||
diff --git a/test/system/002-help.bats b/test/system/002-help.bats
|
||||
index 4ff02c6..cca3da4 100644
|
||||
--- a/test/system/002-help.bats
|
||||
+++ b/test/system/002-help.bats
|
||||
@@ -4,6 +4,10 @@ load 'libs/bats-support/load'
|
||||
load 'libs/bats-assert/load'
|
||||
load 'libs/helpers.bash'
|
||||
|
||||
+setup() {
|
||||
+ check_xdg_runtime_dir
|
||||
+}
|
||||
+
|
||||
@test "help: Run command 'help'" {
|
||||
run $TOOLBOX help
|
||||
|
||||
diff --git a/test/system/101-create.bats b/test/system/101-create.bats
|
||||
index 3cc3eaf..63d4fcb 100644
|
||||
--- a/test/system/101-create.bats
|
||||
+++ b/test/system/101-create.bats
|
||||
@@ -5,6 +5,7 @@ load 'libs/bats-assert/load'
|
||||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
+ check_xdg_runtime_dir
|
||||
cleanup_containers
|
||||
}
|
||||
|
||||
@@ -62,7 +63,7 @@ teardown() {
|
||||
|
||||
assert_success
|
||||
assert_output --partial "Created container: fedora-toolbox-32"
|
||||
- assert_output --partial "Enter with: toolbox enter fedora-toolbox-32"
|
||||
+ assert_output --partial "Enter with: toolbox enter --release 32"
|
||||
|
||||
# Make sure the container has actually been created
|
||||
run podman ps -a
|
||||
diff --git a/test/system/102-list.bats b/test/system/102-list.bats
|
||||
index 184ad6c..2f80843 100644
|
||||
--- a/test/system/102-list.bats
|
||||
+++ b/test/system/102-list.bats
|
||||
@@ -5,6 +5,7 @@ load 'libs/bats-assert/load'
|
||||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
+ check_xdg_runtime_dir
|
||||
cleanup_all
|
||||
}
|
||||
|
||||
@@ -61,14 +62,14 @@ teardown() {
|
||||
run $TOOLBOX list --images
|
||||
|
||||
assert_success
|
||||
- assert_output --partial "$(get_system_id)-toolbox:$(get_system_version)"
|
||||
+ assert_output --partial "$(get_default_image_name)"
|
||||
assert_output --partial "fedora-toolbox:32"
|
||||
|
||||
# Check containers
|
||||
run $TOOLBOX list --containers
|
||||
|
||||
assert_success
|
||||
- assert_output --partial "$(get_system_id)-toolbox-$(get_system_version)"
|
||||
+ assert_output --partial "$(get_default_container_name)"
|
||||
assert_output --partial "non-default-one"
|
||||
assert_output --partial "non-default-two"
|
||||
|
||||
@@ -76,9 +77,9 @@ teardown() {
|
||||
run $TOOLBOX list
|
||||
|
||||
assert_success
|
||||
- assert_output --partial "$(get_system_id)-toolbox:$(get_system_version)"
|
||||
+ assert_output --partial "$(get_default_image_name)"
|
||||
assert_output --partial "fedora-toolbox:32"
|
||||
- assert_output --partial "$(get_system_id)-toolbox-$(get_system_version)"
|
||||
+ assert_output --partial "$(get_default_container_name)"
|
||||
assert_output --partial "non-default-one"
|
||||
assert_output --partial "non-default-two"
|
||||
}
|
||||
diff --git a/test/system/103-container.bats b/test/system/103-container.bats
|
||||
index 01b61e5..554a329 100644
|
||||
--- a/test/system/103-container.bats
|
||||
+++ b/test/system/103-container.bats
|
||||
@@ -14,7 +14,7 @@ teardown() {
|
||||
|
||||
|
||||
@test "container: Check container starts without issues" {
|
||||
- readonly CONTAINER_NAME="$(get_system_id)-toolbox-$(get_system_version)"
|
||||
+ readonly CONTAINER_NAME="$(get_default_container_name)"
|
||||
|
||||
create_default_container
|
||||
|
||||
diff --git a/test/system/104-run.bats b/test/system/104-run.bats
|
||||
index 026126b..03cf291 100644
|
||||
--- a/test/system/104-run.bats
|
||||
+++ b/test/system/104-run.bats
|
||||
@@ -5,6 +5,7 @@ load 'libs/bats-assert/load'
|
||||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
+ check_xdg_runtime_dir
|
||||
cleanup_containers
|
||||
}
|
||||
|
||||
diff --git a/test/system/105-rm.bats b/test/system/105-rm.bats
|
||||
index 9f1435b..68e3c03 100644
|
||||
--- a/test/system/105-rm.bats
|
||||
+++ b/test/system/105-rm.bats
|
||||
@@ -5,6 +5,7 @@ load 'libs/bats-assert/load'
|
||||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
+ check_xdg_runtime_dir
|
||||
cleanup_containers
|
||||
}
|
||||
|
||||
diff --git a/test/system/106-rmi.bats b/test/system/106-rmi.bats
|
||||
index 0ef0ebe..b48f802 100644
|
||||
--- a/test/system/106-rmi.bats
|
||||
+++ b/test/system/106-rmi.bats
|
||||
@@ -5,6 +5,7 @@ load 'libs/bats-assert/load'
|
||||
load 'libs/helpers'
|
||||
|
||||
setup() {
|
||||
+ check_xdg_runtime_dir
|
||||
cleanup_all
|
||||
}
|
||||
|
||||
diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
|
||||
index d59d661..d44b69e 100644
|
||||
--- a/test/system/libs/helpers.bash
|
||||
+++ b/test/system/libs/helpers.bash
|
||||
@@ -8,11 +8,10 @@ readonly TOOLBOX=${TOOLBOX:-toolbox}
|
||||
readonly SKOPEO=$(command -v skopeo)
|
||||
|
||||
# Helpful globals
|
||||
-readonly PROJECT_DIR=${PWD}
|
||||
-readonly IMAGE_CACHE_DIR="${PROJECT_DIR}/image-cache"
|
||||
+readonly IMAGE_CACHE_DIR="${BATS_RUN_TMPDIR}/image-cache"
|
||||
|
||||
# Images
|
||||
-declare -Ag IMAGES=([busybox]="docker.io/library/busybox" \
|
||||
+declare -Ag IMAGES=([busybox]="quay.io/toolbox_tests/busybox" \
|
||||
[fedora]="registry.fedoraproject.org/fedora-toolbox" \
|
||||
[rhel]="registry.access.redhat.com/ubi8")
|
||||
|
||||
@@ -245,6 +244,7 @@ function find_os_release() {
|
||||
|
||||
# Returns the content of field ID in os-release
|
||||
function get_system_id() {
|
||||
+ if [[ -z ${TOOLBOX_TEST_SYSTEM_ID} ]]; then
|
||||
local os_release
|
||||
|
||||
os_release="$(find_os_release)"
|
||||
@@ -255,19 +255,51 @@ function get_system_id() {
|
||||
fi
|
||||
|
||||
echo $(awk -F= '/ID/ {print $2}' $os_release | head -n 1)
|
||||
+ else
|
||||
+ echo ${TOOLBOX_TEST_SYSTEM_ID}
|
||||
+ fi
|
||||
}
|
||||
|
||||
|
||||
# Returns the content of field VERSION_ID in os-release
|
||||
function get_system_version() {
|
||||
- local os_release
|
||||
+ if [[ -z ${TOOLBOX_TEST_VERSION_ID} ]]; then
|
||||
+ local os_release
|
||||
|
||||
- os_release="$(find_os_release)"
|
||||
+ os_release="$(find_os_release)"
|
||||
|
||||
- if [[ -z "$os_release" ]]; then
|
||||
- echo ""
|
||||
- return
|
||||
+ if [[ -z "$os_release" ]]; then
|
||||
+ echo ""
|
||||
+ return
|
||||
+ fi
|
||||
+
|
||||
+ echo $(awk -F= '/VERSION_ID/ {print $2}' $os_release | head -n 1)
|
||||
+ else
|
||||
+ echo ${TOOLBOX_TEST_VERSION_ID}
|
||||
fi
|
||||
+}
|
||||
+
|
||||
|
||||
- echo $(awk -F= '/VERSION_ID/ {print $2}' $os_release | head -n 1)
|
||||
+# Setup the XDG_RUNTIME_DIR variable if not set
|
||||
+function check_xdg_runtime_dir() {
|
||||
+ if [[ -z "${XDG_RUNTIME_DIR}" ]]; then
|
||||
+ export XDG_RUNTIME_DIR="/run/user/${UID}"
|
||||
+ fi
|
||||
}
|
||||
+
|
||||
+
|
||||
+function get_default_container_name() {
|
||||
+ if [[ -z ${TOOLBOX_TEST_DEFAULT_CONTAINER_NAME} ]]; then
|
||||
+ echo $(get_system_id)-toolbox-$(get_system_version)
|
||||
+ else
|
||||
+ echo ${TOOLBOX_TEST_DEFAULT_CONTAINER_NAME}
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+function get_default_image_name() {
|
||||
+ if [[ -z ${TOOLBOX_TEST_DEFAULT_IMAGE_NAME} ]]; then
|
||||
+ echo $(get_system_id)-toolbox:$(get_system_version)
|
||||
+ else
|
||||
+ echo ${TOOLBOX_TEST_DEFAULT_IMAGE_NAME}
|
||||
+ fi
|
||||
+}
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
From 6b47ff61936d2b602d29b229b079bda00dadad7e Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||
Date: Thu, 2 Sep 2021 14:57:37 +0200
|
||||
Subject: [PATCH] cmd/root: Suggest a way forward if coreos/toolbox was used
|
||||
|
||||
github.com/coreos/toolbox bind mounts the entire /run from the host
|
||||
operating system into the toolbox container. Due to this, when run
|
||||
rootful, the /run/.containerenv created by Podman inside the container
|
||||
is also seen on the host. This confuses Toolbox into thinking that it's
|
||||
running inside a container, even when it's running on the host.
|
||||
|
||||
This is an attempt to differentiate between a toolbox container and
|
||||
the host by looking at the 'container' environment variable, so that
|
||||
the user can be presented with a more helpful error message.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1998191
|
||||
---
|
||||
src/cmd/root.go | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/cmd/root.go b/src/cmd/root.go
|
||||
index 5e6f5874a469..139609592218 100644
|
||||
--- a/src/cmd/root.go
|
||||
+++ b/src/cmd/root.go
|
||||
@@ -130,6 +130,16 @@ func preRun(cmd *cobra.Command, args []string) error {
|
||||
|
||||
if toolboxPath == "" {
|
||||
if utils.IsInsideContainer() {
|
||||
+ if containerType := os.Getenv("container"); containerType == "" {
|
||||
+ var builder strings.Builder
|
||||
+ fmt.Fprintf(&builder, "/run/.containerenv found on what looks like the host\n")
|
||||
+ fmt.Fprintf(&builder, "If this is the host, then remove /run/.containerenv and try again.\n")
|
||||
+ fmt.Fprintf(&builder, "Otherwise, contact your system administrator or file a bug.")
|
||||
+
|
||||
+ errMsg := builder.String()
|
||||
+ return errors.New(errMsg)
|
||||
+ }
|
||||
+
|
||||
return errors.New("TOOLBOX_PATH not set")
|
||||
}
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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.access.redhat.com/ubi9/toolbox:latest"
|
||||
|
|
@ -0,0 +1,313 @@
|
|||
# RHEL's RPM toolchain doesn't like the compressed DWARF data generated by the
|
||||
# Go toolchain.
|
||||
%global _dwz_low_mem_die_limit 0
|
||||
%global _find_debuginfo_dwz_opts %{nil}
|
||||
|
||||
Name: toolbox
|
||||
Version: 0.0.99.3
|
||||
|
||||
%global goipath github.com/containers/%{name}
|
||||
%gometa
|
||||
|
||||
Release: 0.14.git660b6970e998%{?dist}
|
||||
Summary: Unprivileged development environment
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/containers/%{name}
|
||||
|
||||
# https://github.com/containers/%%{name}/releases/download/%%{version}/%%{name}-%%{version}.tar.xz
|
||||
# A vendored tarball was created from the upstream tarball:
|
||||
# $ 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
|
||||
Patch103: toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch
|
||||
Patch104: toolbox-Test-fixes-for-gating.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
BuildRequires: golang >= 1.13
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig(bash-completion)
|
||||
BuildRequires: systemd
|
||||
|
||||
Requires: containers-common
|
||||
Requires: podman >= 1.4.0
|
||||
|
||||
|
||||
%description
|
||||
Toolbox is a tool for Linux operating systems, which allows the use of
|
||||
containerized command line environments. It is built on top of Podman and
|
||||
other standard container technologies from OCI.
|
||||
|
||||
|
||||
%package tests
|
||||
Summary: Tests for %{name}
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: skopeo
|
||||
|
||||
%description tests
|
||||
The %{name}-tests package contains system tests for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%ifnarch ppc64
|
||||
%patch100 -p1
|
||||
%else
|
||||
%patch101 -p1
|
||||
%endif
|
||||
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
%patch104 -p1
|
||||
|
||||
# %%gomkdir is absent from RHEL 8.
|
||||
GOBUILDDIR="$(pwd)/_build"
|
||||
GOSOURCEDIR="$(pwd)"
|
||||
if [[ ! -e "$GOBUILDDIR/bin" ]] ; then
|
||||
install -m 0755 -vd "$GOBUILDDIR/bin"
|
||||
fi
|
||||
if [[ ! -e "$GOBUILDDIR/src/%{goipath}" ]] ; then
|
||||
install -m 0755 -vd "$(dirname $GOBUILDDIR/src/%{goipath})"
|
||||
ln -fs "$GOSOURCEDIR" "$GOBUILDDIR/src/%{goipath}"
|
||||
fi
|
||||
cd "$GOBUILDDIR/src/%{goipath}"
|
||||
|
||||
|
||||
%build
|
||||
export GO111MODULE=off
|
||||
GOBUILDDIR="$(pwd)/_build"
|
||||
export GOPATH="$GOBUILDDIR:%{gopath}"
|
||||
export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
ln -s src/cmd cmd
|
||||
ln -s src/pkg pkg
|
||||
ln -s src/vendor vendor
|
||||
%meson --buildtype=plain -Dprofile_dir=%{_sysconfdir}/profile.d
|
||||
%meson_build
|
||||
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
||||
|
||||
|
||||
%files
|
||||
%doc CODE-OF-CONDUCT.md NEWS README.md SECURITY.md
|
||||
%license COPYING
|
||||
%{_bindir}/%{name}
|
||||
%{_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
|
||||
|
||||
%files tests
|
||||
%{_datadir}/%{name}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 22 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.14.git660b6970e998
|
||||
- Suggest a way forward if coreos/toolbox was used
|
||||
Resolves: #2006802
|
||||
|
||||
* Wed Sep 22 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.13.git660b6970e998
|
||||
- Switch to using the Toolbox-specific UBI image by default
|
||||
Resolves: #2004563
|
||||
|
||||
* Thu Sep 16 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.12.git660b6970e998
|
||||
- Changed image for tests and tests parameters to fix gating
|
||||
Related: #2000051
|
||||
|
||||
* Thu Sep 16 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.11.git660b6970e998
|
||||
- Changed image for tests and added /etc/containers dir check
|
||||
Related: #2000051
|
||||
|
||||
* Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.10.git660b6970e998
|
||||
- Added ability to force test system id and version id
|
||||
Related: #2000051
|
||||
|
||||
* Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.9.git660b6970e998
|
||||
- Fixed test roles and changed default image path
|
||||
Related: #2000051
|
||||
|
||||
* Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.8.git660b6970e998
|
||||
- Added default container image configuration for tests
|
||||
Related: #2000051
|
||||
|
||||
* Fri Sep 03 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.7.git660b6970e998
|
||||
- Added missing gating tests files and patch for tests
|
||||
Related: #2000051
|
||||
|
||||
* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.6.git660b6970e998
|
||||
- re-add gating tests
|
||||
- Related: #2000051
|
||||
|
||||
* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.5.git660b6970e998
|
||||
- Make sosreport work by setting the HOST environment variable
|
||||
- Related: #2000051
|
||||
|
||||
* Mon Aug 30 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.4.git660b6970e998
|
||||
- Fixed gating tests bats version
|
||||
Related: rhbz#1977343
|
||||
|
||||
* Tue Aug 24 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.3.git660b6970e998
|
||||
- Rebuilt for gating checks
|
||||
Related: rhbz#1977343
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.3-0.2.git660b6970e998
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Aug 02 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.1.git660b6970e998
|
||||
- Fix the build on CentOS Stream
|
||||
Related: #1970747
|
||||
|
||||
* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2^1.git660b6970e998-1
|
||||
- Add support for configuration files
|
||||
- Related: #1970747
|
||||
|
||||
* 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
|
||||
- Resolves: #1977343
|
||||
|
||||
* 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
|
||||
- Resolves: #1977343
|
||||
|
||||
* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-1
|
||||
- update to 0.99.2
|
||||
- Resolves: #1977343
|
||||
|
||||
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.1-4
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Thu Apr 29 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.1-3
|
||||
- Fix FTBFS
|
||||
Resolves: #1912983
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.1-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Feb 23 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.1-1
|
||||
- Update to 0.0.99.1
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.99-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jan 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99-1
|
||||
- Update to 0.0.99
|
||||
|
||||
* Mon Jan 11 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.98.1-2
|
||||
- Harden the binary by using the same CGO_CFLAGS as on RHEL 8
|
||||
|
||||
* Thu Jan 07 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.98.1-1
|
||||
- Update to 0.0.98.1
|
||||
|
||||
* Tue Jan 05 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.98-1
|
||||
- Update to 0.0.98
|
||||
|
||||
* Wed Nov 25 2020 Ondřej Míchal <harrymichal@seznam.cz> - 0.0.97-2
|
||||
- Move krb5-libs from -support to -experience, and update the list of packages
|
||||
in -experience
|
||||
|
||||
* Tue Nov 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.97-1
|
||||
- Update to 0.0.97
|
||||
|
||||
* Thu Oct 01 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.96-1
|
||||
- Update to 0.0.96
|
||||
|
||||
* Sun Aug 30 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.95-1
|
||||
- Update to 0.0.95
|
||||
|
||||
* Mon Aug 24 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.94-1
|
||||
- Update to 0.0.94
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.93-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Jul 25 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.93-1
|
||||
- Update to 0.0.93
|
||||
|
||||
* Fri Jul 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.92-1
|
||||
- Update to 0.0.92
|
||||
|
||||
* Fri Jul 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.91-2
|
||||
- Fix the 'toolbox --version' output
|
||||
|
||||
* Tue Jun 30 2020 Harry Míchal <harrymichal@seznam.cz> - 0.0.91-1
|
||||
- Update to 0.0.91
|
||||
|
||||
* Sat Jun 27 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-5
|
||||
- Remove ExclusiveArch to match Podman
|
||||
|
||||
* Wed Jun 10 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-4
|
||||
- Sync the "experience" packages with the current Dockerfile
|
||||
- Make "experience" Require "support"
|
||||
|
||||
* Fri Apr 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-3
|
||||
- Drop compatibility Obsoletes and Provides for fedora-toolbox
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Jan 14 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-1
|
||||
- Update to 0.0.18
|
||||
|
||||
* Wed Nov 20 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.17-1
|
||||
- Update to 0.0.17
|
||||
|
||||
* Tue Oct 29 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.16-1
|
||||
- Update to 0.0.16
|
||||
|
||||
* Mon Sep 30 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.15-1
|
||||
- Update to 0.0.15
|
||||
|
||||
* Wed Sep 18 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.14-1
|
||||
- Update to 0.0.14
|
||||
|
||||
* Thu Sep 05 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.13-1
|
||||
- Update to 0.0.13
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jul 22 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.12-1
|
||||
- Update to 0.0.12
|
||||
|
||||
* Tue Jun 25 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.11-2
|
||||
- Require flatpak-session-helper
|
||||
|
||||
* Fri Jun 21 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.11-1
|
||||
- Update to 0.0.11
|
||||
|
||||
* Tue May 21 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.10-1
|
||||
- Update to 0.0.10
|
||||
|
||||
* Tue Apr 30 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.9-1
|
||||
- Update to 0.0.9
|
||||
|
||||
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 0.0.8-2
|
||||
- Rebuild with Meson fix for #1699099
|
||||
|
||||
* Fri Apr 12 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.8-1
|
||||
- Update to 0.0.8
|
||||
|
||||
* Thu Mar 14 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.7-1
|
||||
- Update to 0.0.7
|
||||
|
||||
* Fri Feb 22 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.6-1
|
||||
- Initial build after rename from fedora-toolbox
|
||||
Loading…
Reference in New Issue