Accepting request 1127903 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1127903 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/buildah?expand=0&rev=76
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
6f07d8cc90
@ -0,0 +1,47 @@
|
||||
From fb455cef8a72ee97e9aba0c42d82782196c43218 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Mon, 20 Nov 2023 09:28:06 +0100
|
||||
Subject: [PATCH] set makefile target entrypoint.gz as .PHONY on non x86_64
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The target internal/mkcw/embed/entrypoint is only built on x86_64, but
|
||||
internal/mkcw/embed/entrypoint.gz is run on all arches. This causes build
|
||||
failures on anything non x86_64 as internal/mkcw/embed/entrypoint is not build.
|
||||
|
||||
Signed-off-by: Dan Čermák <dcermak@suse.com>
|
||||
---
|
||||
Makefile | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 85b43c7b9..cce615d5f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -73,17 +73,19 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
|
||||
$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
|
||||
|
||||
ifneq ($(shell as --version | grep x86_64),)
|
||||
+internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint
|
||||
+ $(RM) $@
|
||||
+ gzip -k $^
|
||||
+
|
||||
internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
|
||||
$(AS) -o $(patsubst %.s,%.o,$^) $^
|
||||
$(LD) -o $@ $(patsubst %.s,%.o,$^)
|
||||
strip $@
|
||||
else
|
||||
.PHONY: internal/mkcw/embed/entrypoint
|
||||
+.PHONY: internal/mkcw/embed/entrypoint.gz
|
||||
endif
|
||||
|
||||
-internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint
|
||||
- $(RM) $@
|
||||
- gzip -k $^
|
||||
|
||||
.PHONY: buildah
|
||||
buildah: bin/buildah
|
||||
--
|
||||
2.42.0
|
||||
|
||||
2
_service
2
_service
@ -5,7 +5,7 @@
|
||||
<param name="filename">buildah</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="revision">v1.32.2</param>
|
||||
<param name="revision">v1.33.1</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/containers/buildah.git</param>
|
||||
<param name="changesrevision">050318f87df3b79039a0208dd3b6255332e061fd</param></service></servicedata>
|
||||
<param name="changesrevision">38d6d5f11400b82ee24b94040e0841e894d606eb</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d76d7a9f03b68ec805211c8516a08107f718d58c2aa8cc11cddb61e80ff37311
|
||||
size 11108424
|
||||
3
buildah-1.33.1.tar.xz
Normal file
3
buildah-1.33.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1810a27deed32bfd1c75a5c57432f0930dc43a453b2fed0a614f1e3ade800fe5
|
||||
size 11224008
|
||||
@ -1,3 +1,96 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 20 07:16:52 UTC 2023 - dcermak@suse.com
|
||||
|
||||
- Add patch:
|
||||
* 0001-set-makefile-target-entrypoint.gz-as-.PHONY-on-non-x.patch (fixes
|
||||
builds on non x86_64)
|
||||
- Update to version 1.33.1:
|
||||
* Bump to v1.33.1
|
||||
* Bump to v1.31.2-dev
|
||||
* Bump to v1.31.1
|
||||
* fix(deps): update module github.com/moby/buildkit to v0.11.4 [security]
|
||||
* test,heredoc: use fedora instead of docker.io/library/python:latest
|
||||
* Bump to v1.33.1-dev
|
||||
* Bump to v1.33.0
|
||||
* Never omit layers for emptyLayer instructions when squashing/cwing
|
||||
* Add OverrideChanges and OverrideConfig to CommitOptions
|
||||
* buildah: add heredoc support for RUN, COPY and ADD
|
||||
* vendor: bump imagebuilder to v1.2.6-0.20231110114814-35a50d57f722
|
||||
* conformance tests: archive the context directory as 0:0 (#5171)
|
||||
* blobcacheinfo,test: blobs must be resued when pushing across registry
|
||||
* Bump c/storage v1.51.0, c/image v5.29.0, c/common v0.57.0
|
||||
* pkg/util.MirrorToTempFileIfPathIsDescriptor(): don't leak an fd
|
||||
* StageExecutor.Execute: force a commit for --unsetenv, too
|
||||
* Increase a copier+chroot test timeout
|
||||
* Add support for --compat-auth-file in login/logout
|
||||
* Update existing tests for error message change
|
||||
* Update c/image and c/common to latest
|
||||
* fix(deps): update module github.com/containerd/containerd to v1.7.9
|
||||
* build: downgrade to go 1.20
|
||||
* Add godoc for pkg/parse.GetTempDir
|
||||
* conformance tests: use go-dockerclient for BuildKit builds
|
||||
* Make TEE types case-insensitive
|
||||
* fix(deps): update module golang.org/x/crypto to v0.15.0
|
||||
* Tweak some help descriptions
|
||||
* Stop using DefaultNetworkSysctl and use containers.conf only
|
||||
* Implement ADD checksum flag #5135
|
||||
* vendor of openshift/imagebuilder #5135
|
||||
* Pass secrets from the host down to internal podman containers
|
||||
* Update cirrus and version of golang
|
||||
* image: replace GetStoreImage with ResolveReference
|
||||
* vendor: bump c/image to 373c52a9466f
|
||||
* pkg/parse.Platform(): minor simplification
|
||||
* createConfigsAndManifests: clear history before cw-specific logic
|
||||
* Use a constant definition instead of "scratch"
|
||||
* conformance: use require.NoErrorf() more
|
||||
* fix(deps): update module golang.org/x/term to v0.14.0
|
||||
* fix(deps): update module golang.org/x/sync to v0.5.0
|
||||
* fix(deps): update module github.com/spf13/cobra to v1.8.0
|
||||
* fix(deps): update module golang.org/x/sys to v0.14.0
|
||||
* fix(deps): update github.com/containers/common digest to 8354404
|
||||
* fix(deps): update module github.com/opencontainers/runc to v1.1.10
|
||||
* fix(deps): update github.com/containers/luksy digest to b5a7f79
|
||||
* Log the platform for build errors during multi-platform builds
|
||||
* Use mask definitions from containers/common
|
||||
* Vendor in latest containers/common
|
||||
* fix(deps): update module github.com/containerd/containerd to v1.7.8
|
||||
* fix(deps): update module go.etcd.io/bbolt to v1.3.8
|
||||
* container.conf: support attributed string slices
|
||||
* fix(deps): update module sigs.k8s.io/yaml to v1.4.0
|
||||
* Use cutil.StringInSlice rather then contains
|
||||
* Add --no-hostname option to buildah containers
|
||||
* vendor c/common: appendable containers.conf strings, Part 1
|
||||
* fix(deps): update module github.com/onsi/gomega to v1.28.1
|
||||
* chroot.setupChrootBindMounts: pay more attention to flags
|
||||
* chore(deps): update dependency containers/automation_images to v20231004
|
||||
* Vendor containers/common
|
||||
* chore(deps): update module golang.org/x/net to v0.17.0 [security]
|
||||
* run: use internal.GetTempDir with os.MkdirTemp
|
||||
* fix(deps): update module github.com/containerd/containerd to v1.7.7
|
||||
* imagebuildah,multi-stage: do not remove base images
|
||||
* gitignore: add mkcw binary
|
||||
* mkcw: remove entrypoint binaries
|
||||
* fix(deps): update module golang.org/x/crypto to v0.14.0
|
||||
* fix(deps): update module golang.org/x/sys to v0.13.0
|
||||
* fix(deps): update module golang.org/x/sync to v0.4.0
|
||||
* Update some comments related to confidential workload
|
||||
* Use the parent's image ID in the config that we pass to imagebuilder
|
||||
* fix(deps): update github.com/containers/common digest to 8892536
|
||||
* fix(deps): update github.com/containers/luksy digest to 6df88cb
|
||||
* bug: Ensure the mount type is always BindMount by default
|
||||
* Protocol can be specified with --port. Ex. --port 514/udp
|
||||
* fix(deps): update module github.com/onsi/gomega to v1.28.0
|
||||
* build,config: add support for --unsetlabel
|
||||
* tests/bud: add tests
|
||||
* [CI:BUILD] Packit: tag @containers/packit-build on copr build failures
|
||||
* stage_executor: allow images without layers
|
||||
* vendor of containers/common
|
||||
* Removing selinux_tag.sh as no longer needed after 580356f [NO NEW TESTS NEEDED]
|
||||
* add/copy: make sure we handle relative path names correctly
|
||||
* fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc5
|
||||
* Bump to v1.33.0-dev
|
||||
* imagebuildah: consider ignorefile with --build-context
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 01 07:26:09 UTC 2023 - dcermak@suse.com
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%define project github.com/containers/buildah
|
||||
Name: buildah
|
||||
Version: 1.32.2
|
||||
Version: 1.33.1
|
||||
Release: 0
|
||||
Summary: Tool for building OCI containers
|
||||
License: Apache-2.0
|
||||
@ -26,6 +26,8 @@ Group: System/Management
|
||||
URL: https://%{project}
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: %{name}-rpmlintrc
|
||||
# https://github.com/containers/buildah/pull/5183
|
||||
Patch0: 0001-set-makefile-target-entrypoint.gz-as-.PHONY-on-non-x.patch
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: fdupes
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user