From 38aaef82a3af6b643d9b0a58d152a68bcae480ac Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Fri, 24 Dec 2021 22:05:24 +0300 Subject: [PATCH] Move SigmaStar devices to musleabihf --- .github/workflows/ssc325_images.yml | 4 +- .github/workflows/ssc335_images.yml | 4 +- .github/workflows/ssc337de_images.yml | 4 +- .../unknown_unknown_ssc325_openipc_defconfig | 12 +-- .../unknown_unknown_ssc333_openipc_defconfig | 12 +-- ...unknown_unknown_ssc335_initramfs_defconfig | 7 +- .../unknown_unknown_ssc335_musl_defconfig | 97 ------------------- .../unknown_unknown_ssc335_openipc_defconfig | 12 +-- .../unknown_unknown_ssc335_portal_defconfig | 12 +-- ...unknown_unknown_ssc335de_openipc_defconfig | 12 +-- ...unknown_unknown_ssc337de_openipc_defconfig | 12 +-- 11 files changed, 46 insertions(+), 142 deletions(-) delete mode 100644 br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig diff --git a/.github/workflows/ssc325_images.yml b/.github/workflows/ssc325_images.yml index dbe61f71..9084da78 100644 --- a/.github/workflows/ssc325_images.yml +++ b/.github/workflows/ssc325_images.yml @@ -80,7 +80,7 @@ jobs: id: build-ssc325-sdk continue-on-error: true run: | - ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-uclibcgnueabihf_sdk-buildroot.tar.gz" + ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-musleabihf_sdk-buildroot.tar.gz" echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV cd $GITHUB_WORKSPACE/output make sdk @@ -124,7 +124,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "arm-openipc-ssc325-linux-uclibcgnueabihf_sdk-buildroot.tar.gz" + asset_name: "arm-openipc-ssc325-linux-musleabihf_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/.github/workflows/ssc335_images.yml b/.github/workflows/ssc335_images.yml index dc41b7d0..3d8d6fa7 100644 --- a/.github/workflows/ssc335_images.yml +++ b/.github/workflows/ssc335_images.yml @@ -80,7 +80,7 @@ jobs: id: build-ssc335-sdk continue-on-error: true run: | - ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-uclibcgnueabihf_sdk-buildroot.tar.gz" + ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-musleabihf_sdk-buildroot.tar.gz" echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV cd $GITHUB_WORKSPACE/output make sdk @@ -124,7 +124,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "arm-openipc-ssc335-linux-uclibcgnueabihf_sdk-buildroot.tar.gz" + asset_name: "arm-openipc-ssc335-linux-musleabihf_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/.github/workflows/ssc337de_images.yml b/.github/workflows/ssc337de_images.yml index b25ec6f0..011bd9e4 100644 --- a/.github/workflows/ssc337de_images.yml +++ b/.github/workflows/ssc337de_images.yml @@ -80,7 +80,7 @@ jobs: id: build-ssc337de-sdk continue-on-error: true run: | - ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-uclibcgnueabihf_sdk-buildroot.tar.gz" + ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-musleabihf_sdk-buildroot.tar.gz" echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV cd $GITHUB_WORKSPACE/output make sdk @@ -124,7 +124,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "arm-openipc-ssc337de-linux-uclibcgnueabihf_sdk-buildroot.tar.gz" + asset_name: "arm-openipc-ssc337de-linux-musleabihf_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig index a91952ac..e2af19fe 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig @@ -11,12 +11,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -# BR2_TOOLCHAIN_USES_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig index a355363d..59abf99f 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig @@ -11,12 +11,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -# BR2_TOOLCHAIN_USES_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_initramfs_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_initramfs_defconfig index edb9ea3d..a4a94694 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_initramfs_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_initramfs_defconfig @@ -11,9 +11,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y # Kernel diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig deleted file mode 100644 index 328335c1..00000000 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig +++ /dev/null @@ -1,97 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_EABIHF=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="4.9.84" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y - -# Toolchain -BR2_PER_PACKAGE_DIRECTORIES=y -BR2_GCC_VERSION_7_X=y -# BR2_TOOLCHAIN_USES_UCLIBC is not set -# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -BR2_TOOLCHAIN_USES_MUSL=y -BR2_TOOLCHAIN_BUILDROOT_MUSL=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" -BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TOOLCHAIN_BUILDROOT_LOCALE=y -BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.84" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/ssc335.generic.config" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_XZ=y -BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER=y -BR2_LINUX_KERNEL_EXT_SIGMASTAR_PATCHER_LIST="$(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/patches/ $(BR2_EXTERNAL_SIGMASTAR_PATH)/board/infinity6b0/kernel/overlay" - -# Filesystem -# BR2_TARGET_TZ_INFO is not set -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_SQUASHFS=y -BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y -BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh" - -# OpenIPC configuration -BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" -BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1" -BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc335-musl" -BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches" - -# OpenIPC packages -BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config" -BR2_PACKAGE_DROPBEAR=y -# BR2_PACKAGE_FDK_AAC_OPENIPC is not set -BR2_PACKAGE_FWPRINTENV_OPENIPC=y -BR2_PACKAGE_HASERL=y -BR2_PACKAGE_IPCTOOL=y -BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y -BR2_PACKAGE_LIBCURL_OPENIPC=y -BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y -# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set -# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set -# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set -# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set -BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y -BR2_PACKAGE_LIBEVENT_OPENIPC=y -BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y -BR2_PACKAGE_LIBOGG_OPENIPC=y -BR2_PACKAGE_LIBYAML=y -BR2_PACKAGE_MAJESTIC_FONTS=y -BR2_PACKAGE_MAJESTIC_SSC335=y -BR2_PACKAGE_MBEDTLS_OPENIPC=y -# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set -# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MICROBE_WEB=y -# BR2_PACKAGE_MINI_SNMPD is not set -BR2_PACKAGE_MOTORS=y -BR2_PACKAGE_OPUS_OPENIPC=y -BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y -BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y -# BR2_PACKAGE_SSHPASS is not set -BR2_PACKAGE_UACME_OPENIPC=y -BR2_PACKAGE_VTUND_OPENIPC=y -BR2_PACKAGE_YAML_CLI=y - -# WiFi -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y -# BR2_PACKAGE_RTL8188EU is not set - -# WIREGUARD -BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y -BR2_PACKAGE_WIREGUARD_TOOLS=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig index 0c9cf99e..971d20ea 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig @@ -11,12 +11,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -# BR2_TOOLCHAIN_USES_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig index b63623dc..5d950981 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig @@ -11,12 +11,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -# BR2_TOOLCHAIN_USES_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig index af2ce5f8..022b47e3 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig @@ -11,12 +11,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -# BR2_TOOLCHAIN_USES_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig index ff46e4e1..545c9f87 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig @@ -11,12 +11,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain BR2_PER_PACKAGE_DIRECTORIES=y BR2_GCC_VERSION_7_X=y -BR2_TOOLCHAIN_USES_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" -# BR2_TOOLCHAIN_USES_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set -# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y