[PATCH] image_types_uboot: remove the middle file

[PATCH] image_types_uboot: remove the middle file

[rongqing.li]

From: Yue Tao <Yue.Tao@windriver.com>

The .gz, .bz2 or .lzma are middle files for making gz.u-boot,
bz2.u-boot, or lzma.u-boot. It should be removed once the final
image is generated. Otherwise, even you --enable-rm-oldimgs=yes,
it can't be removed, moreover more and more middle files are
genrated via 'make fs

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
---
 meta/classes/image_types_uboot.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index 07837b5..dba9293 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -3,6 +3,7 @@ inherit image_types kernel-arch
 oe_mkimage () {
     mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
         -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
+    rm $1
 }
 
 COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
-- 
1.9.1

Re: [PATCH] image_types_uboot: remove the middle file

[Rongqing Li]

drop it, I will rework the commit header

-R

On 2015年07月02日 10:34, rongqing.li@windriver.com wrote:
> From: Yue Tao <Yue.Tao@windriver.com>
>
> The .gz, .bz2 or .lzma are middle files for making gz.u-boot,
> bz2.u-boot, or lzma.u-boot. It should be removed once the final
> image is generated. Otherwise, even you --enable-rm-oldimgs=yes,
> it can't be removed, moreover more and more middle files are
> genrated via 'make fs
>
> Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
> ---
>   meta/classes/image_types_uboot.bbclass | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
> index 07837b5..dba9293 100644
> --- a/meta/classes/image_types_uboot.bbclass
> +++ b/meta/classes/image_types_uboot.bbclass
> @@ -3,6 +3,7 @@ inherit image_types kernel-arch
>   oe_mkimage () {
>       mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
>           -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
> +    rm $1
>   }
>
>   COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
>

-- 
Best Reagrds,
Roy | RongQing Li

[PATCH] image_types_uboot: remove the middle file

[rongqing.li]

From: Yue Tao <Yue.Tao@windriver.com>

The .gz, .bz2 or .lzma are middle files for making gz.u-boot,
bz2.u-boot, or lzma.u-boot. It should be removed once the final
image is generated. Otherwise, even RM_OLD_IMAGE = 1, it can't
be removed, moreover more and more middle files are genrated via
'bitbake *-image'

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 meta/classes/image_types_uboot.bbclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index 07837b5..081bca2 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -3,6 +3,9 @@ inherit image_types kernel-arch
 oe_mkimage () {
     mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
         -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
+    if [ x$3 = x"clean" ]; then
+        rm $1
+    fi
 }
 
 COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
@@ -11,13 +14,13 @@ COMPRESS_DEPENDS_u-boot = "u-boot-mkimage-native"
 COMPRESS_CMD_u-boot      = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
 
 COMPRESS_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_gz.u-boot      = "${COMPRESS_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip"
+COMPRESS_CMD_gz.u-boot      = "${COMPRESS_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip clean"
 
 COMPRESS_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_bz2.u-boot      = "${COMPRESS_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
+COMPRESS_CMD_bz2.u-boot      = "${COMPRESS_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean"
 
 COMPRESS_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_lzma.u-boot      = "${COMPRESS_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma"
+COMPRESS_CMD_lzma.u-boot      = "${COMPRESS_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma clean"
 
 IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot"
 
-- 
1.9.1