From 511e5d523eced4cfac51a27e2e1d62934ddd6c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= <8@tle.id.au> Date: Sat, 16 Sep 2023 10:49:54 +1000 Subject: [PATCH] buildroot: Bump to version 2023.02-op-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Trung Lê <8@tle.id.au> --- .gitmodules | 2 +- README.md | 7 ++++--- buildroot | 2 +- openpower/configs/blackbird_defconfig | 3 +-- openpower/configs/mihawk_defconfig | 3 +-- openpower/configs/mowgli_defconfig | 3 +-- openpower/configs/nicole_defconfig | 3 +-- openpower/configs/opal_defconfig | 1 - openpower/configs/p9dsu_defconfig | 3 +-- openpower/configs/romulus_defconfig | 3 +-- openpower/configs/swift_defconfig | 3 +-- openpower/configs/witherspoon_defconfig | 3 +-- openpower/configs/zaius_defconfig | 3 +-- openpower/configs/zz_defconfig | 1 - openpower/package/loadkeys/loadkeys.hash | 4 +++- openpower/package/loadkeys/loadkeys.mk | 14 +++++++++----- 16 files changed, 27 insertions(+), 31 deletions(-) diff --git a/.gitmodules b/.gitmodules index 27c579253a..6f26cb3f1c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot - branch = 2021.02-op-build + branch = 2023.02-op-build url = https://github.com/open-power/buildroot diff --git a/README.md b/README.md index cf8224b6c3..1d5d3aa490 100644 --- a/README.md +++ b/README.md @@ -46,15 +46,16 @@ a handful of other packages (see below). ### Dependencies for *64-bit* Ubuntu/Debian systems -1. Install Ubuntu (>= 18.04) or Debian (>= 9) 64-bit. +1. Install Ubuntu (>= 22.04) or Debian (>= 9) 64-bit. 2. Enable Universe (Ubuntu only): sudo apt-get install software-properties-common sudo add-apt-repository universe + 3. Install the packages necessary for the build: - sudo apt-get install cscope ctags libz-dev libexpat-dev \ - python language-pack-en texinfo gawk cpio xxd \ + sudo apt-get install cscope universal-ctags libz-dev libexpat-dev \ + python2 python-is-python3 language-pack-en texinfo gawk cpio xxd \ build-essential g++ git bison flex unzip \ libssl-dev libxml-simple-perl libxml-sax-perl libxml-parser-perl libxml2-dev libxml2-utils xsltproc \ wget bc rsync diff --git a/buildroot b/buildroot index 2b611ab062..821fd62c35 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 2b611ab062a57fdc287be80f8e9d28d64ceb1b52 +Subproject commit 821fd62c355c52485f6eb7e0a07fdb1a6c9e90a7 diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig index 01d83422b3..01e9cf7eec 100644 --- a/openpower/configs/blackbird_defconfig +++ b/openpower/configs/blackbird_defconfig @@ -1,9 +1,8 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index 2d9e121ccd..3881f1c269 100644 --- a/openpower/configs/mihawk_defconfig +++ b/openpower/configs/mihawk_defconfig @@ -1,9 +1,8 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index 22d3643a7b..ce7f7a2508 100644 --- a/openpower/configs/mowgli_defconfig +++ b/openpower/configs/mowgli_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index 72422ed906..c7ae96c5e4 100644 --- a/openpower/configs/nicole_defconfig +++ b/openpower/configs/nicole_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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/opal_defconfig b/openpower/configs/opal_defconfig index 279a73532a..326e0dbbd7 100644 --- a/openpower/configs/opal_defconfig +++ b/openpower/configs/opal_defconfig @@ -1,5 +1,4 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index a1b0317ca2..204c51a7b8 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index b33225adb6..d5723e9e19 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index 57460c9548..b732b35370 100644 --- a/openpower/configs/swift_defconfig +++ b/openpower/configs/swift_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index da8046ae34..92e09474eb 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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 index 72a0a83bc1..4ce342852f 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -1,8 +1,7 @@ BR2_powerpc64le=y -BR2_powerpc_power8=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/zz_defconfig b/openpower/configs/zz_defconfig index 326f513c52..9bd1ce5b55 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -1,5 +1,4 @@ BR2_powerpc64le=y -BR2_powerpc_power8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" diff --git a/openpower/package/loadkeys/loadkeys.hash b/openpower/package/loadkeys/loadkeys.hash index 39a4cddb6e..63f7286d30 100644 --- 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 index 0a05026d43..03372fca6b 100644 --- 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