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

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

2005/01/16 20:33:29+01:00 uni-frankfurt.de!mickeyl
fix update-rc.d typo on gpsd

2005/01/16 20:17:38+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/16 14:20:02-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/16 14:19:54-05:00 handhelds.org!kergoth
Fix the initscripts DEPENDS for 'openzaurus' distro, which is why image builds have been failing due to missing 'makedevs'.

2005/01/16 19:15:05+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/16 19:00:17+01:00 uni-frankfurt.de!mickeyl
qte: slightly improve keyboard stuff on 2.6

BKrev: 41eac318Ens9ZnPxPNrsN0JAx6bM_g

diff --git a/packages/gpsd/gpsd_2.6.bb b/packages/gpsd/gpsd_2.6.bb
index cfa95b4..e89d775 100644 (file)
--- a/packages/gpsd/gpsd_2.6.bb
+++ b/packages/gpsd/gpsd_2.6.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "http://ftp.berlios.de/gpsd/gpsd-${PV}.tar.gz"
 
-inherit autotools updater-rc.d
+inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 06aa140..3aadf3d 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
-DEPENDS_openzaurus = "virtual/kernel"
+DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
 PR = "r28"

diff --git a/packages/qte/qte-2.3.9-snapshot/use-kernel-keycodes.patch b/packages/qte/qte-2.3.9-snapshot/use-kernel-keycodes.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index c17f5c8..cc02168 100644 (file)
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -1,10 +1,11 @@
-DESCRIPTION = "Qt/Embedded version ${PV}"
+DESCRIPTION = "Qt/Embedded Version ${PV}"
 SECTION = "libs"
 PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
           file://qpe.patch;patch=1 \
@@ -29,7 +30,7 @@ SRC_URI_append_husky          = "file://kernel-keymap.patch;patch=1 file://kernel-keymap
 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_openzaurus-pxa-2.6 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
+SRC_URI_append_openzaurus-pxa-2.6 = "file://use-kernel-keycodes.patch;patch=1 "
 
 S = "${WORKDIR}/qt-${PV}"
 
@@ -68,7 +69,7 @@ EXTRA_DEFINES_corgi           = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS
 EXTRA_DEFINES_shepherd         = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_husky            = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_beagle           = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
-EXTRA_DEFINES_openzaurus-pxa-2.6= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_openzaurus-pxa-2.6= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
 
 export SYSCONF_CC = "${CC}"
 export SYSCONF_CXX = "${CXX}"