From 4544589e7c58ff9532e415871997c9b7549a021b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 20 May 2012 22:29:05 +0000 Subject: [PATCH] e2fsprogs: bump to 1.42.3 remove e2fsprogs-add-missing-dep-of-tst_uuid-o.patch as the changes are already upstream Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- ...fsprogs-add-missing-dep-of-tst_uuid-o.patch | 18 ------------------ package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch diff --git a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch deleted file mode 100644 index 3a60e89461..0000000000 --- a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing dependency of tst_uuid.o on uuid.h - -The missing dependency used to break parallel builds. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in ---- e2fsprogs.orig//lib/uuid/Makefile.in 2010-06-14 05:07:36.000000000 +0200 -+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in 2011-07-18 13:44:58.000000000 +0200 -@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in - $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status - cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status - --tst_uuid.o: $(srcdir)/tst_uuid.c -+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h - $(E) " CC $@" - $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o - diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 5f87b40236..db666356a4 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ############################################################# -E2FSPROGS_VERSION = 1.42.2 +E2FSPROGS_VERSION = 1.42.3 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs E2FSPROGS_CONF_OPT = \ -- 2.30.2