summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch (renamed from meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch)72
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb (renamed from meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb)0
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb (renamed from meta/packages/e2fsprogs/e2fsprogs_1.38.bb)3
3 files changed, 60 insertions, 15 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch
index 979f0d1f08..0de3cdbe15 100644
--- a/meta/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
+++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch
@@ -1,6 +1,14 @@
1--- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100 1---
2+++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100 2 e2fsck/Makefile.in | 24 ++++++++----------------
3@@ -230,17 +230,13 @@ 3 lib/uuid/Makefile.in | 4 ++--
4 misc/Makefile.in | 30 ++++++++++--------------------
5 3 files changed, 20 insertions(+), 38 deletions(-)
6
7Index: e2fsprogs-1.41.2/misc/Makefile.in
8===================================================================
9--- e2fsprogs-1.41.2.orig/misc/Makefile.in 2008-09-07 07:30:18.000000000 +0200
10+++ e2fsprogs-1.41.2/misc/Makefile.in 2008-10-08 10:54:50.000000000 +0200
11@@ -283,23 +283,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i
4 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ 12 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
5 done 13 done
6 @echo " LINK $(root_sbindir)/mkfs.ext2" 14 @echo " LINK $(root_sbindir)/mkfs.ext2"
@@ -11,6 +19,14 @@
11- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ 19- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
12- $(DESTDIR)$(root_sbindir)/mkfs.ext3 20- $(DESTDIR)$(root_sbindir)/mkfs.ext3
13+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3) 21+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f 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) -f 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) -f mke2fs mkfs.ext4dev)
14 @echo " LINK $(root_sbindir)/e2label" 30 @echo " LINK $(root_sbindir)/e2label"
15- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ 31- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
16- $(DESTDIR)$(root_sbindir)/e2label 32- $(DESTDIR)$(root_sbindir)/e2label
@@ -22,7 +38,7 @@
22 @for i in $(UPROGS); do \ 38 @for i in $(UPROGS); do \
23 echo " INSTALL $(bindir)/$$i"; \ 39 echo " INSTALL $(bindir)/$$i"; \
24 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ 40 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
25@@ -259,11 +255,9 @@ 41@@ -318,17 +312,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i
26 @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ 42 @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
27 $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz 43 $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
28 @echo " LINK mkfs.ext2.8" 44 @echo " LINK mkfs.ext2.8"
@@ -33,12 +49,22 @@
33- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ 49- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
34- $(DESTDIR)$(man8dir)/mkfs.ext3.8 50- $(DESTDIR)$(man8dir)/mkfs.ext3.8
35+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8) 51+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
52 @echo " LINK mkfs.ext4.8"
53- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
54- $(DESTDIR)$(man8dir)/mkfs.ext4.8
55+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4.8)
56 @echo " LINK mkfs.ext4dev.8"
57- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
58- $(DESTDIR)$(man8dir)/mkfs.ext4dev.8
59+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4dev.8)
36 @for i in $(UMANPAGES); do \ 60 @for i in $(UMANPAGES); do \
37 $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \ 61 for j in $(COMPRESS_EXT); do \
38 echo " INSTALL_DATA $(man1dir)/$$i"; \ 62 $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
39--- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100 63Index: e2fsprogs-1.41.2/lib/uuid/Makefile.in
40+++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100 64===================================================================
41@@ -146,9 +146,9 @@ 65--- e2fsprogs-1.41.2.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100
66+++ e2fsprogs-1.41.2/lib/uuid/Makefile.in 2008-10-08 10:49:14.000000000 +0200
67@@ -146,9 +146,9 @@ install:: all installdirs
42 @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ 68 @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
43 $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz 69 $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
44 @echo " LINK $(man3dir)/uuid_generate_random.3" 70 @echo " LINK $(man3dir)/uuid_generate_random.3"
@@ -50,9 +76,11 @@
50 @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" 76 @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
51 @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc 77 @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
52 78
53--- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100 79Index: e2fsprogs-1.41.2/e2fsck/Makefile.in
54+++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100 80===================================================================
55@@ -161,11 +161,9 @@ 81--- e2fsprogs-1.41.2.orig/e2fsck/Makefile.in 2008-09-12 12:59:20.000000000 +0200
82+++ e2fsprogs-1.41.2/e2fsck/Makefile.in 2008-10-08 10:58:05.000000000 +0200
83@@ -195,17 +195,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
56 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ 84 $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
57 done 85 done
58 @echo " LINK $(root_sbindir)/fsck.ext2" 86 @echo " LINK $(root_sbindir)/fsck.ext2"
@@ -63,11 +91,19 @@
63- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ 91- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
64- $(DESTDIR)$(root_sbindir)/fsck.ext3 92- $(DESTDIR)$(root_sbindir)/fsck.ext3
65+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3) 93+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
94 @echo " LINK $(root_sbindir)/fsck.ext4"
95- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
96- $(DESTDIR)$(root_sbindir)/fsck.ext4
97+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4)
98 @echo " LINK $(root_sbindir)/fsck.ext4dev"
99- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
100- $(DESTDIR)$(root_sbindir)/fsck.ext4dev
101+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4dev)
66 @for i in $(MANPAGES); do \ 102 @for i in $(MANPAGES); do \
67 for j in $(COMPRESS_EXT); do \ 103 for j in $(COMPRESS_EXT); do \
68 $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ 104 $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
69@@ -174,11 +172,9 @@ 105@@ -221,17 +217,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
70 $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ 106 $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
71 done 107 done
72 @echo " LINK $(man8dir)/fsck.ext2.8" 108 @echo " LINK $(man8dir)/fsck.ext2.8"
73- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ 109- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
@@ -77,6 +113,14 @@
77- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ 113- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
78- $(DESTDIR)$(man8dir)/fsck.ext3.8 114- $(DESTDIR)$(man8dir)/fsck.ext3.8
79+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8) 115+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
116 @echo " LINK $(man8dir)/fsck.ext4.8"
117- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
118- $(DESTDIR)$(man8dir)/fsck.ext4.8
119+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4.8)
120 @echo " LINK $(man8dir)/fsck.ext4.8"
121- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
122- $(DESTDIR)$(man8dir)/fsck.ext4dev.8
123+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4dev.8)
80 124
81 install-strip: install 125 install-strip: install
82 @for i in $(PROGS); do \ 126 @for i in $(PROGS); do \
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
index b0e3a3a35a..b0e3a3a35a 100644
--- a/meta/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
index e98006f826..5e9c170c4d 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -2,9 +2,10 @@ require e2fsprogs.inc
2 2
3PR = "r8" 3PR = "r8"
4 4
5SRC_URI += "file://no-hardlinks.patch;patch=1"
6S = "${WORKDIR}/e2fsprogs-${PV}" 5S = "${WORKDIR}/e2fsprogs-${PV}"
7 6
7SRC_URI += "file://no-hardlinks.patch;patch=1"
8
8PARALLEL_MAKE = "" 9PARALLEL_MAKE = ""
9 10
10EXTRA_OECONF += " --sbindir=${base_sbindir}" 11EXTRA_OECONF += " --sbindir=${base_sbindir}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 11:14:54 +0000