summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
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 /meta/recipes-devtools
parent7836c452670aed0c0892f69f0e494e0c96ff6a84 (diff)
downloadopenembedded-core-b9728f63c676e217efcf93c40ded2c3fad19d52c.tar.gz
openembedded-core-b9728f63c676e217efcf93c40ded2c3fad19d52c.tar.bz2
openembedded-core-b9728f63c676e217efcf93c40ded2c3fad19d52c.tar.xz
openembedded-core-b9728f63c676e217efcf93c40ded2c3fad19d52c.zip
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>
Diffstat (limited to 'meta/recipes-devtools')
-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 000000000..a09e1361b
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
@@ -0,0 +1,21 @@
+Adapt to linux-wrs kernel version, which has character '_' inside.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c dpkg-1.15.8.5/lib/dpkg/parsehelp.c
+--- dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c 2010-10-08 12:27:15.058572774 +0800
++++ dpkg-1.15.8.5/lib/dpkg/parsehelp.c 2010-10-09 11:18:15.484190771 +0800
+@@ -268,11 +268,11 @@
+
+ /* XXX: Would be faster to use something like cisversion and cisrevision. */
+ for (ptr = rversion->version; *ptr; ptr++) {
+- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
++ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL)
+ return _("invalid character in version number");
+ }
+ for (ptr = rversion->revision; *ptr; ptr++) {
+- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~", *ptr) == NULL)
++ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL)
+ return _("invalid character in revision number");
+ }
+
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 2562f4b72..760ecd323 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 @@
require dpkg.inc
SRC_URI += "file://noman.patch;patch=1 \
- file://check_snprintf.patch"
+ file://check_snprintf.patch \
+ file://check_version.patch"
EXTRA_OECONF = "--without-static-progs \
--without-dselect \