summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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