From patchwork Fri Mar 31 16:42:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96454 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp810897qgd; Fri, 31 Mar 2017 09:43:05 -0700 (PDT) X-Received: by 10.107.132.74 with SMTP id g71mr4013576iod.174.1490978585262; Fri, 31 Mar 2017 09:43:05 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b77si6868825iob.144.2017.03.31.09.43.04; Fri, 31 Mar 2017 09:43:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1538177E35; Fri, 31 Mar 2017 16:42:58 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id AD83A77E33 for ; Fri, 31 Mar 2017 16:42:54 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 81so18578887pgh.3 for ; Fri, 31 Mar 2017 09:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=86htP00kFgRVmQqbmUg4XzItS4ShuB4XTSlWBCw0IYg=; b=oS/tC8NMlMLTu++jJ4+tHIrFPf3mUuEPAlge0qNghSpmHX5H22ocnOceA+PS4vcjvJ ZWDbidWEugFm5Zx5VEng722EJ2Y14HyuLqUUCuvJRgfHBGkVxzQiLc70rIsYMAIsSP9M s+RfCBDfCdCvPAY4qB/H+VRSiVN1RIzvlnmjQRFsK9FeapX3jIkVIxqMHK1LksS1HjRe hqvKKBopaH7x/xzAW0/9BI0CaIGaG60XFZb3B2KIAEVSsOqaICUWvs9ZphhWqPFCXo07 k6DnbTiwPtdp5hq8MypLtJa73EskBF+6nCQ4wG9eY6Cq19p67w2yz0e4VG9ITdLIYRlu 9JgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=86htP00kFgRVmQqbmUg4XzItS4ShuB4XTSlWBCw0IYg=; b=D87DBOsE6sy3kpBO8WT9rOTsU6L7SzGN1S/+2MCskDWgBWqLnd89LbqfW0N022tirU MytVL4yuszS/psFgcXEn9TU88Ofx8tcEG8ePIIz7Jxq7pzj0BmcXSefJQbhJh4a2zmb3 j7Aa6P59INB17kgsCwgDqZrVg/k8U+Q6V/oGxmnGJOR8HQWr4lYijQT5Q1LgDIW5MUor CO5xzDGvG4lnW9E/lUp5YgO62EDqPAFgOMeGZmUbfx8+DMDjiWpNXbRgMZxdnb7hpXNO lc8JwZs7q0qgOwgY8DarY91Pz+nvDPnwdubTFDhT1pVLep/T4bDWJIh/2IXGjt5EmHsq 8Duw== X-Gm-Message-State: AFeK/H1KCDKvNy2NiY60R783DpC72BQpt0xONn+yOdXGNHYN+0rw14GpOB8lrkBLsqxksQ== X-Received: by 10.99.137.66 with SMTP id v63mr4168863pgd.183.1490978575427; Fri, 31 Mar 2017 09:42:55 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.42.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:42:54 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:05 -0700 Message-Id: <20170331164247.5052-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [oe] [meta-oe][PATCH 01/43] gpm: Update to use git src uri X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Additional patches are upstream to fix build with gcc6 and clang Add systemd unit file Signed-off-by: Khem Raj --- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ---- meta-oe/recipes-support/gpm/gpm_git.bb | 44 +++ 8 files changed, 54 insertions(+), 392 deletions(-) delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch create mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/init (100%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/no-docs.patch (93%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/processcreds.patch (100%) delete mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb create mode 100644 meta-oe/recipes-support/gpm/gpm_git.bb -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch deleted file mode 100644 index e43bdcb22..000000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: pending - ---- gpm-1.99.7.orig/src/daemon/open_console.c 2008-07-24 12:33:05.000000000 +0200 -+++ gpm-1.99.7/src/daemon/open_console.c 2013-01-10 12:39:47.975461947 +0100 -@@ -23,6 +23,7 @@ - #include /* open and co. */ - #include /* stat() */ - #include /* ioctl() */ -+#include /* major() */ - - /* Linux specific (to be outsourced in gpm2 */ - #include /* for serial console check */ diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch deleted file mode 100644 index d2d6cb8a8..000000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch +++ /dev/null @@ -1,326 +0,0 @@ -Remove nested functions, they are not available in all compilers -e.g. clang will not support them. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: gpm-1.99.7/src/drivers/summa/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/summa/i.c -+++ gpm-1.99.7/src/drivers/summa/i.c -@@ -36,6 +36,28 @@ extern int summamaxy; - - extern signed char summaid; - -+static void resetsumma(int fd) -+{ -+ write(fd, 0, 1); /* Reset */ -+ usleep(400000); /* wait */ -+} -+ -+static int waitsumma(int fd) -+{ -+ struct timeval timeout; -+ -+ fd_set readfds; -+ -+ int err; -+ -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return (err); -+} -+ - Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc, - char **argv) - { -@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short - flags = argc = 0; /* FIXME: 1.99.13 */ - argv = NULL; - -- void resetsumma() { -- write(fd, 0, 1); /* Reset */ -- usleep(400000); /* wait */ -- } -- int waitsumma() { -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return (err); -- } - int err; - - char buffer[255]; -@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short - */ - setspeed(fd, 1200, 9600, 1, - B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD); -- resetsumma(); -+ resetsumma(fd); - - write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE)); - -@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short - * read the Summa Firm-ID - */ - write(fd, SS_FIRMID, strlen(SS_FIRMID)); -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - summaid = 10; /* Original Summagraphics */ - read(fd, buffer, 255); /* Read Firm-ID */ -@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short - } - - if(summaid < 0) { /* Genius-test */ -- resetsumma(); -+ resetsumma(fd); - write(fd, GEN_MMSERIES, 1); - write(fd, &GEN_MODELL, 1); /* Read modell */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { /* read Genius-ID */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - read(fd, &config, 1); - summaid = (config[0] & 224) >> 5; /* genius tablet-id -@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short - * unknown tablet ? - */ - if((summaid < 0) || (summaid == 11)) { -- resetsumma(); -+ resetsumma(fd); - write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3); - } - - /* - * read tablet size - */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) - read(fd, buffer, sizeof(buffer)); - write(fd, SS_READCONFIG, 1); -Index: gpm-1.99.7/src/drivers/wacom/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/wacom/i.c -+++ gpm-1.99.7/src/drivers/wacom/i.c -@@ -30,10 +30,6 @@ - #include "message.h" /* gpm_report */ - #include "wacom.h" /* wacom */ - --Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -- char **argv) --{ -- - /* wacom graphire tablet */ - #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */ - /* -@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short - #define UD_COORD "~C\r" /* Request max coordinates */ - #define UD_STOP "\nSP\r" /* stop sending coordinates */ - -- flags = 0; /* FIXME: 1.99.13 */ - -- void reset_wacom() { -- /* -- * Init Wacom communication; this is modified from xf86Wacom.so module -- */ -- /* -- * Set speed to 19200 -- */ -- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Baudrate Command -- */ -- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -- usleep(250000); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(75000); -- /* -- * Set speed to 9600bps -- */ -- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(250000); -- write(fd, UD_STOP, strlen(UD_STOP)); -- usleep(100000); -- } -+static void reset_wacom(int fd) -+{ -+ /* -+ * Init Wacom communication; this is modified from xf86Wacom.so module -+ */ -+ /* -+ * Set speed to 19200 -+ */ -+ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Baudrate Command -+ */ -+ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -+ usleep(250000); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(75000); -+ /* -+ * Set speed to 9600bps -+ */ -+ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(250000); -+ write(fd, UD_STOP, strlen(UD_STOP)); -+ usleep(100000); -+} - -- int wait_wacom() { -- /* -- * Wait up to 200 ms for Data from Tablet. -- * Do not read that data. -- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -- */ -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return ((err > 0) ? 1 : err); -- } -+static int wait_wacom(int fd) -+{ -+ /* -+ * Wait up to 200 ms for Data from Tablet. -+ * Do not read that data. -+ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -+ */ -+ struct timeval timeout; - -- char buffer[50], *p; -+ fd_set readfds; - -- int RequestData(char *cmd) { -- int err; -+ int err; - -- /* -- * Send cmd if not null, and get back answer from tablet. -- * Get Data to buffer until full or timeout. -- * Give back 0 for timeout and !0 for buffer full -- */ -- if(cmd) -- write(fd, cmd, strlen(cmd)); -- memset(buffer, 0, sizeof(buffer)); -- p = buffer; -- err = wait_wacom(); -- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -- err = wait_wacom(); -- } -- /* -- * return 1 for buffer full -- */ -- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return ((err > 0) ? 1 : err); -+} -+ -+static int RequestData(int fd, char *cmd, char *buffer) -+{ -+ int err; -+ char *p; -+ /* -+ * Send cmd if not null, and get back answer from tablet. -+ * Get Data to buffer until full or timeout. -+ * Give back 0 for timeout and !0 for buffer full -+ */ -+ if(cmd) -+ write(fd, cmd, strlen(cmd)); -+ memset(buffer, 0, sizeof(buffer)); -+ p = buffer; -+ err = wait_wacom(fd); -+ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -+ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -+ err = wait_wacom(fd); - } -+ /* -+ * return 1 for buffer full -+ */ -+ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+} -+ -+Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -+ char **argv) -+{ -+ -+ flags = 0; /* FIXME: 1.99.13 */ -+ -+ char buffer[50]; - - /* - * We do both modes, relative and absolute, with the same function. -@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short - }; - parse_argv(optioninfo, argc, argv); - type->absolute = WacomAbsoluteWanted; -- reset_wacom(); -+ reset_wacom(fd); - - /* - * "Flush" input queque - */ -- while(RequestData(NULL)) ; -+ while(RequestData(fd, NULL, buffer)) ; - - /* - * read WACOM-ID - */ -- RequestData(UD_FIRMID); -+ RequestData(fd, UD_FIRMID, buffer); - - /* - * Search for matching modell -@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short - * read Wacom max size - */ - if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) { -- RequestData(UD_COORD); -+ RequestData(fd, UD_COORD, buffer); - sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy); - wmaxx = (wmaxx - wcmodell[WacomModell].border); - wmaxy = (wmaxy - wcmodell[WacomModell].border); diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in new file mode 100644 index 000000000..ee6c040fa --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm/init similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/init rename to meta-oe/recipes-support/gpm/gpm/init diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch similarity index 93% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch rename to meta-oe/recipes-support/gpm/gpm/no-docs.patch index f10217a94..3faef84ee 100644 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch +++ b/meta-oe/recipes-support/gpm/gpm/no-docs.patch @@ -11,7 +11,7 @@ Index: gpm-1.99.7/Makefile.in # user-overridable flags, but it's also all the implicit rule looks at. # missing ? --SUBDIRS = src doc contrib gpm2 +-SUBDIRS = src doc contrib +SUBDIRS = src diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb deleted file mode 100644 index bbb8c28ac..000000000 --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ -for the console and xterm, with sample clients included \ -(emacs, etc)." -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f" - -PR = "r2" - -DEPENDS = "ncurses" - -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ - file://no-docs.patch \ - file://processcreds.patch \ - file://eglibc-2.17.patch \ - file://remove_nested_functions.patch \ - file://init" - -inherit autotools-brokensep update-rc.d - -INITSCRIPT_NAME = "gpm" -INITSCRIPT_PARAMS = "defaults" - -#export LIBS = "-lm" - -# all fields are /* FIXME: gpm 1.99.13 */ -# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable] -# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable] -# cc1: all warnings being treated as errors -CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable" - -# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7 -# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] -# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror] -CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -m 0644 src/headers/gpm.h ${D}${includedir} - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm - cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 -} -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544" -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee" - -FILES_${PN} += "${datadir}/emacs" diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb new file mode 100644 index 000000000..4c0e9434d --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ +for the console and xterm, with sample clients included \ +(emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" + +PV = "1.99.7+git${SRCREV}" +PR = "r2" +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/telmich/gpm;protocol=git \ + file://no-docs.patch \ + file://processcreds.patch \ + file://gpm.service.in \ + file://init" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep update-rc.d systemd + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" + +do_configure_prepend() { + (cd ${S};./autogen.sh;cd -) +} + +do_install_append () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm + fi + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h +} + +SYSTEMD_SERVICE_${PN} = "gpm.service" + +FILES_${PN} += "${datadir}/emacs" From patchwork Fri Mar 31 16:42:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96455 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811049qgd; Fri, 31 Mar 2017 09:43:30 -0700 (PDT) X-Received: by 10.36.153.134 with SMTP id a128mr4394284ite.90.1490978610025; Fri, 31 Mar 2017 09:43:30 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e198si6861807ioe.147.2017.03.31.09.43.29; Fri, 31 Mar 2017 09:43:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4834977E63; Fri, 31 Mar 2017 16:43:26 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 7714A77E33 for ; Fri, 31 Mar 2017 16:42:56 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id o123so18539655pga.1 for ; Fri, 31 Mar 2017 09:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s3qJerhKm9SDgCDvVSzIjAIrA5ZITlqBqG9lJjGTxGQ=; b=Y47ioPZp9mqkLxjCCcQqFrPj1IS+RU3SvcM68/0FqAySWL2X5kPVO4yMdi3Wa3D4Fd YGZVwzo75HetJu+RaVtDTQ2SHbSUtzDDMfY4B9ZzgshtZHbkM6Z0lnglYT1wh/8D6ymI Hw2ZA6ZLnbSsS0ZKt590rQ7WtlUK+Ue+f0TIDfNXHn1lyX1FE2KkJfrskffaaJ1raxUe ig2H7Qsw3awrK9waa8lNoTUDvHtnSCB4ci8X0VCuVcw5g4AWdQ+oWynfpboU8cLOfdV/ cr6NiUABpmpUh7nG3voznmSTnwp0QxncNPptK2RSeJnzcCDbzdzvymZcSvVxTDzNg2uA txPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s3qJerhKm9SDgCDvVSzIjAIrA5ZITlqBqG9lJjGTxGQ=; b=b3winzJK7n/9TAjA6SJyWogR4Q3Rj+cQSgk14vlJ3kfGyzl2+pYiDyv7bsQKjdzKmR IDI3dszb4t9SyDyWC3tmTuKbpT2hQb6F3cyiaQy0b6h0MISoHGtqbnTHe/A3Vp2MiE76 FvnvDiRn9+NN2YyIDWLm8gtOo8uloqVa108wtEeXKR2eN1NMjsTPq1Lkh1LdNPqZHdM2 QJkbFbxuMkjuxfOPMMhWWO/xTvqPxQGYK44TyDWtH25eiIJMAM7a5BT12S6U/3eNQ5KM ZhbQif42kW+4DfrVYDwql88PM3M96uC0YhF+ZmU/PhX2fh6A94Y2u534BorGRI+zIFQ7 Q9mw== X-Gm-Message-State: AFeK/H14h3WEgZ0O0IEb3UX80iHq1i/+AagE93vpTueE4OBbuB2jwPZY4oqvKrlhVrYZxQ== X-Received: by 10.99.51.200 with SMTP id z191mr4143159pgz.137.1490978577117; Fri, 31 Mar 2017 09:42:57 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.42.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:42:55 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:06 -0700 Message-Id: <20170331164247.5052-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org pkgconfig is used so we need to inherit pkgconfig secondly, base64 support is added for it to work with musl Signed-off-by: Khem Raj --- ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 20 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- 3 files changed, 395 insertions(+), 6 deletions(-) create mode 100644 meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file mode 100644 index 000000000..0966b6580 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 11:30:49 -0700 +Subject: [PATCH] bundle own base64 encode/decode functions + +Not all libc implementations provide it. +as an aside libresolv is no longer needed + +Signed-off-by: Khem Raj +--- + Makefile | 4 +- + base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + netcat.c | 2 + + socks.c | 3 + + 4 files changed, 320 insertions(+), 2 deletions(-) + create mode 100644 base64.c + +Index: netcat-openbsd-1.105/Makefile +=================================================================== +--- netcat-openbsd-1.105.orig/Makefile ++++ netcat-openbsd-1.105/Makefile +@@ -1,9 +1,9 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c base64.c + +-LIBS= `pkg-config --libs libbsd` -lresolv ++LIBS= `pkg-config --libs libbsd` + OBJS= $(SRCS:.c=.o) + CFLAGS= -g -O2 + LDFLAGS= -Wl,--no-add-needed +Index: netcat-openbsd-1.105/base64.c +=================================================================== +--- /dev/null ++++ netcat-openbsd-1.105/base64.c +@@ -0,0 +1,313 @@ ++/* ++ * Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#if !defined(LINT) && !defined(CODECENTER) ++static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; ++#endif /* not lint */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define Assert(Cond) if (!(Cond)) abort() ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ size_t i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ Assert(output[3] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++//libresolv_hidden_def (b64_ntop) ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(char const *src, u_char *target, size_t targsize) { ++ int tarindex, state, ch; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = *src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ target[tarindex+1] = ((pos - Base64) & 0x0f) ++ << 4 ; ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ target[tarindex+1] = ((pos - Base64) & 0x03) ++ << 6; ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ default: ++ abort(); ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = *src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = *src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +Index: netcat-openbsd-1.105/netcat.c +=================================================================== +--- netcat-openbsd-1.105.orig/netcat.c ++++ netcat-openbsd-1.105/netcat.c +@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, + socklen_t salen, int ctimeout); + static void quit(); + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int + main(int argc, char *argv[]) + { +Index: netcat-openbsd-1.105/socks.c +=================================================================== +--- netcat-openbsd-1.105.orig/socks.c ++++ netcat-openbsd-1.105/socks.c +@@ -53,6 +53,9 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int remote_connect(const char *, const char *, struct addrinfo); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index e0a0328ec..76a32a521 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -2,12 +2,15 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch" + ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${PN}-${PV} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" @@ -16,8 +19,6 @@ SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a inherit pkgconfig -S = "${WORKDIR}/${BPN}-${PV}" - EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" do_configure[noexec] = "1" @@ -25,9 +26,18 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} quilt pop -a || true - QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat } +do_unpack[cleandirs] += "${S}" + python do_patch() { bb.build.exec_func('netcat_do_patch', d) bb.build.exec_func('patch_do_patch', d) diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 91a24a106..15441645b 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -9,7 +9,7 @@ connection you would need and has several interesting built-in \ capabilities." SECTION = "net" -inherit update-alternatives gettext +inherit update-alternatives gettext pkgconfig ALTERNATIVE_${PN} = "nc" From patchwork Fri Mar 31 16:42:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96456 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811093qgd; Fri, 31 Mar 2017 09:43:38 -0700 (PDT) X-Received: by 10.36.222.196 with SMTP id d187mr4677672itg.109.1490978618314; Fri, 31 Mar 2017 09:43:38 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x99si6879008ioi.10.2017.03.31.09.43.38; Fri, 31 Mar 2017 09:43:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 87D8977E3D; Fri, 31 Mar 2017 16:43:32 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 45C8977E39 for ; Fri, 31 Mar 2017 16:42:56 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 81so18579145pgh.3 for ; Fri, 31 Mar 2017 09:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vT8ab7dn86XKTGJ2K+3/4yy4ux3GmOQDJywyr3fL3EA=; b=eObag+mlOfeL5u3T78Nvjyyu/0Zk3eYFnMdXrWpkzyjcc+YDJIqtMuK48igmmW9bFd XEKsj9uNyefN4mCJEL8nHndfAyi5sWcjMAb+LJ/MSguzpwg6K2h2p65ky+EyYe2/rN8C y/uqTihsIUzm4MLYZ6AoM+e8qoxzcFbr612dEhNZrCEQVDAAnCeL1MUANp6R3gic67gY d9akdyqf811psNqNxVmzix5tEP6g+yl8DzTUhLbhF9RSfzjPovLd7l7xKHqVYJjmusfz D1SCzHju3r18ikjegP6+bRzqlwOWx7Kv9apvHjeItJDd7kZ5GEqvYMP8L+5PBvWRghua bQ2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vT8ab7dn86XKTGJ2K+3/4yy4ux3GmOQDJywyr3fL3EA=; b=UOGDNnQbpCyYmSfFV/tKSaMCxGTMY1H33KQxYwmTPmaD9MK7ZeqA2la05nA/2t8LKF 3fzR7MPMfAYkdY5WNPufGxZTQKjSnV6zxsxQO7cTaNf1UomIw21aj7wsURBznQUEzYVK 8LlwDyj3hVrsTO206TPLUe9BVx6zvByuilL55GAVxFJHcMRHe0euxZ0CkV9TWd+EjuG6 kj/FHOShCXpQefQ/kgZWdaTVqooNhM2sRDS6HLRqN5h5mo5NS+lU1jQ6UG5DHjLRjocG 9ILYpi0Lq8HcHFBUUSXoJ9pI9qBFT9gNAHii5X1bokkmrD7IyvjLP8//0bw/NZJpU1OJ sDUg== X-Gm-Message-State: AFeK/H1YfxNP1K/hfgMDgacJ/0om289yQRkBL93mh9nOwi+5ZDGcOFW/Rj5IV94Gbq6cmw== X-Received: by 10.99.132.73 with SMTP id k70mr4125937pgd.28.1490978578484; Fri, 31 Mar 2017 09:42:58 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.42.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:42:57 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:07 -0700 Message-Id: <20170331164247.5052-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 03/43] ctdb: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fixes | ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include Signed-off-by: Khem Raj --- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 7cea0f681..b5a60645c 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -27,6 +27,9 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" DEPENDS += "popt libtevent libtalloc libldb" +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" From patchwork Fri Mar 31 16:42:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96457 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811148qgd; Fri, 31 Mar 2017 09:43:46 -0700 (PDT) X-Received: by 10.36.230.65 with SMTP id e62mr4886596ith.3.1490978626605; Fri, 31 Mar 2017 09:43:46 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 125si3175155ith.64.2017.03.31.09.43.46; Fri, 31 Mar 2017 09:43:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 054EF77E72; Fri, 31 Mar 2017 16:43:34 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 1D7F377E36 for ; Fri, 31 Mar 2017 16:42:58 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 79so18583553pgf.0 for ; Fri, 31 Mar 2017 09:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=74vSkimhHpWPcEEMbbHHJlmBk5z1B9h6VrmCva5EN9o=; b=QYLwNoWH+tBHQqzM0K2JXDOrlzxuhyCLhOmTKlntX0Ob/h+Tr62wi3Z6IYtSpncMMy /GXpOOkPAbsSJw0Z7zK7ibkQB7L6UQ0Hx2UDcC65mR42YU7/IbF2Q4gbsYWykEX3cQH1 zry0Eunw9n+MLE7/Y7QrBejS1g/n/1eCKQv0NWCd6egt22N8t+vLUjDTd8AaxIZdmOfU ia6uZrczE+wIni0qIpKoj3Fq36DSCDBgrFYIOn39GW0AOs5NNL302HwkDBMx0dH0uV6m gshXFzSldyppoRBqp0f6aOK7nTbthA4DKeHGw9Ot8i9Wk9iiE7zNaq1uvqWpblpxZMAM BJ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=74vSkimhHpWPcEEMbbHHJlmBk5z1B9h6VrmCva5EN9o=; b=OkZNUuSnnQDDgI4vZYc5ojvtikK99Sd8ByB5OPVbBBGPj5Yh67GtNqIel5dO2pfJQs D+rs3vWmvgeBare1C2BRKM/e/EwiBRWqPU0MGKvtXvN8NwMTm1pdIe8pvBZT0VKjkV4q Otc1n5j9Hig1DY+seaJ8sHP/U0aNLPRFsHFvYBt7N74CXD1xHjEVwkhdPc8i4aXnOmL1 tgwM0lAqs9r09KdwjhiKbAFI/57TaT5qOlmvLMcKlaeDY9yGnXAY6u2mlbQqzFfReN4n Vuto41JiMVJN+/jLsaRt+e1xWYMUmo+LlJp4/6AxVhNVGsoDkvYXD+fdsZV5zNdjDO7V 07+g== X-Gm-Message-State: AFeK/H2wDihbs19XKJV5MCgATlvs1lMlrdR51+LLvJd/gdObewPvfuZNuKZOGKvjy6B26g== X-Received: by 10.99.101.67 with SMTP id z64mr4297211pgb.78.1490978579888; Fri, 31 Mar 2017 09:42:59 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.42.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:42:58 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:08 -0700 Message-Id: <20170331164247.5052-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/43] v4l-utils: Depend on argp-standalone for musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org musl does not bundle libargp like glibc Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb | 1 + 1 file changed, 1 insertion(+) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb index b9732fedc..4d87b50dc 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb @@ -6,6 +6,7 @@ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" +DEPENDS_append_libc-musl = " argp-standalone" inherit autotools gettext pkgconfig From patchwork Fri Mar 31 16:42:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96458 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811199qgd; Fri, 31 Mar 2017 09:43:55 -0700 (PDT) X-Received: by 10.36.7.129 with SMTP id f123mr4969235itf.120.1490978635307; Fri, 31 Mar 2017 09:43:55 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l64si3182158itg.41.2017.03.31.09.43.54; Fri, 31 Mar 2017 09:43:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 358D577E70; Fri, 31 Mar 2017 16:43:35 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 6A69777E42 for ; Fri, 31 Mar 2017 16:43:00 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id 79so18583667pgf.0 for ; Fri, 31 Mar 2017 09:43:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9IyeBO63hq1q66d1UT2yEsgUJ6Ripv/I+oL1T5UEG3w=; b=npIS0VARAUsYYmNsWKl3ckrIu6GIwvJV7OQmXKb9wCqYXZxNPy/61KNLuUfCOpNegb kufw11nv6a7+OdEyphWTIHNz94EeJijb+HI2kPnXAMlk1YBDhV6gJsPgAueQe5PLaqsE NQ6pAcA12T3VS3ClnyxGsrrbLHw6QPezm60TMinDbiMAUp2UkEjHn4hJiJPPY3dFif/q GQdea1/GRNx8HACHh61jEZNYJdjeBnrMBIeIzhFCsnKhMHePzt2I3LXtGicLILzw3s58 rdCbKzT5kxoJelaPTRaTCNIU5xYZtVBm+8Qlc/HvZoKlnm00qPZth/9FB7YJGK3zfRQK V1MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9IyeBO63hq1q66d1UT2yEsgUJ6Ripv/I+oL1T5UEG3w=; b=MFtnA+1QFyH/LC6k0Z5FW30VM42aB44BTB9SbmKW3Tp0KmXNtqTJ/PjjsU3VKXmte8 DK4h7MXt7D+w3EVSxwA/6lfZ4iPPaeC7A7MnNNxayOUaCUiPBtqkR68AOTxZ02Tt/A99 XKLivpMTcSOU7LYrTvJ/9jz/DMDC6Zrj5PFe6XNAeTHdhspCdIKn67twvoqWq+B0tTDi GdNyx0c9n6cB2jyj9BbKyG4zka3aMlGaXB/VbOwIf7E8ZzXHob+zG9hHMk5VnSLO/okN 5vP30ZM883SY33cVW2T+HZy0qkno9ySvO7io9aSNI7yuYU1rKJ/YVaJmDzXzUdS/OxaQ 1XQA== X-Gm-Message-State: AFeK/H3dzZOgDC/cBau9XH4hK2J4n0MshP8h9rHYbBv/DaV2UMLDL3zC0AB2bj/5IfjUQA== X-Received: by 10.98.97.7 with SMTP id v7mr3642618pfb.161.1490978581677; Fri, 31 Mar 2017 09:43:01 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.42.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:00 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:09 -0700 Message-Id: <20170331164247.5052-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 05/43] caps: Use c99 int types X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fixes build with musl Signed-off-by: Khem Raj --- ...01-basic.h-Use-c99-supported-stdint-types.patch | 46 ++++++++++++++++++++++ .../recipes-multimedia/caps/caps_0.9.24.bb | 8 ++-- 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch new file mode 100644 index 000000000..1087b0e79 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch @@ -0,0 +1,46 @@ +From a5cea22294a9acb6eed955bd415f562a6cc36482 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 11:54:23 -0700 +Subject: [PATCH] basic.h: Use c99 supported stdint types + +include stdint.h for getting the definitions for int types + +Signed-off-by: Khem Raj +--- + basics.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/basics.h b/basics.h +index 643d96e..1dc2fa7 100644 +--- a/basics.h ++++ b/basics.h +@@ -46,17 +46,18 @@ + + #include + #include ++#include + + #include "ladspa.h" + +-typedef __int8_t int8; +-typedef __uint8_t uint8; +-typedef __int16_t int16; +-typedef __uint16_t uint16; +-typedef __int32_t int32; +-typedef __uint32_t uint32; +-typedef __int64_t int64; +-typedef __uint64_t uint64; ++typedef int8_t int8; ++typedef uint8_t uint8; ++typedef int16_t int16; ++typedef uint16_t uint16; ++typedef int32_t int32; ++typedef uint32_t uint32; ++typedef int64_t int64; ++typedef uint64_t uint64; + + #define MIN_GAIN 1e-6 /* -120 dB */ + /* smallest non-denormal 32 bit IEEE float is 1.18e-38 */ +-- +2.12.0 + diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb index 3e409e6eb..90a28360c 100644 --- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://quitte.de/dsp/caps.html" LICENSE = "GPL-3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ - file://Avoid-ambiguity-in-div-invocation.patch \ -" +SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ + file://Avoid-ambiguity-in-div-invocation.patch \ + file://0001-basic.h-Use-c99-supported-stdint-types.patch \ + " SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20" From patchwork Fri Mar 31 16:42:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96459 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811264qgd; Fri, 31 Mar 2017 09:44:06 -0700 (PDT) X-Received: by 10.107.185.135 with SMTP id j129mr3926464iof.3.1490978645939; Fri, 31 Mar 2017 09:44:05 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 135si3169319itg.64.2017.03.31.09.44.05; Fri, 31 Mar 2017 09:44:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 59C0277E82; Fri, 31 Mar 2017 16:43:36 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 1675377BDF for ; Fri, 31 Mar 2017 16:43:01 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 81so18579617pgh.3 for ; Fri, 31 Mar 2017 09:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qsb0dxpM6K+bBpr9Hn8CF6o1BbIokOXWUpq5nTw2J7I=; b=B1f37h9+peUOztn7eZnal6H+qevWl7dAhV2JLG4c941QB6FaKWb6w8+YCiGGazuR5r IxhLzAITBXZ2CT2yhFE4lxrAztv81VVC93PetQ1X3BQhQaTWYu7rEgiuqykIqyE6Vy6R Q7gw7RKTNo5Y/ssNzvltA++k6ZvTNpohv3qNCIKJ1yfe5tZCq8NddTk4vWBIiMQ/iA8U xGszbHxghy/CmMx4CB2Tr+a8vCISVQrcSOLPRDUmdGchQFtbEiJL8iNAtyhCXPl87Jg7 q70U+4X7DS4+0bS1Ps6dTmwjsOLHkDoR3AERiQA8C+LduHeKkRnsV+i2CKegpfSz0mzW bMag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qsb0dxpM6K+bBpr9Hn8CF6o1BbIokOXWUpq5nTw2J7I=; b=alN2Kxs88FmEh9Ru43u9xAi6rd9e0Wfwfe6AVMHXGjzedzerKHdUBBWA+UvnpPkfbS 31x8u6nywkv5tT/mpGFiso50nTPB5T3s5NApC2xnJCleIa1VjpTwWpJLkvdG9EICty6o FK2Fx3ROrj0kD++p3PMnbWlE5O87rBokKnrljX+dZXB2+4FUrPrB3+bAwZDxNASAPCEP lig7OAune/aK5x5tGKSES3mWjuETyj3CUfnQokRv9Pm9NGyriuXqt+VRyTZhkunizogQ QqNhJ0gC/diGLX41fuHxhp5J+zAN7AEL//K4W0jiPOcnB/xeV1I8lXVitx1dDFTZJmRN slPg== X-Gm-Message-State: AFeK/H2OnKd63V7eiE1NLsaUbIBiRHpuP7Neflppuo+PYGGswsUF2I6g71I6wq644QhrGw== X-Received: by 10.99.185.91 with SMTP id v27mr4162307pgo.65.1490978583046; Fri, 31 Mar 2017 09:43:03 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:02 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:10 -0700 Message-Id: <20170331164247.5052-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org The patches had syntax errors which are only visible when using musl libs Signed-off-by: Khem Raj --- .../lvm2/0001-implement-libc-specific-reopen_stream.patch | 14 +++++++------- .../lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch index f09fd76b3..b6a7f1a92 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch @@ -1,7 +1,7 @@ -From ede7976da9431573b0104dbcfe91a32c02dbea13 Mon Sep 17 00:00:00 2001 +From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:49:40 +0000 -Subject: [PATCH 1/4] implement libc specific reopen_stream +Subject: [PATCH] implement libc specific reopen_stream musl defines stdin/stdio/stderr as constant types which means we can not assign to them as we are doing here but works ok with glibc @@ -13,15 +13,15 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + +%% original patch: 0001-implement-libc-specific-reopen_stream.patch --- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c -index c933154..638839d 100644 +index c933154..3581084 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ @@ -38,7 +38,7 @@ index c933154..638839d 100644 } +#else +{ -+ return (freopen(NULL, mode, *stream) != NULL) ++ return (freopen(NULL, mode, *stream) != NULL); +} +#endif @@ -76,5 +76,5 @@ index 9a4deb7..f1f18e6 100644 strerror(errno)); return 0; -- -2.9.3 +2.12.0 diff --git a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index 5baafab3e..ef385099f 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -1,20 +1,20 @@ -From 8706a6d33753d8b2cf5bb2a12bd6880b371ce337 Mon Sep 17 00:00:00 2001 +From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH 2/4] Guard use of mallinfo() with __GLIBC__ +Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ This API is glibc-only Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + +%% original patch: 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch --- lib/mm/memlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index da90144..c1bf8fb 100644 +index da90144..f34f890 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) @@ -22,10 +22,10 @@ index da90144..c1bf8fb 100644 static void _allocate_memory(void) { -#ifndef VALGRIND_POOL -+#ifndef VALGRIND_POOL && defined(__GLIBC__) ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) void *stack_mem; struct rlimit limit; int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; -- -2.9.3 +2.12.0 From patchwork Fri Mar 31 16:42:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96460 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811331qgd; Fri, 31 Mar 2017 09:44:15 -0700 (PDT) X-Received: by 10.107.135.105 with SMTP id j102mr3958491iod.90.1490978655488; Fri, 31 Mar 2017 09:44:15 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g6si6885552ioi.42.2017.03.31.09.44.15; Fri, 31 Mar 2017 09:44:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7927277E75; Fri, 31 Mar 2017 16:43:37 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 112EE77E46 for ; Fri, 31 Mar 2017 16:43:03 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 81so18579764pgh.3 for ; Fri, 31 Mar 2017 09:43:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3nmNxsxmf9OacJjOZmV5wU0N5JsljUa/sYu43qrXD7s=; b=BXmJEEeNtXOFdWRrthvfy0QPlIWtS6Dk7qbtiZWIheBHfdDrK/N2szQjXXLAVu9At4 y/edUQ28U+NIj4pwy3I11U5gxbI/Wra6OJIs3yUMHuccUrapelreOBieeWlLFcKEN4VL kpKinvFei4KhpJOG26YzQwCapmK9wLkkpOhWTYIQfK48AiWy/Uih+BiG+h6DCACmDw8S wgTI4Pyv6xKstMm6tmAjNANAc+q7TAsZjn7kd1yPOa4j2JkLLf9lEBm/yWdI50blfGkV I2WWdPZtzWC/McIADGQhVXsccmcWwJVI7uINndk2xYM78tSSmU5MDZ32cOzE//rEHp1O qzwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3nmNxsxmf9OacJjOZmV5wU0N5JsljUa/sYu43qrXD7s=; b=SeTEA3RaG8Z5A0nAVwqh4Oj6RC0itz0VpeLS5t0fVHRUPoiUTCY+09/ngPJl+RU3ov FEkBEBYGnHpB4bxY7jm1+/aRAdfsnXJUH6IYLBQyn/ndxy+jzMnICgf213VkTiRW3QKE CbDzuTmCfxVytsJfKEprLNGKcYiP+u5DZVQX/GDqfzjAp50AiWBsYSXMDAsv77Vo/8rc 6z/xPtXzMAPtaAsSjJKOen3qfasAJiC5s2Mq138QaQfx1vH3bAcTRQ6KRRQ8Ui+hPGgN iZS21uewW1funx4J5kf0tCObVcK/66UpCkRvwZmWgLS0aXeajZEQVzAYGPZFrS6p163L fzjw== X-Gm-Message-State: AFeK/H3GYjdNoa1aVoXwLuZUxmdGCn3vibNb1SBVbD8plIjG+RvejHSn1L2jqwGW8pA60w== X-Received: by 10.98.49.1 with SMTP id x1mr3841989pfx.26.1490978584362; Fri, 31 Mar 2017 09:43:04 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:03 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:11 -0700 Message-Id: <20170331164247.5052-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 07/43] squid: Update to 3.5.23 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Disable NIS on musl, it doesnt yet build Signed-off-by: Khem Raj --- .../recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename meta-networking/recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} (95%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb similarity index 95% rename from meta-networking/recipes-daemons/squid/squid_3.5.20.bb rename to meta-networking/recipes-daemons/squid/squid_3.5.23.bb index 2e9e1f116..0fe9673af 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb @@ -22,13 +22,12 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ " +SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22" +SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ " -SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60" -SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1" - DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools useradd ptest @@ -45,7 +44,9 @@ PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -BASIC_AUTH = "DB SASL LDAP NIS" +BASIC_AUTH = "DB SASL LDAP" +BASIC_AUTH_append_libc-glibc = " NIS" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" From patchwork Fri Mar 31 16:42:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96461 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811395qgd; Fri, 31 Mar 2017 09:44:24 -0700 (PDT) X-Received: by 10.36.137.68 with SMTP id s65mr3950301itd.70.1490978664533; Fri, 31 Mar 2017 09:44:24 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b79si6888759iod.69.2017.03.31.09.44.24; Fri, 31 Mar 2017 09:44:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A757F77E89; Fri, 31 Mar 2017 16:43:38 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by mail.openembedded.org (Postfix) with ESMTP id BF15F77E47 for ; Fri, 31 Mar 2017 16:43:04 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id x125so76087541pgb.0 for ; Fri, 31 Mar 2017 09:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1aCYLgPYxPZzZtZLsuGTnLPpiJaxJxIYSJ4ctfBttgc=; b=N+O+gyNkyyoh2UBk6KPEpMX7RFHSLYlwcsJyBX8tzwBazLfCZDCS2FsTQ05dgmmYNt kc6uoA2Qn6KgpOrG0U+bJJCGiTdNKXP9DbmyEwr0Me6WADUQj9SYUw5UKsWYBQuiylee /HCl2BQZKRLL3c3Ya3o/o7/nnRjpKb/NsDQB16i/iuIahj6ywlQ0akbfFmlKdvd3V8vs QM2wpbW4ows4eDPLTclCkyrI61CilZp+SJY9w2MYVqDd6N/Y8Xh48ccHOnmm6fpDfoiH nwOgsDAH9vdpEkAYKxeFFkOT4Ez04ObXuMGurpzGtIfhZ4/eUMQA1a9goSSdFEg0MK4N KXIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1aCYLgPYxPZzZtZLsuGTnLPpiJaxJxIYSJ4ctfBttgc=; b=TWDlKFKacYvje0uYSNQTg7w2v3EHmZRDji4fZi9IigFPlOSaNK9yRpL9MDqTw20Pwq SVSkjcEV8SpI5+vpuXleqeQFflisvGsuQDSbhn8FbfhktEGwA95TkfFHfFhSaaH5Fpor ZRDCXl6lGKQNyt4RFgAMmmVcVm47tIM/SQE93shkhSDct8mAPQ8Gh7fX8AqubbvHZG9M HDsEWuLharR+h3J4/+i1BI6CXGa8UzJiC3elOq7XuZSmHQo13wuj35fO1znLYuoHZi9D r1X8Hh3ZbteYAFOd9moRmmi6SZ85wQazG8bd7pz48tMFR0WBdIKlWjnL7Cs36qdgF9+K bh8A== X-Gm-Message-State: AFeK/H2noubEbofQB0cts0zAw7rLO80Ug4G9erZGn9GewoUkQlPFH12BqtTvr4SG99cyXw== X-Received: by 10.99.175.66 with SMTP id s2mr4185389pgo.30.1490978585818; Fri, 31 Mar 2017 09:43:05 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:04 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:12 -0700 Message-Id: <20170331164247.5052-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-xfce][PATCH 08/43] xfce4-closebutton-plugin: Fix build with clang X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...n_val_if_fail-in-functions-expecting-a-re.patch | 62 ++++++++++++++++++++++ .../closebutton/xfce4-closebutton-plugin_git.bb | 4 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch new file mode 100644 index 000000000..2e824ec0d --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch @@ -0,0 +1,62 @@ +From b0bda2dfc2d8d7bb244e59897b5bf0776f4fe44c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 15:07:26 -0700 +Subject: [PATCH] Use g_return_val_if_fail() in functions expecting a return + value + +Clang detects that we are not returning any value when function +expects it. + +Fixes + +| ../../git/panel-plugin/closebutton.c:170:3: error: non-void function 'closebutton_plugin_set_icon' should return a value [-Wreturn-type] +| g_return_if_fail (XFCE_IS_PANEL_IMAGE (icon)); + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + panel-plugin/closebutton-settings.c | 2 +- + panel-plugin/closebutton.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/panel-plugin/closebutton-settings.c b/panel-plugin/closebutton-settings.c +index f2fa370..d4e6b0c 100644 +--- a/panel-plugin/closebutton-settings.c ++++ b/panel-plugin/closebutton-settings.c +@@ -60,7 +60,7 @@ closebutton_builder_new (XfcePanelPlugin *panel_plugin, + GtkBuilder *builder; + GObject *dialog, *button; + +- g_return_if_fail (XFCE_IS_PANEL_PLUGIN (panel_plugin)); ++ g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (panel_plugin), 0); + + builder = gtk_builder_new (); + if (gtk_builder_add_from_string (builder, buffer, length, &error)) +diff --git a/panel-plugin/closebutton.c b/panel-plugin/closebutton.c +index fd0a7b5..2120728 100644 +--- a/panel-plugin/closebutton.c ++++ b/panel-plugin/closebutton.c +@@ -167,8 +167,8 @@ closebutton_plugin_set_icon (CloseButtonPlugin *plugin, gboolean force_reload) + XfcePanelPlugin *panel_plugin = XFCE_PANEL_PLUGIN (plugin); + XfcePanelImage *icon = XFCE_PANEL_IMAGE (plugin->icon); + +- g_return_if_fail (XFCE_IS_PANEL_IMAGE (icon)); +- g_return_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin)); ++ g_return_val_if_fail (XFCE_IS_PANEL_IMAGE (icon), 0); ++ g_return_val_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin), 0); + + window = closebutton_plugin_get_effective_window (plugin); + if (window != NULL) +@@ -404,7 +404,7 @@ closebutton_plugin_size_changed (XfcePanelPlugin *panel_plugin, + gint size) + { + CloseButtonPlugin *plugin = XFCE_CLOSEBUTTON_PLUGIN (panel_plugin); +- g_return_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin)); ++ g_return_val_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin), 0); + + #if LIBXFCE4PANEL_CHECK_VERSION(4,9,0) + size /= xfce_panel_plugin_get_nrows (panel_plugin); +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 341107fa1..746b1222a 100644 --- a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -9,7 +9,9 @@ DEPENDS += "exo-native libwnck xfconf" PV = "0.1.0+gitr${SRCPV}" -SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master \ + file://0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch \ + " SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850" S = "${WORKDIR}/git" From patchwork Fri Mar 31 16:42:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96462 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811471qgd; Fri, 31 Mar 2017 09:44:34 -0700 (PDT) X-Received: by 10.107.12.40 with SMTP id w40mr4135873ioi.209.1490978674506; Fri, 31 Mar 2017 09:44:34 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e62si3170151itg.55.2017.03.31.09.44.34; Fri, 31 Mar 2017 09:44:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id F173E77E94; Fri, 31 Mar 2017 16:43:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 06D5377E33 for ; Fri, 31 Mar 2017 16:43:06 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id 79so18584210pgf.0 for ; Fri, 31 Mar 2017 09:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hqzHQig20jcmM5V2HpBIX+EQD56ejkml+fa9zcmnTvQ=; b=uJMaC4nYp+38OJVNAtMFa0msq9xXlNwhI+0gJdvfgsxojuVLqIPsaWF0Z6/EAmomgu cMn2/IIoQ6MPhHnzth1UM/JmcgMScTbLf1MhpdBEct8pzZ7PrwYzPxINcXsuVuQskYUy ThKpMKIcIEv2nK4BaYxSEkXgLWT7NwuAyx7zDUZE0MPtU0l0lOGHtr/TGxiUG3vtYBvn qJCq+OvwaBrvvsn6zvFozhTHf/yIzafsXHMmOP80LT0sAk0yX9v2OrklPr7s69J1W7T+ S2fm4hRob9lCiuXIDYCSJBQxiAa9AaAbZ+bxjnaGJyAC/x9Oi9JnjB4Jp4G5xFwKL/wr kgug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hqzHQig20jcmM5V2HpBIX+EQD56ejkml+fa9zcmnTvQ=; b=bvjm4qXd8MbQejQFlNVEUQxlG1TbVn+0Rws8ipenGnTBWMt843qlV3ZOz2uVsrjEbX aLY7wa5szTHU0znb37z9W5Yme67jsO2vfxfASgCoppT7irPy+q6J55HYkwBJ1BBjzGQj zSiop19vURZLSo6QBM5GHCCxQOmEL2VI43zA32WMm43+0JA8yNIUjQwJ0gutBZN9YSn2 eIEAD+ncs5F0BJqS831eSEEC6VNFRBfQLUi/8Ph5Klk5pazURA/W7xbBiJD0llOkmyDz wr0zd4qdsEPwMpH+OoQ+0B7o1tY/4cPeBKNwj/ojoOubF0/rXVnptGJijtI/27QgNzEu eMpQ== X-Gm-Message-State: AFeK/H2ZbGlw1zbiuwqnaaeVGJCTMwolynMiqvhyx9fDPrUSsxOvnNu49oa3mzL93L9Sbg== X-Received: by 10.99.122.22 with SMTP id v22mr4345798pgc.226.1490978587311; Fri, 31 Mar 2017 09:43:07 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:06 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:13 -0700 Message-Id: <20170331164247.5052-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-xfce][PATCH 09/43] xfce4-timer-plugin: Fix build when security flags are enabled with clang X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-Specify-string-format-explicitly.patch | 32 ++++++++++++++++++++++ .../timer/xfce4-timer-plugin_1.6.0.bb | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch new file mode 100644 index 000000000..3f0bb05af --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch @@ -0,0 +1,32 @@ +From 6b786e1c161026ab5486ac218891a85db65bf3ba Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 15:28:24 -0700 +Subject: [PATCH] Specify string format explicitly + +Avoids below errors when compiling with -Wformat-security + +error: format string is not a string literal (potentially insecure) + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/xfcetimer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xfcetimer.c b/src/xfcetimer.c +index 601772f..4b89682 100644 +--- a/src/xfcetimer.c ++++ b/src/xfcetimer.c +@@ -190,7 +190,7 @@ static gboolean update_function (gpointer data){ + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, +- GTK_BUTTONS_NONE, dialog_message); ++ GTK_BUTTONS_NONE, "%s", dialog_message); + + gtk_window_set_title ((GtkWindow *) dialog, dialog_title); + +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb index d61235fe0..961519285 100644 --- a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb @@ -6,5 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin +SRC_URI += "file://0001-Specify-string-format-explicitly.patch" + SRC_URI[md5sum] = "3be2a4ccfb2af20441b1d25c2cea5f28" SRC_URI[sha256sum] = "39d7d21f099bc4219f6a6156142f0bbb8374986ee1970a9c0c8dc138b87f867c" From patchwork Fri Mar 31 16:42:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96463 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811516qgd; Fri, 31 Mar 2017 09:44:43 -0700 (PDT) X-Received: by 10.107.50.11 with SMTP id y11mr4363194ioy.10.1490978683316; Fri, 31 Mar 2017 09:44:43 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 23si6869106iou.206.2017.03.31.09.44.42; Fri, 31 Mar 2017 09:44:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1879477E63; Fri, 31 Mar 2017 16:43:41 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f53.google.com (mail-pg0-f53.google.com [74.125.83.53]) by mail.openembedded.org (Postfix) with ESMTP id 0AE8077E49 for ; Fri, 31 Mar 2017 16:43:07 +0000 (UTC) Received: by mail-pg0-f53.google.com with SMTP id 81so76187228pgh.2 for ; Fri, 31 Mar 2017 09:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ry/r0q/InedQyIk6HiwDsG/B0qaou75vOh0QMlgI4fU=; b=Np29Fj/Il1ItZJYfnJmOx72DHYKy49fgS12u0TeM0uSnKi1cyW+QzqSvVzhFV8PTzz Eqj5J9QdPNDuzZU82QodC6V4S4ny9xMalll5kDoG7qYC6bbV0gnKPmM8EjJU69yP6SDe Cdj8aRWS96LqGaoXK/zC23tTwGygX+/jmqS08JR90uyxjmlatOtoTa0gNmJdhX/3SHrF VVHnnputf4G9iFGgGlXtqSDGY5NEbt5rbZ+RnFZRZkzgJ8eAaWFcTQvGthJDeKfX4MQJ 3IaZQkx9KETvTMo75/mZN7ykPTnHUTNwXCprRYLnDE7ZjSz1JiILzPErsdmdgN0FcBbx 4Vkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ry/r0q/InedQyIk6HiwDsG/B0qaou75vOh0QMlgI4fU=; b=OIPn4PEr6UycZoLDsdokwlZvNnBlBBq19VFfSYd9A9f5TO31d0wACkDf9GHi7iA8Lh ObxLclep/Y7K2nB+ZpYRsda/lSvmS62KWL3OtKGPK1zRkW/iwyn071hNqtkysTg0Azko 7tbPFg+Z1nNNO7B32H+pj8VT45Z++mBiej6WnjgqzzT5pyqdlEImuaxotUIOH3gv+Onk qz3bwBbzGuLXzlYRMM1e5smWcJtyz6rrFrdUEqHifllJWEOBwfGpHjKbW6Lr1j+Xj10d samlE7wQtsZodT1upFFvxs1kthvf2XjIldqF5i+JV3tU2MW/kJXY3G0ijPrkkQ0cveaO ohxw== X-Gm-Message-State: AFeK/H2J4XTHWRVO+SgXk4yG3+1Rdm7zvHrtJy1b75IIHP0hVrh4k3r51kwiNWGBuf1gUg== X-Received: by 10.99.106.138 with SMTP id f132mr4155406pgc.66.1490978588801; Fri, 31 Mar 2017 09:43:08 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:14 -0700 Message-Id: <20170331164247.5052-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 10/43] tcsh: Update to 6.20.00 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix segfaults on musl Signed-off-by: Khem Raj --- .../recipes-extended/tcsh/files/01_build.1.patch | 16 ------ .../recipes-extended/tcsh/files/01_build.2.patch | 13 ----- .../recipes-extended/tcsh/files/01_build.3.patch | 13 ----- .../tcsh/files/12_unknown_lscolors.patch | 24 --------- .../recipes-extended/tcsh/files/15_no-strip.patch | 14 ----- .../tcsh/files/disable-broken-test.patch | 14 ----- .../tcsh/files/disable-lexical.at-31.patch | 30 ----------- .../tcsh/files/disable-test-nice.patch | 23 --------- .../tcsh/files/disable-test-notty.patch | 30 ----------- .../tcsh/files/fix-gcc6-wait-union.patch | 11 ---- .../tcsh/files/tcsh-6.17.02-multibyte.patch | 18 ------- .../0001-Enable-system-malloc-on-all-linux.patch | 30 +++++++++++ .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 ++++++++++++++++++++++ meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | 55 -------------------- meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb | 44 ++++++++++++++++ 15 files changed, 134 insertions(+), 261 deletions(-) delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.1.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.2.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.3.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/15_no-strip.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch create mode 100644 meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch create mode 100644 meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch delete mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb create mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch deleted file mode 100644 index b9f41ade9..000000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Franz Pletz -Description: Original comment: Fix build -Not sure why we have this patch. Let's keep it for compatibility. ---- a/pathnames.h -+++ b/pathnames.h -@@ -92,6 +92,10 @@ - # define _PATH_TCSHELL "/local/bin/tcsh" /* use ram disk */ - #endif /* _MINIX && !_PATH_TCSHELL */ - -+#ifndef _PATH_TCSHELL -+# define _PATH_TCSHELL "/bin/tcsh" /* Debian */ -+#endif /* !_PATH_TCSHELL */ -+ - #if defined(__EMX__) && !defined(_PATH_DEVNULL) - # define _PATH_DEVNULL "nul" - #endif /* __EMX__ && !_PATH_DEVNULL */ diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch deleted file mode 100644 index ff2753154..000000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Franz Pletz -Description: Update manpage. ---- a/tcsh.man -+++ b/tcsh.man -@@ -578,7 +578,7 @@ Repeating \fIdabbrev-expand\fR without a - changes to the next previous word etc., skipping identical matches - much like \fIhistory-search-backward\fR does. - .TP 8 --.B delete-char \fR(not bound) -+.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR) - Deletes the character under the cursor. - See also \fIdelete-char-or-list-or-eof\fR. - .TP 8 diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch deleted file mode 100644 index d36c177af..000000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Franz Pletz -Description: Enable NODOT ---- a/config_f.h -+++ b/config_f.h -@@ -98,7 +98,7 @@ - /* - * NODOT Don't put "." in the default path, for security reasons - */ --#undef NODOT -+#define NODOT - - /* - * AUTOLOGOUT tries to determine if it should set autologout depending diff --git a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch deleted file mode 100644 index faa59cc80..000000000 --- a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Franz Pletz -Description: Don't die on unknown LS_COLORS values -Removing the patch causes a segfault when dircolors is set by coreutils' dircolors. -Debian-Bug: #592089 - ---- a/tw.color.c -+++ b/tw.color.c -@@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value) - if ((Char)variables[i].variable[0] == (v[0] & CHAR) && - (Char)variables[i].variable[1] == (v[1] & CHAR)) - break; -- if (i < nvariables) { -- v += 3; -+ v += 3; -+ if (i < nvariables) - getstring(&c, &v, &variables[i].color, ':'); -- continue; -- } -- else -- stderror(ERR_BADCOLORVAR, v[0], v[1]); -+ continue; - } - break; - } diff --git a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch deleted file mode 100644 index cbc9f65d0..000000000 --- a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lucas Nussbaum -Description: do not strip binary - Stripping should be handled by dh_strip instead, so DEB_BUILD_OPTIONS=nostrip works. - Closes: #438109, #411607 ---- a/Makefile.in -+++ b/Makefile.in -@@ -596,7 +596,6 @@ install: tcsh$(EXEEXT) - -mkdir -p ${DESTBIN} - -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old - cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) -- -strip ${DESTBIN}/tcsh$(EXEEXT) - chmod 755 ${DESTBIN}/tcsh$(EXEEXT) - - install.man: tcsh.man diff --git a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch deleted file mode 100644 index 0bda0ba10..000000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lucas Nussbaum -Description: disable syntactically incorrect test ---- a/tests/lexical.at -+++ b/tests/lexical.at -@@ -172,9 +172,6 @@ - AT_DATA([nohist.csh], - [echo ! space ! tab != "!(" newline ! - ]) --AT_CHECK([tcsh -f nohist.csh], , --[[! space ! tab != !( newline ! --]]) - - AT_CLEANUP - diff --git a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch deleted file mode 100644 index 98a9b2e1d..000000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/tests/lexical.at -+++ b/tests/lexical.at -@@ -27,27 +27,6 @@ AT_CHECK([tcsh -f oneword.csh], , - - AT_CLEANUP - -- --AT_SETUP([Comments]) -- --AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK --]) -- --AT_CHECK([tcsh -f -c 'echo @%:@no comment'], , --[@%:@no comment --]) -- --AT_DATA([comment2.csh], --[[echo testing...@%:@\ --OK --]]) --AT_CHECK([tcsh -f comment2.csh], , --[testing... OK --]) -- --AT_CLEANUP -- -- - AT_SETUP([Escaping special characters]) - - AT_DATA([nosplit.csh], diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch deleted file mode 100644 index 79f918c08..000000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Lucas Nussbaum -Description: disable test that fails on the buildd with - "setpriority: Permission denied". ---- a/tests/commands.at -+++ b/tests/commands.at -@@ -888,17 +888,6 @@ TCSH_UNTESTED([migrate]) - TCSH_UNTESTED([newgrp]) - - --AT_SETUP([nice]) -- --# Nothing really tested --AT_CHECK([tcsh -f -c 'nice set var=1; echo $?var'], , --[0 --]) -- -- --AT_CLEANUP -- -- - AT_SETUP([nohup]) - - AT_DATA([nohup.csh], diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch deleted file mode 100644 index 69f0564e8..000000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Lucas Nussbaum -Description: Those tests fail when running the testsuite without a tty. Disabling them. - ---- a/tests/commands.at -+++ b/tests/commands.at -@@ -1203,11 +1203,6 @@ AT_SETUP([source]) - AT_DATA([script.csh], - [[set var=$1 - ]]) --AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ -- | sed 's/ [^ ]* / TIME /']], , --[ 1 TIME source -h script.csh foo ; history -- 2 TIME set var=$1 --]) - - AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [], - [var: Undefined variable. ---- a/tests/variables.at -+++ b/tests/variables.at -@@ -319,10 +319,6 @@ AT_CLEANUP - - AT_SETUP([$ edit]) - --AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , --[1 --]) -- - AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], , - [0 - ]) diff --git a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch b/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch deleted file mode 100644 index acc2ce93d..000000000 --- a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tcsh-6.18.01/sh.proc.c.orig 2016-06-08 16:11:02.902326725 +0000 -+++ tcsh-6.18.01/sh.proc.c 2016-06-08 16:38:22.150304901 +0000 -@@ -48,7 +48,7 @@ - #endif /* aiws */ - - #if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) --# if !defined(__ANDROID__) -+# if !defined(__ANDROID__) && !defined(__GLIBC__) - # define BSDWAIT - # endif - #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch deleted file mode 100644 index 3dd420a0e..000000000 --- a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Jean-Luc Leger -Description: fix broken globbing expansion -Debian-Bug: #603545 -Index: tcsh-6.18.01/tc.str.c -=================================================================== ---- tcsh-6.18.01.orig/tc.str.c 2012-01-10 13:34:31.000000000 -0800 -+++ tcsh-6.18.01/tc.str.c 2013-02-26 13:12:13.429153489 -0800 -@@ -122,8 +122,9 @@ - #else - ret = mbtowc(&tmp, s, n); - #endif -- if (ret > 0) { -+ if (ret >= 0) - *pwc = tmp; -+ if (ret >= 0) { - #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC) - if (tmp >= 0xd800 && tmp <= 0xdbff) { - /* UTF-16 surrogate pair. Fetch second half and compute diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch new file mode 100644 index 000000000..ff2f6a3b6 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch @@ -0,0 +1,30 @@ +From 0553455813a1f717ef50cc911e4db73da3d23c32 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 18:47:40 -0700 +Subject: [PATCH 1/2] Enable system malloc on all linux + +Dont trigger on being just android or glibc +internal malloc falls flat on musl based systems +as well. So switch to using system malloc + +Signed-off-by: Khem Raj +--- + config_f.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config_f.h b/config_f.h +index 6a632a5..0a66960 100644 +--- a/config_f.h ++++ b/config_f.h +@@ -139,7 +139,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__linux__) || defined(__OpenBSD__) || defined(__APPLE__) + # define SYSMALLOC + #else + # undef SYSMALLOC +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch new file mode 100644 index 000000000..e4de6f7fe --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch @@ -0,0 +1,60 @@ +From 60271713025f6b17dda29721be012a8428e77185 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 18:56:49 -0700 +Subject: [PATCH 2/2] Add debian csh scripts + +Signed-off-by: Khem Raj +--- + csh.cshrc | 15 +++++++++++++++ + csh.login | 8 ++++++++ + csh.logout | 1 + + 3 files changed, 24 insertions(+) + create mode 100644 csh.cshrc + create mode 100644 csh.login + create mode 100644 csh.logout + +diff --git a/csh.cshrc b/csh.cshrc +new file mode 100644 +index 0000000..29c934a +--- /dev/null ++++ b/csh.cshrc +@@ -0,0 +1,15 @@ ++# /etc/csh.cshrc: system-wide .cshrc file for csh(1) and tcsh(1) ++ ++if ($?tcsh && $?prompt) then ++ ++ bindkey "\e[1~" beginning-of-line # Home ++ bindkey "\e[7~" beginning-of-line # Home rxvt ++ bindkey "\e[2~" overwrite-mode # Ins ++ bindkey "\e[3~" delete-char # Delete ++ bindkey "\e[4~" end-of-line # End ++ bindkey "\e[8~" end-of-line # End rxvt ++ ++ set autoexpand ++ set autolist ++ set prompt = "%U%m%u:%B%~%b%# " ++endif +diff --git a/csh.login b/csh.login +new file mode 100644 +index 0000000..2455c3c +--- /dev/null ++++ b/csh.login +@@ -0,0 +1,8 @@ ++# /etc/csh.login: system-wide .login file for csh(1) and tcsh(1) ++ ++# allow for other packages/system admins to customize the shell environment ++if (-e /etc/csh/login.d && `/bin/ls /etc/csh/login.d` != "") then ++ foreach FILE (`/bin/ls /etc/csh/login.d/*`) ++ source $FILE; ++ end; ++endif +diff --git a/csh.logout b/csh.logout +new file mode 100644 +index 0000000..a207eba +--- /dev/null ++++ b/csh.logout +@@ -0,0 +1 @@ ++# /etc/csh.logout: system-wide .logout file for csh(1) and tcsh(1) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb deleted file mode 100644 index 1cfd96c54..000000000 --- a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ - The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ - It includes all features of 4.4BSD C shell, plus a command-line editor, \ - programmable word completion, spelling correction and more." - -HOMEPAGE = "http://www.tcsh.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780" -SECTION = "base" -DEPENDS = "ncurses gettext-native" -SRC_URI = " \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs2 \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-5.diff.gz;name=diffs5 \ - file://01_build.1.patch \ - file://01_build.2.patch \ - file://01_build.3.patch \ - file://15_no-strip.patch \ - file://disable-test-notty.patch \ - file://disable-test-nice.patch \ - file://disable-lexical.at-31.patch \ - file://12_unknown_lscolors.patch \ - file://tcsh-6.17.02-multibyte.patch \ - file://disable-broken-test.patch \ - file://fix-gcc6-wait-union.patch \ -" -SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a" -SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8" -SRC_URI[diffs2.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9" -SRC_URI[diffs2.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c" -SRC_URI[diffs5.md5sum] = "d536c12a02dc48c332cc472b86927319" -SRC_URI[diffs5.sha256sum] = "7548d64bf996548bfbc13f3e0959fd2e8455f8375381a31da67d79554aabc7af" - -inherit autotools - -do_install_append () { - oe_runmake install.man DESTDIR=${D} - - install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - - install -d ${D}${sysconfdir}/csh/login.d - install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} - install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el -} - -FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" - - -pkg_postinst_${PN} () { -#!/bin/sh -e -echo /usr/bin/tcsh >> $D/etc/shells -} - -PNBLACKLIST[tcsh] ?= "Doesn't respect CC variable and fails with HOSTTOOLS http://errors.yoctoproject.org/Errors/Details/138244/" diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb new file mode 100644 index 000000000..b59d88f5d --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ + The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ + It includes all features of 4.4BSD C shell, plus a command-line editor, \ + programmable word completion, spelling correction and more." + +HOMEPAGE = "http://www.tcsh.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" +SECTION = "base" +DEPENDS = "ncurses gettext-native" +SRC_URI = " \ + http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \ + file://0001-Enable-system-malloc-on-all-linux.patch \ + file://0002-Add-debian-csh-scripts.patch \ +" +SRC_URI[md5sum] = "59d40ef40a68e790d95e182069431834" +SRC_URI[sha256sum] = "b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d" + +EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" +inherit autotools + +do_compile_prepend() { + oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost +} + +do_install_append () { + oe_runmake install.man DESTDIR=${D} + + install -d ${D}${base_bindir} + ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh + ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + install -d ${D}${sysconfdir}/csh/login.d + install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} + install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el +} + +FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" + + +pkg_postinst_${PN} () { +#!/bin/sh -e +echo /usr/bin/tcsh >> $D/etc/shells +echo /usr/bin/csh >> $D/etc/shells +} From patchwork Fri Mar 31 16:42:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96464 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811582qgd; Fri, 31 Mar 2017 09:44:53 -0700 (PDT) X-Received: by 10.107.15.78 with SMTP id x75mr3817865ioi.225.1490978693578; Fri, 31 Mar 2017 09:44:53 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z62si3177541itd.44.2017.03.31.09.44.53; Fri, 31 Mar 2017 09:44:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 61B7D77EA3; Fri, 31 Mar 2017 16:43:42 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id EAC3177E33 for ; Fri, 31 Mar 2017 16:43:08 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id o123so18540814pga.1 for ; Fri, 31 Mar 2017 09:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2WKoRmH6IcvjAhgf9wFxKnF1OHW2/EjOY7Z2ODWriXc=; b=pkAVCfEVYGg+sX/gUKnTORZUnDBxedlYyqTj0+tOJny4SLWMdPSMvOzPfmbrmtOJ9D 9T6/BLsA4knk6vl2OMezM+PDnz5iL6yfzmD4vCimXUkoch+BWHa3nT9K2BuLXzPAYW6J SLAmBZV9PBmNX3Z6S5NL872r3UtKJ+bR8Ql0NNLjdfuKp+M16IbRqKnGtDsMM3UnZtei mnMSMXoWauB8MxPcbzCcHAJCQVnfFdO4Ul41Watlm1BlR2nB1a8ghcBHs8vfB/Yx61HM 87fV9qANt6UBjUI+4ORBgd3AaSvX1rRH2tZGphyqnD/sWXdpC70MVxbsmJVMq1MaaUvc Cd+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2WKoRmH6IcvjAhgf9wFxKnF1OHW2/EjOY7Z2ODWriXc=; b=V3GPQ14g1pf9fcnbx02XaM+2nF2Pfh8atRHAx0lKI8N+lC7KqwGUpEUEUuMCQyI1g9 E+JJIyuTWxiEB+OXJmsw/b1ILsHR9dXjQd49lSfajfuyaslwNL5yilDLnGR+Y4AQBEzC MQ7SyFcBNcSMHf1Ao7nn+NLTJuN9TeYsw4Tt/C70hcB5BRdxOsXUvl+oHGuKf9UVusez TrjEWCSNlsqAJzLHx3qufDvUbjby4oeuJz8n3a+RaTSgXFc5KrLSl17e7mdQbI+jck+r Ubr80FoOAG37lN5gFomSBCgF45UnlcjK2RP+IC2PkucuXzLtqqKXsB9d/N8EmTEO9VzD sCCQ== X-Gm-Message-State: AFeK/H1pq3hqv2hZjK9c0S4dFk/tuRlv7TCyub723QAKwADcCiaHoDfAnGYGOwax0/0LzA== X-Received: by 10.99.137.66 with SMTP id v63mr4169339pgd.183.1490978590296; Fri, 31 Mar 2017 09:43:10 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:09 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:15 -0700 Message-Id: <20170331164247.5052-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 11/43] libnfnetlink: Backport patches to fix musl build X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org There are few upstream patches that are required for getting it working with musl, backport these patches on top of 1.0.1 Signed-off-by: Khem Raj --- ...0001-build-resolve-automake-1.12-warnings.patch | 28 ++ ...rce-code-license-header-in-sync-with-curr.patch | 49 +++ .../0003-configure-uclinux-is-also-linux.patch | 27 ++ ...k-initialize-attribute-padding-to-resolve.patch | 39 ++ .../0005-include-Sync-with-kernel-headers.patch | 110 ++++++ .../0006-src-Use-stdint-types-everywhere.patch | 403 +++++++++++++++++++++ .../libnfnetlink/libnfnetlink_1.0.1.bb | 9 +- 7 files changed, 664 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch new file mode 100644 index 000000000..00d95cd79 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch @@ -0,0 +1,28 @@ +From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 9 Oct 2012 15:59:48 +0200 +Subject: [PATCH 1/6] build: resolve automake-1.12 warnings + +am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries +using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-off-by: Jan Engelhardt +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ed549df..0926a1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([-Wall foreign subdir-objects + tar-pax no-dist-gzip dist-bzip2 1.6]) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + dnl kernel style compile messages + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch new file mode 100644 index 000000000..c2fb5e05a --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch @@ -0,0 +1,49 @@ +From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Wed, 7 Aug 2013 20:53:57 +0200 +Subject: [PATCH 2/6] src: get source code license header in sync with current + licensing terms + +Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, +propagate that changes to src/iftable.c and src/rtnl.c + +Reported-by: Thomas Woerner +Signed-off-by: Pablo Neira Ayuso +--- + src/iftable.c | 2 +- + src/rtnl.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iftable.c b/src/iftable.c +index 0325335..5976ed8 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -3,7 +3,7 @@ + * (C) 2004 by Astaro AG, written by Harald Welte + * (C) 2008 by Pablo Neira Ayuso + * +- * This software is Free Software and licensed under GNU GPLv2. ++ * This software is Free Software and licensed under GNU GPLv2+. + */ + + /* IFINDEX handling */ +diff --git a/src/rtnl.c b/src/rtnl.c +index 5ccb272..7b4ac7d 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -1,10 +1,10 @@ + /* rtnl - rtnetlink utility functions + * + * (C) 2004 by Astaro AG, written by Harald Welte +- * ++ * + * Adapted to nfnetlink by Eric Leblond + * +- * This software is free software and licensed under GNU GPLv2. ++ * This software is free software and licensed under GNU GPLv2+. + * + */ + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch new file mode 100644 index 000000000..6cb7ed6fa --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch @@ -0,0 +1,27 @@ +From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Tue, 10 Sep 2013 16:23:29 -0300 +Subject: [PATCH 3/6] configure: uclinux is also linux + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Pablo Neira Ayuso +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0926a1c..b979772 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DISABLE_STATIC + AM_PROG_LIBTOOL + + case "$host" in +-*-*-linux*) ;; ++*-*-linux* | *-*-uclinux*) ;; + *) AC_MSG_ERROR([Linux only, dude!]);; + esac + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch new file mode 100644 index 000000000..cf3a84135 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch @@ -0,0 +1,39 @@ +From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Mon, 3 Feb 2014 12:09:29 +0100 +Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve + valgrind warnings + +==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) +==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) +==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) +==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) +==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) +==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) +==12195== by 0x400CB1: main (nfulnl_test.c:77) +==12195== Address 0x7fefff3e9 is on thread 1's stack + +This patch sets to zero the padding that is included to align the +attribute payload. + +Reported-by: Ivan Homoliak +Signed-off-by: Pablo Neira Ayuso +--- + src/libnfnetlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 4b2bcd0..398b7d7 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + nfa->nfa_type = type; + nfa->nfa_len = len; + memcpy(NFA_DATA(nfa), data, alen); ++ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); + n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); + return 0; + } +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch new file mode 100644 index 000000000..383f0e8b3 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch @@ -0,0 +1,110 @@ +From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:49:07 +0200 +Subject: [PATCH 5/6] include: Sync with kernel headers + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- + include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- + 2 files changed, 12 insertions(+), 44 deletions(-) + +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..44a38d6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -25,9 +25,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ __u8 nfgen_family; /* AF_xxx */ ++ __u8 version; /* nfnetlink version */ ++ __be16 res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -46,40 +46,8 @@ struct nfgenmsg { + #define NFNL_SUBSYS_CTNETLINK_EXP 2 + #define NFNL_SUBSYS_QUEUE 3 + #define NFNL_SUBSYS_ULOG 4 +-#define NFNL_SUBSYS_COUNT 5 ++#define NFNL_SUBSYS_OSF 5 ++#define NFNL_SUBSYS_IPSET 6 ++#define NFNL_SUBSYS_COUNT 7 + +-#ifdef __KERNEL__ +- +-#include +-#include +-#include +- +-struct nfnl_callback +-{ +- int (*call)(struct sock *nl, struct sk_buff *skb, +- struct nlmsghdr *nlh, struct nlattr *cda[]); +- const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ +-}; +- +-struct nfnetlink_subsystem +-{ +- const char *name; +- __u8 subsys_id; /* nfnetlink subsystem ID */ +- __u8 cb_count; /* number of callbacks */ +- const struct nfnl_callback *cb; /* callback for individual types */ +-}; +- +-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); +-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); +- +-extern int nfnetlink_has_listeners(unsigned int group); +-extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, +- int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); +- +-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ +- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +- +-#endif /* __KERNEL__ */ + #endif /* _NFNETLINK_H */ +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..74b9e55 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -1,6 +1,8 @@ + #ifndef _NFNETLINK_COMPAT_H + #define _NFNETLINK_COMPAT_H +-#ifndef __KERNEL__ ++ ++#include ++ + /* Old nfnetlink macros for userspace */ + + /* nfnetlink groups: Up to 32 maximum */ +@@ -18,10 +20,9 @@ + * ! nfnetlink use the same attributes methods. - J. Schulist. + */ + +-struct nfattr +-{ +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++struct nfattr { ++ __u16 nfa_len; ++ __u16 nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +@@ -57,5 +58,4 @@ struct nfattr + + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) + #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) + +-#endif /* ! __KERNEL__ */ + #endif /* _NFNETLINK_COMPAT_H */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch new file mode 100644 index 000000000..72c9987d1 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch @@ -0,0 +1,403 @@ +From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:59:57 +0200 +Subject: [PATCH 6/6] src: Use stdint types everywhere + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/libnfnetlink.h | 25 ++++++------- + src/iftable.c | 8 ++--- + src/iftable.h | 4 +-- + src/libnfnetlink.c | 72 ++++++++++++++++++------------------- + src/rtnl.c | 4 +-- + src/rtnl.h | 2 +- + 6 files changed, 58 insertions(+), 57 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include + #include /* for sa_family_t */ + #include + #include +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..157f97b 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -27,10 +27,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..655df6b 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,8 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..df57533 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -72,9 +72,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +86,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + } + + /** +- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr ++ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..284eecd 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -30,7 +30,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..2cb22a8 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -7,7 +7,7 @@ + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb index edd0f866f..f7951ff8d 100644 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb @@ -11,7 +11,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar" +SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ + file://0001-build-resolve-automake-1.12-warnings.patch \ + file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ + file://0003-configure-uclinux-is-also-linux.patch \ + file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ + file://0005-include-Sync-with-kernel-headers.patch \ + file://0006-src-Use-stdint-types-everywhere.patch \ + " SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" From patchwork Fri Mar 31 16:42:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96465 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811661qgd; Fri, 31 Mar 2017 09:45:04 -0700 (PDT) X-Received: by 10.36.118.84 with SMTP id z81mr4493022itb.99.1490978704616; Fri, 31 Mar 2017 09:45:04 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c102si6894115iod.53.2017.03.31.09.45.04; Fri, 31 Mar 2017 09:45:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B33F377E8A; Fri, 31 Mar 2017 16:43:43 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 18A5777E33 for ; Fri, 31 Mar 2017 16:43:11 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 81so18580515pgh.3 for ; Fri, 31 Mar 2017 09:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OalqgXJ3BZMXtYARWzxm5FJ9w6G6EO9jMTZYzjXUNbc=; b=Xnvj0hnam8KMUa1zr8SSgu8UfSRHfuCkL52vtIuSjkmXLXkRNWU/75oAgL/VW1w7jx P0FRilxVvqZLfslS0SNwz8USCKMV3yS/hvjeuFhq97oXGSDpdTRMFPaVATbkqmXbkJa7 9EaaNPLg00ilKHHUnHj1J3z0GGqXi+Xzblosk9joZqbKTgby9j+mbyyRsFSVEBSunbsk FN86eatQ3R8vxHfOxai9vD3t9olw659uN4qulAYT07H37QOJO6isJ3QMlqnTVfmbDAWM kPff2y1lYOF/81rTYFpPMNvP06qq8v5rYVzupOizlmCQD28qfUkB+8V3Ro4Eyakoyjll YVqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OalqgXJ3BZMXtYARWzxm5FJ9w6G6EO9jMTZYzjXUNbc=; b=AsWpnDrJDbAfbFCghw7cSLuS/onBxhEglt4Qf8mPp0N0ID56PSL3ntH/kHRuUIvwX+ JLnLBnHZb32PPu6dBBN8PCDQwKBIQnH27sF2QuVUSaZ9j+PxHPGmAGkYeY7s1JnbswSF OTfU2AZAw+aN4qK6FdLfGFo62uYDn6iGjtFYm+J5IXsYtdcZxK/V9LmwGEaXyG71uML8 jcIuWdN3Hs/bvgoe9Ce3dTkzv0nsDYFIFZPmBtkPC3Irjo7JutNtNBiRZW8EI6qifld0 XbNr/WENLXeIAhWwDhDW0ehHhwxZQEbj0gE1ZzNzVhtXTcfHSlfUogekbg6dQXan0OG/ HqZA== X-Gm-Message-State: AFeK/H2ZXvLq7MSvGjr8YG7Sai/TGzcRWrxD40f0TgXp1t8EERF5UI9fByi8Nxd/bwnM0Q== X-Received: by 10.84.191.165 with SMTP id a34mr4599307pld.62.1490978592274; Fri, 31 Mar 2017 09:43:12 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:10 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:16 -0700 Message-Id: <20170331164247.5052-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 12/43] ebtables: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Backport upstream fixes and add fixes to make it work with musl Signed-off-by: Khem Raj --- .../0001-add-RARP-and-update-iana-url.patch | 45 +++++ .../0002-fix-compilation-warning.patch | 25 +++ .../0003-add-info-about-Wl-no-as-needed.patch | 25 +++ ...for-kernel-regression-bug-IPv6-source-des.patch | 28 +++ ...-command-line-support-for-ebtables-restor.patch | 75 +++++++ ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 +++++++ .../0007-extensions-Use-stdint-types.patch | 67 +++++++ ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 +++++ ...low-RETURN-target-rules-in-user-defined-c.patch | 48 +++++ .../0010-Adjust-header-include-sequence.patch | 216 +++++++++++++++++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 12 +- 11 files changed, 657 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch new file mode 100644 index 000000000..90b69792b --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch @@ -0,0 +1,45 @@ +From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Tue, 3 Jul 2012 18:47:32 +0000 +Subject: [PATCH 01/10] add RARP and update iana url + +--- + ethertypes | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/ethertypes b/ethertypes +index 5e700f6..813177b 100644 +--- a/ethertypes ++++ b/ethertypes +@@ -5,6 +5,7 @@ + # + # This list could be found on: + # http://www.iana.org/assignments/ethernet-numbers ++# http://www.iana.org/assignments/ieee-802-numbers + # + # ... #Comment + # +@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT + DIAG 6005 # DEC Diagnostics + CUST 6006 # DEC Customer use + SCA 6007 # DEC Systems Comms Arch +-TEB 6558 # Trans Ether Bridging [RFC1701] +-RAW_FR 6559 # Raw Frame Relay [RFC1701] ++TEB 6558 # Trans Ether Bridging [RFC1701] ++RAW_FR 6559 # Raw Frame Relay [RFC1701] ++RARP 8035 # Reverse ARP [RFC903] + AARP 80F3 # Appletalk AARP +-ATALK 809B # Appletalk ++ATALK 809B # Appletalk + 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame + IPX 8137 # Novell IPX + NetBEUI 8191 # NetBEUI + IPv6 86DD ip6 # IP version 6 +-PPP 880B # PPP ++PPP 880B # PPP + ATMMPOA 884C # MultiProtocol over ATM + PPP_DISC 8863 # PPPoE discovery messages + PPP_SES 8864 # PPPoE session messages +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch new file mode 100644 index 000000000..87b0e9b87 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch @@ -0,0 +1,25 @@ +From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 +From: Petri Gynther +Date: Sun, 24 Feb 2013 10:56:59 +0100 +Subject: [PATCH 02/10] fix compilation warning + +--- + communication.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/communication.c b/communication.c +index 62ed667..ba058c0 100644 +--- a/communication.c ++++ b/communication.c +@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) + } + close_file: + fclose(file); +- return 0; ++ return ret; + } + + /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch new file mode 100644 index 000000000..c8573a464 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch @@ -0,0 +1,25 @@ +From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Wed, 3 Jul 2013 22:12:47 +0200 +Subject: [PATCH 03/10] add info about -Wl,-no-as-needed + +--- + INSTALL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 4a05c67..e90d5c1 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -39,6 +39,8 @@ That's all + You can also use a base directory different from the root directory (/), + using the DESTDIR option. See the Makefile for more details. + ++You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly ++on your system. + + ADDITIONAL PROGRAMS: + ---------------------- +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch new file mode 100644 index 000000000..d8f2795bc --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch @@ -0,0 +1,28 @@ +From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 +From: Luis Fernando +Date: Wed, 3 Jul 2013 22:19:55 +0200 +Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 + source/destination addresses are potentially not matched correctly + +--- + extensions/ebt_ip6.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index 0465e77..bbdc4ae 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) + + ipinfo->invflags = 0; + ipinfo->bitmask = 0; ++ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); ++ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); ++ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); ++ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); + } + + #define OPT_SOURCE 0x01 +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch new file mode 100644 index 000000000..9585fd20e --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch @@ -0,0 +1,75 @@ +From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 +From: Sanket Shah +Date: Wed, 31 Jul 2013 21:40:08 +0200 +Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore + +--- + ebtables-restore.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/ebtables-restore.c b/ebtables-restore.c +index ea02960..bb4d0cf 100644 +--- a/ebtables-restore.c ++++ b/ebtables-restore.c +@@ -22,13 +22,25 @@ + #include + #include + #include ++#include + #include "include/ebtables_u.h" + ++static const struct option options[] = { ++ {.name = "noflush", .has_arg = 0, .val = 'n'}, ++ { 0 } ++}; ++ + static struct ebt_u_replace replace[3]; + void ebt_early_init_once(); + + #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ + ++static void print_usage() ++{ ++ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); ++ exit(1); ++} ++ + static void copy_table_names() + { + strcpy(replace[0].name, "filter"); +@@ -41,11 +53,20 @@ static void copy_table_names() + int main(int argc_, char *argv_[]) + { + char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; +- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; ++ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; + char ebtables_str[] = "ebtables"; + +- if (argc_ != 1) +- ebtrest_print_error("options are not supported"); ++ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { ++ switch(c) { ++ case 'n': ++ flush = 0; ++ break; ++ default: ++ print_usage(); ++ break; ++ } ++ } ++ + ebt_silent = 0; + copy_table_names(); + ebt_early_init_once(); +@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) + ebtrest_print_error("table '%s' was not recognized", cmdline+1); + table_nr = i; + replace[table_nr].command = 11; +- ebt_get_kernel_table(&replace[table_nr], 1); ++ ebt_get_kernel_table(&replace[table_nr], flush); + replace[table_nr].command = 0; + replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ + continue; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch new file mode 100644 index 000000000..21f8e588d --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch @@ -0,0 +1,69 @@ +From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Mon, 14 Apr 2014 22:04:55 +0200 +Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch + by Mariusz Mazur ) + +--- + extensions/ebt_ip6.c | 4 ++-- + include/ebtables_u.h | 1 + + useful_functions.c | 13 +++++++++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index bbdc4ae..e3e0956 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, + if (ipinfo->invflags & EBT_IP6_SOURCE) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); + } + if (ipinfo->bitmask & EBT_IP6_DEST) { + printf("--ip6-dst "); + if (ipinfo->invflags & EBT_IP6_DEST) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); + } + if (ipinfo->bitmask & EBT_IP6_TCLASS) { + printf("--ip6-tclass "); +diff --git a/include/ebtables_u.h b/include/ebtables_u.h +index ab615c1..35a5bcc 100644 +--- a/include/ebtables_u.h ++++ b/include/ebtables_u.h +@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); + void ebt_parse_ip6_address(char *address, struct in6_addr *addr, + struct in6_addr *msk); + char *ebt_ip6_to_numeric(const struct in6_addr *addrp); ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk); + + + int do_command(int argc, char *argv[], int exec_style, +diff --git a/useful_functions.c b/useful_functions.c +index d20b68e..d14cbe9 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) + static char buf[50+1]; + return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); + } ++ ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk) ++{ ++ /* /0000:0000:0000:0000:0000:000.000.000.000 ++ * /0000:0000:0000:0000:0000:0000:0000:0000 */ ++ static char buf[51+1]; ++ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && ++ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) ++ *buf = '\0'; ++ else ++ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); ++ return buf; ++} +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch new file mode 100644 index 000000000..6fbe7df4c --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch @@ -0,0 +1,67 @@ +From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:22:39 +0200 +Subject: [PATCH 07/10] extensions: Use stdint types + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + extensions/ebt_ip6.c | 4 ++-- + extensions/ebt_limit.c | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index e3e0956..dd48547 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -53,8 +53,8 @@ static const struct option opts[] = + + struct icmpv6_names { + const char *name; +- u_int8_t type; +- u_int8_t code_min, code_max; ++ uint8_t type; ++ uint8_t code_min, code_max; + }; + + static const struct icmpv6_names icmpv6_codes[] = { +diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c +index ee40e5c..d189a09 100644 +--- a/extensions/ebt_limit.c ++++ b/extensions/ebt_limit.c +@@ -59,11 +59,11 @@ static void print_help(void) + " default %u\n", EBT_LIMIT_BURST); + } + +-static int parse_rate(const char *rate, u_int32_t *val) ++static int parse_rate(const char *rate, uint32_t *val) + { + const char *delim; +- u_int32_t r; +- u_int32_t mult = 1; /* Seconds by default. */ ++ uint32_t r; ++ uint32_t mult = 1; /* Seconds by default. */ + + delim = strchr(rate, '/'); + if (delim) { +@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, + struct rates + { + const char *name; +- u_int32_t mult; ++ uint32_t mult; + }; + + static struct rates g_rates[] = +@@ -162,7 +162,7 @@ static struct rates g_rates[] = + { "sec", EBT_LIMIT_SCALE } + }; + +-static void print_rate(u_int32_t period) ++static void print_rate(uint32_t period) + { + unsigned int i; + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch new file mode 100644 index 000000000..df3f52143 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch @@ -0,0 +1,48 @@ +From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:31:58 +0200 +Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro + _THROW + +Fixes compilation with musl libc + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/ethernetdb.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/ethernetdb.h b/include/ethernetdb.h +index 46d8bfd..1683abe 100644 +--- a/include/ethernetdb.h ++++ b/include/ethernetdb.h +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch new file mode 100644 index 000000000..248582c18 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch @@ -0,0 +1,48 @@ +From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alin=20N=C4=83stac?= +Date: Thu, 22 Oct 2015 16:41:03 +0200 +Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined + chains + +During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if +they're called from a base chain rather than a user defined chain. + +This can be used by ebtables targets that can encode a special return +value to bail out if e.g. RETURN is used from a base chain. + +Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also +copied to called user-defined-chains (i.e., a user defined chain can no +longer be distinguished from a base chain): + +root@OpenWrt:~# ebtables -N foo +root@OpenWrt:~# ebtables -A OUTPUT -j foo +root@OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN +--mark-target RETURN not allowed on base chain. + +This works if -A OUTPUT -j foo is omitted, but will still appear +if we try to call foo from OUTPUT afterwards. + +After this patch we still reject +'-A OUTPUT -j mark .. --mark-target RETURN'. + +Signed-off-by: Florian Westphal +--- + libebtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libebtc.c b/libebtc.c +index 17ba8f2..74830ec 100644 +--- a/libebtc.c ++++ b/libebtc.c +@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) + /* check if we've dealt with this chain already */ + if (entries2->hook_mask & (1<hook_mask |= entries->hook_mask; ++ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); + /* Jump to the chain, make sure we know how to get back */ + stack[sp].chain_nr = chain_nr; + stack[sp].n = j; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch new file mode 100644 index 000000000..a6ef9cd09 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,216 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj +--- + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + include/linux/if_ether.h | 126 ---------------------------------------------- + useful_functions.c | 4 +- + 5 files changed, 5 insertions(+), 131 deletions(-) + delete mode 100644 include/linux/if_ether.h + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index f97d07e..b096847 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index c3757f3..c5102a4 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index e6afbf8..8d318d1 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h +deleted file mode 100644 +index 28a15ff..0000000 +--- a/include/linux/if_ether.h ++++ /dev/null +@@ -1,126 +0,0 @@ +-/* +- * INET An implementation of the TCP/IP protocol suite for the LINUX +- * operating system. INET is implemented using the BSD Socket +- * interface as the means of communication with the user level. +- * +- * Global definitions for the Ethernet IEEE 802.3 interface. +- * +- * Version: @(#)if_ether.h 1.0.1a 02/08/94 +- * +- * Author: Fred N. van Kempen, +- * Donald Becker, +- * Alan Cox, +- * Steve Whitehouse, +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. +- */ +- +-#ifndef _LINUX_IF_ETHER_H +-#define _LINUX_IF_ETHER_H +- +-#include +- +-/* +- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +- * and FCS/CRC (frame check sequence). +- */ +- +-#define ETH_ALEN 6 /* Octets in one ethernet addr */ +-#define ETH_HLEN 14 /* Total octets in header. */ +-#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ +-#define ETH_DATA_LEN 1500 /* Max. octets in payload */ +-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +-#define ETH_FCS_LEN 4 /* Octets in the FCS */ +- +-/* +- * These are the defined Ethernet Protocol ID's. +- */ +- +-#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ +-#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ +-#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ +-#define ETH_P_IP 0x0800 /* Internet Protocol packet */ +-#define ETH_P_X25 0x0805 /* CCITT X.25 */ +-#define ETH_P_ARP 0x0806 /* Address Resolution packet */ +-#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ +-#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ +-#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ +-#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ +-#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ +-#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ +-#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ +-#define ETH_P_LAT 0x6004 /* DEC LAT */ +-#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ +-#define ETH_P_CUST 0x6006 /* DEC Customer use */ +-#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ +-#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ +-#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ +-#define ETH_P_ATALK 0x809B /* Appletalk DDP */ +-#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ +-#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ +-#define ETH_P_IPX 0x8137 /* IPX over DIX */ +-#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ +-#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ +-#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ +-#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol +- * defined in draft-wilson-wrec-wccp-v2-00.txt */ +-#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ +-#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ +-#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ +-#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ +-#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ +-#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ +-#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport +- * over Ethernet +- */ +-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ +-#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +-#define ETH_P_TIPC 0x88CA /* TIPC */ +-#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ +-#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +-#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ +-#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ +- +-/* +- * Non DIX types. Won't clash for 1500 types. +- */ +- +-#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ +-#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ +-#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ +-#define ETH_P_802_2 0x0004 /* 802.2 frames */ +-#define ETH_P_SNAP 0x0005 /* Internal only */ +-#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ +-#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ +-#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ +-#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ +-#define ETH_P_CAN 0x000C /* Controller Area Network */ +-#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ +-#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ +-#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ +-#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ +-#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ +-#define ETH_P_ECONET 0x0018 /* Acorn Econet */ +-#define ETH_P_HDLC 0x0019 /* HDLC frames */ +-#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ +-#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ +-#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ +-#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +-#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ +-#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ +- +-/* +- * This is an Ethernet frame header. +- */ +- +-struct ethhdr { +- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ +- unsigned char h_source[ETH_ALEN]; /* source ether addr */ +- __be16 h_proto; /* packet type ID field */ +-} __attribute__((packed)); +- +- +-#endif /* _LINUX_IF_ETHER_H */ +diff --git a/useful_functions.c b/useful_functions.c +index d14cbe9..c304f4d 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include + #include + #include +@@ -33,6 +31,8 @@ + #include + #include + #include ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; + const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index f5e28714e..375423d5d 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -18,7 +18,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://ebtables.common \ file://ebtables.service \ file://no-as-needed.patch \ -" + file://0001-add-RARP-and-update-iana-url.patch \ + file://0002-fix-compilation-warning.patch \ + file://0003-add-info-about-Wl-no-as-needed.patch \ + file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ + file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ + file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ + file://0007-extensions-Use-stdint-types.patch \ + file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ + file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ + file://0010-Adjust-header-include-sequence.patch \ + " SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" From patchwork Fri Mar 31 16:42:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96466 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811745qgd; Fri, 31 Mar 2017 09:45:15 -0700 (PDT) X-Received: by 10.36.238.74 with SMTP id b71mr5162524iti.86.1490978715197; Fri, 31 Mar 2017 09:45:15 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o4si3155368iti.126.2017.03.31.09.45.14; Fri, 31 Mar 2017 09:45:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2291777EB2; Fri, 31 Mar 2017 16:43:45 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id ECBA277E33 for ; Fri, 31 Mar 2017 16:43:11 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id g2so18477549pge.2 for ; Fri, 31 Mar 2017 09:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Elssv4KcqHWbUKsdu40jU1biY+fJ/zifWKU2WrSK6uQ=; b=gHUEfUMFPPoNxHdKwE44qVIouEeH3aR1Aj1g93tWtUgnobZO2HDHVGkk0xgihtjPdz ezZ9/9UHutrzUKMtihKO9PecIKtBS6nRLZxL0XX/c6h88n+MlQkkNOqTNV2Tdbn2Fgg2 MWu87iGEX/S/vvKDRSPeQNX8PsZbHt7mjHBD+sTklDDLfWvlNNe1L1WkM73yRdPAryzD vm0P7zvOZB+KRLUJROOc6X3Gx277hDu7vSVh+uNE4s7EXxEU/J3bvrK5VHJ+3wjLi9T3 LNeQaeYDfKrzFa6vjKQ+wrSafM0fBekOjAchQLxhrwetDWC+PlyCqh0I1P2hOrIdhMMR 4WXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Elssv4KcqHWbUKsdu40jU1biY+fJ/zifWKU2WrSK6uQ=; b=smUd25E8kqkki1DUCUtSWNwjs8y14ETHymFA0JVihZ8exLU+Wx8qQIsHEjnGUP8E85 f9vjrh5aj3NYVME4O4b90uO+Adqm+fb1AqUoPrYVE8r6tfliuMKP/LRL27DwSLfMFeE3 3g2lNDMFZJpILq+Wgfp3sLvPoHkQ9y8hCDg4kMmLnoRWS2aIqGATsS0sa+CXdhbd1EJY c00YXy0CRoJ747nixrb/cm/3t+28ztVc1T9IdUk+KJZLg8ZCVEfKBSKdUPuzsQHYCLqn FXicIJmraVG5/EpjEBNVT2ZrlF06EGxBQ5SZkZzfTlaSu5MeTyQoXBWuJleDrLDTBi2P B0zA== X-Gm-Message-State: AFeK/H0kw65FqRY0HuZgQ4209x6OpW+Fzsaniw4H9rUrR2awmGGLHcTY/kulXdhi3J+2sA== X-Received: by 10.99.170.70 with SMTP id x6mr4272794pgo.111.1490978593638; Fri, 31 Mar 2017 09:43:13 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:17 -0700 Message-Id: <20170331164247.5052-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fixes build with musl Signed-off-by: Khem Raj --- meta-oe/recipes-support/poco/{poco_1.7.7.bb => poco_1.7.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/poco/{poco_1.7.7.bb => poco_1.7.8.bb} (97%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/poco/poco_1.7.7.bb b/meta-oe/recipes-support/poco/poco_1.7.8.bb similarity index 97% rename from meta-oe/recipes-support/poco/poco_1.7.7.bb rename to meta-oe/recipes-support/poco/poco_1.7.8.bb index e2d3be885..0fd6a8b1c 100644 --- a/meta-oe/recipes-support/poco/poco_1.7.7.bb +++ b/meta-oe/recipes-support/poco/poco_1.7.8.bb @@ -12,9 +12,9 @@ inherit cmake ptest BBCLASSEXTEND = "native" -SRCREV = "e98adba2c298b4179e77237873d3fbc53876c528" +SRCREV = "aae9c2e0f64caf019d31ba8f97635d5656b25ba5" SRC_URI = " \ - git://github.com/pocoproject/poco.git \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ file://run-ptest \ " From patchwork Fri Mar 31 16:42:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96467 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811794qgd; Fri, 31 Mar 2017 09:45:23 -0700 (PDT) X-Received: by 10.36.107.214 with SMTP id v205mr5027113itc.65.1490978723830; Fri, 31 Mar 2017 09:45:23 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d70si3157883itc.105.2017.03.31.09.45.23; Fri, 31 Mar 2017 09:45:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3F4F877EB3; Fri, 31 Mar 2017 16:43:46 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 717D477E48 for ; Fri, 31 Mar 2017 16:43:13 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 79so18584953pgf.0 for ; Fri, 31 Mar 2017 09:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yG6cVQRwpfq++CQraMLLQiPEUIGDmoLdVY4F4gUzmSM=; b=PCJ9vGF4Eo5ISY8OGrK+w5upj8d3he3C+trS0kSyKoqA3VPDwGuYLq3Ioe+bJTDKlC HtWWvLMHPTz2MVZgRV7R5nay/xX1940j99v5+7Wtj63CbyXKAuwzRFJ8G9DdKXFOTps+ UULxRlpY954W/fMokyRJ2bJOffN3gh8aHZd30NKcNmuyVZvb3nSPydrwWX/fCV6rUGPf LwPqjT1RySGAsT0oy+dUFUTYlMCPY2H96GYuVwpTVbpJzCpw1qT8+CLTl5X3g8Phi6lx lDUdiXpg3xp7p2f2R8jhK7MyPZfkjERaRax6yCxuqImafPAEkaHezL6jaAiooBmhLAk6 4fCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yG6cVQRwpfq++CQraMLLQiPEUIGDmoLdVY4F4gUzmSM=; b=etqadzK3Y0e7EDjs0fHi07YE7bTrv5m/3NVUrWKaPomPHs/RhqjX0HdzAUYOBie4/O gJQIU3aHr/YAppo/MuRdT1ByRkuZebHl0kvatUszYk3Upf8BC8g7PdaEy4CATOlrtjtq vywW9Ex/dKLuqTBgGY1JH1kar2nvrT88MzGC6T5+VDO+lfS+9blDMHCDABdiSlozFjjV GKkdQPu2kgsd3VWC0jdxOkuLWEUNbU1M8uWRjzCOwpJJah/wLMRsOIwm1+/Mo4rewEUY A3ACtUVSH9b9Mpy8YJpl2IywoblXNqowBJjPijozcUZDH4sawjjvEwytZNC0uTdGz6Mp KQ+Q== X-Gm-Message-State: AFeK/H05+gopUn+c/wQ4pxdI+xJdOs9acsoGhrlRhhYtzfQp0DAsF10ECxQh/iglE+Ok+A== X-Received: by 10.99.67.3 with SMTP id q3mr4282516pga.221.1490978595081; Fri, 31 Mar 2017 09:43:15 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:18 -0700 Message-Id: <20170331164247.5052-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 14/43] mariadb: Do not use ucontext_* APIs with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org musl has ucontext.h header but does not implement the APIs Signed-off-by: Khem Raj --- meta-oe/recipes-support/mysql/mariadb.inc | 1 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 0a0caa3f0..401907251 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ + file://0001-disable-ucontext-on-musl.patch \ " SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch new file mode 100644 index 000000000..60e9199f9 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch @@ -0,0 +1,28 @@ +From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 14:30:33 -0700 +Subject: [PATCH] disable ucontext on musl + +musl does not have *contex() APIs even though it has ucontext.h header + +Signed-off-by: Khem Raj +--- + include/my_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/my_context.h b/include/my_context.h +index dd44103..9b28c17 100644 +--- a/include/my_context.h ++++ b/include/my_context.h +@@ -31,7 +31,7 @@ + #define MY_CONTEXT_USE_X86_64_GCC_ASM + #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) + #define MY_CONTEXT_USE_I386_GCC_ASM +-#elif defined(HAVE_UCONTEXT_H) ++#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) + #define MY_CONTEXT_USE_UCONTEXT + #else + #define MY_CONTEXT_DISABLE +-- +2.12.1 + From patchwork Fri Mar 31 16:42:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96468 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811834qgd; Fri, 31 Mar 2017 09:45:31 -0700 (PDT) X-Received: by 10.107.132.155 with SMTP id o27mr4023127ioi.138.1490978731450; Fri, 31 Mar 2017 09:45:31 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g6si6879917ioi.72.2017.03.31.09.45.31; Fri, 31 Mar 2017 09:45:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 63B7B77EA4; Fri, 31 Mar 2017 16:43:47 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 43D4D77E49 for ; Fri, 31 Mar 2017 16:43:15 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id 81so18580842pgh.3 for ; Fri, 31 Mar 2017 09:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zv8DXtLYCW01ehzrZ2z06VsUK/rbDfBB9crvcDPgkm0=; b=SHLQUHKZd+pPo0V4lSKYsclWrYXZ7f7xRJ7GbCJ1qs2kzD4tIIXnOalKCgH3+VrzdI ZOKZl395ifl0ciuEcFAAShgMNNcIHikCMnzK2NMRWgWRZAPM4XmM16ftXzi0ZLZ0m6U8 l2ng9lbMPUKlnmmUqGfMg3f3RRgUrOawHcibOvMX53gdhE3iHlHMH2fZzPJA6J+zNvuV 1LuroU6BkLl6XKe6dHZ+oONW1I9dng+BNplmcu4pbfcgtoHuAagCEIHm3/sp0IKnyvpF arCkmQ7Fi+BJQCnXHlYQeZrnAMCD069QzOv+Sk6eNxUMBDJMzMCV4MfRq3GF0yi5Z3Yp 3dLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zv8DXtLYCW01ehzrZ2z06VsUK/rbDfBB9crvcDPgkm0=; b=Myv+vnkUPIt/2aua3fLCitJcUDNL+cVZ8jJdXQJ5acPIXM08nfcj74C6NHerzj1pKQ dvRwyt5QcZQoXDvXi6Y1pwJ3DdEfeUX7adPfZ+1No1BdqmzZVC8t6NMEnTgBXlPoPZ6+ NSw7B6uNfQO/YG3JLrZCbizeaxga7ow1oiKYIlf8nKxH2w7+/3jz4uwl5Vf7QIuawgi9 +mzZEXOHF1phA5lPMUZ0/G40nkSmkYi4HdzVXctPOV1eP2bNRshhZAmSA3CMMALVfW3J HYS9W0mCzUQmIyK2t/Hm5G4o7roLrq5i1wKHyGuQeixHwbkQwdsI0s3idDuqn7yqotpN PBxQ== X-Gm-Message-State: AFeK/H1NHLqgo7iOeYxEXhMeoS3Fdt7RJngmPJZzD90E+n/cxk/taxC0tBJ0bTtoQn5MuQ== X-Received: by 10.84.174.4 with SMTP id q4mr4482258plb.35.1490978596545; Fri, 31 Mar 2017 09:43:16 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:19 -0700 Message-Id: <20170331164247.5052-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 15/43] lowpan-tools: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...d-config-parse.y-add-missing-time.h-inclu.patch | 44 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch new file mode 100644 index 000000000..0a81a2252 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -0,0 +1,44 @@ +From ab725a3faaeead90ae3c63cbcd370af087c413a5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Mar 2017 17:55:06 -0700 +Subject: [PATCH] addrdb/coord-config-parse.y: add missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The %union definition uses the time_t structure. In order to use this +structure, the header has to be included. Otherwise, the build +breaks with some C libraries, such as musl: + +In file included from coord-config-lex.l:23:0: +coord-config-parse.y:107:2: error: unknown type name ‘time_t’ + time_t timestamp; + ^ + +This patch includes using the '%code requires' directive of +Yacc. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Khem Raj +--- + addrdb/coord-config-parse.y | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y +index 2e10a88..85ee058 100644 +--- a/addrdb/coord-config-parse.y ++++ b/addrdb/coord-config-parse.y +@@ -102,6 +102,10 @@ + + %} + ++%code requires { ++#include ++} ++ + %union { + unsigned long number; + time_t timestamp; +-- +2.12.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 8c7dbc09a..139eb788f 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -11,6 +11,7 @@ PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ + file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" From patchwork Fri Mar 31 16:42:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96469 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811880qgd; Fri, 31 Mar 2017 09:45:39 -0700 (PDT) X-Received: by 10.107.38.16 with SMTP id m16mr3981136iom.106.1490978739411; Fri, 31 Mar 2017 09:45:39 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 78si3147648iti.110.2017.03.31.09.45.39; Fri, 31 Mar 2017 09:45:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 77FF277EBB; Fri, 31 Mar 2017 16:43:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by mail.openembedded.org (Postfix) with ESMTP id 4079477E59 for ; Fri, 31 Mar 2017 16:43:16 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id 21so76222735pgg.1 for ; Fri, 31 Mar 2017 09:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LxSRdZAUXX2oZJZKBftehABRCC7pVyLUHtNF/s41Xwo=; b=cvUWl3R+mdAHSxNfAPo74wwoQrxQ3EpVdFGBqIAvm92vc3BlANx58m2HSMEjKiD0NH dzy+O00dPlDDr8a1O/6UDZe6XI9ia75W9woejeqZ18BYLlQU4gtgRtmqFTxNQUW3UKMV /m8yuG2isWk3c7ep1W0JYMEogkiF6aJOOCLhUj74ODeoQ637Tx+Au+xt5Zz6GbWzdfnQ 0L1ypyaD6bk9L+bg4nTn+4eDs63I5YUKBzWpl9dgCYoDz64k/QkIzDfOh9oy/pJYkl27 cgO2Uvs21gRwAnarrqPBDo4iULelKfhRT77wijLV8yC2GcEfPbpNSjjf7RqO444CTCZn ZOyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LxSRdZAUXX2oZJZKBftehABRCC7pVyLUHtNF/s41Xwo=; b=aH7+0HAtgy1nOEJ9RlGFNMMON4kbzEx3BZXOn3LrWJR8qrk7FL6+We3THvjzwlzCr2 49/JrNDuYMyGB2HicT/rR/N/2FPqx2FmvHUt4YImXP0epRA5qLBeM2GIwMQ/3hG34gAd 835upFWjSWHwXGCDHuLaFTjLwWUkaYvSfvUiM2ooF/MzHkpjTkNF/3nWVuAsfyCp+Xz8 /atnneSLD2RmDMCtp4lini6NHJfAh5zdBEvDfYMgq2hVm5VtpJLY8hZt5xHsNd+FCMsQ ehTcsNTcuqGuIEM6bo/p3N/c7KU9hxTkY2XNmlqHPnSQpnA1jX/6NaGVfoLaQmF6OITQ +7Ow== X-Gm-Message-State: AFeK/H3Ki5/j3baHVSdYqglg6Foj6qdbhB8G2xi0ErfsD4K549v+1Oktq7ELgI1PQNPgOw== X-Received: by 10.99.213.81 with SMTP id v17mr4291008pgi.130.1490978597931; Fri, 31 Mar 2017 09:43:17 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:20 -0700 Message-Id: <20170331164247.5052-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 16/43] usb-modeswitch-data: Add dep on native tcl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org it has a tclsh need for executing a script during build Fixes | ./gen-rules.tcl | /usr/bin/env: ‘tclsh’: No such file or directory | make: *** [Makefile:26: 40-usb_modeswitch.rules] Error 127 | WARNING: /mnt/b/build/tmp-musl/work/all-oe-linux/usb-modeswitch-data/20170205-r0/temp/run.do_compile.30695:1 exit 1 from 'exit 1' Signed-off-by: Khem Raj --- meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb index 042cd383b..eeed5e275 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit allarch +DEPENDS += "tcl-native" + SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" SRC_URI[md5sum] = "0cc107cd0c4c83df0d9400c999e21dfd" SRC_URI[sha256sum] = "e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1" From patchwork Fri Mar 31 16:42:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96470 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811935qgd; Fri, 31 Mar 2017 09:45:47 -0700 (PDT) X-Received: by 10.107.165.212 with SMTP id o203mr4134961ioe.129.1490978747440; Fri, 31 Mar 2017 09:45:47 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c26si6864295iod.241.2017.03.31.09.45.47; Fri, 31 Mar 2017 09:45:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A678D77EA0; Fri, 31 Mar 2017 16:43:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 6405D77E51 for ; Fri, 31 Mar 2017 16:43:18 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id o123so18541596pga.1 for ; Fri, 31 Mar 2017 09:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jWOdrk65W02Ms7lxadgD8MFo2raDy+wMA0H9XbxI+64=; b=Hw9L47g1KuSVVmidiAQ6dkeDh9MTOIBDaQyx/ULMEGExdBHhj53k4oajR/hRkSziN5 rIsjBO/ggBRD9F1M+K1D9tWHCgRi6lSzoQV2Ga/g9CnLyHnvEV02Rxn9aYRWO5wAAig0 FI1FDc6J4NGjO8LFu++G28pNc+AZhn5kozA4/utI7SJQSiNzQRNm6r1xINP705hd0LLV w9yrQsFFKW7bEYZ72eBvUpwjfFiDQjnGjtc82PC27xcbdtR8LTRMtzl4/Mer55N9H119 mq+eZBYciqN2gUWvnpXQfIu9y08Y7OluKpmxE+GA/p3HxohmbDH70XJGSJHkz9AMq4L+ 3Saw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jWOdrk65W02Ms7lxadgD8MFo2raDy+wMA0H9XbxI+64=; b=Al2vP7eg/f+YgVGnGWPCN+Tax5p/g7/sMqRIt+vaqOYVPfz3bAy0O9/H6bWIqjIGE4 btIrUxkJF2DCcPEEFNdIwkCn7kr0834LayvUg+UY2IBY+qu73uZWadpl61Ui9/hkw85B 1EN2a/8WScrWRfO47ZtsVTJe/QUHP/8J7pfblJz3L7TFHVRKeZ8Mmt1uC8RGhZXFsRp7 bLfOhPwfoFwj82D6xAlH1DXuE2rs71gBlNyvPsJg100nDDVr/d6s5/bhxWy8jdpPD3aP yMOjDEVSBpv1JXzi44stVOEqpGRpndStGeu0XPQS3USoFk7VeVndFaUrTkK3za57PXc4 RkSA== X-Gm-Message-State: AFeK/H2JHEbRIQWZdMon3mDT+PVJx88MiOkbHXg6ALLdORoO238tM3AWTJAQGWxtTnexfw== X-Received: by 10.99.132.73 with SMTP id k70mr4126651pgd.28.1490978599355; Fri, 31 Mar 2017 09:43:19 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:21 -0700 Message-Id: <20170331164247.5052-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH 17/43] aufs-util: Define HOSTCC X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fixes errors like below | make: cc: Command not found | make: *** [: c2sh] Error 127 Signed-off-by: Khem Raj --- meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 2 ++ 1 file changed, 2 insertions(+) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 7d5352eb4..50d8b909a 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -18,6 +18,8 @@ PV = "3.14+git${SRCPV}" S = "${WORKDIR}/git" +export HOSTCC = "${BUILD_CC}" + do_configure_prepend() { # Replace sbin,bin paths with bitbake environment sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ From patchwork Fri Mar 31 16:42:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96471 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp811997qgd; Fri, 31 Mar 2017 09:45:55 -0700 (PDT) X-Received: by 10.36.245.196 with SMTP id k187mr4647621ith.42.1490978755610; Fri, 31 Mar 2017 09:45:55 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q15si3163687ite.83.2017.03.31.09.45.55; Fri, 31 Mar 2017 09:45:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C83E977EC1; Fri, 31 Mar 2017 16:43:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 8174E77E53 for ; Fri, 31 Mar 2017 16:43:19 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id o123so18541678pga.1 for ; Fri, 31 Mar 2017 09:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qvIhCWCgn6FPtXcPC6TcnwZbU9lLGsOx9ciMTW7breE=; b=SN3CpkbiPKs/oNPR/ps7sVeueiatwGt7PtFdVgeF3lwiAi2JfTR6x/GwcvUeY21WfU VEKykTPglt3IL65mJY5xhCY5VikYcIQSi1q0bjcPJ5Xy6T2Gz+yhNHlf0aW0Otv8Em88 c6F4JnYmGbjka/RarkdOuGNseY+JfxyCBoyLwXyNdByDwhGdSFar0bie51OJW036r3q8 4aiK5FtpO0weDqLTHB6xgz0OMELLQsQr3rAMGZq4sWjdbWLQ9jsj8fK5Ea657gNDnpdE RrhF77Fp+d5Bj1Hh/qX0P5Ghkfveo+w4KuXYC4CfkA6QOCyevWwmiHrxTixluJW82j/Q qeVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qvIhCWCgn6FPtXcPC6TcnwZbU9lLGsOx9ciMTW7breE=; b=UTH6qPSle8JI+S6suWk52AIZNqiqyQBJ06KUfUbC7VYLwk2melalxl29tCjaIE+/7k TDki0pVBZpd0okbUWB1nSuztqY/OUekjWyGL3QSfk2HGeLiNoMewt9NsMXvtPph5PlmE I7Lf3LWmrs9/Nw2pf/1xgljewFKGlPJ2C521C4RezJ53qwd6kIvfSPmo0GxvyTF+9O22 EQnDkrWzwf1Tff8N7ZxD0dLBRmeM+VexIVGzIsZiHaO3HJNv54jM4XnMcb1khNZPdBEg vhYEACGj0VnHKOWYcW3KC+BidSaClfqMaBwR9oprrbLrpq/zTa51OqclRZfbmxptpoAl tZDA== X-Gm-Message-State: AFeK/H0JPfk/SOWQzht2dDZ04mMfmqvxzpIAQfWfNW2vF5+zalcOOAUwksjV5GQHGUUTvw== X-Received: by 10.84.218.69 with SMTP id f5mr4579780plm.114.1490978600770; Fri, 31 Mar 2017 09:43:20 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:19 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:22 -0700 Message-Id: <20170331164247.5052-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fixes errors like | mv: cannot stat '/mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf': No such file or directory | WARNING: /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/temp/run.do_configure.2485:1 exit 1 from 'mv /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/ttf-inconsolata-20100526/Inconsolata.ttf' Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 20041bb7b..0d6df242a 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -13,13 +13,14 @@ S = "${WORKDIR}/ttf-inconsolata-${PV}" FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" -do_configure() { +deltask do_configure + +do_compile_prepend() { mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf } do_install_append() { - install -d ${D}${datadir}/doc/ttf-inconsolata/ - install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ + install -D -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/OFL.txt } SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" From patchwork Fri Mar 31 16:42:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96472 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812056qgd; Fri, 31 Mar 2017 09:46:04 -0700 (PDT) X-Received: by 10.36.29.83 with SMTP id 80mr4625201itj.2.1490978764830; Fri, 31 Mar 2017 09:46:04 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v130si6891575iod.89.2017.03.31.09.46.04; Fri, 31 Mar 2017 09:46:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E6BD677EC6; Fri, 31 Mar 2017 16:43:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id CD9ED77E33 for ; Fri, 31 Mar 2017 16:43:20 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id g2so18478276pge.2 for ; Fri, 31 Mar 2017 09:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HdN6Q2bqMJz8gOEzsqa//Pmc3lHmqa626QFIEHQTwd0=; b=CdHYNo1GDdWu5TqbkB20Qt5p7L3WUXsXoA46tgkFzQI9Ifrany32oabENyqH0LtV1V cBqN82QWFAndNWgr+x1WRW9/B6OsbYmmVz5FxaRL9XHMpu3jR7YkH+hdgdZE3vIbwDFw hqn7STbZX93NrOzfF+sTqTf7QLBksO1BqXkWti2Zj5Tc38dMZy0UbZPeUFNma0g1HmkM H+aNJ242g+vqKvj+16lmBdskme1j6wuWOVjKNgTTWA8hYQmf9u/yvskbIRuW4voWljvq E5OqfYJut5vYnT3MVFrxzeimPStffJAICdftR07AEZEbHuMR+z1uZyfeXXWsmYnpMI99 DxDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HdN6Q2bqMJz8gOEzsqa//Pmc3lHmqa626QFIEHQTwd0=; b=gdcJlZGLSI1jQ912DfBtjVrZLnqEi+tlajODezYxAQXRU3+hZMxb1JLpAm6PBIyDfd VYeQ6YCcDhK5eEqe2pNzedJG57x/8HLeiQj1sWZAPuwT+WfHtcczSU8VOmqIJ/fsKqdP RWrqh38DA1sOTCFbwKNYKYQZu32jg7nm2e87L3JmtMXVbbaDnJKr8yUALQCSyABEnfQc asoJLqshda+TWSSHczbfy93pe3za7Ekx6OsF9v1rrC+R9J8Wd1H0xj89GgxXhAOrl+CD xT/TuwK7650M9g7AGLrbUORNJ2gu14+pi0ZU8i6i9akbNjscwEMcA68YxffVbcpg8Mty DEjA== X-Gm-Message-State: AFeK/H3SziBI44fJ/rgM/2GVwp2zIjFAqJK0DjHlrmDXuafzXh2HKGQ8uDoW0UpYeM3LVg== X-Received: by 10.99.123.72 with SMTP id k8mr4203480pgn.139.1490978602363; Fri, 31 Mar 2017 09:43:22 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:21 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:23 -0700 Message-Id: <20170331164247.5052-19-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 19/43] libraw1394: Update to 2.1.2 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../libraw1394/{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/libraw1394/{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} (71%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb similarity index 71% rename from meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb rename to meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb index 811829ebc..337780789 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "d06cccb776b240b6ab5efdee33b87af2" -SRC_URI[sha256sum] = "a83cff16fb8885831bc29d7d17f3c570dc39251d89e20795c08e87720de0ba70" +SRC_URI[md5sum] = "45031ab15ca93e50c19886a38bc1814a" +SRC_URI[sha256sum] = "ddc4e32721cdfe680d964aaede68ac606a20cd17dd2ba70e2d7e0692086ab57c" inherit autotools From patchwork Fri Mar 31 16:42:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96473 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812121qgd; Fri, 31 Mar 2017 09:46:14 -0700 (PDT) X-Received: by 10.107.155.16 with SMTP id d16mr4083772ioe.125.1490978774509; Fri, 31 Mar 2017 09:46:14 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i64si6899191ioo.31.2017.03.31.09.46.14; Fri, 31 Mar 2017 09:46:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3A7AD77ECC; Fri, 31 Mar 2017 16:43:53 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 407D977E57 for ; Fri, 31 Mar 2017 16:43:22 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 81so18581483pgh.3 for ; Fri, 31 Mar 2017 09:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XiW1uMKPMaIKDqk2hzsx37OGoZscPx8gyg0AescP5Ho=; b=Hoa07ehLDxJqcJW6f//b3dhec3OHWLZlFDRl9d5vjUZMOQfP87Wvt4EQbZU8kUGt/3 e1lP6NJeTDF+8lEgR5E6LH8xf+Up4HtoOd8ywL/iYNkDiTR5587CsaqM6pyfIfwHOSE4 iLoKHsBQYdC7y4gshElNv3BrV13r10wy1tzb4uNSQ3fX71kkc8zPheQjESUatZQ8wNtl NexXnDXRwNC5YznliDv7EVp4KoAq+3A80v53jP1jdkNDNVJoV/BIbDwpYhmPjkRG5aQk hDhR52j9ngL+Q1IUqQYQWR7knA7kce6t3+5DmYX5W3k0bR80uySqhR4Pd0grURiFgQOH S/1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XiW1uMKPMaIKDqk2hzsx37OGoZscPx8gyg0AescP5Ho=; b=MoMLRSTg0Js08s3u+0CywSjeiXpcXMiCtC/LHCWmEq0jovWD2olkgQz2WIl51zHhKD 6wAtkUlCdREnnJ2b4B7owYLE+135ECMEY0VHWfZrSqINeBFh7reB5sB+HINjvPo4muM/ L9fcZVBi7OLQ+LhWOxlN+Rbk3N6CntfwublxxSOQ/Vg+gSSFYooqd8wRnTQSjyYh75nv rDcZv5tBoM0PJZjvfVndyXPA9TKS3qA2pbyzCLVE5gtQkSogrVWSfq5DjiKYZ5YRLQ9Q qpFihILJU5SbFb9BEK8eqioSQkT3LL/0bOaQiVvebWxOtRE5RSgxfGJpnOxew2M4dNsM Cusg== X-Gm-Message-State: AFeK/H37piOq5EQN3qQaVq24kCg0ug5wpZ8RvvoXXsJj6cJE1oXl5bzEbu6I4iyw+CrMQA== X-Received: by 10.98.138.76 with SMTP id y73mr3610133pfd.118.1490978603894; Fri, 31 Mar 2017 09:43:23 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:24 -0700 Message-Id: <20170331164247.5052-20-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 20/43] libdc1394: Update to 2.2.5+ X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb index c298b440d..8318385b6 100755 --- a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +++ b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl" -PV = "2.2.4+gitr${SRCPV}" +PV = "2.2.5+gitr${SRCPV}" -SRCREV = "9ac63fe7a7561bea83bfd4a5db47d4d74fde43a6" +SRCREV = "5e78f51936fd09db0c0f742c7d2c0e5bdbbeed56" SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \ file://install_examples.patch \ From patchwork Fri Mar 31 16:42:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96474 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812172qgd; Fri, 31 Mar 2017 09:46:22 -0700 (PDT) X-Received: by 10.36.105.132 with SMTP id e126mr5056518itc.61.1490978782751; Fri, 31 Mar 2017 09:46:22 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j132si6891525iof.22.2017.03.31.09.46.22; Fri, 31 Mar 2017 09:46:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5351B77EDC; Fri, 31 Mar 2017 16:43:54 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 63A3C77E4C for ; Fri, 31 Mar 2017 16:43:24 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id g2so18478559pge.2 for ; Fri, 31 Mar 2017 09:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=idV8bIndv07U8OprcLCq4JYIa4pebSNSxquF5GZvrbI=; b=R699B6MjdKtQu+DcS9YE6pAFHqHTRYF8IZI6UPrz+Zo/iAMznn4Nwnq9VgGoQrC8ZV JIDeFd1RLclZhfa2DPJ62D4AE9RKvErFSWBaQi2qymIBHvj/St7cn04RZTVRuA4uSCB8 ASfWhT3yvxkztfn1Kv2Vt6nSiImZopuwsuSuGaZyagekCdcMMPDWeIu+OHKiep7yIg3f YqWpGk81VndPwLQ9k0MIx7nD9LOI26HRMXBMiq8vzhSDAcq1xgP5rLyud9uZUekrrbWP xTHsKfTcCxyLLbNGQLZDv89W02nt/3hmvm0CAzGHks40iZjZi9jI20UN6DIGGCkhLYBl NcbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=idV8bIndv07U8OprcLCq4JYIa4pebSNSxquF5GZvrbI=; b=i2kDgkgH1MzD9gV1CmuqXgNGeFDBfaCHXlXR8/u1C2StzeRnpDKYBmD9hoq6lD701h 7+Ecr6jvsyM/9rE6ptCkjdOtohfVqrBWnFAo0DZPGD35m5r6TMYQxXsTJgx3HyxCctlw NFQUTl1fxRv6koJ+/UQ4xZtWMqNtg0Vhd+XIXJbNYX6n2lyKkUU6Xu07FbBY/MICksBD 89Tm9nrtETflduEF7NLRyUMw1ABGwwUqceOxmCD2TH98xNiZaPVuisMoRXljBCQpjOc+ YCCkZrOY0G29uon1qvzMqj/AbuXeZ7iNdo/O6ufM9/zToeR1JKF6h2p3SgzQhGEmUCcl r/Yg== X-Gm-Message-State: AFeK/H1Mg8ZKbBGvbJpTmT6Kpz6iInM8e12VGa1MWpvNLF+mfTW0uHtW/TawzHV7EUrHKA== X-Received: by 10.98.75.221 with SMTP id d90mr3648129pfj.107.1490978605470; Fri, 31 Mar 2017 09:43:25 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:25 -0700 Message-Id: <20170331164247.5052-21-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH 21/43] ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...tfs-3g-ntfsprogs_2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/{ntfs-3g-ntfsprogs_2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} (88%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb similarity index 88% rename from meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb rename to meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index 6957ea92b..63627deda 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz" S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" - -SRC_URI[md5sum] = "2d6fb47ddf62b51733227126fe9227fe" -SRC_URI[sha256sum] = "4b383f0074a3ab7683339d1f18222b107aaeb4983db119292c43c2b275cefb27" +SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" +SRC_URI[sha256sum] = "3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5" inherit autotools pkgconfig @@ -33,6 +32,7 @@ do_install_append() { # Standard mount will execute the program /sbin/mount.TYPE # when called. Add the symbolic to let mount could find ntfs. ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs + rmdir ${D}${libdir}/ntfs-3g } # Satisfy the -dev runtime dependency From patchwork Fri Mar 31 16:42:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96475 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812225qgd; Fri, 31 Mar 2017 09:46:30 -0700 (PDT) X-Received: by 10.107.172.134 with SMTP id v128mr4588997ioe.49.1490978790750; Fri, 31 Mar 2017 09:46:30 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s40si3177618ite.56.2017.03.31.09.46.30; Fri, 31 Mar 2017 09:46:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 67A9A77ED8; Fri, 31 Mar 2017 16:43:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 0F0C077E51 for ; Fri, 31 Mar 2017 16:43:26 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 81so18581805pgh.3 for ; Fri, 31 Mar 2017 09:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QUZkyQt7bg10jalvJI9jrSYyK20FNMrf+qZ2a1MN1g4=; b=n+zrqDAsS3xRgjpXs6+e35Rd2b+uO2VkmGDiDDQ18YoJvHaFT+9Ml71pL+lR515Tsf IJ/i8/zNPJVnJMo3URtxGhJrynWTP7PEMB2OcBnqqK20EnReRszZLTyN2dGkFhlpMeST YcOGW0fcODs+GMKdT5KAC2eb2D4VfWieC+ihtsuhkeeuhCe3hjqi99eIevMvwCfnXGy2 cDPZhZUOR0OPZYemVCaLOisYJyGArdPdgr2RzcpKQCbCOC2ezJvC1nL7lPUzAoupeYd/ diS1lcjEFK1Bq9TqPWyqNQtSc9FVydE92BmeEnSLVlOKjJjybRjD/sdd5P6zMbIECLuZ tpkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QUZkyQt7bg10jalvJI9jrSYyK20FNMrf+qZ2a1MN1g4=; b=Cous3bVujcrfcsPw9vzMs2guw2Bwi2lcXNkOxSx4gdz5mj4uEnsTLllx8p6wR4gK+F amwTiOGTfk4/xNEk6A4T8h/eUciSom2PtTzwVC42+qazZozbyjI/E40OnhtlZ7RfeR+u eGcpioPL10yoiPpmRDWpOSfwyEIp+sbEWfgWt/jfQnTCQPt+YJfR2LMFDf1dEQGOnAq5 2lRajMG2kTZWzi03nHMqK9Yvjp/77Q2ZqCu5gM1rOhASdh1QRDrDBfoNPFNBAW+f8Xy8 V9Ik2Hlzr/s4yxyjUiPPXXUoJsyl2f6yaJ1yAH6ALGD9FdonfHE8kBngcni8W34+AzQA Al/Q== X-Gm-Message-State: AFeK/H3FWW0HEJyExbrWkoLXQsfaRd+HSFbvV5/ufFqHC29jV7crdW3CSP39+okaMBIGNw== X-Received: by 10.98.87.216 with SMTP id i85mr3812458pfj.151.1490978607160; Fri, 31 Mar 2017 09:43:27 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:26 -0700 Message-Id: <20170331164247.5052-22-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 22/43] openl2tp: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch | 29 +++++++++++++++++ .../0001-l2tp_api-Included-needed-headers.patch | 34 ++++++++++++++++++++ ...02-cli-include-fcntl.h-for-O_CREAT-define.patch | 25 +++++++++++++++ .../openl2tp/0002-user-ipv6-structures.patch | 33 ++++++++++++++++++++ ...fine-_GNU_SOURCE-for-getting-sighandler_t.patch | 35 +++++++++++++++++++++ ...linux-kernel-headers-assumptions-on-glibc.patch | 36 ++++++++++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 17 +++++++++- 7 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch new file mode 100644 index 000000000..d1ee3c591 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -0,0 +1,29 @@ +From 1f8d336a5cd88b87e15596d05980f6fe77a0f226 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:28:41 -0700 +Subject: [PATCH 1/4] Use -1 instead of WAIT_ANY + +WAIT_ANY is not supported by POSIX and some C libraries +e.g. musl do not define this. + +Signed-off-by: Khem Raj +--- + usl/usl_pid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usl/usl_pid.c b/usl/usl_pid.c +index 103458b..9819473 100644 +--- a/usl/usl_pid.c ++++ b/usl/usl_pid.c +@@ -78,7 +78,7 @@ int usl_pid_reap_children(int waitfor) + + /* Wait for processes in our process group. */ + +- while (((pid = waitpid(WAIT_ANY, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { ++ while (((pid = waitpid(-1, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { + have_callback = 0; + usl_list_for_each(walk, tmp, &usl_child_list) { + child = usl_list_entry(walk, struct usl_pid_child, list); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch new file mode 100644 index 000000000..c50f68e65 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -0,0 +1,34 @@ +From 25dce20a75bc84ae9e4ec640590cef0c12750789 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 17:48:13 -0700 +Subject: [PATCH 1/2] l2tp_api: Included needed headers + +These are flagged by musl + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index d16f80e..9d6f60a 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -22,9 +22,12 @@ + * Each module implements the required RPC xxx_1_svc() callbacks which + * are called directly by the RPC library. + */ +- ++#define _GNU_SOURCE ++#include ++#include ++#include + #include +-#include ++//#include + + #include "usl.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch new file mode 100644 index 000000000..9df32658a --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -0,0 +1,25 @@ +From 2d633f4c18ff3cb52234449fd86a0a63b55d669b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:31:55 -0700 +Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 097ed6a..127136c 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch new file mode 100644 index 000000000..3f8bcaa48 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -0,0 +1,33 @@ +From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 18:09:58 -0700 +Subject: [PATCH 2/2] user ipv6 structures + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index 9d6f60a..f0946fd 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -450,10 +450,12 @@ int l2tp_api_rpc_check_request(SVCXPRT *xprt) + * non-loopback interface, reject the request. + */ + if ((!l2tp_opt_remote_rpc) && +- ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && +- (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { ++ ((xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_LOOPBACK)) && ++ (xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_ANY)))) { ++ char straddr[INET6_ADDRSTRLEN]; ++ inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); + if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { +- l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); ++ l2tp_log(LOG_ERR, "Rejecting RPC request from %s", straddr); + } + svcerr_auth(xprt, AUTH_TOOWEAK); + return -EPERM; +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch new file mode 100644 index 000000000..e05be1bbb --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -0,0 +1,35 @@ +From 74fe72583472bcc3c89a52839cac2ebbad6c8a74 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:34:52 -0700 +Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 127136c..931779b 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -17,7 +17,7 @@ + * Boston, MA 02110-1301 USA + * + *****************************************************************************/ +- ++#define _GNU_SOURCE + #include + #include + #include +@@ -634,7 +634,7 @@ static void cli_rl_uninstall_signal_handlers(void) + + static int cli_rl_install_signal_handlers(void) + { +- __sighandler_t handler; ++ sighandler_t handler; + + rl_catch_signals = 0; + rl_clear_signals(); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch new file mode 100644 index 000000000..0fcba6546 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch @@ -0,0 +1,36 @@ +From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:46:56 -0700 +Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc + +Fixes build issues e.g. + +In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: +/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier + IFF_LOWER_UP = 1<<16, /* __volatile__ */ + ^ + +Signed-off-by: Khem Raj +--- + plugins/ppp_unix.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c +index 869066f..5c1e44f 100644 +--- a/plugins/ppp_unix.c ++++ b/plugins/ppp_unix.c +@@ -21,6 +21,11 @@ + * Plugin to use the standard UNIX pppd + */ + ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 67118d8d6..e1670b3ae 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -16,14 +16,28 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + file://0001-Use-1-instead-of-WAIT_ANY.patch \ + file://0002-cli-include-fcntl.h-for-O_CREAT-define.patch \ + file://0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch \ + file://0001-l2tp_api-Included-needed-headers.patch \ + " + +SRC_URI_append_libc-musl = "\ + file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://0002-user-ipv6-structures.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig +DEPENDS_append_libc-musl = " libtirpc" +CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ @@ -34,5 +48,6 @@ do_compile_prepend() { -e 's:$(CROSS_COMPILE)nm:${NM}:g' \ -e 's:$(CROSS_COMPILE)strip:${STRIP}:g' \ -e 's:$(CROSS_COMPILE)install:install:g' \ + -e 's:CPPFLAGS-y:CPPFLAGS:g' \ ${S}/Makefile } From patchwork Fri Mar 31 16:42:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96476 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812275qgd; Fri, 31 Mar 2017 09:46:39 -0700 (PDT) X-Received: by 10.36.94.206 with SMTP id h197mr4921781itb.27.1490978799387; Fri, 31 Mar 2017 09:46:39 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b65si6901977ioe.5.2017.03.31.09.46.39; Fri, 31 Mar 2017 09:46:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8035A77EE6; Fri, 31 Mar 2017 16:43:56 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 77B5D77E3E for ; Fri, 31 Mar 2017 16:43:27 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id g2so18478859pge.2 for ; Fri, 31 Mar 2017 09:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SJLBYjI3ZxeQqOlMhLBeX8gITGfWtGAaaH+Pjuug2fM=; b=RuxpwJkuNbGRzF1ToMEt9Xseg4vQY9tA1HtpyOQIDX1QVV15K1ycUnRpNK+hHRxz/B 1IAbtJLbslw13O1LKb/U4BNQyOv27sI2PISLQe/tuf98zFt+6ZdxgbiwNjY7Ld+gro/5 CsPGWGczzKOTW0QP/kfrH4nzroEYi0Aq+Xg59skqWgXFJRscMHDgFBq7UlryOSvsKy5c vVSCrD+2dqn/cyVyDqTg6p6Z7lYt4fGBBO2ugtZA9nchawPyHzdQEUKrr1sKCLAZBGf4 uQgZVV3ZfQ/GpFIgYr0yqwmuDhqdxt++m4Q4IxL/8MbnyMIqiZdmqQYHiAt0S1OdpzVC uTZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SJLBYjI3ZxeQqOlMhLBeX8gITGfWtGAaaH+Pjuug2fM=; b=fAxF9NWu1rAfwCTVSp77yC2W08PVHTopTRtD+N/m45rA2N6KUSWZt7lwXN730L59Nf Kvd2h1VeOTGoPdMU7zo/R0/NgtTALZ78N1NOPkgXgcwYCmrORis3lebAcOdZnohGLs/L Y35qfhEhQ68GsTl2pPB5+J0UE30DnOPFlWdY4UaRADuWN6kMJJDl7gggidoQgoBB08jH FGYhfA71RWvuC8PdCwsf4beLGykEaRrJkaF0bEFdG0+wl0+hBTQTEKRPVbOGWtOOsgro T3q2aYI1IEPrb7+haFTLLz3ETjtzoJqX6EJN/ghCHQVBu6GWfizc2GPzbM9YcftxodBS pZLw== X-Gm-Message-State: AFeK/H3nVOFPKmTh9XBb8NeaDqKails49INCShoZs62xaGTC615Xx0Hg9vUXAn5YKAOEzQ== X-Received: by 10.98.210.133 with SMTP id c127mr3844430pfg.83.1490978608723; Fri, 31 Mar 2017 09:43:28 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:27 -0700 Message-Id: <20170331164247.5052-23-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 23/43] rp-pppoe: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 30 ++++++++++++++++++++++ ...0002-Enable-support-for-the-kernel-module.patch | 25 ++++++++++++++++++ .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 5 +++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch new file mode 100644 index 000000000..11356ce3f --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -0,0 +1,30 @@ +From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:20:07 -0700 +Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h + +Fixes build with musl + +Signed-off-by: Khem Raj +--- + src/pppoe.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/pppoe.h b/src/pppoe.h +index ec067a0..281879c 100644 +--- a/src/pppoe.h ++++ b/src/pppoe.h +@@ -127,10 +127,6 @@ typedef unsigned long UINT32_t; + #error Could not find a 32-bit integer type + #endif + +-#ifdef HAVE_LINUX_IF_ETHER_H +-#include +-#endif +- + #include + + #ifdef HAVE_NETINET_IF_ETHER_H +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch new file mode 100644 index 000000000..139d1f089 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch @@ -0,0 +1,25 @@ +From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:24:53 -0700 +Subject: [PATCH 2/2] Enable support for the kernel module + +Signed-off-by: Khem Raj +--- + src/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/configure.in b/src/configure.in +index cae0976..951a042 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -33,6 +33,7 @@ AC_CHECK_HEADERS(linux/if_pppox.h, [], [], + #include + #include + #include ++#include + ]) + + dnl Checks for typedefs, structures, and compiler characteristics. +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb index e1ca17fb3..fbe015f5e 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -17,7 +17,10 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ file://pppoe-server.default \ file://pppoe-server.init \ file://configure.in-Error-fix.patch \ - file://pppoe-server.service" + file://pppoe-server.service \ + file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ + file://0002-Enable-support-for-the-kernel-module.patch \ + " SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" From patchwork Fri Mar 31 16:42:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96477 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812328qgd; Fri, 31 Mar 2017 09:46:48 -0700 (PDT) X-Received: by 10.157.47.73 with SMTP id h67mr2100698otb.130.1490978808317; Fri, 31 Mar 2017 09:46:48 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r128si2816530oig.268.2017.03.31.09.46.48; Fri, 31 Mar 2017 09:46:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CC46377EF0; Fri, 31 Mar 2017 16:43:57 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id E408777E51 for ; Fri, 31 Mar 2017 16:43:28 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id g2so18478991pge.2 for ; Fri, 31 Mar 2017 09:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u2PAWm9/M+mp0OYRq8yaMGiGI70eRmIiNkTh71/ov84=; b=LODahxnQAyq6LUMy8wbf614SFpFrf2TCBYgNyYIO5RHXTizkljBhu41GvRO5uzpe9a sPKq7IwzcEu+wMBup15/iTkc/llVAyRYAzYW04eIih53V9ktFL+jHwV6CatZ38ZHsbJM JGODQ19ceTNdM+57ZIuUp1ueRgRoNdcLFaIDNTUfceWarQF8TeriOhAIsW2pampp8StJ k0syyLoib6jcxmu8AMZSd2NK5ttcOa4879TO4743FgIOR52r090+9tHdb+AEU2RNAQI3 C+EcMcpNW0v2lJEUtCSyIGGT6oHsUC75HU4pzSQTQ059sZ3Xr4JP45wjjDwJHIL4df9J Y3IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u2PAWm9/M+mp0OYRq8yaMGiGI70eRmIiNkTh71/ov84=; b=CcFXNl4x64xuTBwjRMUgCPhh+PGI89frBjyS42lTLxJPUGRvc9YTvVdIupqepXOnMr LrYeqI8EYDAp/gFF8AnGOLLM+ZTPViRKDujPn2+xMIlFKyOBMyX0N7JsnX0fv0WQDvRU vezqKlj0Cxu1A2a2a5QSlDhJNuokQjl5V2RXJCUqcSCmjc143yg29Wj/j1WT3Zdys0bs S7eiNO0pL/vGYH9UT6xI5c6WcnF24g5qdJauyxQ27i5LhD7+56mX8oLjYofHAziIakLf aOt0zeqPkVa6QUPMVCB+qwkFkchhM8zrFYFri0DoDXIr6i9M/yn2ta0rS4+2BYENUu7G 5VvA== X-Gm-Message-State: AFeK/H1bFk358vG8sk+d3dLWpSfAby6HyH9xTOKxAcOGZgRST3uXfQE7YPV9lIsjPR9pBQ== X-Received: by 10.98.47.4 with SMTP id v4mr3218559pfv.86.1490978610178; Fri, 31 Mar 2017 09:43:30 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:28 -0700 Message-Id: <20170331164247.5052-24-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Clarify licensing and switch to github for fetching Signed-off-by: Khem Raj --- ...inicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) rename meta-oe/recipes-kernel/minicoredumper/{minicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} (64%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb similarity index 64% rename from meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb rename to meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index babe54448..f3071e39a 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -1,17 +1,24 @@ SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ to allow minimal and customized crash dumps" -LICENSE = " LGPLv2.1 & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=45445387350de96a0e70410470ee5cab" -DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux" +LICENSE = " LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=709087c2ed0acda54a4d91497a889e42 \ + file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ + file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ + " +DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRC_URI = "https://linutronix.de/${BPN}/files/${BPN}-${PV}.tar.gz \ +SRCREV = "248019446ccf6079926efb54f8b6dd7be769bbae" + +PR .= "+git${SRCPV}" + +SRC_URI = "git://github.com/Linutronix/minicoredumper-debian;branch=unstable \ file://minicoredumper.service \ file://minicoredumper.init \ " -SRC_URI[md5sum] = "5ba9d116b52a8e2fb93456260644e753" -SRC_URI[sha256sum] = "1b0eeb3d70dbd2ad6f2f673e4e3446e5dd784e132730e21d8f9dc0977e47dd9a" + +S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "minicoredumper.service" SYSTEMD_AUTO_ENABLE = "enable" From patchwork Fri Mar 31 16:42:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96478 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812370qgd; Fri, 31 Mar 2017 09:46:57 -0700 (PDT) X-Received: by 10.202.226.81 with SMTP id z78mr2138228oig.62.1490978817111; Fri, 31 Mar 2017 09:46:57 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o63si2830148oib.29.2017.03.31.09.46.56; Fri, 31 Mar 2017 09:46:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EEFF177EF4; Fri, 31 Mar 2017 16:43:58 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id C704777E41 for ; Fri, 31 Mar 2017 16:43:30 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id g2so18479168pge.2 for ; Fri, 31 Mar 2017 09:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mir5AmYWPUUUGu8X/6qTsdLGjBjDmvbpOIgzFDhR8tw=; b=WDR0eZ/ezFY3ddJWiiG/YzIroVIKHJObSPRzV9EGxEOhVNiwq6HoHUO4TFFr6yVtEV xLDAqnsR46NeCzXDcuR6fpNMI+yXZAAJ0qKaA5gT3GyfkZdKLIwWrgRycm5PzWAk5pkN q58sBrlHHvg9BGxD0oXpDTdURkQvzIptPR0wgYRH3kQ5K1TqgTZGj5/2mZV5F9ge4OxZ 9X9QvgavYwqgX6lOy2dCAhSLpNwkR8cv5t9lB7JapekYHhSZ2LveAbhsWLHjlUavuUFj Ct0pWNoICdYvrL6hCZvYW6GW8rTbWs23DszoQkwKUTRf1xnVeHM3HcQFrjgyoigsM/qI VZng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mir5AmYWPUUUGu8X/6qTsdLGjBjDmvbpOIgzFDhR8tw=; b=IaWda7FivOefGOtP3jg3oV+Yt6Y5WMZRWDArgLH6tALJtj+WnQwFjQBOescNv0qPFt Drqeh2t7Qf0Azu226bNHXkKC6N5NdeyJ/90pIfhlb9/4s1SMa1ZSytVSYiSwss7ijoJd tOA4mBTZR355Bp6ntNTNewMtt0NbWDGgZOZ+KoYTDPQ42cpeRzu7BYa8upmuCGcd/Hji rnNnY/Bcrk+roYy0Btfvhmm/datOSZw5CTdxFvzsgBaMG79QMHKbcSVB4xHKruhBBy7U +1ZhXDeVfZK/i+8pdWz8Voq8y7beillvYzEp0+cNg5adP80rPE5k/c2qKsqMFy3vVJhm /tKQ== X-Gm-Message-State: AFeK/H1m+LUyUjcNmwmay3ucG4nphgz/GbCIcv/evAnODlUneoYNEy21hMlQJj789kZL0A== X-Received: by 10.84.197.131 with SMTP id n3mr4497835pld.43.1490978612076; Fri, 31 Mar 2017 09:43:32 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:29 -0700 Message-Id: <20170331164247.5052-25-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 25/43] vsftpd: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 28 ++++++++++++++++++++++ .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 7 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch new file mode 100644 index 000000000..c3919e117 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -0,0 +1,28 @@ +From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 20:09:12 -0700 +Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx + +Signed-off-by: Khem Raj +--- + sysdeputil.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sysdeputil.c b/sysdeputil.c +index 06f01f4..a8cff3b 100644 +--- a/sysdeputil.c ++++ b/sysdeputil.c +@@ -58,7 +58,9 @@ + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL + #define VSF_SYSDEP_HAVE_LIBCAP +-#define VSF_SYSDEP_HAVE_UTMPX ++#if defined(__GLIBC__) ++ #define VSF_SYSDEP_HAVE_UTMPX ++#endif + + #define __USE_GNU + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 3eaaa30b6..e52461446 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -19,7 +19,10 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ -" + ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ + file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + " LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ @@ -30,13 +33,11 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd From patchwork Fri Mar 31 16:42:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96479 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812430qgd; Fri, 31 Mar 2017 09:47:05 -0700 (PDT) X-Received: by 10.202.218.214 with SMTP id r205mr2105027oig.20.1490978825752; Fri, 31 Mar 2017 09:47:05 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a103si2817000oic.279.2017.03.31.09.47.05; Fri, 31 Mar 2017 09:47:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0DA3277F00; Fri, 31 Mar 2017 16:44:00 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id CE03877E41 for ; Fri, 31 Mar 2017 16:43:31 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 79so18586584pgf.0 for ; Fri, 31 Mar 2017 09:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=koDygER7f7e+RLQiihvo53lm3jFuDXRsUJmDp3KQoD4=; b=Y7mSltfRrglKYOeMSFVDpGZW0VN9oZ0ypeolznd0H4sBV+KGQb7d5D+ZhZm2CpEqko oqJq8SE6TkWbedurqar79yoUk3gkD7xIXt+DTV4ZIRedKx1Ts6gUYQI9S4vYTmgVZy8X qiqGTkz5u5XLlSzIgrroXsqxBznRYZkpHttf1GfR1z2SRlfbIBZX+hVl/g/M3H+3NpMx AmQNo6NSEfiah/jNrfG7o6oIvkU8JG5L2pNMP0CSPhuqpyP+AWK1Poa883z8Mr+m5qhB 1dDFkl1DHA2F89OVN6za8mGTniK/AIEha0hbyUcWcDu9Ux5SL1jzjiQ1Yg1G3WHjyxMo u9Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=koDygER7f7e+RLQiihvo53lm3jFuDXRsUJmDp3KQoD4=; b=TQd8dhwZChv1FAQgV4y4t5Y6swCpi8cZm5uSOFmfJOTnwOY/BXp86uPxn+cWtFmCxz WkkVf7TtjWDHIKSycW3mI/6MOAM6Mph+/49jI42jSPHa1Pi+tLIWlXXB9NpYvVf3GS+M 1CmwNgRfym8rjVNJUwzf2FJBx7LtPmdJZVaQM5ooyDw3xkyznySM0+/xM57qyfb3g6CD B9EXru4u4SINopgigCRNEJrsKLxC5TRJjP4a+nUM7MyvJK1fPKUpbTV/tSWtAXOeXxvI aJKge5NZP7995840b/TYckf0kQddAEmFcyMqH+qLUDmaCznWoJmwUbd4O/SjnazmJ8mh Wn5g== X-Gm-Message-State: AFeK/H0rxsYtzl5fbCrKnP5wygFGrcgtX0e5NppItZrWtMkyGVW2aLt6DzXqgObB6+ZR9w== X-Received: by 10.98.211.81 with SMTP id q78mr3652527pfg.97.1490978613460; Fri, 31 Mar 2017 09:43:33 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:30 -0700 Message-Id: <20170331164247.5052-26-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 26/43] faac: Fix with with security flags and on musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../recipes-multimedia/faac/faac_1.28.bb | 6 ++++- ...frontend-Fix-format-string-security-error.patch | 26 ++++++++++++++++++++ ...Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch create mode 100644 meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb index 2f048af0e..5c9477f18 100644 --- a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb +++ b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb @@ -9,11 +9,15 @@ inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ file://build-fix.patch \ file://address-gcc-6-narrowing-errors.patch \ -" + file://0001-frontend-Fix-format-string-security-error.patch \ + file://0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \ + " SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6" SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df" +EXTRA_OECONF += "--without-mp4v2" + PACKAGES =+ "lib${BPN} lib${BPN}-dev" FILES_${PN} = " ${bindir}/faac " diff --git a/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch new file mode 100644 index 000000000..75e003eac --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch @@ -0,0 +1,26 @@ +From c1d7a8b992dc36d0012cc3d54b7d3abf4ad4d5d8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 21:33:01 -0700 +Subject: [PATCH 1/2] frontend: Fix format string security error + +Signed-off-by: Khem Raj +--- + frontend/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/frontend/main.c b/frontend/main.c +index 02146a8..cb9329c 100644 +--- a/frontend/main.c ++++ b/frontend/main.c +@@ -715,7 +715,7 @@ int main(int argc, char *argv[]) + break; + #endif + case 'L': +- fprintf(stderr, faac_copyright_string); ++ fprintf(stderr, "%s", faac_copyright_string); + dieMessage = license; + break; + case 'X': +-- +2.12.1 + diff --git a/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch new file mode 100644 index 000000000..d845ddf59 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch @@ -0,0 +1,28 @@ +From 46cc9298c38b9dd735fec3f39aa2d6e56a362410 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 21:33:36 -0700 +Subject: [PATCH 2/2] mp4v2: Define __STRING if cdefs.h does not exist + +Signed-off-by: Khem Raj +--- + common/mp4v2/mp4util.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/common/mp4v2/mp4util.h b/common/mp4v2/mp4util.h +index 1f9cb64..1e7aced 100644 +--- a/common/mp4v2/mp4util.h ++++ b/common/mp4v2/mp4util.h +@@ -23,6 +23,10 @@ + #define __MP4_UTIL_INCLUDED__ + #include + ++#ifndef __STRING ++#define __STRING(x) #x ++#endif ++ + #ifndef ASSERT + #define ASSERT(expr) \ + if (!(expr)) { \ +-- +2.12.1 + From patchwork Fri Mar 31 16:42:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96480 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812491qgd; Fri, 31 Mar 2017 09:47:14 -0700 (PDT) X-Received: by 10.202.91.136 with SMTP id p130mr2206482oib.153.1490978834429; Fri, 31 Mar 2017 09:47:14 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q130si2824858oib.155.2017.03.31.09.47.13; Fri, 31 Mar 2017 09:47:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1CF6777EEE; Fri, 31 Mar 2017 16:44:01 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id C53F277E5C for ; Fri, 31 Mar 2017 16:43:33 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 79so18586715pgf.0 for ; Fri, 31 Mar 2017 09:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lGAxOj0FxjlLigX/nosW8W/zPaHDe57Bbhhnxt/11V4=; b=l9WJBsCQVUWPUNcD2Mm0XJBdtKn4TadVn4AB6WSKU51oJFH8V/NtJqKy3SzEHaklBT dflKOUaYesF+dc7sVgIqLrO3P0TQkusr9YPxBZbLogwgAxRavgy/eOrHHvYPjk8vQIK0 D5rbfEofeB0LW3V7aC52sbBtas2OIS/inNjkrL3EcpLzgktAcdWDDvQB+wKs77A0UtQh 8PLOl4GkioPer41tktI505sqCxsNTr+s710QkEj5coZn3W3d0cPrfQz2a0G6+5sCXClO TiESXLLydSSLnVPM9W3lm74JOGS08ZM8Eaj0ROIyPeF1zg94lcfVeZ/NCwe15Q57XeXY EMIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lGAxOj0FxjlLigX/nosW8W/zPaHDe57Bbhhnxt/11V4=; b=gENzjO5nYRaz16zBb6rfM+iGv2ovftrk8K7lXg9/rG9nx8mEt2XXw/n+hj1L+fDuWn jTyIf3FG+uyPWX6O2LFh8zz1ilzTZSqcxnzYrdwj+oecx+tqj3ehuYz9TZztx9twZeWB Dp78rtFi+kZfcnqrwQxwxDe0ANskAOCoe0bL0lTRflC9goJuU1R/lPpYOI1p58IdM6z3 qhhiHd85cLOy9AihAh/zZ/R9eBZ+4yMx22CBXMid0xtVAY3LuVnc/axVjwuW+7TAahVw LiWXVGRqEz5Kk10WuPTNVMnu7dD4pB0rliXprC8bNWaJI2p91Jjbx+nxjYE03XeUnRYX ED+Q== X-Gm-Message-State: AFeK/H0QmR8WmsV1CTukzE3PMd0ipCNOAPLojqZAcg5/zD21RqGnYN97JPubKLXNZM7jWA== X-Received: by 10.98.144.69 with SMTP id a66mr3707432pfe.30.1490978614956; Fri, 31 Mar 2017 09:43:34 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:31 -0700 Message-Id: <20170331164247.5052-27-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 27/43] dibbler: Upgrade to 1.0.2RC1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Delete dibbler from meta-oe Signed-off-by: Khem Raj --- .../dibbler/dibbler_fix_getSize_crash.patch | 56 ++++--------- .../dibbler/dibbler/types.patch | 96 ---------------------- .../dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} | 16 ++-- .../recipes-connectivity/dibbler/dibbler_1.0.1.bb | 40 --------- 4 files changed, 24 insertions(+), 184 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/dibbler/dibbler/types.patch rename meta-networking/recipes-connectivity/dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} (77%) delete mode 100644 meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index adb249fde..42d2627a1 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,32 +1,8 @@ -diff --git a/ClntMessages/ClntMsg.cpp b/ClntMessages/ClntMsg.cpp -index eeaadd0..0cf5dce 100644 ---- a/ClntMessages/ClntMsg.cpp -+++ b/ClntMessages/ClntMsg.cpp -@@ -346,7 +346,9 @@ unsigned long TClntMsg::getTimeout() - - void TClntMsg::send() - { -- char* pkt = new char[getSize()]; -+ size_t size = getSize(); -+ char* pkt = new char[size]; -+ memset(pkt, 0, size); - - srand((uint32_t)time(NULL)); - if (!RC) -@@ -364,7 +366,7 @@ void TClntMsg::send() - - RC++; - -- this->storeSelf(pkt); -+ storeSelf(pkt); - - SPtr ptrIface = ClntIfaceMgr().getIfaceByID(Iface); - if (!ptrIface) { -diff --git a/ClntMessages/ClntMsgRequest.cpp b/ClntMessages/ClntMsgRequest.cpp -index 4a7b5da..f3e40fd 100644 ---- a/ClntMessages/ClntMsgRequest.cpp -+++ b/ClntMessages/ClntMsgRequest.cpp -@@ -143,7 +143,10 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, +Index: git/ClntMessages/ClntMsgRequest.cpp +=================================================================== +--- git.orig/ClntMessages/ClntMsgRequest.cpp ++++ git/ClntMessages/ClntMsgRequest.cpp +@@ -142,7 +142,10 @@ TClntMsgRequest::TClntMsgRequest(List(TA IsDone=false; SPtr ptr; ptr = new TOptDUID(OPTION_CLIENTID, ClntCfgMgr().getDUID(), this ); @@ -38,8 +14,8 @@ index 4a7b5da..f3e40fd 100644 if (!srvDUID) { Log(Error) << "Unable to send REQUEST: ServerId not specified.\n" << LogEnd; -@@ -154,7 +157,9 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, - ptr = (Ptr*) new TOptDUID(OPTION_SERVERID, srvDUID,this); +@@ -153,7 +156,9 @@ TClntMsgRequest::TClntMsgRequest(List(TA + ptr = new TOptDUID(OPTION_SERVERID, srvDUID,this); // all IAs provided by checkSolicit SPtr ClntAddrIA; - Options.push_back( ptr ); @@ -49,21 +25,21 @@ index 4a7b5da..f3e40fd 100644 IAs.first(); while (ClntAddrIA = IAs.get()) -diff --git a/Messages/Msg.cpp b/Messages/Msg.cpp -index baa6c86..6eef6c7 100644 ---- a/Messages/Msg.cpp -+++ b/Messages/Msg.cpp -@@ -66,10 +66,15 @@ int TMsg::getSize() +Index: git/Messages/Msg.cpp +=================================================================== +--- git.orig/Messages/Msg.cpp ++++ git/Messages/Msg.cpp +@@ -69,10 +69,15 @@ int TMsg::getSize() { int pktsize=0; TOptList::iterator opt; -+ int optionCount = 0; ++ int optionCount = 0; for (opt = Options.begin(); opt!=Options.end(); ++opt) { - pktsize += (*opt)->getSize(); -+ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; -+ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; -+ pktsize += (*opt)->getSize(); ++ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; ++ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; ++ pktsize += (*opt)->getSize(); } + Log(Info) << "### CPE Debug - Packet size of option (Add 4) " << pktsize << LogEnd ; + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch deleted file mode 100644 index 28f18ef42..000000000 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch +++ /dev/null @@ -1,96 +0,0 @@ -Apply fixes to build on musl - -Signed-off-by: Khem Raj - - -Index: dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/IfaceMgr.cpp -+++ dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include "Portable.h" - #include "IfaceMgr.h" - #include "Iface.h" -Index: dibbler-1.0.1/IfaceMgr/SocketIPv6.h -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/SocketIPv6.h -+++ dibbler-1.0.1/IfaceMgr/SocketIPv6.h -@@ -18,6 +18,7 @@ class TIfaceSocket; - - #include - #include -+#include - - #include "Portable.h" - #include "DHCPConst.h" -Index: dibbler-1.0.1/Port-linux/ethtool-local.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/ethtool-local.h -+++ dibbler-1.0.1/Port-linux/ethtool-local.h -@@ -22,9 +22,9 @@ - */ - - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; - - #include "ethtool-kernel.h" - -Index: dibbler-1.0.1/Port-linux/interface.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/interface.c -+++ dibbler-1.0.1/Port-linux/interface.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -35,13 +36,10 @@ - #include - #include - --#include - - #include "ethtool-local.h" - #include "interface.h" - #include --#include --#include - - void daemon_log(int loglevel, const char *fmt,...) - { -Index: dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/lowlevel-linux-link-state.c -+++ dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - #include "Portable.h" - #include "interface.h" - -Index: dibbler-1.0.1/Port-linux/utils.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/utils.h -+++ dibbler-1.0.1/Port-linux/utils.h -@@ -4,6 +4,7 @@ - #include - //#include - #include -+#include - - #include "libnetlink.h" - #include "ll_map.h" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb similarity index 77% rename from meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb rename to meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 1913d3a60..8890e1431 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -5,12 +5,14 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${BP}.tar.gz \ - file://dibbler_fix_getSize_crash.patch \ - file://types.patch \ -" -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" +SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" + +SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ + file://dibbler_fix_getSize_crash.patch \ + " +PV = "1.0.1+1.0.2RC1+git${SRCREV}" + +S = "${WORKDIR}/git" PACKAGECONFIG ??= "debug bind-reuse resolvconf dns-update" @@ -27,8 +29,6 @@ inherit autotools DEPENDS += "flex-native" -CFLAGS += "-D_GNU_SOURCE" - PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" FILES_${PN}-client = "${sbindir}/${PN}-client" diff --git a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb deleted file mode 100644 index 41bb78fff..000000000 --- a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A portable DHCPv6 implementation" -DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful \ -(i.e. IPv6 address granting and IPv6 prefix delegation) as well as stateless (i.e. \ -option granting) autoconfiguration for IPv6." -HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3 \ - file://bison++/COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://klub.com.pl/dhcpv6/dibbler/dibbler-${PV}.tar.gz" - -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" - -inherit autotools - -PACKAGECONFIG ?= "auth bind-reuse dns-update dst-addr-filter link-state" - -PACKAGECONFIG[auth] = "--enable-auth,--disable-auth" -PACKAGECONFIG[bind-reuse] = "--enable-bind-reuse,--disable-bind-reuse" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[dns-update] = "--enable-dns-update,--disable-dns-update" -PACKAGECONFIG[dst-addr-filter] = "--enable-dst-addr-filter,--disable-dst-addr-filter" -PACKAGECONFIG[link-state] = "--enable-link-state,--disable-link-state" -PACKAGECONFIG[remote-autoconf] = "--enable-remote-autoconf,--disable-remote-autoconf" -PACKAGECONFIG[resolvconf] = "--enable-resolvconf,--disable-resolvconf" - -EXTRA_OECONF += " \ - --disable-efence \ - --with-gtest=no \ -" - -PACKAGES =+ "${PN}-client ${PN}-relay ${PN}-requestor ${PN}-server" - -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" From patchwork Fri Mar 31 16:42:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96481 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812527qgd; Fri, 31 Mar 2017 09:47:24 -0700 (PDT) X-Received: by 10.202.199.86 with SMTP id x83mr2239955oif.97.1490978844734; Fri, 31 Mar 2017 09:47:24 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a63si2826376otb.181.2017.03.31.09.47.24; Fri, 31 Mar 2017 09:47:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5F9E677EF6; Fri, 31 Mar 2017 16:44:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id DEA2377E71 for ; Fri, 31 Mar 2017 16:43:34 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 81so18582658pgh.3 for ; Fri, 31 Mar 2017 09:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4R8TH+BOnkWi8vNm3S60cM9bGa1mWW4Vumex4VOq2kQ=; b=dRSqUWrRlS6nRRj32rqFG1+ytC9FKTdAXdplLrYZQEDCMWcPpeqy6z/42ykHAjVEu1 vKZJBTScgLzE9gJHKWFkvYZ8tNolR/Z2lRjycdCSVTP9MqW+k+cQ7mAYO609XQw5NsMO eDKLDx7lOSNUWo9b0OZ3b/N1rJZxK0rH9QX0mPCooyJ2oT8rsx45x5jO//kQVc23Dm73 ioYyX+4EdgTTkw9wDnXcvOoRN8O4S1cNlgOV5JrSqCrZxkmRMcwlb3jog+YmrB7vRKjV p6mZyBt4PvCMnBlODVVQOu8B+RJ9TWFLt5sEg69uUqINu6/ts/oXN6xOtbkP9GcpKJEp 5ReQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4R8TH+BOnkWi8vNm3S60cM9bGa1mWW4Vumex4VOq2kQ=; b=nA19qH5EptmlmYC2qIfzrXbUhl2OpjvyHl/OW2lcfAB1kxYRX+8Er1AkXRmRSb3ndr lU11hI2y31LYcNkPZ1/DK/T7WFZM3uDs55hGegZjgFZtnMZWYpb5bSQFSGUj+Epm+js+ n4CsKarFFgjdwhK4r4CXaspirkj0cKpSNl5vU+5++KyZ1/TLOmjxzikELES03nVPTK+5 AywJ8/OBVtpWinfiIdUru9uuR3C9+rw3oo28BclzBOMBPKHTXDeM2OzRXc5bTkNANxdh URFkn3IjYhXOht2mCBiPu9P5vm/iK0nw4mq8vxLIF7H5zhpQJWGUdYj714UmeEd/aZWo 66lA== X-Gm-Message-State: AFeK/H20DohWpj+LnQmnr7KKOnpYmHybyCCV+UKkcF+KZtQdGUlT6nxyaFGlm87tJMEYsw== X-Received: by 10.98.25.202 with SMTP id 193mr3871883pfz.134.1490978616567; Fri, 31 Mar 2017 09:43:36 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:35 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:32 -0700 Message-Id: <20170331164247.5052-28-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 28/43] live555: Do not use XLOCALE on musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org musl does not have xlocale.h Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/live555/live555.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index 710dbdec8..a51619350 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc @@ -18,9 +18,12 @@ MIRRORS += "http://www.live555.com/liveMedia/public/ http://distcache.FreeBSD.or S = "${WORKDIR}/live" TARGET_CC_ARCH += "${LDFLAGS}" +XLOCALE_libc-musl = " -DXLOCALE_NOT_USED" +XLOCALE ?= "" + do_configure() { cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross + echo "COMPILE_OPTS+=" -fPIC ${XLOCALE}"" >> config.linux-cross ./genMakefiles linux-cross } From patchwork Fri Mar 31 16:42:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96482 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812584qgd; Fri, 31 Mar 2017 09:47:33 -0700 (PDT) X-Received: by 10.157.10.66 with SMTP id 60mr2262884otg.114.1490978853410; Fri, 31 Mar 2017 09:47:33 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n186si2826897oih.90.2017.03.31.09.47.33; Fri, 31 Mar 2017 09:47:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 75E5877EF3; Fri, 31 Mar 2017 16:44:03 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by mail.openembedded.org (Postfix) with ESMTP id C6B6477E62 for ; Fri, 31 Mar 2017 16:43:37 +0000 (UTC) Received: by mail-pg0-f42.google.com with SMTP id g2so75165625pge.3 for ; Fri, 31 Mar 2017 09:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gJu5sKoTy1nuaTGfUbQra6HMevmQRJ+pBq4LiFDZ6js=; b=jESSDuIEKxrRQZx7ILDGh143mTsFd/MmT5oQgMcOis2zPGSr6gxxxAWMDWBsGxBEQt p2plEMs9Qa86kaPRipO6/pSoq2ZQdzDFTZYWkRlEFiyvhW6cSLfbwX9efHy10h4Ayt84 AlCu9+Qhm/3twdevAuV5Qvn4jwRyeVBWep9yC+PKt4AiEB2HxPL4rfEFRMIF8+/jIaec TAJaiv7c4tW3DZ6bdcRtorSyosk0H4N5DDA+GkISWqEoN0aD8oDEhOVlzoivDf2qYFOF jhZAop/wdDSWwo46fqLvVtUZaa5Dvrs06fYUyhTxtRudLhtU0DkNtzJe2o55Off8Z6Nh xHug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gJu5sKoTy1nuaTGfUbQra6HMevmQRJ+pBq4LiFDZ6js=; b=nNPs+113XIUp+friZOzry2W1iZLPPAB+3kXaimRbDlUq+kHhO05rWrMl8WtMM75uPl Cd8rAvAAXwdO3j2hguOqFr0nnXx96YQi3hfD9tieWvCpwwI5xYwg0lFAFP7/F/73mKKH QLXMdfZdaCo85r5kdh+hqktYGAnjDasPI0nGSB4h2w/kWa1hSjNke0paYOYiL2Wd2moz Cw9U3HDblDN7yAQ4/JoGi4VRGfNMrJBAcQOALBh9YL1y9IzZUSV96EXsfUqL9EMZ6+LW uVRdRw0O4pgX8JWnYtLIbtRAUV2G8i188KM+ABeI/436FJ3gppuGzC0CYhvJTuo9kO9B IVjA== X-Gm-Message-State: AFeK/H3oeGJNf7vHuYYlvQyz8ReJ5E9sglDN+2o5iCaCv8D3kZXMLlpUjWbojDlVsAZJOQ== X-Received: by 10.98.20.203 with SMTP id 194mr3681578pfu.70.1490978617987; Fri, 31 Mar 2017 09:43:37 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:33 -0700 Message-Id: <20170331164247.5052-29-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Add a patch needed for cross compiling Signed-off-by: Khem Raj --- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ++++++++++++++++++++++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +++---- 2 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch rename meta-oe/recipes-extended/libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} (67%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch new file mode 100644 index 000000000..28bc5c07d --- /dev/null +++ b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch @@ -0,0 +1,43 @@ +From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 16:31:38 -0700 +Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC + +Does not work during cross compile + +use a compile-time check to detect whether the +monotonic clock is available. This check can run just fine when we are +cross-compiling. + +Signed-off-by: Khem Raj +--- + configure.ac | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa13ae6..f4f0f46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + ) + + AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include ]], +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], ++[[ ++#include ++int main() { ++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) ++ #error No monotonic clock ++#endif ++ return 0; ++ ++]])], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb similarity index 67% rename from meta-oe/recipes-extended/libqb/libqb_0.17.2.bb rename to meta-oe/recipes-extended/libqb/libqb_1.0.1.bb index 94030b2ea..e26bb7c19 100644 --- a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb @@ -4,22 +4,20 @@ It provides high performance logging, tracing, ipc, and poll." HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" SECTION = "libs" - LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" -inherit autotools-brokensep pkgconfig - -PV = "0.17.2+git${SRCPV}" +inherit autotools pkgconfig -SRCREV = "bd2c587f6ccacd8a5644b275d99324d200c2b378" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git" +PV .= "+git${SRCPV}" +SRCREV = "0a329683a76bc6aeb36f20f2bf6b43ba0440c4dc" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ + file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + " S = "${WORKDIR}/git" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) } - - From patchwork Fri Mar 31 16:42:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96483 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812626qgd; Fri, 31 Mar 2017 09:47:41 -0700 (PDT) X-Received: by 10.107.59.22 with SMTP id i22mr4183468ioa.177.1490978861438; Fri, 31 Mar 2017 09:47:41 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v128si6870702ioe.243.2017.03.31.09.47.41; Fri, 31 Mar 2017 09:47:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8801A77F08; Fri, 31 Mar 2017 16:44:04 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 6B14F77E3E for ; Fri, 31 Mar 2017 16:43:38 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id g2so18479845pge.2 for ; Fri, 31 Mar 2017 09:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ibaz+I1w8MltPVz+pm/6ODNTMsx442uVKAIktK5BQn8=; b=cd9qNeOfcE1sxSOtxNFgWSudN2weEVF4PdPVFDQ+3V9xhAnR8rJQw2Fs0bTVOHzxvN mW+huboyfqpCkvl0bXmiVbHGlEpieNdDx4TvQYnWT/fFLSsNu6f+r88YSu5INFrKMFxa emoC3g6QS4vaBYYX7a07tccKMoHgy5iDYw7YSlXjgHYyScmmNVPwr4k5+NeGihJQJA1w N5tttZ6VPef64dDHORBDnEtYW8I28gBh3ScWKGOw8uwdTqYss0Z18yRHRY8VQbyJ9z1U 2/f9695iThrXgmo1i0k1/C87dggWklkqnp8hUETvvlAInxd4Dtwe36M1uq/zQ4gc4S84 PZLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ibaz+I1w8MltPVz+pm/6ODNTMsx442uVKAIktK5BQn8=; b=EiVoMKZwHB/j2CVVpx5XBAt2LMK/S/htX6Y3pIw4osLzY4BpnrF6isaH8vF7g6O+ul kkhwnCyogXwh/Uij3V/8AUAWBfnHyhRt8r+Mjrm3aNrS1X64wcIpjFUAtu0VU4ITiJwg WWEG/8FTBUMRhU6NLy8UWDQmLFJ1iNPPtS1LTvUr4xzFYErHPaksxyNrIVyxEm99Avlb aIfvUizH/2Dyv0Sl9xkz5Pf7Av8qw1qGCqriSlYefo9qIY2wLqZdiNskkg/MC1gXJ00m 5Veo267xRJ01ZJxYzbjWwphRk1i6/WvvTP2ipB6PL7fPlSQ+A9Wb4Lo9NBCR2I9Dt/BX d/wQ== X-Gm-Message-State: AFeK/H0p6tWUWZsSV8CI7euPfWuIiDT1sUll2GDB0Csk9COOryk2d/nGLWff35p/YtEP5g== X-Received: by 10.84.202.194 with SMTP id q2mr4538093plh.108.1490978619375; Fri, 31 Mar 2017 09:43:39 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:34 -0700 Message-Id: <20170331164247.5052-30-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 30/43] libgxim: Fix build with security flags turned on X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch | 53 ++++++++++++++++++++++ .../libgxim/0002-Update-autotools-macro.patch | 31 +++++++++++++ ...string-qualifier-to-fix-potential-securit.patch | 30 ++++++++++++ meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 6 ++- 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch new file mode 100644 index 000000000..41e07f39f --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch @@ -0,0 +1,53 @@ +From d2ccba90186e2affbb3d146ada341ea2ae6fab2c Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 13 May 2013 16:05:32 +0900 +Subject: [PATCH 1/3] Use AM_CPPFLAGS instead of INCLUDES + +--- + docs/reference/Makefile.am | 2 +- + libgxim/Makefile.am | 2 +- + tests/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index 24986e1..f785735 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -84,7 +84,7 @@ expand_content_files= + # signals and properties. + # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) + # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +-INCLUDES= \ ++AM_CPPFLAGS= \ + $(GXIM_CFLAGS) \ + -I$(top_srcdir) \ + $(NULL) +diff --git a/libgxim/Makefile.am b/libgxim/Makefile.am +index 572bdb5..ae1ba32 100644 +--- a/libgxim/Makefile.am ++++ b/libgxim/Makefile.am +@@ -1,7 +1,7 @@ + ## + # Global definitions + NULL = +-INCLUDES = \ ++AM_CPPFLAGS = \ + $(GXIM_CFLAGS) \ + -I$(top_srcdir) \ + $(NULL) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 2926829..919ccc8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,7 +1,7 @@ + ## + # Global definitions + NULL = +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir)/libgxim \ + -I$(top_srcdir) \ + $(GXIM_CFLAGS) \ +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch new file mode 100644 index 000000000..808203b6e --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch @@ -0,0 +1,31 @@ +From 3215783732b147723e3613cc3c3f83cdcf2ae832 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 22 Jan 2014 18:59:32 +0900 +Subject: [PATCH 2/3] Update autotools macro + +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d559491..8b846a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,10 +11,12 @@ dnl V=0 to make. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AM_MAINTAINER_MODE +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4macros]) + +-AC_PROG_LIBTOOL ++LT_PREREQ([2.2]) ++LT_INIT([disable-static]) ++ + AC_PROG_INTLTOOL + + AC_PROG_CC +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch new file mode 100644 index 000000000..cb21e1ef4 --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch @@ -0,0 +1,30 @@ +From d05d7fa24ee128f1f33a2e905fc3601955dd27d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 18:06:02 -0700 +Subject: [PATCH 3/3] Add format string qualifier to fix potential security + risk + +Fixes +libgxim/gximprotocol10.c:2076:66: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + +Signed-off-by: Khem Raj +--- + libgxim/gximprotocol10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgxim/gximprotocol10.c b/libgxim/gximprotocol10.c +index 04887a5..65bd4df 100644 +--- a/libgxim/gximprotocol10.c ++++ b/libgxim/gximprotocol10.c +@@ -2073,7 +2073,7 @@ g_xim_protocol10_closure_real_parser_error(GXimProtocol *proto, + msg = g_strdup_printf("Unable to parse the protocol %s properly", + g_xim_protocol_name(major_opcode)); + +- g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg); ++ g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg); + switch (major_opcode) { + case G_XIM_CONNECT: + case G_XIM_AUTH_REQUIRED: +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 44b75315a..5bf7c6e33 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -10,7 +10,11 @@ HOMEPAGE = "http://code.google.com/p/libgxim/" SECTION = "System Environment/Libraries" SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ + file://0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch \ + file://0002-Update-autotools-macro.patch \ + file://0003-Add-format-string-qualifier-to-fix-potential-securit.patch \ + " SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a" SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79" From patchwork Fri Mar 31 16:42:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96484 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812669qgd; Fri, 31 Mar 2017 09:47:49 -0700 (PDT) X-Received: by 10.202.65.193 with SMTP id o184mr2331523oia.81.1490978869771; Fri, 31 Mar 2017 09:47:49 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k45si2833127otb.67.2017.03.31.09.47.49; Fri, 31 Mar 2017 09:47:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A102777E9D; Fri, 31 Mar 2017 16:44:05 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 1674B77E85 for ; Fri, 31 Mar 2017 16:43:40 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id 81so18583105pgh.3 for ; Fri, 31 Mar 2017 09:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MpCV5PvYEqgCZIqacTkuFqQ2404yGw/2ko/cALJg4U8=; b=hLLDyN889X/Y7JvpdGHa7exUWc/RTZWaYf3ER+OhVTGAuN+NNPggzJDigz6fbLftMG pc4+xH6rYR6AXwS1xSfunIKlnINw5ZIOoJ5Au0DQdpfLwjmkgGZadXBdhApOYAN9oKuW fGBxqad0+Ax4puPe5ZrnAwWhWLGYp9+No3nX4qUtCYVaS8W4lUb3GnE/MIy2ypOyUKfD RRhdt5+ora7mQJLGCnCiTMBzlUk4DtitKJ71ZyDhunl8ZPNav2SvqpS4J1AZQYuPGwrx 8fZxlvOznvh6hTJvI7DbmOgj49Y/Bu7cgNbthZ6AOFuSP1iIn5UWUSZslaaY87QdrRga qrHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MpCV5PvYEqgCZIqacTkuFqQ2404yGw/2ko/cALJg4U8=; b=LbBpGuVqovtRVs5pDNiG+I+lS4EATytvzgFFN5j3OSv0mvasxjC44eoC1ATbsEDSjY hIxpVOoDoe2S+M26cvjIafb808XJPPQgvWxdoFyJrB+ZEVM/PYHbWulVZOlhd5yKuv0U +iUOMAAEEKCl4y5V+g5FaORM8oGwCOfWs0GXdVI0BSShkr5vzz376iYG2V2ND2FpxiUj KEAWEucWhuPTvWNvtKMUFiXmf6auHJb5jYHoHhYBjEFI0GNQmi8eLYlAB3DzsOm1+vTX Cw+53qoEUfk0y+mYGNK8uSdmshgxeKhx4TR3BVEVKlKF+one0vE6Bunpv+cWnMwS15M3 obUQ== X-Gm-Message-State: AFeK/H2iQIwQYrnAXM5DNkSM69QAkn2wYfMNqJV7US0RMuwpfbd+/oDeBhvkB0z/GqNxmA== X-Received: by 10.84.247.23 with SMTP id n23mr4551705pll.39.1490978620721; Fri, 31 Mar 2017 09:43:40 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:35 -0700 Message-Id: <20170331164247.5052-31-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 31/43] vpnc: Update to build from github SRC_URI X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build for musl add packageconfig for crypto selection Fix build with externalsrc Signed-off-by: Khem Raj --- .../0001-search-for-log-help-in-build-dir.patch | 26 +++++++++ ... 0002-Fix-vpnc-install-for-cross-compile.patch} | 20 ++++++- ...003-error.h-is-specific-to-glibc-on-linux.patch | 30 ++++++++++ ...Use-pkgconfig-instead-of-libgcrypt-config.patch | 30 ++++++++++ ...ude-sys-ttydefaults.h-for-CEOT-definition.patch | 30 ++++++++++ ...header-include-sequence-to-adjust-for-mus.patch | 40 +++++++++++++ ...error-API-when-error.h-is-not-on-platform.patch | 66 ++++++++++++++++++++++ ...0008-include-sysdep.h-before-net-if_tun.h.patch | 36 ++++++++++++ .../recipes-connectivity/vpnc/vpnc/makeman.patch | 11 ---- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 41 +++++++++----- 10 files changed, 302 insertions(+), 28 deletions(-) create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch rename meta-networking/recipes-connectivity/vpnc/vpnc/{vpnc-install.patch => 0002-Fix-vpnc-install-for-cross-compile.patch} (73%) create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch delete mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch new file mode 100644 index 000000000..184c7943b --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -0,0 +1,26 @@ +From 48e16e9ae7d8e4c42282bd82cbbd9a6d346a5c00 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 1/8] search for log-help in build dir + +Signed-off-by: Khem Raj +--- + makeman.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makeman.pl b/makeman.pl +index cf241a1..2d73432 100755 +--- a/makeman.pl ++++ b/makeman.pl +@@ -30,7 +30,7 @@ my $vpnc = './vpnc'; + # indenting lists (those originally starting with an asterisk). I hope + # this pays off when converting the manpage to HTML or such. + +-open my $LONGHELP, '-|', "$vpnc --long-help"; ++open my $LONGHELP, '-|', "cat ./long-help"; + my $vpnc_options = ''; + my $relative_indent = 0; + my $indent_needed = 0; +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch similarity index 73% rename from meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch rename to meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 3de65ec35..6f00d3b89 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -1,6 +1,17 @@ ---- a/Makefile~ 2009-01-20 18:44:30.000000000 +0100 -+++ b/Makefile 2009-01-20 18:44:30.000000000 +0100 -@@ -119,21 +119,21 @@ +From d565b4a5e0045f1e40e0e462920ed5b8faca9eec Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 2/8] Fix vpnc install for cross compile + +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 69f5aca..a15782e 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,21 +133,21 @@ install-common: all else \ install vpnc-script $(DESTDIR)$(ETCDIR); \ fi @@ -33,3 +44,6 @@ uninstall : rm -f $(DESTDIR)$(SBINDIR)/vpnc \ +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch new file mode 100644 index 000000000..bb7730647 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -0,0 +1,30 @@ +From 6b49020893f999df56392b49b1a289cb96a113a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:08:17 -0700 +Subject: [PATCH 3/8] error.h is specific to glibc on linux + +Signed-off-by: Khem Raj +--- + sysdep.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 137bf6d..6a323f0 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -37,9 +37,10 @@ int tun_read(int fd, unsigned char *buf, int len); + int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + + /***************************************************************************/ +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__linux__) ++#if defined(__GLIBC__) + #include +- ++#endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 + #define HAVE_ERROR 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch new file mode 100644 index 000000000..f70a13898 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -0,0 +1,30 @@ +From 4d1dd61c04f52a7c796debbdea5fc9139ffa271d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:45:05 -0700 +Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a15782e..b537046 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,10 +63,10 @@ RELEASE_VERSION := $(shell cat VERSION) + CC ?= gcc + CFLAGS ?= -O3 -g + CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings +-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) ++CFLAGS += $(shell pkg-config libgcrypt --cflags) $(CRYPTO_CFLAGS) + CPPFLAGS += -DVERSION=\"$(VERSION)\" + LDFLAGS ?= -g +-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) ++LIBS += $(shell pkg-config libgcrypt --libs) $(CRYPTO_LDADD) + + ifeq ($(shell uname -s), SunOS) + LIBS += -lnsl -lresolv -lsocket +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch new file mode 100644 index 000000000..01783f45b --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -0,0 +1,30 @@ +From 1947ea776dc38c3377702dd89bd229670f4d948d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:06:52 -0700 +Subject: [PATCH 5/8] include sys/ttydefaults.h for CEOT definition + +Fixes + +config.c:146:25: error: use of undeclared identifier 'CEOT' + if (llen == 0 && c == CEOT) + +Signed-off-by: Khem Raj +--- + config.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.c b/config.c +index 804faa7..1883d12 100644 +--- a/config.c ++++ b/config.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch new file mode 100644 index 000000000..fa89df279 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -0,0 +1,40 @@ +From 56768fc0c2cbd6abcf28c9805ab516db8a0548d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:09:47 -0700 +Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl + +--- + sysdep.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 6a323f0..0122b95 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -17,16 +17,20 @@ + * __SKYOS__ + * + */ ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + #include + #include +-#include + + #if !defined(__CYGWIN__) +-#include +-#include ++//#include ++//#include + #include + #endif ++#include + + #include "config.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch new file mode 100644 index 000000000..de67b47a4 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -0,0 +1,66 @@ +From b6a027fe4da6f66552b533f1314e5005b16c5455 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:52:36 -0700 +Subject: [PATCH 7/8] add error() API when error.h is not on platform + +sign-off-by: Khem Raj +--- + sysdep.c | 24 ++++++++++++++++++++++++ + sysdep.h | 2 ++ + 2 files changed, 26 insertions(+) + +diff --git a/sysdep.c b/sysdep.c +index d8f181d..2518ec1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -17,6 +17,7 @@ + GNU General Public License for more details. + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -794,3 +795,26 @@ int setenv(const char *name, const char *value, int overwrite) + return ret; + } + #endif ++ ++#ifndef _ERROR_H_ ++#define _ERROR_H_ ++#include ++#include ++#include ++ ++void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ ++ fflush(stdout); ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ":%d", errnum); ++ if (status) ++ exit(status); ++} ++#endif /* _ERROR_H_ */ ++ +diff --git a/sysdep.h b/sysdep.h +index 0122b95..4e60064 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -44,6 +44,8 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + #if defined(__linux__) + #if defined(__GLIBC__) + #include ++#else ++void error(int status, int errnum, const char* format, ...); + #endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch new file mode 100644 index 000000000..62ffdb7c9 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -0,0 +1,36 @@ +From 7f01847d14a1a3af50f49499743b0551ddef1311 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:54:01 -0700 +Subject: [PATCH 8/8] include sysdep.h before net/if_tun.h + +Fixes duplicate defines in header errors + +Signed-off-by: Khem Raj +--- + sysdep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdep.c b/sysdep.c +index 2518ec1..5624ef1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -57,6 +57,8 @@ + #include + #endif + ++#include "sysdep.h" ++ + #if defined(__DragonFly__) + #include + #elif defined(__linux__) +@@ -69,7 +71,6 @@ + #include + #endif + +-#include "sysdep.h" + + #if !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || !defined(HAVE_ERROR) + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch deleted file mode 100644 index f394e6abd..000000000 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vpnc-0.5.1/makeman.pl.old 2008-03-16 02:17:59.000000000 -0500 -+++ vpnc-0.5.1/makeman.pl 2008-03-16 02:29:34.000000000 -0500 -@@ -29,7 +29,7 @@ my $vpnc = './vpnc'; - # indenting lists (those originally starting with an asterisk). I hope - # this pays off when converting the manpage to HTML or such. - --open my $LONGHELP, '-|', "$vpnc --long-help"; -+open my $LONGHELP, '-|', "cat ../long-help"; - my $vpnc_options = ''; - my $relative_indent = 0; - my $indent_needed = 0; diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 1aff0458d..6f92acd06 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -4,17 +4,39 @@ AUTHOR = "Maurice Massar vpnc@unix-ag.uni-kl.de" SECTION = "net" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" -DEPENDS = "libgcrypt" -inherit perlnative +DEPENDS += "libgcrypt" -EXTRA_OEMAKE = "-e MAKEFLAGS=" -CFLAGS_append = ' -DVERSION=\\"${PV}\\"' -LDFLAGS_append = " -lgcrypt -lgpg-error" +PV .= "r550-2jnpr1" +SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" +SRC_URI = "git://github.com/ndpgroup/vpnc \ + file://long-help \ + file://default.conf \ + file://0001-search-for-log-help-in-build-dir.patch \ + file://0002-Fix-vpnc-install-for-cross-compile.patch \ + file://0003-error.h-is-specific-to-glibc-on-linux.patch \ + file://0004-Use-pkgconfig-instead-of-libgcrypt-config.patch \ + file://0005-include-sys-ttydefaults.h-for-CEOT-definition.patch \ + file://0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch \ + file://0007-add-error-API-when-error.h-is-not-on-platform.patch \ + file://0008-include-sysdep.h-before-net-if_tun.h.patch \ + " + +PACKAGECONFIG ?= "gnutls" + +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[openssl] = ",,openssl" + +S = "${WORKDIR}/git" + +inherit perlnative pkgconfig + +#EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure_append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl + cp ${WORKDIR}/long-help ${S} } do_install () { @@ -34,12 +56,3 @@ vpnc_sysroot_preprocess () { CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" RDEPENDS_${PN} = "perl-module-io-file" RRECOMMENDS_${PN} = "kernel-module-tun" - -SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \ - file://makeman.patch \ - file://vpnc-install.patch \ - file://long-help \ - file://default.conf" - -SRC_URI[md5sum] = "4378f9551d5b077e1770bbe09995afb3" -SRC_URI[sha256sum] = "46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884" From patchwork Fri Mar 31 16:42:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96485 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812715qgd; Fri, 31 Mar 2017 09:47:58 -0700 (PDT) X-Received: by 10.36.137.4 with SMTP id s4mr4827239itd.63.1490978878047; Fri, 31 Mar 2017 09:47:58 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k93si6878631iod.100.2017.03.31.09.47.57; Fri, 31 Mar 2017 09:47:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B724D77F12; Fri, 31 Mar 2017 16:44:06 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id DD0DD77E98 for ; Fri, 31 Mar 2017 16:43:40 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id o123so18543533pga.1 for ; Fri, 31 Mar 2017 09:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zcj1dCc4sKIgHmE/DtBiStdmudFBnDIUNNm8hLZH+V0=; b=ob85bCBjKuxJToL5RTrnfXOSawv7lKmcgvA0BE8cq2TsNe4s+DulZX3aMBekutJVnH GhRL14ENbZF0+pYBSkXy8U+PCbl9A6ohhQY2hlIy7eufHqhBH5VCGiiGSo+2CVA7VCSH LM9D836UDl2UMDUjjxZSfLi+vYQ64JVxau8j6RKxR8WjeQI1h13ssZcMVIJ0P0EjTTvG NhAFPLIm5A8J+h45GEKlJYNFme+VHRkGYu1b8bEbCQGCKkqKMn8ib20MP0rNXSHPp/Ld hNuuhklG65cSnTALAvWUBuSiYEDDNSUQYGjSwAKBP8u/ZkZB6Rc4oX13HtI3lGegZmVM rQxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zcj1dCc4sKIgHmE/DtBiStdmudFBnDIUNNm8hLZH+V0=; b=jn8Ac22d9pAVwjfhNT3A7dfYqRA1jpbHiXPiG8liFK9f+7lRLFOyrr3L0YHQhSgla5 tC6G3hd325crDxgKKshNlXzRwacNv++qhqfZh7sU3ryGLw09ryb9jI9oEFPuWXmERsFw QbsQNpM3Vc+EpfXEXPlWFI6o6z82Z124NYETEpHgme3Qsjy3GYPPwAn4MUI1kwamL38G 7qimAiMj03bt9frPTEV8wpQmtHyqZ5J6IEZ1FwWIGpNwyHLQZjmoeEp06fLQ4I6L36lI Cy3byrsj0OyY1zfOU0nlXAy1tWbyB20C+vOW8CGwl79s8g5y/LOXX7ochdPMx/Xq4TRY x7UQ== X-Gm-Message-State: AFeK/H024R7mmbSmolmc4Lk0iw+7Yem209yFeEKoP1nDV3oegyBU611WtEeWTkKMA2FruA== X-Received: by 10.98.208.65 with SMTP id p62mr3652477pfg.239.1490978622180; Fri, 31 Mar 2017 09:43:42 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:36 -0700 Message-Id: <20170331164247.5052-32-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 32/43] daq: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org unistd.h is not in sys/ on all platforms use standard location in /usr/include to look for it Signed-off-by: Khem Raj --- .../recipes-connectivity/daq/daq_2.0.6.bb | 4 ++- .../0001-correct-the-location-of-unistd.h.patch | 29 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 952d7a42d..47cb163e6 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -9,7 +9,9 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ - file://disable-run-test-program-while-cross-compiling.patch " + file://disable-run-test-program-while-cross-compiling.patch \ + file://0001-correct-the-location-of-unistd.h.patch \ + " # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch new file mode 100644 index 000000000..4798a77f5 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -0,0 +1,29 @@ +From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 15:59:43 -0700 +Subject: [PATCH] correct the location of unistd.h + +Signed-off-by: Khem Raj +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb0..c2a4175 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include + #include + #include ++#include + + #include + #include +-#include + + #include + #include +-- +2.12.1 + From patchwork Fri Mar 31 16:42:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96486 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812776qgd; Fri, 31 Mar 2017 09:48:06 -0700 (PDT) X-Received: by 10.107.141.134 with SMTP id p128mr3868159iod.83.1490978886938; Fri, 31 Mar 2017 09:48:06 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o13si3158652ith.112.2017.03.31.09.48.06; Fri, 31 Mar 2017 09:48:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 03A3977F1A; Fri, 31 Mar 2017 16:44:08 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by mail.openembedded.org (Postfix) with ESMTP id B55D977EA2 for ; Fri, 31 Mar 2017 16:43:42 +0000 (UTC) Received: by mail-pg0-f46.google.com with SMTP id g2so75167806pge.3 for ; Fri, 31 Mar 2017 09:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3rrpETB2hawPtBIKTaZnQM4nAYe9t77Icz7NAS5e8aw=; b=kGzGmrlUUk6Nhbfhpy/TDYsl+JMhpflmwOhDC+3lNz913b3a0K7h5udPPnxFtw5MUf jGqB0YddMyZCQV0njcl6SB9GNvXK/4ugQmCebv92+gvfGiU+N+AuTwerAgC2IidoDaSO FrEreXmP50GCMDoi7nINTUVPbOEhD0zGyIbbxQoX3RL5l4ARcHU+iGN/ZDW1R/t/irjm yqIyZzkBNbVshC4FNH37WN7MzwcgYBHfQTyZVE+hb0EFZYUGGPH2HyN0vgzNoJE6oG58 9noxLxxqhxM+YSuyEYBXGnDgs4APEDR7cPCx5ph/IQQUcu8nzfb89nvFWZu3XjMORfcm 3kYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3rrpETB2hawPtBIKTaZnQM4nAYe9t77Icz7NAS5e8aw=; b=DSMSKNzpTvPsnH0HW1DXjxqRnR6gbLKPcqcYpte/be/99O3/6xQy8Efq8ecckL1BC2 kaI3D34oiVvrOu1bxdzOh/BjyDtOBKPnTFe472oXZWdzgszV4eXKlQ5r+hiIx7GhmUDa wRzzNVe5C3PLPVRT1ykRymL0WI2gcUAn/AYNfKm7Kvlu/lh8KytUFoZU4cz3AC5/rSZV JuUPya0DgRR1/rV19gZZK3CdUzF8n5hT1RFAuWQdOdz/bCjSJlNn5lGWozsu+/3x3oQ/ 6rHy3PyjyRzn5MAZZCbwwY4eiosXhra+pE7tYYaThn7/gxXqWI6xmEQ3b4aymTP7jpgx MOaw== X-Gm-Message-State: AFeK/H0kfhyPm6JJ9+UoXhb3P/Fz4WyYMKHvvEfoamp4bmkeF3lFHONabeU4n+GYppqImw== X-Received: by 10.98.67.157 with SMTP id l29mr3853484pfi.251.1490978623809; Fri, 31 Mar 2017 09:43:43 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:37 -0700 Message-Id: <20170331164247.5052-33-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 33/43] utouch: Fix build on musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...sys-stat.h-for-fixing-build-issue-on-musl.patch | 29 ++++++++++++++++++++++ meta-oe/recipes-support/utouch/utouch-frame_git.bb | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch new file mode 100644 index 000000000..f3c8eeb41 --- /dev/null +++ b/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -0,0 +1,29 @@ +From 08b17ec505e09e8f5a4d73ffc3aa61561ec2e0da Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 00:27:54 -0700 +Subject: [PATCH] include sys/stat.h for fixing build issue on musl + +error: field has incomplete + type 'struct stat' + struct stat fs; + +Signed-off-by: Khem Raj +--- + tools/utouch-frame-test-mtdev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/utouch-frame-test-mtdev.c b/tools/utouch-frame-test-mtdev.c +index 5253320..2032af4 100644 +--- a/tools/utouch-frame-test-mtdev.c ++++ b/tools/utouch-frame-test-mtdev.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include "common-defs.h" + + struct frame_test { +-- +2.12.1 + diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 6ec566ddb..39d46af8e 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -10,7 +10,9 @@ DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ - file://remove-man-page-creation.patch" + file://remove-man-page-creation.patch \ + file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ + " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" PV = "1.1.2+git${SRCPV}" From patchwork Fri Mar 31 16:42:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96487 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812825qgd; Fri, 31 Mar 2017 09:48:14 -0700 (PDT) X-Received: by 10.202.51.9 with SMTP id z9mr2161393oiz.25.1490978894113; Fri, 31 Mar 2017 09:48:14 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g5si1934525otf.302.2017.03.31.09.48.13; Fri, 31 Mar 2017 09:48:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1ACF077F1E; Fri, 31 Mar 2017 16:44:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id EF1F877EA5 for ; Fri, 31 Mar 2017 16:43:43 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id g2so18480276pge.2 for ; Fri, 31 Mar 2017 09:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lq7ysmnLtqWoFzrnsj2Giwv2EAJ4oHSygfrPgbpfwx4=; b=c4xuCHD8N1jD6kNRyu0Hbu/7ip4tJxDPCMZz6BuEYnWN+ARKoaD8Y3HN7BjlQLF5zQ fAQXliQnJOmjN+Fs5k+LknG30rIMIMcTVfvy8+Zjj+i1LiqrAPCI248bPpN6sTQnpNNk E2bFHzw4O1hSO16RFHntMgr3hn/TNk7V1rXKRF/CvDDa8aTjT5MZU2eOTNNLPmLcAphe dUXYqlRYHGQdhYFRBZoDvIKalLRfuGS36YqpmHNjR0raApaYD8EgPiWGMnaRtd+PeC1I 33zgTpIyDBnmQVWRgPq2P7ksuKdq86b0Q/LgJUqLtMGlNakjbqCD43wBYi522WM4li8E wbqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lq7ysmnLtqWoFzrnsj2Giwv2EAJ4oHSygfrPgbpfwx4=; b=JzfgPA02q1XAHGXWJDDuS321xXD52rjDfA79Lq0JV7PHxOvp3S2E1sx6NAipVT86Hf OXNKmRxNBaaXIaInQjQEuQUD0YXMrccyLCIwDo4+WVtXyyBsvRRO7ypDqO545HWjou6b aEn02jW8j6chiEcPmzgdhFCmOyMGXXjbzO4aqatDy46N51xpydDSYlKdnmNDE31SBmHD QYXavnvXzMCy20c6lpKOm3KuCowsaafVbgoW8RgWrlPGiOcLbDOqL3Pc3IngggF2rEL1 A61B+BsdEu6MRX7cT7SkpzEgtzXfrTjyO4fPwIODgDD6CkQ5qgFKzRkCsDYUBUrAZjtk +D3g== X-Gm-Message-State: AFeK/H3V4CCj2qh8IpTrXUarrgUW3Ts8R5VbkgI4iXkfQ+o9RT1irOTk8zmINkPs/G/4Cw== X-Received: by 10.98.160.19 with SMTP id r19mr3726620pfe.16.1490978625191; Fri, 31 Mar 2017 09:43:45 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:38 -0700 Message-Id: <20170331164247.5052-34-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 34/43] libavc1394: Add libargp on musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb b/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb index 97e2bf1b4..f5b0d48c4 100644 --- a/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb +++ b/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://sourceforge.net/projects/libavc1394/" SECTION = "libs/multimedia" DEPENDS = "libraw1394" +DEPENDS_append_libc-musl = " argp-standalone" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" @@ -13,3 +14,5 @@ SRC_URI[md5sum] = "caf0db059d8b8d35d6f08e6c0e1c7dfe" SRC_URI[sha256sum] = "7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53" inherit autotools pkgconfig + +LDFLAGS_append_libc-musl = " -largp" From patchwork Fri Mar 31 16:42:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96490 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp812964qgd; Fri, 31 Mar 2017 09:48:37 -0700 (PDT) X-Received: by 10.157.73.143 with SMTP id g15mr2179019otf.140.1490978917113; Fri, 31 Mar 2017 09:48:37 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l3si2835185otl.10.2017.03.31.09.48.36; Fri, 31 Mar 2017 09:48:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4E19B77ECA; Fri, 31 Mar 2017 16:44:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id C0A8C77E55 for ; Fri, 31 Mar 2017 16:43:48 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 81so18583890pgh.3 for ; Fri, 31 Mar 2017 09:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ULsBflLudffA1tLA/iwob6NxauD83Cauw7KEXBJdCMo=; b=JF78OmKIXHac2ad1f0yU6ammpjJU5yOB74mW6vV6JXDGEFrvXmjAlEz/Q2nbJEHD2f gDozp5GoUi2hDFshN/9YR33jPpMbjw+S/itHSZXkqPqZqosG4Z6no2N5a3GW72VIqf4W Sk6snzhi9NBvV5dNkfqIT/wkvWIFG3FEjwQyu9MGGJRdyDuNzeGQwOkUbT3gOppT9BL5 gkSGmboHa5tCZ0HpyL4S0PADXuDWfe09X1W5ZI5kPoVM7mKGwJWUWeFQ4DbyKJUKhArd wq77ODDEz2HUjXU6dxR8roIWx/doM3gfd7235RJJskScqX+SshUb0NmF9GrzEGZiN/Ka /Eww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ULsBflLudffA1tLA/iwob6NxauD83Cauw7KEXBJdCMo=; b=EDiWJEKfCnoH+LX43vHxXLTiTxDQNZUmSkxXfHAp2mFsM04iFNRbA1bl8WzCShJ29C L4DKtXlMSw0WnyzZEhOcDzRnAl8vk8s0Jip0yFKp+A08facXHPikp3pwdHVPcY8co+6v UafBMlV6udfifk/piBNHjgwBU1r7XogYW2Y0s7yjcQs91PvFbxsImp13tNNfxdjAGhdq h5M9iK0or2OykB/wnC+Y7raP4pacXaXdz9aiWJ7vQWtkB246rcPW4sGcs+xtFKaSYXli zA07An4fHUWoORGFVr3jJ04oNgl5f7pjO2LTdKqNL1y2qpMpdDZKkPj0FtyboYWIzDwJ GNnQ== X-Gm-Message-State: AFeK/H0GApXtN5t0OiJsYbHQDP47dZT++uVHB1WLLoCjBUkNA3crgiqND8SOTHa7bVGxkQ== X-Received: by 10.98.87.216 with SMTP id i85mr3813248pfj.151.1490978629881; Fri, 31 Mar 2017 09:43:49 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:48 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:41 -0700 Message-Id: <20170331164247.5052-37-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...formatting-string-to-printf-like-function.patch | 43 ++++++++++++++++++++++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch new file mode 100644 index 000000000..2d7eb9a5d --- /dev/null +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch @@ -0,0 +1,43 @@ +From baf93ea9acf845c5455d577ac19a6f680dac3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 11:22:42 -0700 +Subject: [PATCH] Add proper formatting string to printf-like functions + +Avoids potential security holes and makes compiler happy + +| ../../../../../../../workspace/sources/xarchiver/src/window.c:236:72: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] +| gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); + +Signed-off-by: Khem Raj +--- + src/window.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/window.c b/src/window.c +index ca2f69f..3b10e2c 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -231,9 +231,9 @@ int xa_show_message_dialog (GtkWindow *window,int mode,int type,int button,const + { + int response; + +- dialog = gtk_message_dialog_new (window,mode,type,button,message1); ++ dialog = gtk_message_dialog_new (window,mode,type,"%s",button,message1); + gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_NO); +- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),"%s",message2); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + return response; +@@ -511,7 +511,7 @@ void xa_list_archive (GtkMenuItem *menuitem,gpointer data) + g_fprintf (stream,_("Comment:\n")); + if (bp) + g_fprintf(stream,"
");
+-			g_fprintf (stream,archive[idx]->comment->str);
++			g_fprintf (stream,"%s",archive[idx]->comment->str);
+ 			if (bp)
+ 				g_fprintf(stream,"
"); + g_fprintf (stream,"\n"); +-- +2.12.1 + diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index ca299223d..ea34a52c1 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master \ + file://0001-Add-proper-formatting-string-to-printf-like-function.patch \ + " SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" PV = "0.5.3" S = "${WORKDIR}/git" From patchwork Fri Mar 31 16:42:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96491 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp813005qgd; Fri, 31 Mar 2017 09:48:45 -0700 (PDT) X-Received: by 10.157.11.225 with SMTP id 88mr2226223oth.85.1490978925044; Fri, 31 Mar 2017 09:48:45 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t5si2821749oib.227.2017.03.31.09.48.44; Fri, 31 Mar 2017 09:48:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 608FA77F29; Fri, 31 Mar 2017 16:44:13 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 3513277EC1 for ; Fri, 31 Mar 2017 16:43:50 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 79so18588273pgf.0 for ; Fri, 31 Mar 2017 09:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Uguvi2TyClDDIZCni1lWGK6YDbpNydcMzgsXPC+dnRw=; b=RjIvQUullb763eng4ZG+9TpXQWrQpd0/GCit8AvS1outXqDVpLPqNPfM5FoSbWNh6p l/hN1EmrfM9C8yZV+jZIYv0QFR6PMYfL2yJ5vFlJSuLLM6FdOg67Pivl2ssW67xKrEA4 eVKOYM7aCwB8cHXCR5oIepbODcIzNdeGriAJQI8x9fE/hUhrcXoZyM05WoCL/ywyfPHW sljcruoNppEHohPGFHv4zbxXcWCEAVTnEaYwSaZnE02EIzaN+CI8oQcDmzadC9U4ibvH xBUu9/oFBGwiyHlybZV5B+eI4VYrHuwj1JxE9fjikbsg7N621xk1tJYFvxQrE+aV+A8b V//Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Uguvi2TyClDDIZCni1lWGK6YDbpNydcMzgsXPC+dnRw=; b=eCBZYzUqv15VjgAj4PJNd+iXYo+/zDFgHMMHZJLkugBnm6FWVXgltTVQb+uBUTF/JL 47md8o7dmLXxh8yuzxJIv33AQKaA9B1vmv5gKLVX0cO9+ksq9rkZSlj4Rrw45uAwp82N XQsr2mjOxNpHSX4kQp1peW9RQSihuIjGfQqvuG1c7j+vt/UMU6K2UhBRwkm76WrJMdID dMnHbI6i3lC72/cXJ7BArdHJOGn7UFO1oYOgdsvuCvIbS07i3pszvMvfzSHlDzqA+MmE Q3OdCHjsIFzmVqxVCtHskvJ0711vTl25chHQhys4UIEiB1mkS6eEMzQ7EaVAVaG0R/jS 0uNA== X-Gm-Message-State: AFeK/H1PdSKS1waJjUYcEpdZp5vIpidwQc2udQ2ktC3S+juY9vYTbO7KTxhcMQz2dyUqSg== X-Received: by 10.98.47.4 with SMTP id v4mr3219301pfv.86.1490978631330; Fri, 31 Mar 2017 09:43:51 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:50 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:42 -0700 Message-Id: <20170331164247.5052-38-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 38/43] arptables: Upgrade to 0.0.4 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Switch the SRC_URI to git based fetcher Signed-off-by: Khem Raj --- .../arptables-compile-install.patch | 61 ----------------- ...FLAGS-for-package-specific-compiler-flags.patch | 79 ++++++++++++++++++++++ .../arptables-arpt-get-target-fix.patch | 0 .../arptables-init-busybox.patch | 0 .../arptables-remove-bashism.patch | 0 .../arptables.service | 0 .../{arptables_0.0.3-4.bb => arptables_git.bb} | 43 ++++++------ 7 files changed, 98 insertions(+), 85 deletions(-) delete mode 100644 meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch create mode 100644 meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-arpt-get-target-fix.patch (100%) rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-init-busybox.patch (100%) rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-remove-bashism.patch (100%) rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables.service (100%) rename meta-networking/recipes-support/arptables/{arptables_0.0.3-4.bb => arptables_git.bb} (61%) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch deleted file mode 100644 index 80e980472..000000000 --- a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: arptables-v0.0.3-4/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/Makefile 2010-03-22 15:52:56.000000000 +0300 -@@ -6,12 +6,11 @@ - LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= - --COPT_FLAGS:=-O2 --CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" - - ifndef ARPT_LIBDIR - ARPT_LIBDIR:=$(LIBDIR)/arptables -@@ -22,16 +21,16 @@ - all: arptables - - arptables.o: arptables.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables-standalone.o: arptables-standalone.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^ - - $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 - mkdir -p $(@D) -@@ -50,6 +49,7 @@ - cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_ - install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ -+ install -d $(DESTDIR)$(INITDIR) - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - -Index: arptables-v0.0.3-4/extensions/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/extensions/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/extensions/Makefile 2010-03-22 15:52:38.000000000 +0300 -@@ -4,4 +4,7 @@ - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) - - extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -+ -+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch new file mode 100644 index 000000000..e8be45e6b --- /dev/null +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -0,0 +1,79 @@ +From a2021f0bc0f029dfa05dcca5db3d2ec77904d41a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 12:33:51 -0700 +Subject: [PATCH] Use ARPCFLAGS for package specific compiler flags + +This leaves room for setting CFLAGS in environment +which OE uses to pass tweaks + +Signed-off-by: Khem Raj +--- + Makefile | 15 +++++++-------- + extensions/Makefile | 5 ++++- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 7bead0d..336db6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib + BINDIR:=$(PREFIX)/sbin + MANDIR:=$(PREFIX)/man + man8dir=$(MANDIR)/man8 +-INITDIR:=/etc/rc.d/init.d ++INITDIR:=/etc/init.d + SYSCONFIGDIR:=/etc/sysconfig + DESTDIR:= + + MANS = arptables.8 arptables-save.8 arptables-restore.8 + +-COPT_FLAGS:=-O2 +-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG +- ++ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" + ifndef ARPT_LIBDIR + ARPT_LIBDIR:=$(LIBDIR)/arptables + endif +@@ -25,13 +23,13 @@ include extensions/Makefile + all: arptables libarptc/libarptc.a + + arptables.o: arptables.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + arptables-standalone.o: arptables-standalone.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.a: libarptc/libarptc.o + $(AR) rcs $@ $< +@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv + install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore + cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi ++ install -d $(DESTDIR)$(INITDIR) ++ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables + rm -f arptables-save_ arptables-restore_ arptables.sysv_ + + .PHONY: install-man +diff --git a/extensions/Makefile b/extensions/Makefile +index 0189cc9..b046425 100644 +--- a/extensions/Makefile ++++ b/extensions/Makefile +@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK + EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) + + extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h +- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< ++ ++extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< +-- +2.12.1 + diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch b/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/meta-networking/recipes-support/arptables/arptables/arptables.service similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service rename to meta-networking/recipes-support/arptables/arptables/arptables.service diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_git.bb similarity index 61% rename from meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb rename to meta-networking/recipes-support/arptables/arptables_git.bb index f53640847..274a55d91 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,15 +1,13 @@ SUMMARY = "Administration tool for arp packet filtering" -LICENSE = "GPL-2.0" SECTION = "net" - -PR = "r2" - -RDEPENDS_${PN} += "perl" - +LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" +PV = "0.0.4+git${SRCPV}" + SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ - file://arptables-compile-install.patch \ + git://git.netfilter.org/arptables \ + file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ file://arptables-remove-bashism.patch \ @@ -18,26 +16,23 @@ SRC_URI = " \ SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" -S = "${WORKDIR}/arptables-v${PV}" - -do_compile () { - oe_runmake -} +S = "${WORKDIR}/git" +SYSTEMD_SERVICE_${PN} = "arptables.service" -# the install target is not multi-job safe, but it doesn't do much -# so we just install serially -# -PARALLEL_MAKEINST = "-j1" +inherit systemd -fakeroot do_install () { - oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install -} +EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'" do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + fi } -inherit systemd +RDEPENDS_${PN} += "perl" -SYSTEMD_SERVICE_${PN} = "arptables.service" +# the install target is not multi-job safe, but it doesn't do much +# so we just install serially +# +PARALLEL_MAKEINST = "-j1" From patchwork Fri Mar 31 16:42:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96492 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp813045qgd; Fri, 31 Mar 2017 09:48:53 -0700 (PDT) X-Received: by 10.36.105.85 with SMTP id e82mr4399794itc.113.1490978933409; Fri, 31 Mar 2017 09:48:53 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v16si3183457itb.66.2017.03.31.09.48.53; Fri, 31 Mar 2017 09:48:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 75F3777F2C; Fri, 31 Mar 2017 16:44:14 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id C9AC577E50 for ; Fri, 31 Mar 2017 16:43:51 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id g2so18481012pge.2 for ; Fri, 31 Mar 2017 09:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uaUD7GyFwn1mvA0H3ET8kMrkuDYLbTLxRAAr31ZPXDs=; b=ttw0seWFrOlTgc1io2PN1uQGd/2HVeGEuNL8q5AfzCdl6u1E03RRyWFnIAC4lQ2ky+ cbRdvmAwtRTtvn+DOsaLLqSdi3HIIBTEgacUeu8PTt5o7p2mnGUUmXa5+bd7T9PVDNUs SLUvmv9bzHCmzDeGJojDBxgvStUfDWzp9vDus4HUytj9WrqZbAPuwR875MOkgISqOONz ZA6ouOlNenCyOtoYaiMMhASeWXN3tGbyjxxpO1sS5fGK+PSsZvuLiJ4Ldh0jTQHdqhSr MY9zoIwGtMzuwhSBXk1XhuXaBpQqKj8rE1aDi6YWFEr76oIAIb6dQr1UM6LMPju9u7Zr GQxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uaUD7GyFwn1mvA0H3ET8kMrkuDYLbTLxRAAr31ZPXDs=; b=kbsRAoRMlNNaWBaA46e8zIeIbJ6dvuuAFl7OLun7Nw92zMHnIgkfPV7bCe44T9O4L9 DRmqGNbHpG+v1t89iz5JwTMgE8+RJL5rgcxNUgAsueDJFlMbowZw5iPUUp4Lrbbwe3s4 Dp5VFcD4nq3XPC4Sy5dyJ2PP6KbGfNlw+D04evmu+i/yvOG9rLbrUeY64jSgIrdNmppe klbKnl/25hTHIALoOgE80lM+lTplv564Y9QNXlKb1hL9Mg4t/fCsbmm6ky9xDd5emnoJ glPNJL25mG22OfaD7WObIITN9NY3uG4jVVNPSkAF3nSzstnFsIqo8TXr7wYFiv1m7ToS PAgQ== X-Gm-Message-State: AFeK/H3lhZ+qWni3j6RrwKzlvVX9IyT3f0vqs7fqKbihgVzr9MR20GUGE1Uimj9DPAJx3g== X-Received: by 10.98.18.66 with SMTP id a63mr3742456pfj.188.1490978632766; Fri, 31 Mar 2017 09:43:52 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:51 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:43 -0700 Message-Id: <20170331164247.5052-39-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 39/43] libnetfilter-log: Switch to git URI X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Move to tip of tree which has needed fixes for musl build add missing dependency on libmnl Signed-off-by: Khem Raj --- .../recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb index 30c9ae6bc..2f627d458 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libnfnetlink" +DEPENDS = "libnfnetlink libmnl" +SRCREV = "ba196a97e810746e5660fe3f57c87c0ed0f2b324" +PV .= "+git${SRCPV}" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "2a4bb0654ae675a52d2e8d1c06090b94" -SRC_URI[tar.sha256sum] = "74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21" +SRC_URI = "git://git.netfilter.org/libnetfilter_log" -S = "${WORKDIR}/libnetfilter_log-${PV}" +S = "${WORKDIR}/git" inherit autotools pkgconfig From patchwork Fri Mar 31 16:42:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96493 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp813089qgd; Fri, 31 Mar 2017 09:49:01 -0700 (PDT) X-Received: by 10.107.59.22 with SMTP id i22mr4191845ioa.177.1490978941225; Fri, 31 Mar 2017 09:49:01 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i64si6907771ioo.31.2017.03.31.09.49.00; Fri, 31 Mar 2017 09:49:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8A67877F30; Fri, 31 Mar 2017 16:44:15 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 28A2977EC5 for ; Fri, 31 Mar 2017 16:43:53 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 81so18584259pgh.3 for ; Fri, 31 Mar 2017 09:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5Ozg7DewfVntZx3Z3FEB3gnQAijPP51vxYrj72rAEp0=; b=J0dDlaflbow2lqrSN/HvboAJH/YKlWMIF4X678lqxXlQ0naWr2h9LhrMxBWNLJsAv2 0NLYzCjWvAoD12JEOWASpUq1L++mDRVzQeXropXan3IMIs+HAJXkChObibEeHww1VuTq +ZAhwJesKDKvCniYyQ5usyFAPHgw3zMLX6cG8xEIRlmrUlhQngwWzFFM2NGRY3hAI7rd gbm+m41MT98GX791jNCUNIRFl46raRxhilHNGC2rW00uyZUQlBd5t9yHOwyMDrdU1IsJ U/yT60h1hOW7k2Dvt07I2Dofy/Z9lAuoD8yfAUSn5wGVxyWLbqbMw2fxKlC20uDN+HHI lkUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5Ozg7DewfVntZx3Z3FEB3gnQAijPP51vxYrj72rAEp0=; b=NLwgfj+djBkmIDIpMTFhIfzHnziDxJeCQqoNCm2gyMNvhGtHEw/Wq2qNvOexBvXDsT hYh8mQhQcZBFCB9X+RlrxhLTqbQwWS300G6DbQ4xDOcnrQJDO8Mr/6ZptfuVeoxUIh4T I+MovE9t/5rHY5Rw9IuXBNhFgjb4omJiMlpEK8b5alq65oUSwvYaS7uR/PYeUwjTP+pb Do+lqylvo6/1FpX3pGQIBOlDilnPILDOfwaQe547d1c5QQL/8lz2aI+yXFPHegnSPRLw ocRGKg+da+yV6vwrl1LDyxTCoh8owtrUv0mqoW8Khw5S8vCvoQW51H8S1mjvo7QVXjGm TwoA== X-Gm-Message-State: AFeK/H36XSVLm2tOZlUYlTFglT4DZ3Z3zFegSAw62v5skwRNJ9cqrI3kgjvHB/h1Pf2gVg== X-Received: by 10.99.51.200 with SMTP id z191mr4145019pgz.137.1490978634383; Fri, 31 Mar 2017 09:43:54 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:53 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:44 -0700 Message-Id: <20170331164247.5052-40-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 40/43] lxdm: Find libexecinfo if its on platform X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org fixes build with musl Signed-off-by: Khem Raj --- ...-for-libexecinfo-providing-backtrace-APIs.patch | 36 ++++++++++++++++++++++ meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 16 +++++----- 2 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch new file mode 100644 index 000000000..f9fd4970f --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch @@ -0,0 +1,36 @@ +From 1d2425febf2020e38db70188df582acc9f37b136 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:01:33 -0700 +Subject: [PATCH] check for libexecinfo providing backtrace() APIs + +on musl it depends on external library to provide backtrace APIs +unlike glibc where it is bundled in + +Signed-off-by: Khem Raj +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index aa3291c..b15f65d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ AM_PROG_CC_C_O + + # Checks for libraries. + AC_CHECK_LIB([crypt], [crypt]) ++AC_CHECK_LIB([execinfo], [backtrace]) + + # Check for PAM support + AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]), +@@ -33,6 +34,7 @@ AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ]) + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_PID_T +-- +2.12.1 + diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 407129dde..c98c3a132 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -2,13 +2,13 @@ SUMMARY = "LXDM is the lightweight display manager" HOMEPAGE = "http://blog.lxde.org/?p=531" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ - file://lxdm.conf \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ - ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ - file://0002-let-autotools-create-lxdm.conf.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ + file://lxdm.conf \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ + ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ + file://0002-let-autotools-create-lxdm.conf.patch \ + file://0001-check-for-libexecinfo-providing-backtrace-APIs.patch \ + " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" @@ -16,6 +16,7 @@ PE = "1" DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" +DEPENDS_append_libc-musl = " libexecinfo" # combine oe-core way with angstrom DISTRO_TYPE DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" @@ -25,6 +26,7 @@ inherit autotools pkgconfig gettext systemd distro_features_check REQUIRED_DISTRO_FEATURES = "x11" CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " +LDFLAGS_append_libc-musl = " -lexecinfo" EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ From patchwork Fri Mar 31 16:42:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96494 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp813148qgd; Fri, 31 Mar 2017 09:49:11 -0700 (PDT) X-Received: by 10.107.151.208 with SMTP id z199mr4097655iod.98.1490978951508; Fri, 31 Mar 2017 09:49:11 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n205si6889907iod.84.2017.03.31.09.49.10; Fri, 31 Mar 2017 09:49:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0E60F77EC9; Fri, 31 Mar 2017 16:44:17 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 2DDEB77ECE for ; Fri, 31 Mar 2017 16:43:54 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 79so18588648pgf.0 for ; Fri, 31 Mar 2017 09:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MWiqbi0krI3glOIoK6zKNnuchUkDMFX8uyJnUVBuz98=; b=Bz24YbkB/EcGjkEx1AKgCQDnk/8IZgv19+S8uLqHuCGKjsfAfAbwRn9UQ4ZYlMztE+ 2lIWWmozQ85OqI0XbvK/bSneFHQnnEKnajzbaQnJt9saF4rLOPX09+tq7ZnoNyGsfr1S SoC6VRNdsHUgKXwfrbPRRZGuTyShUGwXPMINbZ/ycZgvsB1/DyuIi8DxcrP7Yff5V6sT 3T3YS3m/GVLKhD0eNcm43973YIpxuYtZZ7kVVWsJ6uliHrfMOkTynPnj+L4BgkMid4ZM BJAEKhPqggZFfTDvbyGmmDXwNEcUpk6qaeH0OjUFJeB8V2HKuPPYIc/+yk5uqgtGFrpe TJEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MWiqbi0krI3glOIoK6zKNnuchUkDMFX8uyJnUVBuz98=; b=s2udg1/B02V2akPYlE180uKJRY0A2SENYcLwgCquSKy2B8kuEyjmHdvJ2an4GgwVrn 4g7L8X4e4lqe9xTGm4cze2dOVWLPvkur/kViDwnQwc/mQZgvp0vUjxs9D7vEzvvbF4/R DjoROS66kbu4Ig//vDg7sIffr2X0DabQ6KTwcCng+VNbgTNbHrm9vDbnwDePxguxqyFk QWjsQ+tdV771u4GgHaRBnojVnSNcxA+I0LQP5nWsVgZmwjo43R4Z+zYr1D4niJuYESli A09XwHywneL0iHMxkmEktKO/noh3lz+B3zwD8pua059P6e851RsNzjvsxyrnGAeL5wQ9 8/eQ== X-Gm-Message-State: AFeK/H1ujV2YfhQt+VQ2DM1K9wrnnYe9Qff8tGHiITESJIV4YmEKsmw7PXx8l/vGtUtCQw== X-Received: by 10.98.211.81 with SMTP id q78mr3653239pfg.97.1490978635763; Fri, 31 Mar 2017 09:43:55 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:54 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:45 -0700 Message-Id: <20170331164247.5052-41-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 41/43] libnetfilter-queue: Update to git for SRC_URI X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org brings in the fixes to build on musl Add a typo fix patch Signed-off-by: Khem Raj --- ...o-in-the-location-of-internal.h-in-includ.patch | 26 ++++++++++++++++++++++ .../libnetfilter/libnetfilter-queue_1.0.2.bb | 11 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch new file mode 100644 index 000000000..76d2d5d28 --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch @@ -0,0 +1,26 @@ +From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:26:56 -0700 +Subject: [PATCH] Correct typo in the location of internal.h in #include + +Signed-off-by: Khem Raj +--- + src/libnetfilter_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c +index 211a8ba..065d618 100644 +--- a/src/libnetfilter_queue.c ++++ b/src/libnetfilter_queue.c +@@ -32,7 +32,7 @@ + + #include + #include +-#include "src/internal.h" ++#include "internal.h" + + /** + * \mainpage +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb index ddf2aa5c4..0ca074ca3 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb @@ -6,10 +6,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "df09befac35cb215865b39a36c96a3fa" -SRC_URI[tar.sha256sum] = "838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32" +PV .= "+git${SRCREV}" +SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" -S = "${WORKDIR}/libnetfilter_queue-${PV}" +SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ + file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ + " + +S = "${WORKDIR}/git" inherit autotools pkgconfig From patchwork Fri Mar 31 16:42:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96495 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp813200qgd; Fri, 31 Mar 2017 09:49:19 -0700 (PDT) X-Received: by 10.107.7.29 with SMTP id 29mr4281118ioh.57.1490978959528; Fri, 31 Mar 2017 09:49:19 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i4si3194664itb.36.2017.03.31.09.49.19; Fri, 31 Mar 2017 09:49:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2800077F3F; Fri, 31 Mar 2017 16:44:18 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id EDD9277E72 for ; Fri, 31 Mar 2017 16:43:55 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id o123so18544880pga.1 for ; Fri, 31 Mar 2017 09:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3VC+rxeu2XFmK/wG/dIz/pgj8H3xZl51/gaMv1ccP0o=; b=S6PE7uxUGwzn7+oDQdv/mjmQ+pJkeBm+Jgy4EPd0dIDYKaRIFGTuXASoFXl2fVHmhc U6A/8z4EdqIKQ3+MpvVAjQ/4qi9FOwc9c0KW5BtPSP6SwlGumaRGAJwKM/7prZ4CGR4F 9xdkB8HT6hXK/7827P92S3YviKiECGfczOs7UU0mPQTQPf7Jnd9pC73lsogCHondk1dF l4HM/DGMvAZGOes89fIAUtJBfbAFxSawKrzG8XPW1I6cEt4ATBGbmxrOzRe8sz/HH3FI exuKRgThji5TQLBcEteqMpMjw+1e7o/EX0BtvgiIA3TEKuKMh2xfhE1f2ht9e7drSmQk rCIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3VC+rxeu2XFmK/wG/dIz/pgj8H3xZl51/gaMv1ccP0o=; b=czGiSclRfTzsPGMTN+IA2/Sg8BCx2bGI/OKtfpl/Lsf4DEHBwxyPHLvUTfxTZcNIna JWxYWBCavnoQ1bog6RCwzs37TJX52WzD3TxPITq3NtoYi+0Tx7lgpi9p0/ZaUgZk+4av AsanckAR4EB75oMXUuaudNh6mFvEJCHLLBHjiMd3QfkAETohWbJgpGEmtIyM2t3Uhy1c lymD7tSqCY2AiU50hVzcFY1hkk0Vo2lJI8jHnCcvsuodhtkuQZ+cWolAgBPSePfMtrhS OfaB2vzTRNM0PeqdFwDiuHI7frOYNK+Vgop3uwC7NzOpow4C3YKuqRdFVcsLkNi8hz5T ZFfw== X-Gm-Message-State: AFeK/H1fAuwXr5inOmT9RejjoZvNG08yx0/6yy2WKMVGOY9kBdXtOoQEJvo17ScWrFPq5g== X-Received: by 10.84.164.199 with SMTP id l7mr4527077plg.151.1490978637269; Fri, 31 Mar 2017 09:43:57 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:46 -0700 Message-Id: <20170331164247.5052-42-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 42/43] libunique: Fix build with secutiy flags on X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...-unique-Add-format-qualifier-s-for-string.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 11 ++++---- 2 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch new file mode 100644 index 000000000..7f9fdf397 --- /dev/null +++ b/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch @@ -0,0 +1,32 @@ +From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 14:32:55 -0700 +Subject: [PATCH] test-unique: Add format qualifier %s for string + +Fixes potential security issues that compiler flags + +Signed-off-by: Khem Raj +--- + tests/test-unique.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test-unique.c b/tests/test-unique.c +index b7cde45..82ee81b 100644 +--- a/tests/test-unique.c ++++ b/tests/test-unique.c +@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, +- title); ++ "%s",title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +- message); ++ "%s",message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); + +-- +2.12.1 + diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb index 8aa293ff3..9133cccb1 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb @@ -4,11 +4,12 @@ HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ -" + file://fix_for_compile_with_gcc-4.6.0.patch \ + file://noconst.patch \ + file://build.patch \ + file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ + file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ + " SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" From patchwork Fri Mar 31 16:42:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 96496 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp813245qgd; Fri, 31 Mar 2017 09:49:28 -0700 (PDT) X-Received: by 10.36.17.210 with SMTP id 201mr5211327itf.84.1490978968123; Fri, 31 Mar 2017 09:49:28 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y83si6904980ioi.76.2017.03.31.09.49.27; Fri, 31 Mar 2017 09:49:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 40AD277F44; Fri, 31 Mar 2017 16:44:19 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id B89B777EEE for ; Fri, 31 Mar 2017 16:43:57 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 79so18588913pgf.0 for ; Fri, 31 Mar 2017 09:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZeBAXG9qD04zMp2+fojcOohQWqpTO3g/aTtAs4w5fYs=; b=HpLpWP/dz2ljbVSyoVK75WTmW4q6P3aq1BzZpoRJ4kDc18cfuF8W9AY/MhY9+Lxnmc 4teO62y5x3i62/GjaTieg+uOB0I3DtFkerxKeC9j4Csm7F+mBJdxIe9kEPl33gSKwVqT FfgehH6dWw42FK4Dk8hP67x6oMy31gXJz0iTz8qAvK7ZoLEgM2wJclmccPRt6enuik8p j1wa9IoRGJesElylfw+suyJO3fsxQQUJt6TpXVcttapk3w/Xp104qTVFbWdL17DFS+G5 XqbcIW3Ra9czCfJqtFDEa5kYN8pCOc32VMPnVsXAqxOG77NzeT8GCKouC9im4OCbFqa6 celA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZeBAXG9qD04zMp2+fojcOohQWqpTO3g/aTtAs4w5fYs=; b=dlL8oHGxSFIRBcptgjbATe5zoo248t6TR1yMS+aOjz4MIfUKHYSA0Ozur1/Z4fn4Pr 1WmZhzoZ2CPPleCNNh8ZnkCx07cMSG3ZPBE6kGguv84ub/wFrprS/wRkddZh8NFlnNgz 0KZfkq8cnJLPLdy873QuiY/LyeSCE2ic2U+XHjEX9MyE9Lfj496w0g+Gn2icf8rNiwtW SMHHsLSW/kgLkPoFcPcDmIb1FwzIANPIoB5kmbkA7p0jZq7ZiFQRoKhDzkjpXLmuI/0n J7jbmu0uhmqcvOOF6Bse+1hbue8+7QwbNGhapjBUkHrvjL/5AS/HGo5+mIna/+I5r11u ZlFA== X-Gm-Message-State: AFeK/H2wo6d4Yxbsj9oMb365jgyPLrvS+U62CpBI5eypVYFf0zn+ZrM4+SqEDqF2yrg5Cw== X-Received: by 10.99.52.202 with SMTP id b193mr4101162pga.131.1490978639044; Fri, 31 Mar 2017 09:43:59 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id a5sm11569706pfh.124.2017.03.31.09.43.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:43:57 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 31 Mar 2017 09:42:47 -0700 Message-Id: <20170331164247.5052-43-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com> References: <20170331164247.5052-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 43/43] snort: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb | 4 ++++ 1 file changed, 4 insertions(+) -- 2.12.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index c62a8d360..57a04f2e7 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -5,6 +5,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux" +DEPENDS_append_libc-musl = " libtirpc" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -46,6 +47,9 @@ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + do_install_append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules