Sync git submodule

GCC 11 is now the default Also bump loadkeys to 2.5.1 to avoid compilation error with GCC 11 Signed-off-by: Trung Lê <8@tle.id.au>
open-power · Sep 12, 2023 · bf04ba1 · bf04ba1
1 parent 8632106
commit bf04ba1
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 16 deletions.
diff --git a/buildroot b/buildroot
diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig
@@ -2,7 +2,7 @@ BR2_powerpc64le=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/blackbird-patches"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig
@@ -2,7 +2,7 @@ BR2_powerpc64le=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/mihawk-patches"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/mowgli_defconfig b/openpower/configs/mowgli_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/swift_defconfig b/openpower/configs/swift_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
+BR2_GCC_VERSION_11_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/package/loadkeys/loadkeys.hash b/openpower/package/loadkeys/loadkeys.hash
@@ -1,2 +1,4 @@
 # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc
-sha256	7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e	kbd-2.0.3.tar.xz
+sha256  ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683  kbd-2.5.1.tar.xz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256  5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f  CREDITS
diff --git a/openpower/package/loadkeys/loadkeys.mk b/openpower/package/loadkeys/loadkeys.mk
@@ -4,13 +4,17 @@
 #
 ################################################################################
 
-LOADKEYS_VERSION = 2.0.3
+LOADKEYS_VERSION = 2.5.1
 LOADKEYS_SOURCE = kbd-$(LOADKEYS_VERSION).tar.xz
 LOADKEYS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
-LOADKEYS_CONF_OPTS = --disable-vlock
-LOADKEYS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-LOADKEYS_LICENSE = GPLv2+
-LOADKEYS_LICENSE_FILES = COPYING
+LOADKEYS_CONF_OPTS = \
+	--disable-vlock \
+	--disable-tests
+LOADKEYS_DEPENDENCIES = \
+	$(TARGET_NLS_DEPENDENCIES) \
+	host-pkgconf
+LOADKEYS_LICENSE = GPL-2.0+
+LOADKEYS_LICENSE_FILES = COPYING CREDITS
 LOADKEYS_INSTALL_STAGING = NO
 LOADKEYS_INSTALL_TARGET = YES