diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-08 02:40:07 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-08 02:40:07 +0000 |
| commit | 0ff77391ed2b7599e7c99f233c707bb27338a6fd (patch) | |
| tree | 0a4a7b13957ecca8987b60b476facca3b628fa3f /conf | |
| parent | b686d0b3b4db8d5f795a5ed479ca6da008e7cc9b (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/08 03:16:08+01:00 uni-frankfurt.de!mickeyl
workaround parsing error in opie-taskbar
2005/01/08 03:01:20+01:00 uni-frankfurt.de!mickeyl
Merge
2005/01/08 02:58:47+01:00 uni-frankfurt.de!mickeyl
more adjustments for an openzaurus image w/ kernel 2.6
2005/01/08 02:57:34+01:00 uni-frankfurt.de!mickeyl
compile scripts/genksyms in kernel builds. this is needed for external modules
2005/01/07 20:54:57+01:00 uni-frankfurt.de!mickeyl
openzaurus-2.6: add defconfig for combined machine
BKrev: 41df4807VWBmhl2Rfn7MdKt1lbGHOw
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openzaurus-3.5.3.conf | 18 | ||||
| -rw-r--r-- | conf/machine/openzaurus-pxa-2.6.conf | 10 |
2 files changed, 20 insertions, 8 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index b9e7707edc..4c068d96ce 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -5,13 +5,13 @@ DISTRO_VERSION = "3.5.2-snapshot-${DATE}" # DISTRO_VERSION = "3.5.3" FEED_URIS += " \ - upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ \ - base##http://openzaurus.org/official/unstable/3.5.3/feed/base/ \ - libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/ \ - console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ - devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" + upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/ \ + base##http://openzaurus.org/official/unstable/3.5.2/feed/base/ \ + libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/ \ + console##http://openzaurus.org/official/unstable/3.5.2/feed/console \ + devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel" -CVSDATE = "20050103" +CVSDATE = "20050107" ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie" PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive" @@ -36,7 +36,7 @@ CVSDATE_ipkg-utils-native = "20041215" PREFERRED_VERSION_binutils-cross = "2.15.91.0.2" PREFERRED_VERSION_libtool-native = "1.5.6" PREFERRED_VERSION_libtool-cross= "1.5.6" -PREFERRED_VERSION_orinoco-modules = "0.13e" +# PREFERRED_VERSION_orinoco-modules = "0.13e" PREFERRED_VERSION_glibc = "2.3.2+cvs20040726" PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22" PREFERRED_VERSION_bluez-utils-dbus = "2.11" @@ -47,7 +47,9 @@ PREFERRED_VERSION_bluez-utils-dbus = "2.11" OPIE_VERSION = "1.1.8" include conf/distro/preferred-opie-versions.inc -PREFERRED_VERSION_libopie2 = "the-latest-please" +PREFERRED_VERSION_libopie2 = "the-latest-please" +PREFERRED_VERSION_libqpe-opie = "the-latest-please" +PREFERRED_VERSION_opie-taskbar = "the-latest-please" # # GPE diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf index e69de29bb2..3542659830 100644 --- a/conf/machine/openzaurus-pxa-2.6.conf +++ b/conf/machine/openzaurus-pxa-2.6.conf @@ -0,0 +1,10 @@ +#@TYPE: Machine +#@NAME: Sharp Zaurus SL-C700,Sharp Zaurus SL-C750,Sharp Zaurus SL-C760 +#@DESCRIPTION: Machine configuration for the Sharp Zaurus PXA devices running a 2.6 kernel + +include conf/machine/zaurus-clamshell.conf + +PREFERRED_PROVIDER_virtual/kernel = "openzaurus" +PREFERRED_VERSION_orinoco-modules = "20050101" + +ROOT_FLASH_SIZE = "64" |