diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip | |
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/syslinux/syslinux/syslinux-6.03-sysmacros.patch')
| -rw-r--r-- | poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch b/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch deleted file mode 100644 index 3ce46da10..000000000 --- a/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/579928 - -From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 19 Apr 2016 01:56:41 -0400 -Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev - -These functions are defined in sys/sysmacros.h, so add the include to -main.c. This is already handled correctly in mountinfo.c. Otherwise -we get build failures like: - -main.o: In function 'find_device_sysfs': -extlinux/main.c:1131: undefined reference to 'minor' - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> - -The first part wasn't enough in OE build, I had to add the same for syslinuxext.c. ---- - extlinux/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/extlinux/main.c b/extlinux/main.c -index a7ebd49..ebff7ea 100644 ---- a/extlinux/main.c -+++ b/extlinux/main.c -@@ -38,6 +38,7 @@ - #include <sysexits.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/mount.h> - #include <sys/vfs.h> ---- a/libinstaller/syslinuxext.c 2017-02-22 20:17:05.336869181 +0100 -+++ b/libinstaller/syslinuxext.c 2017-02-22 20:16:47.500868751 +0100 -@@ -2,6 +2,7 @@ - - #include <sys/stat.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <getopt.h> - #include <ext2fs/ext2fs.h> - |
