classes/recipes: Use expanded BUILD_REPRODUCIBLE_BINARIES value

Replace the occurences of BUILD_REPRODUCIBLE_BINARIES with expanded
values ${BUILD_REPRODUCIBLE_BINARIES} so the variable does not need to be
exported.

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass
index f3bb68b9e114dcd211865f17476375b4fe69c50d..6a8afa8fa95ae913a820a8f43850fc6b41965448 100644 (file)
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -36,7 +36,7 @@ prelink_image () {
        dynamic_loader=$(linuxloader)
 
        # prelink!
-       if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then
+       if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
                bbnote " prelink: BUILD_REPRODUCIBLE_BINARIES..."
                if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
                        export PRELINK_TIMESTAMP=`git log -1 --pretty=%ct `

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ce78c43a96c4891110c541a04addec7bb3932ea2..1636eed6b0c9bc8fcc3ac44462ed32581013b73e 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -664,7 +664,7 @@ ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge'
 POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}"
 
 reproducible_final_image_task () {
-    if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then
+    if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
         if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
             REPRODUCIBLE_TIMESTAMP_ROOTFS=`git log -1 --pretty=%ct`
         fi

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 9bc0e4125124c3a5aadd97ff9bde2cf146ba1d5f..dc0152f74a28836de5c51bafee504881c4b161ac 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -279,7 +279,7 @@ get_cc_option () {
 
 kernel_do_compile() {
        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-       if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then
+       if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
                # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
                # be set....
                if [ "$SOURCE_DATE_EPOCH" = "0" ]; then

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index ac6d7ca2626a2b69b8bc76cd919ebaf95c4637d5..d1675c37aab42a27291c28634b140b8bd38fd579 100644 (file)
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -106,7 +106,7 @@ python () {
 }
 
 do_prepare_config () {
-       if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then
+       if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
                export KCONFIG_NOTIMESTAMP=1
        fi
        sed -e '/CONFIG_STATIC/d' \
@@ -146,7 +146,7 @@ do_configure () {
 
 do_compile() {
        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-       if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then
+       if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
                export KCONFIG_NOTIMESTAMP=1
        fi
        if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then