sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Dongxiao Xu 2010-10-09 13:40:51 +08:00 committed by Saul Wold
parent 7836c45267
commit b9728f63c6
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta/recipes-devtools/dpkg/dpkg/check_version.patch Normal file
View File

@ -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");
}

3
meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
View File

@ -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 \