All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH 01/43] gpm: Update to use git src uri
@ 2017-03-31 16:42 Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist Khem Raj
                   ` (42 more replies)
  0 siblings, 43 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Additional patches are upstream to fix build with gcc6 and clang
Add systemd unit file

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <fcntl.h>              /* open and co.  */
- #include <sys/stat.h>           /* stat() */
- #include <sys/ioctl.h>          /* ioctl() */
-+#include <sys/types.h>          /* major() */
- 
- /* Linux specific (to be outsourced in gpm2 */
- #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
-
-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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 03/43] ctdb: Fix build with musl Khem Raj
                   ` (41 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

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 <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <sys/types.h>
++#include <sys/param.h>
++#include <sys/socket.h>
++
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <arpa/nameser.h>
++
++#include <ctype.h>
++#include <resolv.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#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"
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 03/43] ctdb: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 04/43] v4l-utils: Depend on argp-standalone for musl Khem Raj
                   ` (40 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Fixes
| ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found
| #include <rpc/rpc.h>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++
 1 file changed, 3 insertions(+)

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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 04/43] v4l-utils: Depend on argp-standalone for musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 03/43] ctdb: Fix build with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-multimedia][PATCH 05/43] caps: Use c99 int types Khem Raj
                   ` (39 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

musl does not bundle libargp like glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb | 1 +
 1 file changed, 1 insertion(+)

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
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-multimedia][PATCH 05/43] caps: Use c99 int types
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (2 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 04/43] v4l-utils: Depend on argp-standalone for musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl Khem Raj
                   ` (38 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Fixes build with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <assert.h>
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ #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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (3 preceding siblings ...)
  2017-03-31 16:42 ` [meta-multimedia][PATCH 05/43] caps: Use c99 int types Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-01  3:50   ` Peter Kjellerstedt
  2017-03-31 16:42 ` [meta-networking][PATCH 07/43] squid: Update to 3.5.23 Khem Raj
                   ` (37 subsequent siblings)
  42 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

The patches had syntax errors which are only
visible when using musl libs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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(-)

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 <dengke.du@windriver.com>
 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 <raj.khem@gmail.com>
 Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
-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 <dengke.du@windriver.com>
 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 <raj.khem@gmail.com>
 Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
-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
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 07/43] squid: Update to 3.5.23
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (4 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-xfce][PATCH 08/43] xfce4-closebutton-plugin: Fix build with clang Khem Raj
                   ` (36 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Disable NIS on musl, it doesnt yet build

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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%)

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)}"
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-xfce][PATCH 08/43] xfce4-closebutton-plugin: Fix build with clang
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (5 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 07/43] squid: Update to 3.5.23 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-xfce][PATCH 09/43] xfce4-timer-plugin: Fix build when security flags are enabled " Khem Raj
                   ` (35 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+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"
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-xfce][PATCH 09/43] xfce4-timer-plugin: Fix build when security flags are enabled with clang
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (6 preceding siblings ...)
  2017-03-31 16:42 ` [meta-xfce][PATCH 08/43] xfce4-closebutton-plugin: Fix build with clang Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 10/43] tcsh: Update to 6.20.00 release Khem Raj
                   ` (34 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 10/43] tcsh: Update to 6.20.00 release
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (7 preceding siblings ...)
  2017-03-31 16:42 ` [meta-xfce][PATCH 09/43] xfce4-timer-plugin: Fix build when security flags are enabled " Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 11/43] libnfnetlink: Backport patches to fix musl build Khem Raj
                   ` (33 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Fix segfaults on musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <fpletz@franz-pletz.org>
-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 <fpletz@franz-pletz.org>
-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 <fpletz@franz-pletz.org>
-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 <fpletz@franz-pletz.org>
-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 <lucas@debian.org>
-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 <lucas@debian.org>
-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 <lucas@debian.org>
-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 <lucas@debian.org>
-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 <reiga@dspnet.fr.eu.org>
-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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <raj.khem@gmail.com>
+Date: Wed, 22 Mar 2017 18:56:49 -0700
+Subject: [PATCH 2/2] Add debian csh scripts
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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
+}
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 11/43] libnfnetlink: Backport patches to fix musl build
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (8 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 10/43] tcsh: Update to 6.20.00 release Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 12/43] ebtables: Fix build with musl Khem Raj
                   ` (32 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

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 <raj.khem@gmail.com>
---
 ...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

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 <jengelh@inai.de>
+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 <jengelh@inai.de>
+---
+ 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 <pablo@netfilter.org>
+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 <twoerner@redhat.com>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 <hwelte@astaro.com>
+  * (C) 2008 by Pablo Neira Ayuso <pablo@netfilter.org>
+  *
+- * 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 <hwelte@astaro.com>
+- * 
++ *
+  * Adapted to nfnetlink by Eric Leblond <eric@inl.fr>
+  *
+- * 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 <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:23:29 -0300
+Subject: [PATCH 3/6] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 <pablo@netfilter.org>
+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 <xhomol11@gmail.com>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 <felix.janda@posteo.de>
+Date: Sat, 16 May 2015 14:49:07 +0200
+Subject: [PATCH 5/6] include: Sync with kernel headers
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 <linux/netlink.h>
+-#include <linux/capability.h>
+-#include <net/netlink.h>
+-
+-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 <linux/types.h>
++
+ /* 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 <felix.janda@posteo.de>
+Date: Sat, 16 May 2015 14:59:57 +0200
+Subject: [PATCH 6/6] src: Use stdint types everywhere
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 <stdint.h>
+ #include <sys/socket.h>	/* for sa_family_t */
+ #include <linux/netlink.h>
+ #include <libnfnetlink/linux_nfnetlink.h>
+@@ -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"
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 12/43] ebtables: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (9 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 11/43] libnfnetlink: Backport patches to fix musl build Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8 Khem Raj
                   ` (31 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Backport upstream fixes and add fixes to make it work with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <bdschuym@pandora.be>
+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
+ #
+ # <name>    <hexnumber> <alias1>...<alias35> #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 <petri.gynther@gmail.com>
+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 <bdschuym@pandora.be>
+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 <tdthp@terra.com.br>
+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 <sanket.shah@cyberoam.com>
+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 <string.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <getopt.h>
+ #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 <bdschuym@pandora.be>
+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 <mmazur at axeos.com>)
+
+---
+ 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 <felix.janda@posteo.de>
+Date: Sat, 16 May 2015 12:22:39 +0200
+Subject: [PATCH 07/10] extensions: Use stdint types
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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 <felix.janda@posteo.de>
+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 <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ 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?= <alin.nastac@gmail.com>
+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 <fw@strlen.de>
+---
+ 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<<i))
+ 				goto letscontinue;
+-			entries2->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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <getopt.h>
+ #include <ctype.h>
+ #include <unistd.h>
+-#include "../include/ebtables_u.h"
+ #include <netinet/ether.h>
++#include "../include/ebtables_u.h"
+ #include "../include/ethernetdb.h"
+ #include <linux/if_ether.h>
+ #include <linux/netfilter_bridge/ebt_among.h>
+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 <stdlib.h>
+ #include <string.h>
+ #include <getopt.h>
+-#include "../include/ebtables_u.h"
+ #include <netinet/ether.h>
++#include "../include/ebtables_u.h"
+ #include <linux/netfilter_bridge/ebt_arpreply.h>
+ 
+ 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 <stdlib.h>
+ #include <string.h>
+ #include <getopt.h>
+-#include "../include/ebtables_u.h"
+ #include <netinet/ether.h>
++#include "../include/ebtables_u.h"
+ #include <linux/netfilter_bridge/ebt_nat.h>
+ 
+ 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, <waltje@uWalt.NL.Mugnet.ORG>
+- *		Donald Becker, <becker@super.org>
+- *		Alan Cox, <alan@lxorguk.ukuu.org.uk>
+- *		Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
+- *
+- *		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 <linux/types.h>
+-
+-/*
+- *	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 <stdio.h>
+ #include <netinet/ether.h>
+ #include <string.h>
+@@ -33,6 +31,8 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (10 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 12/43] ebtables: Fix build with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-07 17:42   ` Martin Jansa
  2017-03-31 16:42 ` [meta-oe][PATCH 14/43] mariadb: Do not use ucontext_* APIs with musl Khem Raj
                   ` (30 subsequent siblings)
  42 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Fixes build with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 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%)

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 \
    "
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 14/43] mariadb: Do not use ucontext_* APIs with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (11 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 15/43] lowpan-tools: Fix build " Khem Raj
                   ` (29 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

musl has ucontext.h header but does not implement the APIs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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
+
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 15/43] lowpan-tools: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (12 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 14/43] mariadb: Do not use ucontext_* APIs with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 16/43] usb-modeswitch-data: Add dep on native tcl Khem Raj
                   ` (28 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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 <thomas.petazzoni@free-electrons.com>
+Date: Mon, 27 Mar 2017 17:55:06 -0700
+Subject: [PATCH] addrdb/coord-config-parse.y: add missing <time.h> 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 <time.h> 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 <time.h> using the '%code requires' directive of
+Yacc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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 <time.h>
++}
++
+ %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"
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 16/43] usb-modeswitch-data: Add dep on native tcl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (13 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 15/43] lowpan-tools: Fix build " Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-filesystems][PATCH 17/43] aufs-util: Define HOSTCC Khem Raj
                   ` (27 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

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 <raj.khem@gmail.com>
---
 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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-filesystems][PATCH 17/43] aufs-util: Define HOSTCC
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (14 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 16/43] usb-modeswitch-data: Add dep on native tcl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile Khem Raj
                   ` (26 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Fixes errors like below

| make: cc: Command not found
| make: *** [<builtin>: c2sh] Error 127

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 2 ++
 1 file changed, 2 insertions(+)

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};' \
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (15 preceding siblings ...)
  2017-03-31 16:42 ` [meta-filesystems][PATCH 17/43] aufs-util: Define HOSTCC Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-02  7:14   ` Martin Jansa
  2017-03-31 16:42 ` [meta-oe][PATCH 19/43] libraw1394: Update to 2.1.2 release Khem Raj
                   ` (25 subsequent siblings)
  42 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

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 <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 19/43] libraw1394: Update to 2.1.2 release
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (16 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-multimedia][PATCH 20/43] libdc1394: Update to 2.2.5+ Khem Raj
                   ` (24 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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%)

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
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-multimedia][PATCH 20/43] libdc1394: Update to 2.2.5+
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (17 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 19/43] libraw1394: Update to 2.1.2 release Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-filesystems][PATCH 21/43] ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 Khem Raj
                   ` (23 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 \
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-filesystems][PATCH 21/43] ntfs-3g-ntfsprogs: Upgrade to 2017.3.23
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (18 preceding siblings ...)
  2017-03-31 16:42 ` [meta-multimedia][PATCH 20/43] libdc1394: Update to 2.2.5+ Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 22/43] openl2tp: Fix build with musl Khem Raj
                   ` (22 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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%)

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
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 22/43] openl2tp: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (19 preceding siblings ...)
  2017-03-31 16:42 ` [meta-filesystems][PATCH 21/43] ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 23/43] rp-pppoe: " Khem Raj
                   ` (21 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <sys/types.h>
++#include <rpc/types.h>
++#include <rpc/xdr.h>
+ #include <rpc/pmap_clnt.h>
+-#include <net/ethernet.h>
++//#include <netinet/in.h>
+ 
+ #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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <sys/file.h>
+ #include <sys/stat.h>
+ #include <sys/errno.h>
++#include <fcntl.h>
+ #include <signal.h>
+ 
+ #include <readline/readline.h>
+-- 
+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 <raj.khem@gmail.com>
+Date: Tue, 28 Mar 2017 18:09:58 -0700
+Subject: [PATCH 2/2] user ipv6 structures
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <unistd.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+-- 
+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
 }
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 23/43] rp-pppoe: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (20 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 22/43] openl2tp: Fix build with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0 Khem Raj
                   ` (20 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <linux/if_ether.h>
+-#endif
+-
+ #include <netinet/in.h>
+ 
+ #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 <raj.khem@gmail.com>
+Date: Tue, 28 Mar 2017 19:24:53 -0700
+Subject: [PATCH 2/2] Enable support for the kernel module
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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<net/ethernet.h>
+ #include<linux/if.h>
+ #include<linux/in.h>
++#include<linux/in6.h>
+ ])
+ 
+ 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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (21 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 23/43] rp-pppoe: " Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-02  7:14   ` Martin Jansa
  2017-03-31 16:42 ` [meta-networking][PATCH 25/43] vsftpd: Fix build with musl Khem Raj
                   ` (19 subsequent siblings)
  42 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Clarify licensing and switch to github for fetching

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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%)

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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 25/43] vsftpd: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (22 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-multimedia][PATCH 26/43] faac: Fix with with security flags and on musl Khem Raj
                   ` (18 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <utmpx.h>
+-- 
+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
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-multimedia][PATCH 26/43] faac: Fix with with security flags and on musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (23 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 25/43] vsftpd: Fix build with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 27/43] dibbler: Upgrade to 1.0.2RC1 Khem Raj
                   ` (17 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <raj.khem@gmail.com>
+Date: Tue, 28 Mar 2017 21:33:01 -0700
+Subject: [PATCH 1/2] frontend: Fix format string security error
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <assert.h>
+ 
++#ifndef __STRING
++#define __STRING(x)     #x
++#endif
++
+ #ifndef ASSERT
+ #define ASSERT(expr) \
+ 	if (!(expr)) { \
+-- 
+2.12.1
+
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 27/43] dibbler: Upgrade to 1.0.2RC1
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (24 preceding siblings ...)
  2017-03-31 16:42 ` [meta-multimedia][PATCH 26/43] faac: Fix with with security flags and on musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 28/43] live555: Do not use XLOCALE on musl Khem Raj
                   ` (16 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Delete dibbler from meta-oe

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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<TIfaceIface> 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<TOpt> 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<TAddrIA> 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 <raj.khem@gmail.com>
-
-
-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 <string>
- #include <stdlib.h>
- #include <errno.h>
-+#include <sys/select.h>
- #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 <iostream>
- #include <string>
-+#include <sys/select.h>
- 
- #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 <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/if.h>
-+#include <linux/sockios.h>
- #include <syslog.h>
- #include <string.h>
- #include <errno.h>
-@@ -35,13 +36,10 @@
- #include <stdlib.h>
- #include <assert.h>
- 
--#include <net/if.h>
- 
- #include "ethtool-local.h"
- #include "interface.h"
- #include <stdarg.h>
--#include <linux/sockios.h>
--#include <linux/if_ether.h>
- 
- 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 <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#include <bits/sigthread.h>
- #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 <asm/types.h>
- //#include <resolv.h>
- #include <linux/types.h>
-+#include <sys/types.h>
- 
- #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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 28/43] live555: Do not use XLOCALE on musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (25 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 27/43] dibbler: Upgrade to 1.0.2RC1 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release Khem Raj
                   ` (15 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

musl does not have xlocale.h

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-multimedia/live555/live555.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
 }
 
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (26 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 28/43] live555: Do not use XLOCALE on musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-03 14:18   ` Martin Jansa
  2017-03-31 16:42 ` [meta-oe][PATCH 30/43] libgxim: Fix build with security flags turned on Khem Raj
                   ` (14 subsequent siblings)
  42 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Add a patch needed for cross compiling

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-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%)

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <time.h>]],
+-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])],
++[[
++#include <unistd.h>
++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 )
 }
-
-
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 30/43] libgxim: Fix build with security flags turned on
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (27 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 31/43] vpnc: Update to build from github SRC_URI Khem Raj
                   ` (13 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <akira@tagoh.org>
+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 <akira@tagoh.org>
+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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 31/43] vpnc: Update to build from github SRC_URI
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (28 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 30/43] libgxim: Fix build with security flags turned on Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 32/43] daq: Fix build with musl Khem Raj
                   ` (12 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Fix build for musl
add packageconfig for crypto selection
Fix build with externalsrc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <Martin.Jansa@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <Martin.Jansa@gmail.com>
+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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <error.h>
+-
++#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 <raj.khem@gmail.com>
+Date: Wed, 29 Mar 2017 22:45:05 -0700
+Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <sys/types.h>
+ #include <sys/utsname.h>
+ #include <sys/wait.h>
++#include <sys/ttydefaults.h>
+ 
+ #include <gcrypt.h>
+ 
+-- 
+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 <raj.khem@gmail.com>
+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 <sys/types.h>
+ #include <sys/socket.h>
+-#include <netinet/in.h>
+ 
+ #if !defined(__CYGWIN__)
+-#include <net/if.h>
+-#include <net/if_arp.h>
++//#include <linux/if.h>
++//#include <net/if_arp.h>
+ #include <netinet/if_ether.h>
+ #endif
++#include <netinet/in.h>
+ 
+ #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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+@@ -794,3 +795,26 @@ int setenv(const char *name, const char *value, int overwrite)
+ 	return ret;
+ }
+ #endif
++
++#ifndef _ERROR_H_
++#define _ERROR_H_
++#include <stdarg.h>
++#include <stdio.h>
++#include <errno.h>
++
++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 <error.h>
++#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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <sys/cygwin.h>
+ #endif
+ 
++#include "sysdep.h"
++
+ #if defined(__DragonFly__)
+ #include <net/tun/if_tun.h>
+ #elif defined(__linux__)
+@@ -69,7 +71,6 @@
+ #include <net/if_tun.h>
+ #endif
+ 
+-#include "sysdep.h"
+ 
+ #if !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || !defined(HAVE_ERROR)
+ #include <stdarg.h>
+-- 
+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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 32/43] daq: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (29 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 31/43] vpnc: Update to build from github SRC_URI Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 33/43] utouch: Fix build on musl Khem Raj
                   ` (11 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

unistd.h is not in sys/ on all platforms
use standard location in /usr/include to look for it

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

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 <raj.khem@gmail.com>
+Date: Wed, 29 Mar 2017 15:59:43 -0700
+Subject: [PATCH] correct the location of unistd.h
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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 <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/unistd.h>
+ 
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+-- 
+2.12.1
+
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 33/43] utouch: Fix build on musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (30 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 32/43] daq: Fix build with musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-multimedia][PATCH 34/43] libavc1394: Add libargp " Khem Raj
                   ` (10 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <stdio.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+ #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}"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-multimedia][PATCH 34/43] libavc1394: Add libargp on musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (31 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 33/43] utouch: Fix build on musl Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH V2 35/43] picocom: Upgrade to 2.2 Khem Raj
                   ` (9 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb | 3 +++
 1 file changed, 3 insertions(+)

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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH V2 35/43] picocom: Upgrade to 2.2
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (32 preceding siblings ...)
  2017-03-31 16:42 ` [meta-multimedia][PATCH 34/43] libavc1394: Add libargp " Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH V2 36/43] libexecinfo: Add recipe Khem Raj
                   ` (8 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Package has moved to github
License file got some cosmetic changes see
https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 -------------------
 meta-oe/recipes-support/picocom/picocom_git.bb | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb
 create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb

diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
deleted file mode 100644
index d2a76c0a9..000000000
--- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
-SECTION = "console/utils"
-LICENSE = "GPLv2+"
-HOMEPAGE = "http://code.google.com/p/picocom/"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
-SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
-		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
-}
-
diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb
new file mode 100644
index 000000000..e091094cf
--- /dev/null
+++ b/meta-oe/recipes-support/picocom/picocom_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+HOMEPAGE = "http://code.google.com/p/picocom/"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
+
+BASEPV = "2.2"
+PV = "${BASEPV}+git${SRCPV}"
+
+SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"
+
+SRC_URI = "git://github.com/npat-efault/picocom"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \
+		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
+}
+
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH V2 36/43] libexecinfo: Add recipe
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (33 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH V2 35/43] picocom: Upgrade to 2.2 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on Khem Raj
                   ` (7 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

This package is handy especially with musl to port
apps which use glibc backtrace APIs

build for musl systems alone

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-makefile-Fix-build-on-linux.patch         | 59 ++++++++++++++++
 ...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 ++++++++++++++++++++++
 .../libexecinfo/libexecinfo_1.1.bb                 | 31 +++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
 create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
 create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb

diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
new file mode 100644
index 000000000..f1863f14b
--- /dev/null
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
@@ -0,0 +1,59 @@
+From 910bbc2cb6cc1cfa6deed9d170da02a639902c7c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 19 Mar 2017 16:14:54 -0700
+Subject: [PATCH 1/2] makefile: Fix build on linux
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+Index: libexecinfo-1.1/Makefile
+===================================================================
+--- libexecinfo-1.1.orig/Makefile
++++ libexecinfo-1.1/Makefile
+@@ -23,24 +23,25 @@
+ # SUCH DAMAGE.
+ #
+ # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
++#
++# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
+ 
+-LIB=	execinfo
+-
+-SRCS=	stacktraverse.c stacktraverse.h execinfo.c execinfo.h
+-
+-INCS=	execinfo.h
+-
+-SHLIB_MAJOR=	1
+-SHLIB_MINOR=	0
+-
+-NOPROFILE=	yes
+-
+-DPADD=		${LIBM}
+-LDADD=		-lm
+-
+-#WARNS?=	4
+-
+-#stacktraverse.c: gen.py
+-#	./gen.py > stacktraverse.c
++CC?=cc
++AR?=ar
++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
++EXECINFO_LDFLAGS=$(LDFLAGS)
++
++all: static dynamic
++
++static:
++	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
++	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
++	$(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
++
++dynamic:
++	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
++	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
++	$(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 $(EXECINFO_LDFLAGS) stacktraverse.So execinfo.So
+ 
+-.include <bsd.lib.mk>
++clean:
++	rm -rf *.o *.So *.a *.so
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
new file mode 100644
index 000000000..423b67082
--- /dev/null
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
@@ -0,0 +1,79 @@
+From 0810817773fb81d7383d2fa8464244c8f79845fb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 19 Mar 2017 16:16:18 -0700
+Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ execinfo.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/execinfo.c b/execinfo.c
+index 906fb14..9448b60 100644
+--- a/execinfo.c
++++ b/execinfo.c
+@@ -69,7 +69,8 @@ backtrace(void **buffer, int size)
+ char **
+ backtrace_symbols(void *const *buffer, int size)
+ {
+-    int i, clen, alen, offset;
++    size_t clen, alen;
++    int i, offset;
+     char **rval;
+     char *cp;
+     Dl_info info;
+@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size)
+     rval = malloc(clen);
+     if (rval == NULL)
+         return NULL;
+-    (char **)cp = &(rval[size]);
+     for (i = 0; i < size; i++) {
+         if (dladdr(buffer[i], &info) != 0) {
+             if (info.dli_sname == NULL)
+@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size)
+                    2 +                      /* " <" */
+                    strlen(info.dli_sname) + /* "function" */
+                    1 +                      /* "+" */
+-                   D10(offset) +            /* "offset */
++                   10 +                     /* "offset */
+                    5 +                      /* "> at " */
+                    strlen(info.dli_fname) + /* "filename" */
+                    1;                       /* "\0" */
+             rval = realloc_safe(rval, clen + alen);
+             if (rval == NULL)
+                 return NULL;
+-            snprintf(cp, alen, "%p <%s+%d> at %s",
++            snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
+               buffer[i], info.dli_sname, offset, info.dli_fname);
+         } else {
+             alen = 2 +                      /* "0x" */
+@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size)
+             rval = realloc_safe(rval, clen + alen);
+             if (rval == NULL)
+                 return NULL;
+-            snprintf(cp, alen, "%p", buffer[i]);
++            snprintf((char *) rval + clen, alen, "%p", buffer[i]);
+         }
+-        rval[i] = cp;
+-        cp += alen;
++        rval[i] = (char *) clen;
++        clen += alen;
+     }
+ 
++    for (i = 0; i < size; i++)
++        rval[i] += (long) rval;
++
+     return rval;
+ }
+ 
+@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd)
+                 return;
+             snprintf(buf, len, "%p\n", buffer[i]);
+         }
+-        write(fd, buf, len - 1);
++        write(fd, buf, strlen(buf));
+     }
+ }
+-- 
+2.12.0
+
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
new file mode 100644
index 000000000..f79b1ab18
--- /dev/null
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
@@ -0,0 +1,31 @@
+# Copyright (C) 2017 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility."
+HOMEPAGE = "http://www.freshports.org/devel/libexecinfo"
+LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5"
+LICENSE = "BSD-2-Clause"
+SECTION = "libs"
+DEPENDS = ""
+
+SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \
+           file://0001-makefile-Fix-build-on-linux.patch \
+           file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \
+           "
+SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91"
+SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
+
+CFLAGS += "-fno-omit-frame-pointer"
+
+do_install() {
+    install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h
+    install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h
+    install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a
+    install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1
+    ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so
+}
+#
+# We will skip parsing for non-musl systems
+#
+COMPATIBLE_HOST = ".*-musl.*"
+
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (34 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH V2 36/43] libexecinfo: Add recipe Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-02  7:16   ` Martin Jansa
  2017-03-31 16:42 ` [meta-networking][PATCH 38/43] arptables: Upgrade to 0.0.4 Khem Raj
                   ` (6 subsequent siblings)
  42 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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,"</b><pre>");
+-			g_fprintf (stream,archive[idx]->comment->str);
++			g_fprintf (stream,"%s",archive[idx]->comment->str);
+ 			if (bp)
+ 				g_fprintf(stream,"</pre>");
+ 			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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 38/43] arptables: Upgrade to 0.0.4
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (35 preceding siblings ...)
  2017-03-31 16:42 ` [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 39/43] libnetfilter-log: Switch to git URI Khem Raj
                   ` (5 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Switch the SRC_URI to git based fetcher

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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%)

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 39/43] libnetfilter-log: Switch to git URI
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (36 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 38/43] arptables: Upgrade to 0.0.4 Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 40/43] lxdm: Find libexecinfo if its on platform Khem Raj
                   ` (4 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Move to tip of tree which has needed fixes for musl build
add missing dependency on libmnl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 40/43] lxdm: Find libexecinfo if its on platform
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (37 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 39/43] libnetfilter-log: Switch to git URI Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 41/43] libnetfilter-queue: Update to git for SRC_URI Khem Raj
                   ` (3 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

fixes build with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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)} \
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 41/43] libnetfilter-queue: Update to git for SRC_URI
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (38 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 40/43] lxdm: Find libexecinfo if its on platform Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-oe][PATCH 42/43] libunique: Fix build with secutiy flags on Khem Raj
                   ` (2 subsequent siblings)
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

brings in the fixes to build on musl
Add a typo fix patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <libnfnetlink/libnfnetlink.h>
+ #include <libnetfilter_queue/libnetfilter_queue.h>
+-#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
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-oe][PATCH 42/43] libunique: Fix build with secutiy flags on
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (39 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 41/43] libnetfilter-queue: Update to git for SRC_URI Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-03-31 16:42 ` [meta-networking][PATCH 43/43] snort: Fix build with musl Khem Raj
  2017-04-03 19:19 ` [meta-oe][PATCH 01/43] gpm: Update to use git src uri Martin Jansa
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-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

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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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"
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* [meta-networking][PATCH 43/43] snort: Fix build with musl
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (40 preceding siblings ...)
  2017-03-31 16:42 ` [meta-oe][PATCH 42/43] libunique: Fix build with secutiy flags on Khem Raj
@ 2017-03-31 16:42 ` Khem Raj
  2017-04-03 19:19 ` [meta-oe][PATCH 01/43] gpm: Update to use git src uri Martin Jansa
  42 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-03-31 16:42 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb | 4 ++++
 1 file changed, 4 insertions(+)

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
-- 
2.12.1



^ permalink raw reply related	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl
  2017-03-31 16:42 ` [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl Khem Raj
@ 2017-04-01  3:50   ` Peter Kjellerstedt
  2017-04-01 15:20     ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Peter Kjellerstedt @ 2017-04-01  3:50 UTC (permalink / raw)
  To: Khem Raj, openembedded-devel

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> Khem Raj
> Sent: den 31 mars 2017 18:42
> To: openembedded-devel@lists.openembedded.org
> Subject: [oe] [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with
> musl
> 
> The patches had syntax errors which are only
> visible when using musl libs
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../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(-)
> 
> 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 <dengke.du@windriver.com>
>  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 <raj.khem@gmail.com>
>  Signed-off-by: Dengke Du <dengke.du@windriver.com>
> ----
> -Upstream-Status: Pending
> +
> +%% original patch: 0001-implement-libc-specific-reopen_stream.patch

This chunk does not look as it was intended...

>  ---
>   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 <dengke.du@windriver.com>
>  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 <raj.khem@gmail.com>
>  Signed-off-by: Dengke Du <dengke.du@windriver.com>
> ----
> -Upstream-Status: Pending
> +
> +%% original patch: 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch

Same here.

>  ---
>   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
> 
> --
> 2.12.1

//Peter



^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl
  2017-04-01  3:50   ` Peter Kjellerstedt
@ 2017-04-01 15:20     ` Khem Raj
  2017-04-05 17:17       ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-04-01 15:20 UTC (permalink / raw)
  To: Peter Kjellerstedt; +Cc: openembedded-devel

On Fri, Mar 31, 2017 at 8:50 PM, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>> -----Original Message-----
>> From: openembedded-devel-bounces@lists.openembedded.org
>> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
>> Khem Raj
>> Sent: den 31 mars 2017 18:42
>> To: openembedded-devel@lists.openembedded.org
>> Subject: [oe] [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with
>> musl
>>
>> The patches had syntax errors which are only
>> visible when using musl libs
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../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(-)
>>
>> 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 <dengke.du@windriver.com>
>>  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 <raj.khem@gmail.com>
>>  Signed-off-by: Dengke Du <dengke.du@windriver.com>
>> ----
>> -Upstream-Status: Pending
>> +
>> +%% original patch: 0001-implement-libc-specific-reopen_stream.patch
>
> This chunk does not look as it was intended...
>

Yeah, devtool creation and I did git format-patch since I was squashing.

>>  ---
>>   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 <dengke.du@windriver.com>
>>  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 <raj.khem@gmail.com>
>>  Signed-off-by: Dengke Du <dengke.du@windriver.com>
>> ----
>> -Upstream-Status: Pending
>> +
>> +%% original patch: 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
>
> Same here.
>
>>  ---
>>   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
>>
>> --
>> 2.12.1
>
> //Peter
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0
  2017-03-31 16:42 ` [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0 Khem Raj
@ 2017-04-02  7:14   ` Martin Jansa
  2017-04-05 17:05     ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-02  7:14 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

minicoredumper-2.0.0: minicoredumper: Files/directories were installed
but not shipped in any package:
  /run
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within
do_install.
minicoredumper: 1 installed and not shipped files. [installed-vs-shipped]


On Fri, Mar 31, 2017 at 6:42 PM, Khem Raj <raj.khem@gmail.com> wrote:

> Clarify licensing and switch to github for fetching
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...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%)
>
> 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] = "1b0eeb3d70dbd2ad6f2f673e4e3446
> e5dd784e132730e21d8f9dc0977e47dd9a"
> +
> +S = "${WORKDIR}/git"
>
>  SYSTEMD_SERVICE_${PN} = "minicoredumper.service"
>  SYSTEMD_AUTO_ENABLE = "enable"
> --
> 2.12.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile
  2017-03-31 16:42 ` [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile Khem Raj
@ 2017-04-02  7:14   ` Martin Jansa
  2017-04-05 16:56     ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-02  7:14 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

mv: cannot stat
'TOPDIR/tmp-glibc/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf':
No such file or directory
WARNING: exit code 1 from a shell command.

http://errors.yoctoproject.org/Errors/Details/138841/



On Fri, Mar 31, 2017 at 6:42 PM, Khem Raj <raj.khem@gmail.com> wrote:

> 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 <raj.khem@gmail.com>
> ---
>  meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 7
> ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> 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"
> --
> 2.12.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on
  2017-03-31 16:42 ` [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on Khem Raj
@ 2017-04-02  7:16   ` Martin Jansa
  2017-04-05 17:14     ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-02  7:16 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

../../git/src/window.c:234:52: error: incompatible type for argument 4
of 'gtk_message_dialog_new'
  dialog = gtk_message_dialog_new (window,mode,type,"%s",button,message1);
                                                    ^~~~

http://errors.yoctoproject.org/Errors/Details/138844/


On Fri, Mar 31, 2017 at 6:42 PM, Khem Raj <raj.khem@gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...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
>
> 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 <raj.khem@gmail.com>
> +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 <raj.khem@gmail.com>
> +---
> + 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,"</b><pre>");
> +-                      g_fprintf (stream,archive[idx]->comment->str);
> ++                      g_fprintf (stream,"%s",archive[idx]->
> comment->str);
> +                       if (bp)
> +                               g_fprintf(stream,"</pre>");
> +                       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"
> --
> 2.12.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release
  2017-03-31 16:42 ` [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release Khem Raj
@ 2017-04-03 14:18   ` Martin Jansa
  2017-04-05 16:49     ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-03 14:18 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 4110 bytes --]

On Fri, Mar 31, 2017 at 09:42:33AM -0700, Khem Raj wrote:
> Add a patch needed for cross compiling

This breaks corosync:
http://errors.yoctoproject.org/Errors/Details/138932/

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...-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%)
> 
> 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 <raj.khem@gmail.com>
> +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 <raj.khem@gmail.com>
> +---
> + 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 <time.h>]],
> +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])],
> ++[[
> ++#include <unistd.h>
> ++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 )
>  }
> -
> -
> -- 
> 2.12.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
                   ` (41 preceding siblings ...)
  2017-03-31 16:42 ` [meta-networking][PATCH 43/43] snort: Fix build with musl Khem Raj
@ 2017-04-03 19:19 ` Martin Jansa
  2017-04-05 16:38   ` Khem Raj
  42 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-03 19:19 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 26768 bytes --]

On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
> Additional patches are upstream to fix build with gcc6 and clang
> Add systemd unit file
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../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

This breaks links build, before this change links detected gpm and
enabled FB driver:

configure:7756: result: yes
configure:7756: checking for gpm.h
configure:7756: result: yes
configure:7766: checking for Gpm_Open in -lgpm
configure:7791: i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
configure:7791: $? = 0
configure:7800: result: yes
configure:7813: checking for Gpm_GetLibVersion
configure:7813: i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
configure:7813: $? = 0
configure:7813: result: yes


with this change:
configure:7756: checking for gpm.h
configure:7756: result: yes
configure:7766: checking for Gpm_Open in -lgpm
configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld: error: cannot find -lgpm
/usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined reference to 'Gpm_Open'
collect2: error: ld returned 1 exit status
configure:7791: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
| #define PACKAGE_TARNAME ""
| #define PACKAGE_VERSION ""
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| #define PACKAGE "links"
| #define VERSION "2.7"
| #define STDC_HEADERS 1
| #define HAVE_TYPEOF 1
| #define HAVE_LONG_LONG 1
...
| #define HAVE_LIBM 1
| #define HAVE_GPM_H 1
| /* end confdefs.h.  */
|
| /* Override any GCC internal prototype to avoid an error.
|    Use char because int might match the return type of a GCC
|    builtin and then its argument prototype would still apply.  */
| #ifdef __cplusplus
| extern "C"
| #endif
| char Gpm_Open ();
| int
| main ()
| {
| return Gpm_Open ();
|   ;
|   return 0;
| }
configure:7800: result: no
configure:7813: checking for Gpm_GetLibVersion
configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
/usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined reference to 'Gpm_GetLibVersion'
collect2: error: ld returned 1 exit status
configure:7813: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
| #define PACKAGE_TARNAME ""
...
| #define HAVE_LIBM 1
| #define HAVE_GPM_H 1
| /* end confdefs.h.  */
| /* Define Gpm_GetLibVersion to an innocuous variant, in case <limits.h> declares Gpm_GetLibVersion.
|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
| #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
|
| /* System header to define __stub macros and hopefully few prototypes,
|     which can conflict with char Gpm_GetLibVersion (); below.
|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|     <limits.h> exists even on freestanding compilers.  */
|
| #ifdef __STDC__
| # include <limits.h>
| #else
| # include <assert.h>
| #endif
|
| #undef Gpm_GetLibVersion
|
| /* Override any GCC internal prototype to avoid an error.
|    Use char because int might match the return type of a GCC
|    builtin and then its argument prototype would still apply.  */
| #ifdef __cplusplus
| extern "C"
| #endif
| char Gpm_GetLibVersion ();
| /* The GNU C library defines this for functions which it implements
|     to always fail with ENOSYS.  Some functions are actually named
|     something starting with __ and the normal name is an alias.  */
| #if defined __stub_Gpm_GetLibVersion || defined __stub___Gpm_GetLibVersion
| choke me
| #endif
|
| int
| main ()
| {
| return Gpm_GetLibVersion ();
|   ;
|   return 0;
| }
configure:7813: result: no


The dependency is there and library as well:

work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
./recipe-sysroot/usr/lib/libgpm.so.1
./recipe-sysroot/usr/lib/libgpm.so.2
./recipe-sysroot/usr/lib/libgpm.a
./recipe-sysroot/usr/lib/libgpm.so.2.1.0

but libgpm.so.1 link is broken:

work/core2-64-oe-linux/links/2.7-r0$ ls -lah ./recipe-sysroot/usr/lib/libgpm*
-rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50 ./recipe-sysroot/usr/lib/libgpm.a
lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56 ./recipe-sysroot/usr/lib/libgpm.so.1 -> libgpm.so.1.19.0
lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56 ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
-rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50 ./recipe-sysroot/usr/lib/libgpm.so.2.1.0

with this change there is only the 2.1.0 version:
lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12 ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
-rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59 ./recipe-sysroot/usr/lib/libgpm.so.2.1.0


> 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 <fcntl.h>              /* open and co.  */
> - #include <sys/stat.h>           /* stat() */
> - #include <sys/ioctl.h>          /* ioctl() */
> -+#include <sys/types.h>          /* major() */
> - 
> - /* Linux specific (to be outsourced in gpm2 */
> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
> -
> -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"
> -- 
> 2.12.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-04-03 19:19 ` [meta-oe][PATCH 01/43] gpm: Update to use git src uri Martin Jansa
@ 2017-04-05 16:38   ` Khem Raj
  2017-04-05 17:41     ` Martin Jansa
  0 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-04-05 16:38 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

Thanks Martin for triaging it. The fix is pushed to kraj/master

https://github.com/kraj/meta-openembedded/commit/21b5a2ad436439bfddd8b1d30fcfab28d868d063


On Mon, Apr 3, 2017 at 12:19 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
>> Additional patches are upstream to fix build with gcc6 and clang
>> Add systemd unit file
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../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
>
> This breaks links build, before this change links detected gpm and
> enabled FB driver:
>
> configure:7756: result: yes
> configure:7756: checking for gpm.h
> configure:7756: result: yes
> configure:7766: checking for Gpm_Open in -lgpm
> configure:7791: i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
> configure:7791: $? = 0
> configure:7800: result: yes
> configure:7813: checking for Gpm_GetLibVersion
> configure:7813: i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
> configure:7813: $? = 0
> configure:7813: result: yes
>
>
> with this change:
> configure:7756: checking for gpm.h
> configure:7756: result: yes
> configure:7766: checking for Gpm_Open in -lgpm
> configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
> /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld: error: cannot find -lgpm
> /usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined reference to 'Gpm_Open'
> collect2: error: ld returned 1 exit status
> configure:7791: $? = 1
> configure: failed program was:
> | /* confdefs.h */
> | #define PACKAGE_NAME ""
> | #define PACKAGE_TARNAME ""
> | #define PACKAGE_VERSION ""
> | #define PACKAGE_STRING ""
> | #define PACKAGE_BUGREPORT ""
> | #define PACKAGE_URL ""
> | #define PACKAGE "links"
> | #define VERSION "2.7"
> | #define STDC_HEADERS 1
> | #define HAVE_TYPEOF 1
> | #define HAVE_LONG_LONG 1
> ...
> | #define HAVE_LIBM 1
> | #define HAVE_GPM_H 1
> | /* end confdefs.h.  */
> |
> | /* Override any GCC internal prototype to avoid an error.
> |    Use char because int might match the return type of a GCC
> |    builtin and then its argument prototype would still apply.  */
> | #ifdef __cplusplus
> | extern "C"
> | #endif
> | char Gpm_Open ();
> | int
> | main ()
> | {
> | return Gpm_Open ();
> |   ;
> |   return 0;
> | }
> configure:7800: result: no
> configure:7813: checking for Gpm_GetLibVersion
> configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot -o conftest  -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0 -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
> /usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined reference to 'Gpm_GetLibVersion'
> collect2: error: ld returned 1 exit status
> configure:7813: $? = 1
> configure: failed program was:
> | /* confdefs.h */
> | #define PACKAGE_NAME ""
> | #define PACKAGE_TARNAME ""
> ...
> | #define HAVE_LIBM 1
> | #define HAVE_GPM_H 1
> | /* end confdefs.h.  */
> | /* Define Gpm_GetLibVersion to an innocuous variant, in case <limits.h> declares Gpm_GetLibVersion.
> |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
> | #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
> |
> | /* System header to define __stub macros and hopefully few prototypes,
> |     which can conflict with char Gpm_GetLibVersion (); below.
> |     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> |     <limits.h> exists even on freestanding compilers.  */
> |
> | #ifdef __STDC__
> | # include <limits.h>
> | #else
> | # include <assert.h>
> | #endif
> |
> | #undef Gpm_GetLibVersion
> |
> | /* Override any GCC internal prototype to avoid an error.
> |    Use char because int might match the return type of a GCC
> |    builtin and then its argument prototype would still apply.  */
> | #ifdef __cplusplus
> | extern "C"
> | #endif
> | char Gpm_GetLibVersion ();
> | /* The GNU C library defines this for functions which it implements
> |     to always fail with ENOSYS.  Some functions are actually named
> |     something starting with __ and the normal name is an alias.  */
> | #if defined __stub_Gpm_GetLibVersion || defined __stub___Gpm_GetLibVersion
> | choke me
> | #endif
> |
> | int
> | main ()
> | {
> | return Gpm_GetLibVersion ();
> |   ;
> |   return 0;
> | }
> configure:7813: result: no
>
>
> The dependency is there and library as well:
>
> work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
> ./recipe-sysroot/usr/lib/libgpm.so.1
> ./recipe-sysroot/usr/lib/libgpm.so.2
> ./recipe-sysroot/usr/lib/libgpm.a
> ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>
> but libgpm.so.1 link is broken:
>
> work/core2-64-oe-linux/links/2.7-r0$ ls -lah ./recipe-sysroot/usr/lib/libgpm*
> -rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50 ./recipe-sysroot/usr/lib/libgpm.a
> lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56 ./recipe-sysroot/usr/lib/libgpm.so.1 -> libgpm.so.1.19.0
> lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56 ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
> -rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50 ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>
> with this change there is only the 2.1.0 version:
> lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12 ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
> -rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59 ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>
>
>> 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 <fcntl.h>              /* open and co.  */
>> - #include <sys/stat.h>           /* stat() */
>> - #include <sys/ioctl.h>          /* ioctl() */
>> -+#include <sys/types.h>          /* major() */
>> -
>> - /* Linux specific (to be outsourced in gpm2 */
>> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
>> -
>> -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"
>> --
>> 2.12.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release
  2017-04-03 14:18   ` Martin Jansa
@ 2017-04-05 16:49     ` Khem Raj
  2017-04-06  7:30       ` Martin Jansa
  0 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-04-05 16:49 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

On Mon, Apr 3, 2017 at 7:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Mar 31, 2017 at 09:42:33AM -0700, Khem Raj wrote:
>> Add a patch needed for cross compiling
>
> This breaks corosync:
> http://errors.yoctoproject.org/Errors/Details/138932/
>

This needed updated too. I have pushed a recipe update for corosync
https://github.com/kraj/meta-openembedded/commit/6d4e506ecf2ae4effee4e70b3ff0e3d7c1a18542


>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  ...-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%)
>>
>> 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 <raj.khem@gmail.com>
>> +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 <raj.khem@gmail.com>
>> +---
>> + 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 <time.h>]],
>> +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])],
>> ++[[
>> ++#include <unistd.h>
>> ++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 )
>>  }
>> -
>> -
>> --
>> 2.12.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile
  2017-04-02  7:14   ` Martin Jansa
@ 2017-04-05 16:56     ` Khem Raj
  0 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-04-05 16:56 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembedded-devel

Drop this one, I see same error without this change, since it does not
fix the problem, I can look into it and send a new version if I find
the proper fix

On Sun, Apr 2, 2017 at 12:14 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> mv: cannot stat
> 'TOPDIR/tmp-glibc/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf':
> No such file or directory
> WARNING: exit code 1 from a shell command.
>
> http://errors.yoctoproject.org/Errors/Details/138841/
>
>
>
> On Fri, Mar 31, 2017 at 6:42 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> 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 <raj.khem@gmail.com>
>> ---
>>  meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 7
>> ++++---
>>  1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> 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"
>> --
>> 2.12.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0
  2017-04-02  7:14   ` Martin Jansa
@ 2017-04-05 17:05     ` Khem Raj
  0 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-04-05 17:05 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembedded-devel

On Sun, Apr 2, 2017 at 12:14 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> minicoredumper-2.0.0: minicoredumper: Files/directories were installed but
> not shipped in any package:
>   /run
> Please set FILES such that these items are packaged. Alternatively if they
> are unneeded, avoid installing them or delete them within do_install.
> minicoredumper: 1 installed and not shipped files. [installed-vs-shipped]
>

Pushed a fix for this here
https://github.com/kraj/meta-openembedded/commit/0016878d08216270f08bb190afaa7ad14326e4ef

>
> On Fri, Mar 31, 2017 at 6:42 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Clarify licensing and switch to github for fetching
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  ...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%)
>>
>> 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"
>> --
>> 2.12.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on
  2017-04-02  7:16   ` Martin Jansa
@ 2017-04-05 17:14     ` Khem Raj
  0 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-04-05 17:14 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembedded-devel

On Sun, Apr 2, 2017 at 12:16 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> ../../git/src/window.c:234:52: error: incompatible type for argument 4 of
> 'gtk_message_dialog_new'
>   dialog = gtk_message_dialog_new (window,mode,type,"%s",button,message1);
>                                                     ^~~~
>
> http://errors.yoctoproject.org/Errors/Details/138844/
>

Fixed with

https://github.com/kraj/meta-openembedded/commit/30cfd14c1a50d3f79f58dea4012d897a64082ded

>
> On Fri, Mar 31, 2017 at 6:42 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  ...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
>>
>> 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 <raj.khem@gmail.com>
>> +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 <raj.khem@gmail.com>
>> +---
>> + 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,"</b><pre>");
>> +-                      g_fprintf (stream,archive[idx]->comment->str);
>> ++                      g_fprintf
>> (stream,"%s",archive[idx]->comment->str);
>> +                       if (bp)
>> +                               g_fprintf(stream,"</pre>");
>> +                       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"
>> --
>> 2.12.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl
  2017-04-01 15:20     ` Khem Raj
@ 2017-04-05 17:17       ` Khem Raj
  0 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-04-05 17:17 UTC (permalink / raw)
  To: Peter Kjellerstedt; +Cc: openembedded-devel

I have pushed a patch on top to remove it

https://github.com/kraj/meta-openembedded/commit/d7faf5fe8e9a4fc01e19fd5690496af47855fdcf

On Sat, Apr 1, 2017 at 8:20 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Mar 31, 2017 at 8:50 PM, Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
>>> -----Original Message-----
>>> From: openembedded-devel-bounces@lists.openembedded.org
>>> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
>>> Khem Raj
>>> Sent: den 31 mars 2017 18:42
>>> To: openembedded-devel@lists.openembedded.org
>>> Subject: [oe] [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with
>>> musl
>>>
>>> The patches had syntax errors which are only
>>> visible when using musl libs
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> ---
>>>  .../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(-)
>>>
>>> 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 <dengke.du@windriver.com>
>>>  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 <raj.khem@gmail.com>
>>>  Signed-off-by: Dengke Du <dengke.du@windriver.com>
>>> ----
>>> -Upstream-Status: Pending
>>> +
>>> +%% original patch: 0001-implement-libc-specific-reopen_stream.patch
>>
>> This chunk does not look as it was intended...
>>
>
> Yeah, devtool creation and I did git format-patch since I was squashing.
>
>>>  ---
>>>   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 <dengke.du@windriver.com>
>>>  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 <raj.khem@gmail.com>
>>>  Signed-off-by: Dengke Du <dengke.du@windriver.com>
>>> ----
>>> -Upstream-Status: Pending
>>> +
>>> +%% original patch: 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
>>
>> Same here.
>>
>>>  ---
>>>   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
>>>
>>> --
>>> 2.12.1
>>
>> //Peter
>>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-04-05 16:38   ` Khem Raj
@ 2017-04-05 17:41     ` Martin Jansa
  2017-04-05 17:57       ` Khem Raj
  2017-04-05 17:58       ` Khem Raj
  0 siblings, 2 replies; 66+ messages in thread
From: Martin Jansa @ 2017-04-05 17:41 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

I've merged many changes from master-next today, only the ones for
meta-networking layer are left in master-next now.

Can you please resend remaining changes (rebased on master-next) and
integrate the fixes into them?

Thanks

On Wed, Apr 5, 2017 at 6:38 PM, Khem Raj <raj.khem@gmail.com> wrote:

> Thanks Martin for triaging it. The fix is pushed to kraj/master
>
> https://github.com/kraj/meta-openembedded/commit/
> 21b5a2ad436439bfddd8b1d30fcfab28d868d063
>
>
> On Mon, Apr 3, 2017 at 12:19 PM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> > On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
> >> Additional patches are upstream to fix build with gcc6 and clang
> >> Add systemd unit file
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >>  .../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
> >
> > This breaks links build, before this change links detected gpm and
> > enabled FB driver:
> >
> > configure:7756: result: yes
> > configure:7756: checking for gpm.h
> > configure:7756: result: yes
> > configure:7766: checking for Gpm_Open in -lgpm
> > configure:7791: i586-oe-linux-gcc  -m32 -march=i586
> --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
> -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-
> oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-
> oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/
> oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
> > configure:7791: $? = 0
> > configure:7800: result: yes
> > configure:7813: checking for Gpm_GetLibVersion
> > configure:7813: i586-oe-linux-gcc  -m32 -march=i586
> --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
> -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-
> oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-
> oe-linux/links/2.7-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/
> oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
> > configure:7813: $? = 0
> > configure:7813: result: yes
> >
> >
> > with this change:
> > configure:7756: checking for gpm.h
> > configure:7756: result: yes
> > configure:7766: checking for Gpm_Open in -lgpm
> > configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
> -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/
> world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
> -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-
> glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-
> glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
> -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-
> glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1
> -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
> > /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-
> oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-
> oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld:
> error: cannot find -lgpm
> > /usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined
> reference to 'Gpm_Open'
> > collect2: error: ld returned 1 exit status
> > configure:7791: $? = 1
> > configure: failed program was:
> > | /* confdefs.h */
> > | #define PACKAGE_NAME ""
> > | #define PACKAGE_TARNAME ""
> > | #define PACKAGE_VERSION ""
> > | #define PACKAGE_STRING ""
> > | #define PACKAGE_BUGREPORT ""
> > | #define PACKAGE_URL ""
> > | #define PACKAGE "links"
> > | #define VERSION "2.7"
> > | #define STDC_HEADERS 1
> > | #define HAVE_TYPEOF 1
> > | #define HAVE_LONG_LONG 1
> > ...
> > | #define HAVE_LIBM 1
> > | #define HAVE_GPM_H 1
> > | /* end confdefs.h.  */
> > |
> > | /* Override any GCC internal prototype to avoid an error.
> > |    Use char because int might match the return type of a GCC
> > |    builtin and then its argument prototype would still apply.  */
> > | #ifdef __cplusplus
> > | extern "C"
> > | #endif
> > | char Gpm_Open ();
> > | int
> > | main ()
> > | {
> > | return Gpm_Open ();
> > |   ;
> > |   return 0;
> > | }
> > configure:7800: result: no
> > configure:7813: checking for Gpm_GetLibVersion
> > configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
> -msse3 -mfpmath=sse --sysroot=/home/jenkins/oe/
> world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
> -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-
> glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-
> glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
> -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-
> glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=   -Wl,-O1
> -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
> > /usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined
> reference to 'Gpm_GetLibVersion'
> > collect2: error: ld returned 1 exit status
> > configure:7813: $? = 1
> > configure: failed program was:
> > | /* confdefs.h */
> > | #define PACKAGE_NAME ""
> > | #define PACKAGE_TARNAME ""
> > ...
> > | #define HAVE_LIBM 1
> > | #define HAVE_GPM_H 1
> > | /* end confdefs.h.  */
> > | /* Define Gpm_GetLibVersion to an innocuous variant, in case
> <limits.h> declares Gpm_GetLibVersion.
> > |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
> > | #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
> > |
> > | /* System header to define __stub macros and hopefully few prototypes,
> > |     which can conflict with char Gpm_GetLibVersion (); below.
> > |     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> > |     <limits.h> exists even on freestanding compilers.  */
> > |
> > | #ifdef __STDC__
> > | # include <limits.h>
> > | #else
> > | # include <assert.h>
> > | #endif
> > |
> > | #undef Gpm_GetLibVersion
> > |
> > | /* Override any GCC internal prototype to avoid an error.
> > |    Use char because int might match the return type of a GCC
> > |    builtin and then its argument prototype would still apply.  */
> > | #ifdef __cplusplus
> > | extern "C"
> > | #endif
> > | char Gpm_GetLibVersion ();
> > | /* The GNU C library defines this for functions which it implements
> > |     to always fail with ENOSYS.  Some functions are actually named
> > |     something starting with __ and the normal name is an alias.  */
> > | #if defined __stub_Gpm_GetLibVersion || defined
> __stub___Gpm_GetLibVersion
> > | choke me
> > | #endif
> > |
> > | int
> > | main ()
> > | {
> > | return Gpm_GetLibVersion ();
> > |   ;
> > |   return 0;
> > | }
> > configure:7813: result: no
> >
> >
> > The dependency is there and library as well:
> >
> > work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
> > ./recipe-sysroot/usr/lib/libgpm.so.1
> > ./recipe-sysroot/usr/lib/libgpm.so.2
> > ./recipe-sysroot/usr/lib/libgpm.a
> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
> >
> > but libgpm.so.1 link is broken:
> >
> > work/core2-64-oe-linux/links/2.7-r0$ ls -lah ./recipe-sysroot/usr/lib/
> libgpm*
> > -rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50 ./recipe-sysroot/usr/lib/
> libgpm.a
> > lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56 ./recipe-sysroot/usr/lib/libgpm.so.1
> -> libgpm.so.1.19.0
> > lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56 ./recipe-sysroot/usr/lib/libgpm.so.2
> -> libgpm.so.2.1.0
> > -rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50 ./recipe-sysroot/usr/lib/
> libgpm.so.2.1.0
> >
> > with this change there is only the 2.1.0 version:
> > lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12 ./recipe-sysroot/usr/lib/libgpm.so.2
> -> libgpm.so.2.1.0
> > -rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59 ./recipe-sysroot/usr/lib/
> libgpm.so.2.1.0
> >
> >
> >> 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 <fcntl.h>              /* open and co.  */
> >> - #include <sys/stat.h>           /* stat() */
> >> - #include <sys/ioctl.h>          /* ioctl() */
> >> -+#include <sys/types.h>          /* major() */
> >> -
> >> - /* Linux specific (to be outsourced in gpm2 */
> >> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
> >> -
> >> -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] = "6071378b24494e36ca3ef6377606e7
> e565040413c86704753a162d2180af32ee"
> >> -
> >> -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=18810669f13b87348459e611d31ab7
> 60"
> >> +
> >> +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"
> >> --
> >> 2.12.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-04-05 17:41     ` Martin Jansa
@ 2017-04-05 17:57       ` Khem Raj
  2017-04-05 17:58       ` Khem Raj
  1 sibling, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-04-05 17:57 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

On Wed, Apr 5, 2017 at 10:41 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> I've merged many changes from master-next today, only the ones for
> meta-networking layer are left in master-next now.
>
> Can you please resend remaining changes (rebased on master-next) and
> integrate the fixes into them?
>

I have rebased kraj/master on upstream master and also squashed the
changed into the original ones since they were not merged yet.

> Thanks
>
> On Wed, Apr 5, 2017 at 6:38 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Thanks Martin for triaging it. The fix is pushed to kraj/master
>>
>>
>> https://github.com/kraj/meta-openembedded/commit/21b5a2ad436439bfddd8b1d30fcfab28d868d063
>>
>>
>> On Mon, Apr 3, 2017 at 12:19 PM, Martin Jansa <martin.jansa@gmail.com>
>> wrote:
>> > On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
>> >> Additional patches are upstream to fix build with gcc6 and clang
>> >> Add systemd unit file
>> >>
>> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >> ---
>> >>  .../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
>> >
>> > This breaks links build, before this change links detected gpm and
>> > enabled FB driver:
>> >
>> > configure:7756: result: yes
>> > configure:7756: checking for gpm.h
>> > configure:7756: result: yes
>> > configure:7766: checking for Gpm_Open in -lgpm
>> > configure:7791: i586-oe-linux-gcc  -m32 -march=i586
>> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
>> > configure:7791: $? = 0
>> > configure:7800: result: yes
>> > configure:7813: checking for Gpm_GetLibVersion
>> > configure:7813: i586-oe-linux-gcc  -m32 -march=i586
>> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
>> > configure:7813: $? = 0
>> > configure:7813: result: yes
>> >
>> >
>> > with this change:
>> > configure:7756: checking for gpm.h
>> > configure:7756: result: yes
>> > configure:7766: checking for Gpm_Open in -lgpm
>> > configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
>> > -msse3 -mfpmath=sse
>> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
>> >
>> > /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld:
>> > error: cannot find -lgpm
>> > /usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined
>> > reference to 'Gpm_Open'
>> > collect2: error: ld returned 1 exit status
>> > configure:7791: $? = 1
>> > configure: failed program was:
>> > | /* confdefs.h */
>> > | #define PACKAGE_NAME ""
>> > | #define PACKAGE_TARNAME ""
>> > | #define PACKAGE_VERSION ""
>> > | #define PACKAGE_STRING ""
>> > | #define PACKAGE_BUGREPORT ""
>> > | #define PACKAGE_URL ""
>> > | #define PACKAGE "links"
>> > | #define VERSION "2.7"
>> > | #define STDC_HEADERS 1
>> > | #define HAVE_TYPEOF 1
>> > | #define HAVE_LONG_LONG 1
>> > ...
>> > | #define HAVE_LIBM 1
>> > | #define HAVE_GPM_H 1
>> > | /* end confdefs.h.  */
>> > |
>> > | /* Override any GCC internal prototype to avoid an error.
>> > |    Use char because int might match the return type of a GCC
>> > |    builtin and then its argument prototype would still apply.  */
>> > | #ifdef __cplusplus
>> > | extern "C"
>> > | #endif
>> > | char Gpm_Open ();
>> > | int
>> > | main ()
>> > | {
>> > | return Gpm_Open ();
>> > |   ;
>> > |   return 0;
>> > | }
>> > configure:7800: result: no
>> > configure:7813: checking for Gpm_GetLibVersion
>> > configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
>> > -msse3 -mfpmath=sse
>> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
>> > /usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined
>> > reference to 'Gpm_GetLibVersion'
>> > collect2: error: ld returned 1 exit status
>> > configure:7813: $? = 1
>> > configure: failed program was:
>> > | /* confdefs.h */
>> > | #define PACKAGE_NAME ""
>> > | #define PACKAGE_TARNAME ""
>> > ...
>> > | #define HAVE_LIBM 1
>> > | #define HAVE_GPM_H 1
>> > | /* end confdefs.h.  */
>> > | /* Define Gpm_GetLibVersion to an innocuous variant, in case
>> > <limits.h> declares Gpm_GetLibVersion.
>> > |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>> > | #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
>> > |
>> > | /* System header to define __stub macros and hopefully few prototypes,
>> > |     which can conflict with char Gpm_GetLibVersion (); below.
>> > |     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>> > |     <limits.h> exists even on freestanding compilers.  */
>> > |
>> > | #ifdef __STDC__
>> > | # include <limits.h>
>> > | #else
>> > | # include <assert.h>
>> > | #endif
>> > |
>> > | #undef Gpm_GetLibVersion
>> > |
>> > | /* Override any GCC internal prototype to avoid an error.
>> > |    Use char because int might match the return type of a GCC
>> > |    builtin and then its argument prototype would still apply.  */
>> > | #ifdef __cplusplus
>> > | extern "C"
>> > | #endif
>> > | char Gpm_GetLibVersion ();
>> > | /* The GNU C library defines this for functions which it implements
>> > |     to always fail with ENOSYS.  Some functions are actually named
>> > |     something starting with __ and the normal name is an alias.  */
>> > | #if defined __stub_Gpm_GetLibVersion || defined
>> > __stub___Gpm_GetLibVersion
>> > | choke me
>> > | #endif
>> > |
>> > | int
>> > | main ()
>> > | {
>> > | return Gpm_GetLibVersion ();
>> > |   ;
>> > |   return 0;
>> > | }
>> > configure:7813: result: no
>> >
>> >
>> > The dependency is there and library as well:
>> >
>> > work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
>> > ./recipe-sysroot/usr/lib/libgpm.so.1
>> > ./recipe-sysroot/usr/lib/libgpm.so.2
>> > ./recipe-sysroot/usr/lib/libgpm.a
>> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >
>> > but libgpm.so.1 link is broken:
>> >
>> > work/core2-64-oe-linux/links/2.7-r0$ ls -lah
>> > ./recipe-sysroot/usr/lib/libgpm*
>> > -rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50
>> > ./recipe-sysroot/usr/lib/libgpm.a
>> > lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56
>> > ./recipe-sysroot/usr/lib/libgpm.so.1 -> libgpm.so.1.19.0
>> > lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56
>> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
>> > -rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50
>> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >
>> > with this change there is only the 2.1.0 version:
>> > lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12
>> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
>> > -rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59
>> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >
>> >
>> >> 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 <fcntl.h>              /* open and co.  */
>> >> - #include <sys/stat.h>           /* stat() */
>> >> - #include <sys/ioctl.h>          /* ioctl() */
>> >> -+#include <sys/types.h>          /* major() */
>> >> -
>> >> - /* Linux specific (to be outsourced in gpm2 */
>> >> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
>> >> -
>> >> -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"
>> >> --
>> >> 2.12.1
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >
>> > --
>> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-04-05 17:41     ` Martin Jansa
  2017-04-05 17:57       ` Khem Raj
@ 2017-04-05 17:58       ` Khem Raj
  2017-04-05 18:36         ` Martin Jansa
  1 sibling, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-04-05 17:58 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

I have created a new branch kraj/master-next which has the changes
rebased on top of upstream master-next

On Wed, Apr 5, 2017 at 10:41 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> I've merged many changes from master-next today, only the ones for
> meta-networking layer are left in master-next now.
>
> Can you please resend remaining changes (rebased on master-next) and
> integrate the fixes into them?
>
> Thanks
>
> On Wed, Apr 5, 2017 at 6:38 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Thanks Martin for triaging it. The fix is pushed to kraj/master
>>
>>
>> https://github.com/kraj/meta-openembedded/commit/21b5a2ad436439bfddd8b1d30fcfab28d868d063
>>
>>
>> On Mon, Apr 3, 2017 at 12:19 PM, Martin Jansa <martin.jansa@gmail.com>
>> wrote:
>> > On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
>> >> Additional patches are upstream to fix build with gcc6 and clang
>> >> Add systemd unit file
>> >>
>> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >> ---
>> >>  .../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
>> >
>> > This breaks links build, before this change links detected gpm and
>> > enabled FB driver:
>> >
>> > configure:7756: result: yes
>> > configure:7756: checking for gpm.h
>> > configure:7756: result: yes
>> > configure:7766: checking for Gpm_Open in -lgpm
>> > configure:7791: i586-oe-linux-gcc  -m32 -march=i586
>> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
>> > configure:7791: $? = 0
>> > configure:7800: result: yes
>> > configure:7813: checking for Gpm_GetLibVersion
>> > configure:7813: i586-oe-linux-gcc  -m32 -march=i586
>> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
>> > configure:7813: $? = 0
>> > configure:7813: result: yes
>> >
>> >
>> > with this change:
>> > configure:7756: checking for gpm.h
>> > configure:7756: result: yes
>> > configure:7766: checking for Gpm_Open in -lgpm
>> > configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
>> > -msse3 -mfpmath=sse
>> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
>> >
>> > /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld:
>> > error: cannot find -lgpm
>> > /usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined
>> > reference to 'Gpm_Open'
>> > collect2: error: ld returned 1 exit status
>> > configure:7791: $? = 1
>> > configure: failed program was:
>> > | /* confdefs.h */
>> > | #define PACKAGE_NAME ""
>> > | #define PACKAGE_TARNAME ""
>> > | #define PACKAGE_VERSION ""
>> > | #define PACKAGE_STRING ""
>> > | #define PACKAGE_BUGREPORT ""
>> > | #define PACKAGE_URL ""
>> > | #define PACKAGE "links"
>> > | #define VERSION "2.7"
>> > | #define STDC_HEADERS 1
>> > | #define HAVE_TYPEOF 1
>> > | #define HAVE_LONG_LONG 1
>> > ...
>> > | #define HAVE_LIBM 1
>> > | #define HAVE_GPM_H 1
>> > | /* end confdefs.h.  */
>> > |
>> > | /* Override any GCC internal prototype to avoid an error.
>> > |    Use char because int might match the return type of a GCC
>> > |    builtin and then its argument prototype would still apply.  */
>> > | #ifdef __cplusplus
>> > | extern "C"
>> > | #endif
>> > | char Gpm_Open ();
>> > | int
>> > | main ()
>> > | {
>> > | return Gpm_Open ();
>> > |   ;
>> > |   return 0;
>> > | }
>> > configure:7800: result: no
>> > configure:7813: checking for Gpm_GetLibVersion
>> > configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
>> > -msse3 -mfpmath=sse
>> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
>> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
>> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
>> > /usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined
>> > reference to 'Gpm_GetLibVersion'
>> > collect2: error: ld returned 1 exit status
>> > configure:7813: $? = 1
>> > configure: failed program was:
>> > | /* confdefs.h */
>> > | #define PACKAGE_NAME ""
>> > | #define PACKAGE_TARNAME ""
>> > ...
>> > | #define HAVE_LIBM 1
>> > | #define HAVE_GPM_H 1
>> > | /* end confdefs.h.  */
>> > | /* Define Gpm_GetLibVersion to an innocuous variant, in case
>> > <limits.h> declares Gpm_GetLibVersion.
>> > |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>> > | #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
>> > |
>> > | /* System header to define __stub macros and hopefully few prototypes,
>> > |     which can conflict with char Gpm_GetLibVersion (); below.
>> > |     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>> > |     <limits.h> exists even on freestanding compilers.  */
>> > |
>> > | #ifdef __STDC__
>> > | # include <limits.h>
>> > | #else
>> > | # include <assert.h>
>> > | #endif
>> > |
>> > | #undef Gpm_GetLibVersion
>> > |
>> > | /* Override any GCC internal prototype to avoid an error.
>> > |    Use char because int might match the return type of a GCC
>> > |    builtin and then its argument prototype would still apply.  */
>> > | #ifdef __cplusplus
>> > | extern "C"
>> > | #endif
>> > | char Gpm_GetLibVersion ();
>> > | /* The GNU C library defines this for functions which it implements
>> > |     to always fail with ENOSYS.  Some functions are actually named
>> > |     something starting with __ and the normal name is an alias.  */
>> > | #if defined __stub_Gpm_GetLibVersion || defined
>> > __stub___Gpm_GetLibVersion
>> > | choke me
>> > | #endif
>> > |
>> > | int
>> > | main ()
>> > | {
>> > | return Gpm_GetLibVersion ();
>> > |   ;
>> > |   return 0;
>> > | }
>> > configure:7813: result: no
>> >
>> >
>> > The dependency is there and library as well:
>> >
>> > work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
>> > ./recipe-sysroot/usr/lib/libgpm.so.1
>> > ./recipe-sysroot/usr/lib/libgpm.so.2
>> > ./recipe-sysroot/usr/lib/libgpm.a
>> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >
>> > but libgpm.so.1 link is broken:
>> >
>> > work/core2-64-oe-linux/links/2.7-r0$ ls -lah
>> > ./recipe-sysroot/usr/lib/libgpm*
>> > -rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50
>> > ./recipe-sysroot/usr/lib/libgpm.a
>> > lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56
>> > ./recipe-sysroot/usr/lib/libgpm.so.1 -> libgpm.so.1.19.0
>> > lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56
>> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
>> > -rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50
>> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >
>> > with this change there is only the 2.1.0 version:
>> > lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12
>> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
>> > -rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59
>> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >
>> >
>> >> 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 <fcntl.h>              /* open and co.  */
>> >> - #include <sys/stat.h>           /* stat() */
>> >> - #include <sys/ioctl.h>          /* ioctl() */
>> >> -+#include <sys/types.h>          /* major() */
>> >> -
>> >> - /* Linux specific (to be outsourced in gpm2 */
>> >> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
>> >> -
>> >> -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"
>> >> --
>> >> 2.12.1
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >
>> > --
>> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-04-05 17:58       ` Khem Raj
@ 2017-04-05 18:36         ` Martin Jansa
  2017-04-05 19:37           ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-05 18:36 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

[-- Attachment #1: Type: text/plain, Size: 32838 bytes --]

On Wed, Apr 05, 2017 at 10:58:37AM -0700, Khem Raj wrote:
> I have created a new branch kraj/master-next which has the changes
> rebased on top of upstream master-next

Thanks!

I've squashed the 2 changes you had there for minicoredumper and fixed
commit message "Fix problem founds during musl build" to
"uml-utilities: Fix problem founds during musl build"

Now it should be all in master-next for next jenkins run.

> On Wed, Apr 5, 2017 at 10:41 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > I've merged many changes from master-next today, only the ones for
> > meta-networking layer are left in master-next now.
> >
> > Can you please resend remaining changes (rebased on master-next) and
> > integrate the fixes into them?
> >
> > Thanks
> >
> > On Wed, Apr 5, 2017 at 6:38 PM, Khem Raj <raj.khem@gmail.com> wrote:
> >>
> >> Thanks Martin for triaging it. The fix is pushed to kraj/master
> >>
> >>
> >> https://github.com/kraj/meta-openembedded/commit/21b5a2ad436439bfddd8b1d30fcfab28d868d063
> >>
> >>
> >> On Mon, Apr 3, 2017 at 12:19 PM, Martin Jansa <martin.jansa@gmail.com>
> >> wrote:
> >> > On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
> >> >> Additional patches are upstream to fix build with gcc6 and clang
> >> >> Add systemd unit file
> >> >>
> >> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> >> ---
> >> >>  .../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
> >> >
> >> > This breaks links build, before this change links detected gpm and
> >> > enabled FB driver:
> >> >
> >> > configure:7756: result: yes
> >> > configure:7756: checking for gpm.h
> >> > configure:7756: result: yes
> >> > configure:7766: checking for Gpm_Open in -lgpm
> >> > configure:7791: i586-oe-linux-gcc  -m32 -march=i586
> >> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
> >> > configure:7791: $? = 0
> >> > configure:7800: result: yes
> >> > configure:7813: checking for Gpm_GetLibVersion
> >> > configure:7813: i586-oe-linux-gcc  -m32 -march=i586
> >> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
> >> > configure:7813: $? = 0
> >> > configure:7813: result: yes
> >> >
> >> >
> >> > with this change:
> >> > configure:7756: checking for gpm.h
> >> > configure:7756: result: yes
> >> > configure:7766: checking for Gpm_Open in -lgpm
> >> > configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
> >> > -msse3 -mfpmath=sse
> >> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
> >> >
> >> > /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld:
> >> > error: cannot find -lgpm
> >> > /usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined
> >> > reference to 'Gpm_Open'
> >> > collect2: error: ld returned 1 exit status
> >> > configure:7791: $? = 1
> >> > configure: failed program was:
> >> > | /* confdefs.h */
> >> > | #define PACKAGE_NAME ""
> >> > | #define PACKAGE_TARNAME ""
> >> > | #define PACKAGE_VERSION ""
> >> > | #define PACKAGE_STRING ""
> >> > | #define PACKAGE_BUGREPORT ""
> >> > | #define PACKAGE_URL ""
> >> > | #define PACKAGE "links"
> >> > | #define VERSION "2.7"
> >> > | #define STDC_HEADERS 1
> >> > | #define HAVE_TYPEOF 1
> >> > | #define HAVE_LONG_LONG 1
> >> > ...
> >> > | #define HAVE_LIBM 1
> >> > | #define HAVE_GPM_H 1
> >> > | /* end confdefs.h.  */
> >> > |
> >> > | /* Override any GCC internal prototype to avoid an error.
> >> > |    Use char because int might match the return type of a GCC
> >> > |    builtin and then its argument prototype would still apply.  */
> >> > | #ifdef __cplusplus
> >> > | extern "C"
> >> > | #endif
> >> > | char Gpm_Open ();
> >> > | int
> >> > | main ()
> >> > | {
> >> > | return Gpm_Open ();
> >> > |   ;
> >> > |   return 0;
> >> > | }
> >> > configure:7800: result: no
> >> > configure:7813: checking for Gpm_GetLibVersion
> >> > configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
> >> > -msse3 -mfpmath=sse
> >> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
> >> > /usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined
> >> > reference to 'Gpm_GetLibVersion'
> >> > collect2: error: ld returned 1 exit status
> >> > configure:7813: $? = 1
> >> > configure: failed program was:
> >> > | /* confdefs.h */
> >> > | #define PACKAGE_NAME ""
> >> > | #define PACKAGE_TARNAME ""
> >> > ...
> >> > | #define HAVE_LIBM 1
> >> > | #define HAVE_GPM_H 1
> >> > | /* end confdefs.h.  */
> >> > | /* Define Gpm_GetLibVersion to an innocuous variant, in case
> >> > <limits.h> declares Gpm_GetLibVersion.
> >> > |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
> >> > | #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
> >> > |
> >> > | /* System header to define __stub macros and hopefully few prototypes,
> >> > |     which can conflict with char Gpm_GetLibVersion (); below.
> >> > |     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> >> > |     <limits.h> exists even on freestanding compilers.  */
> >> > |
> >> > | #ifdef __STDC__
> >> > | # include <limits.h>
> >> > | #else
> >> > | # include <assert.h>
> >> > | #endif
> >> > |
> >> > | #undef Gpm_GetLibVersion
> >> > |
> >> > | /* Override any GCC internal prototype to avoid an error.
> >> > |    Use char because int might match the return type of a GCC
> >> > |    builtin and then its argument prototype would still apply.  */
> >> > | #ifdef __cplusplus
> >> > | extern "C"
> >> > | #endif
> >> > | char Gpm_GetLibVersion ();
> >> > | /* The GNU C library defines this for functions which it implements
> >> > |     to always fail with ENOSYS.  Some functions are actually named
> >> > |     something starting with __ and the normal name is an alias.  */
> >> > | #if defined __stub_Gpm_GetLibVersion || defined
> >> > __stub___Gpm_GetLibVersion
> >> > | choke me
> >> > | #endif
> >> > |
> >> > | int
> >> > | main ()
> >> > | {
> >> > | return Gpm_GetLibVersion ();
> >> > |   ;
> >> > |   return 0;
> >> > | }
> >> > configure:7813: result: no
> >> >
> >> >
> >> > The dependency is there and library as well:
> >> >
> >> > work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
> >> > ./recipe-sysroot/usr/lib/libgpm.so.1
> >> > ./recipe-sysroot/usr/lib/libgpm.so.2
> >> > ./recipe-sysroot/usr/lib/libgpm.a
> >> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
> >> >
> >> > but libgpm.so.1 link is broken:
> >> >
> >> > work/core2-64-oe-linux/links/2.7-r0$ ls -lah
> >> > ./recipe-sysroot/usr/lib/libgpm*
> >> > -rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50
> >> > ./recipe-sysroot/usr/lib/libgpm.a
> >> > lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56
> >> > ./recipe-sysroot/usr/lib/libgpm.so.1 -> libgpm.so.1.19.0
> >> > lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56
> >> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
> >> > -rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50
> >> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
> >> >
> >> > with this change there is only the 2.1.0 version:
> >> > lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12
> >> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
> >> > -rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59
> >> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
> >> >
> >> >
> >> >> 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 <fcntl.h>              /* open and co.  */
> >> >> - #include <sys/stat.h>           /* stat() */
> >> >> - #include <sys/ioctl.h>          /* ioctl() */
> >> >> -+#include <sys/types.h>          /* major() */
> >> >> -
> >> >> - /* Linux specific (to be outsourced in gpm2 */
> >> >> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
> >> >> -
> >> >> -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"
> >> >> --
> >> >> 2.12.1
> >> >>
> >> >> --
> >> >> _______________________________________________
> >> >> Openembedded-devel mailing list
> >> >> Openembedded-devel@lists.openembedded.org
> >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >> >
> >> > --
> >> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> >
> >

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 01/43] gpm: Update to use git src uri
  2017-04-05 18:36         ` Martin Jansa
@ 2017-04-05 19:37           ` Khem Raj
  0 siblings, 0 replies; 66+ messages in thread
From: Khem Raj @ 2017-04-05 19:37 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

Hi Martin

I forgot to drop the ttf-inconsolata patch and its there in master-next too
you might need to drop it manually

http://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=cb5f9fbbd6780011ab2c03b173800d6771d90961

On Wed, Apr 5, 2017 at 11:36 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Apr 05, 2017 at 10:58:37AM -0700, Khem Raj wrote:
>> I have created a new branch kraj/master-next which has the changes
>> rebased on top of upstream master-next
>
> Thanks!
>
> I've squashed the 2 changes you had there for minicoredumper and fixed
> commit message "Fix problem founds during musl build" to
> "uml-utilities: Fix problem founds during musl build"
>
> Now it should be all in master-next for next jenkins run.
>
>> On Wed, Apr 5, 2017 at 10:41 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > I've merged many changes from master-next today, only the ones for
>> > meta-networking layer are left in master-next now.
>> >
>> > Can you please resend remaining changes (rebased on master-next) and
>> > integrate the fixes into them?
>> >
>> > Thanks
>> >
>> > On Wed, Apr 5, 2017 at 6:38 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> >>
>> >> Thanks Martin for triaging it. The fix is pushed to kraj/master
>> >>
>> >>
>> >> https://github.com/kraj/meta-openembedded/commit/21b5a2ad436439bfddd8b1d30fcfab28d868d063
>> >>
>> >>
>> >> On Mon, Apr 3, 2017 at 12:19 PM, Martin Jansa <martin.jansa@gmail.com>
>> >> wrote:
>> >> > On Fri, Mar 31, 2017 at 09:42:05AM -0700, Khem Raj wrote:
>> >> >> Additional patches are upstream to fix build with gcc6 and clang
>> >> >> Add systemd unit file
>> >> >>
>> >> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >> >> ---
>> >> >>  .../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
>> >> >
>> >> > This breaks links build, before this change links detected gpm and
>> >> > enabled FB driver:
>> >> >
>> >> > configure:7756: result: yes
>> >> > configure:7756: checking for gpm.h
>> >> > configure:7756: result: yes
>> >> > configure:7766: checking for Gpm_Open in -lgpm
>> >> > configure:7791: i586-oe-linux-gcc  -m32 -march=i586
>> >> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
>> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
>> >> > configure:7791: $? = 0
>> >> > configure:7800: result: yes
>> >> > configure:7813: checking for Gpm_GetLibVersion
>> >> > configure:7813: i586-oe-linux-gcc  -m32 -march=i586
>> >> > --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot
>> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> >> > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/links/2.7-r0/recipe-sysroot=
>> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm -lm  >&5
>> >> > configure:7813: $? = 0
>> >> > configure:7813: result: yes
>> >> >
>> >> >
>> >> > with this change:
>> >> > configure:7756: checking for gpm.h
>> >> > configure:7756: result: yes
>> >> > configure:7766: checking for Gpm_Open in -lgpm
>> >> > configure:7791: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
>> >> > -msse3 -mfpmath=sse
>> >> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
>> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
>> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lgpm  -lm  >&5
>> >> >
>> >> > /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.3.0/ld:
>> >> > error: cannot find -lgpm
>> >> > /usr/src/debug/links/2.7-r0/build/conftest.c:117: error: undefined
>> >> > reference to 'Gpm_Open'
>> >> > collect2: error: ld returned 1 exit status
>> >> > configure:7791: $? = 1
>> >> > configure: failed program was:
>> >> > | /* confdefs.h */
>> >> > | #define PACKAGE_NAME ""
>> >> > | #define PACKAGE_TARNAME ""
>> >> > | #define PACKAGE_VERSION ""
>> >> > | #define PACKAGE_STRING ""
>> >> > | #define PACKAGE_BUGREPORT ""
>> >> > | #define PACKAGE_URL ""
>> >> > | #define PACKAGE "links"
>> >> > | #define VERSION "2.7"
>> >> > | #define STDC_HEADERS 1
>> >> > | #define HAVE_TYPEOF 1
>> >> > | #define HAVE_LONG_LONG 1
>> >> > ...
>> >> > | #define HAVE_LIBM 1
>> >> > | #define HAVE_GPM_H 1
>> >> > | /* end confdefs.h.  */
>> >> > |
>> >> > | /* Override any GCC internal prototype to avoid an error.
>> >> > |    Use char because int might match the return type of a GCC
>> >> > |    builtin and then its argument prototype would still apply.  */
>> >> > | #ifdef __cplusplus
>> >> > | extern "C"
>> >> > | #endif
>> >> > | char Gpm_Open ();
>> >> > | int
>> >> > | main ()
>> >> > | {
>> >> > | return Gpm_Open ();
>> >> > |   ;
>> >> > |   return 0;
>> >> > | }
>> >> > configure:7800: result: no
>> >> > configure:7813: checking for Gpm_GetLibVersion
>> >> > configure:7813: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2
>> >> > -msse3 -mfpmath=sse
>> >> > --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot
>> >> > -o conftest  -O2 -pipe -g -feliminate-unused-debug-types
>> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0=/usr/src/debug/links/2.7-r0
>> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot-native=
>> >> > -fdebug-prefix-map=/home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/links/2.7-r0/recipe-sysroot=
>> >> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c -lm  >&5
>> >> > /usr/src/debug/links/2.7-r0/build/conftest.c:140: error: undefined
>> >> > reference to 'Gpm_GetLibVersion'
>> >> > collect2: error: ld returned 1 exit status
>> >> > configure:7813: $? = 1
>> >> > configure: failed program was:
>> >> > | /* confdefs.h */
>> >> > | #define PACKAGE_NAME ""
>> >> > | #define PACKAGE_TARNAME ""
>> >> > ...
>> >> > | #define HAVE_LIBM 1
>> >> > | #define HAVE_GPM_H 1
>> >> > | /* end confdefs.h.  */
>> >> > | /* Define Gpm_GetLibVersion to an innocuous variant, in case
>> >> > <limits.h> declares Gpm_GetLibVersion.
>> >> > |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>> >> > | #define Gpm_GetLibVersion innocuous_Gpm_GetLibVersion
>> >> > |
>> >> > | /* System header to define __stub macros and hopefully few prototypes,
>> >> > |     which can conflict with char Gpm_GetLibVersion (); below.
>> >> > |     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>> >> > |     <limits.h> exists even on freestanding compilers.  */
>> >> > |
>> >> > | #ifdef __STDC__
>> >> > | # include <limits.h>
>> >> > | #else
>> >> > | # include <assert.h>
>> >> > | #endif
>> >> > |
>> >> > | #undef Gpm_GetLibVersion
>> >> > |
>> >> > | /* Override any GCC internal prototype to avoid an error.
>> >> > |    Use char because int might match the return type of a GCC
>> >> > |    builtin and then its argument prototype would still apply.  */
>> >> > | #ifdef __cplusplus
>> >> > | extern "C"
>> >> > | #endif
>> >> > | char Gpm_GetLibVersion ();
>> >> > | /* The GNU C library defines this for functions which it implements
>> >> > |     to always fail with ENOSYS.  Some functions are actually named
>> >> > |     something starting with __ and the normal name is an alias.  */
>> >> > | #if defined __stub_Gpm_GetLibVersion || defined
>> >> > __stub___Gpm_GetLibVersion
>> >> > | choke me
>> >> > | #endif
>> >> > |
>> >> > | int
>> >> > | main ()
>> >> > | {
>> >> > | return Gpm_GetLibVersion ();
>> >> > |   ;
>> >> > |   return 0;
>> >> > | }
>> >> > configure:7813: result: no
>> >> >
>> >> >
>> >> > The dependency is there and library as well:
>> >> >
>> >> > work/core2-64-oe-linux/links/2.7-r0$ find . -name libgpm\*
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.1
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.2
>> >> > ./recipe-sysroot/usr/lib/libgpm.a
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >> >
>> >> > but libgpm.so.1 link is broken:
>> >> >
>> >> > work/core2-64-oe-linux/links/2.7-r0$ ls -lah
>> >> > ./recipe-sysroot/usr/lib/libgpm*
>> >> > -rw-r--r-- 2 jenkins Jenkins 103K Apr  3 08:50
>> >> > ./recipe-sysroot/usr/lib/libgpm.a
>> >> > lrwxrwxrwx 1 jenkins Jenkins   16 Apr  3 08:56
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.1 -> libgpm.so.1.19.0
>> >> > lrwxrwxrwx 1 jenkins Jenkins   15 Apr  3 08:56
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
>> >> > -rw-r--r-- 2 jenkins Jenkins  23K Apr  3 08:50
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >> >
>> >> > with this change there is only the 2.1.0 version:
>> >> > lrwxrwxrwx 1 jenkins Jenkins  15 Apr  3 09:12
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.2 -> libgpm.so.2.1.0
>> >> > -rwxr-xr-x 3 jenkins Jenkins 23K Apr  2 12:59
>> >> > ./recipe-sysroot/usr/lib/libgpm.so.2.1.0
>> >> >
>> >> >
>> >> >> 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 <fcntl.h>              /* open and co.  */
>> >> >> - #include <sys/stat.h>           /* stat() */
>> >> >> - #include <sys/ioctl.h>          /* ioctl() */
>> >> >> -+#include <sys/types.h>          /* major() */
>> >> >> -
>> >> >> - /* Linux specific (to be outsourced in gpm2 */
>> >> >> - #include <linux/serial.h>       /* 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 <raj.khem@gmail.com>
>> >> >> -
>> >> >> -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"
>> >> >> --
>> >> >> 2.12.1
>> >> >>
>> >> >> --
>> >> >> _______________________________________________
>> >> >> Openembedded-devel mailing list
>> >> >> Openembedded-devel@lists.openembedded.org
>> >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >> >
>> >> > --
>> >> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>> >
>> >
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release
  2017-04-05 16:49     ` Khem Raj
@ 2017-04-06  7:30       ` Martin Jansa
  0 siblings, 0 replies; 66+ messages in thread
From: Martin Jansa @ 2017-04-06  7:30 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

It was there with older corosync as well, but are you willing to look at:

corosync-2.4.2: ELF binary
'/tmp/work/core2-64-oe-linux/corosync/2.4.2-r0/packages-split/corosync/usr/sbin/corosync'
has relocations in .text [textrel]

?

On Wed, Apr 5, 2017 at 6:49 PM, Khem Raj <raj.khem@gmail.com> wrote:

> On Mon, Apr 3, 2017 at 7:18 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> > On Fri, Mar 31, 2017 at 09:42:33AM -0700, Khem Raj wrote:
> >> Add a patch needed for cross compiling
> >
> > This breaks corosync:
> > http://errors.yoctoproject.org/Errors/Details/138932/
> >
>
> This needed updated too. I have pushed a recipe update for corosync
> https://github.com/kraj/meta-openembedded/commit/
> 6d4e506ecf2ae4effee4e70b3ff0e3d7c1a18542
>
>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >>  ...-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%)
> >>
> >> 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 <raj.khem@gmail.com>
> >> +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 <raj.khem@gmail.com>
> >> +---
> >> + 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 <time.h>]],
> >> +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return
> -1;]])],
> >> ++[[
> >> ++#include <unistd.h>
> >> ++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=321bf41f280cf805086dd5a720b377
> 85"
> >>
> >> -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 )
> >>  }
> >> -
> >> -
> >> --
> >> 2.12.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8
  2017-03-31 16:42 ` [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8 Khem Raj
@ 2017-04-07 17:42   ` Martin Jansa
  2017-04-07 22:21     ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Martin Jansa @ 2017-04-07 17:42 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]

On Fri, Mar 31, 2017 at 09:42:17AM -0700, Khem Raj wrote:
> Fixes build with musl

WARNING: poco-1.7.8-r0 do_package: poco-1.7.8 was registered as shlib
provider for libCppUnit.so.1, changing it to poco-cppunit-1.7.8 because
it was built later

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  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%)
> 
> 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 \
>     "
>  
> -- 
> 2.12.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8
  2017-04-07 17:42   ` Martin Jansa
@ 2017-04-07 22:21     ` Khem Raj
  2017-04-07 23:43       ` Khem Raj
  0 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-04-07 22:21 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

On Fri, Apr 7, 2017 at 10:42 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> WARNING: poco-1.7.8-r0 do_package: poco-1.7.8 was registered as shlib
> provider for libCppUnit.so.1, changing it to poco-cppunit-1.7.8 because
> it was built later

actually poco should not build a shared object at all since that
should come from cppunit recipe.


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8
  2017-04-07 22:21     ` Khem Raj
@ 2017-04-07 23:43       ` Khem Raj
  2017-04-08  7:20         ` Martin Jansa
  0 siblings, 1 reply; 66+ messages in thread
From: Khem Raj @ 2017-04-07 23:43 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

On Fri, Apr 7, 2017 at 3:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Apr 7, 2017 at 10:42 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> WARNING: poco-1.7.8-r0 do_package: poco-1.7.8 was registered as shlib
>> provider for libCppUnit.so.1, changing it to poco-cppunit-1.7.8 because
>> it was built later
>
> actually poco should not build a shared object at all since that
> should come from cppunit recipe.

actually the library names are different. And move to make it part of
poco--cppunit is the right thing. What problems do you see ? package
upgrade ?


^ permalink raw reply	[flat|nested] 66+ messages in thread

* Re: [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8
  2017-04-07 23:43       ` Khem Raj
@ 2017-04-08  7:20         ` Martin Jansa
  0 siblings, 0 replies; 66+ messages in thread
From: Martin Jansa @ 2017-04-08  7:20 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

This is warning during buildtime.

If this 2 packages are fighting which will provide the library, then users
of this library will get different one to RDEPENDS from shlibs code each
time the poco* are finished building in different order.

I don't know if we have any poco users in our metadata, but making it
deterministic is always good thing.

On Sat, Apr 8, 2017 at 1:43 AM, Khem Raj <raj.khem@gmail.com> wrote:

> On Fri, Apr 7, 2017 at 3:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On Fri, Apr 7, 2017 at 10:42 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >> WARNING: poco-1.7.8-r0 do_package: poco-1.7.8 was registered as shlib
> >> provider for libCppUnit.so.1, changing it to poco-cppunit-1.7.8 because
> >> it was built later
> >
> > actually poco should not build a shared object at all since that
> > should come from cppunit recipe.
>
> actually the library names are different. And move to make it part of
> poco--cppunit is the right thing. What problems do you see ? package
> upgrade ?
>


^ permalink raw reply	[flat|nested] 66+ messages in thread

end of thread, other threads:[~2017-04-08  7:20 UTC | newest]

Thread overview: 66+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 03/43] ctdb: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 04/43] v4l-utils: Depend on argp-standalone for musl Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 05/43] caps: Use c99 int types Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl Khem Raj
2017-04-01  3:50   ` Peter Kjellerstedt
2017-04-01 15:20     ` Khem Raj
2017-04-05 17:17       ` Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 07/43] squid: Update to 3.5.23 Khem Raj
2017-03-31 16:42 ` [meta-xfce][PATCH 08/43] xfce4-closebutton-plugin: Fix build with clang Khem Raj
2017-03-31 16:42 ` [meta-xfce][PATCH 09/43] xfce4-timer-plugin: Fix build when security flags are enabled " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 10/43] tcsh: Update to 6.20.00 release Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 11/43] libnfnetlink: Backport patches to fix musl build Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 12/43] ebtables: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8 Khem Raj
2017-04-07 17:42   ` Martin Jansa
2017-04-07 22:21     ` Khem Raj
2017-04-07 23:43       ` Khem Raj
2017-04-08  7:20         ` Martin Jansa
2017-03-31 16:42 ` [meta-oe][PATCH 14/43] mariadb: Do not use ucontext_* APIs with musl Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 15/43] lowpan-tools: Fix build " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 16/43] usb-modeswitch-data: Add dep on native tcl Khem Raj
2017-03-31 16:42 ` [meta-filesystems][PATCH 17/43] aufs-util: Define HOSTCC Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile Khem Raj
2017-04-02  7:14   ` Martin Jansa
2017-04-05 16:56     ` Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 19/43] libraw1394: Update to 2.1.2 release Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 20/43] libdc1394: Update to 2.2.5+ Khem Raj
2017-03-31 16:42 ` [meta-filesystems][PATCH 21/43] ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 22/43] openl2tp: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 23/43] rp-pppoe: " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0 Khem Raj
2017-04-02  7:14   ` Martin Jansa
2017-04-05 17:05     ` Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 25/43] vsftpd: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 26/43] faac: Fix with with security flags and on musl Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 27/43] dibbler: Upgrade to 1.0.2RC1 Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 28/43] live555: Do not use XLOCALE on musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release Khem Raj
2017-04-03 14:18   ` Martin Jansa
2017-04-05 16:49     ` Khem Raj
2017-04-06  7:30       ` Martin Jansa
2017-03-31 16:42 ` [meta-oe][PATCH 30/43] libgxim: Fix build with security flags turned on Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 31/43] vpnc: Update to build from github SRC_URI Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 32/43] daq: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 33/43] utouch: Fix build on musl Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 34/43] libavc1394: Add libargp " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH V2 35/43] picocom: Upgrade to 2.2 Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH V2 36/43] libexecinfo: Add recipe Khem Raj
2017-03-31 16:42 ` [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on Khem Raj
2017-04-02  7:16   ` Martin Jansa
2017-04-05 17:14     ` Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 38/43] arptables: Upgrade to 0.0.4 Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 39/43] libnetfilter-log: Switch to git URI Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 40/43] lxdm: Find libexecinfo if its on platform Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 41/43] libnetfilter-queue: Update to git for SRC_URI Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 42/43] libunique: Fix build with secutiy flags on Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 43/43] snort: Fix build with musl Khem Raj
2017-04-03 19:19 ` [meta-oe][PATCH 01/43] gpm: Update to use git src uri Martin Jansa
2017-04-05 16:38   ` Khem Raj
2017-04-05 17:41     ` Martin Jansa
2017-04-05 17:57       ` Khem Raj
2017-04-05 17:58       ` Khem Raj
2017-04-05 18:36         ` Martin Jansa
2017-04-05 19:37           ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.