diff --git a/common/build.sh b/common/build.sh index 921cd00..cd4b9ed 100755 --- a/common/build.sh +++ b/common/build.sh @@ -113,7 +113,9 @@ function build_yocto(){ function build_debian(){ # build debian echo "====Start build debian====" - /usr/bin/time -f "you take %E to build debian" $COMMON_DIR/mk-debian.sh + echo "TARGET_ARCH =$RK_ARCH" + echo "RK_ENABLE_MODULE =$RK_ENABLE_MODULE" + /usr/bin/time -f "you take %E to build debian" $COMMON_DIR/mk-debian.sh $RK_ENABLE_MODULE if [ $? -eq 0 ]; then echo "====Build debian ok!====" else diff --git a/common/mk-debian.sh b/common/mk-debian.sh index a615a87..8e6f177 100755 --- a/common/mk-debian.sh +++ b/common/mk-debian.sh @@ -6,11 +6,12 @@ then CMD=$(readlink $0) COMMON_DIR=$(dirname $CMD) fi + cd $COMMON_DIR cd ../../.. TOP_DIR=$(pwd) -DEBIAN=$TOP_DIR/rootfs -cd rootfs && ARCH=armhf $DEBIAN/mk-base-debian.sh && ARCH=armhf $DEBIAN/mk-rootfs.sh && $DEBIAN/mk-image.sh && cd - +DEBIAN=$TOP_DIR/distro +sudo $DEBIAN/rkdebootstrap --base $* --shrink --package if [ $? -ne 0 ]; then exit 1 diff --git a/rk3399/BoardConfig_debian.mk b/rk3399/BoardConfig_debian.mk index 788736f..0ba2941 100755 --- a/rk3399/BoardConfig_debian.mk +++ b/rk3399/BoardConfig_debian.mk @@ -25,7 +25,7 @@ export RK_TARGET_PRODUCT=rk3399 # Set rootfs type, including ext2 ext4 squashfs export RK_ROOTFS_TYPE=ext4 # rootfs image path -export RK_ROOTFS_IMG=rootfs/linaro-rootfs.img +export RK_ROOTFS_IMG=distro/rootfs.img # Set oem partition type, including ext2 squashfs export RK_OEM_FS_TYPE=ext2 # Set userdata partition type, including ext2, fat @@ -36,3 +36,5 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#choose enable module +export RK_ENABLE_MODULE="--wifi --audio"