mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 21:32:13 +02:00
btrfs-tools: 3.18.2 -> 4.0.1
* Updated fix-parallel.patch * The 4.0.1 switched to autotools, but inherit autotools doesn't work: | make: *** No rule to make target `ctree.o', needed by `btrfs'. Stop. so inherit autotools-brokensep (From OE-Core rev: 3a3d47882ac26878bdacd4d27a06bbb8fb5e1822) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d66e6d5551
commit
86319df076
@@ -11,20 +11,20 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9c69ada..30c6f06 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -118,7 +118,7 @@ else
|
||||
AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
|
||||
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 $@ $(AM_CFLAGS) $(CFLAGS) $<
|
||||
$(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $<
|
||||
|
||||
.c.o:
|
||||
--
|
||||
|
||||
@@ -12,19 +12,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
|
||||
SECTION = "base"
|
||||
DEPENDS = "util-linux attr e2fsprogs lzo acl"
|
||||
|
||||
SRCREV = "344599a7aefe23c7169ccdde3ad1b921bb60024c"
|
||||
SRCREV = "c061b303c08af7a58373908d0d77ef0f1161fd36"
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
|
||||
file://fix-parallel.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
inherit autotools-brokensep pkgconfig
|
||||
|
||||
PV = "3.18.2+git${SRCPV}"
|
||||
EXTRA_OECONF += "--disable-documentation"
|
||||
|
||||
EXTRA_OEMAKE += "DISABLE_DOCUMENTATION=1"
|
||||
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
do_configure_prepend() {
|
||||
sh autogen.sh
|
||||
}
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "4.0.1+git${SRCPV}"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
Reference in New Issue
Block a user