diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 12 | ||||
| -rw-r--r-- | conf/distro/include/angstromoabi.inc | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6ef9646814..aa7aa0d345 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -10,9 +10,12 @@ 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 @@ -88,11 +91,6 @@ FEED_ARCH_simpad = "arm-oabi" #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" @@ -138,7 +136,7 @@ PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.3" +PREFERRED_VERSION_freetype = "2.3.4" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.8" PREFERRED_VERSION_glib-2.0 = "2.12.12" diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc new file mode 100644 index 0000000000..bb7bc45fbd --- /dev/null +++ b/conf/distro/include/angstromoabi.inc @@ -0,0 +1,4 @@ +require conf/distro/include/angstrom.inc + +PACKAGE_ARCH = "arm-oabi" + |