From 23a18ebd09666b1ee4da2590daa05fccb47f74fd Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Wed, 8 Oct 2008 13:49:09 +0000 Subject: e2fsprogs: Bump to 1.41.2 1.38 didnt seem to be able to create clean ext3 partitions on SSDs. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5452 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch | 82 -------------- .../e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch | 126 +++++++++++++++++++++ meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb | 11 -- meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb | 11 ++ meta/packages/e2fsprogs/e2fsprogs_1.38.bb | 52 --------- meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb | 53 +++++++++ 6 files changed, 190 insertions(+), 145 deletions(-) delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch create mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb create mode 100644 meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb delete mode 100644 meta/packages/e2fsprogs/e2fsprogs_1.38.bb create mode 100644 meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb (limited to 'meta/packages/e2fsprogs') diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch deleted file mode 100644 index 979f0d1f08..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100 -+++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100 -@@ -230,17 +230,13 @@ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ - done - @echo " LINK $(root_sbindir)/mkfs.ext2" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ -- $(DESTDIR)$(root_sbindir)/mkfs.ext2 -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2) - @echo " LINK $(root_sbindir)/mkfs.ext3" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ -- $(DESTDIR)$(root_sbindir)/mkfs.ext3 -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3) - @echo " LINK $(root_sbindir)/e2label" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ -- $(DESTDIR)$(root_sbindir)/e2label -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label) - @echo " LINK $(root_sbindir)/findfs" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ -- $(DESTDIR)$(root_sbindir)/findfs -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs) - @for i in $(UPROGS); do \ - echo " INSTALL $(bindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ -@@ -259,11 +255,9 @@ - @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ - $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz - @echo " LINK mkfs.ext2.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ -- $(DESTDIR)$(man8dir)/mkfs.ext2.8 -+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8) - @echo " LINK mkfs.ext3.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ -- $(DESTDIR)$(man8dir)/mkfs.ext3.8 -+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8) - @for i in $(UMANPAGES); do \ - $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \ - echo " INSTALL_DATA $(man1dir)/$$i"; \ ---- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100 -+++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100 -@@ -146,9 +146,9 @@ - @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ - $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz - @echo " LINK $(man3dir)/uuid_generate_random.3" -- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 -+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3) - @echo " LINK $(man3dir)/uuid_generate_time.3" -- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 -+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3) - @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" - @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc - ---- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100 -+++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100 -@@ -161,11 +161,9 @@ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done - @echo " LINK $(root_sbindir)/fsck.ext2" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -- $(DESTDIR)$(root_sbindir)/fsck.ext2 -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2) - @echo " LINK $(root_sbindir)/fsck.ext3" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -- $(DESTDIR)$(root_sbindir)/fsck.ext3 -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3) - @for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ -@@ -174,11 +172,9 @@ - $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ - done - @echo " LINK $(man8dir)/fsck.ext2.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -- $(DESTDIR)$(man8dir)/fsck.ext2.8 -+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8) - @echo " LINK $(man8dir)/fsck.ext3.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -- $(DESTDIR)$(man8dir)/fsck.ext3.8 -+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8) - - install-strip: install - @for i in $(PROGS); do \ diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch new file mode 100644 index 0000000000..0de3cdbe15 --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch @@ -0,0 +1,126 @@ +--- + e2fsck/Makefile.in | 24 ++++++++---------------- + lib/uuid/Makefile.in | 4 ++-- + misc/Makefile.in | 30 ++++++++++-------------------- + 3 files changed, 20 insertions(+), 38 deletions(-) + +Index: e2fsprogs-1.41.2/misc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.2.orig/misc/Makefile.in 2008-09-07 07:30:18.000000000 +0200 ++++ e2fsprogs-1.41.2/misc/Makefile.in 2008-10-08 10:54:50.000000000 +0200 +@@ -283,23 +283,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ + done + @echo " LINK $(root_sbindir)/mkfs.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ +- $(DESTDIR)$(root_sbindir)/mkfs.ext2 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2) + @echo " LINK $(root_sbindir)/mkfs.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ +- $(DESTDIR)$(root_sbindir)/mkfs.ext3 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3) + @echo " LINK $(root_sbindir)/mkfs.ext4" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ +- $(DESTDIR)$(root_sbindir)/mkfs.ext4 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext4) + @echo " LINK $(root_sbindir)/mkfs.ext4dev" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ +- $(DESTDIR)$(root_sbindir)/mkfs.ext4dev ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext4dev) + @echo " LINK $(root_sbindir)/e2label" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ +- $(DESTDIR)$(root_sbindir)/e2label ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label) + @echo " LINK $(root_sbindir)/findfs" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ +- $(DESTDIR)$(root_sbindir)/findfs ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs) + @for i in $(UPROGS); do \ + echo " INSTALL $(bindir)/$$i"; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ +@@ -318,17 +312,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i + @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ + $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz + @echo " LINK mkfs.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ +- $(DESTDIR)$(man8dir)/mkfs.ext2.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8) + @echo " LINK mkfs.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ +- $(DESTDIR)$(man8dir)/mkfs.ext3.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8) + @echo " LINK mkfs.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ +- $(DESTDIR)$(man8dir)/mkfs.ext4.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4.8) + @echo " LINK mkfs.ext4dev.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ +- $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4dev.8) + @for i in $(UMANPAGES); do \ + for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \ +Index: e2fsprogs-1.41.2/lib/uuid/Makefile.in +=================================================================== +--- e2fsprogs-1.41.2.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100 ++++ e2fsprogs-1.41.2/lib/uuid/Makefile.in 2008-10-08 10:49:14.000000000 +0200 +@@ -146,9 +146,9 @@ install:: all installdirs + @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ + $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz + @echo " LINK $(man3dir)/uuid_generate_random.3" +- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 ++ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3) + @echo " LINK $(man3dir)/uuid_generate_time.3" +- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 ++ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3) + @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" + @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc + +Index: e2fsprogs-1.41.2/e2fsck/Makefile.in +=================================================================== +--- e2fsprogs-1.41.2.orig/e2fsck/Makefile.in 2008-09-12 12:59:20.000000000 +0200 ++++ e2fsprogs-1.41.2/e2fsck/Makefile.in 2008-10-08 10:58:05.000000000 +0200 +@@ -195,17 +195,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ + done + @echo " LINK $(root_sbindir)/fsck.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ +- $(DESTDIR)$(root_sbindir)/fsck.ext2 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2) + @echo " LINK $(root_sbindir)/fsck.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ +- $(DESTDIR)$(root_sbindir)/fsck.ext3 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3) + @echo " LINK $(root_sbindir)/fsck.ext4" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ +- $(DESTDIR)$(root_sbindir)/fsck.ext4 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4) + @echo " LINK $(root_sbindir)/fsck.ext4dev" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ +- $(DESTDIR)$(root_sbindir)/fsck.ext4dev ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4dev) + @for i in $(MANPAGES); do \ + for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ +@@ -221,17 +217,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE + $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ + done + @echo " LINK $(man8dir)/fsck.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ +- $(DESTDIR)$(man8dir)/fsck.ext2.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8) + @echo " LINK $(man8dir)/fsck.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ +- $(DESTDIR)$(man8dir)/fsck.ext3.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8) + @echo " LINK $(man8dir)/fsck.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ +- $(DESTDIR)$(man8dir)/fsck.ext4.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4.8) + @echo " LINK $(man8dir)/fsck.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ +- $(DESTDIR)$(man8dir)/fsck.ext4dev.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4dev.8) + + install-strip: install + @for i in $(PROGS); do \ diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb deleted file mode 100644 index b0e3a3a35a..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "base" -require e2fsprogs_${PV}.bb -inherit native - -DEPENDS = "gettext-native" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -PACKAGES = "" - -do_stage () { - oe_runmake install -} diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb new file mode 100644 index 0000000000..b0e3a3a35a --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb @@ -0,0 +1,11 @@ +SECTION = "base" +require e2fsprogs_${PV}.bb +inherit native + +DEPENDS = "gettext-native" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" + +do_stage () { + oe_runmake install +} diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs_1.38.bb deleted file mode 100644 index e98006f826..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb +++ /dev/null @@ -1,52 +0,0 @@ -require e2fsprogs.inc - -PR = "r8" - -SRC_URI += "file://no-hardlinks.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-${PV}" - -PARALLEL_MAKE = "" - -EXTRA_OECONF += " --sbindir=${base_sbindir}" - -do_compile_prepend () { - find ./ -print|xargs chmod u=rwX - ( cd util; ${BUILD_CC} subst.c -o subst ) -} - -ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ - ext2_types.h ext2_fs.h ext2_io.h \ - ext2fs.h" -e2pheaders = "e2p.h" - -do_stage () { - oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/blkid - for h in blkid.h blkid_types.h; do - install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h" - done -} - -# 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" - -PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" -FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" -FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen" -FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" -FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" -FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" -FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" -FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb new file mode 100644 index 0000000000..5e9c170c4d --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb @@ -0,0 +1,53 @@ +require e2fsprogs.inc + +PR = "r8" + +S = "${WORKDIR}/e2fsprogs-${PV}" + +SRC_URI += "file://no-hardlinks.patch;patch=1" + +PARALLEL_MAKE = "" + +EXTRA_OECONF += " --sbindir=${base_sbindir}" + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ + ext2_types.h ext2_fs.h ext2_io.h \ + ext2fs.h" +e2pheaders = "e2p.h" + +do_stage () { + oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/e2p + for h in ${e2pheaders}; do + install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" + done + install -d ${STAGING_INCDIR}/ext2fs + for h in ${ext2fsheaders}; do + install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" + done + install -d ${STAGING_INCDIR}/blkid + for h in blkid.h blkid_types.h; do + install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h" + done +} + +# 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" + +PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" +FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" +FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen" +FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" -- cgit v1.2.3-54-g00ecf