diff options
Diffstat (limited to 'conf/distro')
42 files changed, 1576 insertions, 550 deletions
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 6e7adda029..6d3ad7bd6b 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe" DISTRO_NAME = "AmsDelta Linux" DISTRO_VERSION = "unstable-${DATE}" -require conf/distro/ansgstrom-2007.1.conf +require conf/distro/angstrom-2007.1.conf DISTRO_TYPE = "debug" diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2007.1-legacy.conf index a22a35d204..298c8589e3 100644 --- a/conf/distro/angstrom-2007.1-legacy.conf +++ b/conf/distro/angstrom-2007.1-legacy.conf @@ -4,6 +4,6 @@ # * no sysfs # * no EABI for ARM -require conf/distro/angstrom-2007.1-oabi.conf +require conf/distro/angstrom-2007.1.conf # We'll have to fill this in as we go. diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf deleted file mode 100644 index d2e59f85a4..0000000000 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ /dev/null @@ -1,24 +0,0 @@ -require conf/distro/angstrom-2007.1.conf - -#this is a special version of angstrom for armv4 based machines that can't do EABI -#see http://wiki.debian.org/ArmEabiPort for details on that - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" - -#only glibc based builds are supported ATM -TARGET_OS = "linux" - -PACKAGE_ARCH = "arm-oabi" -PACKAGE_EXTRA_ARCHS = "arm-oabi" - -PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh13" - -FEED_ARCH_collie = "arm-oabi" -FEED_ARCH_h3600 = "arm-oabi" -FEED_ARCH_h3800 = "arm-oabi" -FEED_ARCH_simpad = "arm-oabi" - - - - - diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index d6766bedbc..282b0532b9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,13 +6,15 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2007.3" +#DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "35" +DISTRO_REVISION = "46" -require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc +#Images built can have to modes: +# 'debug': empty rootpassword, strace and gdb included +# 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -35,28 +37,39 @@ FEED_ARCH ?= "${TARGET_ARCH}" FEED_ARCH_ep93xx = "armv4t" FEED_ARCH_h6300 = "armv4t" +FEED_ARCH_fic-gta01 = "armv4t" +FEED_ARCH_fic-gta02 = "armv4t" +FEED_ARCH_fic-hxd8 = "armv4t" #armv5t machines FEED_ARCH_a780 = "armv5te" +FEED_ARCH_aximx50 = "armv5te" FEED_ARCH_akita = "armv5te" +FEED_ARCH_at91sam9263ek = "armv5te" FEED_ARCH_c7x0 = "armv5te" +FEED_ARCH_compulab-pxa270 = "armv5te" FEED_ARCH_h2200 = "armv5te" FEED_ARCH_h3900 = "armv5te" FEED_ARCH_h4000 = "armv5te" FEED_ARCH_h5000 = "armv5te" +FEED_ARCH_htctornado = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" FEED_ARCH_ixp4xx = "armv5te" +FEED_ARCH_ixp4xxle = "armv5te" FEED_ARCH_magician = "armv5te" FEED_ARCH_netbook-pro = "armv5te" FEED_ARCH_nokia770 = "armv5te" +FEED_ARCH_omap5912osk = "armv5te" FEED_ARCH_poodle = "armv5te" FEED_ARCH_spitz = "armv5te" FEED_ARCH_tosa = "armv5te" +FEED_ARCH_ixp4xxbe = "armv5teb" + #i586 machines FEED_ARCH_epia = "i586" @@ -69,130 +82,128 @@ FEED_ARCH_progear = "i686" FEED_ARCH_efika = "ppc603e" +#strongarm machines, no EABI + +FEED_ARCH_collie = "arm-oabi" +FEED_ARCH_h3600 = "arm-oabi" +FEED_ARCH_h3800 = "arm-oabi" +FEED_ARCH_simpad = "arm-oabi" +FEED_ARCH_htcwallaby = "arm-oabi" + +#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" + FEED_URIS += " \ no-arch##${ANGSTROM_URI}/unstable/feed/all \ base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ + gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" - -# We will lock down a SRCDATE when we go into release mode -#SRCDATE = "20070303" - -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" -PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" -PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" - -PREFERRED_VERSION_file = "4.18" -PREFERRED_VERSION_file_native = "4.18" - -SRCDATE_gconf-dbus = "20060719" -SRCDATE_gnome-vfs-dbus = "20060803" - -CVS_TARBALL_STASH = "\ +#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/ \ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ " -# GPE -require conf/distro/include/preferred-gpe-versions-2.8.inc - -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" -PREFERRED_PROVIDER_esound ?= "pulseaudio" +# We will lock down a SRCDATE when we go into release mode +#SRCDATE = "20070703" -PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.0" -PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.0" +#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" -#work around a segfault in gcc for armv4t -PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" -PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" +#Preferred version for the kernel on various machines +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12" +RDEPENDS_kernel-base_hx4700 = "" +RDEPENDS_kernel-base_htcuniversal = "" -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +# Needed for crappy ipaqs with broken hostap in the kernel +PREFERRED_VERSION_hostap-modules ?= "0.4.7" +PREFERRED_VERSION_hostap-utils ?= "0.4.7" -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_gtk+ = "2.10.9" +PREFERRED_VERSION_file = "4.18" +PREFERRED_VERSION_file_native = "4.18" -#zap extra stuff taking place in $MACHINE.conf -GPE_EXTRA_INSTALL = "" +PREFERRED_VERSION_fontconfig = "2.4.1" +PREFERRED_VERSION_freetype = "2.3.4" +PREFERRED_VERSION_freetype-native = "2.2.1" +PREFERRED_VERSION_cairo = "1.4.10" +PREFERRED_VERSION_glib-2.0 = "2.12.12" +PREFERRED_VERSION_pango = "1.16.4" +PREFERRED_VERSION_atk = "1.10.3" +PREFERRED_VERSION_gtk+ = "2.10.14" +# newer poppler cvs breaks some apps, fix until popper 6 and apps +# catch up with api changes +# PREFERRED_VERSION_poppler = "0.5.4" -# E -require conf/distro/include/preferred-e-versions.inc +# older gtk-webcore releases don't work on ARM/EABI +# We need to switch to a fixed SRCDATE or release as soon as possible +PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" +PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" +PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" +PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" +PREFERRED_VERSION_libxrandr ?= "1.2.1" +PREFERRED_VERSION_xrandr ?= "1.2.0" +PREFERRED_VERSION_randrproto ?= "1.2.1" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_VERSION_libgnomeui = "2.18.1" +PREFERRED_VERSION_prismstumbler = "0.7.3" -# Virtuals: -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +#use EABI ready toolchain +PREFERRED_VERSION_gcc ?= "4.1.2" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -# Others: -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -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" - -#NPTL stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" - - -#shouldn't that be uclibc-initial???? -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" - -#use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" - -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_ixp4xx ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" +PREFERRED_VERSION_avr32-gcc = "4.1.2" +PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" + +PREFERRED_VERSION_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" + +#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.20" +PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21" +#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_uclibc ?= "0.9.29" +PREFERRED_VERSION_uclibc-initial ?= "0.9.29" + +#there's is no avr32 patch for 0.9.29 +PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -209,32 +220,83 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" # Busybox <1.1.0 doesn't have EABI support PREFERRED_VERSION_busybox = "1.2.1" -PCMCIA_MANAGER = "pcmciautils" - PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.71" +PREFERRED_VERSION_dbus-glib ?= "0.72" -PREFERRED_VERSION_gstreamer ?= "0.10.11" +PREFERRED_VERSION_wpa-supplicant = "0.5.5" -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" -PREFERRED_VERSION_hostap-modules ?= "0.4.7" -PREFERRED_VERSION_hostap-utils ?= "0.4.7" -PREFERRED_VERSION_wpa-supplicant = "0.5.5" +#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom +require conf/distro/include/preferred-gpe-versions-2.8.inc +require conf/distro/include/preferred-e-versions.inc +require conf/distro/include/preferred-xorg-versions.inc -#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad +# Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-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" +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/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -# add altboot to compatible models, will be replaced with angstrom-bootmanager -#EXTRA_STUFF_append_c7x0 = "altboot" -#EXTRA_STUFF_append_akita = "altboot" -#EXTRA_STUFF_append_spitz = "altboot" -#EXTRA_STUFF_append_poodle = "altboot" -#EXTRA_STUFF_append_tosa = "altboot" +# Others: +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" + +# 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+" + + +#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 # do some task-base stuff here @@ -247,15 +309,21 @@ EXTRA_STUFF ?= "" # Angstrom want to ship some extra stuff. This should be moved into task-base eventually +# contains ipkg specific stuff as well :( DISTRO_EXTRA_RDEPENDS += "\ - update-modules module-init-tools modutils-initscripts \ - sysvinit initscripts sysvinit-pidof \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ - netbase dropbear \ + update-modules \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ + avahi-daemon \ + avahi-autoipd \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ " +DISTRO_EXTRA_RRECOMMENDS += " \ + kernel-module-vfat \ + kernel-module-ext2 \ + kernel-module-af-packet \ + " diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf new file mode 100644 index 0000000000..7fc656fb5e --- /dev/null +++ b/conf/distro/angstrom-2008.1.conf @@ -0,0 +1,36 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Angstrom <http://www.angstrom-distribution.org> +#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> +#@-------------------------------------------------------------------- + +# This is a testbed for unstable and/or untested things, while angstrom-2007.1 +# is aiming for stability and a release. +# Use this at your own risk, we welcome bugreports filed at +# http://bugs.openembedded.org +# In doubt, use DISTRO="angstrom-2007.1" + +require conf/distro/angstrom-2007.1.conf + +#DISTRO_VERSION = "2008.1" +DISTRO_VERSION = "2008.1-test-${DATE}" +DISTRO_REVISION = "0" + +PREFERRED_VERSION_gcc ?= "4.2.1" +PREFERRED_VERSION_gcc-cross ?= "4.2.1" + +PREFERRED_VERSION_binutils ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12" + +#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.22" + +#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. +PREFERRED_VERSION_glibc ?= "2.6" +PREFERRED_VERSION_glibc-intermediate ?= "2.6" +PREFERRED_VERSION_glibc-initial ?= "2.6" + + diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf deleted file mode 100644 index 59123fd6b5..0000000000 --- a/conf/distro/debianslug.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Distribution -#@NAME: DebianSlug -#@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2 - -DISTRO_NAME = "DebianSlug" -IMAGE_BASENAME = "debianslug" -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux" - -require conf/distro/slugos.conf diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf deleted file mode 100644 index 2b0c745bde..0000000000 --- a/conf/distro/familiar-unstable.conf +++ /dev/null @@ -1 +0,0 @@ -WARNING:="${@bb.fatal('\n*\n*\n* Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n If you want to produce Familiar Linux compatible packages,\n please use the Familiar Linux fork of OpenEmbedded.\n Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n probably works well enough with your MACHINE configuration.\n*\n*\n')}" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf deleted file mode 100644 index 2b0c745bde..0000000000 --- a/conf/distro/familiar.conf +++ /dev/null @@ -1 +0,0 @@ -WARNING:="${@bb.fatal('\n*\n*\n* Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n If you want to produce Familiar Linux compatible packages,\n please use the Familiar Linux fork of OpenEmbedded.\n Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n probably works well enough with your MACHINE configuration.\n*\n*\n')}" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf new file mode 100644 index 0000000000..234c92f62a --- /dev/null +++ b/conf/distro/foonas.conf @@ -0,0 +1,67 @@ + +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: foonas <http://www.foonas.org> +#@DESCRIPTION: A nas-centric distribution +#@MAINTAINER: Øyvind Repvik <repvik@foonas.org> +#@-------------------------------------------------------------------- + +FOONAS_MODE ?= "glibc" +ANGSTROM_MODE = ${FOONAS_MODE} +require conf/distro/angstrom-2007.1.conf + +DISTRO = "foonas" +DISTRO_NAME = "foonas" +DISTRO_VERSION = "1.0-dev" +DISTRO_REVISION = "1" +DISTRO_TYPE = "debug" + +DISTRO_FEATURES = "uboot redboot" +DISTRO_FEATURES_n2100 += "raid" +DISTRO_FEATURES_storcenter += "raid" +DISTRO_FEATURES_lsppchd += "raid" +DISTRO_FEATURES_lsppchg += "raid" +DISTRO_FEATURES_lsarm += "raid" + +# This isn't actually in OE yet +#DISTRO_EXTRA_RDEPENDS = "openlink-machine" + +ENABLE_BINARY_LOCALE_GENERATION = "0" +HOTPLUG = "udev" + +# No room for debug apps on an NSLU2. +DEBUG_APPS = "" + +FEED_URIS = "foonas##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/" + +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*" +IMAGE_POSTPROCESS_COMMAND += "${MACHINE}_pack_image;" +IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" + +require conf/distro/include/sane-srcdates.inc +PREFERRED_VERSION_openlink = "svn" +PREFERRED_VERSION_dtc = "20070216" +PREFERRED_VERSION_dtc-native = "20070216" +PREFERRED_VERSION_udev = "097" + +# Various defines for QNAP Turbostation +#FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ +# kernel-module-usb-storage" +#FOONAS_SUPPORT_turbostation += "uboot-utils" +#BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" +# +# Various defines for Linkstations +#FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ +# kernel-module-raid0 kernel-module-raid456 \ +# kernel-module-multipath" +#FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +#FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +#FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} +# +#FOONAS_KERNEL_storcenter = "kernel-module-dummy \ +# kernel-module-af-packet " + diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 17d7d657b1..a9d667372f 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -25,7 +25,7 @@ INHERIT += "debian multimachine" # Packaging and output format # INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" +IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2" # # Kernel diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc new file mode 100644 index 0000000000..dc3929c3a7 --- /dev/null +++ b/conf/distro/include/angstrom-eglibc.inc @@ -0,0 +1,32 @@ +# eglibc: +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" +PREFERRED_PROVIDER_virtual/libc ?= "eglibc" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" + + + +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']]}" + +#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 +# perl has some problems, see http://bugs.openembedded.org/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 -Os" +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" +FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION_pn-perl = "-O1" +BUILD_OPTIMIZATION_sparc = "-O2" + +CXXFLAGS += "-fvisibility-inlines-hidden" + diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 9b288e8e0b..957042d7e4 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +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']]}" #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-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 9c3274e58f..59d40957d5 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -5,8 +5,10 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +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 = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" #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 a4e4c6d4ae..5522a12728 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -6,9 +6,8 @@ DISTRO = "angstrom" DISTRO_NAME = "Angstrom" TARGET_VENDOR = "-angstrom" -MACHINE_TASK_PROVIDER = "task-base" -# Can be "glibc" and "uclibc" +# Can be "glibc", "eglibc" or "uclibc" ANGSTROM_MODE ?= "glibc" DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" @@ -38,7 +37,7 @@ TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc new file mode 100644 index 0000000000..bb7bc45fbd --- /dev/null +++ b/conf/distro/include/angstromoabi.inc @@ -0,0 +1,4 @@ +require conf/distro/include/angstrom.inc + +PACKAGE_ARCH = "arm-oabi" + diff --git a/conf/distro/include/openmoko-srcdate-now.inc b/conf/distro/include/openmoko-srcdate-now.inc new file mode 100644 index 0000000000..7ca0768819 --- /dev/null +++ b/conf/distro/include/openmoko-srcdate-now.inc @@ -0,0 +1,18 @@ +# Warning! Builds unupgradable packages! + +# OpenMoko +SRCDATE_libgsmd ?= "now" +SRCDATE_libmokogsmd2 ?= "now" +SRCDATE_libmokoui2 ?= "now" +SRCDATE_libmokojournal2 ?= "now" +SRCDATE_libmokopanelui2 ?= "now" +SRCDATE_openmoko-today2 ?= "now" +SRCDATE_openmoko-dialer2 ?= "now" +SRCDATE_openmoko-contacts2 ?= "now" + +SRCDATE_openmoko-panel-battery ?= "now" +SRCDATE_openmoko-panel-clock ?= "now" +SRCDATE_openmoko-panel-gsm ?= "now" +SRCDATE_openmoko-panel-usb ?= "now" +SRCDATE_openmoko-panel-bt ?= "now" +SRCDATE_openmoko-panel-gps ?= "now" diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 168d9bb6a2..7c3c4a8f41 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -1,7 +1,7 @@ # # Header # -DISTRO_NAME = "OpenMoKo" +DISTRO_NAME = "OpenMoko" # # Naming schemes @@ -46,7 +46,6 @@ DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget usbhost" # # Bootstrap & Init # -MACHINE_TASK_PROVIDER = "task-base" require conf/distro/include/sane-srcdates.inc # @@ -89,6 +88,21 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" +# 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+" # # GPE # diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc deleted file mode 100644 index 4cdb68b4e3..0000000000 --- a/conf/distro/include/openzaurus.inc +++ /dev/null @@ -1,23 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenZaurus -#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) - -DISTRO = "openzaurus" -DISTRO_NAME = "OpenZaurus" - -INHERIT += " package_ipk debian multimachine" -# For some reason, this doesn't work -# TARGET_OS ?= "linux" -TARGET_OS = "linux" -TARGET_FPU = "soft" - -BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" - -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" - -# Set minimal version of BitBake needed -BB_MIN_VERSION = "1.4.4" -INHERIT += "sanity" - -# We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc new file mode 100644 index 0000000000..843f8e18ba --- /dev/null +++ b/conf/distro/include/oplinux.inc @@ -0,0 +1,108 @@ +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +# extra checking for needed tools +# + +# set minimal version of BitBake needed +BB_MIN_VERSION = "1.6.7" + +#OPLinux and OPLinux-uclibc source mirrors +INHERIT += "oplinux-mirrors" + +#oplinux is a multimachine distro +INHERIT += "multimachine" + +# check for required tools and minimal BitBake version +INHERIT += "sanity" + + + +# Naming schemes +INHERIT += "package_ipk debian" +PARALLEL_INSTALL_MODULES = "1" + + +# +# Maintainer email +MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.com>" + + +# +# Packaging and output format +IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz" + +# Specifies a location to search for pre-generated tarballs when fetching +# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. +CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/" + + +# +# Bootstrap & Init +PREFERRED_PROVIDER_task-bootstrap = "task-base" + +# We want images supporting the following features (for task-base +DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci" + + +#We need to set this to avoid problems when building for if host=target +TARGET_VENDOR = "-oplinux" + +#URI for base feeds +OPLINUX_URI = "http://www.digital-opsis.com/oplinux" +OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc" + +#Dir config +IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}" + +#Set the name of the generated images +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${MACHINE}-${DATE}-${SVN_REV}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" + + + + + +# +#feed definitions +#i32 machines +#i486 machines +FEED_ARCH_x86 ="i486" +FEED_ARCH_wrap ="i486" + +#i586 machines +FEED_ARCH_i586-generic = "i586" +FEED_ARCH_epia = "i586" + +#i686 machines +FEED_ARCH_i686-generic = "i686" +FEED_ARCH_guinness = "i686" +FEED_ARCH_progear = "i686" + + +#powerpc machines +#ppc405 +FEED_ARCH_dht-walnut = "ppc405" +FEED_ARCH_magicbox = "ppc405" +FEED_ARCH_xilinx-ml403 = "ppc405" + +#ppc440e +FEED_ARCH_sequoia = "ppc440e" + +#ppc603e +FEED_ARCH_efika = "ppc603e" + + +# +#Preferred versions of packages we need +# +PREFERRED_VERSION_busybox = "1.2.1" +PREFERRED_VERSION_u-boot ?= "1.1.4" +# Latest linphone supports yeaphone +PREFERRED_VERSION_linphone ?= "1.6.0" + +# +#SSH daemon +# +DISTRO_SSH_DAEMON ?= "dropbear" + + diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index a246633e07..a31466a434 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -8,5 +8,91 @@ PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" -# - the GPE roadmap doesn't state any versions for 2.8 yet -# http://www.handhelds.org/moin/moin.cgi/GPERoadmap +#specify versions, as the header says :) +PREFERRED_VERSION_glib-2.0 ?= "2.8.6" +PREFERRED_VERSION_pango ?= "1.8.2" +PREFERRED_VERSION_gtk+ ?= "2.6.10" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" +PREFERRED_VERSION_librsvg ?= "2.16.1" + +PREFERRED_VERSION_libgpewidget ?= "0.115" +PREFERRED_VERSION_libgpepimc ?= "0.9" +PREFERRED_VERSION_libgpevtype ?= "0.50" +PREFERRED_VERSION_libschedule ?= "0.17" +PREFERRED_VERSION_libcontactsdb ?= "0.5" +PREFERRED_VERSION_libtododb ?= "0.11" +PREFERRED_VERSION_libhandoff ?= "0.1" +PREFERRED_VERSION_libmimedir ?= "0.4.2" +PREFERRED_VERSION_libsoundgen ?= "0.6" +PREFERRED_VERSION_libdotdesktop ?= "0.11" +PREFERRED_VERSION_libeventdb ?= "0.90" +PREFERRED_VERSION_libgpelaunch ?= "0.14" +PREFERRED_VERSION_libgtkstylus ?= "0.3" +PREFERRED_VERSION_libxsettings-client ?= "0.17" + +PREFERRED_VERSION_gpe-icons ?= "0.25" + +PREFERRED_VERSION_gpe-login ?= "0.90" +PREFERRED_VERSION_gpe-session-scripts ?= "0.67" +PREFERRED_VERSION_gpe-su ?= "0.19" +PREFERRED_VERSION_keylaunch ?= "2.0.10" +PREFERRED_VERSION_startup-monitor ?= "0.18-2" +PREFERRED_VERSION_gpe-dm ?= "0.51" +PREFERRED_VERSION_ipaq-sleep ?= "0.9" +PREFERRED_VERSION_teleport ?= "0.34" +PREFERRED_VERSION_xst ?= "0.15" + + +PREFERRED_VERSION_gpe-aerial ?= "0.3.0" +PREFERRED_VERSION_gpe-appmgr ?= "2.8" +PREFERRED_VERSION_gpe-autostarter ?= "0.12" +PREFERRED_VERSION_gpe-todo ?= "0.56" +PREFERRED_VERSION_gpe-calendar ?= "0.91" +PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" +PREFERRED_VERSION_gpe-contacts ?= "0.47" +PREFERRED_VERSION_gpe-beam ?= "0.2.9" +PREFERRED_VERSION_gpe-bluetooth ?= "0.55" +PREFERRED_VERSION_gpe-bootsplash ?= "1.15" +PREFERRED_VERSION_gpe-conf ?= "0.2.6" +PREFERRED_VERSION_gpe-confd ?= "0.16" +PREFERRED_VERSION_gpe-clock ?= "0.25" +PREFERRED_VERSION_gpe-mininet ?= "0.7" +PREFERRED_VERSION_gpe-mixer ?= "0.42" +PREFERRED_VERSION_gpe-shield ?= "0.9" +PREFERRED_VERSION_gpe-taskmanager ?= "0.20" +PREFERRED_VERSION_minilite ?= "0.50" +PREFERRED_VERSION_miniclipboard ?= "0.3" +PREFERRED_VERSION_minimix ?= "0.8" +PREFERRED_VERSION_gpe-edit ?= "0.40" +PREFERRED_VERSION_gpe-gallery ?= "0.97" +PREFERRED_VERSION_gpe-calculator ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.4" +PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" +PREFERRED_VERSION_gpe-terminal ?= "1.1" +PREFERRED_VERSION_gpe-watch ?= "0.10" +PREFERRED_VERSION_gpe-what ?= "0.43" +PREFERRED_VERSION_gpe-filemanager ?= "0.30" +PREFERRED_VERSION_gpe-mini-browser ?= "0.21" +PREFERRED_VERSION_gpe-scap ?= "1.3" +PREFERRED_VERSION_gpesyncd ?= "2.0" +PREFERRED_VERSION_gpe-synctool ?= "0.2" +PREFERRED_VERSION_gpe-announce ?= "0.13" +PREFERRED_VERSION_gpe-timesheet ?= "0.32" +PREFERRED_VERSION_gpe-irc ?= "0.08" +PREFERRED_VERSION_starling ?= "0.2" +PREFERRED_VERSION_gpe-keylock ?= "0.12" +PREFERRED_VERSION_gpe-ownerinfo ?= "0.28" +PREFERRED_VERSION_gpe-question ?= "0.04" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" + +PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-julia ?= "0.0.6" +PREFERRED_VERSION_gpe-lights ?= "0.13" +PREFERRED_VERSION_gpe-othello ?= "0.2-1" +PREFERRED_VERSION_gpe-plucker ?= "0.4" +PREFERRED_VERSION_gpe-tetris ?= "0.6-4" +PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" +PREFERRED_VERSION_xdemineur ?= "2.1.1" + +PREFERRED_VERSION_vlc-gpe ?= "0.8.4" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc new file mode 100644 index 0000000000..1f39916f4f --- /dev/null +++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc @@ -0,0 +1,211 @@ +# +# Default versions +QTE_VERSION ?= "2.3.10" +OPIE_VERSION ?= "1.2.3" +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-cardmon = "${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-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-pcmciaapplet = "${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-dummy = "${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 = "20070212" diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc index fa1edcc64c..324f4dd80c 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc @@ -3,9 +3,9 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070308" -OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" -OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" +OPIE_SRCDATE ?= "20070727" +OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}" +OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}" # # @@ -188,6 +188,7 @@ 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}" @@ -220,7 +221,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" +PREFERRED_VERSION_konqueror-embedded = "20070212" SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}" @@ -378,6 +379,7 @@ SRCDATE_opie-systemtime = "${OPIE_SRCDATE}" SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}" SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}" SRCDATE_opie-taskbar = "${OPIE_SRCDATE}" +SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}" SRCDATE_opie-tetrix = "${OPIE_SRCDATE}" SRCDATE_opie-textedit = "${OPIE_SRCDATE}" SRCDATE_opie-theme = "${OPIE_SRCDATE}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 27a6164e54..782549589d 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -153,7 +153,7 @@ PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" -PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc new file mode 100644 index 0000000000..59a481a104 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -0,0 +1,271 @@ +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" + +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" + +PREFERRED_VERSION_task-xorg ?= "X11R7.2" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_beforelight ?= "1.0.2" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_editres ?= "1.0.2" +PREFERRED_VERSION_fontosfnt ?= "1.0.3" +PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_iceauth ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_ico ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_luit ?= "1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontscale ?= "1.0.3" +PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.2" +PREFERRED_VERSION_setxkbmap ?= "1.0.3" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_twm ?= "1.0.3" +PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xauth ?= "1.0.2" +PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcalc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.3" +PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xxf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfs ?= "1.0.4" +PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgamma ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xinit ?= "1.0.3" +PREFERRED_VERSION_xkbcomp ?= "1.0.3" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xload ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmag ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xmessage ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.2" +PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xprop ?= "1.0.2" +PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetroot ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xvinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1" + +#data +PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.1.1" + +# driver +PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5" +PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.1.1" +PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.1.2" +PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0" +PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.6.3" +PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2" +PREFERRED_VERSION_xf86-video-nv ?= "1.2.2.1" +PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.1.2" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" +PREFERRED_VERSION_xf86-video-sis ?= "0.9.3" +PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" + +# font +PREFERRED_VERSION_encodings ?= "1.0.2" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "1.0.2" +PREFERRED_VERSION_libx11 ?= "1.1.1" +PREFERRED_VERSION_libx11-native ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "0.3.1" +PREFERRED_VERSION_libxcursor ?= "1.1.8" +PREFERRED_VERSION_libxdamage ?= "1.0.4" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.2" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.0.2" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.2.7" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxi ?= "1.0.2" +PREFERRED_VERSION_libxinerama ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_libxkbfile ?= "1.0.4" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "1.0.3" +PREFERRED_VERSION_libxpm ?= "3.5.6" +PREFERRED_VERSION_libxrandr ?= "1.1.2" +PREFERRED_VERSION_libxrender ?= "0.9.2" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" +PREFERRED_VERSION_libxt ?= "1.0.4" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xtrans ?= "1.0.3" + +# proto +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "1.4.8" +PREFERRED_VERSION_kbproto ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "7.0.10" +PREFERRED_VERSION_xproto ?= "7.0.10" + +# util +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-xorg ?= "1.2.0" + diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc new file mode 100644 index 0000000000..0681b01d3d --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -0,0 +1,111 @@ +PREFERRED_VERSION_applewmproto = "1.0.3" +PREFERRED_VERSION_bigreqsproto = "1.0.2" +PREFERRED_VERSION_bigreqsproto-native = "1.0.2" +PREFERRED_VERSION_compositeproto = "0.4" +PREFERRED_VERSION_damageproto = "1.1.0" +PREFERRED_VERSION_diet-x11 = "1.1.2" +PREFERRED_VERSION_dmxproto = "2.2.2" +PREFERRED_VERSION_evieext = "1.0.2" +PREFERRED_VERSION_fixesproto = "4.0" +PREFERRED_VERSION_fontcacheproto = "0.1.2" +PREFERRED_VERSION_fontcacheproto-native = "0.1.2" +PREFERRED_VERSION_fontsproto = "2.0.2" +PREFERRED_VERSION_fontsproto-native = "2.0.2" +PREFERRED_VERSION_gccmakedep = "1.0.2" +PREFERRED_VERSION_glproto = "1.4.8" +PREFERRED_VERSION_imake = "1.0.2" +PREFERRED_VERSION_inputproto = "1.4.2" +PREFERRED_VERSION_inputproto-native = "1.4.1" +PREFERRED_VERSION_kbproto = "1.0.3" +PREFERRED_VERSION_kbproto-native = "1.0.2" +PREFERRED_VERSION_libapplewm = "1.0.0" +PREFERRED_VERSION_libdmx = "1.0.2" +PREFERRED_VERSION_libfontenc = "1.0.4" +PREFERRED_VERSION_libfontenc-native = "1.0.4" +PREFERRED_VERSION_libfs = "1.0.0" +PREFERRED_VERSION_libice = "1.0.3" +PREFERRED_VERSION_liblbxutil = "1.0.1" +PREFERRED_VERSION_liboldx = "1.0.1" +PREFERRED_VERSION_libsm = "1.0.3" +PREFERRED_VERSION_libwindowswm = "1.0.0" +PREFERRED_VERSION_libx11 = "1.1.2" +PREFERRED_VERSION_libx11-native = "1.0.1" +PREFERRED_VERSION_libxau = "1.0.3" +PREFERRED_VERSION_libxau-native = "1.0.3" +PREFERRED_VERSION_libxaw = "1.0.3" +PREFERRED_VERSION_libxcomposite = "0.4.0" +PREFERRED_VERSION_libxcursor = "1.1.8" +PREFERRED_VERSION_libxdamage = "1.1.1" +PREFERRED_VERSION_libxdmcp = "1.0.2" +PREFERRED_VERSION_libxdmcp-native = "1.0.2" +PREFERRED_VERSION_libxevie = "1.0.2" +PREFERRED_VERSION_libxext = "1.0.3" +PREFERRED_VERSION_libxfixes = "4.0.3" +PREFERRED_VERSION_libxfont = "1.3.0" +PREFERRED_VERSION_libxfont-native = "1.3.0" +PREFERRED_VERSION_libxfontcache = "1.0.4" +PREFERRED_VERSION_libxft = "2.1.12" +PREFERRED_VERSION_libxi = "1.1.2" +PREFERRED_VERSION_libxinerama = "1.0.2" +PREFERRED_VERSION_libxkbfile = "1.0.4" +PREFERRED_VERSION_libxkbui = "1.0.2" +PREFERRED_VERSION_libxmu = "1.0.3" +PREFERRED_VERSION_libxp = "1.0.0" +PREFERRED_VERSION_libxpm = "3.5.6" +PREFERRED_VERSION_libxprintapputil = "1.0.1" +PREFERRED_VERSION_libxprintutil = "1.0.1" +PREFERRED_VERSION_libxrandr = "1.2.1" +PREFERRED_VERSION_libxrender = "0.9.2" +PREFERRED_VERSION_libxres = "1.0.3" +PREFERRED_VERSION_libxscrnsaver = "1.1.2" +PREFERRED_VERSION_libxt = "1.0.5" +PREFERRED_VERSION_libxtrap = "1.0.0" +PREFERRED_VERSION_libxtst = "1.0.2" +PREFERRED_VERSION_libxv = "1.0.3" +PREFERRED_VERSION_libxvmc = "1.0.4" +PREFERRED_VERSION_libxxf86dga = "1.0.1" +PREFERRED_VERSION_libxxf86misc = "1.0.1" +PREFERRED_VERSION_libxxf86vm = "1.0.1" +PREFERRED_VERSION_lndir = "1.0.1" +PREFERRED_VERSION_makedepend = "1.0.1" +PREFERRED_VERSION_makedepend-native = "1.0.1" +PREFERRED_VERSION_printproto = "1.0.3" +PREFERRED_VERSION_randrproto = "1.2.1" +PREFERRED_VERSION_recordproto = "1.13.2" +PREFERRED_VERSION_renderproto = "0.9.2" +PREFERRED_VERSION_resourceproto = "1.0.2" +PREFERRED_VERSION_scrnsaverproto = "1.1.0" +PREFERRED_VERSION_trapproto = "3.4.3" +PREFERRED_VERSION_util-macros = "1.1.5" +PREFERRED_VERSION_util-macros-native = "1.1.5" +PREFERRED_VERSION_videoproto = "2.2.2" +PREFERRED_VERSION_windowswmproto = "1.0.3" +PREFERRED_VERSION_xauth = "1.0.2" +PREFERRED_VERSION_xcmiscproto = "1.1.2" +PREFERRED_VERSION_xcmiscproto-native = "1.1.2" +PREFERRED_VERSION_xdpyinfo = "1.0.2" +PREFERRED_VERSION_xextproto = "7.0.2" +PREFERRED_VERSION_xextproto-native = "7.0.2" +PREFERRED_VERSION_xf86bigfontproto = "1.1.2" +PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2" +PREFERRED_VERSION_xf86dgaproto = "2.0.2" +PREFERRED_VERSION_xf86driproto = "2.0.3" +PREFERRED_VERSION_xf86miscproto = "0.9.2" +PREFERRED_VERSION_xf86rushproto = "1.1.2" +PREFERRED_VERSION_xf86vidmodeproto = "2.2.2" +PREFERRED_VERSION_xhost = "1.0.2" +PREFERRED_VERSION_xineramaproto = "1.1.2" +PREFERRED_VERSION_xmodmap = "1.0.2" +PREFERRED_VERSION_xorg-cf-files = "1.0.2" +PREFERRED_VERSION_xproto = "7.0.10" +PREFERRED_VERSION_xproto-native = "7.0.10" +PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2" +PREFERRED_VERSION_xrandr = "1.2.2" +PREFERRED_VERSION_xrdb = "1.0.3" +PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" +PREFERRED_VERSION_xserver-xorg = "1.1.0" +PREFERRED_VERSION_xset = "1.0.2" +PREFERRED_VERSION_xtrans = "1.0.3" +PREFERRED_VERSION_xtrans-native = "1.0.3" +PREFERRED_VERSION_xinit = "1.0.4" +PREFERRED_VERSION_xev = "1.0.2" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 7b888b9d5f..8310d47a22 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -13,8 +13,8 @@ SRCDATE_libxext-native ?= "20060814" SRCDATE_libxss ?= "20060814" SRCDATE_recordext ?= "20060814" SRCDATE_renderext ?= "20060814" -SRCDATE_xcalibrate ?= "20060814" -SRCDATE_xcalibrateext ?= "20060814" +SRCDATE_calibrateproto ?= "20070802" +SRCDATE_libxcalibrate ?= "20070802" SRCDATE_xxf86dgaext ?= "20060814" SRCDATE_xxf86vmext ?= "20060814" @@ -36,22 +36,66 @@ SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" -SRCDATE_psplash ?= "20061207" +SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" -SRCDATE_libmimedir ?= "20060804" -SRCDATE_gpesyncd ?= "20061128" +SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "20060719" +SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -#Misc apps, sorted by alphabet +# Enlightenment Foundation Libraries +# Caution: This is not alphabetically, but (roughly) dependency-sorted. +# Please leave it like that. +SRCDATE_edb-native = "20070721" +SRCDATE_edb ?= "20070721" +SRCDATE_eet-native = "20070721" +SRCDATE_eet ?= "20070721" +SRCDATE_evas-native ?= "20070721" +SRCDATE_evas ?= "20070721" +SRCDATE_ecore-native ?= "20070721" +SRCDATE_ecore ?= "20070721" +SRCDATE_edbus ?= "20070721" +SRCDATE_embryo-native ?= "20070721" +SRCDATE_embryo ?= "20070721" +SRCDATE_edje-native ?= "20070721" +SRCDATE_edje ?= "20070721" +SRCDATE_emotion ?= "20070721" +SRCDATE_etk-native ?= "20070721" +SRCDATE_etk ?= "20070721" +SRCDATE_ewl ?= "20070721" +SRCDATE_epeg ?= "20070721" +SRCDATE_epsilon ?= "20070721" +SRCDATE_epdf ?= "20070721" +SRCDATE_esmart ?= "20070721" +SRCDATE_efreet ?= "20070721" +SRCDATE_exml ?= "20070721" +SRCDATE_enhance ?= "20070721" +SRCDATE_engrave ?= "20070721" +SRCDATE_evolve-native ?= "20070721" +SRCDATE_evolve ?= "20070721" +SRCDATE_eflpp ?= "20070721" + +# Enlightenment Applications +SRCDATE_edje-viewer ?= "20070601" +SRCDATE_edje-editor ?= "20070721" +SRCDATE_emphasis ?= "20070601" +SRCDATE_ephoto ?= "20070601" +SRCDATE_examine ?= "20070601" +SRCDATE_exhibit ?= "20070721" +SRCDATE_expedite ?= "20070601" +SRCDATE_elitaire ?= "20070504" +SRCDATE_entice ?= "20070601" +SRCDATE_e-utils ?= "20070601" +SRCDATE_enna ?= "20070721" + +# Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" SRCDATE_dvbstream ?= "20060814" @@ -72,6 +116,7 @@ SRCDATE_madwifi-modules ?= "20060814" SRCDATE_maemo-mapper-nohildon ?= "20061114" SRCDATE_mileage ?= "20060814" SRCDATE_minimo ?= "20050401" +SRCDATE_mpd ?= "20070210" SRCDATE_mystun-server ?= "20060814" SRCDATE_olsrd ?= "20060814" SRCDATE_opencvs ?= "20060814" @@ -90,3 +135,6 @@ SRCDATE_xsvg ?= "20060814" SRCDATE_yamonenv ?= "20060814" SRCDATE_zroadmap ?= "20060814" +# Freedesktop.org +SRCDATE_poppler0.6 = "20070708" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index a89d193225..00b9440b1f 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 = "4.3" +SLUGOS_VERSION = "4.5" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -43,13 +43,7 @@ INHERIT += "package_ipk debian multimachine" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. -# The other settings are somewhat arbitrary. The optimisations chosen here -# include the ones which 'break' symbolic debugging (because the compiler does -# not include enough information to allow the debugger to know where given -# values are.) The -fno options are an attempt to cancel explicit use of space -# consuming options found in some packages (this isn't a complete list, this is -# just the ones which package writers seem to know about and abuse). -FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers -fno-unroll-loops -fno-inline-functions -fweb -funit-at-a-time" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" #---------------------------------------------------------------------------------- # FEEDS @@ -117,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.20" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" @@ -139,8 +133,15 @@ INHERIT += "nslu2-mirrors" PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" -PREFERRED_VERSION_ipkg ?= "0.99.154" -PREFERRED_VERSION_ipkg-native ?= "0.99.154" +PREFERRED_VERSION_ipkg ?= "0.99.163" +PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" + +# Due to upstream instability, and another OE project with conflicting +# needs, nail down a specific, known-working version of madwifi-ng. +# Remove this once the madwifi-ng stuff seems to stabilize once again. +#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" + +PREFERRED_VERSION_linux-libc-headers = "2.6.18" diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf new file mode 100644 index 0000000000..26bf8b94f1 --- /dev/null +++ b/conf/distro/mamona.conf @@ -0,0 +1,60 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Mamona +#@-------------------------------------------------------------------- + +DISTRO = "mamona" +DISTRO_NAME = Mamona"" +DISTRO_VERSION = "test-${DATE}" +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" + +TARGET_VENDOR = "-mamona" + +require conf/distro/include/angstrom-glibc.inc + +INHERIT += " package_deb debian" +TARGET_OS = "linux-gnueabi" + +TARGET_FPU_nokia770 = "soft" +TARGET_FPU_n800 = "hard" + +FEED_ARCH_nokia770 = "armv5te" + +# Actually n800 is armv6 but we are using armv5te because qemu does not emulate +# armv6 yet. +FEED_ARCH_n800 = "armv5te" +#FEED_ARCH_n800 = "armv6" + +#Make sure we use 2.6 on machines with a 2.4/2.6 selector +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +#NPTL stuff +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_VERSION_binutils = "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross = "2.17.50.0.5" + +PREFERRED_VERSION_gcc = "4.1.1" +PREFERRED_VERSION_gcc-cross = "4.1.1" +PREFERRED_VERSION_gcc-initial-cross = "4.1.1" + +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" + +PREFERRED_VERSION_glibc ?= "2.5" + +PREFERRED_VERSION_glibc-intermediate ?= "2.5" + +PREFERRED_VERSION_glibc-initial ?= "2.5" + +require conf/distro/include/sane-srcdates.inc + + diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index ea20fdd6b6..2c039dbcce 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -14,9 +14,15 @@ DISTRO_VERSION = "1.0-alpha" DISTRO_REVISION = "1" DISTRO_TYPE = "debug" +MACHINE_TASK_PROVIDER = "task-boot dropbear" +MACHINE_TASK_PROVIDER_append_nslu2 = " sysconf" + +# Even though the NSLU2 does not have built-in bluetooth, +# we assume that a MokoSlug gateway has a bluetooth dongle. MACHINE_FEATURES_append_nslu2 = " bluetooth" -# No room for debug apps in 8MB. -DEBUG_APPS = "" +# No room for debug apps on an NSLU2. +DEBUG_APPS_nslu2 = "" -INHERIT += "nslu2-image"
\ No newline at end of file +# No room for a kernel image on an NSLU2. +IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 0d21488bb0..334c8bba9b 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -29,7 +29,7 @@ SRCDATE := "20050527" PREFERRED_VERSION_glibc = "2.3.3" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113" +PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223" PREFERRED_VERSION_kismet = "2005-01-R1" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" @@ -39,13 +39,14 @@ PREFERRED_VERSION_gcc = "3.3.4" PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_linux-libc-headers = "2.6.18" PREFERRED_VERSION_prism54-firmware = "1.0.3.0" KERNEL_VERSION_mtx-1 = "2.4.27" KERNEL_VERSION_mtx-2 = "2.4.27" -PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" +#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" @@ -57,10 +58,31 @@ PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" PREFERRED_VERSION_binutils_mtx-3 = "2.16" +PREFERRED_VERSION_madwifi-modules = "0.9.3" +PREFERRED_VERSION_madwifi-tools = "0.9.3" PREFERRED_VERSION_udev = "089" KERNEL_VERSION_mtx-3 = "2.6.15.4" +PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" + + +#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" +### did not compile with: +#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7" +#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7" +### falling back to: +PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" +PREFERRED_VERSION_binutils_mtx-3a = "2.16" + +PREFERRED_VERSION_udev = "100" + +KERNEL_VERSION_mtx-3a = "2.6.16.6" # usually overrrided from local.conf diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 6e33867aa9..c438da25d9 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -1,28 +1,29 @@ #----------------------------------------------------------------------------- #@TYPE: Distribution -#@NAME: OpenMoKo -#@DESCRIPTION: Linux Distribution Configuration for the FIC GTA01 Project +#@NAME: OpenMoko +#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform #----------------------------------------------------------------------------- +require conf/distro/angstrom-2007.1.conf +require conf/distro/include/openmoko-srcdate-now.inc + # # Header # -DISTRO_NAME = "OpenMoKo" +DISTRO = "openmoko" +DISTRO_NAME = "OpenMoko" DISTRO_VERSION = ".dev-snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -require conf/distro/include/openmoko.inc +OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" + +PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/" -# Toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -# 2.5 has less bugs, but crashes dropbear :/ -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +FEED_URIS = "\ + all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \ + armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \ + fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01" -PREFERRED_VERSION_lmsensors-apps ?= "2.10.1" diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf deleted file mode 100644 index 5819b5ad59..0000000000 --- a/conf/distro/openomap.conf +++ /dev/null @@ -1,52 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenOMAP -#@DESCRIPTION: OE Distribution for TI OMAP Development Boards - -INHERIT += " package_ipk debian" -TARGET_OS ?= "linux-gnueabi" -TARGET_FPU ?= "soft" - -# 2.4 vs 2.6 is a distro decision. -MODUTILS = "26" - -PREFERRED_PROVIDER_hotplug = "udev" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" - -#EABI stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" - -# use latest booting kernel but allow to override it in local.conf -#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1" - - -#use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_glibc-intermediate ?= "2.5" - -#PREFERRED_VERSION_gcc ?= "4.1.1" -#PREFERRED_VERSION_gcc-cross ?= "4.1.1" -#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -#PREFERRED_VERSION_binutils ?= "2.17" -#PREFERRED_VERSION_binutils-cross ?= "2.17" -#PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -#PREFERRED_VERSION_glibc ?= "2.4" -#PREFERRED_VERSION_glibc-intermediate ?= "2.4" - -# We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs pcmcia usbhost alsa" - -PCMCIA_MANAGER = "pcmciautils" - diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf deleted file mode 100644 index f03c4f653e..0000000000 --- a/conf/distro/openslug.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenSlug -#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 - -DISTRO_NAME = "OpenSlug" -IMAGE_BASENAME = "openslug" -TARGET_ARCH = "armeb" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux" - -require conf/distro/slugos.conf diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf deleted file mode 100644 index b5dba1ffed..0000000000 --- a/conf/distro/openzaurus-3.5.5.conf +++ /dev/null @@ -1,150 +0,0 @@ -# -# This is config for last version of OpenZaurus distribution. -# We (Hrw & XorA) decided to release 3.5.5 from .dev tree because .oz354x -# is just too old so with such small devteam we are unable to backport all -# needed fixes. -# -# This config need some love. It was created from current OpenZaurus config, -# Ångström config and UmbaUmba 17.3 config. - -DISTRO_VERSION = "3.5.5-test0" - -TEST1 := "$bb.fatal('this config need love')" - -require conf/distro/include/openzaurus.inc -require conf/distro/include/sane-srcdates.inc - -# -# Base -# -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_VERSION_binutils-cross-sdk = "2.16" -PREFERRED_VERSION_binutils-cross = "2.16" -PREFERRED_VERSION_binutils = "2.16" - -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc = "3.4.4" -PREFERRED_VERSION_gcc-cross = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4" - -# Glibc provides iconv and intl -- adjust, when doing uclibc builds -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -# -# Feeds -# -# avoid "/" on end to avoid #1102 -FEED_BASE_URI = "http://feeds.openzaurus.org/3.5.5" - -FEED_URIS ?= " \ - upgrades##${FEED_BASE_URI}/feed/upgrades \ -machine-upgrades##${FEED_BASE_URI}/feed/upgrades/machine/${MACHINE} \ - machine##${FEED_BASE_URI}/feed/machine/${MACHINE} \ - perl##${FEED_BASE_URI}/feed/perl \ - python##${FEED_BASE_URI}/feed/python \ - base##${FEED_BASE_URI}/feed/base " - -ENABLE_BINARY_LOCALE_GENERATION = "1" - -# -# All machines will get 2.6 kernel (except collie of course) -# -MACHINE_KERNEL_VERSION = "2.6" -MACHINE_KERNEL_VERSION_collie = "2.4" - -# -# We use 2.6.20 kernel -# -PREFERRED_VERSION_linux-rp = "2.6.20" - -# -# Toshiba USB Host driver is not updated so tosa == 2.6.17 -# -PREFERRED_VERSION_linux-rp_tosa = "2.6.17" - - -PREFERRED_VERSION_altboot = "1.0.8" - -# GPE -require conf/distro/include/preferred-gpe-versions-2.8.inc - -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" -PREFERRED_PROVIDER_esound ?= "pulseaudio" - - -PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.2.1" -PREFERRED_VERSION_freetype-native = "2.2.1" -#fix screen corruption issues -PREFERRED_VERSION_cairo = "1.3.12" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" - -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc - -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" - -# -# 2.6.10 was used in previous release so will be compatible -# -PREFERRED_VERSION_gtk+ = "2.6.10" - -#zap extra stuff taking place in $MACHINE.conf -GPE_EXTRA_INSTALL = "" - -# Virtuals: -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" - -TEST2 := "$bb.fatal('this config need love')" - -# Others: -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -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" -TEST4 := "$bb.fatal('this config need love')" -PREFERRED_PROVIDER_ntp = "ntp" -PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_libxss = "libxss" - -# -# busybox 1.2.1 was known as working - feel free to update -# -PREFERRED_VERSION_busybox = "1.2.1" - -# -# Die pcmcia-cs, DIE! -# -PCMCIA_MANAGER = "pcmciautils" - -PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.71" - -PREFERRED_VERSION_gstreamer ?= "0.10.11" - -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" - -PREFERRED_VERSION_wpa-supplicant = "0.5.7" -PREFERRED_VERSION_hostap-utils ?= "0.4.7" -PREFERRED_VERSION_hostap-modules ?= "0.4.7" - -# -# We do not use qte-mt to keep compatibility with older OZ -# -PALMTOP_USE_MULTITHREADED_QT = "no" -OPIE_VERSION = "1.2.2" - -require conf/distro/include/preferred-opie-versions.inc -TEST3 := "$bb.fatal('this config need love')" diff --git a/conf/distro/openzaurus-unstable-uclibc.conf b/conf/distro/openzaurus-unstable-uclibc.conf deleted file mode 100644 index 28b740c3dd..0000000000 --- a/conf/distro/openzaurus-unstable-uclibc.conf +++ /dev/null @@ -1,9 +0,0 @@ -require conf/distro/include/openzaurus-unstable.inc - -TARGET_OS = "linux-uclibc" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" -PREFERRED_PROVIDER_virtual/libintl = "libintl" -PREFERRED_PROVIDER_hostap-modules = "hostap-modules" - -# NOTE: you have to rename your 2.95 gcc and 2.11.2 ld -ASSUME_PROVIDED += "virtual/arm-linux-uclibc-gcc-2.95" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf deleted file mode 100644 index 476249478d..0000000000 --- a/conf/distro/openzaurus-unstable.conf +++ /dev/null @@ -1,85 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: OpenZaurus <http://www.openzaurus.org> -#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family -#@-------------------------------------------------------------------- - -DISTRO_VERSION = ".dev-snapshot-${DATE}" - -CVS_TARBALL_STASH = "\ -http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/openzaurus.inc - -DISTRO_TYPE = "debug" -# DISTRO_TYPE = "release" - -#FEED_URIS += " \ -# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ -#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ -# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ -# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ -# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ -# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ -# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" - -SRCDATE ?= "20060701" - -# -# Zaurus -# -ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" -PREFERRED_PROVIDER_hostap-conf = "hostap-conf" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_tslib ?= "tslib" - -KERNEL_CONSOLE = "ttyS0" -#DEBUG_OPTIMIZATION = "-O -g3" -#DEBUG_BUILD = "1" -#INHIBIT_PACKAGE_STRIP = "1" - -# Glibc provides iconv and intl -- adjust, when doing uclibc builds -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -# -# Base -# -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_VERSION_binutils-cross-sdk = "2.16" -PREFERRED_VERSION_binutils-cross = "2.16" -PREFERRED_VERSION_binutils = "2.16" - -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc = "3.4.4" -PREFERRED_VERSION_gcc-cross = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4" - -PREFERRED_VERSION_wpa-supplicant = "0.5.5" - -# -# Opie -# -QTE_VERSION = "2.3.10" -OPIE_VERSION = "1.2.2" -PALMTOP_USE_MULTITHREADED_QT = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# GPE -# -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -require conf/distro/include/preferred-gpe-versions-2.8.inc - -# -# E -# -require conf/distro/include/preferred-e-versions.inc - diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/oplinux-uclibc.conf new file mode 100644 index 0000000000..0d31c8c8ac --- /dev/null +++ b/conf/distro/oplinux-uclibc.conf @@ -0,0 +1,95 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OPLinux uClibC +#@DESCRIPTION: OPLinux uClibC Embedded Linux Distribution Configuration +# +#@COMMENT: This is a distribution for a number of embedded targets +#@COMMENT: currently supported are +#@COMMENT: generic x86 +#@COMMENT: wrap (x86) +#@COMMENT: dht-walnut (ppc405) +#@COMMENT: efika (ppc603) +#@COMMENT: rb5xx (mips) +#@COMMENT: +#@COMMENT: for additional info please check www.digital-opsis.com +#----------------------------------------------------------------------------- + +require conf/distro/include/oplinux.inc +require conf/distro/include/sane-srcdates.inc + +# +# Header +# +DISTRO_NAME = "OPLinux-uClibC" +DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" + +# +# Target OS & FPU system +# +TARGET_OS = "linux-uclibc" +PREFERRED_PROVIDER_virtual/libiconv = "libiconv" +PREFERRED_PROVIDER_virtual/libintl = "libintl" + +# +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + + +# +# Binutils & Compiler +# +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" + + +#PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" +PREFERRED_VERSION_linux-libc-headers = "2.6.11.1" + +SRCDATE_uclibc ?= "20061128" +PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" + + + +#Other packages we need +#try to keep it minimal :) +DISTRO_EXTRA_RDEPENDS += "\ + nano pciutils" + + + + +FEED_ARCH ?= "${TARGET_ARCH}" + +#i486 machines +FEED_ARCH_x86 ="i486" + +#i586 machines +FEED_ARCH_epia = "i586" + +#i686 machines +FEED_ARCH_guinness = "i686" +FEED_ARCH_progear = "i686" + +#powerpc machines +FEED_ARCH_efika = "ppc603e" +FEED_ARCH-dht-walnut = "ppc405" + + +FEED_URIS += " \ + no-arch##${OPLINUX-uCLIBC_URI}/unstable/feed/all \ + base##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/base \ + perl##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/perl \ + python##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/python \ + debug##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/debug \ + ${MACHINE}##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf new file mode 100644 index 0000000000..03e56b0148 --- /dev/null +++ b/conf/distro/oplinux.conf @@ -0,0 +1,131 @@ +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OPLinux +#@DESCRIPTION: OPLinux Embedded Linux Distribution Configuration +# +#@COMMENT: This is a distribution for a number of embedded targets +#@COMMENT: currently supported are +#@COMMENT: x86 wrap (i486) +#@COMMENT: i586-generic epia (i586) +#@COMMENT: i686-generic (i686) +#@COMMENT: dht-walnut magicbox (ppc405) +#@COMMENT: sequoia (ppc440) +#@COMMENT: efika (ppc603) +#@COMMENT: +#@COMMENT: for additional info please check www.digital-opsis.com/oplinux +#----------------------------------------------------------------------------- + +require conf/distro/include/oplinux.inc +require conf/distro/include/sane-srcdates.inc + + +# +# Header +# +DISTRO_NAME = "OPLinux" +DISTRO_VERSION ?= ".dev-snapshot-${SRCDATE}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" + +# +# Target OS & FPU system +# +TARGET_OS = "linux" + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + + +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_esound ?= "pulseaudio" + + +# glibc: +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" + + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-oplinux-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-oplinux-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-oplinux-linux-libc-for-gcc = "glibc-intermediate" + + + +# Virtuals: +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" + +# Others: +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +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_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" + +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5" + +PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18" +PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18" +PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18" +PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" + +PREFERRED_VERSION_glibc-initial ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" +PREFERRED_VERSION_glibc ?= "2.5" + +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_VERSION_dbus ?= "1.0.2" +PREFERRED_VERSION_dbus-glib ?= "0.71" + + +# +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + + + +#Other packages we need +#try to keep it minimal :) +DISTRO_EXTRA_RDEPENDS += "\ + nano pciutils" + + +FEED_URIS += " \ + no-arch##${OPLINUX_URI}/unstable/feed/all \ + base##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/base \ + perl##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/perl \ + python##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/python \ + debug##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/debug \ + ${MACHINE}##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" + + + + diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 38ec778b7a..fd01d21397 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -6,7 +6,7 @@ #@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2. #@REQUIREMENTS: /usr/local/arm/2.95.3/bin must be in your path, like "export PATH=$PATH:/usr/local/arm/2.95.3/bin/" -INHERIT += " package_ipk debian" +INHERIT += " package_ipk debian sanity" # # Zaurus @@ -29,7 +29,7 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" # Base # DISTRO_NAME = "SharpROM" -DISTRO_VERSION = "3.1 compatible" +DISTRO_VERSION = "3.1-compatible" DISTRO_TYPE = "debug" PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native" diff --git a/conf/distro/openslug-native.conf b/conf/distro/slugos-native.conf index ac77532697..77258c7148 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/slugos-native.conf @@ -1,9 +1,9 @@ # Our build host is armeb, not armv5eb that the kernel reports BUILD_ARCH = "armeb" -require conf/distro/openslug.conf +require conf/distro/slugos.conf -# Corresponding packages should be in openslug-native.bb, +# Corresponding packages should be in slugos-native.bb, # currently missing: ipkg-utils libtool quilt pkgconfig ASSUME_PROVIDED = "libtool-cross \ libtool-native \ diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 980c158181..564a2d0cfb 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" require conf/distro/include/slugos.inc + +# glibc: +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index d116c15ae6..ad75fffe11 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -45,6 +45,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +PREFERRED_PROVIDERS += " virtual/libc:glibc" + +PREFERRED_PROVIDER_libc6-unslung = "glibc" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" @@ -61,17 +64,9 @@ PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" -SRCDATE_ipkg-utils ?= "20060106" -SRCDATE_ipkg-utils-native ?= "20060106" -SRCDATE_ipkg-link ?= "20060106" -SRCDATE_irssi ?= "20050930" - CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" -PREFERRED_VERSION_ipkg ?= "0.99.154" -PREFERRED_VERSION_ipkg-native ?= "0.99.154" - #------------------------------------------------------------------- # FIXME! # This is clearly wrong, the headers should match the 2.4.22 kernel, |