[OE-core] [PATCH 3/7] btrfs-tools: update to 4.12

[Khem Raj]

On Mon, Aug 7, 2017 at 4:45 AM, Alexander Kanavin
<alexander.kanavin at linux.intel.com> wrote:
> Add a patch to force a native build for a helper binary
> (which is not installed or used outside of the build process).
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> ---
>  ...-Makefile-build-mktables-using-native-gcc.patch | 30 ++++++++++++++++++++++
>  .../{btrfs-tools_4.11.1.bb => btrfs-tools_4.12.bb} |  6 +++--
>  2 files changed, 34 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
>  rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.11.1.bb => btrfs-tools_4.12.bb} (88%)
>
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
> new file mode 100644
> index 00000000000..0a3b5fd7102
> --- /dev/null
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
> @@ -0,0 +1,30 @@
> +From e58369f6d36bc51eb59d6afa34c1cae3ff0810ef Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin at gmail.com>
> +Date: Mon, 7 Aug 2017 14:10:38 +0300
> +Subject: [PATCH] Makefile: build mktables using native gcc
> +
> +It's a throwaway helper binary used during build, and so it needs to
> +be native.
> +
> +Upstream-Status: Inappropriate [oe specific]

I think such a patch would be good upstream too. There are many
packages making distinction between
build host and target host and help cross compilation.

> +Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> +---
> + Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index b3e2b63..347aaf1 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -323,7 +323,7 @@ version.h: version.sh version.h.in configure.ac
> +
> + mktables: kernel-lib/mktables.c
> +       @echo "    [CC]     $@"
> +-      $(Q)$(CC) $(CFLAGS) $< -o $@
> ++      $(Q)$(BUILD_CC) $(CFLAGS) $< -o $@
> +
> + kernel-lib/tables.c: mktables
> +       @echo "    [TABLE]  $@"
> +--
> +2.13.2
> +
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb
> similarity index 88%
> rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb
> rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb
> index a7b42e9546b..c3cc89c2b0f 100644
> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb
> @@ -14,8 +14,10 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
>  DEPENDS_append_class-target = " udev"
>  RDEPENDS_${PN} = "libgcc"
>
> -SRCREV = "88221fc081a7a0979a012f243b66cf097382cc8f"
> -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
> +SRCREV = "0607132c3200bcead1426e6dc685432008de95de"
> +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
> +           file://0001-Makefile-build-mktables-using-native-gcc.patch \
> +           "
>
>  inherit autotools-brokensep pkgconfig manpages
>
> --
> 2.13.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core