diff --git a/common/build.sh b/common/build.sh index e6fbec3..686ca08 100755 --- a/common/build.sh +++ b/common/build.sh @@ -362,7 +362,7 @@ function build_info(){ cd kernel make ARCH=$RK_ARCH dtbs -j$RK_JOBS - build_check_power_domain + # build_check_power_domain } function build_check_power_domain(){ @@ -676,7 +676,7 @@ function build_kernel(){ $TOP_DIR/u-boot/boot.img fi - build_check_power_domain + # build_check_power_domain finish_build } @@ -1304,9 +1304,17 @@ function build_sdcard_package(){ function build_save(){ IMAGE_PATH=$TOP_DIR/rockdev - DATE=$(date +%Y%m%d.%H%M) - STUB_PATH=Image/"$RK_KERNEL_DTS"_"$DATE"_RELEASE_TEST - STUB_PATH="$(echo $STUB_PATH | tr '[:lower:]' '[:upper:]')" + DATE=$(date +%Y%m%d) + + if [ "${RK_ROOTFS_SYSTEM}" != "buildroot" ];then + ZIP_NAME="$RK_KERNEL_DTS"_"$RK_ROOTFS_SYSTEM"_"$RK_DEBIAN_VERSION"_"$DATE" + else + ZIP_NAME="$RK_KERNEL_DTS"_"$RK_ROOTFS_SYSTEM"_"$DATE" + fi + + ZIP_NAME="$(echo $ZIP_NAME | tr '[:lower:]' '[:upper:]')" + + STUB_PATH=IMAGE/$ZIP_NAME export STUB_PATH=$TOP_DIR/$STUB_PATH export STUB_PATCH_PATH=$STUB_PATH/PATCHES mkdir -p $STUB_PATH @@ -1323,6 +1331,11 @@ function build_save(){ mkdir -p $STUB_PATH/IMAGES/ cp $IMAGE_PATH/* $STUB_PATH/IMAGES/ + cd $STUB_PATH/IMAGES/ + mv update.img ${ZIP_NAME}_Update.img + zip -o ../${ZIP_NAME}_Update.zip ${ZIP_NAME}_Update.img + cd - + #Save build command info echo "UBOOT: defconfig: $RK_UBOOT_DEFCONFIG" >> $STUB_PATH/build_cmd_info echo "KERNEL: defconfig: $RK_KERNEL_DEFCONFIG, dts: $RK_KERNEL_DTS" >> $STUB_PATH/build_cmd_info @@ -1338,7 +1351,7 @@ function build_allsave(){ build_updateimg # build_save - build_check_power_domain + # build_check_power_domain finish_build } diff --git a/rk356x/BoardConfig-LubanCat-Zero-buildroot.mk b/rk356x/BoardConfig-LubanCat-Zero-buildroot.mk index d25b681..442ed33 100644 --- a/rk356x/BoardConfig-LubanCat-Zero-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat-Zero-buildroot.mk @@ -58,3 +58,5 @@ export RK_MISC=blank-misc.img export RK_DISTRO_MODULE= # Define pre-build script for this board export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot diff --git a/rk356x/BoardConfig-LubanCat1-buildroot.mk b/rk356x/BoardConfig-LubanCat1-buildroot.mk index bfa84b3..35ba4d7 100644 --- a/rk356x/BoardConfig-LubanCat1-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat1-buildroot.mk @@ -58,3 +58,5 @@ export RK_MISC=wipe_all-misc.img export RK_DISTRO_MODULE= # Define pre-build script for this board export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot diff --git a/rk356x/BoardConfig-LubanCat1N-buildroot.mk b/rk356x/BoardConfig-LubanCat1N-buildroot.mk index eee2c2e..fc6957d 100644 --- a/rk356x/BoardConfig-LubanCat1N-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat1N-buildroot.mk @@ -58,3 +58,5 @@ export RK_MISC=wipe_all-misc.img export RK_DISTRO_MODULE= # Define pre-build script for this board export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot diff --git a/rk356x/BoardConfig-LubanCat2-buildroot.mk b/rk356x/BoardConfig-LubanCat2-buildroot.mk index 914e909..7a7fbdf 100644 --- a/rk356x/BoardConfig-LubanCat2-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat2-buildroot.mk @@ -62,3 +62,5 @@ export RK_MISC=wipe_all-misc.img export RK_DISTRO_MODULE= # Define pre-build script for this board export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot diff --git a/rk356x/BoardConfig-LubanCat2IO-buildroot.mk b/rk356x/BoardConfig-LubanCat2IO-buildroot.mk index e692aae..39751ac 100644 --- a/rk356x/BoardConfig-LubanCat2IO-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat2IO-buildroot.mk @@ -62,3 +62,5 @@ export RK_MISC=wipe_all-misc.img export RK_DISTRO_MODULE= # Define pre-build script for this board export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot diff --git a/rk356x/BoardConfig-LubanCat2N-buildroot.mk b/rk356x/BoardConfig-LubanCat2N-buildroot.mk index 72594eb..09d39cb 100644 --- a/rk356x/BoardConfig-LubanCat2N-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat2N-buildroot.mk @@ -62,3 +62,5 @@ export RK_MISC=wipe_all-misc.img export RK_DISTRO_MODULE= # Define pre-build script for this board export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot