File 0003-packaging-snapd.mk-generate-GNU-build-ID-f... of Package snapd-git

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-packaging-snapd.mk-generate-GNU-build-ID-for-Go-bina.patch of Package snapd-git (Revision 965e6662ba757bd1d73ac8146cd8e8e7)

Currently displaying revision 965e6662ba757bd1d73ac8146cd8e8e7 , Show latest

From 32902e6c7b0de74c2fffc0dcb2259155f86162ef Mon Sep 17 00:00:00 2001
Message-ID: <32902e6c7b0de74c2fffc0dcb2259155f86162ef.1716468061.git.maciej.borzecki@canonical.com>
From: Maciej Borzecki <maciej.borzecki@canonical.com>
Date: Thu, 23 May 2024 14:32:41 +0200
Subject: [PATCH] packaging/snapd.mk: generate GNU build ID for Go binaries

The Go toolchain only generates a Go build ID, but GNU build IDs are expected to
present almost universally. Make sure to generate GNU build IDs for Go binaries
like we do in Fedora packaging, so that rpmbuild is happy.

Signed-off-by: Maciej Borzecki <maciej.borzecki@canonical.com>
---
 packaging/snapd.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packaging/snapd.mk b/packaging/snapd.mk
index 2fb7ea15f87c8d5d8eb2906a8e4a157c91f26fb2..4ae0560c32720ed6ca63d8dfcc228324f65a5d51 100644
--- a/packaging/snapd.mk
+++ b/packaging/snapd.mk
@@ -68,7 +68,9 @@ all: $(go_binaries)
 $(builddir)/snap: GO_TAGS += nomanagers
 $(builddir)/snap $(builddir)/snap-seccomp $(builddir)/snapd-apparmor:
 	go build -o $@ $(if $(GO_TAGS),-tags "$(GO_TAGS)") \
-		-buildmode=pie -ldflags=-w -mod=vendor \
+		-buildmode=pie \
+		-ldflags="-w -B 0x$$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" \
+		-mod=vendor \
 		$(import_path)/cmd/$(notdir $@)
 
 # Those three need to be built as static binaries. They run on the inside of a
@@ -85,7 +87,9 @@ $(builddir)/snap-update-ns $(builddir)/snap-exec $(builddir)/snapctl:
 # Snapd can be built with test keys. This is only used by the internal test
 # suite to add test assertions. Do not enable this in distribution packages.
 $(builddir)/snapd:
-	go build -o $@ -buildmode=pie -ldflags=-w -mod=vendor \
+	go build -o $@ -buildmode=pie \
+		-ldflags="-w -B 0x$$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" \
+		-mod=vendor \
 		$(if $(GO_TAGS),-tags "$(GO_TAGS)") \
 		$(import_path)/cmd/$(notdir $@)
 
-- 
2.45.1

Places

File 0003-packaging-snapd.mk-generate-GNU-build-ID-for-Go-bina.patch of Package snapd-git (Revision 965e6662ba757bd1d73ac8146cd8e8e7)

Places