mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

kbd: Fix build reproducibility issue

Browse Source 
Our CFLAGS were being lost which was breaking reproducibile builds due to
losee of the debug prefix remapping flags. Fix this.

(From OE-Core rev: 037bef5c7dfe82642d19f07b38f6ccc783958e41)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-01-27 16:32:59 +00:00
parent b1fe4aab8b
commit 820a9b52f2
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meta/recipes-core/kbd/kbd/fix_cflags.patch Normal file
View File

@@ -0,0 +1,25 @@
We need to ensure our CFLAGS are preserved as well as whatever tweak configure
tries to make. Without these, the debug prefix changes get lost and we lose
build reproducibility, likely with other side effects.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Pending
2020/1/27
Index: kbd-2.2.0/configure.ac
===================================================================
--- kbd-2.2.0.orig/configure.ac
+++ kbd-2.2.0/configure.ac
@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; t
fi
case "$GCC,$ac_cv_prog_cc_g" in
- yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;;
- yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;;
- ,yes) CFLAGS="-g" ;;
+ yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
+ yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
+ ,yes) CFLAGS="-g $CFLAGS" ;;
esac
CC_CHECK_CFLAGS_APPEND([\

1
meta/recipes-core/kbd/kbd_2.2.0.bb
View File

@@ -17,6 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \
file://0001-analyze.l-add-missing-string-format.patch \
file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \
file://fix_cflags.patch \
"
SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"