diff options
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 | 86 | ||||
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch (renamed from meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch (renamed from meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch | 127 | ||||
| -rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb (renamed from meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb) | 13 |
5 files changed, 95 insertions, 131 deletions
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 000000000..4b0066847 --- /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 <j.darrington@elvis.murdoch.edu.au> +# +# 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.5/mkdir.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch index b0577e3bc..b0577e3bc 100644 --- a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch index 528e319d8..528e319d8 100644 --- a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch 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 65bb498ea..000000000 --- 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.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb index 82280a6bf..410e1721b 100644 --- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb @@ -1,16 +1,21 @@ require e2fsprogs.inc -PR = "r16" +PR = "r17" -SRC_URI += "file://no-hardlinks.patch;patch=1 \ - file://quotefix.patch;patch=1" +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" +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 ) |