* [meta-oe][PATCH 02/14] fftw: Update to 3.3.6 release
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 03/14] libxml++: Update to 2.40.1 Khem Raj
` (11 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/fftw/{fftw_3.3.5.bb => fftw_3.3.6.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/fftw/{fftw_3.3.5.bb => fftw_3.3.6.bb} (89%)
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.5.bb b/meta-oe/recipes-support/fftw/fftw_3.3.6.bb
similarity index 89%
rename from meta-oe/recipes-support/fftw/fftw_3.3.5.bb
rename to meta-oe/recipes-support/fftw/fftw_3.3.6.bb
index 71adb8905..559985169 100644
--- a/meta-oe/recipes-support/fftw/fftw_3.3.5.bb
+++ b/meta-oe/recipes-support/fftw/fftw_3.3.6.bb
@@ -4,11 +4,13 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SRC_URI = " \
- http://www.fftw.org/fftw-${PV}.tar.gz \
+ http://www.fftw.org/fftw-${PV}-pl1.tar.gz \
file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \
"
-SRC_URI[md5sum] = "6cc08a3b9c7ee06fdd5b9eb02e06f569"
-SRC_URI[sha256sum] = "8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf"
+SRC_URI[md5sum] = "682a0e78d6966ca37c7446d4ab4cc2a1"
+SRC_URI[sha256sum] = "1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d"
+
+S = "${WORKDIR}/fftw-${PV}-pl1"
inherit autotools pkgconfig
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 03/14] libxml++: Update to 2.40.1
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 02/14] fftw: Update to 3.3.6 release Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 04/14] gpm: Update to use git src uri Khem Raj
` (10 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Fix ptests for S != B case
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libxml/libxml++/libxml++_ptest.patch | 34 +++++++++++-----------
.../{libxml++_2.38.1.bb => libxml++_2.40.1.bb} | 4 +--
2 files changed, 19 insertions(+), 19 deletions(-)
rename meta-oe/recipes-core/libxml/{libxml++_2.38.1.bb => libxml++_2.40.1.bb} (84%)
diff --git a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch
index 82960f112..0d1a5186a 100644
--- a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch
+++ b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch
@@ -1,21 +1,21 @@
-diff --git a/Makefile.am b/Makefile.am
-index d4aadb1..0e36756 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -253,5 +253,8 @@ post-html: docs/index.html
- rsync $(rsync_args) -r docs/index.html $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project)
- rsync $(rsync_args) -r examples $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project)
+Index: libxml++-2.40.1/Makefile.am
+===================================================================
+--- libxml++-2.40.1.orig/Makefile.am
++++ libxml++-2.40.1/Makefile.am
+@@ -24,5 +24,8 @@ dist_noinst_SCRIPTS = autogen.sh
+
+ DISTCLEANFILES = MSVC_Net2010/libxml++/libxml++config.h
+install-ptest:
+ make -C examples install-ptest
+
# Optional: auto-generate the ChangeLog file from the git log on make dist
- include $(top_srcdir)/macros/dist-changelog.am
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index d9541ca..c27e088 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS)
+ include $(top_srcdir)/build/dist-changelog.am
+Index: libxml++-2.40.1/examples/Makefile.am
+===================================================================
+--- libxml++-2.40.1.orig/examples/Makefile.am
++++ libxml++-2.40.1/examples/Makefile.am
+@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_
AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS)
LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
@@ -24,7 +24,7 @@ index d9541ca..c27e088 100644
check_PROGRAMS = \
dom_build/dom_build \
dom_parse_entities/dom_parse_entities \
-@@ -36,6 +38,23 @@ check_PROGRAMS = \
+@@ -37,6 +39,23 @@ check_PROGRAMS = \
schemavalidation/schemavalidation \
textreader/textreader
@@ -48,7 +48,7 @@ index d9541ca..c27e088 100644
# Shell scripts that call the example programs.
check_SCRIPTS = \
dom_build/make_check.sh \
-@@ -147,10 +166,10 @@ dist_noinst_DATA = \
+@@ -154,10 +173,10 @@ dist_noinst_DATA = \
# file are located in different directories.
dom_read_write/make_check.sh: Makefile
echo '# Generated and used by "make check"' >$@
@@ -61,7 +61,7 @@ index d9541ca..c27e088 100644
standard_scripts = $(filter-out dom_read_write/make_check.sh,$(check_SCRIPTS))
# All other script files are generated like so:
-@@ -162,3 +181,18 @@ $(standard_scripts): Makefile
+@@ -169,3 +188,18 @@ $(standard_scripts): Makefile
CLEANFILES = \
dom_read_write/example_output.xml \
$(check_SCRIPTS)
@@ -77,6 +77,6 @@ index d9541ca..c27e088 100644
+ cd $(srcdir) && cp --parents $(dist_noinst_DATA) $(DESTDIR)/examples
+ cp Makefile $(DESTDIR)/examples
+ $(MKDIR_P) $(DESTDIR)/macros
-+ cp $(srcdir)/../macros/test-driver $(DESTDIR)/macros
++ cp $(top_srcdir)/build/test-driver $(DESTDIR)/macros
+ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/examples/Makefile
+
diff --git a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
similarity index 84%
rename from meta-oe/recipes-core/libxml/libxml++_2.38.1.bb
rename to meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
index 2cb954835..c001c184c 100644
--- a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb
+++ b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
@@ -11,8 +11,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \
file://libxml++_ptest.patch \
file://run-ptest \
"
-SRC_URI[md5sum] = "6b16aac575725a9bc0e9d96489e9251f"
-SRC_URI[sha256sum] = "882529189b03db6c69925b3f579ab1941feb4f02b5fe2612504ee7e498a4a05f"
+SRC_URI[md5sum] = "377a87bea899f2b4ff62df2418c3d8a6"
+SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9"
DEPENDS = "libxml2 glibmm"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 02/14] fftw: Update to 3.3.6 release Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 03/14] libxml++: Update to 2.40.1 Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-08 10:16 ` Martin Jansa
` (2 more replies)
2017-03-07 7:13 ` [meta-oe][PATCH 05/14] grail: Disable elision warnings for clang Khem Raj
` (9 subsequent siblings)
12 siblings, 3 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 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 | 52 ++--
7 files changed, 31 insertions(+), 370 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%)
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
index bbb8c28ac..7697772ca 100644
--- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
+++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
@@ -5,49 +5,39 @@ SECTION = "console/utils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f"
+PV .="+git${SRCREV}"
PR = "r2"
DEPENDS = "ncurses"
-SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
+SRC_URI = "git://github.com/telmich/gpm;protocol=git;branch=master \
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
+SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77"
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep update-rc.d systemd
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
+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
}
-SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544"
-SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee"
+
+SYSTEMD_SERVICE_${PN} = "gpm.service"
FILES_${PN} += "${datadir}/emacs"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-07 7:13 ` [meta-oe][PATCH 04/14] gpm: Update to use git src uri Khem Raj
@ 2017-03-08 10:16 ` Martin Jansa
2017-03-08 10:18 ` Martin Jansa
2017-03-29 11:05 ` Martin Jansa
2 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2017-03-08 10:16 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 6071 bytes --]
On Mon, Mar 06, 2017 at 11:13:39PM -0800, 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>
> ---
>
...
>
> 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
> index bbb8c28ac..7697772ca 100644
> --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> +++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> @@ -5,49 +5,39 @@ SECTION = "console/utils"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f"
NOTE: recipe gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2:
task do_populate_lic: Started
WARNING: gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2
do_populate_lic: Could not copy license file
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/git/gpm2/core/main.c
to
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/license-destdir/gpm/main.c:
[Errno 2] No such file or directory:
'/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/git/gpm2/core/main.c'
ERROR: gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2
do_populate_lic: QA Issue: gpm: LIC_FILES_CHKSUM points to an invalid
file:
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/gpm/1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2/git/gpm2/core/main.c
[license-checksum]
NOTE: recipe gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2:
task do_configure: Started
NOTE: recipe gpm-1.99.7+git1fd19417b8a4dd9945347e98dfa97e4cfd798d77-r2:
task do_populate_lic: Succeeded
>
> +PV .="+git${SRCREV}"
Isn't it better to rename the recipe to gpm_git.bb and set whole version
inside the recipe?
> PR = "r2"
>
> DEPENDS = "ncurses"
>
> -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
> +SRC_URI = "git://github.com/telmich/gpm;protocol=git;branch=master \
You can drop protocol and branch parameters as it's default.
> 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
> +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77"
> +S = "${WORKDIR}/git"
> +
> +inherit autotools-brokensep update-rc.d systemd
>
> 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
> +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
> }
> -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544"
> -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee"
> +
> +SYSTEMD_SERVICE_${PN} = "gpm.service"
>
> FILES_${PN} += "${datadir}/emacs"
> --
> 2.12.0
>
> --
> _______________________________________________
> 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] 22+ messages in thread* Re: [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-07 7:13 ` [meta-oe][PATCH 04/14] gpm: Update to use git src uri Khem Raj
2017-03-08 10:16 ` Martin Jansa
@ 2017-03-08 10:18 ` Martin Jansa
2017-03-29 11:05 ` Martin Jansa
2 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2017-03-08 10:18 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]
On Mon, Mar 06, 2017 at 11:13:39PM -0800, Khem Raj wrote:
> Additional patches are upstream to fix build with gcc6 and clang
> Add systemd unit file
And one more error later in do_install:
http://errors.yoctoproject.org/Errors/Details/134813/
>
> 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 | 52 ++--
> 7 files changed, 31 insertions(+), 370 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%)
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-07 7:13 ` [meta-oe][PATCH 04/14] gpm: Update to use git src uri Khem Raj
2017-03-08 10:16 ` Martin Jansa
2017-03-08 10:18 ` Martin Jansa
@ 2017-03-29 11:05 ` Martin Jansa
2017-03-29 14:06 ` Khem Raj
2 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2017-03-29 11:05 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 18739 bytes --]
On Mon, Mar 06, 2017 at 11:13:39PM -0800, 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 | 52 ++--
> 7 files changed, 31 insertions(+), 370 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%)
>
> 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
> index bbb8c28ac..7697772ca 100644
> --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> +++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> @@ -5,49 +5,39 @@ SECTION = "console/utils"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f"
>
> +PV .="+git${SRCREV}"
> PR = "r2"
>
> DEPENDS = "ncurses"
>
> -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
> +SRC_URI = "git://github.com/telmich/gpm;protocol=git;branch=master \
> 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
> +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77"
> +S = "${WORKDIR}/git"
> +
> +inherit autotools-brokensep update-rc.d systemd
>
> 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
> +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
Did you forgot to add gpm.service.in in SRC_URI?
> + 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
> }
> -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544"
> -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee"
> +
> +SYSTEMD_SERVICE_${PN} = "gpm.service"
>
> FILES_${PN} += "${datadir}/emacs"
> --
> 2.12.0
>
> --
> _______________________________________________
> 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] 22+ messages in thread* Re: [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-29 11:05 ` Martin Jansa
@ 2017-03-29 14:06 ` Khem Raj
2017-03-29 14:21 ` Martin Jansa
0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2017-03-29 14:06 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembeded-devel
>> +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
>
> Did you forgot to add gpm.service.in in SRC_URI?
I sent a V2 for this patch with another series i sent later. So you can drop it.
see
https://patchwork.openembedded.org/patch/138243/
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-29 14:06 ` Khem Raj
@ 2017-03-29 14:21 ` Martin Jansa
2017-03-29 14:30 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2017-03-29 14:21 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
On Wed, Mar 29, 2017 at 07:06:44AM -0700, Khem Raj wrote:
> >> +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
> >
> > Did you forgot to add gpm.service.in in SRC_URI?
>
> I sent a V2 for this patch with another series i sent later. So you can drop it.
> see
>
> https://patchwork.openembedded.org/patch/138243/
I think this is the one I was testing and I still don't see
gpm.service.in in SRC_URI, so it doesn't get unpacked in WORKDIR and the
sed call fails.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [meta-oe][PATCH 04/14] gpm: Update to use git src uri
2017-03-29 14:21 ` Martin Jansa
@ 2017-03-29 14:30 ` Khem Raj
0 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-29 14:30 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembeded-devel
On Wed, Mar 29, 2017 at 7:21 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Mar 29, 2017 at 07:06:44AM -0700, Khem Raj wrote:
>> >> +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
>> >
>> > Did you forgot to add gpm.service.in in SRC_URI?
>>
>> I sent a V2 for this patch with another series i sent later. So you can drop it.
>> see
>>
>> https://patchwork.openembedded.org/patch/138243/
>
> I think this is the one I was testing and I still don't see
> gpm.service.in in SRC_URI, so it doesn't get unpacked in WORKDIR and the
> sed call fails.
>
yes drop this for now. I will send a v3 with next pull request.
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 05/14] grail: Disable elision warnings for clang
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (2 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 04/14] gpm: Update to use git src uri Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 06/14] gperftools: Fix build with clang Khem Raj
` (8 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Clang warns more, but lets disable them for now
../../grail-3.1.1/src/handle.cpp:65:5: error: moving a temporary object prevents copy elision
[-Werror,-Wpessimizing-move]
std::move(UniqueRecognizer(recognizer));
^
../../grail-3.1.1/src/handle.cpp:65:5: note: remove std::move call here
std::move(UniqueRecognizer(recognizer));
^~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
index 3026744a0..5d9d12515 100644
--- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit autotools pkgconfig
DEPENDS = "frame"
-
+CXXFLAGS_append_toolchain-clang = " -Wno-pessimizing-move"
SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44"
SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 06/14] gperftools: Fix build with clang
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (3 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 05/14] grail: Disable elision warnings for clang Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 07/14] tbb: Update to 2017 release Khem Raj
` (7 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-Support-Atomic-ops-on-clang.patch | 33 ++++++++++++++++++++++
.../recipes-support/gperftools/gperftools_2.5.bb | 4 ++-
2 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
new file mode 100644
index 000000000..e582c0da6
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
@@ -0,0 +1,33 @@
+From ea9f64eb2cdf3be6c4dc65fa1472d854616e43ca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Mar 2017 13:38:46 -0800
+Subject: [PATCH] Support Atomic ops on clang
+
+clang pretends to be gcc 4.2 which is a lie
+it actually supports a lot more features then
+gcc 4.2, here it depends on gcc 4.7 to enable
+the atomics and fails for clang
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Pending
+
+ src/base/atomicops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/base/atomicops.h b/src/base/atomicops.h
+index be038f3..f1a21ff 100644
+--- a/src/base/atomicops.h
++++ b/src/base/atomicops.h
+@@ -118,7 +118,7 @@
+ #include "base/atomicops-internals-linuxppc.h"
+ #elif defined(__GNUC__) && defined(__mips__)
+ #include "base/atomicops-internals-mips.h"
+-#elif defined(__GNUC__) && GCC_VERSION >= 40700
++#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__)
+ #include "base/atomicops-internals-gcc.h"
+ #else
+ #error You need to implement atomic operations for this architecture
+--
+2.12.0
+
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb b/meta-oe/recipes-support/gperftools/gperftools_2.5.bb
index 2e4479c9d..3cab42385 100644
--- a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb
+++ b/meta-oe/recipes-support/gperftools/gperftools_2.5.bb
@@ -4,7 +4,9 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
DEPENDS = "libunwind"
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f50/gperftools-2.5.tar.gz"
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f50/gperftools-2.5.tar.gz \
+ file://0001-Support-Atomic-ops-on-clang.patch\
+ "
SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50"
SRC_URI[sha256sum] = "6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 07/14] tbb: Update to 2017 release
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (4 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 06/14] gperftools: Fix build with clang Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 08/14] irssi: Upgrade to 1.0.1 Khem Raj
` (6 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Update license to reflect new Apache 2.0 license
Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/tbb/{tbb_4.1.bb => tbb.bb} | 23 ++++++++---------
.../tbb/allow-to-build-for-older-arm-cores.patch | 30 ----------------------
.../recipes-support/tbb/tbb/cross-compile.patch | 30 ++++++++++++++++------
3 files changed, 33 insertions(+), 50 deletions(-)
rename meta-oe/recipes-support/tbb/{tbb_4.1.bb => tbb.bb} (74%)
delete mode 100644 meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch
diff --git a/meta-oe/recipes-support/tbb/tbb_4.1.bb b/meta-oe/recipes-support/tbb/tbb.bb
similarity index 74%
rename from meta-oe/recipes-support/tbb/tbb_4.1.bb
rename to meta-oe/recipes-support/tbb/tbb.bb
index 09ed6ec52..d8eb1c2f3 100644
--- a/meta-oe/recipes-support/tbb/tbb_4.1.bb
+++ b/meta-oe/recipes-support/tbb/tbb.bb
@@ -4,23 +4,22 @@ DESCRIPTION = "Parallelism library for C++ - runtime files \
higher-level, task-based parallelism that abstracts platform details \
and threading mechanism for performance and scalability."
HOMEPAGE = "http://threadingbuildingblocks.org/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1"
-PRDATE = "20130314"
-PR = "r${PRDATE}"
-
-SRC_URI = "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_${PRDATE}oss_src.tgz \
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+PRDATE = "20170118"
+PV = "${PRDATE}"
+SRC_URI = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb2017_${PRDATE}oss_src.tgz \
file://cross-compile.patch \
- file://allow-to-build-for-older-arm-cores.patch \
file://tbb.pc"
+SRC_URI[md5sum] = "26baa6fbcc8f03ee45c0641b91d9588a"
+SRC_URI[sha256sum] = "48bb526287fa8b4e7d1e1b2ba9e5fb9c3e372b497772c06ef9ccd7f93f344e74"
-S = "${WORKDIR}/tbb41_${PRDATE}oss/"
-
-SRC_URI[md5sum] = "ed4af7ccfa122f16cf9920b241633a3a"
-SRC_URI[sha256sum] = "32fd5979971b772caa96d40646cee585ed0070516ba2dbbcb1f9b6033d08a92d"
+S = "${WORKDIR}/tbb2017_${PRDATE}oss/"
+COMPILER ?= "gcc"
+COMPILER_toolchain-clang = "clang"
do_compile() {
- oe_runmake compiler=gcc arch=${HOST_ARCH} runtime=cc4
+ oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4
}
do_install() {
diff --git a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch b/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch
deleted file mode 100644
index cd2ec9499..000000000
--- a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Description: Allow to build TBB for ARM cores older than ARMv7a
-
-| ../../include/tbb/machine/gcc_armv7.h:39:2: error: #error Threading
-Building Blocks ARM port requires an ARMv7-a architecture.
-| make[1]: *** [concurrent_hash_map.o] Error 1
-
-https://bugs.launchpad.net/linaro-oe/+bug/1167144
-
-Upstream-status: pending
-
----
- include/tbb/tbb_machine.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- tbb41_20130314oss.orig/include/tbb/tbb_machine.h
-+++ tbb41_20130314oss/include/tbb/tbb_machine.h
-@@ -237,11 +237,11 @@ template<> struct atomic_selector<8> {
- #include "machine/linux_intel64.h"
- #elif __ia64__
- #include "machine/linux_ia64.h"
- #elif __powerpc__
- #include "machine/mac_ppc.h"
-- #elif __arm__
-+ #elif __ARM_ARCH_7A__
- #include "machine/gcc_armv7.h"
- #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT
- #include "machine/gcc_generic.h"
- #endif
- #include "machine/linux_common.h"
diff --git a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch
index b970a374e..d54b307ee 100644
--- a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch
+++ b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch
@@ -5,14 +5,14 @@ Upstream-Status: unsuitable
build/linux.gcc.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---- tbb41_20121003oss.orig/build/linux.gcc.inc
-+++ tbb41_20121003oss/build/linux.gcc.inc
-@@ -40,12 +40,13 @@ DYLIB_KEY = -shared
+Index: tbb2017_20170118oss/build/linux.gcc.inc
+===================================================================
+--- tbb2017_20170118oss.orig/build/linux.gcc.inc
++++ tbb2017_20170118oss/build/linux.gcc.inc
+@@ -32,8 +32,9 @@ DYLIB_KEY = -shared
EXPORT_KEY = -Wl,--version-script,
LIBDL = -ldl
- TBB_NOSTRICT = 1
-
-CPLUS = g++
-CONLY = gcc
+CPLUS = $(CXX)
@@ -20,6 +20,20 @@ Upstream-Status: unsuitable
+CPLUS_FLAGS = $(CXXFLAGS)
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=.
- C_FLAGS = $(CPLUS_FLAGS)
- # gcc 4.4 and higher support -std=c++0x
+ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
+Index: tbb2017_20170118oss/build/linux.clang.inc
+===================================================================
+--- tbb2017_20170118oss.orig/build/linux.clang.inc
++++ tbb2017_20170118oss/build/linux.clang.inc
+@@ -31,8 +31,9 @@ DYLIB_KEY = -shared
+ EXPORT_KEY = -Wl,--version-script,
+ LIBDL = -ldl
+
+-CPLUS = clang++
+-CONLY = clang
++CPLUS = $(CXX)
++CONLY = $(CC)
++CPLUS_FLAGS = $(CXXFLAGS)
+ LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
+ LIBS += -lpthread -lrt
+ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 08/14] irssi: Upgrade to 1.0.1
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (5 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 07/14] tbb: Update to 2017 release Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 09/14] a2jmidid: Fix build on aarch64 Khem Raj
` (5 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
| 22 ----------------------
| 12 ++++++++++++
2 files changed, 12 insertions(+), 22 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb
create mode 100644 meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb
diff --git a/meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb b/meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb
deleted file mode 100644
index 54d881d1c..000000000
--- a/meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "ncurses IRC client"
-DESCRIPTION = "Irssi is an ncurses IRC client"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8"
-
-DEPENDS = "glib-2.0 ncurses openssl"
-
-REALPV = "0.8.16-rc1"
-PV = "0.8.15+${REALPV}"
-
-SRC_URI = "http://irssi.org/files/irssi-${REALPV}.tar.gz"
-
-SRC_URI[md5sum] = "769fec4df8e633c583c411ccd2cd563a"
-SRC_URI[sha256sum] = "bb6c0125db30b697f80837941c17372b7484c64d57a6920b8bfa7ee3def92de3"
-
-S = "${WORKDIR}/irssi-${REALPV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-ssl \
- --with-ncurses=${STAGING_EXECPREFIXDIR} \
-"
--git a/meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb
new file mode 100644
index 000000000..041f5de6d
--- /dev/null
+++ b/meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb
@@ -0,0 +1,12 @@
+SUMMARY = "ncurses IRC client"
+DESCRIPTION = "Irssi is an ncurses IRC client"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8"
+
+DEPENDS = "glib-2.0 ncurses openssl"
+
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
+SRC_URI[md5sum] = "f6bed196cef63ea089f5cce089784445"
+SRC_URI[sha256sum] = "9428c51a3f3598ffaef438c351a8d609cf10db34f2435bdcb84456226c383ccf"
+
+inherit autotools pkgconfig
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 09/14] a2jmidid: Fix build on aarch64
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (6 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 08/14] irssi: Upgrade to 1.0.1 Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 10/14] log4c: Backport patch to fix security format errors with clang Khem Raj
` (4 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../jack/a2jmidid/0002-aarch64.patch | 31 ++++++++++++++++++++++
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 1 +
2 files changed, 32 insertions(+)
create mode 100644 meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch
diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch b/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch
new file mode 100644
index 000000000..b344f5427
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch
@@ -0,0 +1,31 @@
+Consider compiler define for aarch64
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status:Pending
+
+Index: a2jmidid-8/sigsegv.c
+===================================================================
+--- a2jmidid-8.orig/sigsegv.c
++++ a2jmidid-8/sigsegv.c
+@@ -91,18 +91,18 @@ static void signal_segv(int signum, sigi
+ a2j_error("info.si_errno = %d", info->si_errno);
+ a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
+ a2j_error("info.si_addr = %p", info->si_addr);
+-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
+ for(i = 0; i < NGREG; i++)
+ a2j_error("reg[%02d] = 0x" REGFORMAT, i,
+ #if defined(__powerpc__)
+ ucontext->uc_mcontext.uc_regs[i]
+-#elif defined(__sparc__) && defined(__arch64__)
++#elif defined(__sparc__) || defined(__arch64__)
+ ucontext->uc_mcontext.mc_gregs[i]
+ #else
+ ucontext->uc_mcontext.gregs[i]
+ #endif
+ );
+-#endif /* alpha, ia64, kFreeBSD, arm, hppa */
++#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */
+
+ #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
+ # if defined(SIGSEGV_STACK_IA64)
diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
index 0204fb904..a520f98e1 100644
--- a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
@@ -11,6 +11,7 @@ DEPENDS = "alsa-lib jack dbus"
SRC_URI = " \
http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \
+ file://0002-aarch64.patch \
"
SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd"
SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 10/14] log4c: Backport patch to fix security format errors with clang
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (7 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 09/14] a2jmidid: Fix build on aarch64 Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 11/14] rapidjson: Update to 1.1.0 + git Khem Raj
` (3 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...-properly-in-the-example-format-security-.patch | 26 ++++++++++++++++++++++
meta-oe/recipes-support/log4c/log4c_1.2.4.bb | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch
diff --git a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch
new file mode 100644
index 000000000..9ff9d7002
--- /dev/null
+++ b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch
@@ -0,0 +1,26 @@
+From 97f0b7b25474fab25f5757f7c50a77e20be5d05b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
+Date: Mon, 7 Sep 2015 15:00:48 +0200
+Subject: [PATCH] Use the API properly in the example (format security error
+ fixed).
+
+---
+ examples/helloworld1/mylog.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/helloworld1/mylog.h b/examples/helloworld1/mylog.h
+index 280f3dc..57e5369 100644
+--- a/examples/helloworld1/mylog.h
++++ b/examples/helloworld1/mylog.h
+@@ -39,7 +39,7 @@ static LOG4C_INLINE int mylog_fini(){
+
+ static LOG4C_INLINE void mylog_msg(char *catName,int a_priority, char *msg){
+ #ifndef WITHOUT_LOG4C
+- log4c_category_log(log4c_category_get(catName), a_priority, msg);
++ log4c_category_log(log4c_category_get(catName), a_priority, "%s", msg);
+ #else
+ printf(msg);
+ #endif
+--
+2.12.0
+
diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
index a028f2b7f..ef7ad847a 100644
--- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
+++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
@@ -4,7 +4,9 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
- file://fix_configure_with-expat.patch"
+ file://fix_configure_with-expat.patch \
+ file://0001-Use-the-API-properly-in-the-example-format-security-.patch \
+ "
SRC_URI[md5sum] = "0d94919136e1d16b68427562e74cb3dd"
SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 11/14] rapidjson: Update to 1.1.0 + git
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (8 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 10/14] log4c: Backport patch to fix security format errors with clang Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-08 10:19 ` Martin Jansa
2017-03-07 7:13 ` [meta-oe][PATCH 12/14] ltrace: Fix build with aarch64 and bump to latest Khem Raj
` (2 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Drop backports
Adjust the license checksums to match the changes to file especially
https://github.com/miloyip/rapidjson/commit/b4b1a39937fbd168ef72ea477f90f626773d56fc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../Fix-gcc-strict-overflow-warning.patch | 30 ----------------
.../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 41 +++++++++++++---------
.../{rapidjson_1.0.2.bb => rapidjson_1.1.0.bb} | 7 ++--
3 files changed, 28 insertions(+), 50 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
rename meta-oe/recipes-devtools/rapidjson/{rapidjson_1.0.2.bb => rapidjson_1.1.0.bb} (74%)
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
deleted file mode 100644
index 6ce3933ce..000000000
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f5560d9557ee48fb79810180ddfd3ec386e2a7b5 Mon Sep 17 00:00:00 2001
-From: Milo Yip <miloyip@gmail.com>
-Date: Wed, 2 Mar 2016 01:01:17 +0800
-Subject: [PATCH] Fix gcc strict-overflow warning
-
-Fix #566 #568
-
-Upstream-Status: Backport [Partial merge of upstream commit 928caf92e]
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
----
- include/rapidjson/internal/dtoa.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h
-index 2d8d2e4..15571e1 100644
---- a/include/rapidjson/internal/dtoa.h
-+++ b/include/rapidjson/internal/dtoa.h
-@@ -148,7 +148,7 @@ inline char* WriteExponent(int K, char* buffer) {
- inline char* Prettify(char* buffer, int length, int k) {
- const int kk = length + k; // 10^(kk-1) <= v < 10^kk
-
-- if (length <= kk && kk <= 21) {
-+ if (0 <= k && kk <= 21) {
- // 1234e7 -> 12340000000
- for (int i = length; i < kk; i++)
- buffer[i] = '0';
---
-1.9.1
-
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
index 17164283c..cf3e16ea5 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
@@ -12,22 +12,29 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68139ba..cae7c9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING)
- endif()
+Index: git/CMakeLists.txt
+===================================================================
+--- git.orig/CMakeLists.txt
++++ git/CMakeLists.txt
+@@ -51,10 +51,10 @@ endif(CCACHE_FOUND)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
- elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
- endif()
---
-1.9.1
-
+ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ else()
+ #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
+ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
+@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
+ else()
+ #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
+ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything)
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_1.1.0.bb
similarity index 74%
rename from meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
rename to meta-oe/recipes-devtools/rapidjson/rapidjson_1.1.0.bb
index dd6b89698..402c93921 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_1.1.0.bb
@@ -2,14 +2,15 @@ SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API"
HOMEPAGE = "http://rapidjson.org/"
SECTION = "libs"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://license.txt;md5=cff54e417a17b4b77465198254970cd2"
+LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \
- file://Fix-gcc-strict-overflow-warning.patch \
"
-SRCREV = "3d5848a7cd3367c5cb451c6493165b7745948308"
+SRCREV = "ecf3d64293d84666534a23523814df6323c6bfe5"
+
+PV .= "+git${SRCPV}"
S = "${WORKDIR}/git"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 12/14] ltrace: Fix build with aarch64 and bump to latest
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (9 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 11/14] rapidjson: Update to 1.1.0 + git Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 13/14] iptraf: Fix build with clang Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git Khem Raj
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../ltrace/ltrace/0001-Use-correct-enum-type.patch | 28 ++++++++
.../ltrace/0002-Fix-const-qualifier-error.patch | 76 ++++++++++++++++++++++
meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 6 +-
3 files changed, 108 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch
create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch
new file mode 100644
index 000000000..01a35842c
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch
@@ -0,0 +1,28 @@
+From df490528d1e81a98ba2991c700c92a8e6c969083 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Mar 2017 21:32:22 -0800
+Subject: [PATCH 1/2] Use correct enum type
+
+Clang warns about wrong enum initializtion
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ sysdeps/linux-gnu/aarch64/fetch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysdeps/linux-gnu/aarch64/fetch.c b/sysdeps/linux-gnu/aarch64/fetch.c
+index 2744df0..1dcf7cc 100644
+--- a/sysdeps/linux-gnu/aarch64/fetch.c
++++ b/sysdeps/linux-gnu/aarch64/fetch.c
+@@ -173,7 +173,7 @@ static struct fetch_script
+ pass_arg(struct fetch_context const *context,
+ struct process *proc, struct arg_type_info *info)
+ {
+- enum fetch_method cvt = CVT_NOP;
++ enum convert_method cvt = CVT_NOP;
+
+ size_t sz = type_sizeof(proc, info);
+ if (sz == (size_t) -1)
+--
+2.12.0
+
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch
new file mode 100644
index 000000000..c15277192
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch
@@ -0,0 +1,76 @@
+From 4d3ec1a514f9b1df8ce3a1b04c8a2823d977377f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Mar 2017 21:34:01 -0800
+Subject: [PATCH 2/2] Fix const qualifier error
+
+Fixes clang warning
+error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ dict.h | 2 +-
+ library.c | 2 +-
+ vect.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: git/dict.h
+===================================================================
+--- git.orig/dict.h
++++ git/dict.h
+@@ -90,7 +90,7 @@ int dict_clone(struct dict *target, cons
+ assert(_source_d->values.elt_size == sizeof(VALUE_TYPE)); \
+ /* Check that callbacks are typed properly. */ \
+ void (*_key_dtor_cb)(KEY_TYPE *, void *) = DTOR_KEY; \
+- int (*_key_clone_cb)(KEY_TYPE *, const KEY_TYPE *, \
++ int (*_key_clone_cb)(KEY_TYPE *, KEY_TYPE *, \
+ void *) = CLONE_KEY; \
+ void (*_value_dtor_cb)(VALUE_TYPE *, void *) = DTOR_VALUE; \
+ int (*_value_clone_cb)(VALUE_TYPE *, const VALUE_TYPE *, \
+Index: git/library.c
+===================================================================
+--- git.orig/library.c
++++ git/library.c
+@@ -353,7 +353,7 @@ static void
+ library_exported_names_init(struct library_exported_names *names)
+ {
+ DICT_INIT(&names->names,
+- const char*, uint64_t,
++ char*, uint64_t,
+ dict_hash_string, dict_eq_string, NULL);
+ DICT_INIT(&names->addrs,
+ uint64_t, struct vect*,
+Index: git/vect.h
+===================================================================
+--- git.orig/vect.h
++++ git/vect.h
+@@ -66,7 +66,7 @@ int vect_clone(struct vect *target, cons
+ assert(_source_vec->elt_size == sizeof(ELT_TYPE)); \
+ /* Check that callbacks are typed properly. */ \
+ void (*_dtor_callback)(ELT_TYPE *, void *) = DTOR; \
+- int (*_clone_callback)(ELT_TYPE *, const ELT_TYPE *, \
++ int (*_clone_callback)(ELT_TYPE *, ELT_TYPE *, \
+ void *) = CLONE; \
+ vect_clone((TGT_VEC), _source_vec, \
+ (int (*)(void *, const void *, \
+Index: git/value_dict.c
+===================================================================
+--- git.orig/value_dict.c
++++ git/value_dict.c
+@@ -40,7 +40,7 @@ val_dict_init(struct value_dict *dict)
+ }
+
+ static int
+-value_clone_cb(struct value *tgt, const struct value *src, void *data)
++value_clone_cb(struct value *tgt, struct value *src, void *data)
+ {
+ return value_clone(tgt, src);
+ }
+@@ -53,7 +53,7 @@ value_dtor(struct value *val, void *data
+
+ static int
+ named_value_clone(struct named_value *tgt,
+- const struct named_value *src, void *data)
++ struct named_value *src, void *data)
+ {
+ tgt->name = strdup(src->name);
+ if (tgt->name == NULL)
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
index 8ae018503..60068ae96 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
@@ -10,14 +10,16 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
PE = "1"
-PV = "7.3+git${SRCPV}"
-SRCREV = "01b10e191e99d8cb147e5a2b7da8196e0ec6fb94"
+PV = "7.91+git${SRCPV}"
+SRCREV = "c22d359433b333937ee3d803450dc41998115685"
DEPENDS = "elfutils"
RDEPENDS_${PN} = "elfutils"
SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \
file://configure-allow-to-disable-selinux-support.patch \
file://0001-replace-readdir_r-with-readdir.patch \
+ file://0001-Use-correct-enum-type.patch \
+ file://0002-Fix-const-qualifier-error.patch \
"
S = "${WORKDIR}/git"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 13/14] iptraf: Fix build with clang
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (10 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 12/14] ltrace: Fix build with aarch64 and bump to latest Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-07 7:13 ` [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git Khem Raj
12 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../iptraf/iptraf/format_string.patch | 31 +++++++++++++++++++
.../recipes-devtools/iptraf/iptraf/ldopts.patch | 35 ++++++++++++++++++++++
meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb | 7 +++--
3 files changed, 71 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch
create mode 100644 meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch b/meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch
new file mode 100644
index 000000000..5f96f0f4c
--- /dev/null
+++ b/meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch
@@ -0,0 +1,31 @@
+Index: iptraf-3.0.0/src/othptab.c
+===================================================================
+--- iptraf-3.0.0.orig/src/othptab.c
++++ iptraf-3.0.0/src/othptab.c
+@@ -335,7 +335,7 @@ void printothpentry(struct othptable *ta
+ break;
+ }
+
+- sprintf(scratchpad, inet_ntoa(saddr));
++ sprintf(scratchpad, "%s", inet_ntoa(saddr));
+ strcat(msgstring, scratchpad);
+ wattrset(table->othpwin, ARPATTR);
+ break;
+@@ -354,7 +354,7 @@ void printothpentry(struct othptable *ta
+ break;
+ }
+
+- sprintf(scratchpad, rarp_mac_addr);
++ sprintf(scratchpad, "%s", rarp_mac_addr);
+ strcat(msgstring, scratchpad);
+ wattrset(table->othpwin, ARPATTR);
+ break;
+@@ -421,7 +421,7 @@ void printothpentry(struct othptable *ta
+ wattrset(table->othpwin, UNKNIPATTR);
+ protptr = getprotobynumber(entry->protocol);
+ if (protptr != NULL) {
+- sprintf(protname, protptr->p_aliases[0]);
++ sprintf(protname, "%s", protptr->p_aliases[0]);
+ } else {
+ sprintf(protname, "IP protocol");
+ unknown = 1;
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch b/meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch
new file mode 100644
index 000000000..c84a0a0ad
--- /dev/null
+++ b/meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch
@@ -0,0 +1,35 @@
+Index: iptraf-3.0.0/src/Makefile
+===================================================================
+--- iptraf-3.0.0.orig/src/Makefile
++++ iptraf-3.0.0/src/Makefile
+@@ -5,7 +5,7 @@
+ #
+ # Architecture determination string borrowed from the kernel makefile.
+ #
+-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
++ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+ -e s/arm.*/arm/ -e s/sa110/arm/)
+ PLATFORM = -DPLATFORM=\"$(shell uname -s)/$(ARCH)\"
+ VERNUMBER := $(shell cat version)
+@@ -17,7 +17,7 @@ VERSION = -DVERSION=\"$(VERNUMBER)\"
+ #
+ BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH)
+
+-CC = gcc
++CC = $(CC)
+ LIBS = -L../support -ltextbox -lpanel -lncurses # in this order!
+
+ # comment this one out to omit debug code when done.
+@@ -31,10 +31,10 @@ PROF = #-pg
+ # options to be passed to the compiler. I don't believe they need to be
+ # modified (except for -m486 on non-Intel x86 platforms).
+
+-CFLAGS = -Wall #-O2 #-m486
++CFLAGS ?= -Wall #-O2 #-m486
+ DIRS = -DWORKDIR=\"$(WORKDIR)\" \
+ -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
+-LDOPTS = #-static
++LDOPTS ?= #-static
+
+ # you may want to change this to point to your ncurses include directory
+ # if the ncurses include files are not in the default location.
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb b/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb
index e7a406fc5..abfab02e0 100644
--- a/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb
+++ b/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb
@@ -12,12 +12,15 @@ DEPENDS = "ncurses"
SRC_URI = " \
ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz \
- file://0001-src-Fix-error-in-cross-compile.patch"
+ file://0001-src-Fix-error-in-cross-compile.patch \
+ file://format_string.patch \
+ file://ldopts.patch \
+"
SRC_URI[md5sum] = "377371c28ee3c21a76f7024920649ea8"
SRC_URI[sha256sum] = "9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163"
RDEPENDS_${PN} = "ncurses"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
+EXTRA_OEMAKE = "-e MAKEFLAGS= LDOPTS='${LDFLAGS}' ARCH='${TARGET_ARCH}'"
do_compile() {
oe_runmake -C src all
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git
2017-03-07 7:13 [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors Khem Raj
` (11 preceding siblings ...)
2017-03-07 7:13 ` [meta-oe][PATCH 13/14] iptraf: Fix build with clang Khem Raj
@ 2017-03-07 7:13 ` Khem Raj
2017-03-08 10:17 ` Martin Jansa
12 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2017-03-07 7:13 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} | 13 ++++++++++---
.../rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} | 12 +++++++++---
2 files changed, 19 insertions(+), 6 deletions(-)
rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} (60%)
rename meta-oe/recipes-connectivity/rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} (57%)
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
similarity index 60%
rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
index 4af3a6a6a..7153cff6c 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
@@ -6,12 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
DEPENDS = "libsigc++-2.0 openssl cppunit"
-SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
+SRC_URI = "git://github.com/rakshasa/libtorrent;protocol=git;branch=master \
file://don-t-run-code-while-configuring-package.patch \
"
+SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"
-SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2"
-SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677"
+PV .= "+git${SRCPV}"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
+EXTRA_OECONF = "--without-zlib"
+
+do_configure_prepend() {
+ (cd ${S}; ./autogen.sh; cd -)
+}
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
similarity index 57%
rename from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
rename to meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
index eb0a39af5..817c24345 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
@@ -5,11 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses"
-SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
+SRC_URI = "git://github.com/rakshasa/rtorrent;protocol=git;branch=master \
file://don-t-run-code-while-configuring-package.patch \
"
+SRCREV = "226e670decf92e7adaa845a6982aca4f164ea740"
-SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2"
-SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310"
+PV .= "+git${SRCPV}"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
+
+do_configure_prepend() {
+ (cd ${S}; ./autogen.sh; cd -)
+}
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git
2017-03-07 7:13 ` [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git Khem Raj
@ 2017-03-08 10:17 ` Martin Jansa
0 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2017-03-08 10:17 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3766 bytes --]
On Mon, Mar 06, 2017 at 11:13:49PM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} | 13 ++++++++++---
> .../rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} | 12 +++++++++---
> 2 files changed, 19 insertions(+), 6 deletions(-)
> rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} (60%)
> rename meta-oe/recipes-connectivity/rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} (57%)
>
> diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
> similarity index 60%
> rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
> rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
> index 4af3a6a6a..7153cff6c 100644
> --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
> +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
> @@ -6,12 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>
> DEPENDS = "libsigc++-2.0 openssl cppunit"
>
> -SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
> +SRC_URI = "git://github.com/rakshasa/libtorrent;protocol=git;branch=master \
Drop protocol and branch
> file://don-t-run-code-while-configuring-package.patch \
> "
> +SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"
>
> -SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2"
> -SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677"
> +PV .= "+git${SRCPV}"
Please rename the recipe and set whole version inside.
> +
> +S = "${WORKDIR}/git"
>
> inherit autotools pkgconfig
>
> +EXTRA_OECONF = "--without-zlib"
For some reason even with this it tries to use zlib:
| ../../../../git/src/torrent/utils/log.cc:51:18: fatal error: zlib.h:
No such file or directory
| #include <zlib.h>
| ^
| compilation terminated.
| Makefile:485: recipe for target 'log.lo' failed
http://errors.yoctoproject.org/Errors/Details/134814/
> +
> +do_configure_prepend() {
> + (cd ${S}; ./autogen.sh; cd -)
> +}
> diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
> similarity index 57%
> rename from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
> rename to meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
> index eb0a39af5..817c24345 100644
> --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
> +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
> @@ -5,11 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
> DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses"
>
> -SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
> +SRC_URI = "git://github.com/rakshasa/rtorrent;protocol=git;branch=master \
> file://don-t-run-code-while-configuring-package.patch \
> "
> +SRCREV = "226e670decf92e7adaa845a6982aca4f164ea740"
>
> -SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2"
> -SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310"
> +PV .= "+git${SRCPV}"
> +
> +S = "${WORKDIR}/git"
>
> inherit autotools pkgconfig
> +
> +do_configure_prepend() {
> + (cd ${S}; ./autogen.sh; cd -)
> +}
> --
> 2.12.0
>
> --
> _______________________________________________
> 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] 22+ messages in thread