diff options
| author |   Juro Bystricky <juro.bystricky@intel.com> | 2018-03-10 10:56:25 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-12 15:05:35 -0700 |
| commit | 27f87bbc8395a2481ef808465a62d213a6b678ac (patch) | |
| tree | be3a73306df39aef0ebf9731a839fba954de8a16 | |
| parent | 0a1a1daac661046b0bf287b63267d58e0ab03e8e (diff) | |
| download | openembedded-core-contrib-27f87bbc8395a2481ef808465a62d213a6b678ac.tar.gz | |
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>
| -rw-r--r-- | meta/classes/image-prelink.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/kernel.bbclass | 2 | ||||
| -rw-r--r-- | 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 f3bb68b9e1..6a8afa8fa9 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 ce78c43a96..1636eed6b0 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 9bc0e41251..dc0152f74a 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 ac6d7ca262..d1675c37aa 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 |