diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-11-15 13:33:16 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-20 14:03:29 +0000 |
commit | a053eff03e9f481297017e6d6f080d6ebe5b7a6b (patch) | |
tree | c97c2679ac767af843633dbfca712c7ab33c7717 /meta | |
parent | a50da2ddb49435a16fd2d69c749e09e5bab386f4 (diff) | |
download | poky-a053eff03e9f481297017e6d6f080d6ebe5b7a6b.tar.gz |
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 <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb | 8 |
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" | |||
12 | SECTION = "base" | 12 | SECTION = "base" |
13 | DEPENDS = "util-linux attr e2fsprogs lzo acl" | 13 | DEPENDS = "util-linux attr e2fsprogs lzo acl" |
14 | 14 | ||
15 | SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f" | 15 | SRCREV = "e9ac73b441b1b05b57ce99be1aff02eac6929448" |
16 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" | 16 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \ |
17 | file://weak-defaults.patch" | ||
17 | 18 | ||
18 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
19 | 20 | ||
20 | PV = "0.20+git${SRCPV}" | 21 | PV = "0.20+git${SRCPV}" |
21 | 22 | ||
22 | SRC_URI += "file://weak-defaults.patch" | ||
23 | SRC_URI += "file://btrfs-progs-fix-parallel-build.patch" | ||
24 | SRC_URI += "file://btrfs-progs-fix-parallel-build2.patch" | ||
25 | 23 | ||
26 | do_install () { | 24 | do_install () { |
27 | oe_runmake 'DESTDIR=${D}' install | 25 | oe_runmake 'DESTDIR=${D}' install |