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>
This commit is contained in:
parent
fe39685c0c
commit
8e73fb597a
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue