Compare commits
10 Commits
2a43d8da6e
...
3aa1cd6f55
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3aa1cd6f55 | ||
|
|
e1b029bdbe | ||
|
|
272cb4f711 | ||
|
|
f68710f440 | ||
|
|
fe97ba98e9 | ||
|
|
578245d51a | ||
|
|
492d065b7c | ||
|
|
9a9332b344 | ||
|
|
fad858dc5b | ||
|
|
b1cfc979d8 |
53
fix-bad-build-flags.patch
Normal file
53
fix-bad-build-flags.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From a5d1ee156b76c4f823ae2554a0fd2e2ab9aaccaa Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <cyphar@cyphar.com>
|
||||
Date: Thu, 8 Apr 2021 18:55:40 +1000
|
||||
Subject: [PATCH] makefile: fix bad build flags
|
||||
|
||||
Fix mistake in the Makefile which prevents the version field (as well as
|
||||
some other build flags) from being passed to "go build". Update the
|
||||
"runc --version" integration test to make sure that the contents of
|
||||
VERSION are actually present.
|
||||
|
||||
Fixes: 6fbd32e48b66 ("Make Makefile more portable")
|
||||
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
test/help.bats | 6 ++++--
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d760e928..1fdcf650 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -71,7 +71,7 @@ BASE_LDFLAGS := -s -w -X ${PROJECT}.gitCommit=${COMMIT} -X ${PROJECT}.version=${
|
||||
|
||||
# Specific build flags for build type.
|
||||
ifeq ($(GOOS), linux)
|
||||
- TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test" DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}"
|
||||
+ DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}"
|
||||
TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test"
|
||||
else
|
||||
DYN_BUILD_FLAGS := ${BASE_FLAGS} -ldflags "${BASE_LDFLAGS}"
|
||||
diff --git a/test/help.bats b/test/help.bats
|
||||
index 3d6dc975..a3826435 100644
|
||||
--- a/test/help.bats
|
||||
+++ b/test/help.bats
|
||||
@@ -17,13 +17,15 @@
|
||||
load helpers
|
||||
|
||||
@test "umoci --version" {
|
||||
+ VERSION="$(cat "$INTEGRATION_ROOT/../VERSION")"
|
||||
+
|
||||
umoci --version
|
||||
[ "$status" -eq 0 ]
|
||||
- [[ "$output" =~ "umoci version "+ ]]
|
||||
+ [[ "$output" =~ "umoci version $VERSION"+ ]]
|
||||
|
||||
umoci -v
|
||||
[ "$status" -eq 0 ]
|
||||
- [[ "$output" =~ "umoci version "+ ]]
|
||||
+ [[ "$output" =~ "umoci version $VERSION"+ ]]
|
||||
}
|
||||
|
||||
@test "umoci --help" {
|
||||
|
||||
BIN
sys.tar.gz
Normal file
BIN
sys.tar.gz
Normal file
Binary file not shown.
37
umoci.spec
37
umoci.spec
@ -3,13 +3,16 @@
|
||||
%define tempdir github.com/openSUSE/umoci
|
||||
|
||||
Name: umoci
|
||||
Version: 0.4.5
|
||||
Version: 0.4.7
|
||||
Release: 3
|
||||
Summary: Open Container Image manipulation tool
|
||||
License: Apache-2.0
|
||||
License: ISC and MIT and Apache-2.0
|
||||
URL: https://github.com/opencontainers/umoci
|
||||
Source0: https://github.com/opencontainers/umoci/archive/v0.4.5.tar.gz
|
||||
BuildRequires: fdupes go >= 1.6 go-md2man
|
||||
Source0: https://github.com/opencontainers/umoci/archive/v0.4.7.tar.gz
|
||||
Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
|
||||
Source2: sys.tar.gz
|
||||
Patch0000: fix-bad-build-flags.patch
|
||||
BuildRequires: fdupes go >= 1.6
|
||||
|
||||
%description
|
||||
Umoci modifies Open Container images. Umoci intends to be a complete manipulation tool for OCI images.
|
||||
@ -20,15 +23,24 @@ the OCI.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
tar -xf %SOURCE1
|
||||
%ifarch loongarch64
|
||||
rm -rf vendor/golang.org/x/sys
|
||||
tar -xf %{SOURCE2} -C vendor/golang.org/x
|
||||
%endif
|
||||
|
||||
%build
|
||||
cd go-md2man-*
|
||||
go build -mod=vendor -o go-md2man .
|
||||
export GO_MD2MAN=$(realpath go-md2man)
|
||||
cd -
|
||||
|
||||
export GOPATH=$HOME/go
|
||||
mkdir -pv $HOME/go/src/%{tempdir}
|
||||
rm -rf $HOME/go/src/%{tempdir}/*
|
||||
cp -ar * $HOME/go/src/%{tempdir}
|
||||
make umoci
|
||||
make local-doc
|
||||
make docs
|
||||
|
||||
%install
|
||||
install -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}
|
||||
@ -48,6 +60,21 @@ done
|
||||
%{_mandir}/man1/umoci*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 11 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 0.4.7-3
|
||||
- add loong64 support for umoci
|
||||
|
||||
* Tue Feb 15 2022 caodongxia <caodongxia@huawei.com> - 0.4.7-2
|
||||
- fix bad build flags
|
||||
|
||||
* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 0.4.7-1
|
||||
- Upgrade to version 0.4.7
|
||||
|
||||
* Fri Apr 16 2021 wangyue <wangyue92@huawei.com> - 0.4.5-5
|
||||
- Fix CVE-2021-29136
|
||||
|
||||
* Tue Feb 9 2021 lingsheng <lingsheng@huawei.com> - 0.4.5-4
|
||||
- Fix unresolvable
|
||||
|
||||
* Wed Sep 9 2020 Ge Wang <wangge20@huawei.com> - 0.4.5-3
|
||||
- Modify Source0 Url
|
||||
|
||||
|
||||
BIN
v0.4.5.tar.gz
BIN
v0.4.5.tar.gz
Binary file not shown.
BIN
v0.4.7.tar.gz
Normal file
BIN
v0.4.7.tar.gz
Normal file
Binary file not shown.
BIN
v1.0.10.tar.gz
Normal file
BIN
v1.0.10.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user