summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch32
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb)3
2 files changed, 1 insertions, 34 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
deleted file mode 100644
index bbc53c6fe1..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
+++ /dev/null
@@ -1,32 +0,0 @@
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.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile.in b/Makefile.in
18index 860a390..8a6fbd7 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -142,7 +142,7 @@ else
22 check_echo = true
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 $@ $(CFLAGS) $<
28
29 .c.o:
30--
311.7.9.5
32
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb
index becf093967..b06fd4adcc 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb
@@ -13,9 +13,8 @@ SECTION = "base"
13DEPENDS = "util-linux attr e2fsprogs lzo acl" 13DEPENDS = "util-linux attr e2fsprogs lzo acl"
14RDEPENDS_${PN} = "libgcc" 14RDEPENDS_${PN} = "libgcc"
15 15
16SRCREV = "6819fbcdcab63c2d95da1a2997e37be9a71ca533" 16SRCREV = "d8d0a60406b14b140e83a8c0d5eaedb5dca44092"
17SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 17SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
18 file://fix-parallel.patch \
19" 18"
20 19
21inherit autotools-brokensep pkgconfig 20inherit autotools-brokensep pkgconfig