Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/27 15:27:35+02:00 uni-frankfurt.de!mickeyl
update openzaurus-3.5.4.conf and sharprom-compatible.conf

BKrev: 426f935bdwt63FIyq5wbvjD0CpVTSQ

diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index bd20f31..3730056 100644 (file)
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
        console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
        devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = "20050415"
+CVSDATE = "20050428"
 
 #
 # Zaurus
@@ -39,7 +39,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 #
 
 PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_konqueror-embedded = "20030705"
 
 OPIE_VERSION = "1.2.1"
 include conf/distro/preferred-opie-versions.inc
@@ -49,7 +48,6 @@ include conf/distro/preferred-opie-versions.inc
 #
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-GPE_EXTRA_INSTALL += " gsoko"
 
 include conf/distro/preferred-gpe-versions.inc
 

diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 58a6e15..02dd6ae 100644 (file)
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -9,7 +9,11 @@
 INHERIT += " package_ipk debian"
 TARGET_OS = "linux"
 TARGET_FPU = ""
+TARGET_ARCH = "arm"
 TARGET_CC_ARCH = "-march=armv4"
+export CC = "ccache arm-linux-gcc-2.95"
+export CPP = "arm-linux-gcc-2.95 -E"
+export LD = "arm-linux-ld-2.11.2"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 
 DISTRO = "sharprom"
@@ -37,8 +41,8 @@ KERNEL_CONSOLE = "tty1"
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross"
 ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc"
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial
+ASSUME_PROVIDED += "virtual/libc linux-libc-headers"
 
-PREFERRED_VERSION_glibc = "2.2.5"
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 
 #