Lubancat2/device_rockchip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新Ubuntu和Debian镜像名称匹配规则

Browse Source
This commit is contained in:
hejiawencc
2023-03-10 15:32:59 +08:00
parent 4d38d21c01
commit a229175272
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/build.sh
View File

@ -901,18 +901,16 @@ function build_ubuntu(){
cd ubuntu cd ubuntu
if [ ! -e ubuntu-rootfs.img ]; then if [ ! -e ubuntu-$RK_ROOTFS_TARGET-rootfs.img ]; then
echo "[ No ubuntu-rootfs.img, Run Make Ubuntu Scripts ]" echo "[ No ubuntu-$RK_ROOTFS_TARGET-rootfs.img, Run Make Ubuntu Scripts ]"
if [ ! -e ubuntu-base-$RK_ROOTFS_TARGET-$ARCH.tar.gz ]; then if [ ! -e ubuntu-base-$RK_ROOTFS_TARGET-$ARCH-*.tar.gz ]; then
ARCH=arm64 ./mk-base-$RK_ROOTFS_TARGET-ubuntu.sh ARCH=arm64 ./mk-base-$RK_ROOTFS_TARGET-ubuntu.sh
fi fi
VERSION=$RK_ROOTFS_DEBUG ARCH=$ARCH SOC=$RK_SOC ./mk-$RK_ROOTFS_TARGET-rootfs.sh VERSION=$RK_ROOTFS_DEBUG ARCH=$ARCH SOC=$RK_SOC ./mk-$RK_ROOTFS_TARGET-rootfs.sh
./mk-image.sh
else else
echo "[ Already Exists IMG, Skip Make Ubuntu Scripts ]" echo "[ Already Exists IMG, Skip Make Ubuntu Scripts ]"
echo "[ Delate ubuntu-rootfs.img To Rebuild Ubuntu IMG ]" echo "[ Delate Ubuntu-$RK_ROOTFS_TARGET-rootfs.img To Rebuild Ubuntu IMG ]"
fi fi
finish_build finish_build
@ -941,18 +939,17 @@ function build_debian(){
echo -e "\033[36m please input the os type,stretch or buster...... \033[0m" echo -e "\033[36m please input the os type,stretch or buster...... \033[0m"
fi fi
if [ ! -e linaro-rootfs.img ]; then if [ ! -e linaro-$RK_ROOTFS_TARGET-rootfs.img ]; then
echo "[ No linaro-rootfs.img, Run Make Debian Scripts ]" echo "[ No linaro-$RK_ROOTFS_TARGET-rootfs.img, Run Make Debian Scripts ]"
if [ ! -e linaro-$RELEASE-alip-*.tar.gz ]; then if [ ! -e linaro-$RELEASE-$RK_ROOTFS_TARGET-alip-*.tar.gz ]; then
echo "[ build linaro-$RELEASE-alip-*.tar.gz ]" echo "[ build linaro-$RELEASE-$RK_ROOTFS_TARGET-alip-*.tar.gz ]"
RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET ARCH=$ARCH ./mk-base-debian.sh RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET ARCH=$ARCH ./mk-base-debian.sh
fi fi
RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET VERSION=$RK_ROOTFS_DEBUG SOC=$RK_SOC ARCH=$ARCH ./mk-rootfs.sh RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET VERSION=$RK_ROOTFS_DEBUG SOC=$RK_SOC ARCH=$ARCH ./mk-rootfs.sh
./mk-image.sh
else else
echo "[ Already Exists IMG, Skip Make Debian Scripts ]" echo "[ Already Exists IMG, Skip Make Debian Scripts ]"
echo "[ Delate linaro-rootfs.img To Rebuild Debian IMG ]" echo "[ Delate linaro-$RK_ROOTFS_TARGET-rootfs.img To Rebuild Debian IMG ]"
fi fi
@ -976,12 +973,12 @@ function build_rootfs(){
;; ;;
ubuntu) ubuntu)
build_ubuntu build_ubuntu
ln -rsf ubuntu/ubuntu-rootfs.img \ ln -rsf ubuntu/ubuntu-$RK_ROOTFS_TARGET-rootfs.img \
$RK_ROOTFS_DIR/rootfs.ext4 $RK_ROOTFS_DIR/rootfs.ext4
;; ;;
debian) debian)
build_debian build_debian
ln -rsf debian/linaro-rootfs.img \ ln -rsf debian/linaro-$RK_ROOTFS_TARGET-rootfs.img \
$RK_ROOTFS_DIR/rootfs.ext4 $RK_ROOTFS_DIR/rootfs.ext4
;; ;;
*) *)