From 5b1c70256663128ca38553ad762c746e8f8e19df Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Jun 2010 22:13:35 +0100 Subject: e2fsprogs: Upgrade 1.41.5 -> 1.45.12 * The no-hardlinks patch is no longer required * There was an autoconf macro issue which required a new patch (details in patch) * libuuid was disabled, this should be provided by util-linux on modern systems * Not providing libuuid is useful for the -native tools as it stops library symbol confusion with those from the host system. Signed-off-by: Richard Purdie --- .../e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 | 86 ++++++++++++++ .../e2fsprogs/e2fsprogs-1.41.12/mkdir.patch | 26 +++++ .../e2fsprogs/e2fsprogs-1.41.12/quotefix.patch | 43 +++++++ .../e2fsprogs/e2fsprogs-1.41.5/mkdir.patch | 26 ----- .../e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch | 127 --------------------- .../e2fsprogs/e2fsprogs-1.41.5/quotefix.patch | 43 ------- meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb | 48 ++++++++ meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb | 43 ------- 8 files changed, 203 insertions(+), 239 deletions(-) create mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 create mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch create mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch create mode 100644 meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb delete mode 100644 meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb (limited to 'meta') diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 new file mode 100644 index 0000000000..4b00668476 --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 @@ -0,0 +1,86 @@ +# Extracted from the package's shipped aclocal.m4. Custom macros should be in +# acinclude.m4 so running aclocal doesn't blow them away. +# +# RP 1/6/2010 + +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/check_gnu_make.html +# =========================================================================== +# +# SYNOPSIS +# +# CHECK_GNU_MAKE() +# +# DESCRIPTION +# +# This macro searches for a GNU version of make. If a match is found, the +# makefile variable `ifGNUmake' is set to the empty string, otherwise it +# is set to "#". This is useful for including a special features in a +# Makefile, which cannot be handled by other versions of make. The +# variable _cv_gnu_make_command is set to the command to invoke GNU make +# if it exists, the empty string otherwise. +# +# Here is an example of its use: +# +# Makefile.in might contain: +# +# # A failsafe way of putting a dependency rule into a makefile +# $(DEPEND): +# $(CC) -MM $(srcdir)/*.c > $(DEPEND) +# +# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) +# @ifGNUmake@ include $(DEPEND) +# @ifGNUmake@ endif +# +# Then configure.in would normally contain: +# +# CHECK_GNU_MAKE() +# AC_OUTPUT(Makefile) +# +# Then perhaps to cause gnu make to override any other make, we could do +# something like this (note that GNU make always looks for GNUmakefile +# first): +# +# if ! test x$_cv_gnu_make_command = x ; then +# mv Makefile GNUmakefile +# echo .DEFAULT: > Makefile ; +# echo \ $_cv_gnu_make_command \$@ >> Makefile; +# fi +# +# Then, if any (well almost any) other make is called, and GNU make also +# exists, then the other make wraps the GNU make. +# +# LICENSE +# +# Copyright (c) 2008 John Darrington +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. +# +# Note: Modified by Ted Ts'o to add @ifNotGNUMake@ + +AC_DEFUN( + [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, + _cv_gnu_make_command='' ; +dnl Search all the common names for GNU make + for a in "$MAKE" make gmake gnumake ; do + if test -z "$a" ; then continue ; fi ; + if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then + _cv_gnu_make_command=$a ; + break; + fi + done ; + ) ; +dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise + if test "x$_cv_gnu_make_command" != "x" ; then + ifGNUmake='' ; + ifNotGNUmake='#' ; + else + ifGNUmake='#' ; + ifNotGNUmake='' ; + AC_MSG_RESULT("Not found"); + fi + AC_SUBST(ifGNUmake) + AC_SUBST(ifNotGNUmake) +] ) diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch new file mode 100644 index 0000000000..b0577e3bcb --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch @@ -0,0 +1,26 @@ +Index: e2fsprogs-1.41.5/po/Makefile.in.in +=================================================================== +--- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000 ++++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100 +@@ -30,7 +30,7 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++mkinstalldirs = $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ +Index: e2fsprogs-1.41.5/configure.in +=================================================================== +--- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100 ++++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100 +@@ -970,6 +970,8 @@ + fi + AC_SUBST(BUILD_CFLAGS) + AC_SUBST(BUILD_LDFLAGS) ++MKINSTALLDIRS="mkdir -p" ++AC_SUBST(MKINSTALLDIRS) + dnl + dnl Make our output files, being sure that we create the some miscellaneous + dnl directories diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch new file mode 100644 index 0000000000..528e319d84 --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch @@ -0,0 +1,43 @@ +These macros are underquoted and break with recent autoconf+automake +combinations. + +RP 1/2/10 + +Index: e2fsprogs-1.41.5/configure.in +=================================================================== +--- e2fsprogs-1.41.5.orig/configure.in 2010-02-01 11:40:10.547790252 +0000 ++++ e2fsprogs-1.41.5/configure.in 2010-02-01 11:44:51.577876485 +0000 +@@ -397,11 +397,11 @@ + AC_MSG_ERROR([pkg-config not installed; please install it.]) + fi + +- AC_CHECK_LIB(blkid, blkid_get_cache, ++ [AC_CHECK_LIB(blkid, blkid_get_cache, + [LIBBLKID=`$PKG_CONFIG --libs blkid`; + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], + [AC_MSG_ERROR([external blkid library not found])], +- [$LIBBLKID]) ++ [$LIBBLKID])] + BLKID_CMT=# + AC_MSG_RESULT([Disabling private blkid library]) + else +@@ -786,15 +786,15 @@ + dnl + SEM_INIT_LIB='' + AC_CHECK_FUNC(sem_init, , +- AC_CHECK_LIB(pthread, sem_init, ++ [AC_CHECK_LIB(pthread, sem_init, + AC_DEFINE(HAVE_SEM_INIT) + SEM_INIT_LIB=-lpthread, +- AC_CHECK_LIB(rt, sem_init, ++ [AC_CHECK_LIB(rt, sem_init, + AC_DEFINE(HAVE_SEM_INIT) + SEM_INIT_LIB=-lrt, +- AC_CHECK_LIB(posix4, sem_init, ++ [AC_CHECK_LIB(posix4, sem_init, + AC_DEFINE(HAVE_SEM_INIT) +- SEM_INIT_LIB=-lposix4))))dnl ++ SEM_INIT_LIB=-lposix4)])])])dnl + AC_SUBST(SEM_INIT_LIB) + dnl + dnl Check for unified diff diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch deleted file mode 100644 index b0577e3bcb..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: e2fsprogs-1.41.5/po/Makefile.in.in -=================================================================== ---- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000 -+++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100 -@@ -30,7 +30,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -+mkinstalldirs = $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ - MSGFMT = @MSGFMT@ -Index: e2fsprogs-1.41.5/configure.in -=================================================================== ---- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100 -+++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100 -@@ -970,6 +970,8 @@ - fi - AC_SUBST(BUILD_CFLAGS) - AC_SUBST(BUILD_LDFLAGS) -+MKINSTALLDIRS="mkdir -p" -+AC_SUBST(MKINSTALLDIRS) - dnl - dnl Make our output files, being sure that we create the some miscellaneous - dnl directories diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch deleted file mode 100644 index 65bb498ea7..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- - e2fsck/Makefile.in | 24 ++++++++---------------- - lib/uuid/Makefile.in | 4 ++-- - misc/Makefile.in | 30 ++++++++++-------------------- - 3 files changed, 20 insertions(+), 38 deletions(-) - -Index: e2fsprogs-1.41.5/misc/Makefile.in -=================================================================== ---- e2fsprogs-1.41.5.orig/misc/Makefile.in 2009-05-18 00:54:07.000000000 +0100 -+++ e2fsprogs-1.41.5/misc/Makefile.in 2009-05-18 00:56:12.000000000 +0100 -@@ -394,24 +394,18 @@ - $(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) 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) 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) 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) mke2fs mkfs.ext4dev) - @echo " LINK $(root_sbindir)/e2label" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ -- $(DESTDIR)$(root_sbindir)/e2label -+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs e2label) - @if test -n "$(FINDFS_LINK)"; then \ - echo " LINK $(root_sbindir)/findfs"; \ -- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ -- $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \ -+ (cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs $(FINDFS_LINK)); \ - fi - @for i in $(UPROGS); do \ - echo " INSTALL $(bindir)/$$i"; \ -@@ -431,17 +425,13 @@ - @$(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.5/lib/uuid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.5.orig/lib/uuid/Makefile.in 2009-05-18 00:54:07.000000000 +0100 -+++ e2fsprogs-1.41.5/lib/uuid/Makefile.in 2009-05-18 00:54:07.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 - -Index: e2fsprogs-1.41.5/e2fsck/Makefile.in -=================================================================== ---- e2fsprogs-1.41.5.orig/e2fsck/Makefile.in 2009-05-18 00:54:07.000000000 +0100 -+++ e2fsprogs-1.41.5/e2fsck/Makefile.in 2009-05-18 00:54:07.000000000 +0100 -@@ -195,17 +195,13 @@ - $(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_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-1.41.5/quotefix.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch deleted file mode 100644 index 528e319d84..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch +++ /dev/null @@ -1,43 +0,0 @@ -These macros are underquoted and break with recent autoconf+automake -combinations. - -RP 1/2/10 - -Index: e2fsprogs-1.41.5/configure.in -=================================================================== ---- e2fsprogs-1.41.5.orig/configure.in 2010-02-01 11:40:10.547790252 +0000 -+++ e2fsprogs-1.41.5/configure.in 2010-02-01 11:44:51.577876485 +0000 -@@ -397,11 +397,11 @@ - AC_MSG_ERROR([pkg-config not installed; please install it.]) - fi - -- AC_CHECK_LIB(blkid, blkid_get_cache, -+ [AC_CHECK_LIB(blkid, blkid_get_cache, - [LIBBLKID=`$PKG_CONFIG --libs blkid`; - STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], - [AC_MSG_ERROR([external blkid library not found])], -- [$LIBBLKID]) -+ [$LIBBLKID])] - BLKID_CMT=# - AC_MSG_RESULT([Disabling private blkid library]) - else -@@ -786,15 +786,15 @@ - dnl - SEM_INIT_LIB='' - AC_CHECK_FUNC(sem_init, , -- AC_CHECK_LIB(pthread, sem_init, -+ [AC_CHECK_LIB(pthread, sem_init, - AC_DEFINE(HAVE_SEM_INIT) - SEM_INIT_LIB=-lpthread, -- AC_CHECK_LIB(rt, sem_init, -+ [AC_CHECK_LIB(rt, sem_init, - AC_DEFINE(HAVE_SEM_INIT) - SEM_INIT_LIB=-lrt, -- AC_CHECK_LIB(posix4, sem_init, -+ [AC_CHECK_LIB(posix4, sem_init, - AC_DEFINE(HAVE_SEM_INIT) -- SEM_INIT_LIB=-lposix4))))dnl -+ SEM_INIT_LIB=-lposix4)])])])dnl - AC_SUBST(SEM_INIT_LIB) - dnl - dnl Check for unified diff diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb new file mode 100644 index 0000000000..410e1721b8 --- /dev/null +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb @@ -0,0 +1,48 @@ +require e2fsprogs.inc + +PR = "r17" + +SRC_URI += "file://quotefix.patch;patch=1 \ + file://acinclude.m4" +#file://no-hardlinks.patch;patch=1 \ + +PARALLEL_MAKE = "" + +EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid" +EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" +EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" + +do_configure_prepend () { + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + oe_runmake 'DESTDIR=${D}' install-libs + # We use blkid from util-linux now so remove from here + rm -f ${D}${libdir}/libblkid* + rm -rf ${D}${includedir}/blkid + rm -f ${D}${libdir}/pkgconfig/blkid.pc +} + +# 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 libuuid" +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" +FILES_libuuid = "${libdir}/libuuid.so.*" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb deleted file mode 100644 index 82280a6bf4..0000000000 --- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb +++ /dev/null @@ -1,43 +0,0 @@ -require e2fsprogs.inc - -PR = "r16" - -SRC_URI += "file://no-hardlinks.patch;patch=1 \ - file://quotefix.patch;patch=1" - -PARALLEL_MAKE = "" - -EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs" -EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" -EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" - -do_compile_prepend () { - find ./ -print|xargs chmod u=rwX - ( cd util; ${BUILD_CC} subst.c -o subst ) -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install - oe_runmake 'DESTDIR=${D}' install-libs - # We use blkid from util-linux now so remove from here - rm -f ${D}${libdir}/libblkid* - rm -rf ${D}${includedir}/blkid - rm -f ${D}${libdir}/pkgconfig/blkid.pc -} - -# 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 libuuid" -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" -FILES_libuuid = "${libdir}/libuuid.so.*" - -BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf