diff options
| -rw-r--r-- | packages/e2fsprogs/e2fsprogs-1.38/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch | 82 | ||||
| -rw-r--r-- | packages/e2fsprogs/e2fsprogs_1.38.bb | 21 |
3 files changed, 88 insertions, 15 deletions
diff --git a/packages/e2fsprogs/e2fsprogs-1.38/.mtn2git_empty b/packages/e2fsprogs/e2fsprogs-1.38/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/e2fsprogs/e2fsprogs-1.38/.mtn2git_empty diff --git a/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch b/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch new file mode 100644 index 0000000000..979f0d1f08 --- /dev/null +++ b/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch @@ -0,0 +1,82 @@ +--- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100 ++++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100 +@@ -230,17 +230,13 @@ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ + done + @echo " LINK $(root_sbindir)/mkfs.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ +- $(DESTDIR)$(root_sbindir)/mkfs.ext2 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2) + @echo " LINK $(root_sbindir)/mkfs.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ +- $(DESTDIR)$(root_sbindir)/mkfs.ext3 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3) + @echo " LINK $(root_sbindir)/e2label" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ +- $(DESTDIR)$(root_sbindir)/e2label ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label) + @echo " LINK $(root_sbindir)/findfs" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ +- $(DESTDIR)$(root_sbindir)/findfs ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs) + @for i in $(UPROGS); do \ + echo " INSTALL $(bindir)/$$i"; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ +@@ -259,11 +255,9 @@ + @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ + $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz + @echo " LINK mkfs.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ +- $(DESTDIR)$(man8dir)/mkfs.ext2.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8) + @echo " LINK mkfs.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ +- $(DESTDIR)$(man8dir)/mkfs.ext3.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8) + @for i in $(UMANPAGES); do \ + $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \ + echo " INSTALL_DATA $(man1dir)/$$i"; \ +--- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100 ++++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100 +@@ -146,9 +146,9 @@ + @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ + $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz + @echo " LINK $(man3dir)/uuid_generate_random.3" +- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 ++ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3) + @echo " LINK $(man3dir)/uuid_generate_time.3" +- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 ++ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3) + @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" + @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc + +--- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100 ++++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100 +@@ -161,11 +161,9 @@ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ + done + @echo " LINK $(root_sbindir)/fsck.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ +- $(DESTDIR)$(root_sbindir)/fsck.ext2 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2) + @echo " LINK $(root_sbindir)/fsck.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ +- $(DESTDIR)$(root_sbindir)/fsck.ext3 ++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3) + @for i in $(MANPAGES); do \ + for j in $(COMPRESS_EXT); do \ + $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ +@@ -174,11 +172,9 @@ + $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ + done + @echo " LINK $(man8dir)/fsck.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ +- $(DESTDIR)$(man8dir)/fsck.ext2.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8) + @echo " LINK $(man8dir)/fsck.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ +- $(DESTDIR)$(man8dir)/fsck.ext3.8 ++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8) + + install-strip: install + @for i in $(PROGS); do \ diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index 25d4ffbe00..199493dc17 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -2,9 +2,10 @@ DESCRIPTION = "EXT2 Filesystem Utilities" HOMEPAGE = "http://e2fsprogs.sourceforge.net" LICENSE = "GPL" SECTION = "base" -PR = "r1" +PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ + file://no-hardlinks.patch;patch=1" S = "${WORKDIR}/e2fsprogs-${PV}" inherit autotools @@ -34,17 +35,7 @@ do_stage () { done } -pkg_postinst_e2fsprogs-e2fsck() { - ln -s ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext2 - ln -s ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext3 -} - -pkg_postinst_e2fsprogs-mke2fs() { - ln -s ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext2 - ln -s ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext3 -} - -PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " +PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck" FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" -FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck" -FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" |