diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/distro/openzaurus-3.5.3.conf | 3 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions.inc | 140 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 6 | ||||
| -rw-r--r-- | conf/machine/poodle-2.6.conf | 6 | ||||
| -rw-r--r-- | conf/machine/poodle.conf | 5 | ||||
| -rw-r--r-- | conf/machine/tosa-2.4.conf | 0 | ||||
| -rw-r--r-- | conf/machine/tosa-2.6.conf | 0 | ||||
| -rw-r--r-- | conf/machine/tosa.conf | 26 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell.conf | 5 |
11 files changed, 95 insertions, 100 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2b99e29b0a..ff3c6348e2 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -288,7 +288,7 @@ GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://aleron.dl.sourceforge.net/sourceforge" GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source" -XLIBS_MIRROR = "http://freedesktop.org/~xlibs/release" +XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs" diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index 3b7aa1994e..f051f7b5ad 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -47,9 +47,8 @@ include conf/distro/preferred-opie-versions.inc # GPE # -CVSDATE_xserver-kdrive = "20050208" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" include conf/distro/preferred-gpe-versions.inc diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index 0851c2e696..f33302d741 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/preferred-gpe-versions.inc @@ -6,74 +6,74 @@ #CVSDATE_xserver-kdrive=20050207 #specify versions, as the header says :) -PREFERRED_VERSION_libmatchbox = "1.6" -PREFERRED_VERSION_matchbox = "0.9.1" -PREFERRED_VERSION_matchbox-common = "0.9.1" -PREFERRED_VERSION_matchbox-desktop = "0.9.1" -PREFERRED_VERSION_matchbox-wm = "0.9.3" -PREFERRED_VERSION_matchbox-panel = "0.9.1" -PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6" -PREFERRED_VERSION_gtk+ = "2.6.3" -PREFERRED_VERSION_libgpewidget = "0.97" -PREFERRED_VERSION_libgpepimc = "0.4" -PREFERRED_VERSION_libgpevtype = "0.11" -PREFERRED_VERSION_libschedule = "0.14" -PREFERRED_VERSION_gpe-icons = "0.24" -PREFERRED_VERSION_libgsm = "1.0.10" -#PREFERRED_VERSION_diet-x11 = "6.2.1" -PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1" -PREFERRED_VERSION_rxvt-unicode = "5.3" -PREFERRED_VERSION_gtk2-theme-angelistic = "0.3" -PREFERRED_VERSION_xst = "0.14" -PREFERRED_VERSION_xextensions = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost = "0.0cvs20040413" -PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_gpe-login = "0.76" -PREFERRED_VERSION_gpe-session-scripts = "0.62" -PREFERRED_VERSION_gpe-soundserver = "0.4-1" -PREFERRED_VERSION_gpe-todo = "0.50" -PREFERRED_VERSION_gpe-calendar = "0.61" -PREFERRED_VERSION_gpe-sketchbox = "0.2.8" -PREFERRED_VERSION_gpe-contacts = "0.36" -PREFERRED_VERSION_gpe-today = "0.08" -PREFERRED_VERSION_matchbox-panel-manager = "0.1" -PREFERRED_VERSION_dbus = "0.23" -PREFERRED_VERSION_gpe-bluetooth = "0.38" -PREFERRED_VERSION_gpe-su = "0.18" -PREFERRED_VERSION_gpe-conf = "0.1.22" -PREFERRED_VERSION_gpe-clock = "0.20" -PREFERRED_VERSION_gpe-mininet = "0.5" -PREFERRED_VERSION_gpe-mixer = "0.40" -PREFERRED_VERSION_gpe-shield = "0.7" -PREFERRED_VERSION_gpe-wlancfg = "0.2.6" -PREFERRED_VERSION_gpe-taskmanager = "0.17" -PREFERRED_VERSION_keylaunch = "2.0.7" -PREFERRED_VERSION_minilite = "0.47" -PREFERRED_VERSION_xmonobut = "0.4" -PREFERRED_VERSION_gpe-edit = "0.28" -PREFERRED_VERSION_gpe-gallery = "0.95" -PREFERRED_VERSION_gpe-calculator = "0.2" -PREFERRED_VERSION_gpe-package = "0.2" -PREFERRED_VERSION_gpe-soundbite = "1.0.5" -PREFERRED_VERSION_gpe-terminal = "1.1" -PREFERRED_VERSION_gpe-watch = "0.10" -PREFERRED_VERSION_gpe-what = "0.33" -PREFERRED_VERSION_gpe-filemanager = "0.20" -PREFERRED_VERSION_gpe-go = "0.05" -PREFERRED_VERSION_gpe-irc = "0.07" -PREFERRED_VERSION_gpe-lights = "0.13" -#PREFERRED_VERSION_gpe-nmf = "0.19" -PREFERRED_VERSION_gpe-othello = "0.2-1" -PREFERRED_VERSION_gpe-plucker = "0.2" -PREFERRED_VERSION_gpe-tetris = "0.6-2" -PREFERRED_VERSION_gsoko = "0.4.2-gpe6" -PREFERRED_VERSION_xdemineur = "2.1.1" -PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1" -PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_dillo2 = "0.6.6" -PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_linphone-hh = "0.12.2.hh1" -PREFERRED_VERSION_linphone = "0.12.2" -PREFERRED_VERSION_firefox = "1.0" +PREFERRED_VERSION_libmatchbox ?= "1.6" +PREFERRED_VERSION_matchbox ?= "0.9.1" +PREFERRED_VERSION_matchbox-common ?= "0.9.1" +PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" +PREFERRED_VERSION_matchbox-wm ?= "0.9.3" +PREFERRED_VERSION_matchbox-panel ?= "0.9.1" +PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" +PREFERRED_VERSION_gtk+ ?= "2.6.3" +PREFERRED_VERSION_libgpewidget ?= "0.97" +PREFERRED_VERSION_libgpepimc ?= "0.4" +PREFERRED_VERSION_libgpevtype ?= "0.11" +PREFERRED_VERSION_libschedule ?= "0.14" +PREFERRED_VERSION_gpe-icons ?= "0.24" +PREFERRED_VERSION_libgsm ?= "1.0.10" +#PREFERRED_VERSION_diet-x11 ?= "6.2.1" +PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" +PREFERRED_VERSION_rxvt-unicode ?= "5.3" +PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" +PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xhost ?= "0.0cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_gpe-login ?= "0.76" +PREFERRED_VERSION_gpe-session-scripts ?= "0.62" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" +PREFERRED_VERSION_gpe-todo ?= "0.50" +PREFERRED_VERSION_gpe-calendar ?= "0.61" +PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" +PREFERRED_VERSION_gpe-contacts ?= "0.36" +PREFERRED_VERSION_gpe-today ?= "0.08" +PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" +PREFERRED_VERSION_dbus ?= "0.23" +PREFERRED_VERSION_gpe-bluetooth ?= "0.38" +PREFERRED_VERSION_gpe-su ?= "0.18" +PREFERRED_VERSION_gpe-conf ?= "0.1.22" +PREFERRED_VERSION_gpe-clock ?= "0.20" +PREFERRED_VERSION_gpe-mininet ?= "0.5" +PREFERRED_VERSION_gpe-mixer ?= "0.40" +PREFERRED_VERSION_gpe-shield ?= "0.7" +PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" +PREFERRED_VERSION_gpe-taskmanager ?= "0.17" +PREFERRED_VERSION_keylaunch ?= "2.0.7" +PREFERRED_VERSION_minilite ?= "0.47" +PREFERRED_VERSION_xmonobut ?= "0.4" +PREFERRED_VERSION_gpe-edit ?= "0.28" +PREFERRED_VERSION_gpe-gallery ?= "0.95" +PREFERRED_VERSION_gpe-calculator ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.2" +PREFERRED_VERSION_gpe-soundbite ?= "1.0.5" +PREFERRED_VERSION_gpe-terminal ?= "1.1" +PREFERRED_VERSION_gpe-watch ?= "0.10" +PREFERRED_VERSION_gpe-what ?= "0.33" +PREFERRED_VERSION_gpe-filemanager ?= "0.20" +PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-irc ?= "0.07" +PREFERRED_VERSION_gpe-lights ?= "0.13" +#PREFERRED_VERSION_gpe-nmf ?= "0.19" +PREFERRED_VERSION_gpe-othello ?= "0.2-1" +PREFERRED_VERSION_gpe-plucker ?= "0.2" +PREFERRED_VERSION_gpe-tetris ?= "0.6-2" +PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" +PREFERRED_VERSION_xdemineur ?= "2.1.1" +PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" +PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_dillo2 ?= "0.6.6" +PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" +PREFERRED_VERSION_linphone ?= "0.12.2" +PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index df20c0647a..35f1de8ec4 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -2,10 +2,12 @@ #@NAME: Unslung #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 -FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable" +FEED_URIS_cross = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross" +FEED_URIS_native = "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" +FEED_URIS_oe = "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" DISTRO_NAME = "Unslung" -DISTRO_VERSION = "4.5-alpha" +DISTRO_VERSION = "4.7-alpha" DISTRO_TYPE = "beta" TARGET_FPU = "soft" diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf index e69de29bb2..72a751d19e 100644 --- a/conf/machine/poodle-2.6.conf +++ b/conf/machine/poodle-2.6.conf @@ -0,0 +1,6 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_orinoco-modules = "0.13e-26" + +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" + diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 458ee554bd..3bd9f5f076 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -14,8 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/tosa-2.4.conf diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/tosa-2.6.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index be495925c1..f742bed742 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -4,24 +4,9 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \ - orinoco-modules sharp-sdmmc-support usbutils" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \ - kernel-module-evdev kernel-module-net-fd \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel-module-usb-storage \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre \ - kernel-module-irnet kernel-module-ipip kernel-module-usbcore \ - kernel-module-usbdcore kernel-module-usbdmonitor" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" + +KERNEL_VERSION ?= "2.4" +include conf/machine/tosa-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" @@ -31,7 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 530d12af0b..e408c5c86e 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -1,6 +1,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -PREFERRED_VERSION_orinoco-modules = "cvs" +PREFERRED_VERSION_orinoco-modules = "0.13e-26" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index 9246d45197..e0b8d31349 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -16,7 +16,8 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed" GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" |