[no ci] Overlay: minor script formatting

pull/1343/head
Viktor 2024-03-10 20:07:55 +01:00
parent 4410246b4e
commit cd896c502e
5 changed files with 23 additions and 9 deletions

View File

@ -19,5 +19,5 @@ fi
LIST="${BR2_EXTERNAL_GENERAL_PATH}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_VARIANT}.list" LIST="${BR2_EXTERNAL_GENERAL_PATH}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_VARIANT}.list"
if [ -f ${LIST} ]; then if [ -f ${LIST} ]; then
xargs -a ${LIST} -I % rm -f ${TARGET_DIR}% xargs -a ${LIST} -I % rm -f ${TARGET_DIR}%
fi fi

View File

@ -10,6 +10,7 @@ toolchain_by_config() {
VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') 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}') 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) 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) ARCH=$(sed -rn "s/^BR2_(arm[a-z0-9_]+)=y/\1/p" $CF)
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
ARCH=$(sed -rn "s/^BR2_(cortex_[a-z0-9_]+)=y/\1/p" $CF) ARCH=$(sed -rn "s/^BR2_(cortex_[a-z0-9_]+)=y/\1/p" $CF)
@ -34,35 +35,40 @@ toolchain_by_config() {
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) SOC=$(echo $CF | cut -d _ -f 3)
case $FMT in case $FMT in
list) list)
echo $ARCH $GCC_VER $LIBC $KVER $VENDOR $CF echo $ARCH $GCC_VER $LIBC $KVER $VENDOR $CF
;; ;;
uniq) uniq)
echo $ARCH $GCC_VER $LIBC $KVER echo $ARCH $GCC_VER $LIBC $KVER
;; ;;
*) *)
if [ -n "$2" ]; then if [ -n "$2" ]; then
BR_DIR=buildroot-$2 BR_DIR=buildroot-$2
GCC_VER=$(sed -rn \ GCC_VER=$(sed -rn \
"s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \
$BR_DIR/package/gcc/Config.in.host) $BR_DIR/package/gcc/Config.in.host)
case $LIBC in case $LIBC in
musl) musl)
VER=$(sed -rn "s/^MUSL_VERSION\s*=\s*([0-9.]+)/\1/p" \ VER=$(sed -rn "s/^MUSL_VERSION\s*=\s*([0-9.]+)/\1/p" \
$BR_DIR/package/musl/musl.mk) $BR_DIR/package/musl/musl.mk)
;; ;;
uclibc) uclibc)
VER=$(sed -rn "s/^UCLIBC_VERSION\s*=\s*([0-9.]+)/\1/p" \ VER=$(sed -rn "s/^UCLIBC_VERSION\s*=\s*([0-9.]+)/\1/p" \
$BR_DIR/package/uclibc/uclibc.mk) $BR_DIR/package/uclibc/uclibc.mk)
;; ;;
glibc) glibc)
VER=$(sed -rn "s/^GLIBC_VERSION\s*=\s*([0-9.]+).*/\1/p" \ VER=$(sed -rn "s/^GLIBC_VERSION\s*=\s*([0-9.]+).*/\1/p" \
$BR_DIR/package/glibc/glibc.mk | tail -1) $BR_DIR/package/glibc/glibc.mk | tail -1)
;; ;;
esac esac
HASH=$(echo $VER | sha1sum | cut -c 1-8) HASH=$(echo $VER | sha1sum | cut -c 1-8)
echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER}-${HASH} echo ${ARCH}-gcc${GCC_VER}-${LIBC}-${KVER}-${HASH}
else else

View File

@ -4,10 +4,18 @@ OUTDIR=br-ext-chip-goke/board/gk7205v200/kernel
function map_soc() { function map_soc() {
case $1 in case $1 in
hi3516ev200) NEW_SOC=gk7205v200 ;; hi3516ev200)
hi3516dv200) NEW_SOC=gk7605v100 ;; NEW_SOC=gk7205v200
hi3516ev300) NEW_SOC=gk7205v300 ;; ;;
hi3518ev300) NEW_SOC=gk7202v300 ;; hi3516dv200)
NEW_SOC=gk7605v100
;;
hi3516ev300)
NEW_SOC=gk7205v300
;;
hi3518ev300)
NEW_SOC=gk7202v300
;;
esac esac
} }