Update toolchain to GCC 10, add ualpn binary

pinetainer · Sep 23, 2020 · 1a1a94a · 1a1a94a
1 parent 8b9300d
commit 1a1a94a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/configs/pinechain_defconfig b/configs/pinechain_defconfig
@@ -6,6 +6,7 @@ BR2_REPRODUCIBLE=y
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="pinechain"
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_BINUTILS_VERSION_2_34_X=y
+BR2_GCC_VERSION_10_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_GCC_ENABLE_LTO=y
 BR2_GCC_ENABLE_OPENMP=y
@@ -17,3 +18,4 @@ BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_TARGET_GENERIC_GETTY is not set
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 # BR2_PACKAGE_BUSYBOX is not set
+# BR2_TARGET_ROOTFS_TAR is not set
diff --git a/configs/pinetainer_defconfig b/configs/pinetainer_defconfig
@@ -12,8 +12,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(BR2_EXTERNAL_PINETAINER_PATH)/aarch64-pinechain-linux-musl_sdk-buildroot"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-pinechain-linux-musl"
-BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_TOOLCHAIN_EXTERNAL_OPENMP=y
@@ -37,7 +36,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_PINETAINER_PATH)/board/common/post-
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_PINETAINER_PATH)/board/pinetainer/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9-rc6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_PINETAINER_PATH)/board/common/linux.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_PINETAINER_PATH)/board/pinetainer/linux.config"
@@ -127,6 +126,7 @@ BR2_PACKAGE_SOCAT=y
 BR2_PACKAGE_STUNNEL=y
 BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_UACME=y
+BR2_PACKAGE_UACME_UALPN=y
 BR2_PACKAGE_WGET=y
 # BR2_PACKAGE_URANDOM_SCRIPTS is not set
 BR2_PACKAGE_AT=y

diff --git a/configs/pineup_defconfig b/configs/pineup_defconfig
@@ -12,8 +12,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(BR2_EXTERNAL_PINETAINER_PATH)/aarch64-pinechain-linux-musl_sdk-buildroot"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-pinechain-linux-musl"
-BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_TOOLCHAIN_EXTERNAL_OPENMP=y
@@ -36,7 +35,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_PINETAINER_PATH)/board/common/post-
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_PINETAINER_PATH)/board/pineup/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9-rc6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_PINETAINER_PATH)/board/common/linux.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_PINETAINER_PATH)/board/pineup/linux.config"
@@ -90,11 +89,11 @@ BR2_PACKAGE_NFTABLES=y
 BR2_PACKAGE_SOCAT=y
 BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WGET=y
-# BR2_PACKAGE_URANDOM_SCRIPTS is not set
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+# BR2_PACKAGE_URANDOM_SCRIPTS is not set
 BR2_PACKAGE_WHICH=y
 BR2_PACKAGE_COREUTILS=y
 BR2_PACKAGE_KMOD_TOOLS=y