summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-05-31 22:41:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-03 16:38:48 +0100
commit86319df07670efa543391fc6b99572c9500d89f6 (patch)
tree26b523564a622c5a3d22f8d1a1c08e59b0ad2ac7 /meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
parentd66e6d5551e7cc4dcc086b2420bf6ffa1735e6e9 (diff)
downloadpoky-86319df07670efa543391fc6b99572c9500d89f6.tar.gz
btrfs-tools: 3.18.2 -> 4.0.1
* Updated fix-parallel.patch * The 4.0.1 switched to autotools, but inherit autotools doesn't work: | make: *** No rule to make target `ctree.o', needed by `btrfs'. Stop. so inherit autotools-brokensep (From OE-Core rev: 3a3d47882ac26878bdacd4d27a06bbb8fb5e1822) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
index 65c31a4448..bbc53c6fe1 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
@@ -11,20 +11,20 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13--- 13---
14 Makefile | 2 +- 14 Makefile.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/Makefile b/Makefile 17diff --git a/Makefile.in b/Makefile.in
18index 9c69ada..30c6f06 100644 18index 860a390..8a6fbd7 100644
19--- a/Makefile 19--- a/Makefile.in
20+++ b/Makefile 20+++ b/Makefile.in
21@@ -118,7 +118,7 @@ else 21@@ -142,7 +142,7 @@ else
22 AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 22 check_echo = true
23 endif 23 endif
24 24
25-%.o.d: %.c 25-%.o.d: %.c
26+%.o.d: %.c version.h 26+%.o.d: %.c version.h
27 $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(AM_CFLAGS) $(CFLAGS) $< 27 $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $<
28 28
29 .c.o: 29 .c.o:
30-- 30--