diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/btrfs-tools | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/btrfs-tools')
| -rw-r--r-- | poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch | 27 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb (renamed from poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb) | 4 |
2 files changed, 2 insertions, 29 deletions
diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch deleted file mode 100644 index 467de32751..0000000000 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e58369f6d36bc51eb59d6afa34c1cae3ff0810ef Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@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] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -343,7 +343,7 @@ version.h: version.sh version.h.in confi - - mktables: kernel-lib/mktables.c - @echo " [CC] $@" -- $(Q)$(CC) $(CFLAGS) $< -o $@ -+ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ - - # the target can be regenerated manually using mktables, but a local copy is - # kept so the build process is simpler diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb index 6b53fbcd7f..3647232dc6 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb @@ -14,9 +14,8 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "7faaca0d9f78f7162ae603231f693dd8e1af2a41" +SRCREV = "6c33832b8c7bf2d7b64d6aed023c0bda43a03311" 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 \ " @@ -28,6 +27,7 @@ CLEANBROKEN = "1" PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" EXTRA_OECONF = " --disable-zstd" EXTRA_OECONF_append_libc-musl = " --disable-backtrace " +EXTRA_OEMAKE = "V=1" do_configure_prepend() { # Upstream doesn't ship this and autoreconf won't install it as automake isn't used. |