DISTRO_VERSION = "test-${DATE}"
DISTRO_REVISION = "46"
-require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
+
#Images built can have to modes:
# 'debug': empty rootpassword, strace and gdb included
# 'release' no root password, no strace and gdb by default
#Tweak packaging for strongarm machines since they can't use EABI
-PACKAGE_ARCH_collie = "arm-oabi"
-PACKAGE_ARCH_h3600 = "arm-oabi"
-PACKAGE_ARCH_h3800 = "arm-oabi"
-PACKAGE_ARCH_simpad = "arm-oabi"
-
PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"