Skip to contentSkip to conversation

btrfs-tools: 3.18.2 -> 4.0.1

PATCH In review Robert Yang 2 participants 5 messages Jun 1, 2015 – Jun 2, 2015 Kbuild

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

v2 cover btrfs-tools: 3.18.2 -> 4.0.1

* V2
Updated commit message that 4.0.1 switched to autotools.

// Robert

The following changes since commit 968973d55d4b33e1a929ed4cdf9387fcaba2d93f:

qt4: unconditionally disable gstreamer 0.10 support in qt webkit (2015-05-30 22:25:12 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/btrfs-tools
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/btrfs-tools

Robert Yang (1):
btrfs-tools: 3.18.2 -> 4.0.1

 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |   16 ++++++++--------
 .../btrfs-tools/btrfs-tools_git.bb                 |   16 +++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/1 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

Signed-off-by Robert Yang <[email protected]>
---
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |   16 ++++++++--------
 .../btrfs-tools/btrfs-tools_git.bb                 |   16 +++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch +8 -8
index 65c31a4..bbc53c6 100644
@@ -11,20 +11,20 @@ Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <[email protected]>
 ---
- 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:
 --
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +9 -7
index d86075c..82403aa 100644
@@ -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"
Signature · 1 line
1.7.9.5
#2 lore raw

Review

Quoted 5 lines · Robert Yang
(quoted diff) +1 -3
-       $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o)
-MT $@ $(AM_CFLAGS) $(CFLAGS) >lt;
+       $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o)
-MT $@ $(CFLAGS) >lt;

Pretty sure you don't mean to drop AM_CFLAGS there.

Ross

author
#3 lore raw
Quoted 11 lines · Ross

On 1 June 2015 at 06:41, Robert Yang <[email protected] <mailto:[email protected]>> wrote:

- $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o)
-MT $@ $(AM_CFLAGS) $(CFLAGS) >lt;
+ $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o)
-MT $@ $(CFLAGS) >lt;

Pretty sure you don't mean to drop AM_CFLAGS there.

Hi Ross,

The patch I sent is a patch's patch, which means that this patch patches fix-parallel.patch, after the patch is applied, the fix-parallel.patch is:

Makefile.in +1 -1
index 860a390..8a6fbd7 100644
@@ -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 $@

$(CFLAGS) $<

.c.o:

I think that there isn't anything wrong.

// Robert

Quoted 2 lines

Ross

#4 lore raw
Quoted 3 lines · Robert Yang

The patch I sent is a patch's patch, which means that this patch patches fix-parallel.patch, after the patch is applied, the fix-parallel.patch is:

Yes, of course, sorry :)

Ross