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

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/05 22:37:02+02:00 utwente.nl!koen
tslib-maemo_0.0.1-15.bb:  tweak tslib-maemo a bit, courtesy Florian Boor
nokia770.conf:  tweak preferred providers, courtesy Florian Boor

2005/06/05 21:11:14+01:00 reciva.com!pb
shuffle some gcc DEFAULT_PREFERENCEs around


BKrev: 42a36329ZV-DIwINptN5D_Kt7mt5LA

4 files changed, 78 insertions, 3 deletions

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index fafcd13b4e..f1e2b96a34 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -4,9 +4,11 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive-omap"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
-PREFERRED_PROVIDER_tslib = "tslib-maemo"
+PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo"
+
+XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
@@ -27,7 +29,7 @@ EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no
 SERIAL_CONSOLE = "115200 ttyS0"
 
 
-#buid omap1 till nokia releases the patches
+#build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index e69de29bb2..ddc9db60bf 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -0,0 +1,14 @@
+PR = "r0"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+
+inherit autotools gettext
+
+include gcc-package.inc
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2"
+
+include gcc4-build.inc
diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-20050603.bb
index e69de29bb2..59b209c6d7 100644
--- a/packages/gcc/gcc_csl-arm-20050603.bb
+++ b/packages/gcc/gcc_csl-arm-20050603.bb
@@ -0,0 +1,15 @@
+include gcc_csl-arm.bb
+
+PV = "3.4.4+csl-arm-${CVSDATE}"
+BINV = "3.4.4"
+
+SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
+
+PR = "r0"
+
+CVSDATE = "20050603"
+OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
+
+DEFAULT_PREFERENCE_arm = "1"
+DEFAULT_PREFERENCE_armeb = "1"
+
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index e69de29bb2..28a5f00fa9 100644
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -0,0 +1,44 @@
+SECTION = "base"
+DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
+PR = "r1"
+PROVIDES = "virtual/tslib"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+PACKAGE_ARCH_tslib-conf = "${MACHINE}"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \
+	   file://ts.conf \
+	   file://tslib.sh"
+
+S = "${WORKDIR}/tslib"
+LICENSE = "LGPL"
+CONFFILES_${PN} = "${sysconfdir}/ts.conf"
+
+inherit autotools
+
+PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate"
+EXTRA_OECONF = "--enable-shared"
+
+do_stage () {
+	oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
+	ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so
+	install -m 0644 src/tslib.h ${STAGING_INCDIR}/
+	install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/
+}
+
+do_install_prepend () {
+	install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
+}
+
+RDEPENDS_libts-maemo = "tslib-maemo-conf"
+
+FILES_tslib-maemo-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
+FILES_libts-maemo = "${libdir}/*.so.* ${datadir}/ts/plugins/*.so*"
+FILES_libts-maemo-dev = "${FILES_tslib-maemo-dev}"
+FILES_tslib-maemo-calibrate += "${bindir}/ts_calibrate"
+FILES_tslib-maemo-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test"