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/atop | |
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/atop')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch | 26 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch | 97 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/atop/atop_2.3.0.bb (renamed from meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb) | 28 |
3 files changed, 37 insertions, 114 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch b/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch new file mode 100644 index 0000000000..5646061971 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch @@ -0,0 +1,26 @@ +From 13f3771655f859d5e0332dd65b9c43f572f6359d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 Aug 2018 16:02:06 -0700 +Subject: [PATCH] add sys/sysmacros.h for major/minor macros + +photosyst.c:1465:19: error: called object 'major' is not a function or function pointer + dmp->major = major(statbuf.st_rdev); + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + photosyst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/photosyst.c b/photosyst.c +index 38828ec..caed352 100644 +--- a/photosyst.c ++++ b/photosyst.c +@@ -152,6 +152,7 @@ + static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $"; + + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <stdio.h> + #include <string.h> + #include <unistd.h> diff --git a/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch b/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch deleted file mode 100644 index 3708f60ba0..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 7b651793269b6b86f12c43c30b751b86def27222 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 18 Mar 2017 17:56:40 -0700 -Subject: [PATCH] include missing header files - -fixes build with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - deviate.c | 1 + - procdbase.c | 2 +- - showgeneric.c | 2 +- - showlinux.c | 2 +- - showprocs.c | 2 +- - showsys.c | 2 +- - 6 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/deviate.c b/deviate.c -index 7cf1b49..8e615af 100644 ---- a/deviate.c -+++ b/deviate.c -@@ -178,6 +178,7 @@ static const char rcsid[] = "$Id: deviate.c,v 1.45 2010/10/23 14:02:03 gerlof Ex - #include <stdio.h> - #include <errno.h> - #include <fcntl.h> -+#include <stdlib.h> - #include <unistd.h> - #include <limits.h> - #include <memory.h> -diff --git a/procdbase.c b/procdbase.c -index 9cab347..0487d26 100644 ---- a/procdbase.c -+++ b/procdbase.c -@@ -67,7 +67,7 @@ static const char rcsid[] = "$Id: procdbase.c,v 1.8 2010/04/23 12:19:35 gerlof E - #include <fcntl.h> - #include <unistd.h> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - - #include "atop.h" - #include "photoproc.h" -diff --git a/showgeneric.c b/showgeneric.c -index 775afa8..3d5be0e 100644 ---- a/showgeneric.c -+++ b/showgeneric.c -@@ -268,7 +268,7 @@ static const char rcsid[] = "$Id: showgeneric.c,v 1.71 2010/10/25 19:08:32 gerlo - #include <errno.h> - #include <fcntl.h> - #include <string.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> -diff --git a/showlinux.c b/showlinux.c -index 6e60754..aba2ee6 100644 ---- a/showlinux.c -+++ b/showlinux.c -@@ -274,7 +274,7 @@ static const char rcsid[] = "$Id: showlinux.c,v 1.70 2010/10/23 14:04:12 gerlof - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> -diff --git a/showprocs.c b/showprocs.c -index 5194524..f0169ad 100644 ---- a/showprocs.c -+++ b/showprocs.c -@@ -94,7 +94,7 @@ static const char rcsid[] = "$Id: showprocs.c,v 1.15 2011/09/05 11:44:16 gerlof - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> -diff --git a/showsys.c b/showsys.c -index 26331be..5a05fe5 100644 ---- a/showsys.c -+++ b/showsys.c -@@ -80,7 +80,7 @@ static const char rcsid[] = "XXXXXX"; - #include <string.h> - #include <errno.h> - #include <fcntl.h> --#include <termio.h> -+#include <termios.h> - #include <unistd.h> - #include <stdarg.h> - #include <curses.h> --- -2.12.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.3.0.bb index 1ab9e7cf9e..302813c2ea 100644 --- a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.3.0.bb @@ -15,21 +15,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "ncurses zlib" -ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}" - -SRC_URI = " \ - http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ - file://0001-include-missing-header-files.patch \ - file://remove-bashisms.patch \ - file://fix-permissions.patch \ - file://sysvinit-implement-status.patch \ -" - -SRC_URI[md5sum] = "034dc1544f2ec4e4d2c739d320dc326d" -SRC_URI[sha256sum] = "c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d" - -S = "${WORKDIR}/${BPN}-${ATOP_VER}" +SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ + file://remove-bashisms.patch \ + file://fix-permissions.patch \ + file://sysvinit-implement-status.patch \ + file://0001-add-sys-sysmacros.h-for-major-minor-macros.patch \ + " +SRC_URI[md5sum] = "48e1dbef8c7d826e68829a8d5fc920fc" +SRC_URI[sha256sum] = "73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264" do_compile() { oe_runmake all @@ -37,13 +31,13 @@ do_compile() { do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - make DESTDIR=${D} VERS=${ATOP_VER} SYSDPATH=${systemd_system_unitdir} \ + make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ PMPATHD=${systemd_unitdir}/system-sleep systemdinstall install -d ${D}${sysconfdir}/tmpfiles.d install -m 644 ${WORKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf rm -f ${D}${systemd_system_unitdir}/atopacct.service else - make DESTDIR=${D} VERS=${ATOP_VER} sysvinstall + make DESTDIR=${D} VERS=${PV} sysvinstall install -d ${D}${sysconfdir}/default/volatiles install -m 644 ${WORKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop rm -f ${D}${sysconfdir}/init.d/atopacct |