diff --git a/.gitmodules b/.gitmodules index db0c71c218..6f26cb3f1c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot - branch = 2022.02-op-build + branch = 2023.02-op-build url = https://github.com/open-power/buildroot diff --git a/README.md b/README.md index 96b4d0033b..29ac50c586 100644 --- a/README.md +++ b/README.md @@ -45,12 +45,12 @@ The machine your building on will need Python 2.7, GCC 8.4 (or later), and a handful of other packages (see below). ### Dependencies for *64-bit* Ubuntu/Debian systems - 1. Install Ubuntu 22.04 or Debian 12 (x86_64 or ppc64le). 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 universal-ctags libz-dev libexpat-dev \ diff --git a/buildroot b/buildroot index 65d9213f21..821fd62c35 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 65d9213f214d7f6810e61f4ec85e9893b717b40b +Subproject commit 821fd62c355c52485f6eb7e0a07fdb1a6c9e90a7 diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig index d3ff2e4c3b..e0e2067f86 100644 --- a/openpower/configs/blackbird_defconfig +++ b/openpower/configs/blackbird_defconfig @@ -1,5 +1,4 @@ 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" diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig index 47339a63a4..8c9240ad98 100644 --- a/openpower/configs/mihawk_defconfig +++ b/openpower/configs/mihawk_defconfig @@ -1,5 +1,4 @@ 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" diff --git a/openpower/configs/mowgli_defconfig b/openpower/configs/mowgli_defconfig index c159a986b4..91727278de 100644 --- a/openpower/configs/mowgli_defconfig +++ b/openpower/configs/mowgli_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig index b902033d45..48d5f2726a 100644 --- a/openpower/configs/nicole_defconfig +++ b/openpower/configs/nicole_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig index 2dbb58aca0..bebef531c9 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 37f338f213..f356c07acb 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index a7e160298c..fdee167990 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/swift_defconfig b/openpower/configs/swift_defconfig index f437956d71..62285068cd 100644 --- a/openpower/configs/swift_defconfig +++ b/openpower/configs/swift_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index f72cb716f0..41fea073d7 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index ad462d0660..675c882a4b 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_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_GCC_VERSION_11_X=y diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index ff9512facf..2ccbffed2b 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.mk b/openpower/package/loadkeys/loadkeys.mk index dcbe20a226..03372fca6b 100644 --- a/openpower/package/loadkeys/loadkeys.mk +++ b/openpower/package/loadkeys/loadkeys.mk @@ -8,11 +8,11 @@ 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 \ - --disable-tests + --disable-vlock \ + --disable-tests LOADKEYS_DEPENDENCIES = \ - $(TARGET_NLS_DEPENDENCIES) \ - host-pkgconf + $(TARGET_NLS_DEPENDENCIES) \ + host-pkgconf LOADKEYS_LICENSE = GPL-2.0+ LOADKEYS_LICENSE_FILES = COPYING CREDITS LOADKEYS_INSTALL_STAGING = NO