summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-14 12:58:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-16 17:41:59 +0100
commit20f6477b6323c723f856c5c29358a04029af7493 (patch)
treef214bc3be31392aa459787a01fc7d87607b9a4c6 /meta/recipes-core/busybox/busybox.inc
parent0dc5920862dd692905347104927f7cf0b7d61376 (diff)
downloadpoky-20f6477b6323c723f856c5c29358a04029af7493.tar.gz
reproducible: Drop BUILD_REPRODUCIBLE_BINARIES variable
We want things to be reproduicble and the variable doesn't really change much any more. Drop the remaining uses and make those code paths always active. (From OE-Core rev: d15fb02c7ee7da50e322d74bc6a545234e20c7f3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r--meta/recipes-core/busybox/busybox.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 808c3dc700..622325aabb 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -110,9 +110,8 @@ python () {
110} 110}
111 111
112do_prepare_config () { 112do_prepare_config () {
113 if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then 113 export KCONFIG_NOTIMESTAMP=1
114 export KCONFIG_NOTIMESTAMP=1 114
115 fi
116 sed -e '/CONFIG_STATIC/d' \ 115 sed -e '/CONFIG_STATIC/d' \
117 < ${WORKDIR}/defconfig > ${S}/.config 116 < ${WORKDIR}/defconfig > ${S}/.config
118 echo "# CONFIG_STATIC is not set" >> .config 117 echo "# CONFIG_STATIC is not set" >> .config
@@ -143,9 +142,8 @@ do_configure () {
143 142
144do_compile() { 143do_compile() {
145 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 144 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
146 if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then 145 export KCONFIG_NOTIMESTAMP=1
147 export KCONFIG_NOTIMESTAMP=1 146
148 fi
149 if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then 147 if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
150 # split the .config into two parts, and make two busybox binaries 148 # split the .config into two parts, and make two busybox binaries
151 if [ -e .config.orig ]; then 149 if [ -e .config.orig ]; then