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-support/multipath-tools/files/0006-multipath-tools-fix-compilation-with-musl-libc.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-support/multipath-tools/files/0006-multipath-tools-fix-compilation-with-musl-libc.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-multipath-tools-fix-compilation-with-musl-libc.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-multipath-tools-fix-compilation-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-multipath-tools-fix-compilation-with-musl-libc.patch new file mode 100644 index 000000000..c6fd5b4cf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-multipath-tools-fix-compilation-with-musl-libc.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Xose Vazquez Perez <xose.vazquez@gmail.com> +Date: Fri, 11 May 2018 18:39:44 +0200 +Subject: [PATCH] multipath-tools: fix compilation with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In file included from alias.c:15: +file.h:9:47: error: unknown type name ‘mode_t’; did you mean ‘time_t’? + int ensure_directories_exist(const char *str, mode_t dir_mode); + ^~~~~~ + time_t + +sysfs.c: In function ‘sysfs_is_multipathed’: +sysfs.c:304:15: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean ‘PATH_UP’? + char pathbuf[PATH_MAX]; + ^~~~~~~~ + PATH_UP + +Cc: Martin Wilck <mwilck@suse.com> +Cc: Christophe Varoqui <christophe.varoqui@opensvc.com> +Cc: DM ML <dm-devel@redhat.com> +Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> +--- + libmultipath/file.h | 2 ++ + libmultipath/sysfs.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/libmultipath/file.h b/libmultipath/file.h +index 29520c7..3c75c90 100644 +--- a/libmultipath/file.h ++++ b/libmultipath/file.h +@@ -5,6 +5,8 @@ + #ifndef _FILE_H + #define _FILE_H + ++#include <sys/stat.h> ++ + #define FILE_TIMEOUT 30 + int ensure_directories_exist(const char *str, mode_t dir_mode); + int open_file(const char *file, int *can_write, const char *header); +diff --git a/libmultipath/sysfs.c b/libmultipath/sysfs.c +index ee72e6a..16e0a73 100644 +--- a/libmultipath/sysfs.c ++++ b/libmultipath/sysfs.c +@@ -28,6 +28,7 @@ + #include <dirent.h> + #include <libudev.h> + #include <fnmatch.h> ++#include <limits.h> + + #include "checkers.h" + #include "vector.h" +-- +2.7.4 + |