Re: [OE-core] [PATCH 7/9] btrfs-tools: 3.18.2 - 4.0.1

2015-05-31 Thread Robert Yang 



On 05/29/2015 09:36 PM, Richard Purdie wrote:

On Thu, 2015-05-28 at 02:57 -0700, Robert Yang wrote:

* Updated fix-parallel.patch
* inherit autotools-brokensep, the autotools doesn't work:
   | make: *** No rule to make target `ctree.o', needed by `btrfs'.  Stop.

Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
  .../btrfs-tools/btrfs-tools/fix-parallel.patch |   16 
  .../btrfs-tools/btrfs-tools_git.bb |   16 +---
  2 files changed, 17 insertions(+), 15 deletions(-)


Did upstream switch to autotools for 4.x? If so, this should really be
mentioned in the commit message to make sense of the changes.


Yes, it does, I will send an updated patch for it.

// Robert



Cheers,

Richard




--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 7/9] btrfs-tools: 3.18.2 - 4.0.1

2015-05-29 Thread Richard Purdie 
On Thu, 2015-05-28 at 02:57 -0700, Robert Yang wrote:
 * Updated fix-parallel.patch
 * inherit autotools-brokensep, the autotools doesn't work:
   | make: *** No rule to make target `ctree.o', needed by `btrfs'.  Stop.
 
 Signed-off-by: Robert Yang liezhi.y...@windriver.com
 ---
  .../btrfs-tools/btrfs-tools/fix-parallel.patch |   16 
  .../btrfs-tools/btrfs-tools_git.bb |   16 +---
  2 files changed, 17 insertions(+), 15 deletions(-)

Did upstream switch to autotools for 4.x? If so, this should really be
mentioned in the commit message to make sense of the changes.

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 7/9] btrfs-tools: 3.18.2 - 4.0.1

2015-05-28 Thread Robert Yang 
* Updated fix-parallel.patch
* inherit autotools-brokensep, the autotools doesn't work:
  | make: *** No rule to make target `ctree.o', needed by `btrfs'.  Stop.

Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
 .../btrfs-tools/btrfs-tools/fix-parallel.patch |   16 
 .../btrfs-tools/btrfs-tools_git.bb |   16 +---
 2 files changed, 17 insertions(+), 15 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
index 65c31a4..bbc53c6 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
@@ -11,20 +11,20 @@ Upstream-Status: Pending
 
 Signed-off-by: Robert Yang liezhi.y...@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:
 -- 
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb 
b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index d86075c..82403aa 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -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
-
-PV = 3.18.2+git${SRCPV}
+inherit autotools-brokensep pkgconfig
 
-EXTRA_OEMAKE += DISABLE_DOCUMENTATION=1
+EXTRA_OECONF += --disable-documentation
 
-do_install () {
-   oe_runmake 'DESTDIR=${D}' install
+do_configure_prepend() {
+  sh autogen.sh
 }
 
+S = ${WORKDIR}/git
+
+PV = 4.0.1+git${SRCPV}
+
 BBCLASSEXTEND = native
-- 
1.7.9.5

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core