summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-04 06:40:08 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-04 06:40:08 +0000
commit967c90dd504f7994176dc8a6297364ae9b79e551 (patch)
treebfcaec4b86ef14954f9cac5c39428a900ed3f0fc /packages
parent14f13f31d3307aa6e70f14a045af7c3828b7dc51 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/03 22:15:14-08:00 (none)!ggilbert Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into olddog.(none):/home/ggilbert/oe/openembedded 2005/01/03 22:14:20-08:00 (none)!ggilbert libqpe-opie_1.1.8.bb: libqpe-opie_1.1.8: Backport a patch from current CVS that fixes the use of compiled in pixmaps. Fixes the problem where many toolbar icons are not found. resource.patch: new file 2005/01/03 22:14:15-08:00 (none)!emte kbdd-patched changed to single init BKrev: 41da3a48qPihtYGzrFPsd60tZdQbCg
Diffstat (limited to 'packages')
-rw-r--r--packages/kbdd/kbdd-patched-20040904/kbdd.init (renamed from packages/kbdd/kbdd-patched-20040904/fellowes.init)0
-rw-r--r--packages/kbdd/kbdd-patched-20040904/stowaway.init0
-rw-r--r--packages/kbdd/kbdd-patched_20040904.bb52
-rw-r--r--packages/libqpe/libqpe-opie/resource.patch (renamed from packages/kbdd/kbdd-patched-20040904/snapntype.init)0
-rw-r--r--packages/libqpe/libqpe-opie_1.1.8.bb7
5 files changed, 27 insertions, 32 deletions
diff --git a/packages/kbdd/kbdd-patched-20040904/fellowes.init b/packages/kbdd/kbdd-patched-20040904/kbdd.init
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/fellowes.init
+++ b/packages/kbdd/kbdd-patched-20040904/kbdd.init
diff --git a/packages/kbdd/kbdd-patched-20040904/stowaway.init b/packages/kbdd/kbdd-patched-20040904/stowaway.init
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/kbdd/kbdd-patched-20040904/stowaway.init
+++ /dev/null
diff --git a/packages/kbdd/kbdd-patched_20040904.bb b/packages/kbdd/kbdd-patched_20040904.bb
index cfcd6a4106..ebb190a9d3 100644
--- a/packages/kbdd/kbdd-patched_20040904.bb
+++ b/packages/kbdd/kbdd-patched_20040904.bb
@@ -2,21 +2,20 @@ DESCRIPTION = "Keyboard Device Daemon which provides support for snapntype and s
MAINTAINER = "Paul Eggleton <http://handhelds.org/moin/moin.cgi/PaulEggleton>"
SECTION = "utils"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
DEPENDS = "virtual/kernel"
RDEPENDS = "kernel-module-keybdev kernel-module-uinput"
SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV} \
file://snapntype.patch;patch=1;pnum=0 \
file://stowaway-fellowes-apm.patch;patch=1;pnum=0 \
- file://fellowes.init \
- file://stowaway.init \
- file://snapntype.init \
+ file://kbdd.init \
file://kbdd.default"
-inherit autotools
+inherit autotools update-rc.d
S = "${WORKDIR}/kbdd"
-
+INITSCRIPT_NAME = "kbdd.init"
+INITSCRIPT_PARAMS = "default"
do_compile() {
oe_runmake
}
@@ -29,17 +28,6 @@ do_install() {
}
do_install_append () {
- set -x
- install -d ${D}/${sysconfdir}/init.d
- cat ${WORKDIR}/fellowes.init | \
- sed -e 's,/usr/sbin/,${sbindir}/,g; s,/usr/bin/,${bindir}/,g; s,/usr/lib/,${libdir}/,g; s,/etc/,${sysconfdir}/,g; s,/usr/,${prefix}/,g;' > ${D}/${sysconfdir}/init.d/kbdd-fellowes
- cat ${WORKDIR}/stowaway.init | \
- sed -e 's,/usr/sbin/,${sbindir}/,g; s,/usr/bin/,${bindir}/,g; s,/usr/lib/,${libdir}/,g; s,/etc/,${sysconfdir}/,g; s,/usr/,${prefix}/,g;' > ${D}/${sysconfdir}/init.d/kbdd-stowaway
- cat ${WORKDIR}/snapntype.init | \
- sed -e 's,/usr/sbin/,${sbindir}/,g; s,/usr/bin/,${bindir}/,g; s,/usr/lib/,${libdir}/,g; s,/etc/,${sysconfdir}/,g; s,/usr/,${prefix}/,g;' > ${D}/${sysconfdir}/init.d/kbdd-snapntype
- chmod 755 ${D}/${sysconfdir}/init.d/kbdd-fellowes
- chmod 755 ${D}/${sysconfdir}/init.d/kbdd-stowaway
- chmod 755 ${D}/${sysconfdir}/init.d/kbdd-snapntype
mkdir -p ${D}/${sysconfdir}/defaults
cat ${WORKDIR}/kbdd.default > ${D}/${sysconfdir}/defaults/kbdd
chmod 755 ${D}/${sysconfdir}/defaults/kbdd
@@ -51,22 +39,28 @@ do_install_append () {
}
pkg_postinst () {
- if test -n "${D}"; then
- D="-r"
- fi
-# update-rc.d $D kbdd-fellowes defaults
-# update-rc.d $D kbdd-stowaway defaults
- update-rc.d $D kbdd-snapntype defaults
update-modules
}
pkg_prerm () {
- if test -n "${D}"; then
- D="-r"
- fi
- update-rc.d $D kbdd-fellowes remove
- update-rc.d $D kbdd-stowaway remove
- update-rc.d $D kbdd-snapntype remove
rm ${D}/${sysconfdir}/modutils/kbdd-modules
update-modules
}
+
+updatercd_postinst() {
+if test "x$D" != "x"; then
+ D="-r $D"
+else
+ D="-s"
+fi
+update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
+}
+
+updatercd_postrm() {
+if test "x$D" != "x"; then
+ D="-r $D"
+else
+ ${INIT_D_DIR}/${INITSCRIPT_NAME} stop
+fi
+update-rc.d $D ${INITSCRIPT_NAME} remove
+}
diff --git a/packages/kbdd/kbdd-patched-20040904/snapntype.init b/packages/libqpe/libqpe-opie/resource.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/snapntype.init
+++ b/packages/libqpe/libqpe-opie/resource.patch
diff --git a/packages/libqpe/libqpe-opie_1.1.8.bb b/packages/libqpe/libqpe-opie_1.1.8.bb
index 37290c0b12..0c12765d88 100644
--- a/packages/libqpe/libqpe-opie_1.1.8.bb
+++ b/packages/libqpe/libqpe-opie_1.1.8.bb
@@ -5,11 +5,12 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
DEPENDS = "uicmoc-native qte-for-opie"
PROVIDES = "virtual/libqpe"
-PR = "r3"
+PR = "r4"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
- file://nomax.patch;patch=1;pnum=1"
+ file://nomax.patch;patch=1;pnum=1 \
+ file://resource.patch;patch=1;pnum=1"
S = "${WORKDIR}/library"
inherit qmake
@@ -23,7 +24,7 @@ CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-r
CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+XXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
do_compile() {
mkdir -p ${STAGING_INCDIR}/qpe \