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.bystri...@intel.com>
---
 meta/classes/image-prelink.bbclass    | 2 +-
 meta/classes/image.bbclass            | 2 +-
 meta/classes/kernel.bbclass           | 2 +-
 meta/recipes-core/busybox/busybox.inc | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/classes/image-prelink.bbclass 
b/meta/classes/image-prelink.bbclass
index f3bb68b..6a8afa8 100644
--- 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 ce78c43..1636eed 100644
--- 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 321c0a4..d4ebc25 100644
--- 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 ac6d7ca..d1675c3 100644
--- 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
-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to