nativesdk/package_ipk.bbclass: Clean up sdk package architectures
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
parent
1c1305d15c
commit
3fbbc44cfd
|
|
@ -6,7 +6,8 @@ EXCLUDE_FROM_WORLD = "1"
|
|||
OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
|
||||
# Save PACKAGE_ARCH
|
||||
OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
|
||||
PACKAGE_ARCH = "${HOST_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk"
|
||||
PACKAGE_ARCH = "${SDK_ARCH}-${TARGET_ARCH}-canadian"
|
||||
PACKAGE_ARCHS = "${PACKAGE_ARCH}"
|
||||
# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
|
||||
OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
|
||||
BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
|
||||
|
|
@ -17,7 +18,7 @@ STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
|
|||
STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
|
||||
|
||||
PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}"
|
||||
PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_HOST_SYS}"
|
||||
PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"
|
||||
|
||||
HOST_ARCH = "${SDK_ARCH}"
|
||||
HOST_VENDOR = "${SDK_VENDOR}"
|
||||
|
|
@ -43,14 +44,3 @@ FILES_${PN}-dbg += "${prefix}/.debug \
|
|||
export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
|
||||
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
|
||||
|
||||
python () {
|
||||
barch = bb.data.getVar('HOST_ARCH', d, True)
|
||||
archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
|
||||
sdkarchs = []
|
||||
for arch in archs:
|
||||
sdkarchs.append(barch + '-' + arch + '-nativesdk')
|
||||
bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ PACKAGES = ""
|
|||
|
||||
BASE_PACKAGE_ARCH = "${SDK_ARCH}"
|
||||
PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
|
||||
STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-${TARGET_ARCH}-nativesdk${TARGET_VENDOR}-${TARGET_OS}"
|
||||
STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
|
||||
|
||||
TARGET_ARCH = "${SDK_ARCH}"
|
||||
TARGET_VENDOR = "${SDK_VENDOR}"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,12 @@ EXCLUDE_FROM_WORLD = "1"
|
|||
# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
|
||||
#
|
||||
OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
|
||||
BASE_PACKAGE_ARCH = "${HOST_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk"
|
||||
BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
|
||||
python () {
|
||||
barch = bb.data.getVar('HOST_ARCH', d, True)
|
||||
archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
|
||||
sdkarchs = []
|
||||
for arch in archs:
|
||||
sdkarchs.append(barch + '-' + arch + '-nativesdk')
|
||||
sdkarchs.append(arch + '-nativesdk')
|
||||
bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ python package_ipk_install () {
|
|||
bb.error("PACKAGE_ARCHS missing")
|
||||
raise FuncFailed
|
||||
ipkg_archs = ipkg_archs.split()
|
||||
arch_priority = 1
|
||||
arch_priority = 1na
|
||||
|
||||
f = open(conffile,"w")
|
||||
for arch in ipkg_archs:
|
||||
|
|
@ -75,9 +75,12 @@ package_update_index_ipk () {
|
|||
|
||||
packagedirs="${DEPLOY_DIR_IPK}"
|
||||
for arch in $ipkgarchs; do
|
||||
packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${SDK_ARCH}-$arch-nativesdk"
|
||||
sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
|
||||
packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk"
|
||||
done
|
||||
|
||||
packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian"
|
||||
|
||||
for pkgdir in $packagedirs; do
|
||||
if [ -e $pkgdir/ ]; then
|
||||
touch $pkgdir/Packages
|
||||
|
|
@ -100,20 +103,26 @@ package_generate_ipkg_conf () {
|
|||
if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
|
||||
echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
|
||||
fi
|
||||
if [ -e ${DEPLOY_DIR_IPK}/${SDK_ARCH}-$arch-nativesdk/Packages ] ; then
|
||||
echo "src oe-${SDK_ARCH}-$arch-nativesdk file:${DEPLOY_DIR_IPK}/${SDK_ARCH}-$arch-nativesdk" >> ${IPKGCONF_SDK}
|
||||
sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
|
||||
if [ -e ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk/Packages ] ; then
|
||||
echo "src oe-$sdkarch-nativesdk file:${DEPLOY_DIR_IPK}/$sdkarch-nativesdk" >> ${IPKGCONF_SDK}
|
||||
fi
|
||||
done
|
||||
if [ -e ${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian/Packages ] ; then
|
||||
echo "src oe-${SDK_ARCH}-${TARGET_ARCH}-canadian file:${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian" >> ${IPKGCONF_SDK}
|
||||
fi
|
||||
}
|
||||
|
||||
package_generate_archlist () {
|
||||
ipkgarchs="${PACKAGE_ARCHS}"
|
||||
priority=1
|
||||
for arch in $ipkgarchs; do
|
||||
sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
|
||||
echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
|
||||
echo "arch ${SDK_ARCH}-$arch-nativesdk $priority" >> ${IPKGCONF_SDK}
|
||||
echo "arch $sdkarch-nativesdk $priority" >> ${IPKGCONF_SDK}
|
||||
priority=$(expr $priority + 5)
|
||||
done
|
||||
echo "arch ${SDK_ARCH}-${TARGET_ARCH}-canadian $priority" >> ${IPKGCONF_SDK}
|
||||
}
|
||||
|
||||
python do_package_ipk () {
|
||||
|
|
|
|||
Loading…
Reference in New Issue