Merge pull request #2521 from sammj/users
Update Petitboot and enable Petitboot privilege separation
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index a790a6d..f0a5815 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -45,7 +45,7 @@
BR2_OPENPOWER_POWER8=y
BR2_HOSTBOOT_P8_CONFIG_FILE="firestone.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="firestone-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="2494a430656504d014780000adbc2c2e7cfc54ab"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9df12d2653f2fbcae043d0e8effadb9aa5b84694"
BR2_OPENPOWER_MACHINE_XML_FILENAME="firestone.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="FIRESTONE_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="FIRESTONE_hb.mrw.xml"
diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig
index 744bbf6..545f5ec 100644
--- a/openpower/configs/vesnin_defconfig
+++ b/openpower/configs/vesnin_defconfig
@@ -24,6 +24,7 @@
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_IPMITOOL=y
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 0d675ae..0e3b935 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw122018a.930" if BR2_HCODE_LATEST_VERSION
+ default "hw020919a.930" if BR2_HCODE_LATEST_VERSION
default BR2_HCODE_CUSTOM_VERSION_VALUE \
if BR2_HCODE_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 8993cf8..9b055de 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -24,7 +24,7 @@
config BR2_HOSTBOOT_BINARIES_VERSION
string
- default "hw121518a.930" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw012919a.930" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk
index dfe28e8..58be71b 100644
--- a/openpower/package/hostboot-p8/hostboot-p8.mk
+++ b/openpower/package/hostboot-p8/hostboot-p8.mk
@@ -3,7 +3,7 @@
# hostboot for POWER8
#
################################################################################
-HOSTBOOT_P8_VERSION ?= e743c92914db3bb33add6132dccf07a1666b6a85
+HOSTBOOT_P8_VERSION ?= a3b0cb929cbf28bc82e54ef8787d36fd5eac4b0a
HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION))
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index cbe669e..c47067a 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -28,8 +28,8 @@
config BR2_HOSTBOOT_VERSION
string
- default "23c66ccdeab039d1c1ca6def64d9e37bbf9c933f" if BR2_HOSTBOOT_LATEST_VERSION
- default "3f1f2186bb80322594a3cc81241c390119d69552" if BR2_HOSTBOOT_STABLE_VERSION
+ default "cccf89e092dd50e3fe10b70701c9ddfaa84498cb" if BR2_HOSTBOOT_LATEST_VERSION
+ default "610ca55e285e2f0d7cabed6235deef82ee271627" if BR2_HOSTBOOT_STABLE_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/petitboot/63-md-raid-arrays.rules b/openpower/package/petitboot/63-md-raid-arrays.rules
index 385a8da..92aec36 100644
--- a/openpower/package/petitboot/63-md-raid-arrays.rules
+++ b/openpower/package/petitboot/63-md-raid-arrays.rules
@@ -17,7 +17,7 @@
ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
LABEL="md_ignore_state"
-IMPORT{program}="/usr/sbin/mdadm --detail --export $devnode"
+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
diff --git a/openpower/package/petitboot/65-md-incremental.rules b/openpower/package/petitboot/65-md-incremental.rules
index a8ad636..153d12f 100644
--- a/openpower/package/petitboot/65-md-incremental.rules
+++ b/openpower/package/petitboot/65-md-incremental.rules
@@ -25,7 +25,7 @@
# anything here, just regular disks, and this also won't get any imsm
# array members either)
SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid_member", \
- RUN+="/usr/sbin/mdadm -I --export $env{DEVNAME}"
+ RUN+="/sbin/mdadm -I --export $env{DEVNAME}"
# Next, check to make sure the BIOS raid stuff wasn't turned off via cmdline
IMPORT{cmdline}="noiswmd"
@@ -33,37 +33,37 @@
ENV{noiswmd}=="?*", GOTO="md_imsm_inc_end"
ENV{nodmraid}=="?*", GOTO="md_imsm_inc_end"
SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \
- RUN+="/usr/sbin/mdadm -I $env{DEVNAME}"
+ RUN+="/sbin/mdadm -I $env{DEVNAME}"
LABEL="md_imsm_inc_end"
SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \
- RUN+="/usr/sbin/mdadm -If $name --path $env{ID_PATH}"
+ RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}!="?*", \
- RUN+="/usr/sbin/mdadm -If $name"
+ RUN+="/sbin/mdadm -If $name"
# Next make sure that this isn't a dm device we should skip for some reason
ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end"
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end"
ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end"
KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \
- ACTION=="change", RUN+="/usr/sbin/mdadm -I $env{DEVNAME}"
+ ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}"
LABEL="dm_change_end"
# Finally catch any nested md raid arrays. If we brought up an md raid
# array that's part of another md raid array, it won't be ready to be used
# until the change event that occurs when it becomes live
KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \
- ACTION=="change", RUN+="/usr/sbin/mdadm -I $env{DEVNAME}"
+ ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}"
# In case the initramfs only started some of the arrays in our container,
# run incremental assembly on the container itself. Note: we ran mdadm
# on the container in 64-md-raid.rules, and that's how the MD_LEVEL
# environment variable is already set. If that disappears from the other
# file, we will need to add this line into the middle of the next rule:
-# IMPORT{program}="/usr/sbin/mdadm -D --export $tempnode", \
+# IMPORT{program}="/sbin/mdadm -D --export $tempnode", \
SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \
- ENV{MD_LEVEL}=="container", RUN+="/usr/sbin/mdadm -I $env{DEVNAME}"
+ ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}"
LABEL="md_end"