diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch | 37 | ||||
-rw-r--r-- | meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb | 5 |
2 files changed, 40 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch new file mode 100644 index 000000000..24b187f2a --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Submitted [sourceforge] | ||
2 | |||
3 | From 75d789d0ea9716c9a9ae72f42a2fcfa907cf4a12 Mon Sep 17 00:00:00 2001 | ||
4 | From: Matthieu Crapet <mcrapet@gmail.com> | ||
5 | Date: Mon, 30 Jun 2014 13:52:25 +0200 | ||
6 | Subject: [PATCH] usage2c.awk: fix wrong basename regexp | ||
7 | |||
8 | Previously not matching with filename argument with absolute path. | ||
9 | |||
10 | Signed-off-by: Matthieu Crapet <mcrapet@gmail.com> | ||
11 | --- | ||
12 | usage2c.awk | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/usage2c.awk b/usage2c.awk | ||
16 | index 94b897a..9aea212 100755 | ||
17 | --- a/usage2c.awk | ||
18 | +++ b/usage2c.awk | ||
19 | @@ -6,13 +6,13 @@ BEGIN { | ||
20 | } | ||
21 | |||
22 | # text in src/foo-bar.txt results in | ||
23 | -# static const char foo_text[] = { | ||
24 | +# static const char foo_bar[] = { | ||
25 | # 't', 'h', 'e', ' ', 't', 'e', 'x', 't', ... | ||
26 | # } | ||
27 | length(command_name) == 0 { | ||
28 | command_name = FILENAME; | ||
29 | sub(/\.txt$/, "", command_name); | ||
30 | - sub(/^([^\/]+\/)*/, "", command_name); | ||
31 | + sub(/^.*\//, "", command_name); | ||
32 | gsub(/-/, "_", command_name); | ||
33 | printf("static const char %s[] = {\n", command_name); | ||
34 | progs = 0; | ||
35 | -- | ||
36 | 2.0.0 | ||
37 | |||
diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb index 770ccab1e..d9a03c6d4 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb | |||
@@ -12,8 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c04760d09e8b0fe73283d0cc9e8bea53" | |||
12 | 12 | ||
13 | DEPENDS = "libxml2 libxslt" | 13 | DEPENDS = "libxml2 libxslt" |
14 | 14 | ||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BPN}-${PV}.tar.gz \ | 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ |
16 | file://configure.ac.patch" | 16 | file://configure.ac.patch \ |
17 | file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" | ||
17 | SRC_URI[md5sum] = "0c6db295d0cf9ff0d439edb755b7e8f6" | 18 | SRC_URI[md5sum] = "0c6db295d0cf9ff0d439edb755b7e8f6" |
18 | SRC_URI[sha256sum] = "47b4ed042ea2909257f2a386001af49fceb303f84da7214779ccf99fffc6bbba" | 19 | SRC_URI[sha256sum] = "47b4ed042ea2909257f2a386001af49fceb303f84da7214779ccf99fffc6bbba" |
19 | 20 | ||