od: configs: Update to Buildroot 2022.11

Update the gcw0, lepus and rs90 configs to compile Binutils 2.38 instead of 2.37, GCC 12 instead of 11, and GDB 11 instead of 10. The python3-ssl module was also disabled, because of the hard dependency on openssl (vs. libressl). I don't think anything uses it, so it should be safe to remove it here. Signed-off-by: Paul Cercueil <[email protected]>
citral23 · Dec 18, 2022 · 00363b7 · 00363b7
1 parent 520d244
commit 00363b7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 38 deletions.
diff --git a/configs/od_gcw0_defconfig b/configs/od_gcw0_defconfig
@@ -1,24 +1,24 @@
 BR2_mipsel=y
 BR2_mips_32r2=y
 # BR2_MIPS_SOFT_FLOAT is not set
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/gcw0"
-BR2_CCACHE_BR_ONLY=y
-BR2_OPTIMIZE_2=y
-BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
-# BR2_PIC_PIE is not set
-BR2_RELRO_NONE=y
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="gcw0"
+BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
 BR2_UCLIBC_CONFIG="board/opendingux/gcw0/uclibc.config"
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_PTHREAD_DEBUG=y
-BR2_BINUTILS_VERSION_2_37_X=y
-BR2_GCC_VERSION_11_X=y
+BR2_GCC_VERSION_12_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-mips-plt"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GCC_ENABLE_LTO=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/gcw0"
+BR2_CCACHE_BR_ONLY=y
+BR2_OPTIMIZE_2=y
+BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
+BR2_PER_PACKAGE_DIRECTORIES=y
+# BR2_PIC_PIE is not set
+BR2_RELRO_NONE=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/opendingux/target_skeleton"
 BR2_TARGET_GENERIC_PASSWD_SHA512=y
@@ -47,8 +47,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ingenic/gcw0 ingenic/gcw0_proto ingenic/pocket
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_LINUX_TOOLS_PERF=y
-BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3=y
 BR2_PACKAGE_LINUX_TOOLS_PERF_TUI=y
+BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/opendingux/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_ALSA_UTILS=y
@@ -115,11 +115,9 @@ BR2_PACKAGE_LUAJIT_COMPAT52=y
 BR2_PACKAGE_PYTHON3=y
 BR2_PACKAGE_PYTHON3_CURSES=y
 BR2_PACKAGE_PYTHON3_READLINE=y
-BR2_PACKAGE_PYTHON3_SSL=y
 BR2_PACKAGE_PYTHON3_SQLITE=y
 BR2_PACKAGE_PYTHON3_PYEXPAT=y
 BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
 # BR2_PACKAGE_ALSA_LIB_ALISP is not set
 # BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set
 BR2_PACKAGE_LIBID3TAG=y
@@ -144,7 +142,6 @@ BR2_PACKAGE_GLOG=y
 BR2_PACKAGE_C_ARES=y
 BR2_PACKAGE_LIBHTTPPARSER=y
 BR2_PACKAGE_BOOST=y
-BR2_PACKAGE_BOOST_ATOMIC=y
 BR2_PACKAGE_BOOST_DATE_TIME=y
 BR2_PACKAGE_BOOST_FILESYSTEM=y
 BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y
@@ -229,4 +226,3 @@ BR2_PACKAGE_SPARROW3D=y
 BR2_PACKAGE_UBIBOOT=y
 BR2_PACKAGE_UBIBOOT_BOARDNAME="gcw0"
 BR2_PACKAGE_UNLOCKVT=y
-BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/configs/od_lepus_defconfig b/configs/od_lepus_defconfig
@@ -2,6 +2,16 @@ BR2_mipsel=y
 BR2_mips_xburst=y
 # BR2_MIPS_SOFT_FLOAT is not set
 BR2_MIPS_FP32_MODE_32=y
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="lepus"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_BINUTILS_VERSION_2_38_X=y
+BR2_GCC_VERSION_12_X=y
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-mips-plt"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_PACKAGE_HOST_GDB_PYTHON3=y
+BR2_GDB_VERSION_11=y
+BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/lepus"
 BR2_CCACHE_BR_ONLY=y
@@ -10,16 +20,6 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
 # BR2_PIC_PIE is not set
 BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="lepus"
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_BINUTILS_VERSION_2_37_X=y
-BR2_GCC_VERSION_11_X=y
-BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-mips-plt"
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GCC_ENABLE_LTO=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_PACKAGE_HOST_GDB_PYTHON3=y
-BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/opendingux/target_skeleton"
 BR2_TARGET_GENERIC_PASSWD_SHA512=y
@@ -86,7 +86,6 @@ BR2_PACKAGE_PYTHON3_SSL=y
 BR2_PACKAGE_PYTHON3_PYEXPAT=y
 BR2_PACKAGE_PYTHON3_ZLIB=y
 BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
 # BR2_PACKAGE_ALSA_LIB_ALOAD is not set
 # BR2_PACKAGE_ALSA_LIB_RAWMIDI is not set
 # BR2_PACKAGE_ALSA_LIB_HWDEP is not set
@@ -101,10 +100,8 @@ BR2_PACKAGE_LIBVORBIS=y
 BR2_PACKAGE_OPUS=y
 BR2_PACKAGE_TREMOR=y
 BR2_PACKAGE_LIBZIP=y
-BR2_PACKAGE_LIBRESSL=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_BOOST=y
-BR2_PACKAGE_BOOST_ATOMIC=y
 BR2_PACKAGE_BOOST_DATE_TIME=y
 BR2_PACKAGE_BOOST_FILESYSTEM=y
 BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y

diff --git a/configs/od_rs90_defconfig b/configs/od_rs90_defconfig
@@ -1,4 +1,13 @@
 BR2_mipsel=y
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="rs90"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_BINUTILS_VERSION_2_38_X=y
+BR2_GCC_VERSION_12_X=y
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-mips-plt"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_GDB_VERSION_11=y
+BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/rs90"
 BR2_CCACHE_BR_ONLY=y
@@ -7,15 +16,6 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
 # BR2_PIC_PIE is not set
 BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="rs90"
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_BINUTILS_VERSION_2_37_X=y
-BR2_GCC_VERSION_11_X=y
-BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-mips-plt"
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GCC_ENABLE_LTO=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/opendingux/target_skeleton"
 BR2_TARGET_GENERIC_PASSWD_SHA512=y
@@ -94,7 +94,6 @@ BR2_PACKAGE_PYTHON3_PYEXPAT=y
 BR2_PACKAGE_PYTHON3_ZLIB=y
 BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
 BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
 # BR2_PACKAGE_ALSA_LIB_ALOAD is not set
 # BR2_PACKAGE_ALSA_LIB_RAWMIDI is not set
 # BR2_PACKAGE_ALSA_LIB_HWDEP is not set