summaryrefslogtreecommitdiff
path: root/meta/packages/e2fsprogs/e2fsprogs-1.41.5
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-06-01 22:13:35 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-01 22:13:35 +0100
commit5b1c70256663128ca38553ad762c746e8f8e19df (patch)
tree8c56242f4a4005560b76267281c2599e35346e35 /meta/packages/e2fsprogs/e2fsprogs-1.41.5
parentfe37d679e09dd11a57b2956666b0fcaceb7bc304 (diff)
downloadopenembedded-core-5b1c70256663128ca38553ad762c746e8f8e19df.tar.gz
openembedded-core-5b1c70256663128ca38553ad762c746e8f8e19df.tar.bz2
openembedded-core-5b1c70256663128ca38553ad762c746e8f8e19df.tar.xz
openembedded-core-5b1c70256663128ca38553ad762c746e8f8e19df.zip
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 <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/e2fsprogs/e2fsprogs-1.41.5')
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch26
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch127
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch43
3 files changed, 0 insertions, 196 deletions
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 b0577e3bc..000000000
--- 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 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/quotefix.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/quotefix.patch
deleted file mode 100644
index 528e319d8..000000000
--- 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