From eb4406179cc82f23b58d052d476e2c82427356c5 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:22:43 +0100 Subject: [PATCH] [no ci] Scripts: formatting --- general/scripts/rootfs_script.sh | 10 +- general/scripts/show_toolchains.sh | 150 ++++++++++++++--------------- general/scripts/sync_goke.sh | 24 ++--- 3 files changed, 92 insertions(+), 92 deletions(-) diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh index 78bddd0a..abe8cc6a 100755 --- a/general/scripts/rootfs_script.sh +++ b/general/scripts/rootfs_script.sh @@ -10,13 +10,13 @@ date +TIME_STAMP=%s >> ${FILE} CONF="INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|WIFIBROADCAST=y|WEBRTC_AUDIO_PROCESSING=y" if ! grep -q "USES_GLIBC" ${BR2_CONFIG} && ! grep -qP ${CONF} ${BR2_CONFIG}; then - rm -f ${TARGET_DIR}/usr/lib/libstdc++* + rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi if grep -q "USES_MUSL" ${BR2_CONFIG}; then - LIST=${BR2_EXTERNAL}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_FLAVOR}.list - test -e ${LIST} && xargs -a ${LIST} -I % rm -f ${TARGET_DIR}% + LIST=${BR2_EXTERNAL}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_FLAVOR}.list + test -e ${LIST} && xargs -a ${LIST} -I % rm -f ${TARGET_DIR}% - ln -sf libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 - ln -sf ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd + ln -sf libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 + ln -sf ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd fi diff --git a/general/scripts/show_toolchains.sh b/general/scripts/show_toolchains.sh index 7cfc2960..57b8bf8e 100755 --- a/general/scripts/show_toolchains.sh +++ b/general/scripts/show_toolchains.sh @@ -3,87 +3,87 @@ shopt -s nullglob toolchain_by_config() { - CF=$1 - FMT=$2 + CF=$1 + FMT=$2 - BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF) - if [ -n "$BR2_VER" ]; then - VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') - KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}') - GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF) - ARCH=$(sed -rn "s/^BR2_(arm[a-z0-9_]+)=y/\1/p" $CF) - if [ -z "$ARCH" ]; then - ARCH=$(sed -rn "s/^BR2_(cortex_[a-z0-9_]+)=y/\1/p" $CF) - fi - if [ -z "$ARCH" ]; then - ARCH=$(sed -rn "s/^BR2_(arm)=y/\1/p" $CF) - else - # Here we have something from ARM modern family - HF=$(sed -rn "s/^BR2_ARM_EABI(HF)=y/\1/p" $CF | tr '[:upper:]' '[:lower:]') - fi + BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF) + if [ -n "$BR2_VER" ]; then + VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') + KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}') + GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF) + ARCH=$(sed -rn "s/^BR2_(arm[a-z0-9_]+)=y/\1/p" $CF) + if [ -z "$ARCH" ]; then + ARCH=$(sed -rn "s/^BR2_(cortex_[a-z0-9_]+)=y/\1/p" $CF) + fi + if [ -z "$ARCH" ]; then + ARCH=$(sed -rn "s/^BR2_(arm)=y/\1/p" $CF) + else + # Here we have something from ARM modern family + HF=$(sed -rn "s/^BR2_ARM_EABI(HF)=y/\1/p" $CF | tr '[:upper:]' '[:lower:]') + fi - if [ -z "$ARCH" ]; then - ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF) - else - THUMB=$(sed -rn "s/^BR2_ARM_INSTRUCTIONS_(THUMB2)=y/\1/p" $CF) - if [ -n "$THUMB" ]; then - ARCH="${ARCH}_${THUMB,,}" - fi - if [ -n "$HF" ]; then - ARCH="${ARCH}_${HF}" - fi - fi + if [ -z "$ARCH" ]; then + ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF) + else + THUMB=$(sed -rn "s/^BR2_ARM_INSTRUCTIONS_(THUMB2)=y/\1/p" $CF) + if [ -n "$THUMB" ]; then + ARCH="${ARCH}_${THUMB,,}" + fi + if [ -n "$HF" ]; then + ARCH="${ARCH}_${HF}" + fi + fi - LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF) + LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF) - SOC=$(echo $CF | cut -d _ -f 3) - case $FMT in - list) - echo $ARCH $GCC_VER $LIBC $KVER $VENDOR $CF - ;; - uniq) - echo $ARCH $GCC_VER $LIBC $KVER - ;; - *) - if [ -n "$2" ]; then - BR_DIR=buildroot-$2 - GCC_VER=$(sed -rn \ - "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ - $BR_DIR/package/gcc/Config.in.host) - case $LIBC in - musl) - VER=$(sed -rn "s/^MUSL_VERSION\s*=\s*([0-9.]+)/\1/p" \ - $BR_DIR/package/musl/musl.mk) - ;; - uclibc) - VER=$(sed -rn "s/^UCLIBC_VERSION\s*=\s*([0-9.]+)/\1/p" \ - $BR_DIR/package/uclibc/uclibc.mk) - ;; - glibc) - VER=$(sed -rn "s/^GLIBC_VERSION\s*=\s*([0-9.]+).*/\1/p" \ - $BR_DIR/package/glibc/glibc.mk | tail -1) - ;; - esac - HASH=$(echo $VER | sha1sum | cut -c 1-8) - echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER}-${HASH} - else - echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER} - fi - ;; - esac - fi + SOC=$(echo $CF | cut -d _ -f 3) + case $FMT in + list) + echo $ARCH $GCC_VER $LIBC $KVER $VENDOR $CF + ;; + uniq) + echo $ARCH $GCC_VER $LIBC $KVER + ;; + *) + if [ -n "$2" ]; then + BR_DIR=buildroot-$2 + GCC_VER=$(sed -rn \ + "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ + $BR_DIR/package/gcc/Config.in.host) + case $LIBC in + musl) + VER=$(sed -rn "s/^MUSL_VERSION\s*=\s*([0-9.]+)/\1/p" \ + $BR_DIR/package/musl/musl.mk) + ;; + uclibc) + VER=$(sed -rn "s/^UCLIBC_VERSION\s*=\s*([0-9.]+)/\1/p" \ + $BR_DIR/package/uclibc/uclibc.mk) + ;; + glibc) + VER=$(sed -rn "s/^GLIBC_VERSION\s*=\s*([0-9.]+).*/\1/p" \ + $BR_DIR/package/glibc/glibc.mk | tail -1) + ;; + esac + HASH=$(echo $VER | sha1sum | cut -c 1-8) + echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER}-${HASH} + else + echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER} + fi + ;; + esac + fi } if [ $# -eq 0 ]; then - $0 list | sort + $0 list | sort else - if [ "$1" != "list" ] && [ "$1" != "uniq" ]; then - toolchain_by_config $1 $2 - else - for D in br-ext-chip-*; do - for CF in $D/configs/*; do - toolchain_by_config $CF $1 - done - done - fi + if [ "$1" != "list" ] && [ "$1" != "uniq" ]; then + toolchain_by_config $1 $2 + else + for D in br-ext-chip-*; do + for CF in $D/configs/*; do + toolchain_by_config $CF $1 + done + done + fi fi diff --git a/general/scripts/sync_goke.sh b/general/scripts/sync_goke.sh index bf9c8a26..0ebbe1a7 100755 --- a/general/scripts/sync_goke.sh +++ b/general/scripts/sync_goke.sh @@ -4,21 +4,21 @@ INDIR=br-ext-chip-hisilicon/board/hi3516ev200/kernel OUTDIR=br-ext-chip-goke/board/gk7205v200/kernel function map_soc() { - case $1 in - hi3516ev200) NEW_SOC=gk7205v200 ;; - hi3516dv200) NEW_SOC=gk7605v100 ;; - hi3516ev300) NEW_SOC=gk7205v300 ;; - hi3518ev300) NEW_SOC=gk7202v300 ;; - esac + case $1 in + hi3516ev200) NEW_SOC=gk7205v200 ;; + hi3516dv200) NEW_SOC=gk7605v100 ;; + hi3516ev300) NEW_SOC=gk7205v300 ;; + hi3518ev300) NEW_SOC=gk7202v300 ;; + esac } pushd $(git rev-parse --show-toplevel) > /dev/null for FILENAME in ${INDIR}/*.config; do - OLD_CONFIG=$(basename $FILENAME) - OLD_SOC=$(echo $OLD_CONFIG | cut -f 1 -d .) - map_soc $OLD_SOC - NEW_CONFIG=$(echo $OLD_CONFIG | sed "s/$OLD_SOC/$NEW_SOC/") - general/scripts/clone_hisi2goke.sh $INDIR/$OLD_CONFIG $OUTDIR/$NEW_CONFIG - git add $OUTDIR/$NEW_CONFIG + OLD_CONFIG=$(basename $FILENAME) + OLD_SOC=$(echo $OLD_CONFIG | cut -f 1 -d .) + map_soc $OLD_SOC + NEW_CONFIG=$(echo $OLD_CONFIG | sed "s/$OLD_SOC/$NEW_SOC/") + general/scripts/clone_hisi2goke.sh $INDIR/$OLD_CONFIG $OUTDIR/$NEW_CONFIG + git add $OUTDIR/$NEW_CONFIG done popd > /dev/null