From a053eff03e9f481297017e6d6f080d6ebe5b7a6b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 15 Nov 2013 13:33:16 -0800 Subject: 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] (From OE-Core rev: 9ae204660814a8dc50b67d6c35b872dfa78c17e1) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/recipes-devtools/btrfs-tools') 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 -- cgit v1.2.3-54-g00ecf