All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] btrfs-tools Makefile: 1) remove duplicate of '-o $@' option from CC cmdline; 2) disable "bttfs-fragments" tool compilation
@ 2019-02-20  8:33 Ivan Efimov
  2019-02-21 12:37 ` Burton, Ross
  0 siblings, 1 reply; 3+ messages in thread
From: Ivan Efimov @ 2019-02-20  8:33 UTC (permalink / raw)
  To: poky; +Cc: Architecture group

1) Command line for target "libbtrfsutil/%.o" contained double usage of '-o $@' option and causes error:

     cc1: error: too many filenames given

2) "btrfs-fragments" tool depends on library "gd", but there is no "gd" recipe in Yocto Poky.
   "btrfs-fragments" has been excluded from list of tools for compilation ("progs" Makefile variable)

Signed-off-by: Ivan Efimov <i.efimov@inango-systems.com>
---
 ...1-Makefile-disable-btrfs-fragments-compilation.patch | 15 +++++++++++++++
 ...01-Makefile-fix-double-o-compiler-option-using.patch | 17 +++++++++++++++++
 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
new file mode 100644
index 0000000000..c20bde967d
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
@@ -0,0 +1,15 @@
+"btrfs-fragments" tool requires library "gd" for compilation, but 
+  there is no "gd" recipe in Yocto Poky
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -217,7 +217,7 @@ progs_build = $(progs_install) btrfsck b
+ 
+ # All programs. Use := instead of = so that this is expanded before we reassign
+ # progs_build below.
+-progs := $(progs_build) btrfs-convert btrfs-fragments
++progs := $(progs_build) btrfs-convert
+ 
+ ifneq ($(DISABLE_BTRFSCONVERT),1)
+ progs_install += btrfs-convert
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
new file mode 100644
index 0000000000..335067bc1f
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
@@ -0,0 +1,17 @@
+Command line for target "libbtrfsutil/%.o" contained double usage
+  of '-o $@' option and caused error:
+    cc1: error: too many filenames given
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -414,7 +414,7 @@ libbtrfs.so.0 libbtrfs.so: libbtrfs.so.0
+ 
+ libbtrfsutil/%.o: libbtrfsutil/%.c
+ 	@echo "    [CC]     $@"
+-	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) -o $@ -c $< -o $@
++	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) -c $< -o $@
+ 
+ libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
+ 	@echo "    [LD]     $@"
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
index 2f59a0c13e..6b77ee796f 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
@@ -19,6 +19,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Makefile-build-mktables-using-native-gcc.patch \
            file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
+           file://0001-Makefile-disable-btrfs-fragments-compilation.patch \
+           file://0001-Makefile-fix-double-o-compiler-option-using.patch \
            "
 
 inherit autotools-brokensep pkgconfig manpages distutils3-base
-- 
2.14.1

[ https://inango.com/ |    ] 
Ivan Efimov 
Architect, Arch Group 
i.efimov@inango-systems.com 
T +7 343 298 0147 C +7 904 9 888 350 
[ https://inango.com/ | inango.com ] [ https://www.linkedin.com/company/inango ]


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] btrfs-tools Makefile: 1) remove duplicate of '-o $@' option from CC cmdline; 2) disable "bttfs-fragments" tool compilation
  2019-02-20  8:33 [PATCH 1/1] btrfs-tools Makefile: 1) remove duplicate of '-o $@' option from CC cmdline; 2) disable "bttfs-fragments" tool compilation Ivan Efimov
@ 2019-02-21 12:37 ` Burton, Ross
  2019-02-22 13:39   ` Ivan Efimov
  0 siblings, 1 reply; 3+ messages in thread
From: Burton, Ross @ 2019-02-21 12:37 UTC (permalink / raw)
  To: Ivan Efimov; +Cc: Architecture group, Poky Project

oe-core patches to go the openembedded-core@lists.openembedded.org mailing list.

You'll need to rebase onto the btrfs-tools 4.20.1 that is now in master.

The patches you're applying are missing Upstream-Status and Signed-off-by tags.

Also if gd isn't in oe-core and btrfs-fragments depends on it, how
does the current recipe build?

Ross

On Wed, 20 Feb 2019 at 08:41, Ivan Efimov <i.efimov@inango-systems.com> wrote:
>
> 1) Command line for target "libbtrfsutil/%.o" contained double usage of '-o $@' option and causes error:
>
>      cc1: error: too many filenames given
>
> 2) "btrfs-fragments" tool depends on library "gd", but there is no "gd" recipe in Yocto Poky.
>    "btrfs-fragments" has been excluded from list of tools for compilation ("progs" Makefile variable)
>
> Signed-off-by: Ivan Efimov <i.efimov@inango-systems.com>
> ---
>  ...1-Makefile-disable-btrfs-fragments-compilation.patch | 15 +++++++++++++++
>  ...01-Makefile-fix-double-o-compiler-option-using.patch | 17 +++++++++++++++++
>  meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb |  2 ++
>  3 files changed, 34 insertions(+)
>  create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
>  create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
>
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
> new file mode 100644
> index 0000000000..c20bde967d
> --- /dev/null
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
> @@ -0,0 +1,15 @@
> +"btrfs-fragments" tool requires library "gd" for compilation, but
> +  there is no "gd" recipe in Yocto Poky
> +Index: git/Makefile
> +===================================================================
> +--- git.orig/Makefile
> ++++ git/Makefile
> +@@ -217,7 +217,7 @@ progs_build = $(progs_install) btrfsck b
> +
> + # All programs. Use := instead of = so that this is expanded before we reassign
> + # progs_build below.
> +-progs := $(progs_build) btrfs-convert btrfs-fragments
> ++progs := $(progs_build) btrfs-convert
> +
> + ifneq ($(DISABLE_BTRFSCONVERT),1)
> + progs_install += btrfs-convert
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
> new file mode 100644
> index 0000000000..335067bc1f
> --- /dev/null
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
> @@ -0,0 +1,17 @@
> +Command line for target "libbtrfsutil/%.o" contained double usage
> +  of '-o $@' option and caused error:
> +    cc1: error: too many filenames given
> +
> +Index: git/Makefile
> +===================================================================
> +--- git.orig/Makefile
> ++++ git/Makefile
> +@@ -414,7 +414,7 @@ libbtrfs.so.0 libbtrfs.so: libbtrfs.so.0
> +
> + libbtrfsutil/%.o: libbtrfsutil/%.c
> +       @echo "    [CC]     $@"
> +-      $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) -o $@ -c $< -o $@
> ++      $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) -c $< -o $@
> +
> + libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
> +       @echo "    [LD]     $@"
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
> index 2f59a0c13e..6b77ee796f 100644
> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
> @@ -19,6 +19,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
>             file://0001-Makefile-build-mktables-using-native-gcc.patch \
>             file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
>             file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
> +           file://0001-Makefile-disable-btrfs-fragments-compilation.patch \
> +           file://0001-Makefile-fix-double-o-compiler-option-using.patch \
>             "
>
>  inherit autotools-brokensep pkgconfig manpages distutils3-base
> --
> 2.14.1
>
> [ https://inango.com/ |    ]
> Ivan Efimov
> Architect, Arch Group
> i.efimov@inango-systems.com
> T +7 343 298 0147 C +7 904 9 888 350
> [ https://inango.com/ | inango.com ] [ https://www.linkedin.com/company/inango ]
> --
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] btrfs-tools Makefile: 1) remove duplicate of '-o $@' option from CC cmdline; 2) disable "bttfs-fragments" tool compilation
  2019-02-21 12:37 ` Burton, Ross
@ 2019-02-22 13:39   ` Ivan Efimov
  0 siblings, 0 replies; 3+ messages in thread
From: Ivan Efimov @ 2019-02-22 13:39 UTC (permalink / raw)
  To: Burton, Ross; +Cc: Architecture group, poky

Hi, Ross,

Thanks, i'll find the answer for your question and send my patch to openembedded-core@lists.openembedded.org.

Best regards,
Ivan

----- Original Message -----
From: "Burton, Ross" <ross.burton@intel.com>
To: "Ivan Efimov" <i.efimov@inango-systems.com>
Cc: "poky" <poky@yoctoproject.org>, "Architecture group" <arch@inango-systems.com>
Sent: Thursday, February 21, 2019 5:37:52 PM
Subject: Re: [poky] [PATCH 1/1] btrfs-tools Makefile: 1) remove duplicate of '-o $@' option from CC cmdline; 2) disable "bttfs-fragments" tool compilation

oe-core patches to go the openembedded-core@lists.openembedded.org mailing list.

You'll need to rebase onto the btrfs-tools 4.20.1 that is now in master.

The patches you're applying are missing Upstream-Status and Signed-off-by tags.

Also if gd isn't in oe-core and btrfs-fragments depends on it, how
does the current recipe build?

Ross

On Wed, 20 Feb 2019 at 08:41, Ivan Efimov <i.efimov@inango-systems.com> wrote:
>
> 1) Command line for target "libbtrfsutil/%.o" contained double usage of '-o $@' option and causes error:
>
>      cc1: error: too many filenames given
>
> 2) "btrfs-fragments" tool depends on library "gd", but there is no "gd" recipe in Yocto Poky.
>    "btrfs-fragments" has been excluded from list of tools for compilation ("progs" Makefile variable)
>
> Signed-off-by: Ivan Efimov <i.efimov@inango-systems.com>
> ---
>  ...1-Makefile-disable-btrfs-fragments-compilation.patch | 15 +++++++++++++++
>  ...01-Makefile-fix-double-o-compiler-option-using.patch | 17 +++++++++++++++++
>  meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb |  2 ++
>  3 files changed, 34 insertions(+)
>  create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
>  create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
>
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
> new file mode 100644
> index 0000000000..c20bde967d
> --- /dev/null
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-disable-btrfs-fragments-compilation.patch
> @@ -0,0 +1,15 @@
> +"btrfs-fragments" tool requires library "gd" for compilation, but
> +  there is no "gd" recipe in Yocto Poky
> +Index: git/Makefile
> +===================================================================
> +--- git.orig/Makefile
> ++++ git/Makefile
> +@@ -217,7 +217,7 @@ progs_build = $(progs_install) btrfsck b
> +
> + # All programs. Use := instead of = so that this is expanded before we reassign
> + # progs_build below.
> +-progs := $(progs_build) btrfs-convert btrfs-fragments
> ++progs := $(progs_build) btrfs-convert
> +
> + ifneq ($(DISABLE_BTRFSCONVERT),1)
> + progs_install += btrfs-convert
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
> new file mode 100644
> index 0000000000..335067bc1f
> --- /dev/null
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-fix-double-o-compiler-option-using.patch
> @@ -0,0 +1,17 @@
> +Command line for target "libbtrfsutil/%.o" contained double usage
> +  of '-o $@' option and caused error:
> +    cc1: error: too many filenames given
> +
> +Index: git/Makefile
> +===================================================================
> +--- git.orig/Makefile
> ++++ git/Makefile
> +@@ -414,7 +414,7 @@ libbtrfs.so.0 libbtrfs.so: libbtrfs.so.0
> +
> + libbtrfsutil/%.o: libbtrfsutil/%.c
> +       @echo "    [CC]     $@"
> +-      $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) -o $@ -c $< -o $@
> ++      $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) -c $< -o $@
> +
> + libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
> +       @echo "    [LD]     $@"
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
> index 2f59a0c13e..6b77ee796f 100644
> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
> @@ -19,6 +19,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
>             file://0001-Makefile-build-mktables-using-native-gcc.patch \
>             file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
>             file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
> +           file://0001-Makefile-disable-btrfs-fragments-compilation.patch \
> +           file://0001-Makefile-fix-double-o-compiler-option-using.patch \
>             "
>
>  inherit autotools-brokensep pkgconfig manpages distutils3-base
> --
> 2.14.1
>
> [ https://inango.com/ |    ]
> Ivan Efimov
> Architect, Arch Group
> i.efimov@inango-systems.com
> T +7 343 298 0147 C +7 904 9 888 350
> [ https://inango.com/ | inango.com ] [ https://www.linkedin.com/company/inango ]
> --
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
-- 
[ https://inango.com/ |    ] 
Ivan Efimov 
Architect, Arch Group 
i.efimov@inango-systems.com 
T +7 343 298 0147 C +7 904 9 888 350 
[ https://inango.com/ | inango.com ] [ https://www.linkedin.com/company/inango ]


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-22 13:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-20  8:33 [PATCH 1/1] btrfs-tools Makefile: 1) remove duplicate of '-o $@' option from CC cmdline; 2) disable "bttfs-fragments" tool compilation Ivan Efimov
2019-02-21 12:37 ` Burton, Ross
2019-02-22 13:39   ` Ivan Efimov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.