Merge pull request #3617 from artemsen/wof_tables
nicole_config: Bump version of machine xml
diff --git a/ci/build-all-defconfigs.sh b/ci/build-all-defconfigs.sh
index 30703f2..f21b847 100755
--- a/ci/build-all-defconfigs.sh
+++ b/ci/build-all-defconfigs.sh
@@ -7,7 +7,6 @@
SDK_ONLY=0
CONFIGTAG="_defconfig"
DEFCONFIGS=();
-CCACHE_DIR=""
SDK_DIR=""
opt=$(getopt -o 'o:Ss:p:r' -- "$@")
@@ -83,7 +82,7 @@
# Even if they should be interchangeable, we want to force the sdk
# build on every supported OS variations
- HASH_PROPERTIES="$(HASH PROPERTIES) $(lsb_release -as | tr -d '/n[:space:]')"
+ HASH_PROPERTIES="$HASH_PROPERTIES $(lsb_release -as | tr -d '[:space:]')"
# Disable things not necessary for the sdk
# (Buildroot manual section 6.1.3 plus a few more things)
@@ -192,7 +191,7 @@
export SDK_DIR
}
-if [ -z "${PLATFORM_LIST}" ]; then
+if [ -z "${PLATFORM_LIST-}" ]; then
echo "Using all the defconfigs for all the platforms"
DEFCONFIGS=`(cd openpower/configs; ls -1 *_defconfig)`
else
@@ -203,14 +202,14 @@
done
fi
-if [ -z "$CCACHE_DIR" ]; then
+if [ -z "${CCACHE_DIR-}" ]; then
CCACHE_DIR=`pwd`/.op-build_ccache
fi
shopt -s expand_aliases
source op-build-env
-if [ -n "$DL_DIR" ]; then
+if [ -n "${DL_DIR-}" ]; then
unset BR2_DL_DIR
export BR2_DL_DIR=${DL_DIR}
fi
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 7b71ec5..0b62f6b 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw050620a.opmst" if BR2_HCODE_LATEST_VERSION
+ default "hw050820a.opmst" if BR2_HCODE_LATEST_VERSION
default BR2_HCODE_CUSTOM_VERSION_VALUE \
if BR2_HCODE_CUSTOM_VERSION
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index d31efdc..c25b8ce 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "29ca2d7cfcef6235f18787a942d7828f0b99e985" if BR2_HOSTBOOT_LATEST_VERSION
+ default "db5cabf13783c2ed5ed4c4df2fea24668daaafc9" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION