summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-11-15 13:33:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:04 +0000
commit9ae204660814a8dc50b67d6c35b872dfa78c17e1 (patch)
treeca2ebe508ccfecd57412f88fa497d4bac0960414 /meta
parent836396a3450e7bf151956e87bd92f70c5050c995 (diff)
downloadopenembedded-core-9ae204660814a8dc50b67d6c35b872dfa78c17e1.tar.gz
openembedded-core-9ae204660814a8dc50b67d6c35b872dfa78c17e1.tar.bz2
openembedded-core-9ae204660814a8dc50b67d6c35b872dfa78c17e1.zip
btrfs-tools: Update to git HEAD
btrfs-tools has had numerous bugfix and recently fixed the issue that do_rootfs was failing, there is no offical release, they just roll the head. Removed 2 parallel make patches that we resolved slightly differently upstream [YOCTO #5146] Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 2d2d55571b..066153b797 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -12,16 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
SECTION = "base"
DEPENDS = "util-linux attr e2fsprogs lzo acl"
-SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
+SRCREV = "e9ac73b441b1b05b57ce99be1aff02eac6929448"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \
+ file://weak-defaults.patch"
S = "${WORKDIR}/git"
PV = "0.20+git${SRCPV}"
-SRC_URI += "file://weak-defaults.patch"
-SRC_URI += "file://btrfs-progs-fix-parallel-build.patch"
-SRC_URI += "file://btrfs-progs-fix-parallel-build2.patch"
do_install () {
oe_runmake 'DESTDIR=${D}' install