diff options
Diffstat (limited to 'conf')
82 files changed, 639 insertions, 634 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 01b9321c23..66dfabaa5d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -150,6 +150,9 @@ QEMU_OPTIONS_armv7a = "-cpu cortex-a8" # default compression levels XZ_COMPRESSION_LEVEL ?= "-e -9" +# default integrity check +XZ_INTEGRITY_CHECK ?= "crc32" + ################################################################## # Date/time variables. ################################################################## @@ -294,6 +297,8 @@ FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" +# The persistent cache should be shared by all builds +PERSISTENT_DIR = "${TMPDIR}/cache" CO_DIR = "${DL_DIR}" CVSDIR = "${CO_DIR}/cvs" SVNDIR = "${CO_DIR}/svn" @@ -386,7 +391,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;" IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" -IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" +IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" @@ -396,9 +401,9 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE IMAGE_CMD_tar.xz = "cd ${IMAGE_ROOTFS} && tar --xz -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.xz ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}" -IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}" +IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.gz.u-boot = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}; mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz.u-boot" -IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}" +IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz --format=lzma -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}" IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}" @@ -429,7 +434,7 @@ IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext4.bz2 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext4.xz = "genext2fs-native e2fsprogs-native xz-native" IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native" -IMAGE_DEPENDS_cpio.lzma = "lzma-native" +IMAGE_DEPENDS_cpio.lzma = "xz-native" IMAGE_DEPENDS_cpio.xz = "xz-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native" @@ -541,10 +546,11 @@ EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " # Optimization flags. ################################################################## +DEBUG_FLAGS = "-g" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g" +DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS}" SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}" -BUILD_OPTIMIZATION = "-O2 -g" +BUILD_OPTIMIZATION = "-O2 ${DEBUG_FLAGS}" ################################################################## # Bootstrap stuff. @@ -632,6 +638,8 @@ LOCALCOUNT[type] = "integer" SRC_URI = "file://${FILE}" SRC_URI[type] = "list" +FAKEROOT = "fakeroot" + ################################################################## # UI/Interaction Configuration ################################################################## diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index befbb80fc5..2e093b635c 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" #PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr" PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu" +PREFERRED_PROVIDER_ffmpeg ?= "libav" PREFERRED_PROVIDER_gconf ?= "gconf" #PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gdk-pixbuf-csource-native ?= "gtk+-native" @@ -61,6 +62,8 @@ PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native" PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial" PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +#PREFERRED_PROVIDER_virtual/libintl-native ?= "proxy-libintl-native" +PREFERRED_PROVIDER_virtual/libintl-native ?= "gettext-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" #PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" diff --git a/conf/distro/angstrom-2008.1-legacy.conf b/conf/distro/angstrom-2008.1-legacy.conf deleted file mode 100644 index 358ed06cf2..0000000000 --- a/conf/distro/angstrom-2008.1-legacy.conf +++ /dev/null @@ -1,9 +0,0 @@ -#this is a special version of angstrom for legacy (e.g. kernel 2.4) software -# that means: -# * no udev -# * no sysfs -# * no EABI for ARM - -require conf/distro/angstrom-2008.1.conf - -# We'll have to fill this in as we go. diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf deleted file mode 100644 index ae1ed4cc0d..0000000000 --- a/conf/distro/angstrom-2008.1.conf +++ /dev/null @@ -1,206 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Angstrom <http://www.angstrom-distribution.org> -#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Graeme 'XorA' Gregory <dp@xora.org.uk> -#@MAINTAINER: Koen Kooi <koen@openembedded.org> -#@MAINTAINER: Philip 'Crofton' Balister <philip@balister.org> -#@-------------------------------------------------------------------- - -# We welcome bugreports sent to -# angstrom-distro-devel@linuxtogo.org -# -# For more contact info please visit -# http://www.angstrom-distribution.org/contact - -DISTRO_VERSION = "2011.03" -DISTRO_REVISION = "4" -DISTRO_PR = ".6" - -OLDEST_KERNEL ?= "2.6.16" - -require conf/distro/include/angstrom-2008-preferred-versions.inc -require conf/distro/include/preferred-opie-versions-1.2.4.inc - -#Images built can have to modes: -# 'debug': empty rootpassword, strace included -# 'release' no root password, no strace and gdb by default -DISTRO_TYPE ?= "debug" -#DISTRO_TYPE = "release" - -# Set the toolchain type (internal, external) and brand (generic, csl etc.) -TOOLCHAIN_TYPE ?= "internal" -TOOLCHAIN_BRAND ?= "" - -# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so -# shipping some adhoc subset will be still useless and size burden for -# users of all other languages/countries. Instead, worth to make it easy -# to install additional languages: installer/wizard + metapackages which -# will RRECOMMEND as much as possible content for a given language -# (locales, UI transalations, help, etc. - useless for pros, but really -# helpful for common users). -# Also, it appears that no locales fit in 16Mb for now. "C" locale rules! -IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}' - - -# set feed path variables -FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" - -# Uncomment this to fetch packaged-staging packages from the central angstrom server -#PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging" - -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "\ - http://www.angstrom-distribution.org/unstable/sources/ \ - " - - -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" -PCMCIA_MANAGER = "pcmciautils" - -#Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" - -#Initramfs for kernels -#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/" -#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" - -#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -LINUX_LIBC_HEADERS_VERSION ?= "2.6.31" -PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" -PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" - -#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.9" -PREFERRED_VERSION_glibc-initial ?= "2.9" -PREFERRED_VERSION_uclibc ?= "0.9.30.2" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30.2" -PREFERRED_VERSION_eglibc ?= "2.9" -PREFERRED_VERSION_eglibc-initial ?= "2.9" - -#powerpc needs additional patches to gcc -ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" -ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" -ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" - -# Blackfin has its on gcc -ANGSTROM_GCC_VERSION_bfin = "4.1.2" - -# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) -#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53" -KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53" -KERNEL_CCSUFFIX_archos5it = "-4.2.1+csl-arm-2007q3-53" - -#avr32 only has support for gcc 4.2.2 -ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" - -#armv4 needs at least gcc 4.4.2 for eabi -ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2" - -#Everybody else can just use this: -ANGSTROM_GCC_VERSION ?= "4.3.3" - -ANGSTROM_BINUTILS_VERSION ?= "2.18" -ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20" -ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" - -PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" -PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}" -PREFERRED_VERSION_binutils-cross-sdk ?= "${ANGSTROM_BINUTILS_VERSION}" - -PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}" - -#avr32 only has patches for binutils 2.17 in OE -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" - -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_opkg ?= "opkg" - -ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" -ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" - -ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" - -ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg" - -ANGSTROM_BLACKLIST_pn-bash-noemu = "doesn't work on the target" -PREFERRED_PROVIDER_bash = "bash" - -ANGSTROMLIBC ?= "glibc" - -require conf/distro/include/angstrom.inc - -# Toolchain virtuals: -require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc -require conf/distro/include/arm-thumb.inc - -# Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc -DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}" - -# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run -# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs -IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}" - -# we need the same provider for opkg and u-a -PREFERRED_PROVIDER_virtual/update-alternatives = "opkg" - -# Select xserver-xorg as default, since kdrive has been EOL'ed -XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" - -# do some task-base stuff here - -# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with -# bluez 3.x -DISTRO_BLUETOOTH_MANAGER = "\ - blueprobe \ - bluez4 \ - " - -# We want to ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' - -# This hooks into task-base, so it won't do anything if your images doesn't include task-base. -# angstrom-version: ship this to have an identifiable rootfs so user can report bugs against a specific version -# ANGSTROM_FEED_CONFIGS: configfiles for the online feeds -# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken -# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink -DISTRO_EXTRA_RDEPENDS += "\ - angstrom-version \ - ${ANGSTROM_FEED_CONFIGS} \ - util-linux-ng-mount util-linux-ng-umount \ - angstrom-libc-fixup-hack \ - " - -# This also hooks into task-base, but isn't mandatory. -# If you don't want parts of this in your task-base using images you can put this in the image recipe: -# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd" -# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass, not angstrom -# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works -# avahi: makes finding your device on the network a lot easier -# openssh-sftp-server: provides sftp which combined with avahi makes it real easy to use things like sshfs -# psplash-angstrom: angstrom branded psplash, you can add your own psplash-foo to an image, it uses update-alternatives -# DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier -DISTRO_EXTRA_RRECOMMENDS += " \ - kernel-module-vfat \ - kernel-module-ext2 \ - kernel-module-ext3 \ - kernel-module-af-packet \ - avahi-daemon \ - avahi-autoipd \ - openssh-sftp-server \ - ${DEBUG_APPS} \ -" - -SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}' -ARM_INSTRUCTION_SET_pn-uclibc = "arm" -ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm" diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf index c6fb07d406..e8aad5aa52 100644 --- a/conf/distro/angstrom-2010.x.conf +++ b/conf/distro/angstrom-2010.x.conf @@ -19,14 +19,14 @@ # Again, in doubt, use DISTRO="angstrom-2008.1" #DISTRO_VERSION = "2010.X" -DISTRO_VERSION = "v${DATE}" +DISTRO_VERSION = "v${@time.strftime('%Y.%m',time.gmtime())}" DISTRO_REVISION = "4" DISTRO_PR = ".9" OLDEST_KERNEL ?= "2.6.16" require conf/distro/include/angstrom-2010-preferred-versions.inc -require conf/distro/include/preferred-opie-versions-1.2.4.inc +require conf/distro/include/preferred-opie-versions-1.2.5.inc #Images built can have to modes: # 'debug': empty rootpassword, strace included @@ -64,7 +64,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -LINUX_LIBC_HEADERS_VERSION ?= "2.6.32" +LINUX_LIBC_HEADERS_VERSION ?= "2.6.37" PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" @@ -123,6 +123,17 @@ ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg" +ANGSTROM_BLACKLIST_pn-bash-noemu = "doesn't work on the target" + +ANGSTROM_BLACKLIST_pn-hotplug-ng = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-hotplug2 = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-linux-hotplug = "hotplug functionality is provided by udev" + +ANGSTROM_BLACKLIST_pn-xcursor-watchonly-theme = "xcursor-transparent-theme is good enough" + +PREFERRED_PROVIDER_ffmpeg = "libav" +ANGSTROM_BLACKLIST_pn-ffmpeg = "libav is the preferred multimedia library" + require conf/distro/include/angstrom.inc # Toolchain virtuals: @@ -194,4 +205,4 @@ ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm" #Machine specific tweaks, will move to its own include soon PREFERRED_PROVIDER_virtual/kernel_beagleboard = "linux-omap" -PREFERRED_VERSION_linux-omap_beagleboard = "2.6.37" +PREFERRED_VERSION_linux-omap_beagleboard = "2.6.39" diff --git a/conf/distro/aurora.conf b/conf/distro/aurora.conf new file mode 100644 index 0000000000..976d8a2f25 --- /dev/null +++ b/conf/distro/aurora.conf @@ -0,0 +1,58 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Aurora +#@DESCRIPTION: Aurora distribution (based on minimal) +# +#@COMMENT: This is used by the FreeSmartphone team to ship a distribution +#@COMMENT: which is suitable for several mobile handset devices out there +#@COMMENT: and uses the FSO middleware to access several of their features +#@COMMENT: like telephony or GPS. +#----------------------------------------------------------------------------- + +require conf/distro/minimal.conf + +# set default locale for images +IMAGE_LINGUAS ?= "en-us" + +# +# Header +# + +DISTRO_NAME = "aurora" +DISTRO_VERSION = "0.1-${DATE}" +DISTRO_REVISION = "1" +DISTRO_PR = ".0" +DISTRO = "aurora" +DISTRO_SSH_DAEMON = "openssh" +DISTRO_APM = "fso-apm" +DISTRO_ALSA_STATE = "fsoaudiod" + +require conf/distro/include/preferred-aurora-versions.inc + +############################################################################ +# SETTINGS +############################################################################ + +# Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +ENABLE_BINARY_LOCALE_GENERATION ?= "1" + +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + +# save statistical info on images +INHERIT += "testlab" + +# activate the angstrom blacklister +INHERIT += "angstrom-blacklist" + +DISTRO_FEED_PREFIX ?= "aurora" +DISTRO_FEED_URI ?= "http://amethyst.openembedded.net/~morphis/aurora/ipk/" + +############################################################################# +# CONTENTS +############################################################################# + +# Some additional content for images based on aurora +DISTRO_EXTRA_RDEPENDS += " \ + aurora-version \ +" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 4833d35cbc..d79f64b31f 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -37,6 +37,8 @@ PREFERRED_VERSION_mythplugins = "0.23" PREFERRED_VERSION_myththemes = "0.23" PREFERRED_VERSION_mythtv = "0.23" PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr%" +PREFERRED_VERSION_network-manager-applet = "0.8.1" +PREFERRED_VERSION_networkmanager = "0.8.1" PREFERRED_VERSION_openssl = "1.0.0d" PREFERRED_VERSION_openssl-native = "1.0.0d" PREFERRED_VERSION_pango = "1.24.4" @@ -44,8 +46,9 @@ PREFERRED_VERSION_pango-native = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_policykit = "0.96" +PREFERRED_VERSION_policykit-gnome = "0.96" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_pulseaudio_armv7a = "0.9.22" PREFERRED_VERSION_python-pycairo = "1.8.0" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc index ceb84fe820..cf13a9ab7a 100644 --- a/conf/distro/include/angstrom-2010-preferred-versions.inc +++ b/conf/distro/include/angstrom-2010-preferred-versions.inc @@ -1,5 +1,5 @@ -ANGSTROM_MESA_VERSION = "7.9.1" -ANGSTROM_QT_VERSION ?= "4.7.1" +ANGSTROM_MESA_VERSION = "7.10" +ANGSTROM_QT_VERSION ?= "4.7.3" ANGSTROM_LIBTOOL_VERSION = "2.4" # Use new sysroot feature LIBTOOL_HAS_SYSROOT = "yes" @@ -12,9 +12,10 @@ PREFERRED_VERSION_autoconf = "2.65" PREFERRED_VERSION_autoconf-native = "2.65" PREFERRED_VERSION_automake = "1.11.1" PREFERRED_VERSION_automake-native = "1.11.1" -PREFERRED_VERSION_busybox = "1.18.3" +PREFERRED_VERSION_avahi = "0.6.30" +PREFERRED_VERSION_busybox = "1.18.5" PREFERRED_VERSION_cairo = "1.10.0" -PREFERRED_VERSION_dbus = "1.2.24" +PREFERRED_VERSION_dbus = "1.4.1" PREFERRED_VERSION_dropbear = "0.52" PREFERRED_VERSION_fontconfig = "2.8.0" PREFERRED_VERSION_glib-2.0 = "2.28.5" @@ -42,8 +43,8 @@ PREFERRED_VERSION_mythplugins = "0.23" PREFERRED_VERSION_myththemes = "0.23" PREFERRED_VERSION_mythtv = "0.23" PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr%" -PREFERRED_VERSION_openssl = "1.0.0d" -PREFERRED_VERSION_openssl-native = "1.0.0d" +PREFERRED_VERSION_openssl = "1.0.0e" +PREFERRED_VERSION_openssl-native = "1.0.0e" PREFERRED_VERSION_pango = "1.28.3" PREFERRED_VERSION_pango-native = "1.28.3" PREFERRED_VERSION_perl = "5.10.1" @@ -51,7 +52,7 @@ PREFERRED_VERSION_perl-native = "5.10.1" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" -PREFERRED_VERSION_pulseaudio = "0.9.21" +PREFERRED_VERSION_pulseaudio = "0.9.22" PREFERRED_VERSION_python-pycairo = "1.8.0" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" @@ -62,15 +63,13 @@ PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.9.4+4.0.0beta6" +PREFERRED_VERSION_tslib = "1.0+gitr%" -PREFERRED_VERSION_udev = "165" -PREFERRED_VERSION_udev_libc-uclibc = "141" -UDEV_GE_141 = "1" +PREFERRED_VERSION_udev = "171" PREFERRED_VERSION_usbutils = "0.86" PREFERRED_VERSION_wpa-supplicant = "0.7.3" PREFERRED_VERSION_wget = "1.11.4" -PREFERRED_VERSION_xserver-common = "1.33" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" # diff --git a/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc index cb1683f1cc..e12ac7207e 100644 --- a/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc +++ b/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc @@ -12,12 +12,12 @@ PREFERRED_VERSION_ti-dsplink-examples = "1_65_00_03" PREFERRED_VERSION_ti-dsplink-module = "1_65_00_03" PREFERRED_VERSION_ti-edma3lld = "01_11_00_03" PREFERRED_VERSION_ti-framework-components = "2_25_03_07" -PREFERRED_VERSION_ti-linuxutils = "2_25_05_11" +PREFERRED_VERSION_ti-linuxutils = "2_26_01_02" PREFERRED_VERSION_ti-local-power-manager = "1_24_02_09" PREFERRED_VERSION_ti-lpm-module = "1_24_02_09" PREFERRED_VERSION_ti-lpm-utils = "1_24_02_09" PREFERRED_VERSION_ti-xdais = "6_26_00_02" -PREFERRED_VERSION_ti-xdctools = "3_20_05_76" +PREFERRED_VERSION_ti-xdctools = "3_20_06_81" PREFERRED_VERSION_ti-codecs-dm355 = "1_13_000" PREFERRED_VERSION_ti-codecs-dm355-server = "1_13_000" diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf index 48727c40be..d715980f64 100644 --- a/conf/distro/include/angstrom-jalimo.conf +++ b/conf/distro/include/angstrom-jalimo.conf @@ -5,12 +5,12 @@ PREFERRED_VERSION_jamvm-initial = "1.4.5" PREFERRED_VERSION_classpath-initial = "0.93" # Native VM -PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native" -SRCREV_pn-cacao-native ?= "c7bf150bfa46" +PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native" +PREFERRED_VERSION_jamvm-native = "1.5.5+1.6.0-devel+git0+4617da717ecb05654ea5bb9572338061106a414d" PREFERRED_VERSION_classpath-native = "0.98" # Native compiler settings -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" +PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native" PREFERRED_VERSION_libecj-bootstrap = "3.6" # Target VM @@ -21,7 +21,7 @@ PREFERRED_VERSION_jamvm = "1.5.2" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.5" +PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.1" PREFERRED_VERSION_icedtea6-native = "1.7.10" # Stage JAR files not into ARCH related dirs diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index c267b96527..50eac850c6 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -54,7 +54,7 @@ ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" # but requires more instructions (140% for 70% smaller code) so may be # slower. -THUMB_INTERWORK = "yes" +THUMB_INTERWORK ?= "yes" # "yes" "no" # Whether to compile with code to allow interworking between the two # instruction sets. This allows thumb code to be executed on a primarily @@ -80,7 +80,7 @@ INHERIT += "debian" INHERIT += "sanity" #activate the blacklister -INHERIT += "angstrom" +INHERIT += "angstrom-blacklist" #make devshell available as task INHERIT += "devshell" diff --git a/conf/distro/include/buglabs-autorev.inc b/conf/distro/include/buglabs-autorev.inc index 84ae8796d1..779b20328e 100644 --- a/conf/distro/include/buglabs-autorev.inc +++ b/conf/distro/include/buglabs-autorev.inc @@ -11,6 +11,7 @@ SRCREV_pn-com.buglabs.bug.jni.libmatthew = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.jni.pb = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.jni.rxtx = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.jni.vonhippel = "${AUTOREV}" +SRCREV_pn-com.buglabs.bug.jni.motion = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.module = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.module.camera = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.module.gps = "${AUTOREV}" @@ -18,6 +19,7 @@ SRCREV_pn-com.buglabs.bug.module.lcd = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.module.pb = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.module.video = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.module.vonhippel = "${AUTOREV}" +SRCREV_pn-com.buglabs.bug.module.motion = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.program = "${AUTOREV}" SRCREV_pn-com.buglabs.bug.service = "${AUTOREV}" SRCREV_pn-com.buglabs.common = "${AUTOREV}" diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 275f598060..52a9cfaae9 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -4,6 +4,7 @@ FSO_PYTHONHELPERS_SRCREV = "${AUTOREV}" SRCREV_pn-android-image-utils-native = "${AUTOREV}" SRCREV_pn-android-rpc = "${AUTOREV}" +SRCREV_pn-cmtspeechtest = "${AUTOREV}" SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index 01257240b5..27c78d6a5b 100644 --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc @@ -4,7 +4,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution preferred version #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 29-11-2010 +#@VERSION: 11-03-2011 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -31,6 +31,7 @@ PREFERRED_VERSION_hal = "0.5.14" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.14" +PREFERRED_VERSION_libsoup-2.4 = "2.32.2" PREFERRED_VERSION_libtool = "2.2.6b" PREFERRED_VERSION_libtool-native = "2.2.6b" PREFERRED_VERSION_libtool-cross = "2.2.6b" @@ -52,13 +53,15 @@ PREFERRED_VERSION_pango-native = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_policykit = "0.96" +PREFERRED_VERSION_policykit-gnome = "0.96" PREFERRED_VERSION_pulseaudio = "0.9.15" PREFERRED_VERSION_python-pycairo = "1.8.0" KAEILOS_WX_VERSION ?= "2.8.10" PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}" -KAEILOS_QT_VERSION ?= "4.6.3" +KAEILOS_QT_VERSION ?= "4.7.3" PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}" @@ -74,10 +77,11 @@ PREFERRED_VERSION_udev_libc-uclibc = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.86" -PREFERRED_VERSION_wpa-supplicant = "0.6.9" +PREFERRED_VERSION_wpa-supplicant = "0.7.3" PREFERRED_VERSION_wget = "1.11.4" PREFERRED_VERSION_xserver-common = "1.33" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +PREFERRED_VERSION_xserver-nodm-init = "2.0" PREFERRED_VERSION_xserver-xorg = "1.7.4" # diff --git a/conf/distro/include/kaeilos-2011-preferred-versions.inc b/conf/distro/include/kaeilos-2011-preferred-versions.inc new file mode 100644 index 0000000000..540f6bdeb1 --- /dev/null +++ b/conf/distro/include/kaeilos-2011-preferred-versions.inc @@ -0,0 +1,105 @@ +#@-------------------------------------------------------------------- +#@FILE: conf/distro/include/kaeilos-2011-preferred-versions.inc +#@TYPE: Distribution +#@NAME: KaeilOS(R) - http://www.kaeilos.com +#@DESCRIPTION: KaeilOS Linux Distribution preferred version +#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> +#@VERSION: 25-10-2011 +# +# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia +# Product website : http://www.KaeilOS.com +#@-------------------------------------------------------------------- + +KAEILOS_MESA_VERSION = "7.10" +KAEILOS_LIBTOOL_VERSION = "2.4" +# Use new sysroot feature +LIBTOOL_HAS_SYSROOT = "yes" + +CE_VERSION ?= "latest" + +require conf/distro/include/angstrom-codec-engine-${CE_VERSION}-preferred-versions.inc + +PREFERRED_VERSION_autoconf = "2.65" +PREFERRED_VERSION_autoconf-native = "2.65" +PREFERRED_VERSION_automake = "1.11.1" +PREFERRED_VERSION_automake-native = "1.11.1" +PREFERRED_VERSION_avahi = "0.6.30" +PREFERRED_VERSION_busybox = "1.18.5" +PREFERRED_VERSION_cairo = "1.10.0" +PREFERRED_VERSION_dbus = "1.4.1" +PREFERRED_VERSION_dropbear = "0.52" +PREFERRED_VERSION_fontconfig = "2.8.0" +PREFERRED_VERSION_glib-2.0 = "2.28.5" +PREFERRED_VERSION_glib-2.0-native = "2.28.5" +PREFERRED_VERSION_glibmm = "2.24.0" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_gtk+ = "2.20.1" +PREFERRED_VERSION_gtk+-native = "2.20.1" +PREFERRED_VERSION_gtkmm = "2.20.0" +PREFERRED_VERSION_gvfs = "1.7.2" +PREFERRED_VERSION_hal = "0.5.14" +PREFERRED_VERSION_libgemwidget = "1.0" +PREFERRED_VERSION_libgpephone = "0.4" +PREFERRED_VERSION_libsdl-x11 = "1.2.14" +PREFERRED_VERSION_libtool = "${KAEILOS_LIBTOOL_VERSION}" +PREFERRED_VERSION_libtool-native = "${KAEILOS_LIBTOOL_VERSION}" +PREFERRED_VERSION_libtool-cross = "${KAEILOS_LIBTOOL_VERSION}" +PREFERRED_VERSION_libtool-nativesdk = "${KAEILOS_LIBTOOL_VERSION}" +PREFERRED_VERSION_libtool-sdk = "${KAEILOS_LIBTOOL_VERSION}" +PREFERRED_VERSION_lighttpd = "1.4.26" +PREFERRED_VERSION_mesa = "${KAEILOS_MESA_VERSION}" +PREFERRED_VERSION_mesa-dri = "${KAEILOS_MESA_VERSION}" +PREFERRED_VERSION_mesa-xlib = "${KAEILOS_MESA_VERSION}" +PREFERRED_VERSION_mythplugins = "0.23" +PREFERRED_VERSION_myththemes = "0.23" +PREFERRED_VERSION_mythtv = "0.23" +PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr%" +PREFERRED_VERSION_openssl = "1.0.0d" +PREFERRED_VERSION_openssl-native = "1.0.0d" +PREFERRED_VERSION_pango = "1.28.3" +PREFERRED_VERSION_pango-native = "1.28.3" +PREFERRED_VERSION_perl = "5.10.1" +PREFERRED_VERSION_perl-native = "5.10.1" +#PREFERRED_VERSION_pixman = "0.13.2" +PREFERRED_VERSION_pkgconfig = "0.23" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_pulseaudio = "0.9.22" +PREFERRED_VERSION_python-pycairo = "1.8.0" + +KAEILOS_WX_VERSION ?= "2.8.10" +PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}" + +KAEILOS_QT_VERSION ?= "4.7.3" +PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}" + +PREFERRED_VERSION_samba = "3.3.9" +PREFERRED_VERSION_tiff = "3.9.4+4.0.0beta6" +PREFERRED_VERSION_tslib = "1.0+gitr%" + +PREFERRED_VERSION_udev = "171" + +PREFERRED_VERSION_usbutils = "0.86" +PREFERRED_VERSION_wpa-supplicant = "0.7.3" +PREFERRED_VERSION_wget = "1.11.4" +PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" + +# +# meta-moblin package SRCREVs +# +SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9" +SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8" +SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15" +SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" +SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184" +SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c" +SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48" +SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f" +SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758" +SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e" +SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab" + diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc index 3ba439d33e..b06c886bcb 100644 --- a/conf/distro/include/kaeilos.inc +++ b/conf/distro/include/kaeilos.inc @@ -76,7 +76,7 @@ INHERIT += "debian" INHERIT += "sanity" #activate the blacklister -INHERIT += "angstrom" +INHERIT += "angstrom-blacklist" #make devshell available as task INHERIT += "devshell" @@ -129,6 +129,7 @@ TARGET_FPU_ppc405 ?= "soft" TARGET_FPU_armv6 ?= "hard" TARGET_FPU_armv6-novfp ?= "soft" TARGET_FPU_armv7a ?= "hard" +TARGET_FPU_armv7a-vfp ?= "hard" TARGET_FPU_ppc603e ?= "hard" # webkit-gtk and cairo have alignment issues with double instructions on armv5 so @@ -144,15 +145,6 @@ FEED_ARCH ?= "${BASE_PACKAGE_ARCH}" #blackfin machines FEED_ARCH_bfin = "blackfin" -#Tweak packaging for strongarm machines since they can't use EABI - -PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" -PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" -PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" -PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi" -PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" - - #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" @@ -181,10 +173,8 @@ SEPPUKU_COMPONENT = "org.openembedded.dev" OESTATS_SERVER ?= "tinderbox.openembedded.org" - - # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" +DISTRO_FEATURES = "xattr largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" # Use-like features DISTRO_FEATURES += "tk" diff --git a/conf/distro/include/preferred-aurora-versions.inc b/conf/distro/include/preferred-aurora-versions.inc new file mode 100644 index 0000000000..5ddcdcddd3 --- /dev/null +++ b/conf/distro/include/preferred-aurora-versions.inc @@ -0,0 +1,18 @@ +# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" +# and 2.6.31 for fsodeviced +LINUX_LIBC_HEADERS_VERSION ?= "2.6.32" +PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" +PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" + +# We need git version of tslib as the old 1.0 release does not the support the features we +# need for some mobile handset devices +PREFERRED_VERSION_tslib = "1.0+git%" + +# Adjust kernel configuration for older udev versions +UDEV_GE_141 = "1" + +# specifically set an openssh version +# NOTE: whenever changing the version here make sure +# to check we won't loose our specific config !!! +PREFERRED_VERSION_openssh = "5.2p1" + diff --git a/conf/distro/include/preferred-opie-git-versions.inc b/conf/distro/include/preferred-opie-git-versions.inc index 72974d7541..34708663a9 100644 --- a/conf/distro/include/preferred-opie-git-versions.inc +++ b/conf/distro/include/preferred-opie-git-versions.inc @@ -5,7 +5,7 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes" OPIE_SRCREV ?= "8c3beef263bc9c34443eacfc821e99813e17554f" -OPIE_VERSION = "1.2.4+gitr${OPIE_SRCREV}" +OPIE_VERSION = "1.2.5+gitr${OPIE_SRCREV}" OPIE_GIT_PV = "${OPIE_VERSION}" diff --git a/conf/distro/include/preferred-opie-versions-1.2.4.inc b/conf/distro/include/preferred-opie-versions-1.2.4.inc deleted file mode 100644 index 312a78cf1a..0000000000 --- a/conf/distro/include/preferred-opie-versions-1.2.4.inc +++ /dev/null @@ -1,210 +0,0 @@ -# -# Default versions -QTE_VERSION ?= "2.3.10" -OPIE_VERSION ?= "1.2.4" -PALMTOP_USE_MULTITHREADED_QT ?= "yes" - -# -# -# Opie libraries -# -PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' -PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" -PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" -PREFERRED_VERSION_qte = "${QTE_VERSION}" -PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}" -PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" -PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" -PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" -PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" -PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}" -# -# Opie applications -# -PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bluepin ?= "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bluetoothapplet ?= "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bluetoothmanager ?= "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-cardapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-console = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-go = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-language = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-login = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-core = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-notes = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-search = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-security = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-write = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20070316" diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 662f366012..28a6ffbcc5 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -18,7 +18,6 @@ PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" PREFERRED_VERSION_openssh = "5.2p1" # upgrades used in Angstrom -PREFERRED_VERSION_xserver-common = "1.33" PREFERRED_VERSION_xserver-nodm-init = "2.0" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_wpa-supplicant = "0.6.9" @@ -28,7 +27,7 @@ PREFERRED_VERSION_perl = "5.10.1" PREFERRED_VERSION_perl-native = "5.10.1" UDEV_GE_141 = "1" -ANGSTROM_QT_VERSION ?= "4.7.1" +ANGSTROM_QT_VERSION ?= "4.7.3" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" @@ -38,9 +37,6 @@ PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_tslib = "1.0+git%" -# epdf needs > 0.12, but recipes have D_P = -1 -PREFERRED_VERSION_poppler = "0.12.3" - # git version fails to build PREFERRED_VERSION_mupdf = "0.6" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 4f1033c05b..2121edbc19 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -20,21 +20,15 @@ PREFERRED_VERSION_linux-ixp4xx = "2.6.37+svnr${SRCREV_pn-linux-ixp4xx}" ### alphabetically. Note that the main slugos.inc file ### may include preferred versions for toolchain components. -PREFERRED_VERSION_atk ?= "1.28.0" -PREFERRED_VERSION_atk-native ?= "1.28.0" PREFERRED_VERSION_autoconf ?= "2.65" PREFERRED_VERSION_autoconf-native ?= "2.65" PREFERRED_VERSION_automake ?= "1.11.1" PREFERRED_VERSION_automake-native ?= "1.11.1" -PREFERRED_VERSION_busybox ?= "1.18.3" +PREFERRED_VERSION_busybox ?= "1.18.5" PREFERRED_VERSION_dbus ?= "1.4.1" PREFERRED_VERSION_glib-2.0 ?= "2.26.1" PREFERRED_VERSION_glib-2.0-native ?= "2.26.1" -PREFERRED_VERSION_gtk+ ?= "2.18.6" -PREFERRED_VERSION_gtk+-native ?= "2.18.6" PREFERRED_VERSION_gvfs ?= "1.6.6" -PREFERRED_VERSION_ipkg ?= "0.99.163" -PREFERRED_VERSION_ipkg-native ?= "0.99.163" PREFERRED_VERSION_linux-libc-headers ?= "2.6.31" PREFERRED_VERSION_m4 ?= "1.4.14" PREFERRED_VERSION_m4-native ?= "1.4.14" @@ -44,17 +38,3 @@ PREFERRED_VERSION_perl-native ?= "5.10.1" PREFERRED_VERSION_pkgconfig ?= "0.23" PREFERRED_VERSION_pkgconfig-native ?= "0.23" PREFERRED_VERSION_udev ?= "118" - -##################### Stuff with special notes, and broken stuff: - -# Newer version required by glibc and some userspace apps -#PREFERRED_VERSION_linux-libc-headers ?= "2.6.31" - -# boost 1.36 won't build -#PREFERRED_VERSION_boost ?= "1.33.1" - -# pulseaudio 0.9.19 is broken (ASM errors during do_compile): -#PREFERRED_VERSION_pulseaudio ?= "0.9.15" - -# latest tcl recipe has a bug that overwites regex.h; use the old tcl -#PREFERRED_VERSION_tcl ?= "8.4.19" diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index daab0f8627..d38ca5dcf1 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -3,20 +3,20 @@ # eglibc: # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" -FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os ${DEBUG_FLAGS}" +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1 ${DEBUG_FLAGS}" +FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" # gcc 4.4 and 4.5 has a problem with 'leakage' into libgcc.a with -Os -FULL_OPTIMIZATION_powerpc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_powerpc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" # JaMa: I promise to report bug upstream, but as it can take a while to fix it, I'll switch to -O2 here # Tested with gcc-4.4.2 and gcc-4.4.3 on armv4t and armv5te and it fails with -Os, with gcc-4.3.3 it works OK with -Os # Here is testcase, but you have to rebuild whole libqtxml to test it # http://lists.shr-project.org/pipermail/shr-devel/2010-February/002169.html -FULL_OPTIMIZATION_pn-qt4-x11-free = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_pn-qt4-x11-free = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" # This I've seen only on armv4t, it segfaults when called from pisi, but whole test unit suite can pass -FULL_OPTIMIZATION_pn-libsyncml = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_pn-libsyncml = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_sparc = "-O2" diff --git a/conf/distro/include/sane-toolchain-glibc.inc b/conf/distro/include/sane-toolchain-glibc.inc index 770aa87cc3..29c201b17d 100644 --- a/conf/distro/include/sane-toolchain-glibc.inc +++ b/conf/distro/include/sane-toolchain-glibc.inc @@ -7,14 +7,14 @@ # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 ${DEBUG_FLAGS}" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" -FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" -FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1 ${DEBUG_FLAGS}" +FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2 ${DEBUG_FLAGS}" +FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" # gcc 4.4 and 4.5 has a problem with 'leakage' into libgcc.a with -Os -FULL_OPTIMIZATION_powerpc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_powerpc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_pn-glibc = "-O2" diff --git a/conf/distro/include/sane-toolchain-java.inc b/conf/distro/include/sane-toolchain-java.inc index 365a3d654c..ff919924b0 100644 --- a/conf/distro/include/sane-toolchain-java.inc +++ b/conf/distro/include/sane-toolchain-java.inc @@ -1,6 +1,21 @@ # Set PREFFERED and VERSION stuff for working java-toolchain PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial" -PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native" +PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native" + +# target cacao is failing to build +# without this provider we get +# DEBUG: sorted providers for java2-runtime are: [ +# '/OE/dev/recipes/cacao/cacao_0.99.4.bb', +# '/OE/dev/recipes/jamvm/jamvm_1.5.3.bb', +# '/OE/dev/recipes/openjdk/openjdk-5_6b18-1.8.5.bb'] +# with this provider we get +# NOTE: selecting openjdk-6-jre to satisfy runtime java2-runtime due to PREFERRED_PROVIDER_openjdk-6-jre = openjdk-6-jre +# DEBUG: sorted providers for java2-runtime are: [ +# '/OE/dev/recipes/openjdk/openjdk-6_6b18-1.8.5.bb', +# '/OE/dev/recipes/cacao/cacao_0.99.4.bb', +# '/OE/dev/recipes/jamvm/jamvm_1.5.3.bb'] +PREFERRED_PROVIDER_openjdk-6-jre = "openjdk-6-jre" + PREFERRED_VERSION_classpath-native = "0.98" PREFERRED_VERSION_classpath = "0.98" diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc index b61ee36af6..b51cdaf2e5 100644 --- a/conf/distro/include/sane-toolchain-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclibc.inc @@ -23,12 +23,12 @@ PREFERRED_VERSION_uclibc-cross-intermediate ?= "${PREFERRED_UCLIBC_VERSION}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -pipe" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -pipe ${DEBUG_FLAGS}" BUILD_OPTIMIZATION += "-pipe" # -Os compiled root file system does not boot for powerpc, root cause it still at large # we use -O2 meanwhile -FULL_OPTIMIZATION_powerpc = "-O2 -pipe" +FULL_OPTIMIZATION_powerpc = "-O2 -pipe ${DEBUG_FLAGS}" #Gcc will die with 'internal consistency error when using the above optimizations #with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports). @@ -38,7 +38,7 @@ FULL_OPTIMIZATION_powerpc = "-O2 -pipe" #it was removed while debugging an issue that ultimately turned out to be due #to the ICE fixed by gcc-pr32889.patch. It needs to be tested again. #Note that this testing was done without the gcc-pr32889.patch. -FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer" +FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer ${DEBUG_FLAGS}" TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}" diff --git a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc index a1e7df0087..8ebaf153d7 100644 --- a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc @@ -9,7 +9,7 @@ USE_NLS_gcc-cross = "no" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -pipe" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -pipe ${DEBUG_FLAGS}" BUILD_OPTIMIZATION = "-Os" #Gcc will die with 'internal consistency error when using the above optimizations diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index a174a070fd..664629c528 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -6,7 +6,7 @@ # Base line versions, good for most things PREFERRED_GCC_VERSION ?= "4.5" -PREFERRED_BINUTILS_VERSION ?= "2.21" +PREFERRED_BINUTILS_VERSION ?= "2.21.1a" PREFERRED_UCLIBC_VERSION ?= "git" PREFERRED_EGLIBC_VERSION ?= "2.12" PREFERRED_GLIBC_VERSION ?= "2.10.1" @@ -200,10 +200,6 @@ def compute_os_portion_of_target_triplet (d): bb.note("DISTRO_FEATURES is not set abi suffix not set") abi_suffix = "" - if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \ - "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1): - gnu_suffix = "gnu" - if libc_suffix + gnu_suffix + abi_suffix is not "": return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix else: diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 0451fc1f38..0c49140b79 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "6.0" +SLUGOS_VERSION = "6.1" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index a3ec20e2fd..e3a062437e 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -106,4 +106,4 @@ ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" DISTRO_BLUETOOTH_MANAGER = "blueprobe bluez4" -require conf/distro/include/preferred-opie-versions-1.2.4.inc +require conf/distro/include/preferred-opie-versions-1.2.5.inc diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf index 857525414a..ee49d80e3b 100644 --- a/conf/distro/kaeilos-2010.conf +++ b/conf/distro/kaeilos-2010.conf @@ -5,6 +5,8 @@ #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> #@VERSION: 04-10-2010 # +# ***** OBSOLETE - DO NOT USE ***** +# # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com # @@ -20,7 +22,7 @@ OLDEST_KERNEL ?= "2.6.28" require conf/distro/include/kaeilos-2009-preferred-versions.inc require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-opie-versions-1.2.4.inc +require conf/distro/include/preferred-opie-versions-1.2.5.inc #Images built can have to modes: # 'debug': empty rootpassword, strace included diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 39033211c3..ae2f4b1d80 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -4,22 +4,24 @@ #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices # This version is strictly conformed to Angstrom #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 20-01-2011 +#@VERSION: 25-10-2011 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Use this at your own risk, we welcome bugreports filed at # Product website : http://www.KaeilOS.com #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2009.2" -DISTRO_VERSION = "2009.2-test-${DATE}" -DISTRO_REVISION = "2" -DISTRO_PR = ".7" +DISTRO_VERSION = "v${@time.strftime('%Y.%m',time.gmtime())}" +DISTRO_REVISION = "4" +DISTRO_PR = ".9" OLDEST_KERNEL ?= "2.6.16" -require conf/distro/include/kaeilos-2009-preferred-versions.inc -require conf/distro/include/preferred-opie-versions-1.2.4.inc +require conf/distro/include/kaeilos-2011-preferred-versions.inc +require conf/distro/include/preferred-opie-versions-1.2.5.inc + +# Java VM +require conf/distro/include/angstrom-jalimo.conf #Images built can have to modes: # 'debug': empty rootpassword, strace included @@ -45,14 +47,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)} EXTRA_IMAGECMD_ext2 = "-i 4096" # set feed path variables -FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" - - -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "\ - http://www.angstrom-distribution.org/unstable/sources/ \ - " - +FEED_BASEPATH = "feeds/next/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #Make sure we use 2.6 on machines with a 2.4/2.6 selector KERNEL = "kernel26" @@ -62,23 +57,18 @@ PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" -#Initramfs for kernels -#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/" -#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" - #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -LINUX_LIBC_HEADERS_VERSION ?= "2.6.31" +LINUX_LIBC_HEADERS_VERSION ?= "2.6.37" PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" -# see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.9" -PREFERRED_VERSION_glibc-initial ?= "2.9" +PREFERRED_VERSION_glibc ?= "2.10.1" +PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_VERSION_uclibc ?= "0.9.30.2" PREFERRED_VERSION_uclibc-initial ?= "0.9.30.2" -PREFERRED_VERSION_eglibc ?= "2.9" -PREFERRED_VERSION_eglibc-initial ?= "2.9" +PREFERRED_VERSION_eglibc ?= "2.12" +PREFERRED_VERSION_eglibc-initial ?= "2.12" #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" @@ -100,11 +90,9 @@ ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2" #Everybody else can just use this: -ANGSTROM_GCC_VERSION ?= "4.3.3" +ANGSTROM_GCC_VERSION ?= "4.5" -ANGSTROM_BINUTILS_VERSION ?= "2.18" -ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20" -ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" +ANGSTROM_BINUTILS_VERSION ?= "2.20.1" PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}" @@ -125,7 +113,7 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_opkg ?= "opkg" -# see recipes/bluez/bluez4*.bb for further dependencies of this setting +# Remaining some Angstrom stuff ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" @@ -133,7 +121,16 @@ ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg" -ANGSTROMLIBC ?= "glibc" +ANGSTROM_BLACKLIST_pn-bash-noemu = "doesn't work on the target" + +ANGSTROM_BLACKLIST_pn-hotplug-ng = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-hotplug2 = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-linux-hotplug = "hotplug functionality is provided by udev" + +ANGSTROM_BLACKLIST_pn-xcursor-watchonly-theme = "xcursor-transparent-theme is good enough" + +PREFERRED_PROVIDER_ffmpeg = "libav" +ANGSTROM_BLACKLIST_pn-ffmpeg = "libav is the preferred multimedia library" require conf/distro/include/kaeilos.inc @@ -141,6 +138,9 @@ require conf/distro/include/kaeilos.inc require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc require conf/distro/include/arm-thumb.inc +# Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc +DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}" + # If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}" diff --git a/conf/distro/metano.conf b/conf/distro/metano.conf index 3f4daacf03..5fd8bac468 100644 --- a/conf/distro/metano.conf +++ b/conf/distro/metano.conf @@ -89,7 +89,7 @@ require conf/distro/include/arm-thumb.inc # PREFERRED VERSIONS ############################################################################# require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-opie-versions-1.2.4.inc +require conf/distro/include/preferred-opie-versions-1.2.5.inc PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index caf7826208..18bcfae310 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -115,7 +115,7 @@ require conf/distro/include/preferred-opie-versions-1.2.5.inc PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" -PREFERRED_QT_VERSION ?= "4.7.1" +PREFERRED_QT_VERSION ?= "4.7.3" PREFERRED_VERSION_qt4-tools-native = "${PREFERRED_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${PREFERRED_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${PREFERRED_QT_VERSION}" diff --git a/conf/distro/nylon.conf b/conf/distro/obsolete/nylon.conf index 6b9d3d968d..6b9d3d968d 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/obsolete/nylon.conf diff --git a/conf/distro/wrt54oe.conf b/conf/distro/obsolete/wrt54oe.conf index 0cea34912a..0cea34912a 100644 --- a/conf/distro/wrt54oe.conf +++ b/conf/distro/obsolete/wrt54oe.conf diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 415e44961c..1e5bb0583c 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -26,6 +26,7 @@ DISTRO = "shr" DISTRO_SSH_DAEMON = "openssh" DISTRO_APM = "fso-apm" +DISTRO_ALSA_STATE = "fsoaudiod" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable ENABLE_BINARY_LOCALE_GENERATION ?= "1" @@ -37,7 +38,7 @@ LOCALE_UTF8_ONLY = "1" INHERIT += "testlab" #activate the angstrom blacklister -INHERIT += "angstrom" +INHERIT += "angstrom-blacklist" #run QA tests on builds and packages and log them INHERIT += "insane" @@ -50,6 +51,13 @@ INHERIT += "devshell" #run QA tests on recipes INHERIT += "recipe_sanity" +ANGSTROM_BLACKLIST_pn-pstree = "pstree is provided by psmisc" +ANGSTROM_BLACKLIST_pn-hotplug-ng = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-hotplug2 = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-linux-hotplug = "hotplug functionality is provided by udev" +ANGSTROM_BLACKLIST_pn-xcursor-watchonly-theme = "xcursor-transparent-theme is good enough" +ANGSTROM_BLACKLIST_pn-xserver-kdrive = "xorg-server is preferred" +ANGSTROM_BLACKLIST_pn-xserver-kdrive-1300 = "xorg-server is preferred" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso" @@ -96,8 +104,10 @@ IMAGE_INITSCRIPTS = "initscripts-shr" IPKG_VARIANT = "opkg" #Illume settings -ILLUME_CONFIG = "e-wm-config-illume2-shr" -ILLUME_THEME = "e-wm-theme-illume-gry" +ESYSACTIONS = "e-wm-sysactions-shr" +EMENU = "e-wm-menu-shr" +ECONFIG = "e-wm-config-illume2-shr" +ETHEME = "e-wm-theme-illume-gry" # From minimal.conf @@ -179,7 +189,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" # PREFERRED VERSIONS ############################################################################# require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-opie-versions-1.2.4.inc +require conf/distro/include/preferred-opie-versions-1.2.5.inc ############################################################################# # CONTENTS diff --git a/conf/documentation.conf b/conf/documentation.conf index f1abee076b..f98f3a9835 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -57,7 +57,7 @@ PR[doc] = "PR is the revision of the package (Package Revision). By default it i PF[doc] = "Package name - Package version - Package revision (PN-PV-PR)" P[doc] = "Package name - Package version (PN-PF)" S[doc] = "Directory that holds the sources to build, WORKDIR/PN-PV by default. The 'make' or equivalent command is run from this directory." -SECTION[doc] = "Section of the packages e.g. console/networking" +SECTION[doc] = "Section of the packages e.g. console/network" PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed'." DESCRIPTION[doc] = "A small description of the package." LICENSE[doc] = "The license of the resulting package e.g. GPL" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 4a27130d3a..857ede9119 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -94,7 +94,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # binary toolchain, in this case one built by CodeSourcery. The following # example is for ARM and we set TOOLCHAIN_VENDOR to "-none" as the CodeSourcery # ARM tools are arm-none-linux-gnueabi-$tool. Other arches need different -# values here. This assumes that the tools are already in the users PATH. +# values here. Some arches may need to override TARGET_PREFIX (ia32). +# This assumes that the tools are already in the users PATH. # TOOLCHAIN_VENDOR = "-none" # TOOLCHAIN_TYPE = "external" # TOOLCHAIN_BRAND = "csl" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 4afa515c32..ae089a17a8 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/at91sam9m10ekes.conf b/conf/machine/at91sam9m10ekes.conf index 63d97a88ef..9b00e64127 100644 --- a/conf/machine/at91sam9m10ekes.conf +++ b/conf/machine/at91sam9m10ekes.conf @@ -13,10 +13,14 @@ include conf/machine/include/at91-lcd.inc # Supported u-boot machines #UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config" #UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config" -UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config" +#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config" #UBOOT_MACHINE = "at91sam9m10g45ek_config" +UBOOT_MACHINE = "at91sam9m10g45ek_sd" -AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf" +#UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash" +UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash" + +AT91BOOTSTRAP_BOARD = "at91sam9m10dfes at91sam9m10ekes at91sam9m10nfes at91sam9m10sdu" MACHINE_FEATURES += "usbhost" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index ce480193f8..bd2b8dd81c 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -15,13 +15,13 @@ GUI_MACHINE_CLASS = "bigscreen" require conf/machine/include/omap3.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" IMAGE_FSTYPES += "tar.bz2 ubi" EXTRA_IMAGECMD_jffs2 = "-lnp " # Guesswork -SERIAL_CONSOLE = "115200 ttyS2" +SERIAL_CONSOLE = "115200 ttyO2" UBOOT_MACHINE = "omap3_beagle_config" diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf index fd4aba48f8..68c37bfe0e 100644 --- a/conf/machine/ben-nanonote.conf +++ b/conf/machine/ben-nanonote.conf @@ -5,13 +5,22 @@ TARGET_ARCH = "mipsel" require conf/machine/include/tune-mips32.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben-nanonote" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel_jlime = "linux-jlime-ben-nanonote" # With 2.6.37 there is not yet uImage target (pending patches) #KERNEL_IMAGETYPE = "uImage" KERNEL_IMAGETYPE = "vmlinux.bin" -IMAGE_FSTYPES ?= "jffs2" +CMDLINE = "console=ttyS0,57600n8 console=tty0 mem=32M" + +UBOOT_LOADADDRESS = "0x80010000" + +# Dynamic entrypoint +#UBOOT_ENTRYPOINT = +UBOOT_ENTRYSYMBOL = "kernel_entry" + +IMAGE_FSTYPES ?= "jffs2 tar.gz" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" @@ -23,10 +32,3 @@ MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "320" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" LOGO_SIZE = "qvga" - -################################## -# build kexecboot kernel while -# making sure rootfs is compatible -################################## - -# require conf/machine/include/initramfs-kexecboot.inc diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf index e45629d191..1d301c7c85 100644 --- a/conf/machine/bug.conf +++ b/conf/machine/bug.conf @@ -21,7 +21,8 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "240" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ xf86-input-evdev \ - xf86-input-tslib \ xf86-input-mouse \ xf86-video-fbdev \ xf86-input-keyboard" + +PREFERRED_PROVIDER_udev-compat = "udev-compat141" diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf index 95ce49c7f5..36de8eb685 100644 --- a/conf/machine/bug20.conf +++ b/conf/machine/bug20.conf @@ -20,7 +20,8 @@ GUI_MACHINE_CLASS = "bigscreen" require conf/machine/include/omap3.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-hah" +PREFERRED_PROVIDER_virtual/kernel = "linux-bug20-linaro" +MACHINE_KERNEL_PR = "r103" IMAGE_FSTYPES += "tar.bz2 ubi" EXTRA_IMAGECMD_jffs2 = "-lnp " diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 68c9ba4263..f5ec1325a2 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc # NAND factory-default diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 66995e9b09..a0d710cbfc 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "14" diff --git a/conf/machine/exopcslate.conf b/conf/machine/exopcslate.conf new file mode 100644 index 0000000000..d7eb86bf53 --- /dev/null +++ b/conf/machine/exopcslate.conf @@ -0,0 +1,42 @@ +#@TYPE: Machine +#@NAME: exocpslate +#@DESCRIPTION: Machine configuration for the ExoPC Slate machine + + +TARGET_ARCH = "i686" + +PREFERRED_VERSION_linux = "2.6.37" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-tslib \ + xf86-input-evdev \ + xf86-input-evtouch \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-fbdev \ +" + + +KERNEL_IMAGETYPE = "bzImage" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +IMAGE_FSTYPES ?= "tar.gz" +IMAGE_DEVICE_TABLES = " \ + files/device_table-minimal.txt \ + files/device_table_add-loop.txt \ + files/device_table_add-scsi.txt \ +" + +MACHINE_FEATURES = "kernel26 apm alsa bluetooth wifi vfat phone screen touchscreen keyboard pci usbhost acpi ext2 ext3 ext4 x86" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + +module_autoload_hci_usb = "hci_usb" +module_autoload_g_ether = "g_ether" + +require conf/machine/include/tune-atom.inc + diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index eec87a3ed5..19e76625f3 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -6,7 +6,11 @@ TARGET_ARCH = "arm" # Set preferred providers PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" +PREFERRED_PROVIDER_virtual/kernel = "linux" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_LOADADDRESS = "0x30108000" +UBOOT_ENTRYPOINT = "0x30108000" # Set features for task-base MACHINE_GUI_CLASS = "smallscreen" diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf index 998b8fdf62..1e38fd67c3 100644 --- a/conf/machine/htcdream.conf +++ b/conf/machine/htcdream.conf @@ -26,7 +26,6 @@ XSERVER = " \ xserver-xorg \ xserver-xorg-extension-glx \ xserver-xorg-extension-dri \ - xf86-input-tslib \ xf86-input-evdev \ xf86-input-mouse \ xf86-input-keyboard \ diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 474454ab31..70e4a1efae 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -29,13 +29,14 @@ MACHINE_FEATURES += "iwmmxt" # # Software/packages selection # -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux" PCMCIA_MANAGER = "pcmciautils" MODUTILS = "26" -XSERVER = "xserver-kdrive-w100" - -PREFERRED_VERSION_orinoco-modules = "0.15rc1" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-video-fbdev" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "\ diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc index e245b15363..37a7188cbb 100644 --- a/conf/machine/include/at91-2.6.30.inc +++ b/conf/machine/include/at91-2.6.30.inc @@ -7,10 +7,10 @@ SOC_FAMILY = "at91" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.30" -PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13" -PREFERRED_VERSION_at91bootstrap = "2.13" +PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap" +PREFERRED_VERSION_at91bootstrap = "3.0" -PREFERRED_PROVIDER_u-boot = "u-boot_2009.11" +PREFERRED_PROVIDER_u-boot = "u-boot" PREFERRED_VERSION_u-boot = "2009.11" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/imx28.inc b/conf/machine/include/imx28.inc new file mode 100644 index 0000000000..b50f000a3b --- /dev/null +++ b/conf/machine/include/imx28.inc @@ -0,0 +1,19 @@ +SOC_FAMILY = "mx28" +TARGET_ARCH = "arm" + +require conf/machine/include/tune-arm926ejs.inc + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" + +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r0" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x40008000" +UBOOT_LOADADDRESS = "0x40008000" + +EXTRA_IMAGEDEPENDS += "u-boot" + +IMAGE_FSTYPES += "jffs2 tar.bz2" + diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9700a7aa3f..c762d41797 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r100" +MACHINE_KERNEL_PR = "r102" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/palmpre.inc b/conf/machine/include/palmpre.inc index f5d64052c8..7c22bccbc2 100644 --- a/conf/machine/include/palmpre.inc +++ b/conf/machine/include/palmpre.inc @@ -19,7 +19,7 @@ require conf/machine/include/omap3.inc # Copied from include/omap3.inc (as we do not use linux-omap recipes): # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r93" +MACHINE_KERNEL_PR = "r94" PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre" @@ -34,10 +34,12 @@ MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone blueto MACHINE_EXTRA_RDEPENDS = " \ tsmd \ read-tokens \ - tellbootie \ lvm2 \ palmpre-audio-scripts \ compat-wireless-2.6-old \ + kernel-module-sirloin-wifi \ + marvell-license \ + marvell-sdio-fw \ " PREFERRED_PROVIDER_udev-compat = "udev-compat141" diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc index 8fa7ee9a49..3e7ee76367 100644 --- a/conf/machine/include/ti814x.inc +++ b/conf/machine/include/ti814x.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "ti814x" require conf/machine/include/tune-cortexa8.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap3" +PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" # Increase this everytime you change something in the kernel diff --git a/conf/machine/include/ti816x.inc b/conf/machine/include/ti816x.inc index ef562647e9..57bd89f00f 100644 --- a/conf/machine/include/ti816x.inc +++ b/conf/machine/include/ti816x.inc @@ -3,16 +3,16 @@ SOC_FAMILY = "ti816x" require conf/machine/include/tune-cortexa8.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-omap3" +PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r1" +MACHINE_KERNEL_PR = "r2" KERNEL_IMAGETYPE = "uImage" UBOOT_ARCH = "arm" -UBOOT_MACHINE = "ti816x_evm_config" +UBOOT_MACHINE = "ti8168_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc index 44058c12be..01c41d3001 100644 --- a/conf/machine/include/tune-atom.inc +++ b/conf/machine/include/tune-atom.inc @@ -6,4 +6,4 @@ TARGET_CC_ARCH = "-march=core2" #TARGET_CC_ARCH = "-march=i686 -mtune=atom" BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" -PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
\ No newline at end of file +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 i686" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index fe57c9ccc0..ac584e3e38 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -6,3 +6,6 @@ TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" FEED_ARCH = "armv4" BASE_PACKAGE_ARCH = "armv4" PACKAGE_EXTRA_ARCHS += "armv4" + +ARM_INSTRUCTION_SET = "arm" +THUMB_INTERWORK = "no" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus.inc index 862424a01c..9cbe056bdb 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus.inc @@ -22,9 +22,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ cat ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" - EXTRA_IMAGEDEPENDS += "zaurus-installer" +IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ + files/device_table_add-scsi.txt \ + files/device_table_add-loop.txt \ + " ######### # xserver (FIXME: xserver-xorg is in testing on spitz) @@ -55,24 +58,16 @@ PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" # kernel ######## -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" - -# Starting with 2.6.32 linux-rp is deprecated for some models -#PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDER_virtual/kernel_collie = "linux" -PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" - -# udev-141 is the latest version that works with linux-2.6.26-RP -PREFERRED_PROVIDER_udev-compat_akita = "udev-compat141" -PREFERRED_PROVIDER_udev-compat_spitz = "udev-compat141" -PREFERRED_PROVIDER_udev-compat_c7x0 = "udev-compat141" -PREFERRED_PROVIDER_udev-compat_poodle = "udev-compat141" +PREFERRED_PROVIDER_virtual/kernel = "linux" # Default bootloader expects "zImage", use "uImage" for u-boot # Note: kexecboot can boot both kind of images ZAURUS_KERNEL_IMAGETYPE ?= "zImage" KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" +# sane defaults for devices with only 32Mb RAM (see man xz) +XZ_COMPRESSION_LEVEL = "-e -7" + # kernel bootlogo LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' @@ -87,26 +82,23 @@ SERIAL_CONSOLE_collie = "115200 ttySA0" PCMCIA_MANAGER ?= "pcmciautils" +CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_c7x0 = "console=ttyS0,115200n8 console=tty1" +CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1" +CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1" + MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" -MACHINE_FEATURES_append_akita = " usbhost " -MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_akita = " usbhost" +MACHINE_FEATURES_append_spitz = " usbhost" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" -# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel -# Fixme ? module-snd for collie -MACHINE_EXTRA_RRECOMMENDS_collie = "" -MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -# For tosa: OHCI suspend/resume fixup -# wlan-ng is now in kernel (2.6.29) -# Fixme ? module-snd for tosa -MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" - +# Still actual? OHCI suspend/resume fixup +# MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" ################################## # build kexecboot kernel while @@ -114,3 +106,25 @@ MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" ################################## require conf/machine/include/initramfs-kexecboot.inc + +# FIXME +# blindly import from linux-rp.inc (2.6.2x) +# +module_autoload_pxaficp_ir = "pxaficp_ir" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_pcmcia_core = "pcmcia_core" +module_autoload_pxa2xx_cs = "pxa2xx_cs" +module_autoload_ohci-hcd_tosa = "ohci-hcd" +module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" +module_autoload_snd-soc-spitz_akita = "snd-soc-spitz" +module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz" +module_autoload_snd-soc-poodle_poodle = "snd-soc-poodle" +module_autoload_locomo-spi_collie = "locomo-spi" +module_autoload_mmc_block_collie = "mmc_block" +module_autoload_mmc_spi = "mmc-spi" +module_autoload_locomokbd_collie = "locomokbd" +module_autoload_sa1100-cs_collie = "sa1100_cs" +module_autoload_collie-ts_collie = "collie-ts" +module_autoload_leds-locomo_collie = "leds-locomo" +module_autoload_power_collie = "power" +# Fixme ? module-snd for tosa diff --git a/conf/machine/mx28evk.conf b/conf/machine/mx28evk.conf new file mode 100644 index 0000000000..823b5026db --- /dev/null +++ b/conf/machine/mx28evk.conf @@ -0,0 +1,23 @@ +#@Name: Freescale i.MX28 Evaluation Kit +#@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit +#@Homepage: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MCIMX28EVKJ&fr=g + +UBOOT_MACHINE = "mx28_evk_config" + +PREFERRED_PROVIDER_virtual/kernel = "linux-imx" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 usbhost usbgadget screen" + +MACHINE_GUI_CLASS = "bigscreen" +LOGO_SIZE = "vga" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +require conf/machine/include/imx28.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyAM0" + +ROOT_FLASH_SIZE = "128" + diff --git a/conf/machine/nexusone.conf b/conf/machine/nexusone.conf new file mode 100644 index 0000000000..83422302a1 --- /dev/null +++ b/conf/machine/nexusone.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: Nexus One +#@DESCRIPTION: Machine configuration for Nexus One smartphone + +require conf/machine/include/htc-qsd8.inc + +XSERVER = " \ + xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-evdev \ + xf86-video-fbdev \ +" + +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "800" + +PREFERRED_PROVIDER_virtual/kernel = "linux-nexusone" + +KERNEL_IMAGETYPE = "zImage" + +MACHINE_FEATURES = "kernel26 mmc mmcroot screen touchscreen usbgadget wifi phone" diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 39409afc81..4b4009261c 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -6,6 +6,7 @@ TARGET_ARCH = "arm" SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc +require conf/machine/include/initramfs-kexecboot.inc PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -48,6 +49,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-twl4030-pwrbutton \ kernel-module-wl1251-spi \ kernel-module-ubifs \ + kernel-module-af-packet \ + kernel-module-snd-soc-rx51 \ + kernel-module-snd-soc-tlv320aic3x \ + kernel-module-snd-soc-omap \ + kernel-module-musb-hdrc \ + kernel-module-twl4030-usb \ + kernel-module-bq27x00-battery \ + kernel-module-cmt-speech \ + kernel-module-hsi-char \ " GUI_MACHINE_CLASS = "bigscreen" @@ -55,6 +65,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE_pn-linux-kexecboot = "zImage" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" @@ -83,16 +94,28 @@ UBINIZE_ARGS = "-m 2048 -p 131072 -s 2048 -O 2048" IMAGE_FSTYPES ?= "jffs2 tar.gz" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "linux-nokia900-meego" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat keyboard" -module_autoload_g_ether = "g_ether" - +module_autoload_rtc-twl = "rtc-twl" +module_autoload_g-nokia = "g-nokia" +module_autoload_musb-hdrc = "musb-hdrc" +module_autoload_twl4030-usb = "twl4030-usb" +module_autoload_omap-ssi = "omap-ssi" +module_autoload_isp1704-charger = "isp1704-charger" +module_autoload_bq27x00-battery = "bq27x00-battery" +module_autoload_af-packet = "af-packet" +module_autoload_snd-soc-rx51 = "snd-soc-rx51" +module_autoload_snd-soc-tlv320aic3x = "snd-soc-tlv320aic3x" +module_autoload_wl1251-spi = "wl1251-spi" +module_autoload_snd-soc-omap = "snd-soc-omap" +module_autoload_cmt-speech = "cmt-speech" +module_autoload_hsi-char = "hsi-char" # Copied from include/omap3.inc (as we do not use linux-omap recipes): # # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r58" +MACHINE_KERNEL_PR = "r65" diff --git a/conf/machine/nonworking/.mtn2git_empty b/conf/machine/nonworking/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/conf/machine/nonworking/.mtn2git_empty +++ /dev/null diff --git a/conf/machine/er0100.conf b/conf/machine/nonworking/er0100.conf index f20d6ae8e3..f20d6ae8e3 100644 --- a/conf/machine/er0100.conf +++ b/conf/machine/nonworking/er0100.conf diff --git a/conf/machine/geodegx.conf b/conf/machine/nonworking/geodegx.conf index 0ec6782076..0ec6782076 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/nonworking/geodegx.conf diff --git a/conf/machine/hx2000.conf b/conf/machine/nonworking/hx2000.conf index c9957e2b2f..c9957e2b2f 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/nonworking/hx2000.conf diff --git a/conf/machine/mnci.conf b/conf/machine/nonworking/mnci.conf index 9f6a0d8385..9f6a0d8385 100644 --- a/conf/machine/mnci.conf +++ b/conf/machine/nonworking/mnci.conf diff --git a/conf/machine/mtx-1.conf b/conf/machine/nonworking/mtx-1.conf index 7db19696fa..7db19696fa 100644 --- a/conf/machine/mtx-1.conf +++ b/conf/machine/nonworking/mtx-1.conf diff --git a/conf/machine/mtx-2.conf b/conf/machine/nonworking/mtx-2.conf index 67cc5bf185..67cc5bf185 100644 --- a/conf/machine/mtx-2.conf +++ b/conf/machine/nonworking/mtx-2.conf diff --git a/conf/machine/wrt54.conf b/conf/machine/nonworking/wrt54.conf index 1b07df2666..1b07df2666 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/nonworking/wrt54.conf diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index d952ad75d9..d14b0fdd9a 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -21,7 +21,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER ?= "xserver-xorg \ - xf86-input-tslib \ xf86-input-evdev \ xf86-video-fbdev \ xf86-input-keyboard \ diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index bd103ce55e..033190cce1 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -23,7 +23,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER ?= "xserver-xorg \ - xf86-input-tslib \ xf86-input-evdev \ xf86-video-glamo \ xf86-input-keyboard \ @@ -37,6 +36,8 @@ READER_UI = "gtk" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-s3cmci \ + kernel-module-snd-soc-s3c24xx \ + kernel-module-snd-soc-wm8753 \ kernel-module-snd-soc-neo1973-wm8753 \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-g-ether \ @@ -87,6 +88,8 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native qi qi-ubi" module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" #2.6.31 is using the same name as it was in gta01 module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +module_autoload_snd-soc-wm8753 = "snd-soc-wm8753" +module_autoload_snd-soc-s3c24xx = "snd-soc-s3c24xx" module_autoload_ar6000 = "ar6000" module_autoload_btusb = "btusb" diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf index 88389250f2..1bdf4fd19a 100644 --- a/conf/machine/p2020rdb.conf +++ b/conf/machine/p2020rdb.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "powerpc" -PREFERRED_PROVIDER_virtual/kernel ?= "linux" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-powerpc-fsl" MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" diff --git a/conf/machine/picosam9.conf b/conf/machine/picosam9.conf new file mode 100644 index 0000000000..8e727003e5 --- /dev/null +++ b/conf/machine/picosam9.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@Name: pico-SAM9G45 (http://www.mini-box.com/pico-SAM9G45-X) +#@DESCRIPTION: Machine configuration for the picoSAM9G45 board with a at91sam9g45 processor + +# More information can be found here: +# http://arm.mini-box.com/index.php?title=Compiling_Angstrom_for_pico-SAM9G45 +# Images tested: base-image and x11-image + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "picosam9" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +MACHINE_FEATURES += "usbhost kernel26 apm vfat screen touchscreen ethernet wifi bluetooth" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index db7a7809a7..d1bcb154b2 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "22" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index 238493a16e..d58e3df3d7 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -2,8 +2,8 @@ #@NAME: qemu x86 Emulator setup #@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation -require conf/machine/include/qemu.inc require conf/machine/i686-generic.conf +require conf/machine/include/qemu.inc MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 0b5331eb44..4019bca4fb 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc MACHINE_FEATURES += "iwmmxt" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index fd1e477465..ab12b8bd56 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-6000 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device -require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc ROOT_FLASH_SIZE = "28" diff --git a/conf/machine/vmx25.conf b/conf/machine/vmx25.conf index 2d82dd2ae4..e8adfd5baa 100644 --- a/conf/machine/vmx25.conf +++ b/conf/machine/vmx25.conf @@ -31,3 +31,9 @@ require conf/machine/include/tune-arm926ejs.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \ + --pad ; sumtool --eraseblock=0x20000 -n \ + --littleendian --pad \ + -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" diff --git a/conf/machine/vulcano-g20.conf b/conf/machine/vulcano-g20.conf new file mode 100644 index 0000000000..98072f5da5 --- /dev/null +++ b/conf/machine/vulcano-g20.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@Name: Metodo2 Vulcano G20 Board +#@DESCRIPTION: Machine configuration for Metodo2 VulcanoG20 module with AT91SAM9G20 + +include conf/machine/include/at91-2.6.30.inc + +#PREFERRED_VERSION_linux = "2.6.30" + +# Has linux config file in OpenEmbedded +#LINUX26_DEFCONFIG = "at91sam9g20ek_defconfig" + +UBOOT_MACHINE = "vulcano-g20_nandflash_config" +#UBOOT_MACHINE = "vulcano-g20_dataflash_cs1_config" +# UBOOT_MACHINE = "vulcano-g20_config" + +AT91BOOTSTRAP_BOARD = "vulcano-g20 vulcano-g20df vulcano-g20nf" + +MACHINE_FEATURES += "usbhost" + +#Vulcano with 64MB NAND +#EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -s 0x200 -n -e 16KiB" diff --git a/conf/machine/warpcomm.conf b/conf/machine/warpcomm.conf new file mode 100644 index 0000000000..01d9c5e360 --- /dev/null +++ b/conf/machine/warpcomm.conf @@ -0,0 +1,21 @@ +#@NAME: ARM based Warpcomm + +MACHINE_EXTRA_RDEPENDS = "u-boot-utils" +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 4096 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 4096" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +require conf/machine/include/kirkwood.inc diff --git a/conf/sanity.conf b/conf/sanity.conf index e9902f6b13..c1ac332552 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -7,5 +7,6 @@ BB_MIN_VERSION = "1.10.2" SANITY_ABIFILE = "${TMPDIR}/abi_version" SANITY_PRFILE = "${TMPDIR}/distro_pr" +SANITY_PERSIST_DATA_FILE = "bb_persist_data.sqlite3" INHERIT += "sanity" |