summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-03-02 17:12:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-02 12:59:51 +0000
commit8e73fb597ab7c518978c44beb75464dfdcdbd768 (patch)
tree54884631a2b254a1c3cd74458c2c6ffc5b8a9ce6
parentfe39685c0c59967afa4108d74086724e3b617379 (diff)
downloadpoky-8e73fb597ab7c518978c44beb75464dfdcdbd768.tar.gz
package_deb.bbclass:fix the arch (replace "_" with "-") in deb package control
when build deb image, such as building meta-toolchain-sdk in x86_64 host, there is warning like that: ... 'x86_64' is not a valid architecture name: character `_' not allowed (only letters, digits and characters `-') ... The params in deb package control file don't allow character `_', only letters, digits and characters `-' allowed. Change the arch's "_" to "-" in the deb package's control file at the control file creation time. Such as `x86_64'-->`x86-64' [YOCTO #3721] (From OE-Core rev: 8487b352cabd8c8ae8a7d9e7e66489e4e964bd50) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_deb.bbclass8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index eea15e722f..309c48da11 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -82,6 +82,9 @@ package_install_internal_deb () {
82 82
83 tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list 83 tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
84 84
85 # The params in deb package control don't allow character `_', so
86 # change the arch's `_' to `-' in it.
87 dpkg_arch=`echo ${dpkg_arch} | sed 's/_/-/g'`
85 cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ 88 cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
86 | sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \ 89 | sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \
87 | sed -e "s:#ROOTFS#:${target_rootfs}:g" \ 90 | sed -e "s:#ROOTFS#:${target_rootfs}:g" \
@@ -259,6 +262,11 @@ python do_package_deb () {
259 raise KeyError(f) 262 raise KeyError(f)
260 if i == 'DPKG_ARCH' and d.getVar('PACKAGE_ARCH', True) == 'all': 263 if i == 'DPKG_ARCH' and d.getVar('PACKAGE_ARCH', True) == 'all':
261 data = 'all' 264 data = 'all'
265 elif i == 'PACKAGE_ARCH' or i == 'DPKG_ARCH':
266 # The params in deb package control don't allow character
267 # `_', so change the arch's `_' to `-'. Such as `x86_64'
268 # -->`x86-64'
269 data = data.replace('_', '-')
262 l2.append(data) 270 l2.append(data)
263 return l2 271 return l2
264 272