diff options
author | Richard Purdie <richard@openedhand.com> | 2005-12-12 14:45:48 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-12-12 14:45:48 +0000 |
commit | 3c470b4e199b91c16da139eef47df253627f00e3 (patch) | |
tree | 7edb3a0412e808fc53357fbba856335add5205fb /openembedded/packages/e2fsprogs | |
parent | f0702a22fe1e95075d0159ddeafb453ab4c87ebc (diff) | |
download | poky-3c470b4e199b91c16da139eef47df253627f00e3.tar.gz |
oe/packages Updates from Openembedded
git-svn-id: https://svn.o-hand.com/repos/poky@188 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/e2fsprogs')
-rw-r--r-- | openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch | 82 | ||||
-rw-r--r-- | openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb | 21 |
2 files changed, 88 insertions, 15 deletions
diff --git a/openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch b/openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch new file mode 100644 index 0000000000..979f0d1f08 --- /dev/null +++ b/openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | --- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100 | ||
2 | +++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100 | ||
3 | @@ -230,17 +230,13 @@ | ||
4 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ | ||
5 | done | ||
6 | @echo " LINK $(root_sbindir)/mkfs.ext2" | ||
7 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ | ||
8 | - $(DESTDIR)$(root_sbindir)/mkfs.ext2 | ||
9 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2) | ||
10 | @echo " LINK $(root_sbindir)/mkfs.ext3" | ||
11 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ | ||
12 | - $(DESTDIR)$(root_sbindir)/mkfs.ext3 | ||
13 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3) | ||
14 | @echo " LINK $(root_sbindir)/e2label" | ||
15 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ | ||
16 | - $(DESTDIR)$(root_sbindir)/e2label | ||
17 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label) | ||
18 | @echo " LINK $(root_sbindir)/findfs" | ||
19 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ | ||
20 | - $(DESTDIR)$(root_sbindir)/findfs | ||
21 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs) | ||
22 | @for i in $(UPROGS); do \ | ||
23 | echo " INSTALL $(bindir)/$$i"; \ | ||
24 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ | ||
25 | @@ -259,11 +255,9 @@ | ||
26 | @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ | ||
27 | $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz | ||
28 | @echo " LINK mkfs.ext2.8" | ||
29 | - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ | ||
30 | - $(DESTDIR)$(man8dir)/mkfs.ext2.8 | ||
31 | + @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8) | ||
32 | @echo " LINK mkfs.ext3.8" | ||
33 | - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ | ||
34 | - $(DESTDIR)$(man8dir)/mkfs.ext3.8 | ||
35 | + @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8) | ||
36 | @for i in $(UMANPAGES); do \ | ||
37 | $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \ | ||
38 | echo " INSTALL_DATA $(man1dir)/$$i"; \ | ||
39 | --- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100 | ||
40 | +++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100 | ||
41 | @@ -146,9 +146,9 @@ | ||
42 | @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ | ||
43 | $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz | ||
44 | @echo " LINK $(man3dir)/uuid_generate_random.3" | ||
45 | - @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 | ||
46 | + @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3) | ||
47 | @echo " LINK $(man3dir)/uuid_generate_time.3" | ||
48 | - @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 | ||
49 | + @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3) | ||
50 | @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" | ||
51 | @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc | ||
52 | |||
53 | --- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100 | ||
54 | +++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100 | ||
55 | @@ -161,11 +161,9 @@ | ||
56 | $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ | ||
57 | done | ||
58 | @echo " LINK $(root_sbindir)/fsck.ext2" | ||
59 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ | ||
60 | - $(DESTDIR)$(root_sbindir)/fsck.ext2 | ||
61 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2) | ||
62 | @echo " LINK $(root_sbindir)/fsck.ext3" | ||
63 | - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ | ||
64 | - $(DESTDIR)$(root_sbindir)/fsck.ext3 | ||
65 | + @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3) | ||
66 | @for i in $(MANPAGES); do \ | ||
67 | for j in $(COMPRESS_EXT); do \ | ||
68 | $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ | ||
69 | @@ -174,11 +172,9 @@ | ||
70 | $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ | ||
71 | done | ||
72 | @echo " LINK $(man8dir)/fsck.ext2.8" | ||
73 | - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ | ||
74 | - $(DESTDIR)$(man8dir)/fsck.ext2.8 | ||
75 | + @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8) | ||
76 | @echo " LINK $(man8dir)/fsck.ext3.8" | ||
77 | - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ | ||
78 | - $(DESTDIR)$(man8dir)/fsck.ext3.8 | ||
79 | + @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8) | ||
80 | |||
81 | install-strip: install | ||
82 | @for i in $(PROGS); do \ | ||
diff --git a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb index 25d4ffbe00..199493dc17 100644 --- a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb | |||
@@ -2,9 +2,10 @@ DESCRIPTION = "EXT2 Filesystem Utilities" | |||
2 | HOMEPAGE = "http://e2fsprogs.sourceforge.net" | 2 | HOMEPAGE = "http://e2fsprogs.sourceforge.net" |
3 | LICENSE = "GPL" | 3 | LICENSE = "GPL" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | PR = "r1" | 5 | PR = "r2" |
6 | 6 | ||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" | 7 | SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ |
8 | file://no-hardlinks.patch;patch=1" | ||
8 | S = "${WORKDIR}/e2fsprogs-${PV}" | 9 | S = "${WORKDIR}/e2fsprogs-${PV}" |
9 | 10 | ||
10 | inherit autotools | 11 | inherit autotools |
@@ -34,17 +35,7 @@ do_stage () { | |||
34 | done | 35 | done |
35 | } | 36 | } |
36 | 37 | ||
37 | pkg_postinst_e2fsprogs-e2fsck() { | 38 | PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck" |
38 | ln -s ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext2 | ||
39 | ln -s ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext3 | ||
40 | } | ||
41 | |||
42 | pkg_postinst_e2fsprogs-mke2fs() { | ||
43 | ln -s ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext2 | ||
44 | ln -s ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext3 | ||
45 | } | ||
46 | |||
47 | PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " | ||
48 | FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" | 39 | FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" |
49 | FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck" | 40 | FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" |
50 | FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs" | 41 | FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" |