[oe] [meta-networking][PATCH 5/6] samba: Refresh musl pam patch
last update left the musl builds broken since the patch was not forward ported Signed-off-by: Khem Raj--- .../{samba-4.2.7-pam.patch => samba-pam.patch} | 21 +++-- .../recipes-connectivity/samba/samba_4.7.0.bb | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) rename meta-networking/recipes-connectivity/samba/samba/{samba-4.2.7-pam.patch => samba-pam.patch} (73%) diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch similarity index 73% rename from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch rename to meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 6b9ade920..0cbacb6c0 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj - -Index: samba-4.4.5/source3/wscript +Index: samba-4.7.0/source3/wscript === samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +--- samba-4.7.0.orig/source3/wscript samba-4.7.0/source3/wscript +@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; +"or headers not found. Use --without-pam to disable " +"PAM support."); + +else: +Logs.warn("PAM disabled") +use_pam=False @@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript +conf.undefine('PAM_RHOST') +conf.undefine('PAM_TTY') +conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + # diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb index 686998e5e..8a031eb5e 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb @@ -26,7 +26,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ + file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " -- 2.16.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 6/6] libyui-ncurses: Fix build with musl
Signed-off-by: Khem Raj--- ...rc-Replace-using-sys-errno.h-with-errno.h.patch | 59 ++ .../recipes-graphics/libyui/libyui-ncurses_git.bb | 4 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch new file mode 100644 index 0..ae1b265dc --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch @@ -0,0 +1,59 @@ +From 46f016c4b87bb2a594df1c84e4d494bff0cbeaf9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 5 Feb 2018 12:01:25 -0800 +Subject: [PATCH] src: Replace using sys/errno.h with errno.h + +sys/errno.h is no longer the right place for this file + +error: #warning redirecting incorrect #include to [-Werror=cpp] + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/63] + src/NCAskForDirectory.cc | 2 +- + src/NCAskForFile.cc | 2 +- + src/NCFileSelection.h| 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc +index 06ec6ac..ed1a30c 100644 +--- a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + /* + Textdomain "ncurses" +diff --git a/src/NCAskForFile.cc b/src/NCAskForFile.cc +index 31fdb39..63a6679 100644 +--- a/src/NCAskForFile.cc b/src/NCAskForFile.cc +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + /* + Textdomain "ncurses" +diff --git a/src/NCFileSelection.h b/src/NCFileSelection.h +index d42311f..514d020 100644 +--- a/src/NCFileSelection.h b/src/NCFileSelection.h +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + + + struct NCFileInfo +-- +2.16.1 + diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index e445ee0cc..3388876e4 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui-ncurses.git" +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0001-src-Replace-using-sys-errno.h-with-errno.h.patch \ + " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" -- 2.16.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH V2 4/6] iscsi-initiator-utils: Upgrade to 2.0.876
Fix build with musl along the way Signed-off-by: Khem Raj--- Changes since V1: - Rebased on top of master and drop backports ...Check-for-root-peer-user-for-iscsiuio-IPC.patch | 135 - ...openiscsiusr-Include-limit.h-for-PATH_MAX.patch | 25 ...001-qedi.c-Removed-unused-linux-ethtool.h.patch | 25 ...ude-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch | 25 ...ould-ignore-bogus-iscsid-broadcast-packet.patch | 39 -- ...openiscsiusr-Add-CFLAGS-to-linker-cmdline.patch | 29 + ...l-fields-in-iscsiuio-IPC-response-are-set.patch | 34 -- ...rder-the-includes-to-avoid-duplicate-defi.patch | 49 ...ot-double-close-IPC-file-stream-to-iscsid.patch | 62 -- ...04-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch | 28 + ...re-strings-from-peer-are-copied-correctly.patch | 78 ...-useless-strcopy-and-validate-CIDR-length.patch | 44 --- ...ck-iscsiuio-ping-data-length-for-validity.patch | 64 -- ...nitiator-utils-Do-not-clean-kernel-source.patch | 44 --- ...text-add-include-for-NI_MAXHOST-definiton.patch | 35 -- ...2.0.874.bb => iscsi-initiator-utils_2.0.876.bb} | 32 ++--- 16 files changed, 191 insertions(+), 557 deletions(-) delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0.874.bb => iscsi-initiator-utils_2.0.876.bb} (78%) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch deleted file mode 100644 index 2fd5c08a1..0 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch +++ /dev/null @@ -1,135 +0,0 @@ -From eb516ac5f9dddc80564f6becee08a0011e7aa58b Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 10:36:11 -0800 -Subject: [PATCH 1/7] Check for root peer user for iscsiuio IPC - -This fixes a possible vulnerability where a non-root -process could connect with iscsiuio. Fouund by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi - iscsiuio/src/unix/Makefile.am | 3 ++- - iscsiuio/src/unix/iscsid_ipc.c | 47 ++ - 2 files changed, 49 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am -index 71d5463..a989ef0 100644 a/iscsiuio/src/unix/Makefile.am -+++ b/iscsiuio/src/unix/Makefile.am -@@ -20,7 +20,8 @@ iscsiuio_SOURCES = build_date.c\ - nic_utils.c \ - packet.c\ - iscsid_ipc.c\ -- ping.c -+
[oe] [meta-oe][PATCH 3/6] mraa: Fix build on musl
Signed-off-by: Khem Raj--- ...ian.h-for-be16toh-and-le16toh-declaration.patch | 27 ++ meta-oe/recipes-extended/mraa/mraa_git.bb | 4 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch diff --git a/meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch b/meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch new file mode 100644 index 0..711738a92 --- /dev/null +++ b/meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch @@ -0,0 +1,27 @@ +From 2c85decc3b93bfe7322309d2ca7d6377e746c18f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 5 Feb 2018 09:51:08 -0800 +Subject: [PATCH] include endian.h for be16toh and le16toh declarations + +Upstream-Status: Submitted [https://github.com/intel-iot-devkit/mraa/pull/863] + +Signed-off-by: Khem Raj +--- + examples/iio_driver.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/iio_driver.c b/examples/iio_driver.c +index c5a0181..568011c 100644 +--- a/examples/iio_driver.c b/examples/iio_driver.c +@@ -22,6 +22,7 @@ + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include + #include + #include "mraa/iio.h" + +-- +2.16.1 + diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index c4b9c6f90..473116e63 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f" SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480" PV = "1.7.0-git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch \ + " S = "${WORKDIR}/git" -- 2.16.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/6] alsa-oss: Upgrade to 1.0.28
Signed-off-by: Khem Raj--- .../alsa/{alsa-oss-1.0.17 => alsa-oss}/libio.patch | 16 .../alsa/{alsa-oss_1.0.17.bb => alsa-oss_1.0.28.bb} | 6 ++ 2 files changed, 10 insertions(+), 12 deletions(-) rename meta-oe/recipes-multimedia/alsa/{alsa-oss-1.0.17 => alsa-oss}/libio.patch (66%) rename meta-oe/recipes-multimedia/alsa/{alsa-oss_1.0.17.bb => alsa-oss_1.0.28.bb} (75%) diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch similarity index 66% rename from meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch rename to meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch index a053e4c60..5299945e1 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch @@ -1,7 +1,7 @@ -Index: alsa-oss-1.0.15/alsa/stdioemu.c +Index: alsa-oss-1.0.28/alsa/stdioemu.c === alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.0 +0200 -+++ alsa-oss-1.0.15/alsa/stdioemu.c2008-07-21 22:17:06.303161438 +0200 +--- alsa-oss-1.0.28.orig/alsa/stdioemu.c alsa-oss-1.0.28/alsa/stdioemu.c @@ -37,7 +37,9 @@ #endif @@ -12,7 +12,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c struct fd_cookie { int fd; -@@ -99,7 +101,11 @@ +@@ -99,7 +101,11 @@ static FILE *fake_fopen(const char *path if (open_mode && fdc->fd > 0) { result = fopencookie (fdc,"w", fns); @@ -24,11 +24,11 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c } return result; } -Index: alsa-oss-1.0.15/configure.in +Index: alsa-oss-1.0.28/configure.ac === alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.0 +0200 -+++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200 -@@ -33,6 +33,12 @@ +--- alsa-oss-1.0.28.orig/configure.ac alsa-oss-1.0.28/configure.ac +@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then LIBS="$OLD_LIBS" fi diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb similarity index 75% rename from meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb rename to meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb index 8966dbbc1..0c4a9f545 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb @@ -3,11 +3,12 @@ SECTION = "libs/multimedia" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "alsa-lib" -PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ file://libio.patch \ " +SRC_URI[md5sum] = "91f57e8cee1ad4cc956caa8b62ac5d43" +SRC_URI[sha256sum] = "3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5" inherit autotools @@ -17,6 +18,3 @@ do_configure_prepend () { touch NEWS README AUTHORS ChangeLog sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in } - -SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" -SRC_URI[sha256sum] = "8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca" -- 2.16.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/6] mdns: Do not include nss.h with musl
Signed-off-by: Khem Raj--- ...mdns-Do-not-include-nss.h-when-libc-glibc.patch | 42 ++ .../recipes-protocols/mdns/mdns_765.50.9.bb| 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch diff --git a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch new file mode 100644 index 0..863866d18 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch @@ -0,0 +1,42 @@ +From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 21:54:11 -0800 +Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc + +Provide nss_status macro instead for non-glibc case +where nss.h is absent + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mDNSPosix/nss_mdns.c | 13 - + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +index afadb3c..c469584 100755 +--- a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +@@ -378,8 +378,19 @@ init_config (); + + #define ENTNAME hostent + #define DATABASE "hosts" +- ++#ifdef __GLIBC__ + #include ++#else ++enum nss_status ++{ ++NSS_STATUS_TRYAGAIN = -2, ++NSS_STATUS_UNAVAIL, ++NSS_STATUS_NOTFOUND, ++NSS_STATUS_SUCCESS, ++NSS_STATUS_RETURN ++}; ++#define NETDB_INTERNAL NULL ++#endif + // For nss_status + #include + // For hostent +-- +2.16.1 + diff --git a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb index 1a80f7acb..9a7152fcf 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb @@ -9,6 +9,7 @@ RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ + file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317" -- 2.16.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] recipes-kernel: add kpatch dynamic kernel patching infrastructure
On 02/01/2018 10:04 PM, Ruslan Bilovol wrote: > kpatch is a Linux dynamic kernel patching infrastructure > which allows you to patch a running kernel without > rebooting or restarting any processes > > Currently it is enabled and tested on x86-64 systems, > although can be extended to PPC64 as well. > > Signed-off-by: Ruslan BilovolMy bad. Had my system mis configured. - armin > --- > > v2: no code changes, moved from oe-core to meta-oe > v1: > http://lists.openembedded.org/pipermail/openembedded-core/2018-January/146913.html > > meta-oe/recipes-kernel/kpatch/kpatch.inc | 49 ++ > ...patch-build-add-cross-compilation-support.patch | 103 > + > ...tch-build-allow-overriding-of-distro-name.patch | 62 + > meta-oe/recipes-kernel/kpatch/kpatch_git.bb| 11 +++ > 4 files changed, 225 insertions(+) > create mode 100644 meta-oe/recipes-kernel/kpatch/kpatch.inc > create mode 100644 > meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch > create mode 100644 > meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch > create mode 100644 meta-oe/recipes-kernel/kpatch/kpatch_git.bb > > diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc > b/meta-oe/recipes-kernel/kpatch/kpatch.inc > new file mode 100644 > index 000..b1e73e9 > --- /dev/null > +++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc > @@ -0,0 +1,49 @@ > +SUMMARY = "Linux dynamic kernel patching infrastructure" > +DESCRIPTION = "kpatch is a Linux dynamic kernel patching infrastructure > which allows you to patch a running kernel without rebooting or restarting > any processes." > +LICENSE = "GPLv2 & LGPLv2" > +DEPENDS = "elfutils bash" > + > +SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https \ > + file://0001-kpatch-build-add-cross-compilation-support.patch \ > + file://0002-kpatch-build-allow-overriding-of-distro-name.patch \ > + " > + > +EXTRA_OEMAKE = " \ > + PREFIX=${prefix} \ > + BINDIR=${D}${bindir} \ > + SBINDIR=${D}${sbindir} \ > + LIBDIR=${D}${libdir} \ > + MANDIR=${D}${mandir}/man1 \ > + SYSTEMDDIR=${D}${systemd_system_unitdir} \ > + DESTDIR=${D} \ > + BUILDMOD=no \ > + CC='${CC}' \ > + " > + > +S = "${WORKDIR}/git" > + > +do_install () { > + oe_runmake install > +} > + > +PACKAGES =+ "kpatch-build" > +PROVIDES += "kpatch-build" > + > +COMPATIBLE_HOST = "(x86_64).*-linux" > + > +RDEPENDS_${PN} = "bash binutils" > +RDEPENDS_kpatch-build = "bash glibc-utils" > + > +FILES_${PN} = " \ > + ${sbindir}/kpatch \ > + ${systemd_system_unitdir}/kpatch.service \ > + ${mandir}/man1/kpatch.1.gz \ > + " > +FILES_kpatch-build = " \ > + ${bindir}/kpatch-build \ > + ${libexecdir}/* \ > + ${datadir}/kpatch \ > + ${mandir}/man1/kpatch-build.1.gz \ > + " > + > +SYSTEMD_SERVICE_${PN} = "kpatch.service" > diff --git > a/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch > > b/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch > new file mode 100644 > index 000..459fb21 > --- /dev/null > +++ > b/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch > @@ -0,0 +1,103 @@ > +From a9a80a1f4df65892a0269295ce8a64b06f2ff61d Mon Sep 17 00:00:00 2001 > +From: Ruslan Bilovol > +Date: Tue, 19 Dec 2017 15:59:04 +0200 > +Subject: [PATCH] kpatch-build: add cross-compilation support > + > +This patch introduces new option for kpatch-build > +script "--cross-compile" which can be used for > +specifying cross-complier prefix. > +It allows to build live patches not only on > +target system, but also on hosts for a target other > +than the one on which the compiler is running > + > +Also removed quotes in exec lines, so it is > +possible to pass multy-component strings like > +"ccache x86_64-xelinux-linux-" as cross-compiler > + > +Upstream-Status: Pending > + > +Signed-off-by: Ruslan Bilovol > +--- > + kpatch-build/kpatch-build | 13 +++-- > + kpatch-build/kpatch-gcc | 4 ++-- > + 2 files changed, 13 insertions(+), 4 deletions(-) > + > +diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build > +index 166ecbd..af24cc4 100755 > +--- a/kpatch-build/kpatch-build > b/kpatch-build/kpatch-build > +@@ -195,7 +195,7 @@ gcc_version_check() { > + # gcc --version varies between distributions therefore extract version > + # by compiling a test file and compare it to vmlinux's version. > + echo 'void main(void) {}' > "$c" > +-out="$(gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" > ++out="$(${KPATCH_CROSS_COMPILE}gcc -c -pg -ffunction-sections -o "$o" > "$c" 2>&1)" > + gccver="$(gcc_version_from_file "$o")" > + kgccver="$(gcc_version_from_file "$VMLINUX")" > + rm -f "$c" "$o" > +@@ -381,12 +381,14 @@ usage() {
Re: [oe] [oe-commits] Li xin : tiptop: upgrade 2.2 -> 2.3
On Tue, Jan 30, 2018 at 12:50:59PM -0800, Khem Raj wrote: > On 1/30/18 6:27 AM, Martin Jansa wrote: > > Anyone else seeing random failures with this one? > > > > /usr/src/debug/tiptop/2.3-r0/tiptop-2.3/src/utils-expression.c:191: error: > > undefined reference to 'yyparse' > > /usr/src/debug/tiptop/2.3-r0/tiptop-2.3/src/calc.lex:75: error: undefined > > reference to 'yylval' > > /usr/src/debug/tiptop/2.3-r0/tiptop-2.3/src/calc.lex:75: error: undefined > > reference to 'yylval' > > /usr/src/debug/tiptop/2.3-r0/tiptop-2.3/src/calc.lex:65: error: undefined > > reference to 'yylval' > > /usr/src/debug/tiptop/2.3-r0/tiptop-2.3/src/calc.lex:65: error: undefined > > reference to 'yylval' > > collect2: error: ld returned 1 exit status > > make[1]: *** [tiptop] Error 1 > > > > wonder if its missing dep on bison bison-native dependency is implicit via toolchain - should probably be specified explicitly to avoid such random failures. I've discussed with RP and sent bunch of similar patches earlier to oe-core and even to meta-oe... > > On Tue, Aug 18, 2015 at 11:54 AM,wrote: > > > >> Module: meta-openembedded.git > >> Branch: master > >> Commit: 4638d7223aa48639238c35b019e1ca86151a0b65 > >> URL:http://git.openembedded.org/?p=meta-openembedded.git=commit;h= > >> 4638d7223aa48639238c35b019e1ca86151a0b65 > >> > >> Author: Li xin > >> Date: Wed Jul 29 17:54:11 2015 +0800 > >> > >> tiptop: upgrade 2.2 -> 2.3 > >> > >> Signed-off-by: Li Xin > >> Signed-off-by: Martin Jansa > >> > >> --- > >> > >> meta-oe/recipes-extended/tiptop/{tiptop_2.2.bb => tiptop_2.3.bb} | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/meta-oe/recipes-extended/tiptop/tiptop_2.2.bb > >> b/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb > >> similarity index 87% > >> rename from meta-oe/recipes-extended/tiptop/tiptop_2.2.bb > >> rename to meta-oe/recipes-extended/tiptop/tiptop_2.3.bb > >> index a803e26..5a98116 100644 > >> --- a/meta-oe/recipes-extended/tiptop/tiptop_2.2.bb > >> +++ b/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb > >> @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5= > >> b234ee4d69f5fce4486a80fdaf4a4263" > >> DEPENDS = "ncurses libxml2" > >> > >> SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz; > >> -SRC_URI[md5sum] = "74255a29acf44569db021b080ad3e3f7" > >> -SRC_URI[sha256sum] = "965cb99b16cb59df78363d83b62877 > >> ce8501b0aac1116a86bed8a16aa96b171d" > >> +SRC_URI[md5sum] = "f1fba1e90465b0e5a3865b19133fa19d" > >> +SRC_URI[sha256sum] = "3f07e958b40acaeab98e9eb1326c9f > >> 91b0be0a782c1cc2bd7a9e18d31fab18ca" > >> > >> inherit autotools-brokensep > >> EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" > >> > >> -- > >> ___ > >> Openembedded-commits mailing list > >> openembedded-comm...@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-commits > >> > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] recipes-kernel: add kpatch dynamic kernel patching infrastructure
On 02/01/2018 10:04 PM, Ruslan Bilovol wrote: > kpatch is a Linux dynamic kernel patching infrastructure > which allows you to patch a running kernel without > rebooting or restarting any processes > > Currently it is enabled and tested on x86-64 systems, > although can be extended to PPC64 as well. > > Signed-off-by: Ruslan BilovolI am seeing this error with qemux86 Machine. i586-oe-linux-gcc -m32 -march=i586 --sysroot=/build/build_artifacts/master/tmp-glibc/work/i586-oe-linux/kpatch/0.5.0+gitAUTOINC+db6efbb8c7-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/build/build_artifacts/master/tmp-glibc/work/i586-oe-linux/kpatch/0.5.0+gitAUTOINC+db6efbb8c7-r0=/usr/src/debug/kpatch/0.5.0+gitAUTOINC+db6efbb8c7-r0 -fdebug-prefix-map=/build/build_artifacts/master/tmp-glibc/work/i586-oe-linux/kpatch/0.5.0+gitAUTOINC+db6efbb8c7-r0/recipe-sysroot-native= -fdebug-prefix-map=/build/build_artifacts/master/tmp-glibc/work/i586-oe-linux/kpatch/0.5.0+gitAUTOINC+db6efbb8c7-r0/recipe-sysroot= -MMD -MP -I../kmod/patch -Iinsn -Wall -g -Werror -c -o create-diff-object.o create-diff-object.c | In file included from kpatch-elf.h:25:0, | from create-diff-object.c:53: | create-diff-object.c: In function 'kpatch_bundle_symbols': | log.h:11:14: error: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'Elf64_Addr {aka long long unsigned int}' [-Werror=format=] | error(1, 0, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__) | ^ | create-diff-object.c:163:5: note: in expansion of macro 'ERROR' | ERROR("symbol %s at offset %lu within section %s, expected 0", | ^ | create-diff-object.c:163:34: note: format string is defined here | ERROR("symbol %s at offset %lu within section %s, expected 0", | ~~^ | %llu | create-diff-object.c: In function 'kpatch_replace_sections_syms': | create-diff-object.c:1142:5: error: implicit declaration of function 'rela_insn'; did you mean 'rela_equal'? [-Werror=implicit-function-declaration] | rela_insn(sec, rela, ); | ^ | rela_equal | cc1: all warnings being treated as errors | : recipe for target 'create-diff-object.o' failed | make[1]: *** [create-diff-object.o] Error 1 | make[1]: Leaving directory '/build/build_artifacts/master/tmp-glibc/work/i586-oe-linux/kpatch/0.5.0+gitAUTOINC+db6efbb8c7-r0/git/kpatch-build' | Makefile:15: recipe for target 'build-kpatch-build' failed | make: *** [build-kpatch-build] Error 2 > --- > > v2: no code changes, moved from oe-core to meta-oe > v1: > http://lists.openembedded.org/pipermail/openembedded-core/2018-January/146913.html > > meta-oe/recipes-kernel/kpatch/kpatch.inc | 49 ++ > ...patch-build-add-cross-compilation-support.patch | 103 > + > ...tch-build-allow-overriding-of-distro-name.patch | 62 + > meta-oe/recipes-kernel/kpatch/kpatch_git.bb| 11 +++ > 4 files changed, 225 insertions(+) > create mode 100644 meta-oe/recipes-kernel/kpatch/kpatch.inc > create mode 100644 > meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch > create mode 100644 > meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch > create mode 100644 meta-oe/recipes-kernel/kpatch/kpatch_git.bb > > diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc > b/meta-oe/recipes-kernel/kpatch/kpatch.inc > new file mode 100644 > index 000..b1e73e9 > --- /dev/null > +++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc > @@ -0,0 +1,49 @@ > +SUMMARY = "Linux dynamic kernel patching infrastructure" > +DESCRIPTION = "kpatch is a Linux dynamic kernel patching infrastructure > which allows you to patch a running kernel without rebooting or restarting > any processes." > +LICENSE = "GPLv2 & LGPLv2" > +DEPENDS = "elfutils bash" > + > +SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https \ > + file://0001-kpatch-build-add-cross-compilation-support.patch \ > + file://0002-kpatch-build-allow-overriding-of-distro-name.patch \ > + " > + > +EXTRA_OEMAKE = " \ > + PREFIX=${prefix} \ > + BINDIR=${D}${bindir} \ > + SBINDIR=${D}${sbindir} \ > + LIBDIR=${D}${libdir} \ > + MANDIR=${D}${mandir}/man1 \ > + SYSTEMDDIR=${D}${systemd_system_unitdir} \ > + DESTDIR=${D} \ > + BUILDMOD=no \ > + CC='${CC}' \ > + " > + > +S = "${WORKDIR}/git" > + > +do_install () { > + oe_runmake install > +} > + > +PACKAGES =+ "kpatch-build" > +PROVIDES += "kpatch-build" > + > +COMPATIBLE_HOST = "(x86_64).*-linux" > + > +RDEPENDS_${PN} = "bash binutils" > +RDEPENDS_kpatch-build = "bash glibc-utils" > + > +FILES_${PN} = " \ > + ${sbindir}/kpatch \ > + ${systemd_system_unitdir}/kpatch.service \ > + ${mandir}/man1/kpatch.1.gz \ > + " > +FILES_kpatch-build = " \ > +
[oe] [meta-oe][PATCH] libqmi: Update to version 1.20.0
Signed-off-by: Fabio Berton--- .../libqmi/{libqmi_1.16.0.bb => libqmi_1.20.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.16.0.bb => libqmi_1.20.0.bb} (82%) diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb similarity index 82% rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb index 80c26c05c..9301cbd5e 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-Detect-clang.patch \ " -SRC_URI[md5sum] = "4970c110f160b33637a3515004c637b2" -SRC_URI[sha256sum] = "7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a" +SRC_URI[md5sum] = "797e365521df76b77b067e6317618b41" +SRC_URI[sha256sum] = "21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4" -- 2.14.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtwebengine: add PACKAGECONFIG for proprietary_codecs
Signed-off-by: Pascal Huerst--- recipes-qt/qt5/qtwebengine_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ecf4657..4d6c7b6 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -57,6 +57,7 @@ PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx" PACKAGECONFIG[nss] = "WEBENGINE_CONFIG+=use_nss,,nss" +PACKAGECONFIG[proprietary_codecs] = "WEBENGINE_CONFIG+=use_proprietary_codecs,," EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -- 2.14.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel