[oe] [PATCH 1/2] e2fsprogs: stop providing libblkid/libuuid/fsck - they are in util-linux-ng

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12-02-10 15:51, Marcin Juszkiewicz wrote:
> There is a long story about moving components from e2fsprogs to
> util-linux-ng and I will not write it here. But it happened and we
> should follow.
> 
> The story in short is: kill libblkid, libuuid in this package, drop fsck
> binary and use those which are in util-linux-ng. There are more and more
> applications/libraries which require libblkid 2.xx - for example recent
> HAL.
> 


Acked-by: Koen Kooi <koen at openembedded.org>




> Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
> ---
>  recipes/e2fsprogs/e2fsprogs_1.41.9.bb |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
> index ada93bd..dd9aadb 100644
> --- a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
> +++ b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
> @@ -1,6 +1,8 @@
>  require e2fsprogs.inc
>  
> -DEPENDS += "gettext-native"
> +DEPENDS += "gettext-native util-linux-ng"
> +
> +EXTRA_OECONF += " --disable-libuuid --disable-libblkid --disable-fsck"
>  
>  do_configure() {
>          oe_runconf
> @@ -33,22 +35,17 @@ do_stage () {
>  # blkid used to be part of e2fsprogs but is useful outside, add it
>  # as an RDEPENDS so that anything relying on it being in e2fsprogs
>  # still works
> -RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
> +RDEPENDS_e2fsprogs = "util-linux-ng e2fsprogs-badblocks"
>  
>  FILES_${PN} += "${libdir}/e2initrd_helper"
>  
> -PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
> -FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
> -FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
> -FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
> +PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks"
>  FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
>  FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
>  FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
>  FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
>  
>  do_install_append () {
> -	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
> -	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
>  	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
>  	rm ${D}${base_sbindir}/fsck.ext2
>  	rm ${D}${base_sbindir}/fsck.ext3

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLdW3wMkyGM64RGpERAj+uAJ9A2IRy6jUQk6yIndC/BcwScpUV0ACggzMw
AUAMFuiWO8FK9aHpLz5Z/TI=
=d+dj
-----END PGP SIGNATURE-----