diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools')
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch | 29 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch | 37 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb (renamed from meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb) | 8 |
3 files changed, 34 insertions, 40 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch new file mode 100644 index 000000000..0a3261b4e --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch @@ -0,0 +1,29 @@ +From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Aug 2018 18:49:03 -0700 +Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path + +This helps builds when builddir != srcdir + +Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/sg_write_buffer/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am +index 922c328..19c438d 100644 +--- a/tools/sg_write_buffer/Makefile.am ++++ b/tools/sg_write_buffer/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + if LINUX +-AM_CPPFLAGS = -I./include ++AM_CPPFLAGS = -I$(srcdir)/include + AM_CFLAGS = -Wall + sbin_PROGRAMS = sg_write_buffer + sg_write_buffer_SOURCES = sg_write_buffer.c \ +-- +2.18.0 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch deleted file mode 100644 index 9e561cb11..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001 -From: "Yong, Jonathan" <jonathan.yong@intel.com> -Date: Thu, 30 Mar 2017 08:03:37 +0000 -Subject: [PATCH] Fix mkfs out of tree builds - -Libraries are built in builddir, not srcdir, fix Makefile.am -accordingly. - -Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> -Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> - -The patch was imported from the f2fs-tools repo -(git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git) -commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a. - -Upstream-Status: Accepted, expected to be included in 1.9.0. - -Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> - ---- - mkfs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am -index 162a0cf..0ea8b49 100644 ---- a/mkfs/Makefile.am -+++ b/mkfs/Makefile.am -@@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la - libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c - libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD - libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include --libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \ -+libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \ - -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) --- -2.10.2 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb index 691cb6ea0..2240049d4 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174" +# v1.11.0 +SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ - file://0002-Fix-mkfs-out-of-tree-builds.patch" + file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ + file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ + " S = "${WORKDIR}/git" inherit pkgconfig autotools |