From 3d79f51902c03c07290b3a96f531f6a71f363c1f Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 18 Jul 2022 13:15:47 +0800
Subject: [PATCH] update bsp download address
---
bsp/rootfs/rootfs.json | 4 +-
bsp/bootloader/igkboard.json | 2
tools/setup_tools.sh | 2
bsp/images/build.sh | 4 +
bsp/bootloader/build.sh | 6 +--
bsp/kernel/igkboard.json | 2
bsp/kernel/build.sh | 6 +--
bsp/drivers/igkboard.json | 2
bsp/scripts/setup_env.sh | 38 +++++++++---------
bsp/drivers/build.sh | 3 +
bsp/build.sh | 8 +++-
11 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/bsp/bootloader/build.sh b/bsp/bootloader/build.sh
index 0c5bfed..829f819 100755
--- a/bsp/bootloader/build.sh
+++ b/bsp/bootloader/build.sh
@@ -23,7 +23,7 @@
return 0;
fi
- do_fetch_json $JSON_CONF UBOOT_SRC $UBOOT_SRC
+ do_fetch_json $JSON_CONF UBOOT_SRC $PRJ_PATH
}
function do_patch()
@@ -77,9 +77,7 @@
{
pr_warn "Clean ${UBOOT_SRC} source code"
- cd ${UBOOT_SRC}
-
- make distclean
+ rm -rf ${UBOOT_SRC}
cd ${PRJ_PATH}
}
diff --git a/bsp/bootloader/igkboard.json b/bsp/bootloader/igkboard.json
index 238a0e8..b3484af 100644
--- a/bsp/bootloader/igkboard.json
+++ b/bsp/bootloader/igkboard.json
@@ -1,6 +1,6 @@
{
"UBOOT_SRC": {
- "URL": "${SRC_URL}/bsp/uboot-imx-${BSP_VER}.tar.xz",
+ "URL": "${BSP_URL}/uboot-imx.tar.xz",
"PROTOCAL": "wget"
},
"INSTALL": {
diff --git a/bsp/build.sh b/bsp/build.sh
index 3b0b538..94dca00 100755
--- a/bsp/build.sh
+++ b/bsp/build.sh
@@ -3,13 +3,14 @@
PRJ_PATH=`pwd`
BOARD=igkboard
+BSP_VER=lf-5.10.52-2.1.0
CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
# SYSTEM should be: buildroot, yocto or debian
-# DISTRO should be: 2021.02, hardknott/honister, bullseye
+# DISTRO should be: v2021.02, hardknott/honister, bullseye
# SYSNAME should be: buildroot, yocto, bullseye
SYSTEM=buildroot
-DISTRO=2021.02
+DISTRO=v2021.02
SYSTEM=`echo $SYSTEM | tr 'A-Z' 'a-z'`
DISTRO=`echo $DISTRO | tr 'A-Z' 'a-z'`
@@ -29,6 +30,8 @@
sed -i "s|^SYSTEM=.*|SYSTEM=${SYSTEM}|g" $FILE
sed -i "s|^DISTRO=.*|DISTRO=${DISTRO}|g" $FILE
+
+ sed -i "s|^BSP_VER=.*|BSP_VER=${BSP_VER}|g" $FILE
}
function do_root()
@@ -60,6 +63,7 @@
./build.sh -b
elif [ $action == "clean" ] ; then
./build.sh -c
+ rm -rf ${PRJ_PATH}/tarballs
fi
cd $PRJ_PATH
diff --git a/bsp/drivers/build.sh b/bsp/drivers/build.sh
index 4687e89..68b7bbf 100755
--- a/bsp/drivers/build.sh
+++ b/bsp/drivers/build.sh
@@ -2,6 +2,7 @@
source ../scripts/setup_env.sh
+PRJ_PATH=`pwd`
WIFI_SRC=rtl8188fu
drvpath=$(eval echo `jq -r ".CONFIG.DRVPATH" $JSON_CONF`)
@@ -13,7 +14,7 @@
return 0;
fi
- do_fetch_json $JSON_CONF WIFI_SRC $WIFI_SRC
+ do_fetch_json $JSON_CONF WIFI_SRC ${PRJ_PATH}
rm -rf *.tar*
}
diff --git a/bsp/drivers/igkboard.json b/bsp/drivers/igkboard.json
index 9f256ce..38f3364 100644
--- a/bsp/drivers/igkboard.json
+++ b/bsp/drivers/igkboard.json
@@ -1,6 +1,6 @@
{
"WIFI_SRC": {
- "URL": "${SRC_URL}/wifi/rtl8188fu.tar.bz2",
+ "URL": "${SRV_URL}/imx/${BOARD}/wifi/rtl8188fu.tar.bz2",
"PROTOCAL": "wget"
},
"CONFIG": {
diff --git a/bsp/images/build.sh b/bsp/images/build.sh
index 224f97e..d1db2bf 100755
--- a/bsp/images/build.sh
+++ b/bsp/images/build.sh
@@ -131,7 +131,9 @@
pr_warn "clean images files "
rm -f *.img *.imx *.bz2 *.gz
- rm -rf boot drivers
+ rm -rf drivers
+ cd boot
+ rm -rf `ls | grep -v .txt`
exit 0;
}
diff --git a/bsp/kernel/build.sh b/bsp/kernel/build.sh
index 63a4b14..3b0535f 100755
--- a/bsp/kernel/build.sh
+++ b/bsp/kernel/build.sh
@@ -22,7 +22,7 @@
return 0;
fi
- do_fetch_json $JSON_CONF KERNEL_SRC $KERNEL_SRC
+ do_fetch_json $JSON_CONF KERNEL_SRC ${PRJ_PATH}
}
function do_patch()
@@ -69,9 +69,7 @@
{
pr_warn "Clean ${KERNEL_SRC} source code"
- cd ${KERNEL_SRC}
-
- make distclean
+ rm -rf ${KERNEL_SRC}
cd ${PRJ_PATH}
}
diff --git a/bsp/kernel/igkboard.json b/bsp/kernel/igkboard.json
index 10240d1..b2a9a23 100644
--- a/bsp/kernel/igkboard.json
+++ b/bsp/kernel/igkboard.json
@@ -1,6 +1,6 @@
{
"KERNEL_SRC": {
- "URL": "${SRC_URL}/bsp/linux-imx-${BSP_VER}.tar.xz",
+ "URL": "${BSP_URL}/linux-imx.tar.xz",
"PROTOCAL": "wget"
},
"INSTALL": {
diff --git a/bsp/rootfs/rootfs.json b/bsp/rootfs/rootfs.json
index 0b001d7..648d2f6 100644
--- a/bsp/rootfs/rootfs.json
+++ b/bsp/rootfs/rootfs.json
@@ -21,7 +21,7 @@
}
},
"SYS_YOCTO": {
- "URL":"${SRC_URL}/rootfs/$ROOTFS_DIR.tar.bz2",
+ "URL":"${SRV_URL}/imx/${BOARD}/rootfs/${ROOTFS_DIR}.tar.bz2",
"PROTOCAL": "wget",
"INSTALL_FILES": {
"${PRJ_PATH}/../images/drivers/lib/modules/*": "$ROOTFS_DIR/lib/modules/",
@@ -31,7 +31,7 @@
}
},
"SYS_BUILDROOT": {
- "URL":"${SRC_URL}/rootfs/$ROOTFS_DIR.tar.bz2",
+ "URL":"${SRV_URL}/imx/${BOARD}/rootfs/${ROOTFS_DIR}.tar.bz2",
"PROTOCAL": "wget",
"INSTALL_FILES": {
"${PRJ_PATH}/../images/drivers/lib/modules/*": "$ROOTFS_DIR/lib/modules/",
diff --git a/bsp/scripts/setup_env.sh b/bsp/scripts/setup_env.sh
index 7e59ff0..5fb1e7c 100755
--- a/bsp/scripts/setup_env.sh
+++ b/bsp/scripts/setup_env.sh
@@ -8,25 +8,25 @@
CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
# Source code download address
-SRC_URL=http://weike-iot.com:2211/imx6ull/
-#SRC_URL=http://127.0.0.1:2211/imx6ull/
+SRV_URL=http://weike-iot.com:2211
BSP_VER=lf-5.10.52-2.1.0
+BSP_URL=${SRV_URL}/imx/bsp/${BSP_VER}
-# SYSTEM should be: yocto, buildroot or debian
-# DISTRO should be: hardknott/honister, 2021.02 or bullseye
+# SYSTEM should be: yocto or debian
+# DISTRO should be: hardknott, buster
+# SYSNAME should be: yocto, buster
SYSTEM=buildroot
-DISTRO=2021.02
+DISTRO=v2021.02
TARBALL_DIR=${PRJ_PATH}/../tarballs/
-if [ $SYSTEM == "buildroot" ] ; then
- SYSNAME=${SYSTEM}
-else
+if [ $SYSTEM == "debian" ] ; then
SYSNAME=${DISTRO}
+else
+ SYSNAME=${SYSTEM}
fi
-ROOTFS_DIR=rootfs_${SYSNAME}
-
+ROOTFS_DIR=rootfs_${DISTRO}
JSON_CONF=${PRJ_PATH}/${BOARD}.json
JOBS=`cat /proc/cpuinfo | grep processor | wc -l`
@@ -60,8 +60,6 @@
pr_info "decompress $tarball"
- mkdir -p $dstpath
-
case $tarball in
*.tar.gz)
tar -xzf $tarball -C $dstpath
@@ -78,6 +76,10 @@
*.tar)
tar -xf $tarball -C $dstpath
;;
+
+ *.zip)
+ unzip -qo $tarball -d $dstpath
+ ;;
*)
pr_error "decompress Unsupport packet: $tarball"
@@ -97,7 +99,7 @@
mkdir -p $dst
- if [[ $src =~ .tar ]] ; then
+ if [[ "$src" =~ ".tar" ]] || [[ "$src" =~ ".zip" ]] ; then
do_unpack $src ${dst}
else
rm -rf ${dst}/`basename ${src}`
@@ -145,16 +147,14 @@
dirname=$2
tarfile=`basename $url`
- mkdir -p ${TARBALL_DIR}
+ mkdir -p ${TARBALL_DIR}
if [ ! -f ${TARBALL_DIR}/$tarfile ] ; then
pr_info "wget $url"
- wget $url -P ${TARBALL_DIR} > /dev/null 2>&1
- fi
- if [ ! -d $dirname ] ; then
- do_unpack ${TARBALL_DIR}/$tarfile
+ wget $url -P ${TARBALL_DIR} > /dev/null 2>&1
fi
+ do_unpack ${TARBALL_DIR}/$tarfile $dirname
}
# fetch source code by copy
@@ -165,7 +165,7 @@
cp -rf $url $tarfile
- if [[ "$tarfile" =~ ".tar" ]] ; then
+ if [[ "$tarfile" =~ ".tar" ]] || [[ "$tarfile" =~ ".zip" ]] ; then
do_unpack $tarfile $dirname
fi
}
diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh
index f68ef08..6d7a917 100755
--- a/tools/setup_tools.sh
+++ b/tools/setup_tools.sh
@@ -2,7 +2,7 @@
# This shell script used to setup imx6ull build envrionment
#
-LYFTP_PUB=http://weike-iot.com:2211/imx6ull/tools/lintools
+LYFTP_PUB=http://wekei-iot.com:2211/imx/igkboard/tools/lintools
if [ `id -u` != 0 ] ; then
echo ""
--
Gitblit v1.9.1