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-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch | |
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-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch deleted file mode 100644 index 745883ebe..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 86686ccbf43c5d9e8c8dc97c66ba09e522050e5e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 27 Jul 2017 10:06:24 +0800 -Subject: [PATCH 1/3] fix configure and compile failures - -1. Fix do_configure failure ---------------------------- -|Checking header volume_key/libvolume_key.h existence and usability. -../tmp/6tvtK.c:1:38: fatal error: volume_key/libvolume_key.h: -No such file or directory -| #include <volume_key/libvolume_key.h> -|Checking header dmraid/dmraid.h existence and usability.../tmp/ -ktVJ6.c:1:27: fatal error: dmraid/dmraid.h: No such file or directory -| #include <dmraid/dmraid.h> ---------------------------- -We explictly add volume_key and dmraid to DEPENDS, do not need -configure to test. - -2. Fix config.h not found -Add it to configure.ac - -3. Correct AC_DEFINE -... -autoheader: warning: missing template: LIBMOUNT_NEW_ERR_API -autoheader: Use AC_DEFINE([LIBMOUNT_NEW_ERR_API], [], [Description]) -... - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d41a307..b036e04 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,6 +9,8 @@ AC_DISABLE_STATIC - AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-syntax -Wno-portability]) - AC_CONFIG_MACRO_DIR([m4]) - -+AC_CONFIG_HEADERS([config.h]) -+ - AM_PATH_PYTHON - - AM_PROG_AR -@@ -154,7 +156,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19]) - AS_IF([test "x$with_crypto" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([CRYPTSETUP], [libcryptsetup >= 1.6.7]) - LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0]) -- LIBBLOCKDEV_CHECK_HEADER([volume_key/libvolume_key.h], [$GLIB_CFLAGS $NSS_CFLAGS], [libvolume_key.h not available]) - ], - []) - -@@ -162,10 +163,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" ! - [LIBBLOCKDEV_PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.93])], - []) - --AS_IF([test "x$with_dm" != "xno"], -- [LIBBLOCKDEV_CHECK_HEADER([dmraid/dmraid.h], [], [dmraid.h not available])], -- []) -- - AS_IF([test "x$with_part" != "xno" -o "x$with_fs" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([PARTED], [libparted >= 3.1])] - []) -@@ -174,7 +171,8 @@ AS_IF([test "x$with_fs" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([MOUNT], [mount >= 2.23.0]) - # new versions of libmount has some new functions we can use - AS_IF([$PKG_CONFIG --atleast-version=2.30.0 mount], -- [AC_DEFINE([LIBMOUNT_NEW_ERR_API])], []) -+ [AC_DEFINE([LIBMOUNT_NEW_ERR_API], [1], [new versions of libmount has some new functions we can use])], -+ []) - - LIBBLOCKDEV_PKG_CHECK_MODULES([BLKID], [blkid >= 2.23.0]) - # older versions of libblkid don't support BLKID_SUBLKS_BADCSUM so let's just --- -2.14.3 - |