From 8d50ec0c607624649987ce389e54a6de00a07098 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 05 Jun 2022 20:32:27 +0800
Subject: [PATCH] 1, Update top build.sh 2, Update setup_env.sh 3, update rootfs build shell script and json config file 4, update driver build shell script and json config file
---
bsp/rootfs/build.sh | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index 6a1079c..13f7c61 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -1,12 +1,14 @@
#!/bin/bash
-source ../scripts//setup_env.sh
+source ../scripts/setup_env.sh
JSON_CONF=rootfs.json
DEF_USER=`jq -r ".SYS_CONF.DEF_USER" $JSON_CONF`
DEF_PASSWD=`jq -r ".SYS_CONF.DEF_PASSWD" $JSON_CONF`
DEF_HOSTNAME=${BOARD}
+
+TARBALL_DIR=${PRJ_PATH}/../tarballs/
set -e
@@ -137,7 +139,7 @@
pr_warn "start fetch rootfs tree for $SYSTEM($DISTRO) "
if [ -f $ROOTFS_DIR.tar.bz2 ] ; then
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
return;
fi
@@ -145,20 +147,20 @@
mkdir -p $ROOTFS_DIR
do_fetch_json $JSON_CONF SYS_YOCTO $ROOTFS_DIR
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
elif [ $SYSTEM == "buildroot" ] ; then
mkdir -p $ROOTFS_DIR
do_fetch_json $JSON_CONF SYS_BUILDROOT $ROOTFS_DIR
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
elif [ $SYSTEM == "debian" ] ; then
protocal=`jq -r ".SYS_DEBIAN.PROTOCAL" $JSON_CONF`
if [ $protocal != "debootstrap" ] ; then
mkdir -p $ROOTFS_DIR
do_fetch_json $JSON_CONF SYS_DEBIAN $ROOTFS_DIR
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
else
debian_src=`jq -r ".SYS_DEBIAN.URL" $JSON_CONF`
--
Gitblit v1.9.1