Merge pull request #826 from stewart-ibm/zaius-kernel-skiboot-update
zaius: bump skiboot and kexec-lite
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index ca9062e..2310898 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 464ab6a961bd062788e73923ff5e10fe4d119d95
+HOSTBOOT_BINARIES_VERSION ?= 674c6357f6133de25f016cb20891b37302e1bdf8
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
HOSTBOOT_BINARIES_LICENSE_FILES = LICENSE
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 92fb1c5..44d23fa 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= e28b28fa9995ab3039b44f2c200fdbbc58313677
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 6910cb9249c0ac3bcf150357a2577089d6382a6c
+HOSTBOOT_VERSION_BRANCH_MASTER ?= f792a2cbe3d68e549f5321ac70adf9d24a7ab6ab
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 9a9d60e..6c194b4 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "skiboot-5.4.2" if BR2_SKIBOOT_LATEST_VERSION
+ default "skiboot-5.4.3" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION
diff --git a/openpower/package/zaius-xml/zaius.mk b/openpower/package/zaius-xml/zaius.mk
index bd52ab3..5385c88 100644
--- a/openpower/package/zaius-xml/zaius.mk
+++ b/openpower/package/zaius-xml/zaius.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ZAIUS_XML_VERSION ?= db53313f3873fc0a822121c0d95f257604387a76
+ZAIUS_XML_VERSION ?= b877062971163638c8e4348be10dc9c5ebbe52ee
ZAIUS_XML_SITE ?= $(call github,open-power,zaius-xml,$(ZAIUS_XML_VERSION))
ZAIUS_XML_LICENSE = Apache-2.0
diff --git a/openpower/scripts/release-notes b/openpower/scripts/release-notes
index 402c88d..2bf1b90 100755
--- a/openpower/scripts/release-notes
+++ b/openpower/scripts/release-notes
@@ -31,6 +31,12 @@
'barreleye-xml' => { REPO => "http://github.com/open-power/barreleye-xml" ,
DIR => "openpower/package/barreleye-xml",
PACKAGE => "BARRELEYE_XML" },
+ 'witherspoon-xml' => { REPO => "http://github.com/open-power/witherspoon-xml" ,
+ DIR => "openpower/package/witherspoon-xml",
+ PACKAGE => "WITHERSPOON_XML" },
+ 'zaius-xml' => { REPO => "http://github.com/open-power/zaius-xml" ,
+ DIR => "openpower/package/zaius-xml",
+ PACKAGE => "ZAIUS_XML" },
'petitboot' => { REPO => "http://github.com/open-power/petitboot" ,
DIR => "openpower/package/petitboot",
PACKAGE => "PETITBOOT" },
@@ -77,11 +83,22 @@
print "Old $1:$3\n";
$old_level->{$1} = $3;
}
+ if ($line =~ m/-([^[:space:]]*)_VERSION_BRANCH_MASTER([[:space:]]*\?*=[[:space:]]*)(.*)/)
+ {
+ print "Old $1:$3\n";
+ $old_level->{$1} = $3;
+ }
if ($line =~ m/\+([^[:space:]]*)_VERSION([[:space:]]*\?*=[[:space:]]*)(.*)/)
{
print "New $1:$3\n";
$new_level->{$1} = $3;
}
+ if ($line =~ m/\+([^[:space:]]*)_VERSION_BRANCH_MASTER([[:space:]]*\?*=[[:space:]]*)(.*)/)
+ {
+ print "New $1:$3\n";
+ $new_level->{$1} = $3;
+ }
+
if ($line =~ m/-[[:space:]]*default[[:space:]]*"([^[:space:]]*)"[[:space:]]*if[[:space:]]BR2_([^[:space:]]*)_LATEST_VERSION/)
{
print "Old $2:$1\n";