diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-07-21 13:31:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-07-21 13:31:14 +0000 |
| commit | bafd505e783612ba4d8067364ce38e10f4efe737 (patch) | |
| tree | 53214e59087d621895c55ab9861104e0d62ae0a7 /sys-fs | |
| parent | Version bump. (diff) | |
| download | historical-bafd505e783612ba4d8067364ce38e10f4efe737.tar.gz historical-bafd505e783612ba4d8067364ce38e10f4efe737.tar.bz2 historical-bafd505e783612ba4d8067364ce38e10f4efe737.zip | |
update patch to what was merged upstream #329235
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/mtd-utils/Manifest | 8 | ||||
| -rw-r--r-- | sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest index 15566e3caa75..039bd4ad9f66 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX mtd-utils-20100718-ubi-parallel.patch 816 RMD160 6a924f6319c258425874194f52493f53f0a16f32 SHA1 f1807bf58aa5b11ed5f091675ef989546c2b4cb1 SHA256 a8a80b4fc5e4c775205280f6759d1dffd6e13a4b4dae1d065b6ac447fce4597b +AUX mtd-utils-20100718-ubi-parallel.patch 743 RMD160 fe99a2726a41ff084f24aedadb11ab7de7548d19 SHA1 41c1a27cdeacb51d9f22fab29ed3bd3837c6eb37 SHA256 114314b86ba663fdcd23d32b936f37e25c6dddf4bd9ace0790b5d010837d8ed8 AUX mtd-utils-fixup.patch 1172 RMD160 3372bedd828485d2edd6cf9ea61d3896d3e929f7 SHA1 fdfe1799fc2a4479b09e07d0df9f5e7c054960f4 SHA256 994c98f2866826c592a300a95304822f6453ea8cdc8ba6a20c26d5f07c92b0c8 DIST mtd-utils-snapshot-20080907-41c53b6f2d756ae995c3ffa4455576515427c5e0.tar.gz 400957 RMD160 da8b2b632a33db084b735683b1fbf00dd55de611 SHA1 83c5ab77504cb9f09bf15d3d92a23122817a7339 SHA256 9d26274299de7722ee2d3080e16d3fced04fd0d428a84c20ea6a628e180953e9 DIST mtd-utils-snapshot-20090630-22494a8d105936785af53235b088fa38112128fc.tar.bz2 323899 RMD160 b4f3814e41ca4e942189c0a1615e875567558e1e SHA1 e11125edd1840a83f6a5a77e541bd2c2f85379c1 SHA256 8510b6bed46c30e595166eeafa9dd5493c4d77403c5cacf7a54ba4b7e77a8b76 @@ -15,7 +15,7 @@ MISC metadata.xml 249 RMD160 17bb23a33d6d3f30d98add1bb64dded5a0fde760 SHA1 d172f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkxFE6wACgkQTwhj9JtAlp7Q3QD/cf9/sMFu6PHVR1Ri/XLIUj/R -9+CWScBZzZgpyiHgw88BAKQq7xaYJ/M1jKe+T76TqBHB9U+Ty80cZK8umScEqGwe -=iklp +iF4EAREIAAYFAkxG9p4ACgkQTwhj9JtAlp64vwD/ZENJz+JXSk3m1XDMaxTwdZ9B +c7VNYfMkbqcoi70kR1gBAJXgBLO8lcTVrTrjvmFlvTK2tFbFWi2gJUsYbFj6KYBl +=bcTJ -----END PGP SIGNATURE----- diff --git a/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch b/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch index 94db9350267a..a126083d7d9b 100644 --- a/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch +++ b/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch @@ -1,27 +1,28 @@ -From 52aa25079d6d5116a8bf3b24b32abe210f37f08f Mon Sep 17 00:00:00 2001 +From 05f56bf49ee0de8979c29c11f61a01e30e964444 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 19 Jul 2010 23:06:37 -0400 +Date: Tue, 20 Jul 2010 17:27:50 -0400 Subject: [PATCH] fix parallel build between ubi-utils and mkfs.ubifs Signed-off-by: Mike Frysinger <vapier@gentoo.org> +Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> --- Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile -index b558705..8457654 100644 +index b558705..d315f39 100644 --- a/Makefile +++ b/Makefile -@@ -9,6 +9,9 @@ endif +@@ -25,6 +25,9 @@ LDDEPS = $(BUILDDIR)/lib/libmtd.a - SUBDIRS = lib ubi-utils mkfs.ubifs + include common.mk +# mkfs.ubifs needs -lubi which is in ubi-utils/ +subdirs_mkfs.ubifs_all: subdirs_ubi-utils_all + - TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \ - flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite nandtest \ + clean:: + -rm -f $(SYMLINKS) + ifneq ($(BUILDDIR)/.git,) -- 1.7.1.1 |