openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: skopeo 1.0.0.20200519 -> 1.1.0.20200620

master
Dr. Ralf S. Engelschall 5 years ago
parent
b3e8d03e40
commit
aaa2921549
2 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      skopeo/skopeo.patch
  2. 10
      skopeo/skopeo.spec

34
skopeo/skopeo.patch
Unescape View File

@ -1,6 +1,6 @@
Index: src/github.com/containers/skopeo/Makefile
--- src/github.com/containers/skopeo/Makefile.orig 2020-03-16 09:47:33.000000000 +0100
+++ src/github.com/containers/skopeo/Makefile 2020-03-16 09:55:17.092301000 +0100
--- src/github.com/containers/skopeo/Makefile.orig 2020-06-20 10:01:28.000000000 +0200
+++ src/github.com/containers/skopeo/Makefile 2020-06-20 10:02:03.485002000 +0200
@@ -30,7 +30,7 @@
endif
@ -10,18 +10,18 @@ Index: src/github.com/containers/skopeo/Makefile
# Go module support: set `-mod=vendor` to use the vendored sources.
# See also hack/make.sh.
@@ -107,7 +107,7 @@
@@ -112,7 +112,7 @@
# Build w/o using containers
binary-local:
- $(GPGME_ENV) $(GO) build $(MOD_VENDOR) ${GO_DYN_FLAGS} -ldflags "-X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo
+ $(GPGME_ENV) $(GO) build -v $(MOD_VENDOR) ${GO_DYN_FLAGS} -ldflags "-X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo
.PHONY: bin/skopeo
bin/skopeo:
- $(GPGME_ENV) $(GO) build $(MOD_VENDOR) ${GO_DYN_FLAGS} ${LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo
+ $(GPGME_ENV) $(GO) build -v $(MOD_VENDOR) ${GO_DYN_FLAGS} ${LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo
binary-local-static:
$(GPGME_ENV) $(GO) build $(MOD_VENDOR) -ldflags "-extldflags \"-static\" -X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo
build-container:
${CONTAINER_RUNTIME} build ${BUILD_ARGS} -t "$(IMAGE)" .
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go.orig 2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go 2020-03-16 09:55:17.092465000 +0100
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go.orig 2020-06-20 10:01:28.000000000 +0200
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go 2020-06-20 10:00:31.046395000 +0200
@@ -1,8 +1,6 @@
package graphdriver
@ -41,8 +41,8 @@ Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/dri
}
return FsMagic(buf.Type) == fsType, nil
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go.orig 2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go 2020-03-16 09:55:17.092603000 +0100
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go.orig 2020-06-20 10:01:28.000000000 +0200
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go 2020-06-20 10:00:31.046570000 +0200
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!freebsd
@ -50,8 +50,8 @@ Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg
package mount
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go.orig 2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go 2020-03-16 09:55:39.262143000 +0100
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go.orig 2020-06-20 10:01:28.000000000 +0200
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go 2020-06-20 10:00:31.046735000 +0200
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!freebsd
@ -59,8 +59,8 @@ Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg
package mount
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go.orig 2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go 2020-03-16 09:55:17.092731000 +0100
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go.orig 2020-06-20 10:01:28.000000000 +0200
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go 2020-06-20 10:00:31.046934000 +0200
@@ -9,7 +9,7 @@
// Mknod creates a filesystem node (file, device special file or named pipe) named path
// with attributes specified by mode and dev.

10
skopeo/skopeo.spec
Unescape View File

@ -22,8 +22,8 @@
##
# package version
%define V_skopeo_base 1.0.0
%define V_skopeo_snap 20200519
%define V_skopeo_base 1.1.0
%define V_skopeo_snap 20200620
# package information
Name: skopeo
@ -36,7 +36,7 @@ Class: EVAL
Group: Web
License: Apache
Version: %{V_skopeo_base}.%{V_skopeo_snap}
Release: 20200519
Release: 20200620
# list of sources
Source0: http://download.openpkg.org/components/versioned/skopeo/skopeo-%{V_skopeo_snap}.tar.xz
@ -77,7 +77,7 @@ PreReq: OpenPKG, openpkg >= 20160101
%{l_shtool} subst -e 's;/bin/bash;%{l_bash};g' */*.sh
%{l_shtool} subst -e 's;/etc/containers/policy.json;%{l_prefix}/etc/skopeo/policy.json;' \
vendor/github.com/containers/image/v5/signature/policy_config.go
%{l_make} %{l_mflags} SHELL=%{l_bash} binary-local
%{l_make} %{l_mflags} SHELL=%{l_bash} bin/skopeo
# build manpages
%{l_make} %{l_mflags} SHELL=%{l_bash} docs
@ -91,7 +91,7 @@ PreReq: OpenPKG, openpkg >= 20160101
# install program
%{l_shtool} install -c -s -m 755 \
src/github.com/containers/skopeo/skopeo \
src/github.com/containers/skopeo/bin/skopeo \
$RPM_BUILD_ROOT%{l_prefix}/bin/
# install manpages

Write Preview
Loading…
Cancel
Save