summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-02-17 19:28:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-19 07:51:39 +0000
commit285966f337ce8a191cbd870c004dd4822be9821a (patch)
treed9e51439c5070b1df8cd7d2a8e37dcb11b53c554
parentda1259e0e6fc9bb372a21ecc0086c7851f65b4d4 (diff)
downloadpoky-285966f337ce8a191cbd870c004dd4822be9821a.tar.gz
btrfs-tools: fix for parallel build
Fixed: mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function) fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION); (From OE-Core rev: 5808c423a2cbea9f2f6a9f78ce5ca09864dc6a75) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch32
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb5
2 files changed, 36 insertions, 1 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
new file mode 100644
index 0000000000..65c31a4448
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
@@ -0,0 +1,32 @@
1From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 11 Feb 2015 22:08:41 -0800
4Subject: [PATCH] Makefile: fix for parallel build
5
6Fixed:
7mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function)
8 fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION);
9
10Upstream-Status: Pending
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile b/Makefile
18index 9c69ada..30c6f06 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -118,7 +118,7 @@ else
22 AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
23 endif
24
25-%.o.d: %.c
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) $<
28
29 .c.o:
30--
311.7.9.5
32
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index f796f6f85a..d86075c4c6 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -13,7 +13,10 @@ SECTION = "base"
13DEPENDS = "util-linux attr e2fsprogs lzo acl" 13DEPENDS = "util-linux attr e2fsprogs lzo acl"
14 14
15SRCREV = "344599a7aefe23c7169ccdde3ad1b921bb60024c" 15SRCREV = "344599a7aefe23c7169ccdde3ad1b921bb60024c"
16SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" 16SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
17 file://fix-parallel.patch \
18"
19
17S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
18 21
19PV = "3.18.2+git${SRCPV}" 22PV = "3.18.2+git${SRCPV}"