Skip to content

Commit 77d6bb8

Browse files
committed
fix: set explicit ABI in FreeBSD package manifest
pkg(8) stamps the ABI from the build host OS, so building in a FreeBSD 14 VM produced packages that FreeBSD 15 rejected. Add an ABI variable (default FreeBSD:15:amd64) to the Makefile and substitute it into the manifest template. The binary is statically linked so the ABI is purely metadata.
1 parent 4ed5135 commit 77d6bb8

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

contrib/freebsd/+MANIFEST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ origin: "security/epithet"
44
comment: "SSH certificate authority with short-lived certificates"
55
maintainer: "brianm@apache.org"
66
www: "https://github.com/epithet-ssh/epithet"
7+
abi: "%%ABI%%"
78
prefix: "/usr/local"
89
licenselogic: "single"
910
licenses: ["Apache-2.0"]

contrib/freebsd/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
REPO_ROOT ?= ../..
22
ARCH ?= amd64
3+
ABI ?= FreeBSD:15:amd64
34
PREFIX ?= /usr/local
45

56
.if !defined(VERSION)
@@ -25,6 +26,7 @@ help:
2526
@echo "Variables:"
2627
@echo " VERSION=$(VERSION)"
2728
@echo " ARCH=$(ARCH)"
29+
@echo " ABI=$(ABI)"
2830
@echo ""
2931
@echo "Requires: go (pkg install go)"
3032

@@ -39,7 +41,7 @@ $(BINARY):
3941

4042
$(MANIFEST): +MANIFEST
4143
@mkdir -p $(BUILDDIR)
42-
sed 's/%%VERSION%%/$(VERSION)/g' +MANIFEST > $(MANIFEST)
44+
sed -e 's/%%VERSION%%/$(VERSION)/g' -e 's/%%ABI%%/$(ABI)/g' +MANIFEST > $(MANIFEST)
4345

4446
$(STAGEDIR): $(BINARY)
4547
@echo "==> Staging files"

0 commit comments

Comments
 (0)