Re: [PATCH 2/2] bitbake.conf: add ext4 image support

[Tom Rini <tom_rini@mentor.com>]

On 11/18/2010 12:27 PM, Bernhard Reutner-Fischer wrote:

> diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
> index 7697440..3d3e874 100644
> --- a/recipes/e2fsprogs/e2fsprogs.inc
> +++ b/recipes/e2fsprogs/e2fsprogs.inc
> @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
>
>   S = "${WORKDIR}/e2fsprogs-${PV}"
>
> -INC_PR = "r24"
> +INC_PR = "r25"
>
>   inherit autotools
>
> @@ -31,29 +31,22 @@ do_install_append () {
>
>       	oe_runmake install-libs DESTDIR=${D}
>
> -	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
> -	rm ${D}${base_sbindir}/fsck.ext2
> -	rm ${D}${base_sbindir}/fsck.ext3
> -	rm ${D}${base_sbindir}/fsck.ext4*
> -	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
> -	rm ${D}${base_sbindir}/mkfs.ext2
> -	rm ${D}${base_sbindir}/mkfs.ext3
> -	rm ${D}${base_sbindir}/mkfs.ext4*
> -
> -	cd ${D}/${base_sbindir}
> -	ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
> -	ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
> -	ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
> -	ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
> -	ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
> -	ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
> -	ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
> -	ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
> -
> -	ln -sf ./tune2fs findfs
> -	ln -sf ./tune2fs e2label
> -
> -	mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN}
> +	if ${@['true','false'][(bb.data.inherits_class('packaged-staging', d))]}; then
> +	for f in e2fsck mke2fs; do
> +		mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN}
> +	done
> +	for f in chattr; do
> +		mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN}
> +	done
> +	fsck=$(cd ${D}${base_sbindir}/&&  ls -1 fsck.ext* | sed s/[^\.]*//)
> +	for e in $fsck;do
> +		rm ${D}${base_sbindir}/{fsck,mkfs}$e;
> +		ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
> +		ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
> +	done
> +	fi
> +	ln -sf ${D}/${base_sbindir}/tune2fs findfs
> +	ln -sf ${D}/${base_sbindir}/tune2fs e2label
>   }
>
>   pkg_postinst_e2fsprogs () {

This part should be separate.  And I like making it a loop, the way (I) 
have been doing this for other conflicts is with:
do_install_append_pn-e2fsprogs () {
...
}

-- 
Tom Rini
Mentor Graphics Corporation