summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-10-09 13:40:51 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-10-09 10:15:50 -0700
commitb9728f63c676e217efcf93c40ded2c3fad19d52c (patch)
tree563973e7d2e828f4cb68d6fa61f87410080d21ba
parent7836c452670aed0c0892f69f0e494e0c96ff6a84 (diff)
downloadpoky-b9728f63c676e217efcf93c40ded2c3fad19d52c.tar.gz
dpkg: fix package_deb error for linux-wrs
The new dpkg will report linux-wrs version parse error, since there is a '_' inside. This patch fixes this issue. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/check_version.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_version.patch b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
new file mode 100644
index 0000000000..a09e1361b8
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
@@ -0,0 +1,21 @@
1Adapt to linux-wrs kernel version, which has character '_' inside.
2
3Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
4
5diff -ruN dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c dpkg-1.15.8.5/lib/dpkg/parsehelp.c
6--- dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c 2010-10-08 12:27:15.058572774 +0800
7+++ dpkg-1.15.8.5/lib/dpkg/parsehelp.c 2010-10-09 11:18:15.484190771 +0800
8@@ -268,11 +268,11 @@
9
10 /* XXX: Would be faster to use something like cisversion and cisrevision. */
11 for (ptr = rversion->version; *ptr; ptr++) {
12- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
13+ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL)
14 return _("invalid character in version number");
15 }
16 for (ptr = rversion->revision; *ptr; ptr++) {
17- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~", *ptr) == NULL)
18+ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL)
19 return _("invalid character in revision number");
20 }
21
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
index 2562f4b724..760ecd3239 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
@@ -1,7 +1,8 @@
1require dpkg.inc 1require dpkg.inc
2 2
3SRC_URI += "file://noman.patch;patch=1 \ 3SRC_URI += "file://noman.patch;patch=1 \
4 file://check_snprintf.patch" 4 file://check_snprintf.patch \
5 file://check_version.patch"
5 6
6EXTRA_OECONF = "--without-static-progs \ 7EXTRA_OECONF = "--without-static-progs \
7 --without-dselect \ 8 --without-dselect \