From: Kirtika Ruchandani Date: Tue, 21 Jul 2009 19:16:30 +0000 (+0530) Subject: Adding my conf files to select the correct versions of gtk/glib X-Git-Url: http://git.maemo.org/git/?p=oespirit1;a=commitdiff_plain;h=be0d174716c747dfcc0e0ecc3056422da3d0c526 Adding my conf files to select the correct versions of gtk/glib --- diff --git a/angstrom-2008-preferred-versions.inc b/angstrom-2008-preferred-versions.inc new file mode 100644 index 0000000..9f5241e --- /dev/null +++ b/angstrom-2008-preferred-versions.inc @@ -0,0 +1,26 @@ +PREFERRED_VERSION_automake-native = "1.10.2" +PREFERRED_VERSION_busybox = "1.13.2" +PREFERRED_VERSION_cairo = "1.8.0" +PREFERRED_VERSION_dbus = "1.2.1" +PREFERRED_VERSION_dropbear = "0.51" +PREFERRED_VERSION_fontconfig = "2.6.0" +PREFERRED_VERSION_glibmm = "2.18.0" +PREFERRED_VERSION_glproto = "1.4.9" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_libgemwidget = "1.0" +PREFERRED_VERSION_libgpephone = "0.4" +PREFERRED_VERSION_libsdl-x11 = "1.2.11" +PREFERRED_VERSION_libtool = "2.2.4" +PREFERRED_VERSION_libtool-native = "2.2.4" +PREFERRED_VERSION_libtool-cross = "2.2.4" +PREFERRED_VERSION_libtool-sdk = "2.2.4" +PREFERRED_VERSION_pango = "1.22.0" +PREFERRED_VERSION_pixman = "0.13.2" +PREFERRED_VERSION_pkgconfig = "0.23" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_pulseaudio = "0.9.10" +PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" +PREFERRED_VERSION_udev = "124" +PREFERRED_VERSION_wpa-supplicant = "0.6.7" +PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" diff --git a/angstrom-2008.1.conf b/angstrom-2008.1.conf new file mode 100644 index 0000000..f41b0c5 --- /dev/null +++ b/angstrom-2008.1.conf @@ -0,0 +1,261 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Koen Kooi +## 03/06/09 23:36:58 Kirtika B Ruchandani +# Tweaked angstrom.conf to get a decent conf for maemo software stack +# on mamona base +#@-------------------------------------------------------------------- + +# This is a aimed to be the next stable angstrom release. +# If you want something stable *right now*, use angstrom-2007.1 +# with the org.openembedded.angstrom-2007.12-stable branch +# +# Use this at your own risk, we welcome bugreports filed at +# http://bugs.openembedded.net +# +# Again, in doubt, use DISTRO="angstrom-2007.1" with the +# org.openembedded.angstrom-2007.12-stable branch + +#DISTRO_VERSION = "2009.X" +DISTRO_VERSION = "2009.X-test-${DATE}" +DISTRO_REVISION = "1" +DISTRO_PR = ".1" + +#build staging from packages +INHERIT += "packaged-staging" + +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc +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" + +# 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/2008/${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/ \ + " + + +#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 +PREFERRED_VERSION_linux-libc-headers = "2.6.23" + +#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. +PREFERRED_VERSION_glibc ?= "2.6.1" +PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_uclibc ?= "0.9.30" +PREFERRED_VERSION_uclibc-initial ?= "0.9.30" + +# Preferred provider for virtual/psplash +# This enforces a specific brand to be used, in our case the angstrom +# one. In case you want to change the logo or something like that we +# suggest you to create another recipe (e.g: psplash-) for that +# and add that into your image. +# You can also opt to change or override this line, but that isn't +# needed because psplash is using update-alternatives. +PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" + +PREFERRED_PROVIDER_avahi = "avahi" + +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" + +#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" + +ANGSTROM_GCC_VERSION_486sx = "4.3.3" +ANGSTROM_GCC_VERSION_armv7a = "4.3.3" + +# 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" + +#avr32 only has support for gcc 4.2.2 +ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" + +#Everybody else can just use this: +ANGSTROM_GCC_VERSION ?= "4.2.4" + +#2.19.51.0.3 +ANGSTROM_BINUTILS_VERSION ?= "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}" + +#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom +require conf/distro/include/preferred-e-versions.inc +require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +require conf/distro/include/preferred-xorg-versions-X11R7.4.inc + +#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" + +# Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines +PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" +PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" +PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" + +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" + +# Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" +PREFERRED_PROVIDER_esound ?= "pulseaudio" +PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_tslib-conf ?= "tslib" +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_ntp ?= "ntp" +PREFERRED_PROVIDER_hotplug = "udev" +PREFERRED_PROVIDER_libxss = "libxss" +PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" +PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils = "bluez4" + +# we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf ?= "gtk+" + + +#Silence a warning during parsing +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} +ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +require conf/distro/include/angstrom${ARM_ABI}.inc + + + +# If we're using an .ipk based rootfs, we want to have opkg-nogpg 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-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}" + +# 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" + + +# Gtk+ with maemo changes +PREFERRED_PROVIDER_gtk+ = "gtk+" +PREFERRED_VERSION_gtk+ = "2.12.12" +#Maemo has changes in glib too +PREFERRED_PROVIDER_glib-2.0 = "glib-2.0" +PREFERRED_VERSION_glib-2.0 = "2.18.1"