From 191846dcbd0d912ee3e6c35c03adeb0c01de88ca6f2f850c76b9863cbd6defe3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Jan 2021 20:49:50 +0000 Subject: [PATCH] Accepting request 865034 from devel:kubic OBS-URL: https://build.opensuse.org/request/show/865034 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/toolbox?expand=0&rev=8 --- _servicedata | 2 +- microos-toolbox-1.0+git20201126.3d26283.tar.xz | 3 --- microos-toolbox-1.0+git20210119.b5acdcf.tar.xz | 3 +++ toolbox.changes | 12 ++++++++++++ toolbox.spec | 13 +++++++++++-- toolboxrc | 2 ++ 6 files changed, 29 insertions(+), 6 deletions(-) delete mode 100644 microos-toolbox-1.0+git20201126.3d26283.tar.xz create mode 100644 microos-toolbox-1.0+git20210119.b5acdcf.tar.xz create mode 100644 toolboxrc diff --git a/_servicedata b/_servicedata index fb08809..a69e492 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/thkukuk/microos-toolbox.git - 3d26283d2baa62d1351c3dbe356caf8590d202f0 + b5acdcfad5dd3f09536bd312790015f61c27f40a \ No newline at end of file diff --git a/microos-toolbox-1.0+git20201126.3d26283.tar.xz b/microos-toolbox-1.0+git20201126.3d26283.tar.xz deleted file mode 100644 index 19078a1..0000000 --- a/microos-toolbox-1.0+git20201126.3d26283.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ea54231e7d45f9ab274a660049297ec47ea367611a794f7a7d2f92a7628f22e -size 8924 diff --git a/microos-toolbox-1.0+git20210119.b5acdcf.tar.xz b/microos-toolbox-1.0+git20210119.b5acdcf.tar.xz new file mode 100644 index 0000000..21393a6 --- /dev/null +++ b/microos-toolbox-1.0+git20210119.b5acdcf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a359fb69a229a8e768eee2bfa5e9c084112ccb433421100d8fe453a2024b979 +size 8948 diff --git a/toolbox.changes b/toolbox.changes index ead0784..cfa09ce 100644 --- a/toolbox.changes +++ b/toolbox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jan 20 09:57:44 UTC 2021 - Thorsten Kukuk + +- Add a group tag for SLE Micro +- Mark toolboxrc as %config and add it is Source + +------------------------------------------------------------------- +Tue Jan 19 13:12:13 UTC 2021 - bruno.leon@suse.com + +- Update to version 1.0+git20210119.b5acdcf: + * Dynamically set REGISTRY and IMAGE (#11) + ------------------------------------------------------------------- Thu Nov 26 10:48:21 UTC 2020 - kukuk@suse.com diff --git a/toolbox.spec b/toolbox.spec index b1edcdb..fd4d2fa 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -1,7 +1,7 @@ # # spec file for package toolbox # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,14 @@ Name: toolbox -Version: 1.0+git20201126.3d26283 +Version: 1.0+git20210119.b5acdcf Release: 0 Summary: Script to start a toolbox container for system debugging License: Apache-2.0 +Group: System/Management URL: https://github.com/thkukuk/microos-toolbox Source: microos-toolbox-%{version}.tar.xz +Source1: toolboxrc Requires: podman BuildArch: noarch @@ -42,10 +44,17 @@ such a system. The root filesystem can be found at /media/root. %install mkdir -p %{buildroot}%{_bindir} install -m 755 toolbox %{buildroot}%{_bindir}/toolbox +%if !0%{?is_opensuse} +mkdir -p %{buildroot}%{_sysconfdir} +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/toolboxrc +%endif %files %license LICENSE %doc README.md %{_bindir}/toolbox +%if !0%{?is_opensuse} +%config %{_sysconfdir}/toolboxrc +%endif %changelog diff --git a/toolboxrc b/toolboxrc new file mode 100644 index 0000000..f06a49c --- /dev/null +++ b/toolboxrc @@ -0,0 +1,2 @@ +REGISTRY=registry.suse.com +IMAGE=suse/toolbox