summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch29
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb5
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
new file mode 100644
index 0000000000..1f9f8b30b1
--- /dev/null
+++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
@@ -0,0 +1,29 @@
1From 5b1b04356f3efc08ae279cafc6ee86df11f10c9a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 15 Aug 2024 23:13:02 -0700
4Subject: [PATCH] configure.ac: Do not emit compiler flags into object files
5
6They contain options which have absolute paths in them e.g. --sysroot
7therefore do not record them and make build reproducible
8
9Upstream-Status: Inappropriate [OE-Specific]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 configure.ac | 3 +--
14 1 file changed, 1 insertion(+), 2 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index fae16f1..677b94a 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then
21 "-Wp,-D_FORTIFY_SOURCE=2" \
22 "-fexceptions" \
23 "-fstack-protector-strong" \
24- "--param=ssp-buffer-size=4" \
25- "-grecord-gcc-switches"
26+ "--param=ssp-buffer-size=4"
27 do
28 AC_MSG_CHECKING([for $FLAG support])
29 CFLAGS="$CFLAGS $FLAG"
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
index 85f4a6aa59..c4d59d3caa 100644
--- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
+++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
@@ -11,6 +11,7 @@ LICENSE = "GPL-2.0-only"
11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
12 12
13SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ 13SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \
14 file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \
14 " 15 "
15SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" 16SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6"
16UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" 17UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
@@ -30,6 +31,10 @@ EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d"
30 31
31export EXTRA_CFLAGS = "${CFLAGS}" 32export EXTRA_CFLAGS = "${CFLAGS}"
32 33
34do_configure:append() {
35 sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/lib/config.h
36}
37
33do_install:append() { 38do_install:append() {
34 if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then 39 if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then
35 chmod 0755 ${D}${sysconfdir}/init.d/${BPN} 40 chmod 0755 ${D}${sysconfdir}/init.d/${BPN}