summaryrefslogtreecommitdiffstats
path: root/meta
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
parentfe37d679e09dd11a57b2956666b0fcaceb7bc304 (diff)
downloadpoky-5b1c70256663128ca38553ad762c746e8f8e19df.tar.gz
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')
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m486
-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.patch127
-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 0000000000..4b00668476
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
@@ -0,0 +1,86 @@
1# Extracted from the package's shipped aclocal.m4. Custom macros should be in
2# acinclude.m4 so running aclocal doesn't blow them away.
3#
4# RP 1/6/2010
5
6# ===========================================================================
7# http://www.nongnu.org/autoconf-archive/check_gnu_make.html
8# ===========================================================================
9#
10# SYNOPSIS
11#
12# CHECK_GNU_MAKE()
13#
14# DESCRIPTION
15#
16# This macro searches for a GNU version of make. If a match is found, the
17# makefile variable `ifGNUmake' is set to the empty string, otherwise it
18# is set to "#". This is useful for including a special features in a
19# Makefile, which cannot be handled by other versions of make. The
20# variable _cv_gnu_make_command is set to the command to invoke GNU make
21# if it exists, the empty string otherwise.
22#
23# Here is an example of its use:
24#
25# Makefile.in might contain:
26#
27# # A failsafe way of putting a dependency rule into a makefile
28# $(DEPEND):
29# $(CC) -MM $(srcdir)/*.c > $(DEPEND)
30#
31# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
32# @ifGNUmake@ include $(DEPEND)
33# @ifGNUmake@ endif
34#
35# Then configure.in would normally contain:
36#
37# CHECK_GNU_MAKE()
38# AC_OUTPUT(Makefile)
39#
40# Then perhaps to cause gnu make to override any other make, we could do
41# something like this (note that GNU make always looks for GNUmakefile
42# first):
43#
44# if ! test x$_cv_gnu_make_command = x ; then
45# mv Makefile GNUmakefile
46# echo .DEFAULT: > Makefile ;
47# echo \ $_cv_gnu_make_command \$@ >> Makefile;
48# fi
49#
50# Then, if any (well almost any) other make is called, and GNU make also
51# exists, then the other make wraps the GNU make.
52#
53# LICENSE
54#
55# Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au>
56#
57# Copying and distribution of this file, with or without modification, are
58# permitted in any medium without royalty provided the copyright notice
59# and this notice are preserved.
60#
61# Note: Modified by Ted Ts'o to add @ifNotGNUMake@
62
63AC_DEFUN(
64 [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
65 _cv_gnu_make_command='' ;
66dnl Search all the common names for GNU make
67 for a in "$MAKE" make gmake gnumake ; do
68 if test -z "$a" ; then continue ; fi ;
69 if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
70 _cv_gnu_make_command=$a ;
71 break;
72 fi
73 done ;
74 ) ;
75dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
76 if test "x$_cv_gnu_make_command" != "x" ; then
77 ifGNUmake='' ;
78 ifNotGNUmake='#' ;
79 else
80 ifGNUmake='#' ;
81 ifNotGNUmake='' ;
82 AC_MSG_RESULT("Not found");
83 fi
84 AC_SUBST(ifGNUmake)
85 AC_SUBST(ifNotGNUmake)
86] )
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/mkdir.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
index b0577e3bcb..b0577e3bcb 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 528e319d84..528e319d84 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 65bb498ea7..0000000000
--- a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch
+++ /dev/null
@@ -1,127 +0,0 @@
1---
2 e2fsck/Makefile.in | 24 ++++++++----------------
3 lib/uuid/Makefile.in | 4 ++--
4 misc/Makefile.in | 30 ++++++++++--------------------
5 3 files changed, 20 insertions(+), 38 deletions(-)
6
7Index: e2fsprogs-1.41.5/misc/Makefile.in
8===================================================================
9--- e2fsprogs-1.41.5.orig/misc/Makefile.in 2009-05-18 00:54:07.000000000 +0100
10+++ e2fsprogs-1.41.5/misc/Makefile.in 2009-05-18 00:56:12.000000000 +0100
11@@ -394,24 +394,18 @@
12 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
13 done
14 @echo " LINK $(root_sbindir)/mkfs.ext2"
15- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
16- $(DESTDIR)$(root_sbindir)/mkfs.ext2
17+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext2)
18 @echo " LINK $(root_sbindir)/mkfs.ext3"
19- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
20- $(DESTDIR)$(root_sbindir)/mkfs.ext3
21+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext3)
22 @echo " LINK $(root_sbindir)/mkfs.ext4"
23- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
24- $(DESTDIR)$(root_sbindir)/mkfs.ext4
25+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext4)
26 @echo " LINK $(root_sbindir)/mkfs.ext4dev"
27- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
28- $(DESTDIR)$(root_sbindir)/mkfs.ext4dev
29+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext4dev)
30 @echo " LINK $(root_sbindir)/e2label"
31- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
32- $(DESTDIR)$(root_sbindir)/e2label
33+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs e2label)
34 @if test -n "$(FINDFS_LINK)"; then \
35 echo " LINK $(root_sbindir)/findfs"; \
36- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
37- $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
38+ (cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs $(FINDFS_LINK)); \
39 fi
40 @for i in $(UPROGS); do \
41 echo " INSTALL $(bindir)/$$i"; \
42@@ -431,17 +425,13 @@
43 @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
44 $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
45 @echo " LINK mkfs.ext2.8"
46- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
47- $(DESTDIR)$(man8dir)/mkfs.ext2.8
48+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
49 @echo " LINK mkfs.ext3.8"
50- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
51- $(DESTDIR)$(man8dir)/mkfs.ext3.8
52+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
53 @echo " LINK mkfs.ext4.8"
54- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
55- $(DESTDIR)$(man8dir)/mkfs.ext4.8
56+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4.8)
57 @echo " LINK mkfs.ext4dev.8"
58- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
59- $(DESTDIR)$(man8dir)/mkfs.ext4dev.8
60+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4dev.8)
61 @for i in $(UMANPAGES); do \
62 for j in $(COMPRESS_EXT); do \
63 $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
64Index: e2fsprogs-1.41.5/lib/uuid/Makefile.in
65===================================================================
66--- e2fsprogs-1.41.5.orig/lib/uuid/Makefile.in 2009-05-18 00:54:07.000000000 +0100
67+++ e2fsprogs-1.41.5/lib/uuid/Makefile.in 2009-05-18 00:54:07.000000000 +0100
68@@ -146,9 +146,9 @@
69 @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
70 $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
71 @echo " LINK $(man3dir)/uuid_generate_random.3"
72- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
73+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
74 @echo " LINK $(man3dir)/uuid_generate_time.3"
75- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
76+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
77 @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
78 @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
79
80Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
81===================================================================
82--- e2fsprogs-1.41.5.orig/e2fsck/Makefile.in 2009-05-18 00:54:07.000000000 +0100
83+++ e2fsprogs-1.41.5/e2fsck/Makefile.in 2009-05-18 00:54:07.000000000 +0100
84@@ -195,17 +195,13 @@
85 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
86 done
87 @echo " LINK $(root_sbindir)/fsck.ext2"
88- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
89- $(DESTDIR)$(root_sbindir)/fsck.ext2
90+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
91 @echo " LINK $(root_sbindir)/fsck.ext3"
92- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
93- $(DESTDIR)$(root_sbindir)/fsck.ext3
94+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
95 @echo " LINK $(root_sbindir)/fsck.ext4"
96- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
97- $(DESTDIR)$(root_sbindir)/fsck.ext4
98+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4)
99 @echo " LINK $(root_sbindir)/fsck.ext4dev"
100- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
101- $(DESTDIR)$(root_sbindir)/fsck.ext4dev
102+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4dev)
103 @for i in $(MANPAGES); do \
104 for j in $(COMPRESS_EXT); do \
105 $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
106@@ -221,17 +217,13 @@
107 $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
108 done
109 @echo " LINK $(man8dir)/fsck.ext2.8"
110- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
111- $(DESTDIR)$(man8dir)/fsck.ext2.8
112+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
113 @echo " LINK $(man8dir)/fsck.ext3.8"
114- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
115- $(DESTDIR)$(man8dir)/fsck.ext3.8
116+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
117 @echo " LINK $(man8dir)/fsck.ext4.8"
118- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
119- $(DESTDIR)$(man8dir)/fsck.ext4.8
120+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4.8)
121 @echo " LINK $(man8dir)/fsck.ext4.8"
122- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
123- $(DESTDIR)$(man8dir)/fsck.ext4dev.8
124+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4dev.8)
125
126 install-strip: install
127 @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 82280a6bf4..410e1721b8 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -1,16 +1,21 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r16" 3PR = "r17"
4 4
5SRC_URI += "file://no-hardlinks.patch;patch=1 \ 5SRC_URI += "file://quotefix.patch;patch=1 \
6 file://quotefix.patch;patch=1" 6 file://acinclude.m4"
7#file://no-hardlinks.patch;patch=1 \
7 8
8PARALLEL_MAKE = "" 9PARALLEL_MAKE = ""
9 10
10EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs" 11EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
11EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" 12EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
12EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs" 13EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
13 14
15do_configure_prepend () {
16 cp ${WORKDIR}/acinclude.m4 ${S}/
17}
18
14do_compile_prepend () { 19do_compile_prepend () {
15 find ./ -print|xargs chmod u=rwX 20 find ./ -print|xargs chmod u=rwX
16 ( cd util; ${BUILD_CC} subst.c -o subst ) 21 ( cd util; ${BUILD_CC} subst.c -o subst )
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-03-01 18:13:47 +0000