mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 20:36:40 +02:00
community/buildah: upgrade to 1.33.1
This commit is contained in:
parent
d3f97c2ebd
commit
db0edb1711
@ -2,7 +2,7 @@
|
||||
# Contributor: Michał Polański <michal@polanski.me>
|
||||
# Maintainer: Michał Polański <michal@polanski.me>
|
||||
pkgname=buildah
|
||||
pkgver=1.32.2
|
||||
pkgver=1.33.1
|
||||
pkgrel=0
|
||||
pkgdesc="tool that facilitates building OCI container images"
|
||||
url="https://github.com/containers/buildah"
|
||||
@ -12,7 +12,9 @@ depends="oci-runtime shadow-subids slirp4netns containers-common"
|
||||
makedepends="go go-md2man lvm2-dev gpgme-dev libseccomp-dev btrfs-progs-dev bash"
|
||||
subpackages="$pkgname-doc"
|
||||
options="!check" # tests require root privileges
|
||||
source="https://github.com/containers/buildah/archive/v$pkgver/buildah-$pkgver.tar.gz"
|
||||
source="https://github.com/containers/buildah/archive/v$pkgver/buildah-$pkgver.tar.gz
|
||||
fix-makefile.patch
|
||||
"
|
||||
|
||||
# secfixes:
|
||||
# 1.28.0-r0:
|
||||
@ -40,5 +42,6 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1 buildah-1.32.2.tar.gz
|
||||
4abab105f6b242dc38e443b53b6c0c90fd7897bceb6b491fd067cd56767616a3df4005bc0bd0d10f217df2e6716cf950d8662788b110929a826660f29516703e buildah-1.33.1.tar.gz
|
||||
f94bea59423f448ff442d409fdda7fd501c078985af25593d4f7e91ed6970d2332f0828535e36d096ef6a12c45b3e9f122387303f8b445368fd29d734cc2dfd4 fix-makefile.patch
|
||||
"
|
||||
|
||||
45
community/buildah/fix-makefile.patch
Normal file
45
community/buildah/fix-makefile.patch
Normal file
@ -0,0 +1,45 @@
|
||||
Patch-Source: https://github.com/containers/buildah/commit/12b205f69876bf09bb6dfe03adcdefad5d4ee9f8.patch
|
||||
--
|
||||
From 12b205f69876bf09bb6dfe03adcdefad5d4ee9f8 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] Remove makefile targets entrypoint{,.gz} for 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 | 9 ++++-----
|
||||
1 file changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 85b43c7b9e..0fda9ae6eb 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -73,17 +73,16 @@ 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
|
||||
endif
|
||||
|
||||
-internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint
|
||||
- $(RM) $@
|
||||
- gzip -k $^
|
||||
|
||||
.PHONY: buildah
|
||||
buildah: bin/buildah
|
||||
Loading…
x
Reference in New Issue
Block a user