diff options
Diffstat (limited to 'conf/distro')
36 files changed, 624 insertions, 115 deletions
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 25b07e0038..7935672795 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -1,4 +1,3 @@ -DISTRO = "amsdelta-oe" DISTRO_NAME = "AmsDelta Linux" DISTRO_VERSION = "unstable-${DATE}" diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2008.1-legacy.conf index 358ed06cf2..358ed06cf2 100644 --- a/conf/distro/angstrom-2007.1-legacy.conf +++ b/conf/distro/angstrom-2008.1-legacy.conf diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ec8a5b9b30..b24a57f537 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -22,6 +22,7 @@ DISTRO_REVISION = "1" require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc +require conf/distro/include/angstrom-2008-preferred-versions.inc #Images built can have to modes: # 'debug': empty rootpassword, strace included @@ -71,15 +72,9 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29" #Prefer a newer GTK+ and friends -PREFERRED_VERSION_gtk+ = "2.12.0" -PREFERRED_VERSION_glib-2.0 = "2.14.0" -PREFERRED_VERSION_pango = "1.18.1" - -# prefer newest for speed and fun -PREFERRED_VERSION_udev = "115" - -# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable -PREFERRED_VERSION_busybox = "1.7.2" +PREFERRED_VERSION_gtk+ ?= "2.12.3" +PREFERRED_VERSION_glib-2.0 ?= "2.14.4" +PREFERRED_VERSION_pango ?= "1.18.1" PREFERRED_PROVIDER_avahi = "avahi" diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf new file mode 100644 index 0000000000..c439ad67f6 --- /dev/null +++ b/conf/distro/chinook-compat.conf @@ -0,0 +1,199 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Chinook-compatible +#@DESCRIPTION: Distribution which allows building packages compatible to OS 2008 +#@-------------------------------------------------------------------- + +# Note: This is not a complete distribution. Just some definitions to make +# it possible to build packages that are compatible to Nokia's OS2008. +# You should *not* replace core libraries of the operating system (glibc, +# glib, gtk+, ..) with those you build in OE. +# +# Furthermore it may be possible that OpenEmbedded lacks specific versions +# of some packages. If you encounter such a problem please provide a recipe +# or file a bug! + +DISTRO_NAME = "Chinook-compat" +DISTRO_VERSION = "test-${DATE}" +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" + +require conf/distro/include/angstrom-glibc.inc +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1" + +INHERIT += "package_deb debian" +TARGET_OS = "linux-gnueabi" + +TARGET_FPU_nokia770 = "soft" +TARGET_FPU_nokia800 = "hard" + +DPKG_ARCH_nokia770 = "armel" +DPKG_ARCH_nokia800 = "armel" + +FEED_ARCH_nokia770 = "armv5te" + +# Actually n800 is armv6 but we are using armv5te because qemu does not emulate +# armv6 yet. +FEED_ARCH_nokia800 = "armv5te" +#FEED_ARCH_nokia800 = "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" + +PREFERRED_PROVIDER_virtual/libc = "glibc" + +# NPTL 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-gnueabi-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header" + +PREFERRED_VERSION_automake-native = "1.9.6" + +PREFERRED_VERSION_binutils = "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross = "2.18" + +PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" + +# Use recent enough version of the headers to let HAL build successfully. +PREFERRED_VERSION_linux-libc-headers = "2.6.20" + +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-intermediate = "2.5" +PREFERRED_VERSION_glibc-initial = "2.5" + +PREFERRED_VERSION_libtool = "1.5.6" + +require conf/distro/include/sane-srcrevs.inc + +PREFERRED_VERSION_fontconfig = "2.4.1" +PREFERRED_VERSION_freetype = "2.2.1" +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.18.0" +PREFERRED_VERSION_gtk+ = "2.10.14" + +PREFERRED_VERSION_gnome-vfs = "2.16.3" + +# 3.9.1 would be correct +PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2" +PREFERRED_VERSION_libxml2 = "2.6.27" +# 2.16 would be correct +PREFERRED_VERSION_gconf = "2.6.1" + +# gstreamer +# 0.10.13 would be correct (+ maemo patches) +PREFERRED_VERSION_gstreamer = "0.10.14" +PREFERRED_VERSION_gst-plugins-good = "0.10.6" +# 0.10.13 would be correct (+ maemo patches) +PREFERRED_VERSION_gst-plugins-base = "0.10.14" +# 0.11.3 would be correct ( + maemo patches) +PREFERRED_VERSION_gst-ffmpeg = "0.10.2" + +PREFERRED_VERSION_bluez-libs = "3.20" + +PREFERRED_PROVIDER_virtual/db = "db" +PREFERRED_PROVIDER_virtual/db-native = "db-native" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +# This is a hack to avoid building mesa which crashes the compiler +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb" +PREFERRED_VERSION_libsdl-directfb = "1.2.9" +PREFERRED_VERSION_libsdl-image = "1.2.3" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +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_VERSION_libgnomeui = "2.18.1" + +PREFERRED_PROVIDER_gtk+ = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+" + +PREFERRED_PROVIDER_gconf = "gconf" + +PREFERRED_VERSION_pixman = "0.9.6" + +PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt" +PREFERRED_PROVIDER_avahi = "avahi" + +PREFERRED_VERSION_libsoup = "2.2.7" +PREFERRED_VERSION_libglade = "2.4.2" +PREFERRED_VERSION_gnutls = "1.4.5" +PREFERRED_VERSION_libgpg-error = "1.0" +PREFERRED_VERSION_libgcrypt = "1.2.3" + +PREFERRED_VERSION_gpe-scap = "1.3" + +# various Maemo4 specific libraries +PREFERRED_VERSION_mce-dev = "1.6.3" +PREFERRED_VERSION_libosso = "2.13" +PREFERRED_VERSION_libhildon = "1.99.0" +PREFERRED_VERSION_libhildonmime = "1.10.0" +PREFERRED_VERSION_libhildonfm = "1.9.46" +PREFERRED_VERSION_hildon-thumbnail = "0.14" +PREFERRED_VERSION_osso-gwconnect = "1.0.12" +PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3" + +# Java stuff + +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" + +PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon" +PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5" + +# Does not compile with the CodeSourcery compiler .. :( +PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120" +PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120" + +# WARNING: If you change these values after the respective package has +# been built the change will have no effect. Edit the package's file in +# ${STAGING}/pkgdata/runtime then. +PKG_ncurses = "libncurses5" +PKG_ncurses-tools = "ncurses-bin" +PKG_ncurses-terminfo = "ncurses-base" + +PKG_gtk+ = "libgtk2.0-0" +PKG_pango = "libpango1.0-0" +PKG_atk = "libatk1.0-0" +PKG_glib-2.0 = "libglib2.0-0" +PKG_gconf = "libgconf2-6" +DEBIANNAME_dbus_pn-dbus = "dbus" +PKG_hildon-1 = "libhildon1" + +PKG_zlib = "zlib1g" +PKG_libglade = "libglade2-0" +PKG_libsoup = "libsoup2.2-8" + +PKG_libsdl-image = "libsdl-image1.2" +PKG_libsdl-directfb = "libsdl1.2" + +PKG_bluez-libs = "libbluetooth2" + +PKG_osso-ic-oss = "osso-ic" +PKG_libconic = "libconic0" diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf index 7454c0167f..25ea04a1f5 100644 --- a/conf/distro/colinuxoe.conf +++ b/conf/distro/colinuxoe.conf @@ -2,6 +2,8 @@ #@NAME: coLinuxoe #@DESCRIPTION: Generic OE built distro for the coLinux MACHINE +TARGET_OS = "linux" + INHERIT += "package_ipk debian" # MACHINE decides that linux-colinux is the correct kernel. diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index fe079db92d..8e26a282ab 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -10,7 +10,6 @@ FOONAS_MODE ?= "glibc" ANGSTROM_MODE = ${FOONAS_MODE} require conf/distro/angstrom-2008.1.conf -DISTRO = "foonas" DISTRO_NAME = "foonas" DISTRO_VERSION = "1.0-dev" DISTRO_REVISION = "1" diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index 26e78f89c1..805cfe7955 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -27,3 +27,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libiconv = "libiconv" PREFERRED_PROVIDER_virtual/libintl = "libintl" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +PREFERRED_VERSION_uclibc = "0.9.29" +PREFERRED_VERSION_uclibc-initial = "0.9.29" + diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 0286666495..d67be1d738 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -36,28 +36,34 @@ 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_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" +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" 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_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" # # Target OS & FPU system -# +# TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +# +# C library +# 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_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -65,28 +71,12 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5" # Bootstrap & Init # PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= "tslib" -require conf/distro/include/preferred-xorg-versions-X11R7.2.inc # -# GPE +# Preferred versions # -require conf/distro/include/preferred-gpe-versions-2.8.inc -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc index 156b5b21a3..6cabe8164c 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc @@ -509,7 +509,7 @@ PREFERRED_VERSION_gnomesword ?= "2.1.2" PREFERRED_VERSION_gnuchess ?= "5.05" PREFERRED_VERSION_gnumeric ?= "1.6.3" PREFERRED_VERSION_gnupg ?= "1.4.2.2" -PREFERRED_VERSION_gnuplot ?= "4.2.0" +PREFERRED_VERSION_gnuplot ?= "4.2.2" PREFERRED_VERSION_gnuradio ?= "3.0.4" PREFERRED_VERSION_gnutls ?= "1.6.3" PREFERRED_VERSION_gob2 ?= "2.0.14" @@ -548,7 +548,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.08" PREFERRED_VERSION_gpe-keylock ?= "0.12" PREFERRED_VERSION_gpe-life ?= "0.2" PREFERRED_VERSION_gpe-lights ?= "0.13" -PREFERRED_VERSION_gpe-login ?= "0.90" +PREFERRED_VERSION_gpe-login ?= "0.91" PREFERRED_VERSION_gpe-mini-browser ?= "0.21" PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17" PREFERRED_VERSION_gpe-mininet ?= "0.7" @@ -886,7 +886,7 @@ PREFERRED_VERSION_libgalago ?= "0.3.3" PREFERRED_VERSION_libgc ?= "6.7" PREFERRED_VERSION_libgcrypt ?= "1.2.3" PREFERRED_VERSION_libgeda ?= "20050820" -PREFERRED_VERSION_libgemwidget ?= "0.1" +PREFERRED_VERSION_libgemwidget ?= "1.0" PREFERRED_VERSION_libglade ?= "2.6.2" PREFERRED_VERSION_libglademm ?= "2.4.1" PREFERRED_VERSION_libgmime ?= "2.1.7" @@ -918,7 +918,7 @@ PREFERRED_VERSION_libhildonfm ?= "1.9.41" PREFERRED_VERSION_libhildonhelp ?= "1.9.1" PREFERRED_VERSION_libhildonmime ?= "1.9.5" PREFERRED_VERSION_libhtml-mason-perl ?= "1.35" -PREFERRED_VERSION_libiac ?= "0.1" +PREFERRED_VERSION_libiac ?= "1.0" PREFERRED_VERSION_libice ?= "1.0.4" PREFERRED_VERSION_libiconv ?= "1.11" PREFERRED_VERSION_libid3 ?= "1.1" @@ -946,7 +946,7 @@ PREFERRED_VERSION_libmailwrapper ?= "1.2.3" PREFERRED_VERSION_libmatchbox ?= "1.9" PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18" PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" -PREFERRED_VERSION_libmimedir ?= "0.3.1" +PREFERRED_VERSION_libmimedir ?= "0.4.2" PREFERRED_VERSION_libmng ?= "1.0.8" PREFERRED_VERSION_libmodplug ?= "0.7" PREFERRED_VERSION_libmodule-build-perl ?= "0.2805" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 380c882c2c..08cf27ba57 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -146,7 +146,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/angstrom-2007-preferred-versions.inc +require conf/distro/include/angstrom-2007-for-openmoko-versions.inc require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc new file mode 100644 index 0000000000..b8685a578e --- /dev/null +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -0,0 +1,8 @@ +PREFERRED_VERSION_dbus = "1.1.4" +PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.5.10" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_vte = "0.16.10" + diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 1502833389..d14c6f1b19 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" 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']]}" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 59d40957d5..7e8e60d7dd 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -14,5 +14,10 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" BUILD_OPTIMIZATION = "-Os" + +#Gcc will die with 'internal consistency error when using the above optimizations +FULL_OPTIMIZATION_avr32 = "" +BUILD_OPTIMIZATION_avr32 = "" + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index aff3ba90d1..d55b5bf3db 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -2,6 +2,8 @@ #@NAME: Angstrom #@DESCRIPTION: Release independent distribution configuration for Angstrom +# Preserve original DISTRO value +USERDISTRO := "${DISTRO}" DISTRO = "angstrom" DISTRO_NAME = "Angstrom" @@ -10,6 +12,7 @@ TARGET_VENDOR = "-angstrom" # Can be "glibc", "eglibc" or "uclibc" ANGSTROM_MODE ?= "glibc" +CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}" DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc @@ -50,6 +53,8 @@ TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" +TARGET_FPU_dht-walnut ?= "soft" + #Set the right arch for the feeds #Alphabetically sorted diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index e039a144d3..f9941c8a9a 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -9,6 +9,7 @@ SRCREV_pn-ezxd ?= "${AUTOREV}" SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}" SRCREV_pn-fstests ?= "${AUTOREV}" SRCREV_pn-gnuradio ?= "${AUTOREV}" +SRCREV_pn-gtkhtml2 ?= "${AUTOREV}" SRCREV_pn-hildon-1 ?= "${AUTOREV}" SRCREV_pn-kismet ?= "${AUTOREV}" SRCREV_pn-kismet-newcore ?= "${AUTOREV}" @@ -81,6 +82,8 @@ SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" SRCREV_pn-psplash ?= "${AUTOREV}" SRCREV_pn-settings-daemon ?= "${AUTOREV}" SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index fb9e2815ba..55e51409be 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -32,7 +32,7 @@ PREFERRED_VERSION_libxsettings-client ?= "0.17" PREFERRED_VERSION_gpe-icons ?= "0.25" -PREFERRED_VERSION_gpe-login ?= "0.90" +PREFERRED_VERSION_gpe-login ?= "0.91" PREFERRED_VERSION_gpe-session-scripts ?= "0.67" PREFERRED_VERSION_gpe-su ?= "0.19" PREFERRED_VERSION_keylaunch ?= "2.0.10" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index d7209be624..b801536586 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,7 +1,13 @@ -PREFERRED_VERSION_vte = "0.16.10" -PREFERRED_VERSION_dbus = "1.1.1" -PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_asterisk = "1.4.17" +PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_dbus = "1.1.4" PREFERRED_VERSION_gnash = "0.8.1" +PREFERRED_VERSION_gpsdrive = "2.10pre4" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.5.24" PREFERRED_VERSION_mono = "1.2.6" PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6" +PREFERRED_VERSION_mono-native = "1.2.6" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_vte = "0.16.10" diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc index 324f4dd80c..0a95b1ff67 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070727" +OPIE_SRCDATE ?= "20080127" OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 6db9d92f71..5a391aa45a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1" PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1" PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1" PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1" + +# Unreleased Packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 782549589d..c387161577 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc index 59a481a104..dc34a99340 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" PREFERRED_VERSION_xserver-xorg ?= "1.2.0" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index d7e19284bc..648472e9b6 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -280,3 +280,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.4" PREFERRED_VERSION_xserver-xorg ?= "1.4" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc new file mode 100644 index 0000000000..4af2405aa7 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -0,0 +1,292 @@ +# see http://www.x.org/wiki/Releases/7.4 +# WORK IN PROGRESS, 7.4 will be released on 2008-03-01 + +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.4" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "1.0.1" +PREFERRED_VERSION_beforelight ?= "1.0.3" +PREFERRED_VERSION_bitmap ?= "1.0.3" +PREFERRED_VERSION_editres ?= "1.0.3" +PREFERRED_VERSION_fontosfnt ?= "1.0.3" +PREFERRED_VERSION_fslsfonts ?= "1.0.1" +PREFERRED_VERSION_fstobdf ?= "1.0.2" +PREFERRED_VERSION_iceauth ?= "1.0.2" +PREFERRED_VERSION_ico ?= "1.0.2" +PREFERRED_VERSION_lbxproxy ?= "1.0.1" +PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_luit ?= "1.0.3" +PREFERRED_VERSION_mkfontdir-native ?= "1.0.3" +PREFERRED_VERSION_mkfontdir ?= "1.0.3" +PREFERRED_VERSION_mkfontscale ?= "1.0.3" +PREFERRED_VERSION_oclock ?= "1.0.1" +PREFERRED_VERSION_proxymngr ?= "1.0.1" +PREFERRED_VERSION_rgb ?= "1.0.1" +PREFERRED_VERSION_rstart ?= "1.0.2" +PREFERRED_VERSION_scripts ?= "1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.3" +PREFERRED_VERSION_setxkbmap ?= "1.0.4" +PREFERRED_VERSION_smproxy ?= "1.0.2" +PREFERRED_VERSION_twm ?= "1.0.3" +PREFERRED_VERSION_viewres ?= "1.0.1" +PREFERRED_VERSION_x11perf ?= "1.4.1" +PREFERRED_VERSION_xauth ?= "1.0.2" +PREFERRED_VERSION_xbacklight ?= "1.1" +PREFERRED_VERSION_xbiff ?= "1.0.1" +PREFERRED_VERSION_xcalc ?= "1.0.2" +PREFERRED_VERSION_xclipboard ?= "1.0.1" +PREFERRED_VERSION_xclock ?= "1.0.3" +PREFERRED_VERSION_xcmsdb ?= "1.0.1" +PREFERRED_VERSION_xconsole ?= "1.0.3" +PREFERRED_VERSION_xcursorgen ?= "1.0.2" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.6" +PREFERRED_VERSION_xdpyinfo ?= "1.0.2" +PREFERRED_VERSION_xdriinfo ?= "1.0.2" +PREFERRED_VERSION_xedit ?= "1.0.2" +PREFERRED_VERSION_xev ?= "1.0.2" +PREFERRED_VERSION_xeyes ?= "1.0.1" +PREFERRED_VERSION_xxf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfindproxy ?= "1.0.1" +PREFERRED_VERSION_xfontsel ?= "1.0.2" +PREFERRED_VERSION_xfs ?= "1.0.5" +PREFERRED_VERSION_xfsinfo ?= "1.0.1" +PREFERRED_VERSION_xfwp ?= "1.0.1" +PREFERRED_VERSION_xgamma ?= "1.0.2" +PREFERRED_VERSION_xgc ?= "1.0.1" +PREFERRED_VERSION_xhost ?= "1.0.2" +PREFERRED_VERSION_xinit ?= "1.0.7" +PREFERRED_VERSION_xinput ?= "1.3.0" +PREFERRED_VERSION_xkbcomp ?= "1.0.3" +PREFERRED_VERSION_xkbevd ?= "1.0.2" +PREFERRED_VERSION_xkbprint ?= "1.0.1" +PREFERRED_VERSION_xkbutils ?= "1.0.1" +PREFERRED_VERSION_xkill ?= "1.0.1" +PREFERRED_VERSION_xload ?= "1.0.2" +PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlsatoms ?= "1.0.1" +PREFERRED_VERSION_xlsclients ?= "1.0.1" +PREFERRED_VERSION_xlsfonts ?= "1.0.2" +PREFERRED_VERSION_xmag ?= "1.0.2" +PREFERRED_VERSION_xman ?= "1.0.3" +PREFERRED_VERSION_xmessage ?= "1.0.2" +PREFERRED_VERSION_xmh ?= "1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.3" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xpr ?= "1.0.2" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" +PREFERRED_VERSION_xprop ?= "1.0.3" +PREFERRED_VERSION_xrandr ?= "1.2.2" +PREFERRED_VERSION_xrdb ?= "1.0.4" +PREFERRED_VERSION_xrefresh ?= "1.0.2" +PREFERRED_VERSION_xrx ?= "1.0.1" +PREFERRED_VERSION_xset ?= "1.0.3" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.1" +PREFERRED_VERSION_xsetroot ?= "1.0.2" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.1" +PREFERRED_VERSION_xvinfo ?= "1.0.2" +PREFERRED_VERSION_xwd ?= "1.0.1" +PREFERRED_VERSION_xwininfo ?= "1.0.3" +PREFERRED_VERSION_xwud ?= "1.0.1" + +# data +PREFERRED_VERSION_xbitmaps ?= "1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "1.4" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" + +# driver +PREFERRED_VERSION_xf86-input-acecad ?= "1.2.1" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1" +PREFERRED_VERSION_xf86-input-citron ?= "2.2.1" +PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1" +PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1" +PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1" +PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0" +PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2" +PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1" +PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1" +PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" +PREFERRED_VERSION_xf86-input-summa ?= "1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3" +PREFERRED_VERSION_xf86-input-void ?= "1.1.1" +PREFERRED_VERSION_xf86-video-apm ?= "1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.6.193" +PREFERRED_VERSION_xf86-video-chips ?= "1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" +PREFERRED_VERSION_xf86-video-glide ?= "1.0.0" +PREFERRED_VERSION_xf86-video-glint ?= "1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" +PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" +PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.2.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.8" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.7" +PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0" +PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.1.3" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" +PREFERRED_VERSION_xf86-video-sis ?= "0.9.4" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tga ?= "1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0" +PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.15.2" +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 ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.3" +PREFERRED_VERSION_libdmx ?= "1.0.2" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libice ?= "1.0.4" +PREFERRED_VERSION_liblbxutil ?= "1.0.1" +PREFERRED_VERSION_libsm ?= "1.0.3" +PREFERRED_VERSION_libx11 ?= "1.1.3" +PREFERRED_VERSION_libx11-native ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxaw ?= "1.0.4" +PREFERRED_VERSION_libxcomposite ?= "0.4.0" +PREFERRED_VERSION_libxcursor ?= "1.1.9" +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.3" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.3.1" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxi ?= "1.1.3" +PREFERRED_VERSION_libxinerama ?= "1.0.2" +PREFERRED_VERSION_libxkbfile ?= "1.0.4" +PREFERRED_VERSION_libxkbui ?= "1.0.2" +PREFERRED_VERSION_libxmu ?= "1.0.4" +PREFERRED_VERSION_libxpm ?= "3.5.7" +PREFERRED_VERSION_libxrandr ?= "1.2.2" +PREFERRED_VERSION_libxrender ?= "0.9.4" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" +PREFERRED_VERSION_libxt ?= "1.0.5" +PREFERRED_VERSION_libxtst ?= "1.0.3" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +PREFERRED_VERSION_libxxf86dga ?= "1.0.2" +PREFERRED_VERSION_libxxf86misc ?= "1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "1.0.1" +PREFERRED_VERSION_xtrans ?= "1.0.4" + +# proto +PREFERRED_VERSION_compositeproto ?= "0.4" +PREFERRED_VERSION_damageproto ?= "1.1.0" +PREFERRED_VERSION_fixesproto ?= "4.0" +PREFERRED_VERSION_glproto ?= "1.4.9" +PREFERRED_VERSION_inputproto ?= "1.4.2.1" +PREFERRED_VERSION_kbproto ?= "1.0.3" +PREFERRED_VERSION_randrproto ?= "1.2.1" +PREFERRED_VERSION_renderproto ?= "0.9.3" +PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" +PREFERRED_VERSION_xproto-native ?= "7.0.11" +PREFERRED_VERSION_xproto ?= "7.0.11" + +# util +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" +PREFERRED_VERSION_makedepend ?= "1.0.1" +PREFERRED_VERSION_util-macros-native ?= "1.1.5" +PREFERRED_VERSION_util-macros ?= "1.1.5" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.4" +PREFERRED_VERSION_xserver-xorg ?= "1.4" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index f34b29f147..05136138fc 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -109,3 +109,7 @@ 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" +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index cff6d7316b..5a1e8f2758 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,14 +46,13 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080117" +EFL_SRCDATE = "20080216" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -107,9 +106,9 @@ SRCDATE_entice ?= "${EFL_SRCDATE}" SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna = "${EFL_SRCDATE}" -#SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" +SRCDATE_rage ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 46c90976c8..0cf1788c8c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -7,6 +7,10 @@ # this is alphabetical! +# yes, really! + +# you know what that means? like... a, b, c, d, e, f, g... + SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" @@ -23,10 +27,12 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" -SRCREV_pn-gconf-dbus ?= "638" +SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "42" +SRCREV_pn-gpio ?= "4112" +SRCREV_pn-gsm0710muxd ?= "77" +SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" @@ -40,12 +46,14 @@ SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" +SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "983" -SRCREV_pn-linux-openmoko ?= "4082" +SRCREV_pn-linux-ixp4xx ?= "1039" +SRCREV_pn-linux-openmoko ?= "4102" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -55,8 +63,11 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" +SRCREV_pn-mplayer ?= "24587" SRCREV_pn-multitap-pad ?= "337" SRCREV_pn-neod ?= "3421" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -120,23 +131,24 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" +SRCREV_pn-opkg ?= "4022" +SRCREV_pn-opkg-native ?= "4019" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-python-formencode = "3148" -SRCREV_pn-python-fso-pyproto = "49" +SRCREV_pn-python-fso-pyproto = "70" SRCREV_pn-python-gsmd = "127" +SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" +SRCREV_pn-u-boot-openmoko ?= "4100" +SRCREV_pn-usbpath ?= "3108" +SRCREV_pn-usbpath-native ?= "3108" SRCREV_pn-webkit-gtk ?= "28656" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" -SRCREV_pn-mplayer ?= "24587" -SRCREV_pn-networkmanager ?= "2887" -SRCREV_pn-networkmanager-applet ?= "200" -SRCREV_pn-libw100 ?= "47" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ea4980b55a..c13c9b6c75 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -119,11 +119,6 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" -# 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 ?= "linux-ixp4xx" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" - # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 19379862ae..3a7c7ee549 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series) #@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com> -DISTRO = "Jornada Linux Mobility Edition" DISTRO_NAME = "JLime" DISTRO_VERSION = "Shrek" DISTRO_TYPE = "release" diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf deleted file mode 100644 index b8592fdf68..0000000000 --- a/conf/distro/maemo-1.0.conf +++ /dev/null @@ -1,38 +0,0 @@ -require conf/distro/include/familiar.inc - -DISTRO = "maemo" -DISTRO_NAME = "Maemo Linux" -DISTRO_VERSION = "v1.0b-${DATE}" - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" - -FEED_URIS += " \ - " -#SRCDATE = 20050331 - -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 = "2.15.91.0.2" -#PREFERRED_VERSION_gcc-cross = "3.4.4" -#PREFERRED_VERSION_gcc-cross-initial = "3.4.4 -#PREFERRED_VERSION_libtool-native = "1.5.6" -#PREFERRED_VERSION_libtool-cross= "1.5.6" - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" - -require conf/distro/include/preferred-gpe-versions.inc - -# -# Maemo -# - -require conf/distro/include/maemo-preferred.inc diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf index 26bf8b94f1..bf055874e8 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -3,7 +3,6 @@ #@NAME: Mamona #@-------------------------------------------------------------------- -DISTRO = "mamona" DISTRO_NAME = Mamona"" DISTRO_VERSION = "test-${DATE}" DISTRO_TYPE = "debug" diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index d68a03fa2b..f8ea1ee5af 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -8,7 +8,6 @@ # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... require conf/distro/angstrom-2008.1.conf -DISTRO = "mokoslug" DISTRO_NAME = "MokoSlug" DISTRO_VERSION = "1.0-alpha" DISTRO_REVISION = "1" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 334c8bba9b..0623ce6dd0 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -11,6 +11,8 @@ # # Bruno Randolf <bruno.randolf@4g-systems.biz> +TARGET_OS = "linux" + INHERIT += "package_ipk debian nylon-mirrors" INHERIT += "linux-kernel-base" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index d7b3cf753a..470dbf0de2 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -10,17 +10,16 @@ require conf/distro/include/angstrom-2007-for-openmoko.inc # # Header # -DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" -PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" +PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf index 92e5ac5b39..0646b17f90 100644 --- a/conf/distro/openwrt-sdk.conf +++ b/conf/distro/openwrt-sdk.conf @@ -20,10 +20,14 @@ require conf/distro/generic-uclibc.conf DISTRO_NAME = "OpenWRT" DISTRO_REVISION = "2" +# Build ipk's wrapped with tar.gz instead of ar, like OpenWRT has them IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" # This is what lives in SDK ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" +# Rename packages to names used in OpenWRT +PKG_ncurses = "libncurses" + # Make sure that we have correct package dependencies for SDK-provided libs. ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 92fd42f4f8..0e130a2fd7 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" @@ -52,6 +53,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" QTE_VERSION = "2.3.10" OPIE_VERSION = "1.2.2" PALMTOP_USE_MULTITHREADED_QT = "no" +export palmtopdir = "/opt/QtPalmtop" require conf/distro/include/preferred-opie-versions.inc # diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 29c96ce384..012081f143 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -8,7 +8,7 @@ DISTRO_NAME = "SlugOS" # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" +DISTRO_TYPE = "alpha" TARGET_ARCH ?= "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" |