diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-10-18 16:38:50 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 11:27:33 +0100 |
| commit | ca6ad4a53ba79201ea481c7f16c7f0c638fc0b3d (patch) | |
| tree | 031b77fdb1823ef6ddf40a5de08b7c7284284aea | |
| parent | c31030d87cd1741a4186d711325b8eab9c70b327 (diff) | |
| download | openembedded-core-contrib-ca6ad4a53ba79201ea481c7f16c7f0c638fc0b3d.tar.gz | |
btrfs-tools: update to 4.8.1
Remove fix-parallel.patch as version.h is now generated by autoconf in configure()
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch | 32 | ||||
| -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 @@ -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.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 860a390..8a6fbd7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -142,7 +142,7 @@ else - check_echo = true - endif - --%.o.d: %.c -+%.o.d: %.c version.h - $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $< - - .c.o: --- -1.7.9.5 - 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" DEPENDS = "util-linux attr e2fsprogs lzo acl" RDEPENDS_${PN} = "libgcc" -SRCREV = "6819fbcdcab63c2d95da1a2997e37be9a71ca533" +SRCREV = "d8d0a60406b14b140e83a8c0d5eaedb5dca44092" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ - file://fix-parallel.patch \ " inherit autotools-brokensep pkgconfig |