diff options
Diffstat (limited to 'conf/distro/include')
24 files changed, 1005 insertions, 450 deletions
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 28e3b3eddd..9b288e8e0b 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,17 +3,20 @@ 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)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info # 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-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 149b8ed9d8..9c3274e58f 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index c057d1a05e..6605fff3e8 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -6,7 +6,6 @@ DISTRO = "angstrom" DISTRO_NAME = "Angstrom" TARGET_VENDOR = "-angstrom" -MACHINE_TASK_PROVIDER = "task-base" # Can be "glibc" and "uclibc" ANGSTROM_MODE ?= "glibc" @@ -22,7 +21,7 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use ipkg package format with debian style naming #use multimachine buildrules -INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors" +INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors insane" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" @@ -37,10 +36,6 @@ TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" - -#Make a LE jffs2 image -SLUGOS_IMAGESEX = "little-endian" - #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" @@ -50,3 +45,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" +DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/debianslug-packages.inc b/conf/distro/include/debianslug-packages.inc deleted file mode 100644 index a4b9a6720f..0000000000 --- a/conf/distro/include/debianslug-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc index d41cb89111..4c2c8b1e2e 100644 --- a/conf/distro/include/freeze.inc +++ b/conf/distro/include/freeze.inc @@ -14,12 +14,10 @@ FROZEN_DIR ?= "/non/-existent/-directory/-for/-security" # Pull in the frozen definitions (if they exist) The multiple # includes allow the frozen file to be stored alongside local.conf -# and in the conf/distro directory - the former take precedence over -# the latter. -require conf/distro/include/${DISTRO}-packages.inc +# and in a distro-specific frozen directory - the former take +# precedence over the latter. include conf/${DISTRO}-packages.conf include ${FROZEN_DIR}/${DISTRO}-packages.conf -require conf/distro/include/${DISTRO}-bbfiles.inc include conf/${DISTRO}-bbfiles.conf include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc new file mode 100644 index 0000000000..457aa997dd --- /dev/null +++ b/conf/distro/include/openmoko.inc @@ -0,0 +1,142 @@ +# +# Header +# +DISTRO_NAME = "OpenMoKo" + +# +# Naming schemes +# +INHERIT += "debian multimachine" + +# +# Packaging and output format +# +INHERIT += "package_ipk" +IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" +IMAGE_FSTYPES_x86 = "tar.gz" +IMAGE_ROOTFS_SIZE_ext2 = "131072" + +# +# 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" + +# EABI 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-linux-libc-for-gcc = "glibc-intermediate" + +# +# Target OS & FPU system +# +TARGET_OS = "linux" +TARGET_FPU_arm = "soft" +TARGET_FPU_armeb = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_VERSION_linux-libc-headers_x86 = "2.6.15.99" +PREFERRED_VERSION_linux-libc_headers = "2.6.18" +# +# Features +# +DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget usbhost" + +# +# Bootstrap & Init +# +require conf/distro/include/sane-srcdates.inc + +# +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11" +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc + +# +# Gnome +# +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" +PREFERRED_PROVIDER_gconf = "gconf-dbus" +#new +#PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs" +#old +PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs-plugin-file = "gnome-vfs" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus" + +PREFERRED_VERSION_dbus-native = "1.0.2" +PREFERRED_VERSION_dbus = "1.0.2" +PREFERRED_VERSION_dbus-glib-native = "0.71" +PREFERRED_VERSION_dbus-glib = "0.71" +PREFERRED_VERSION_atk = "1.9.0" +PREFERRED_VERSION_pango = "1.8.2" +PREFERRED_VERSION_glib-2.0 = "2.12.3" +PREFERRED_VERSION_gtk+ = "2.6.10" +PREFERRED_VERSION_gtk-engines = "2.6.5" +#PREFERRED_VERSION_gnome-vfs = "2.16.3" + +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 +# +PREFERRED_PROVIDER_libgpewidget = "libgpewidget" + +# +# O-Hand +# +PREFERRED_VERSION_contacts = "0.1" +PREFERRED_VERSION_dates = "0.1" +# PREFERRED_VERSION_web = "???" + +# +# Development +# +PREFERRED_PROVIDER_qemu-native = "qemu-native" +PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}" + +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" +require conf/distro/include/preferred-opie-versions.inc + +# +# Enlightenment +# +require conf/distro/include/preferred-e-versions.inc + +# +# OpenMoko +# + +#We comment this out since external developers don't needs to use SRCDATE="now" as that generated unneed traffic +#require conf/distro/include/preferred-openmoko-versions.inc + diff --git a/conf/distro/include/openslug-native-packages.inc b/conf/distro/include/openslug-native-packages.inc deleted file mode 100644 index 7f7a448434..0000000000 --- a/conf/distro/include/openslug-native-packages.inc +++ /dev/null @@ -1,11 +0,0 @@ -# automatically generated by bitbake freeze -BBFILES := "\ -${PKGDIR}/packages/apache/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/meta/package-index.bb \ -${PKGDIR}/packages/meta/openslug-native-packages.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${OPENSLUG_NATIVE_EXTRA_BBFILES}" diff --git a/conf/distro/include/openslug-packages.inc b/conf/distro/include/openslug-packages.inc deleted file mode 100644 index fe09a7bcfa..0000000000 --- a/conf/distro/include/openslug-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc deleted file mode 100644 index 8274148823..0000000000 --- a/conf/distro/include/openzaurus.inc +++ /dev/null @@ -1,25 +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" - -PARALLEL_INSTALL_MODULES = "1" - -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..a700a830b8 --- /dev/null +++ b/conf/distro/include/oplinux.inc @@ -0,0 +1,66 @@ +# +# extra checking for needed tools +# + +# set minimal version of BitBake needed +BB_MIN_VERSION = "1.6.3" + +#oplinux is a multimachine distro +INHERIT += "multimachine" + +# check for required tools and minimal BitBake version +INHERIT += "sanity" + + +# +# Naming schemes +# +PARALLEL_INSTALL_MODULES = "1" +INHERIT += "package_ipk debian" + +# +# Packaging and output format + +IMAGE_FSTYPES = "tar jffs2 ext2 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/source/current/" + +#INHERIT += "owmnr-mirrors" + +#Uncommend this is if you are using bitbake multithread and you have multiple cpu's or cores you are running on +#BB_NUMBER_THREADS = "5" + +#Uncommend this if you hava icecc installed +#INHERIT += "icecc" +#PARALLEL_MAKE = "-j6" +#ICECC_PATH = "/usr/bin/icecc" +#ICECC_ENV_EXEC = "/home/stelios/icecc-create-env" + +# +# 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" + + +OPLINUX_URI = "http://www.ifaistos.awmn/oplinux" +OPLINUX-uCLIBC_URI = "http://www.ifaistos.awmn/oplinux-uclibc" + +#Dir config +IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}" + +# +#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" + + diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 662dfc386f..cbdaec0a21 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -7,7 +7,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index bf00aa8d01..a246633e07 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -4,7 +4,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index 7d4efea06e..5db9d7f06a 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -7,7 +7,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" #specify versions, as the header says :) #PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc new file mode 100644 index 0000000000..263406c90b --- /dev/null +++ b/conf/distro/include/preferred-openmoko-versions.inc @@ -0,0 +1,60 @@ +# +# Specify which versions of OpenMoko packages to build +# + +# +# Base +# + +SRCDATE_uboot = "now" +SRCDATE_uboot-gta01 = "now" +SRCDATE_kernel = "now" +SRCDATE_linux-gta01 = "now" +SRCDATE_linux-gta01-nobbt = "now" +SRCDATE_libgsmd = "now" +SRCDATE_openmoko-session = "now" +SRCDATE_openmoko-common = "now" +SRCDATE_openmoko-theme-standard = "now" +SRCDATE_openmoko-libs = "now" + +# +# Examples +# +SRCDATE_openmoko-stylus-demo = "now" +SRCDATE_openmoko-stylus-demo-simple = "now" +SRCDATE_openmoko-finger-demo = "now" +SRCDATE_openmoko-panel-demo = "now" +SRCDATE_openmoko-panel-demo-simple = "now" + +# +# PIM +# +SRCDATE_openmoko-contacts = "now" +SRCDATE_openmoko-dates = "now" + +# +# Applications +# +SRCDATE_openmoko-appmanager = "now" +SRCDATE_openmoko-chordmaster = "now" +SRCDATE_openmoko-dialer = "now" +SRCDATE_openmoko-footer = "now" +SRCDATE_openmoko-phone = "now" +SRCDATE_openmoko-mainmenu = "now" +SRCDATE_openmoko-taskmanager = "now" + +# +# Multimedia +# +SRCDATE_openmoko-simplemediaplayer = "now" + +# +# Panel Plugins +# +SRCDATE_openmoko-panel-clock = "now" +SRCDATE_openmoko-panel-battery = "now" +SRCDATE_openmoko-panel-mainmenu = "now" +SRCDATE_openmoko-panel-gsm = "now" +SRCDATE_openmoko-panel-gps = "now" +SRCDATE_openmoko-panel-bt = "now" +SRCDATE_openmoko-panel-usb = "now" diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc index 93b068ee65..d27f56fb04 100644 --- a/conf/distro/include/preferred-opie-cvs-versions.inc +++ b/conf/distro/include/preferred-opie-cvs-versions.inc @@ -106,7 +106,8 @@ SRCDATE_opie-mediaplayer1-libmadplugin ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer1-libmodplugin ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer1-libtremorplugin ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}" -SRCDATE_opie-mediaplayer1 ?= "${OPIE_VERSION}" +SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}" +SRCDATE_opie-mediaplayer1-core ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer2 ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer2-skin-default ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer2-skin-default-landscape ?= "${OPIE_VERSION}" diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc new file mode 100644 index 0000000000..6990c98000 --- /dev/null +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -0,0 +1,412 @@ +# +# Default versions +QTE_VERSION ?= "2.3.10" +PALMTOP_USE_MULTITHREADED_QT ?= "yes" + +OPIE_SRCDATE ?= "20070428" +OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" +OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" + +# +# +# 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}" + +SRCDATE_libopie2 ?= "${OPIE_SRCDATE}" +SRCDATE_libopieobex0 = "${OPIE_SRCDATE}" +SRCDATE_libopietooth1 = "${OPIE_SRCDATE}" +SRCDATE_libqpe-opie = "${OPIE_SRCDATE}" +SRCDATE_libqtaux2 = "${OPIE_SRCDATE}" +SRCDATE_libmailwrapper = "${OPIE_SRCDATE}" + +# +# 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-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 = "20060404" + + +SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-addressbook = "${OPIE_SRCDATE}" +SRCDATE_opie-advancedfm = "${OPIE_SRCDATE}" +SRCDATE_opie-alarm = "${OPIE_SRCDATE}" +SRCDATE_opie-appearance = "${OPIE_SRCDATE}" +SRCDATE_opie-aqpkg = "${OPIE_SRCDATE}" +SRCDATE_opie-autorotateapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-backgammon = "${OPIE_SRCDATE}" +SRCDATE_opie-backup = "${OPIE_SRCDATE}" +SRCDATE_opie-bartender = "${OPIE_SRCDATE}" +SRCDATE_opie-batteryapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-bluepin ?= "${OPIE_SRCDATE}" +SRCDATE_opie-bluetoothapplet ?= "${OPIE_SRCDATE}" +SRCDATE_opie-bluetoothmanager ?= "${OPIE_SRCDATE}" +SRCDATE_opie-bounce = "${OPIE_SRCDATE}" +SRCDATE_opie-brightnessapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-button-settings = "${OPIE_SRCDATE}" +SRCDATE_opie-buzzword = "${OPIE_SRCDATE}" +SRCDATE_opie-calculator = "${OPIE_SRCDATE}" +SRCDATE_opie-calibrate = "${OPIE_SRCDATE}" +SRCDATE_opie-camera = "${OPIE_SRCDATE}" +SRCDATE_opie-cardmon = "${OPIE_SRCDATE}" +SRCDATE_opie-checkbook = "${OPIE_SRCDATE}" +SRCDATE_opie-citytime = "${OPIE_SRCDATE}" +SRCDATE_opie-clipboardapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-clockapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-clock = "${OPIE_SRCDATE}" +SRCDATE_opie-confeditor = "${OPIE_SRCDATE}" +SRCDATE_opie-console = "${OPIE_SRCDATE}" +SRCDATE_opie-dagger = "${OPIE_SRCDATE}" +SRCDATE_opie-dasher = "${OPIE_SRCDATE}" +SRCDATE_opie-datebook = "${OPIE_SRCDATE}" +SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-datebook-birthdayplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-deco-flat = "${OPIE_SRCDATE}" +SRCDATE_opie-deco-liquid = "${OPIE_SRCDATE}" +SRCDATE_opie-deco-polished = "${OPIE_SRCDATE}" +SRCDATE_opie-doctab = "${OPIE_SRCDATE}" +SRCDATE_opie-drawpad = "${OPIE_SRCDATE}" +SRCDATE_opie-dvorak = "${OPIE_SRCDATE}" +SRCDATE_opie-embeddedkonsole = "${OPIE_SRCDATE}" +SRCDATE_opie-euroconv = "${OPIE_SRCDATE}" +SRCDATE_opie-examples-python = "${OPIE_SRCDATE}" +SRCDATE_opie-examples = "${OPIE_SRCDATE}" +SRCDATE_opie-eye = "${OPIE_SRCDATE}" +SRCDATE_opie-fifteen = "${OPIE_SRCDATE}" +SRCDATE_opie-formatter = "${OPIE_SRCDATE}" +SRCDATE_opie-freetype = "${OPIE_SRCDATE}" +SRCDATE_opie-ftplib = "${OPIE_SRCDATE}" +SRCDATE_opie-ftp = "${OPIE_SRCDATE}" +SRCDATE_opie-go = "${OPIE_SRCDATE}" +SRCDATE_opie-gutenbrowser = "${OPIE_SRCDATE}" +SRCDATE_opie-handwriting = "${OPIE_SRCDATE}" +SRCDATE_opie-helpbrowser = "${OPIE_SRCDATE}" +SRCDATE_opie-help-en = "${OPIE_SRCDATE}" +SRCDATE_opie-homeapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-i18n = "${OPIE_SRCDATE}" +SRCDATE_opie-lrelease-native = "${OPIE_SRCDATE}" +SRCDATE_opie-lupdate-native = "${OPIE_SRCDATE}" +SRCDATE_opie-icon-reload = "${OPIE_SRCDATE}" +SRCDATE_opie-irc = "${OPIE_SRCDATE}" +SRCDATE_opie-irdaapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-jumpx = "${OPIE_SRCDATE}" +SRCDATE_opie-kbill = "${OPIE_SRCDATE}" +SRCDATE_opie-kcheckers = "${OPIE_SRCDATE}" +SRCDATE_opie-keyboard = "${OPIE_SRCDATE}" +SRCDATE_opie-keypebble = "${OPIE_SRCDATE}" +SRCDATE_opie-keytabs = "${OPIE_SRCDATE}" +SRCDATE_opie-keyview = "${OPIE_SRCDATE}" +SRCDATE_opie-kjumpx = "${OPIE_SRCDATE}" +SRCDATE_opie-kpacman = "${OPIE_SRCDATE}" +SRCDATE_opie-language = "${OPIE_SRCDATE}" +SRCDATE_opie-launcher-settings = "${OPIE_SRCDATE}" +SRCDATE_opie-libqrsync = "${OPIE_SRCDATE}" +SRCDATE_opie-light-and-power = "${OPIE_SRCDATE}" +SRCDATE_opie-lockapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-login = "${OPIE_SRCDATE}" +SRCDATE_opie-logoutapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-mailapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-mail = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer1-core = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer1 = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer2 = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_SRCDATE}" +SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_SRCDATE}" +SRCDATE_opie-mediummount = "${OPIE_SRCDATE}" +SRCDATE_opie-memoryapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-mindbreaker = "${OPIE_SRCDATE}" +SRCDATE_opie-minesweep = "${OPIE_SRCDATE}" +SRCDATE_opie-mobilemsg = "${OPIE_SRCDATE}" +SRCDATE_opie-multikeyapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-multikey = "${OPIE_SRCDATE}" +SRCDATE_opie-networkapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-networksettings = "${OPIE_SRCDATE}" +SRCDATE_opie-notesapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-odict = "${OPIE_SRCDATE}" +SRCDATE_opie-osearch = "${OPIE_SRCDATE}" +SRCDATE_opie-oxygen = "${OPIE_SRCDATE}" +SRCDATE_opie-oyatzee = "${OPIE_SRCDATE}" +SRCDATE_opie-packagemanager = "${OPIE_SRCDATE}" +SRCDATE_opie-parashoot = "${OPIE_SRCDATE}" +SRCDATE_opie-pcmciaapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-performance = "${OPIE_SRCDATE}" +SRCDATE_opie-pickboard = "${OPIE_SRCDATE}" +SRCDATE_opie-pics = "${OPIE_SRCDATE}" +SRCDATE_opie-pimconverter = "${OPIE_SRCDATE}" +SRCDATE_opie-powerchord = "${OPIE_SRCDATE}" +SRCDATE_opie-pyquicklaunchapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-qasteroids = "${OPIE_SRCDATE}" +SRCDATE_opie-qcop = "${OPIE_SRCDATE}" +SRCDATE_opie-quicklauncher = "${OPIE_SRCDATE}" +SRCDATE_opie-qss = "${OPIE_SRCDATE}" +SRCDATE_opie-rdesktop = "${OPIE_SRCDATE}" +SRCDATE_opie-reader = "${OPIE_SRCDATE}" +SRCDATE_opie-recorder = "${OPIE_SRCDATE}" +SRCDATE_opie-remote = "${OPIE_SRCDATE}" +SRCDATE_opie-restartapplet2 = "${OPIE_SRCDATE}" +SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-rotateapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-screenshotapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-search = "${OPIE_SRCDATE}" +SRCDATE_opie-security = "${OPIE_SRCDATE}" +SRCDATE_opie-securityplugin-blueping = "${OPIE_SRCDATE}" +SRCDATE_opie-securityplugin-dummy = "${OPIE_SRCDATE}" +SRCDATE_opie-securityplugin-notice = "${OPIE_SRCDATE}" +SRCDATE_opie-securityplugin-pin = "${OPIE_SRCDATE}" +SRCDATE_opie-sfcave = "${OPIE_SRCDATE}" +SRCDATE_opie-sheet = "${OPIE_SRCDATE}" +SRCDATE_opie-sh = "${OPIE_SRCDATE}" +SRCDATE_opie-showimg = "${OPIE_SRCDATE}" +SRCDATE_opie-snake = "${OPIE_SRCDATE}" +SRCDATE_opie-solitaire = "${OPIE_SRCDATE}" +SRCDATE_opie-sshkeys = "${OPIE_SRCDATE}" +SRCDATE_opie-style-flat = "${OPIE_SRCDATE}" +SRCDATE_opie-style-fresh = "${OPIE_SRCDATE}" +SRCDATE_opie-style-liquid = "${OPIE_SRCDATE}" +SRCDATE_opie-style-metal = "${OPIE_SRCDATE}" +SRCDATE_opie-style-phase = "${OPIE_SRCDATE}" +SRCDATE_opie-style-web = "${OPIE_SRCDATE}" +SRCDATE_opie-sounds = "${OPIE_SRCDATE}" +SRCDATE_opie-suspendapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-symlinker = "${OPIE_SRCDATE}" +SRCDATE_opie-sysinfo = "${OPIE_SRCDATE}" +SRCDATE_opie-systemtime = "${OPIE_SRCDATE}" +SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}" +SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}" +SRCDATE_opie-taskbar = "${OPIE_SRCDATE}" +SRCDATE_opie-tetrix = "${OPIE_SRCDATE}" +SRCDATE_opie-textedit = "${OPIE_SRCDATE}" +SRCDATE_opie-theme = "${OPIE_SRCDATE}" +SRCDATE_opie-tictac = "${OPIE_SRCDATE}" +SRCDATE_opie-tinykate = "${OPIE_SRCDATE}" +SRCDATE_opie-today-addressbookplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-today-datebookplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-today-fortuneplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-today-mailplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-today = "${OPIE_SRCDATE}" +SRCDATE_opie-today-stocktickerplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-today-todolistplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-today-weatherplugin = "${OPIE_SRCDATE}" +SRCDATE_opie-todo = "${OPIE_SRCDATE}" +SRCDATE_opie-tonleiter = "${OPIE_SRCDATE}" +SRCDATE_opie-unikeyboard = "${OPIE_SRCDATE}" +SRCDATE_opie-usermanager = "${OPIE_SRCDATE}" +SRCDATE_opie-vmemo = "${OPIE_SRCDATE}" +SRCDATE_opie-vmemo-settings = "${OPIE_SRCDATE}" +SRCDATE_opie-volumeapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-vtapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-wellenreiter = "${OPIE_SRCDATE}" +SRCDATE_opie-wirelessapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-wordgame = "${OPIE_SRCDATE}" +SRCDATE_opie-write = "${OPIE_SRCDATE}" +SRCDATE_opie-zkbapplet = "${OPIE_SRCDATE}" +SRCDATE_opie-zlines = "${OPIE_SRCDATE}" +SRCDATE_opie-zsafe = "${OPIE_SRCDATE}" +SRCDATE_opie-zsame = "${OPIE_SRCDATE}" +SRCDATE_opie-sh-snes = "${OPIE_SRCDATE}" +SRCDATE_opie-stumbler = "${OPIE_SRCDATE}" + diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc index d7c5b94f7a..84c0b212ed 100644 --- a/conf/distro/include/preferred-opie-versions.inc +++ b/conf/distro/include/preferred-opie-versions.inc @@ -32,9 +32,9 @@ 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-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}" @@ -106,6 +106,7 @@ 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}" 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/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index f73fa22e34..9fd71d05d8 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -22,31 +22,32 @@ SRCDATE_xxf86vmext ?= "20060814" SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" SRCDATE_fstests ?= "20061122" -SRCDATE_eds-dbus ?= "20061215" +SRCDATE_eds-dbus ?= "20070215" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" SRCDATE_matchbox-config-gtk ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612" -SRCDATE_matchbox-keyboard ?= "20060612" +SRCDATE_matchbox-keyboard ?= "20060725" SRCDATE_matchbox-panel ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" -SRCDATE_psplash ?= "20061207" +SRCDATE_libmatchbox ?= "20060612" +SRCDATE_libfakekey ?= "20051101" +SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" -SRCDATE_libmimedir ?= "20060804" SRCDATE_gpesyncd ?= "20061128" # GNOME -SRCDATE_gconf-dbus ?= "20060719" -SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_gconf-dbus ?= "20070412" +SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" #Misc apps, sorted by alphabet diff --git a/conf/distro/include/slugos-packages.inc b/conf/distro/include/slugos-packages.inc deleted file mode 100644 index 650368a990..0000000000 --- a/conf/distro/include/slugos-packages.inc +++ /dev/null @@ -1,259 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/alsa/*.bb \ -${PKGDIR}/packages/apr/*.bb \ -${PKGDIR}/packages/asterisk/*.bb \ -${PKGDIR}/packages/asterisk-sounds/*.bb \ -${PKGDIR}/packages/atftp/*.bb \ -${PKGDIR}/packages/audiofile/*.bb \ -${PKGDIR}/packages/aumix/*.bb \ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/base-files/*.bb \ -${PKGDIR}/packages/base-passwd/*.bb \ -${PKGDIR}/packages/bash/*.bb \ -${PKGDIR}/packages/beep/*.bb \ -${PKGDIR}/packages/bind/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez/*.bb \ -${PKGDIR}/packages/bogofilter/*.bb \ -${PKGDIR}/packages/boost/*.bb \ -${PKGDIR}/packages/bridge-utils/*.bb \ -${PKGDIR}/packages/btsco/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/bwmon/*.bb \ -${PKGDIR}/packages/bzip2/*.bb \ -${PKGDIR}/packages/ccxstream/*.bb \ -${PKGDIR}/packages/cdparanoia/*.bb \ -${PKGDIR}/packages/cdstatus/*.bb \ -${PKGDIR}/packages/cherokee/*.bb \ -${PKGDIR}/packages/coreutils/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/cron/*.bb \ -${PKGDIR}/packages/ctorrent/*.bb \ -${PKGDIR}/packages/ctrlproxy/*.bb \ -${PKGDIR}/packages/curl/*.bb \ -${PKGDIR}/packages/cvs/*.bb \ -${PKGDIR}/packages/cyrus-imapd/*.bb \ -${PKGDIR}/packages/cyrus-sasl/*.bb \ -${PKGDIR}/packages/davfs2/*.bb \ -${PKGDIR}/packages/db/*.bb \ -${PKGDIR}/packages/dbus/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/device-mapper/*.bb \ -${PKGDIR}/packages/devlabel/*.bb \ -${PKGDIR}/packages/dhcp/*.bb \ -${PKGDIR}/packages/didiwiki/*.bb \ -${PKGDIR}/packages/diffstat/*.bb \ -${PKGDIR}/packages/diffutils/*.bb \ -${PKGDIR}/packages/dnsmasq/*.bb \ -${PKGDIR}/packages/docbook-utils/*.bb \ -${PKGDIR}/packages/dropbear/*.bb \ -${PKGDIR}/packages/dsniff/*.bb \ -${PKGDIR}/packages/e2fsprogs/*.bb \ -${PKGDIR}/packages/e2fsprogs-libs/*.bb \ -${PKGDIR}/packages/eciadsl/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${PKGDIR}/packages/ez-ipupdate/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/fetchmail/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flac/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/ftpd-topfield/*.bb \ -${PKGDIR}/packages/gawk/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/gd/*.bb \ -${PKGDIR}/packages/gdb/*.bb \ -${PKGDIR}/packages/gdbm/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glib-1.2/*.bb \ -${PKGDIR}/packages/glib-2.0/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/gnutls/*.bb \ -${PKGDIR}/packages/gphoto2/*.bb \ -${PKGDIR}/packages/gpsd/*.bb \ -${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ -${PKGDIR}/packages/gtk-doc/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${PKGDIR}/packages/hal/*.bb \ -${PKGDIR}/packages/hotplug-ng/*.bb \ -${PKGDIR}/packages/icecast/*.bb \ -${PKGDIR}/packages/ifupdown/*.bb \ -${PKGDIR}/packages/initscripts/*.bb \ -${PKGDIR}/packages/install/*.bb \ -${PKGDIR}/packages/intltool/*.bb \ -${PKGDIR}/packages/iperf/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/iptables/*.bb \ -${PKGDIR}/packages/ircp/*.bb \ -${PKGDIR}/packages/irssi/*.bb \ -${PKGDIR}/packages/ixp425-eth/*.bb \ -${PKGDIR}/packages/ixp4xx/*.bb \ -${PKGDIR}/packages/joe/*.bb \ -${PKGDIR}/packages/jpeg/*.bb \ -${PKGDIR}/packages/lcdproc/*.bb \ -${PKGDIR}/packages/less/*.bb \ -${PKGDIR}/packages/libaal/*.bb \ -${PKGDIR}/packages/libao/*.bb \ -${PKGDIR}/packages/libdvb/*.bb \ -${PKGDIR}/packages/libexif/*.bb \ -${PKGDIR}/packages/libgcrypt/*.bb \ -${PKGDIR}/packages/libgpg-error/*.bb \ -${PKGDIR}/packages/libgphoto2/*.bb \ -${PKGDIR}/packages/libgsm/*.bb \ -${PKGDIR}/packages/libiconv/*.bb \ -${PKGDIR}/packages/libid3tag/*.bb \ -${PKGDIR}/packages/liblockfile/*.bb \ -${PKGDIR}/packages/libmad/*.bb \ -${PKGDIR}/packages/libmikmod/*.bb \ -${PKGDIR}/packages/libnet/*.bb \ -${PKGDIR}/packages/libnids/*.bb \ -${PKGDIR}/packages/libogg/*.bb \ -${PKGDIR}/packages/libol/*.bb \ -${PKGDIR}/packages/libpcap/*.bb \ -${PKGDIR}/packages/libpng/*.bb \ -${PKGDIR}/packages/libtiff/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/libusb/*.bb \ -${PKGDIR}/packages/libvorbis/*.bb \ -${PKGDIR}/packages/libxml/*.bb \ -${PKGDIR}/packages/libxslt/* \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/lirc/*.bb \ -${PKGDIR}/packages/lrzsz/*.bb \ -${PKGDIR}/packages/lsof/*.bb \ -${PKGDIR}/packages/lvm2/*.bb \ -${PKGDIR}/packages/lzo/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/madplay/*.bb \ -${PKGDIR}/packages/madwifi/*.bb \ -${PKGDIR}/packages/mailx/*.bb \ -${PKGDIR}/packages/make/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/man-pages/*.bb \ -${PKGDIR}/packages/man/*.bb \ -${PKGDIR}/packages/masqmail/*.bb \ -${PKGDIR}/packages/mdadm/*.bb \ -${PKGDIR}/packages/memtester/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/mgetty/*.bb \ -${PKGDIR}/packages/miau/*.bb \ -${PKGDIR}/packages/microcom/*.bb \ -${PKGDIR}/packages/minicom/*.bb \ -${PKGDIR}/packages/module-init-tools/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/monotone/*.bb \ -${PKGDIR}/packages/motion/*.bb \ -${PKGDIR}/packages/mt-daapd/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/musicpd/*.bb \ -${PKGDIR}/packages/mutt/*.bb \ -${PKGDIR}/packages/mysql/*.bb \ -${PKGDIR}/packages/nail/*.bb \ -${PKGDIR}/packages/nano/*.bb \ -${PKGDIR}/packages/ncftp/*.bb \ -${PKGDIR}/packages/ncurses/*.bb \ -${PKGDIR}/packages/neon/*.bb \ -${PKGDIR}/packages/netbase/*.bb \ -${PKGDIR}/packages/netcat/*.bb \ -${PKGDIR}/packages/netpbm/*.bb \ -${PKGDIR}/packages/nfs-utils/*.bb \ -${PKGDIR}/packages/nis/*.bb \ -${PKGDIR}/packages/nmap/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/ntp/*.bb \ -${PKGDIR}/packages/obexftp/*.bb \ -${PKGDIR}/packages/openjade/*.bb \ -${PKGDIR}/packages/openldap/*.bb \ -${PKGDIR}/packages/openntpd/*.bb \ -${PKGDIR}/packages/openobex/*.bb \ -${PKGDIR}/packages/opensp/*.bb \ -${PKGDIR}/packages/openssh/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/openvpn/*.bb \ -${PKGDIR}/packages/pam/*.bb \ -${PKGDIR}/packages/patch/*.bb \ -${PKGDIR}/packages/patcher/*.bb \ -${PKGDIR}/packages/patchutils/*.bb \ -${PKGDIR}/packages/pciutils/*.bb \ -${PKGDIR}/packages/pcmcia-cs/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/perl/*.bb \ -${PKGDIR}/packages/php/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/popt/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/postfix/*.bb \ -${PKGDIR}/packages/ppp/*.bb \ -${PKGDIR}/packages/procps/*.bb \ -${PKGDIR}/packages/psmisc/*.bb \ -${PKGDIR}/packages/puppy/*.bb \ -${PKGDIR}/packages/pvrusb2-mci/*.bb \ -${PKGDIR}/packages/pwc/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/qc-usb/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/radlib/*.bb \ -${PKGDIR}/packages/readline/*.bb \ -${PKGDIR}/packages/reiser4progs/*.bb \ -${PKGDIR}/packages/reiserfsprogs/*.bb \ -${PKGDIR}/packages/rsync/*.bb \ -${PKGDIR}/packages/samba/*.bb \ -${PKGDIR}/packages/sane-backends/*.bb \ -${PKGDIR}/packages/screen/*.bb \ -${PKGDIR}/packages/sed/*.bb \ -${PKGDIR}/packages/setpwc/*.bb \ -${PKGDIR}/packages/setserial/*.bb \ -${PKGDIR}/packages/sgml-common/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/slugos-init/*.bb \ -${PKGDIR}/packages/spca5xx/*.bb \ -${PKGDIR}/packages/ssmtp/*.bb \ -${PKGDIR}/packages/strace/*.bb \ -${PKGDIR}/packages/streamripper/*.bb \ -${PKGDIR}/packages/subversion/*.bb \ -${PKGDIR}/packages/sudo/*.bb \ -${PKGDIR}/packages/sysfsutils/*.bb \ -${PKGDIR}/packages/syslog-ng/*.bb \ -${PKGDIR}/packages/sysvinit/*.bb \ -${PKGDIR}/packages/tar/*.bb \ -${PKGDIR}/packages/tcltk/*.bb \ -${PKGDIR}/packages/thttpd/*.bb \ -${PKGDIR}/packages/time/*.bb \ -${PKGDIR}/packages/timezones/*.bb \ -${PKGDIR}/packages/tinylogin/*.bb \ -${PKGDIR}/packages/uclibc/*.bb \ -${PKGDIR}/packages/udev/*.bb \ -${PKGDIR}/packages/unionfs/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/update-rc.d/*.bb \ -${PKGDIR}/packages/upslug/*.bb \ -${PKGDIR}/packages/usbutils/*.bb \ -${PKGDIR}/packages/util-linux/*.bb \ -${PKGDIR}/packages/vim/*.bb \ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/vpnc/*.bb \ -${PKGDIR}/packages/vsftpd/*.bb \ -${PKGDIR}/packages/w3cam/*.bb \ -${PKGDIR}/packages/wakelan/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/whois/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/wpa-supplicant/*.bb \ -${PKGDIR}/packages/wview/*.bb \ -${PKGDIR}/packages/xlibs/*.bb \ -${PKGDIR}/packages/xextensions/*.bb \ -${PKGDIR}/packages/xinetd/*.bb \ -${PKGDIR}/packages/xproto/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${PKGDIR}/packages/zip/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${SLUGOS_EXTRA_BBFILES}" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b255e85488..4c7dd422c3 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -3,29 +3,7 @@ #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 # WARNING: this file should not be used directly, use one of -# the supported slugos-???.conf instead: - -# Explanation of the naming -# -# slugos-dist - the base distro configuration for an NSLU2 -# slugos-[bl][at][gu] - a specific configuration encoded as follows: -# -# b or l - big or little endian -# set ARCH_BYTE_SEX to match -# -# a or t - ARM or Thumb instructions in the low level libraries -# set ARM_INSTRUCTION_SET to match -# -# g or u - glibc or uclibc libc implementation -# set TARGET_OS to match -# -# The following names are deprecated: -# -# openslug - the historical name of a canonical slugos-bag distro -# also the name of a standard slugos-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of slugos-btu -# also the name of a standard slugos-btu distro with a package feed -# +# the supported slugos-derived distributions instead. #---------------------------------------------------------------------------------- # STANDARD SLUGOS DEFINITIONS @@ -34,28 +12,25 @@ # #DISTRO_NAME #DISTRO_TYPE +#ARM_INSTRUCTION_SET "arm" or "thumb" +#TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.1" +SLUGOS_VERSION = "4.4" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" -# The following must also be set, they define the basic format of the build -# -#ARCH_BYTE_SEX "be" or "le" -#ARM_INSTRUCTION_SET "arm" or "thumb" -#TARGET_OS "linux" or "linux-uclibc" -#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) +IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}" # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" USE_NLS ?= "no" # To make errors easier to identify: -DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" +DISTRO_NAME ?= "INVALID-${SITEINFO_ENDIANESS}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" DISTRO_TYPE ?= "INVALID" # The following must not be changed. @@ -64,21 +39,11 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian" - -DISTRO_BASE = ":slugos" +INHERIT += "package_ipk debian multimachine" -# packages/meta/slugos-image.bb generates a binary image of the root file system -# with a name controlled by the following setting - it defaults to the top level -# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g. -# if you change the DISTRO from one of the standard ones in a way which does not -# change the generated image). -SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" - -# pull in the frozen list of bbfiles - this sets BBFILES and this will override any -# setting in local.conf Since this depends on ${DISTRO} it doesn't actually do -# anything by default unless conf/distro/${DISTRO}-packages.conf exists. -# require conf/distro/include/freeze.conf +# FULL_OPTIMIZATION +# Optimization settings. Os works fine and is significantly better than O2. +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" #---------------------------------------------------------------------------------- # FEEDS @@ -86,21 +51,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # when downloading new packages or updating existing packages. Additional feeds # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- -# Add to the user's feeds from local.conf (there may be none). -# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which -# will work on any derived distro. The slugos-???.conf files set the FEED_URIS to -# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building -# such a feed: -# -#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}" -#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}" # -# When such a feed exists the corresponding 'unstable' feed will normally also -# exist - the packages in unstable are the latest but very unlikely to be the -# greatest. Use at your own risk! -# -#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable" -#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable" +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION @@ -113,20 +66,6 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" -# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete -# 8MByte flash image will be built after the rootfs JFFS2 image. Other options -# may later be defined for other vendor-flashable image types. -# -# If you do this you will need to find a source for the LinkSys software to be -# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch -# of bytes to flag the image as valid) and 'SysConf' (actually just a block of -# unset data - you could modify this to pre-configure the SysConf partition of the -# image). If you own an NSLU2 then this data is already in the flash of the NSLU2 -# and you can download it (including new versions) from the LinkSys web site - see -# packages/meta/slugos-image.bb for information about where to put the downloaded -# data. -SLUGOS_FLASH_IMAGE ?= "no" - # EXTRA PACKAGES # -------------- # SlugOS builds an image with no extra packages - to add packages to the @@ -139,7 +78,9 @@ SLUGOS_FLASH_IMAGE ?= "no" # # Everything in this list gets added to the flash image, along with any RDEPENDS # it has itself! -SLUGOS_EXTRA_RDEPENDS ?= "" +DISTRO_EXTRA_DEPENDS ?= "" +DISTRO_EXTRA_RDEPENDS ?= "" +DISTRO_EXTRA_RRECOMMENDS ?= "" #---------------------------------------------------------------------------------- # PACKAGE VERSION CONTROL @@ -156,8 +97,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# compiler/binary/library versions (unslung uses different ones so these -# cannot be in ${MACHINE}.conf) +# compiler/binary/library versions PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.16" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" @@ -171,15 +111,12 @@ 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.19" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" -# Latest wpa-supplicant which supports madwifi-ng -PREFERRED_VERSION_wpa-supplicant ?= "0.5.1" - # Ensure consistency across all SlugOS builds for the provider of a # relational database - use the latest version of the SleepyCat # Berkeley database @@ -194,8 +131,17 @@ 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" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" + +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"
\ No newline at end of file diff --git a/conf/distro/include/ucslugc-packages.inc b/conf/distro/include/ucslugc-packages.inc deleted file mode 100644 index 3b3e9fca75..0000000000 --- a/conf/distro/include/ucslugc-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/unslung-packages.inc b/conf/distro/include/unslung-packages.inc deleted file mode 100644 index e889a65df5..0000000000 --- a/conf/distro/include/unslung-packages.inc +++ /dev/null @@ -1,41 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/genext2fs/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${UNSLUNG_EXTRA_BBFILES}" |