diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:32:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:48:10 +0000 |
commit | 820a9b52f2bf028854bfb591f27d6d13874bb85f (patch) | |
tree | 4700491cfeb160eccd17d104b44b4bb1185056fe /meta | |
parent | b1fe4aab8b8b8a98ab8ba4788a34a90446d6222b (diff) | |
download | poky-820a9b52f2bf028854bfb591f27d6d13874bb85f.tar.gz |
kbd: Fix build reproducibility issue
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/kbd/kbd/fix_cflags.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.2.0.bb | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-core/kbd/kbd/fix_cflags.patch b/meta/recipes-core/kbd/kbd/fix_cflags.patch new file mode 100644 index 0000000000..37220960ab --- /dev/null +++ b/meta/recipes-core/kbd/kbd/fix_cflags.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | We need to ensure our CFLAGS are preserved as well as whatever tweak configure | ||
2 | tries to make. Without these, the debug prefix changes get lost and we lose | ||
3 | build reproducibility, likely with other side effects. | ||
4 | |||
5 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
6 | Upstream-Status: Pending | ||
7 | 2020/1/27 | ||
8 | |||
9 | Index: kbd-2.2.0/configure.ac | ||
10 | =================================================================== | ||
11 | --- kbd-2.2.0.orig/configure.ac | ||
12 | +++ kbd-2.2.0/configure.ac | ||
13 | @@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; t | ||
14 | fi | ||
15 | |||
16 | case "$GCC,$ac_cv_prog_cc_g" in | ||
17 | - yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;; | ||
18 | - yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;; | ||
19 | - ,yes) CFLAGS="-g" ;; | ||
20 | + yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; | ||
21 | + yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; | ||
22 | + ,yes) CFLAGS="-g $CFLAGS" ;; | ||
23 | esac | ||
24 | |||
25 | CC_CHECK_CFLAGS_APPEND([\ | ||
diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb index e13cea7634..e5700ff57f 100644 --- a/meta/recipes-core/kbd/kbd_2.2.0.bb +++ b/meta/recipes-core/kbd/kbd_2.2.0.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | |||
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ |
18 | file://0001-analyze.l-add-missing-string-format.patch \ | 18 | file://0001-analyze.l-add-missing-string-format.patch \ |
19 | file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \ | 19 | file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \ |
20 | file://fix_cflags.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc" | 23 | SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc" |