Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 06/15] btrfs-tools: update to 4.15.1
Date: Thu,  1 Mar 2018 16:00:43 +0200	[thread overview]
Message-ID: <20180301140052.1388-6-alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <20180301140052.1388-1-alexander.kanavin@linux.intel.com>

Drop upstreamed 0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch

Add --disable-zstd as libzstd isn't provided in oe-core.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...ith-musl-missing-header-include-for-dev_t.patch | 26 ----------------------
 ...btrfs-tools_4.13.3.bb => btrfs-tools_4.15.1.bb} |  4 ++--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.13.3.bb => btrfs-tools_4.15.1.bb} (90%)

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
deleted file mode 100644
index 790676b9cbf..00000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bc35c4caebb57cc8b96c30c25432b12ca8dc18d5 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 6 Oct 2017 15:03:49 +0300
-Subject: [PATCH] Fix build with musl (missing header include for dev_t).
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- convert/source-fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/convert/source-fs.h b/convert/source-fs.h
-index 23f3356..6fd770f 100644
---- a/convert/source-fs.h
-+++ b/convert/source-fs.h
-@@ -20,6 +20,7 @@
- #include "kerncompat.h"
- #include <linux/kdev_t.h>
- #include <pthread.h>
-+#include <sys/types.h>
- 
- #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
- 
--- 
-2.14.1
-
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
similarity index 90%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
index 263fc657550..4490b82d91d 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
@@ -14,15 +14,15 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4"
+SRCREV = "3097f02c948f69f520c565ff8f8ba476aa6edb88"
 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-Fix-build-with-musl-missing-header-include-for-dev_t.patch \
            "
 
 inherit autotools-brokensep pkgconfig manpages
 
 PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
+EXTRA_OECONF = " --disable-zstd"
 EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
 
 do_configure_prepend() {
-- 
2.15.1



  parent reply	other threads:[~2018-03-01 14:06 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-01 14:00 [PATCH 01/15] package.bbclass: run pre/post installation/removal scriptlets using sh -e Alexander Kanavin
2018-03-01 14:00 ` [PATCH 02/15] meta/lib/oe/package_manager.py: warn about failing scriptlets for all package types Alexander Kanavin
2018-03-01 14:00 ` [PATCH 03/15] oe-selftest: add a test for failing package post-installation scriptlets Alexander Kanavin
2018-03-01 14:00 ` [PATCH 04/15] latencytop: remove recipe Alexander Kanavin
2018-03-01 14:00 ` [PATCH 05/15] lsbinitscripts: update to 9.79 Alexander Kanavin
2018-03-01 14:00 ` Alexander Kanavin [this message]
2018-03-01 14:00 ` [PATCH 07/15] gtk-doc.bbclass: inherit python3native Alexander Kanavin
2018-03-01 23:34   ` Burton, Ross
2018-03-02  8:55     ` Alexander Kanavin
2018-03-01 14:00 ` [PATCH 08/15] strace: use strace.io as the tarball location Alexander Kanavin
2018-03-01 14:00 ` [PATCH 09/15] mpg123: upgrade 1.25.8 -> 1.25.10 Alexander Kanavin
2018-03-01 14:00 ` [PATCH 10/15] ffmpeg: upgrade 3.4.1 -> 3.4.2 Alexander Kanavin
2018-03-01 14:00 ` [PATCH 11/15] epiphany: upgrade 3.26.5.1 -> 3.26.6 Alexander Kanavin
2018-03-01 14:00 ` [PATCH 12/15] vala: upgrade 0.38.6 -> 0.38.8 Alexander Kanavin
2018-03-01 14:00 ` [PATCH 13/15] meson: upgrade 0.44.0 -> 0.44.1 Alexander Kanavin
2018-03-01 14:00 ` [PATCH 14/15] expect: upgrade 5.45.3 -> 5.45.4 Alexander Kanavin
2018-03-02 14:12   ` Burton, Ross
2018-03-02 18:14     ` Denys Dmytriyenko
2018-03-02 20:56       ` Burton, Ross
2018-03-02 22:40       ` Richard Purdie
2018-03-01 14:00 ` [PATCH 15/15] trace-cmd: update to 2.7 Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180301140052.1388-6-alexander.kanavin@linux.intel.com \
    --to=alexander.kanavin@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox