Merge pull request #3454 from runlevel5/kernel-5.4.18
kernel: Move to Linux v5.4.18-openpower1
diff --git a/op-build-env b/op-build-env
index e6ca40e..2537c4f 100755
--- a/op-build-env
+++ b/op-build-env
@@ -14,6 +14,8 @@
export BR2_EXTERNAL=${__PWD}/openpower
export BR2_DL_DIR=${__PWD}/dl
+export LANG=en_US.UTF-8
+
op-build () {
make --directory=${__PWD}/buildroot O=${__PWD}/output $@
}
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index c5dcb5d..3ec891c 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "19e0f82a35985230f2913be14d9dcf734cf7f556" if BR2_HOSTBOOT_LATEST_VERSION
+ default "46174931e05562140af4ef53b5074420cf142332" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index c1fe08f..723c90b 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -4,16 +4,18 @@
#
################################################################################
+LIBFLASH_VERSION = $(call qstrip,$(BR2_SKIBOOT_VERSION))
+
ifeq ($(BR2_SKIBOOT_CUSTOM_GIT),y)
LIBFLASH_SITE = $(call qstrip,$(BR2_SKIBOOT_CUSTOM_REPO_URL))
LIBFLASH_SITE_METHOD = git
else
-LIBFLASH_VERSION = $(call qstrip,$(BR2_SKIBOOT_VERSION))
LIBFLASH_SITE = $(call github,open-power,skiboot,$(LIBFLASH_VERSION))
endif
LIBFLASH_INSTALL_STAGING = YES
LIBFLASH_INSTALL_TARGET = YES
+LIBFLASH_DEPENDENCIES += skiboot
LIBFLASH_LICENSE_FILES = LICENCE