diff options
| -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 () { | |||
| 36 | dynamic_loader=$(linuxloader) | 36 | dynamic_loader=$(linuxloader) |
| 37 | 37 | ||
| 38 | # prelink! | 38 | # prelink! |
| 39 | if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then | 39 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then |
| 40 | bbnote " prelink: BUILD_REPRODUCIBLE_BINARIES..." | 40 | bbnote " prelink: BUILD_REPRODUCIBLE_BINARIES..." |
| 41 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then | 41 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then |
| 42 | export PRELINK_TIMESTAMP=`git log -1 --pretty=%ct ` | 42 | 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' | |||
| 664 | POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}" | 664 | POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}" |
| 665 | 665 | ||
| 666 | reproducible_final_image_task () { | 666 | reproducible_final_image_task () { |
| 667 | if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then | 667 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then |
| 668 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then | 668 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then |
| 669 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`git log -1 --pretty=%ct` | 669 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`git log -1 --pretty=%ct` |
| 670 | fi | 670 | 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 () { | |||
| 279 | 279 | ||
| 280 | kernel_do_compile() { | 280 | kernel_do_compile() { |
| 281 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | 281 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE |
| 282 | if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then | 282 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then |
| 283 | # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not | 283 | # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not |
| 284 | # be set.... | 284 | # be set.... |
| 285 | if [ "$SOURCE_DATE_EPOCH" = "0" ]; then | 285 | 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 () { | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | do_prepare_config () { | 108 | do_prepare_config () { |
| 109 | if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then | 109 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then |
| 110 | export KCONFIG_NOTIMESTAMP=1 | 110 | export KCONFIG_NOTIMESTAMP=1 |
| 111 | fi | 111 | fi |
| 112 | sed -e '/CONFIG_STATIC/d' \ | 112 | sed -e '/CONFIG_STATIC/d' \ |
| @@ -146,7 +146,7 @@ do_configure () { | |||
| 146 | 146 | ||
| 147 | do_compile() { | 147 | do_compile() { |
| 148 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 148 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS |
| 149 | if [ "$BUILD_REPRODUCIBLE_BINARIES" = "1" ]; then | 149 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then |
| 150 | export KCONFIG_NOTIMESTAMP=1 | 150 | export KCONFIG_NOTIMESTAMP=1 |
| 151 | fi | 151 | fi |
| 152 | if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then | 152 | if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then |
