aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Schurig <schurig@mn-solutions.de>2005-02-18 13:15:45 +0000
committerHolger Schurig <schurig@mn-solutions.de>2005-02-18 13:15:45 +0000
commit81492c514b568326be1f65b65584cee1cd334e56 (patch)
tree3c106ac3df92596f1b7443afd1391c16dc2465d7
parentbe3648e62c8d067f46edb6385af4184d7d31fb87 (diff)
downloadopenembedded-81492c514b568326be1f65b65584cee1cd334e56.tar.gz
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/18 13:55:10+01:00 uni-frankfurt.de!mickeyl add some spitz'isms to qte 2005/02/18 13:40:13+01:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into marcinj.local:/home/hrw/zaurus/bb/openembedded 2005/02/18 13:39:44+01:00 local!hrw updated mtd to 2005-02-17 BKrev: 4215ea81xV70hXV2_wCPn1rsGqKLvQ
-rw-r--r--packages/mtd/mtd-utils-native_20050217.bb (renamed from packages/mtd/mtd-utils-native_20050128.bb)0
-rw-r--r--packages/mtd/mtd-utils_20050128.bb34
-rw-r--r--packages/mtd/mtd-utils_20050217.bb0
-rw-r--r--packages/qte/qte_2.3.10.bb4
4 files changed, 3 insertions, 35 deletions
diff --git a/packages/mtd/mtd-utils-native_20050128.bb b/packages/mtd/mtd-utils-native_20050217.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd-utils-native_20050128.bb
+++ b/packages/mtd/mtd-utils-native_20050217.bb
diff --git a/packages/mtd/mtd-utils_20050128.bb b/packages/mtd/mtd-utils_20050128.bb
deleted file mode 100644
index 6b457d52d7..0000000000
--- a/packages/mtd/mtd-utils_20050128.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Tools for managing memory technology devices."
-SECTION = "base"
-DEPENDS = "zlib"
-HOMEPAGE = "http://www.linux-mtd.infradead.org/"
-LICENSE = "GPLv2"
-mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
- mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
- flashcp nandwrite jffs2dump"
-PR = "r2"
-
-SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \
- file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
- file://more-verbosity.patch;patch=1"
-S = "${WORKDIR}/mtd/"
-
-CFLAGS_prepend = "-I${S}/include "
-
-do_compile () {
- oe_runmake -C util ${mtd_utils}
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/mtd
- for f in ${S}/include/mtd/*.h; do
- install -m 0644 $f ${STAGING_INCDIR}/mtd/
- done
-}
-
-do_install () {
- install -d ${D}${bindir}
- for binary in ${mtd_utils}; do
- install -m 0755 util/$binary ${D}${bindir}
- done
-}
diff --git a/packages/mtd/mtd-utils_20050217.bb b/packages/mtd/mtd-utils_20050217.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mtd/mtd-utils_20050217.bb
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index f898cca078..56d135e19a 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
file://qpe.patch;patch=1 \
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
SRC_URI_append_simpad = "file://devfs.patch;patch=1 "
SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
+SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
SRC_URI_append_beagle = "file://beagle.patch;patch=1 "
SRC_URI_append_jornada720 = "file://kernel-keymap.patch;patch=1 "
@@ -72,6 +73,7 @@ EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_jornada720 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
EXTRA_DEFINES_beagle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_BEAGLE"
EXTRA_DEFINES_ramses = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS"