toolchain: update workflow and profiles

themactep · Dec 8, 2024 · 454f092 · 454f092
1 parent a26092a
commit 454f092
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 8 deletions.
diff --git a/.github/workflows/toolchain.yaml b/.github/workflows/toolchain.yaml
@@ -77,9 +77,9 @@ jobs:
         id: set-matrix
         run: |
           if [[ "${{ github.event.inputs.latest_only }}" == 'true' ]]; then
-            CONFIGS=$(find configs/github/ -type f | sort | awk -F '/' '{print $(NF)}' | grep 'toolchain_xburst1_musl_gcc14')
+            CONFIGS=$(find configs/github/ -type f | sort | awk -F '/' '{print $(NF)}' | grep 'gcc14')
           else
-            CONFIGS=$(find configs/github/ -type f | sort | awk -F '/' '{print $(NF)}' | grep 'toolchain_xburst1')
+            CONFIGS=$(find configs/github/ -type f | sort | awk -F '/' '{print $(NF)}' | grep 'toolchain_xburst')
           fi
           JSON_MATRIX="{\"toolchain-version\": ["
           for CONFIG in $CONFIGS; do

diff --git a/configs/github/toolchain_xburst2_musl_gcc12 b/configs/github/toolchain_xburst2_musl_gcc12
@@ -3,12 +3,12 @@ BR2_mips_xburst=y
 # BR2_MIPS_SOFT_FLOAT is not set
 BR2_MIPS_FP32_MODE_64=y
 BR2_OPTIMIZE_S=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
+#BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
 BR2_REPRODUCIBLE=y
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="thingino"
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_BINUTILS_VERSION_2_41_X=y
+BR2_BINUTILS_VERSION_2_43_X=y
 BR2_GCC_VERSION_12_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_CCACHE=y
@@ -17,6 +17,9 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(THINGINO_KERNEL)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/board/ingenic/xburst1/kernel/$(KERNEL_VERSION)/$(SOC_FAMILY).generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/board/ingenic/xburst2/kernel/4.4/t40.generic.config"
 BR2_LINUX_KERNEL_LZMA=y
 BR2_SOC_INGENIC_T40XP=y
+KERNEL_VERSION_4=y
+BR2_THINGINO_TOOLCHAIN_BUILD=y
+BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/configs/github/toolchain_xburst2_musl_gcc13 b/configs/github/toolchain_xburst2_musl_gcc13
@@ -3,12 +3,12 @@ BR2_mips_xburst=y
 # BR2_MIPS_SOFT_FLOAT is not set
 BR2_MIPS_FP32_MODE_64=y
 BR2_OPTIMIZE_S=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
+#BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
 BR2_REPRODUCIBLE=y
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="thingino"
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_BINUTILS_VERSION_2_41_X=y
+BR2_BINUTILS_VERSION_2_43_X=y
 BR2_GCC_VERSION_13_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_CCACHE=y
@@ -17,6 +17,9 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(THINGINO_KERNEL)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/board/ingenic/xburst1/kernel/$(KERNEL_VERSION)/$(SOC_FAMILY).generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/board/ingenic/xburst2/kernel/4.4/t40.generic.config"
 BR2_LINUX_KERNEL_LZMA=y
 BR2_SOC_INGENIC_T40XP=y
+KERNEL_VERSION_4=y
+BR2_THINGINO_TOOLCHAIN_BUILD=y
+BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/configs/github/toolchain_xburst2_musl_gcc14 b/configs/github/toolchain_xburst2_musl_gcc14
@@ -0,0 +1,25 @@
+BR2_mipsel=y
+BR2_mips_xburst=y
+# BR2_MIPS_SOFT_FLOAT is not set
+BR2_MIPS_FP32_MODE_64=y
+BR2_OPTIMIZE_S=y
+#BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
+BR2_REPRODUCIBLE=y
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="thingino"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_BINUTILS_VERSION_2_43_X=y
+BR2_GCC_VERSION_14_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(HOME)/.ccache"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(THINGINO_KERNEL)"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/board/ingenic/xburst2/kernel/4.4/t40.generic.config"
+BR2_LINUX_KERNEL_LZMA=y
+BR2_SOC_INGENIC_T40XP=y
+KERNEL_VERSION_4=y
+BR2_THINGINO_TOOLCHAIN_BUILD=y
+BR2_PER_PACKAGE_DIRECTORIES=y