Merge pull request #879 from stewart-ibm/ppe42-toolchain-fix-on-modern-host
ppe42-binutils,ppe42-gcc: Patch, use $(MAKE) and -Wno-error to fix bu…
diff --git a/ci/Dockerfile/fedora23.x86_64 b/ci/Dockerfile/fedora23.x86_64
deleted file mode 120000
index 5322ce7..0000000
--- a/ci/Dockerfile/fedora23.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-fedora23
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora23 b/ci/Dockerfile/fedora25
similarity index 96%
rename from ci/Dockerfile/fedora23
rename to ci/Dockerfile/fedora25
index ed50956..9414efc 100644
--- a/ci/Dockerfile/fedora23
+++ b/ci/Dockerfile/fedora25
@@ -1,4 +1,4 @@
-FROM fedora:23
+FROM fedora:25
RUN dnf -y remove vim-minimal
RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch zlib-devel zlib-static texinfo perl-bignum "perl(XML::Simple)" "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" "perl(Env)" "perl(XML::LibXML)" "perl(Digest::SHA1)" libxml2-devel libxslt "perl(ExtUtils::MakeMaker)"
RUN dnf -y install which wget unzip tar cpio python bzip2 bc vim redhat-lsb-core
diff --git a/ci/Dockerfile/fedora25.x86_64 b/ci/Dockerfile/fedora25.x86_64
new file mode 120000
index 0000000..c6db8fc
--- /dev/null
+++ b/ci/Dockerfile/fedora25.x86_64
@@ -0,0 +1 @@
+fedora25
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 64b862d..0ace0e1 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,6 +1,8 @@
#!/bin/bash
-while getopts ":ahp:" opt; do
+CONTAINERS="ubuntu1404 fedora25"
+
+while getopts ":ahp:c:" opt; do
case $opt in
a)
echo "Build firmware images for all the platforms"
@@ -10,11 +12,16 @@
echo "Build firmware images for the platforms: $OPTARG"
PLATFORMS=$OPTARG
;;
+ c)
+ echo "Build in container: $OPTARG"
+ CONTAINERS=$OPTARG
+ ;;
h)
echo "Usage: ./ci/build.sh [options] [--]"
echo "-h Print this help and exit successfully."
echo "-a Build firmware images for all the platform defconfig's."
echo "-p List of comma separated platform names to build images for particular platforms."
+ echo "-c Container to run in"
echo "Example:DOCKER_PREFIX=sudo ./ci/build.sh -a"
echo -e "\tDOCKER_PREFIX=sudo ./ci/build.sh -p firestone"
echo -e "\tDOCKER_PREFIX=sudo ./ci/build.sh -p garrison,palmetto,openpower_p9_mambo"
@@ -48,7 +55,7 @@
exit 1;
fi
-for distro in ubuntu1404 fedora23;
+for distro in $CONTAINERS;
do
base_dockerfile=ci/Dockerfile/$distro.`arch`
if [ ! -f $base_dockerfile ]; then
@@ -59,7 +66,7 @@
http_proxy=$HTTP_PROXY
fi
if [[ -n "$http_proxy" ]]; then
- if [[ "$distro" == fedora23 ]]; then
+ if [[ "$distro" == fedora25 ]]; then
PROXY="RUN echo \"proxy=${http_proxy}\" >> /etc/dnf/dnf.conf"
fi
if [[ "$distro" == ubuntu1404 ]]; then
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 747fef6..188860a 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= fe5c556993ce24fae1f70f6be9a071fbd89e616c
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 2fc2af3a3531e91e0f20c245742e6fd08d283d7f
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 678260620b9bcc2d35f84a6f12dcaaa7e2f3a583
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))