From 8e73fb597ab7c518978c44beb75464dfdcdbd768 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sat, 2 Mar 2013 17:12:58 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'meta/classes/package_deb.bbclass') 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 () { tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list + # The params in deb package control don't allow character `_', so + # change the arch's `_' to `-' in it. + dpkg_arch=`echo ${dpkg_arch} | sed 's/_/-/g'` cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ | sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \ | sed -e "s:#ROOTFS#:${target_rootfs}:g" \ @@ -259,6 +262,11 @@ python do_package_deb () { raise KeyError(f) if i == 'DPKG_ARCH' and d.getVar('PACKAGE_ARCH', True) == 'all': data = 'all' + elif i == 'PACKAGE_ARCH' or i == 'DPKG_ARCH': + # The params in deb package control don't allow character + # `_', so change the arch's `_' to `-'. Such as `x86_64' + # -->`x86-64' + data = data.replace('_', '-') l2.append(data) return l2 -- cgit v1.2.3-54-g00ecf