update to lastest release

This commit is contained in:
duyiwei 2022-11-10 15:17:05 +08:00
parent 49e34ca980
commit e55976635d
4 changed files with 74 additions and 5 deletions

View File

@ -0,0 +1,58 @@
From d4da0320234814ec17a817d049440cfd17833ecf Mon Sep 17 00:00:00 2001
From: duyiwei <duyiwei@kylinos.cn>
Date: Thu, 15 Sep 2022 15:32:58 +0800
Subject: [PATCH] fix-wrong-path-of-os-release
Signed-off-by: duyiwei <duyiwei@kylinos.cn>
---
profile.d/toolbox.sh | 2 +-
toolbox | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/profile.d/toolbox.sh b/profile.d/toolbox.sh
index d43f6c7..5489cda 100644
--- a/profile.d/toolbox.sh
+++ b/profile.d/toolbox.sh
@@ -8,7 +8,7 @@ toolbox_welcome_stub="$toolbox_config/toolbox-welcome-shown"
# shellcheck disable=2046
# shellcheck disable=SC1091
eval $(
- . /usr/lib/os-release
+ . /etc/os-release
echo ID="$ID"
echo VARIANT_ID="$VARIANT_ID"
diff --git a/toolbox b/toolbox
index c6ae396..2848c19 100755
--- a/toolbox
+++ b/toolbox
@@ -531,7 +531,7 @@ get_group_for_sudo()
get_host_id()
(
# shellcheck disable=SC1091
- . /usr/lib/os-release
+ . /etc/os-release
echo "$ID"
)
@@ -539,7 +539,7 @@ get_host_id()
get_host_variant_id()
(
# shellcheck disable=SC1091
- . /usr/lib/os-release
+ . /etc/os-release
echo "$VARIANT_ID"
)
@@ -547,7 +547,7 @@ get_host_variant_id()
get_host_version_id()
(
# shellcheck disable=SC1091
- . /usr/lib/os-release
+ . /etc/os-release
echo "$VERSION_ID"
)
--
2.33.0

View File

@ -3,15 +3,15 @@ Version: 0.0.99
%global goipath github.com/containers/%{name}
Release: 1
Release: 3
Summary: Unprivileged development environment
License: ASL 2.0
URL: https://github.com/containers/toolbox
Source0: toolbox-0.0.99-vendored.tar.xz
Source0: toolbox-0.0.99.3.tar.xz
Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
Patch0: 0001-fix-wrong-path-of-os-release.patch
BuildRequires: golang >= 1.13 meson
BuildRequires: pkgconfig(bash-completion) systemd
@ -35,6 +35,7 @@ The toolbox-tests package contains system tests for toolbox.
%prep
%setup -q
%patch0 -p 1
GOBUILDDIR="$(pwd)/_build"
GOSOURCEDIR="$(pwd)"
@ -87,5 +88,11 @@ ln -s src/vendor vendor
%{_datadir}/%{name}
%changelog
* Thu Feb 10 2022 duyiwei <duyiwei@kylinos.cn> - 0.0.99-1
- Package init
* Thu Sep 15 2022 duyiwei <duyiwei@kylinos.cn> - 0.0.99-3
- change /usr/lib/os-release to /etc/os-release
* Tue Jun 07 2022 fushanqing <fushanqing@kylinos.cn> - 0.0.99.3-2
- update Source0
* Thu Feb 10 2022 duyiwei <duyiwei@kylinos.cn> - 0.0.99.3-1
- Package init

4
toolbox.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: containers/toolbox
tag_prefix: ""
separator: .