diff options
-rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch (renamed from meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch) | 49 | ||||
-rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb (renamed from meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb) | 0 | ||||
-rw-r--r-- | meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb (renamed from meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb) | 0 |
3 files changed, 25 insertions, 24 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch index 0de3cdbe15..65bb498ea7 100644 --- a/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch +++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch | |||
@@ -4,41 +4,42 @@ | |||
4 | misc/Makefile.in | 30 ++++++++++-------------------- | 4 | misc/Makefile.in | 30 ++++++++++-------------------- |
5 | 3 files changed, 20 insertions(+), 38 deletions(-) | 5 | 3 files changed, 20 insertions(+), 38 deletions(-) |
6 | 6 | ||
7 | Index: e2fsprogs-1.41.2/misc/Makefile.in | 7 | Index: e2fsprogs-1.41.5/misc/Makefile.in |
8 | =================================================================== | 8 | =================================================================== |
9 | --- e2fsprogs-1.41.2.orig/misc/Makefile.in 2008-09-07 07:30:18.000000000 +0200 | 9 | --- e2fsprogs-1.41.5.orig/misc/Makefile.in 2009-05-18 00:54:07.000000000 +0100 |
10 | +++ e2fsprogs-1.41.2/misc/Makefile.in 2008-10-08 10:54:50.000000000 +0200 | 10 | +++ e2fsprogs-1.41.5/misc/Makefile.in 2009-05-18 00:56:12.000000000 +0100 |
11 | @@ -283,23 +283,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i | 11 | @@ -394,24 +394,18 @@ |
12 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ | 12 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ |
13 | done | 13 | done |
14 | @echo " LINK $(root_sbindir)/mkfs.ext2" | 14 | @echo " LINK $(root_sbindir)/mkfs.ext2" |
15 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ | 15 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ |
16 | - $(DESTDIR)$(root_sbindir)/mkfs.ext2 | 16 | - $(DESTDIR)$(root_sbindir)/mkfs.ext2 |
17 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2) | 17 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext2) |
18 | @echo " LINK $(root_sbindir)/mkfs.ext3" | 18 | @echo " LINK $(root_sbindir)/mkfs.ext3" |
19 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ | 19 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ |
20 | - $(DESTDIR)$(root_sbindir)/mkfs.ext3 | 20 | - $(DESTDIR)$(root_sbindir)/mkfs.ext3 |
21 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3) | 21 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext3) |
22 | @echo " LINK $(root_sbindir)/mkfs.ext4" | 22 | @echo " LINK $(root_sbindir)/mkfs.ext4" |
23 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ | 23 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ |
24 | - $(DESTDIR)$(root_sbindir)/mkfs.ext4 | 24 | - $(DESTDIR)$(root_sbindir)/mkfs.ext4 |
25 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext4) | 25 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext4) |
26 | @echo " LINK $(root_sbindir)/mkfs.ext4dev" | 26 | @echo " LINK $(root_sbindir)/mkfs.ext4dev" |
27 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ | 27 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ |
28 | - $(DESTDIR)$(root_sbindir)/mkfs.ext4dev | 28 | - $(DESTDIR)$(root_sbindir)/mkfs.ext4dev |
29 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext4dev) | 29 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext4dev) |
30 | @echo " LINK $(root_sbindir)/e2label" | 30 | @echo " LINK $(root_sbindir)/e2label" |
31 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ | 31 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ |
32 | - $(DESTDIR)$(root_sbindir)/e2label | 32 | - $(DESTDIR)$(root_sbindir)/e2label |
33 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label) | 33 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs e2label) |
34 | @echo " LINK $(root_sbindir)/findfs" | 34 | @if test -n "$(FINDFS_LINK)"; then \ |
35 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ | 35 | echo " LINK $(root_sbindir)/findfs"; \ |
36 | - $(DESTDIR)$(root_sbindir)/findfs | 36 | - $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ |
37 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs) | 37 | - $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \ |
38 | + (cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs $(FINDFS_LINK)); \ | ||
39 | fi | ||
38 | @for i in $(UPROGS); do \ | 40 | @for i in $(UPROGS); do \ |
39 | echo " INSTALL $(bindir)/$$i"; \ | 41 | echo " INSTALL $(bindir)/$$i"; \ |
40 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ | 42 | @@ -431,17 +425,13 @@ |
41 | @@ -318,17 +312,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i | ||
42 | @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ | 43 | @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ |
43 | $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz | 44 | $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz |
44 | @echo " LINK mkfs.ext2.8" | 45 | @echo " LINK mkfs.ext2.8" |
@@ -60,11 +61,11 @@ Index: e2fsprogs-1.41.2/misc/Makefile.in | |||
60 | @for i in $(UMANPAGES); do \ | 61 | @for i in $(UMANPAGES); do \ |
61 | for j in $(COMPRESS_EXT); do \ | 62 | for j in $(COMPRESS_EXT); do \ |
62 | $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \ | 63 | $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \ |
63 | Index: e2fsprogs-1.41.2/lib/uuid/Makefile.in | 64 | Index: e2fsprogs-1.41.5/lib/uuid/Makefile.in |
64 | =================================================================== | 65 | =================================================================== |
65 | --- e2fsprogs-1.41.2.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100 | 66 | --- e2fsprogs-1.41.5.orig/lib/uuid/Makefile.in 2009-05-18 00:54:07.000000000 +0100 |
66 | +++ e2fsprogs-1.41.2/lib/uuid/Makefile.in 2008-10-08 10:49:14.000000000 +0200 | 67 | +++ e2fsprogs-1.41.5/lib/uuid/Makefile.in 2009-05-18 00:54:07.000000000 +0100 |
67 | @@ -146,9 +146,9 @@ install:: all installdirs | 68 | @@ -146,9 +146,9 @@ |
68 | @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ | 69 | @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ |
69 | $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz | 70 | $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz |
70 | @echo " LINK $(man3dir)/uuid_generate_random.3" | 71 | @echo " LINK $(man3dir)/uuid_generate_random.3" |
@@ -76,11 +77,11 @@ Index: e2fsprogs-1.41.2/lib/uuid/Makefile.in | |||
76 | @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" | 77 | @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" |
77 | @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc | 78 | @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc |
78 | 79 | ||
79 | Index: e2fsprogs-1.41.2/e2fsck/Makefile.in | 80 | Index: e2fsprogs-1.41.5/e2fsck/Makefile.in |
80 | =================================================================== | 81 | =================================================================== |
81 | --- e2fsprogs-1.41.2.orig/e2fsck/Makefile.in 2008-09-12 12:59:20.000000000 +0200 | 82 | --- e2fsprogs-1.41.5.orig/e2fsck/Makefile.in 2009-05-18 00:54:07.000000000 +0100 |
82 | +++ e2fsprogs-1.41.2/e2fsck/Makefile.in 2008-10-08 10:58:05.000000000 +0200 | 83 | +++ e2fsprogs-1.41.5/e2fsck/Makefile.in 2009-05-18 00:54:07.000000000 +0100 |
83 | @@ -195,17 +195,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE | 84 | @@ -195,17 +195,13 @@ |
84 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ | 85 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ |
85 | done | 86 | done |
86 | @echo " LINK $(root_sbindir)/fsck.ext2" | 87 | @echo " LINK $(root_sbindir)/fsck.ext2" |
@@ -102,7 +103,7 @@ Index: e2fsprogs-1.41.2/e2fsck/Makefile.in | |||
102 | @for i in $(MANPAGES); do \ | 103 | @for i in $(MANPAGES); do \ |
103 | for j in $(COMPRESS_EXT); do \ | 104 | for j in $(COMPRESS_EXT); do \ |
104 | $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ | 105 | $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ |
105 | @@ -221,17 +217,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE | 106 | @@ -221,17 +217,13 @@ |
106 | $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ | 107 | $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ |
107 | done | 108 | done |
108 | @echo " LINK $(man8dir)/fsck.ext2.8" | 109 | @echo " LINK $(man8dir)/fsck.ext2.8" |
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb index c3654206f7..c3654206f7 100644 --- a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb +++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb | |||
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb index 77da0d579f..77da0d579f 100644 --- a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb +++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb | |||