* [PATCH 1/3] connman: backport test script fixes
2012-04-11 3:19 [PATCH 0/3] Important fixes for rc3 Otavio Salvador
@ 2012-04-11 3:19 ` Otavio Salvador
2012-04-11 3:28 ` Otavio Salvador
2012-04-11 3:19 ` [PATCH 2/3] distrodata.bbclass: fix comment typo Otavio Salvador
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Otavio Salvador @ 2012-04-11 3:19 UTC (permalink / raw)
To: openembedded-core
Those fixes are required to get the test scripts to work with current
0.79 DBus API.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../connman/test-set-ipv4-method-api-fix.patch | 50 ++++++++++++++++++
.../connman/test-set-ipv6-method-api-fix.patch | 55 ++++++++++++++++++++
meta/recipes-connectivity/connman/connman_0.79.bb | 4 ++
3 files changed, 109 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
create mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
new file mode 100644
index 0000000..78eb19a
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
@@ -0,0 +1,50 @@
+From 0b817dd3096f5c3ca8f0b868ee55ea550054137b Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <daniel.wagner@bmw-carit.de>
+Date: Mon, 19 Mar 2012 14:03:27 +0100
+Subject: [PATCH 3/3] set-ipv4-method: The arguments have to be wrapped into a
+ variant
+
+Fixes BMC#24986
+
+Upstream-Status: Backport
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ test/set-ipv4-method | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/test/set-ipv4-method b/test/set-ipv4-method
+index 820b24b..235113f 100755
+--- a/test/set-ipv4-method
++++ b/test/set-ipv4-method
+@@ -3,6 +3,9 @@
+ import sys
+ import dbus
+
++def make_variant(string):
++ return dbus.String(string, variant_level=1)
++
+ def print_usage():
+ print "Usage: %s <service> [off|dhcp|manual <address> [netmask] [gateway]]" % (sys.argv[0])
+
+@@ -20,13 +23,13 @@ properties = service.GetProperties()
+
+ print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
+
+-ipv4_configuration = { "Method": sys.argv[2] }
++ipv4_configuration = { "Method": make_variant(sys.argv[2]) }
+ if (len(sys.argv) > 3):
+- ipv4_configuration["Address"] = sys.argv[3]
++ ipv4_configuration["Address"] = make_variant(sys.argv[3])
+ if (len(sys.argv) > 4):
+- ipv4_configuration["Netmask"] = sys.argv[4]
++ ipv4_configuration["Netmask"] = make_variant(sys.argv[4])
+ if (len(sys.argv) > 5):
+- ipv4_configuration["Gateway"] = sys.argv[5]
++ ipv4_configuration["Gateway"] = make_variant(sys.argv[5])
+
+ service.SetProperty("IPv4.Configuration", ipv4_configuration)
+ print "New IPv4.Configuration: ", ipv4_configuration
+--
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
new file mode 100644
index 0000000..773127b
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
@@ -0,0 +1,55 @@
+From 2885e71c9c0df7ea9866e91ab79d255eaa8de53d Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <daniel.wagner@bmw-carit.de>
+Date: Mon, 19 Mar 2012 14:03:28 +0100
+Subject: [PATCH 2/3] set-ipv6-method: The arguments have to be wrapped into a
+ variant
+
+Fixes BMC#24986
+
+Upstream-Status: Backport
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ test/set-ipv6-method | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/test/set-ipv6-method b/test/set-ipv6-method
+index 7f60b88..4f2de09 100755
+--- a/test/set-ipv6-method
++++ b/test/set-ipv6-method
+@@ -3,6 +3,9 @@
+ import sys
+ import dbus
+
++def make_variant(string):
++ return dbus.String(string, variant_level=1)
++
+ def print_usage():
+ print "Usage: %s <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (sys.argv[0])
+
+@@ -19,17 +22,17 @@ properties = service.GetProperties()
+
+ print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
+
+-ipv6_configuration = { "Method": sys.argv[2] }
++ipv6_configuration = { "Method": make_variant(sys.argv[2])}
+ if sys.argv[2] == "auto":
+ if (len(sys.argv) > 3):
+- ipv6_configuration["Privacy"] = sys.argv[3]
++ ipv6_configuration["Privacy"] = make_variant(sys.argv[3])
+ else:
+ if (len(sys.argv) > 3):
+- ipv6_configuration["Address"] = sys.argv[3]
++ ipv6_configuration["Address"] = make_variant(sys.argv[3])
+ if (len(sys.argv) > 4):
+- ipv6_configuration["PrefixLength"] = sys.argv[4]
++ ipv6_configuration["PrefixLength"] = make_variant(sys.argv[4])
+ if (len(sys.argv) > 5):
+- ipv6_configuration["Gateway"] = sys.argv[5]
++ ipv6_configuration["Gateway"] = make_variant(sys.argv[5])
+
+ service.SetProperty("IPv6.Configuration", ipv6_configuration)
+ print "New IPv6.Configuration: ", ipv6_configuration
+--
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
index f87c4dd..c0b1618 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -1,11 +1,15 @@
require connman.inc
+PR = "r1"
+
# 0.79 tag
SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
file://add_xuser_dbus_permission.patch \
file://ethernet_default.patch \
file://disable_alg-test.patch \
+ file://test-set-ipv4-method-api-fix.patch \
+ file://test-set-ipv6-method-api-fix.patch \
file://connman"
S = "${WORKDIR}/git"
PR = "r1"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] flex: backport Debian patches to fix generated code warnings
2012-04-11 3:19 [PATCH 0/3] Important fixes for rc3 Otavio Salvador
2012-04-11 3:19 ` [PATCH 1/3] connman: backport test script fixes Otavio Salvador
2012-04-11 3:19 ` [PATCH 2/3] distrodata.bbclass: fix comment typo Otavio Salvador
@ 2012-04-11 3:19 ` Otavio Salvador
2012-04-11 10:21 ` [PATCH 0/3] Important fixes for rc3 Richard Purdie
2012-04-27 21:28 ` Saul Wold
4 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-04-11 3:19 UTC (permalink / raw)
To: openembedded-core
The generated parser had warnings regarding signess and return check
which makes Linux Kernel's perf tool from 3.4 release to fail without
those patches.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../flex/flex/avoid-FORTIFY-warnings.patch | 59 ++++++++++++++++++++
.../flex/int-is-not-the-same-size-as-size_t.patch | 42 ++++++++++++++
meta/recipes-devtools/flex/flex_2.5.35.bb | 5 +-
3 files changed, 105 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
create mode 100644 meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
diff --git a/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch b/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
new file mode 100644
index 0000000..c71eb82
--- /dev/null
+++ b/meta/recipes-devtools/flex/flex/avoid-FORTIFY-warnings.patch
@@ -0,0 +1,59 @@
+Wrap ECHO macro to avoid FORTIFY warnings
+
+This change will enable flex scanners to be compiled with
+-D_FORTIFY_SOURCE=2.
+
+Signed-off-by: Manoj Srivastava <srivasta@debian.org>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+Origin: Cherry picked from Debian
+Upstream-Status: Pending
+
+---
+ flex.skl | 2 +-
+ scan.c | 2 +-
+ skel.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/flex.skl b/flex.skl
+index 6ebf2fd..eaa355e 100644
+--- a/flex.skl
++++ b/flex.skl
+@@ -1074,7 +1074,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
+ /* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+-#define ECHO fwrite( yytext, yyleng, 1, yyout )
++#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+ %endif
+ %if-c++-only C++ definition
+ #define ECHO LexerOutput( yytext, yyleng )
+diff --git a/scan.c b/scan.c
+index d7f5db3..1a079bf 100644
+--- a/scan.c
++++ b/scan.c
+@@ -2093,7 +2093,7 @@ static int input (void );
+ /* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+-#define ECHO fwrite( yytext, yyleng, 1, yyout )
++#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+ #endif
+
+ /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
+diff --git a/skel.c b/skel.c
+index ee9f6ef..b8a2b4b 100644
+--- a/skel.c
++++ b/skel.c
+@@ -1141,7 +1141,7 @@ const char *skel[] = {
+ "/* This used to be an fputs(), but since the string might contain NUL's,",
+ " * we now use fwrite().",
+ " */",
+- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
++ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
+ "%endif",
+ "%if-c++-only C++ definition",
+ "#define ECHO LexerOutput( yytext, yyleng )",
+--
+1.7.9.5
+
diff --git a/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch b/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
new file mode 100644
index 0000000..8d05ee4
--- /dev/null
+++ b/meta/recipes-devtools/flex/flex/int-is-not-the-same-size-as-size_t.patch
@@ -0,0 +1,42 @@
+int is not the same size as size_t.
+
+Signed-off-by: Manoj Srivastava <srivasta@debian.org>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+Origin: Cherry picked from Debian
+Upstream-Status: Pending
+
+---
+ gen.c | 2 +-
+ scan.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gen.c b/gen.c
+index 848e2c5..5a5daef 100644
+--- a/gen.c
++++ b/gen.c
+@@ -1890,7 +1890,7 @@ void make_tables ()
+ outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
+ outn ("\t\t{ \\");
+ outn ("\t\tint c = '*'; \\");
+- outn ("\t\tint n; \\");
++ outn ("\t\tsize_t n; \\");
+ outn ("\t\tfor ( n = 0; n < max_size && \\");
+ outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
+ outn ("\t\t\tbuf[n] = (char) c; \\");
+diff --git a/scan.c b/scan.c
+index 44559b6..15e2058 100644
+--- a/scan.c
++++ b/scan.c
+@@ -2105,7 +2105,7 @@ static int input (void );
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ { \
+ int c = '*'; \
+- int n; \
++ size_t n; \
+ for ( n = 0; n < max_size && \
+ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+ buf[n] = (char) c; \
+--
+1.7.9.5
+
diff --git a/meta/recipes-devtools/flex/flex_2.5.35.bb b/meta/recipes-devtools/flex/flex_2.5.35.bb
index 28a4f1f..7419f10 100644
--- a/meta/recipes-devtools/flex/flex_2.5.35.bb
+++ b/meta/recipes-devtools/flex/flex_2.5.35.bb
@@ -1,8 +1,11 @@
require flex.inc
-PR = "r2"
+PR = "r3"
LICENSE="BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"
BBCLASSEXTEND = "native"
+SRC_URI += "file://avoid-FORTIFY-warnings.patch \
+ file://int-is-not-the-same-size-as-size_t.patch"
+
SRC_URI[md5sum] = "10714e50cea54dc7a227e3eddcd44d57"
SRC_URI[sha256sum] = "0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread