diff options
Diffstat (limited to 'conf/distro/include')
39 files changed, 1334 insertions, 595 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 1deb85d7f7..6741bae3e1 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -143,8 +143,8 @@ PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 32cfbfb403..18df733fa1 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,46 +1,53 @@ +ANGSTROM_QT_VERSION ?= "4.6.0" + PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" 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_cairo = "1.8.8" +PREFERRED_VERSION_dbus = "1.2.3" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.21.4" -PREFERRED_VERSION_glib-2.0-native = "2.18.0" -PREFERRED_VERSION_glibmm = "2.18.0" -PREFERRED_VERSION_glproto = "1.4.9" +PREFERRED_VERSION_glib-2.0 = "2.22.1" +PREFERRED_VERSION_glib-2.0-native = "2.22.1" +PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.16.4" -PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_gtk+ = "2.18.3" +PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" -PREFERRED_VERSION_libsdl-x11 = "1.2.11" +PREFERRED_VERSION_libsdl-x11 = "1.2.14" PREFERRED_VERSION_libtool = "2.2.6a" PREFERRED_VERSION_libtool-native = "2.2.6a" PREFERRED_VERSION_libtool-cross = "2.2.6a" PREFERRED_VERSION_libtool-sdk = "2.2.6a" -PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.2" +PREFERRED_VERSION_mesa = "7.6" +PREFERRED_VERSION_mesa-dri = "7.6" +PREFERRED_VERSION_mesa-xlib = "7.6" +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.1" -PREFERRED_VERSION_samba = "3.3.0" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" + +PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" -PREFERRED_VERSION_util-macros-native = "1.2.1" -PREFERRED_VERSION_util-macros = "1.2.1" -PREFERRED_VERSION_wpa-supplicant = "0.6.7" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.6.1" # # meta-moblin package SRCREVs diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index e947833453..6a1f93bfb6 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,9 +1,12 @@ # eglibc: require conf/distro/include/eglibc.inc -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" -TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" +TARGET_OS = "linux" + +TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" #TARGET_OS = "linux-gnuspe" @@ -12,7 +15,7 @@ TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', # 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 -fomit-frame-pointer -frename-registers -O2 -ggdb3" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 287bd9bd77..298e250362 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,9 +1,10 @@ # glibc: -require conf/distro/include/glibc.inc +require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS = "linux" +TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #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 @@ -23,5 +24,8 @@ BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g" TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}" +# Disable -Wl,as-needed for now till all the test come back OK +#require conf/distro/include/angstrom-ldflags.inc + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom-ldflags.inc b/conf/distro/include/angstrom-ldflags.inc new file mode 100644 index 0000000000..6c60568798 --- /dev/null +++ b/conf/distro/include/angstrom-ldflags.inc @@ -0,0 +1,26 @@ + +# Set as-need to an intermediate var... +ASNEEDED = "-Wl,--as-needed" + +# ...so we can blacklist it for recipes that break with it +ASNEEDED_pn-console-tools = "" +ASNEEDED_pn-distcc = "" +ASNEEDED_pn-openobex = "" +ASNEEDED_pn-icu = "" +ASNEEDED_pn-xserver-kdrive-xomap = "" +ASNEEDED_pn-minimo = "" +ASNEEDED_pn-pciutils = "" +ASNEEDED_pn-puzzles = "" +ASNEEDED_pn-dialer = "" +ASNEEDED_pn-pulseaudio = "" +ASNEEDED_pn-python = "" +ASNEEDED_pn-libproxy = "" +ASNEEDED_pn-libxsettings-client = "" +ASNEEDED_pn-libmatchbox = "" +ASNEEDED_pn-faac = "" +ASNEEDED_pn-wireless-tools = "" +ASNEEDED_pn-ffmpeg = "" + +# Append it to TARGET_LDLFLAGS +TARGET_LDFLAGS += "${ASNEEDED}" + diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc index 3dbb175f93..e060bb1ccf 100644 --- a/conf/distro/include/angstrom-package-deb.inc +++ b/conf/distro/include/angstrom-package-deb.inc @@ -1,4 +1,4 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index a33a4ad2b4..14206bda2d 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg} diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index a60952ff06..4ca68389f7 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -9,7 +9,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index 019f814b8f..92b8d8ba7e 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -6,7 +6,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #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 diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 669c8ada3c..8bbd28ee93 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}" TARGET_VENDOR = "-angstrom" -# Add FEED_ARCH to overrides -OVERRIDES .= ":${FEED_ARCH}" +SOC_FAMILY ?= "Unknown" + +# Add FEED_ARCH and SOC_FAMILY to overrides +OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}" # Put links to sources in deploy/sources to make it easier for people to be GPL compliant INHERIT += "src_distribute_local" @@ -139,15 +141,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}" @@ -202,7 +195,8 @@ SEPPUKU_COMPONENT = "org.openembedded.dev" OESTATS_SERVER ?= "tinderbox.openembedded.org" - - # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci" +DISTRO_FEATURES = "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/angstromoabi.inc b/conf/distro/include/angstromoabi.inc deleted file mode 100644 index 81ffed71f8..0000000000 --- a/conf/distro/include/angstromoabi.inc +++ /dev/null @@ -1,4 +0,0 @@ -require conf/distro/include/angstrom.inc - -PACKAGE_ARCH = "arm-oabi" -BASE_PACKAGE_ARCH = "arm-oabi" diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index a66a37fdd0..f5c7974d5b 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -2,9 +2,11 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" +SRCREV_pn-fsodatad = "${AUTOREV}" SRCREV_pn-fsodeviced = "${AUTOREV}" SRCREV_pn-fsogsmd = "${AUTOREV}" -SRCREV_pn-fsogpsd = "${AUTOREV}" +SRCREV_pn-fsotdld = "${AUTOREV}" +SRCREV_pn-fsomusicd = "${AUTOREV}" SRCREV_pn-fsonetworkd = "${AUTOREV}" SRCREV_pn-fsotimed = "${AUTOREV}" SRCREV_pn-fsousaged = "${AUTOREV}" @@ -23,15 +25,19 @@ SRCREV_pn-libascenario = "${AUTOREV}" SRCREV_pn-libeflvala = "${AUTOREV}" SRCREV_pn-libfsobasics = "${AUTOREV}" SRCREV_pn-libfsoframework = "${AUTOREV}" +SRCREV_pn-libfsoresource = "${AUTOREV}" SRCREV_pn-libfsotransport = "${AUTOREV}" SRCREV_pn-libframeworkd-glib = "${AUTOREV}" SRCREV_pn-libfso-glib = "${AUTOREV}" +SRCREV_pn-libgee-native = "${AUTOREV}" SRCREV_pn-libgee = "${AUTOREV}" SRCREV_pn-libgsm0710 = "${AUTOREV}" SRCREV_pn-libgsm0710mux = "${AUTOREV}" +SRCREV_pn-libpersistence = "${AUTOREV}" SRCREV_pn-mickeydbus = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" SRCREV_pn-misc-vapi = "${AUTOREV}" +SRCREV_pn-msmcommd = "${AUTOREV}" SRCREV_pn-python-pytrc = "${AUTOREV}" SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}" SRCREV_pn-vala-native = "${AUTOREV}" diff --git a/conf/distro/include/glibc-external.inc b/conf/distro/include/glibc-external.inc new file mode 100644 index 0000000000..3ddedb640f --- /dev/null +++ b/conf/distro/include/glibc-external.inc @@ -0,0 +1,21 @@ +# Add glibc to the overrides. +OVERRIDES .= ":libc-glibc" + +# The things glibc can provide. We default to wanting glibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/libintl ?= "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/libc = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_linux-libc-headers ?= "external-toolchain-${TOOLCHAIN_BRAND}" + +# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal +# sane versions there + +OLDEST_KERNEL ?= "2.4.0" + +# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi" +# TARGET_OS here, not on architecture which is 'arm' in both cases +OLDEST_KERNEL_linux-gnueabi ?= "2.6.14" +OLDEST_KERNEL_sparc64 ?= "2.4.21" +OLDEST_KERNEL_ppc64 ?= "2.4.21" diff --git a/conf/distro/include/glibc-internal.inc b/conf/distro/include/glibc-internal.inc new file mode 100644 index 0000000000..d1cbd5339b --- /dev/null +++ b/conf/distro/include/glibc-internal.inc @@ -0,0 +1,21 @@ +# Add glibc to the overrides. +OVERRIDES .= ":libc-glibc" + +# The things glibc can provide. We default to wanting glibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + +# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal +# sane versions there + +OLDEST_KERNEL ?= "2.4.0" + +# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi" +# TARGET_OS here, not on architecture which is 'arm' in both cases +OLDEST_KERNEL_linux-gnueabi ?= "2.6.14" +OLDEST_KERNEL_sparc64 ?= "2.4.21" +OLDEST_KERNEL_ppc64 ?= "2.4.21" diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index ba8d587241..8b120f2eb2 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: 01-07-2009 +#@VERSION: 11-01-2010 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -14,44 +14,58 @@ PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" 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_cairo = "1.8.8" +PREFERRED_VERSION_dbus = "1.2.3" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.20.0" -PREFERRED_VERSION_glib-2.0-native = "2.18.0" -PREFERRED_VERSION_glibmm = "2.18.0" -PREFERRED_VERSION_glproto = "1.4.9" +PREFERRED_VERSION_glib-2.0 = "2.22.1" +PREFERRED_VERSION_glib-2.0-native = "2.22.1" +PREFERRED_VERSION_glibmm = "2.22.1" +PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.16.0" -PREFERRED_VERSION_gtkmm = "2.14.1" -PREFERRED_VERSION_hal = "0.5.12" +PREFERRED_VERSION_gtk+ = "2.18.3" +PREFERRED_VERSION_gtkmm = "2.18.1" +PREFERRED_VERSION_hal = "0.5.13" 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_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.2" -PREFERRED_VERSION_pango = "1.24.2" -PREFERRED_VERSION_pixman = "0.13.2" +PREFERRED_VERSION_libsdl-x11 = "1.2.14" +PREFERRED_VERSION_libtool = "2.2.6a" +PREFERRED_VERSION_libtool-native = "2.2.6a" +PREFERRED_VERSION_libtool-cross = "2.2.6a" +PREFERRED_VERSION_libtool-sdk = "2.2.6a" +PREFERRED_VERSION_mesa = "7.6" +PREFERRED_VERSION_mesa-dri = "7.6" +PREFERRED_VERSION_mesa-xlib = "7.6" +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165" +PREFERRED_VERSION_pango = "1.24.4" +PREFERRED_VERSION_pixman = "0.16.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_samba = "3.3.0" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" +KAEILOS_QT_VERSION ?= "4.6.0" +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_udev = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" -PREFERRED_VERSION_util-macros-native = "1.2.1" -PREFERRED_VERSION_util-macros = "1.2.1" -PREFERRED_VERSION_wpa-supplicant = "0.6.7" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.6.1" + +# Use latest version available +#PREFERRED_VERSION_util-macros-native = "1.4.1" +#PREFERRED_VERSION_util-macros = "1.4.1" +#PREFERRED_VERSION_xserver-xorg = "1.7.3" +#PREFERRED_VERSION_xf86-video-xgi = "1.5.1" # # meta-moblin package SRCREVs diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc index fc0348da28..ad03976c67 100644 --- a/conf/distro/include/kaeilos.inc +++ b/conf/distro/include/kaeilos.inc @@ -10,17 +10,20 @@ USERDISTRO := "${DISTRO}" DISTRO = "kaeilos" DISTRO_NAME = "KaeilOS" +BUILDNAME = "KaeilOS ${DISTRO_VERSION}" + TARGET_VENDOR = "-kaeilos" # Add FEED_ARCH to overrides OVERRIDES .= ":${FEED_ARCH}" # Put links to sources in deploy/sources to make it easier for people to be GPL compliant -SRC_DIST_LOCAL ?= "symlink" INHERIT += "src_distribute_local" +SRC_DIST_LOCAL ?= "symlink" # Can be "glibc", "eglibc" or "uclibc" -LIBC ?= "glibc" +KAEILOSLIBC ?= "glibc" +LIBC ?= "${KAEILOSLIBC}" PSTAGE_EXTRAPATH = "${LIBC}" CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" @@ -34,8 +37,8 @@ require conf/distro/include/angstrom-${LIBC}.inc # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" -ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" +#ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" +#ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" @@ -72,6 +75,9 @@ INHERIT += "debian" #activate config checker INHERIT += "sanity" +#activate the blacklister +INHERIT += "angstrom" + #make devshell available as task INHERIT += "devshell" @@ -80,13 +86,25 @@ INHERIT += "angstrom-mirrors" #run QA tests on builds and packages and log them INHERIT += "insane" +# INHERIT += "packagehistory" QA_LOG = "1" +#run QA tests on recipes +INHERIT += "recipe_sanity" + +#save statistical info on images +INHERIT += "testlab" + ANGSTROM_PKG_FORMAT ?= "ipk" require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc + # We don't want to keep OABI compat ARM_KEEP_OABI = "0" +# Do keep OABI compat for om-gta01 to keep the gllin binary working +ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1" +ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1" + #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" @@ -95,8 +113,8 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales LOCALE_UTF8_ONLY = "1" -#qemu doesn't like armv6/eabi/vfp -ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" +#qemu doesn't like this fp +ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0" #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" @@ -121,158 +139,11 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" #Set the right arch for the feeds #Alphabetically sorted -FEED_ARCH ?= "${TARGET_ARCH}" +FEED_ARCH ?= "${BASE_PACKAGE_ARCH}" #blackfin machines FEED_ARCH_bfin = "blackfin" -#armv4t machines - -FEED_ARCH_acern30 = "armv4t" -FEED_ARCH_amsdelta = "armv4t" -FEED_ARCH_ep93xx = "armv4t" -FEED_ARCH_eteng500 = "armv4t" -FEED_ARCH_om-gta01 = "armv4t" -FEED_ARCH_om-gta02 = "armv4t" -FEED_ARCH_h1940 = "armv4t" -FEED_ARCH_h6300 = "armv4t" -FEED_ARCH_kb9202 = "armv4t" -FEED_ARCH_ks8695 = "armv4t" -FEED_ARCH_rx1950 = "armv4t" -FEED_ARCH_rx3000 = "armv4t" -FEED_ARCH_sarge-at91 = "armv4t" -FEED_ARCH_smdk2440 = "armv4t" -FEED_ARCH_smdk2443 = "armv4t" - -#armv5t machines - -FEED_ARCH_a1200 = "armv5te" -FEED_ARCH_a780 = "armv5te" -FEED_ARCH_akita = "armv5te" -FEED_ARCH_asus620 = "armv5te" -FEED_ARCH_asus730 = "armv5te" -FEED_ARCH_at91sam9263ek = "armv5te" -FEED_ARCH_aximx50 = "armv5te" -FEED_ARCH_aximx50v = "armv5te" -FEED_ARCH_c7x0 = "armv5te" -FEED_ARCH_compulab-pxa270 = "armv5te" -FEED_ARCH_davinci-dvevm = "armv5te" -FEED_ARCH_devkitidp-pxa255 = "armv5te" -FEED_ARCH_e680 = "armv5te" -FEED_ARCH_er0100 = "armv5te" -FEED_ARCH_gumstix = "armv5te" -FEED_ARCH_gumstix-verdex = "armv5te" -FEED_ARCH_gumstix-connex = "armv5te" -FEED_ARCH_h1910 = "armv5te" -FEED_ARCH_h2200 = "armv5te" -FEED_ARCH_h3900 = "armv5te" -FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5000 = "armv5te" -FEED_ARCH_htcalpine = "armv5te" -FEED_ARCH_htcapache = "armv5te" -FEED_ARCH_htcblueangel = "armv5te" -FEED_ARCH_htchimalaya = "armv5te" -FEED_ARCH_htcsable = "armv5te" -FEED_ARCH_htctornado = "armv5te" -FEED_ARCH_htcuniversal = "armv5te" -FEED_ARCH_hx2000 = "armv5te" -FEED_ARCH_hx4700 = "armv5te" -FEED_ARCH_ixp4xxle = "armv5te" -FEED_ARCH_logicpd-pxa270 = "armv5te" -FEED_ARCH_looxc550 = "armv5te" -FEED_ARCH_lsarm = "armv5te" -FEED_ARCH_magician = "armv5te" -FEED_ARCH_mainstone = "armv5te" -FEED_ARCH_mnci = "armv5te" -FEED_ARCH_mtx-3 = "armv5te" -FEED_ARCH_mx21ads = "armv5te" -FEED_ARCH_n2100 = "armv5te" -FEED_ARCH_navman-icn330 = "armv5te" -FEED_ARCH_netbook-pro = "armv5te" -FEED_ARCH_nokia770 = "armv5te" -FEED_ARCH_rokre2 = "armv5te" -FEED_ARCH_nslu2le = "armv5te" -FEED_ARCH_omap1510inn = "armv5te" -FEED_ARCH_omap1610h2 = "armv5te" -FEED_ARCH_omap1710h3 = "armv5te" -FEED_ARCH_omap5912osk = "armv5te" -FEED_ARCH_palmld = "armv5te" -FEED_ARCH_palmt650 = "armv5te" -FEED_ARCH_palmt680 = "armv5te" -FEED_ARCH_palmtc = "armv5te" -FEED_ARCH_palmtt = "armv5te" -FEED_ARCH_palmtt3 = "armv5te" -FEED_ARCH_palmtt5 = "armv5te" -FEED_ARCH_palmtx = "armv5te" -FEED_ARCH_palmz31 = "armv5te" -FEED_ARCH_palmz71 = "armv5te" -FEED_ARCH_palmz72 = "armv5te" -FEED_ARCH_poodle = "armv5te"</ |