diff options
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb | 5 |
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 @@ +From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 11 Feb 2015 22:08:41 -0800 +Subject: [PATCH] Makefile: 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); + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 9c69ada..30c6f06 100644 +--- a/Makefile ++++ b/Makefile +@@ -118,7 +118,7 @@ else + AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + endif + +-%.o.d: %.c ++%.o.d: %.c version.h + $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(AM_CFLAGS) $(CFLAGS) $< + + .c.o: +-- +1.7.9.5 + 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" DEPENDS = "util-linux attr e2fsprogs lzo acl" SRCREV = "344599a7aefe23c7169ccdde3ad1b921bb60024c" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ + file://fix-parallel.patch \ +" + S = "${WORKDIR}/git" PV = "3.18.2+git${SRCPV}" |