Commit f2c8270b authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

1. mmc + nand images 2. microzed should be broken

parent db666e8c
...@@ -30,4 +30,4 @@ PRODUCTION_BOOT := "boot.bin" ...@@ -30,4 +30,4 @@ PRODUCTION_BOOT := "boot.bin"
PRODUCTION_UBOOT := "u-boot-dtb.img" PRODUCTION_UBOOT := "u-boot-dtb.img"
PRODUCTION_DEVICETREE := "devicetree.dtb" PRODUCTION_DEVICETREE := "devicetree.dtb"
PRODUCTION_KERNEL := "uImage" PRODUCTION_KERNEL := "uImage"
PRODUCTION_ROOTFS := "uramdisk.image.gz" PRODUCTION_ROOTFS := "rootfs"
\ No newline at end of file \ No newline at end of file
...@@ -69,9 +69,18 @@ MKUBIFS_ARGS = " -m 2048 -e 126976 -c 2048" ...@@ -69,9 +69,18 @@ MKUBIFS_ARGS = " -m 2048 -e 126976 -c 2048"
UBINIZE_ARGS = " -m 2048 -p 128KiB -s 2048" UBINIZE_ARGS = " -m 2048 -p 128KiB -s 2048"
create_symlinks_append(){ create_symlinks_append(){
if not os.path.isdir("${DEPLOY_DIR_IMAGE}/${PRODUCTION_DIR}"): rlocs = (d.getVar('PRODUCTION_ROOT_LOCATION', True)).split()
os.system("mkdir ${DEPLOY_DIR_IMAGE}/${PRODUCTION_DIR}") for rloc in rlocs:
if os.path.isfile("${DEPLOY_DIR_IMAGE}/${PRODUCTION_DIR}/${PRODUCTION_ROOTFS}"): if not os.path.isdir("${DEPLOY_DIR_IMAGE}/"+rloc):
os.system("rm ${DEPLOY_DIR_IMAGE}/${PRODUCTION_DIR}/${PRODUCTION_ROOTFS}") os.system("mkdir ${DEPLOY_DIR_IMAGE}/"+rloc)
os.system("cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz.u-boot ${DEPLOY_DIR_IMAGE}/${PRODUCTION_DIR}/${PRODUCTION_ROOTFS}")
if (rloc=="mmc"):
image_ext = ".tar.gz"
else:
image_ext = ".ubi"
if os.path.isfile("${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs"+image_ext):
if os.path.isfile("${DEPLOY_DIR_IMAGE}/"+rloc+"/${PRODUCTION_ROOTFS}"+image_ext):
os.system("rm ${DEPLOY_DIR_IMAGE}/"+rloc+"/${PRODUCTION_ROOTFS}"+image_ext)
os.system("cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs"+image_ext+" ${DEPLOY_DIR_IMAGE}/"+rloc+"/${PRODUCTION_ROOTFS}"+image_ext)
} }
...@@ -64,15 +64,15 @@ python do_link() { ...@@ -64,15 +64,15 @@ python do_link() {
addtask do_link before do_kernel_configme after do_patch addtask do_link before do_kernel_configme after do_patch
sstate_create_package_append(){ sstate_create_package_append(){
for RLOC in ${PRODUCTION_ROOT_LOCATION}; do for RLOC in ${PRODUCTION_ROOT_LOCATION}; do
if [ ! -d ${DEPLOY_DIR_IMAGE}/${RLOC} ]; then if [ ! -d ${DEPLOY_DIR_IMAGE}/${RLOC} ]; then
mkdir ${DEPLOY_DIR_IMAGE}/${RLOC} mkdir ${DEPLOY_DIR_IMAGE}/${RLOC}
fi fi
if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then if [ -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ]; then
rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then
fi rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
if [ -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ]; then fi
cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
fi fi
done done
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment