Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/26 17:01:49+01:00 nslu2-linux.org!perlguru
openslug-packages.bb:
  Added CVS

2005/03/26 06:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 15:07:57+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/openembedded

2005/03/26 15:05:31+01:00 vanille.de!mickeyl
This ChangeSet introduces .inc files for everything Opie related
Fixed and floating versions only differ in PV and SRC_URI, so that's
what gets overridden in the actual .bbfiles. Please watch out for breakage
and catch up if I missed files.
Unfortunately, for now I had to yank the few individually versioned Opie
programs. We will bring individual versions for many (if not all) programs
back eventually.

2005/03/26 14:14:13+01:00 mauricekoster.com!maurice
openslug-packages.bb:
  Added rsync

2005/03/26 04:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 13:06:25+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 13:06:05+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb:
  fix deps

2005/03/26 03:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 12:07:48+01:00 uni-frankfurt.de!mickeyl
opie-1.2.0 uses qcop 1.0.1

2005/03/26 12:06:49+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 12:03:13+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb, gphoto2_2.1.5.bb: add latest and greatest gphoto2, features improved ptp2 support

2005/03/26 12:02:29+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/26 12:00:56+01:00 uni-frankfurt.de!mickeyl
opie-taskbar-1.2.0: catch up with cvs version

2005/03/26 11:51:00+01:00 uni-frankfurt.de!mickeyl
use opie 1.2.0 in familiar 0.8.2

2005/03/26 11:44:24+01:00 uni-frankfurt.de!mickeyl
libqpe-opie-1.2.0: catch up with cvs version

2005/03/25 20:41:33-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 23:09:00-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/25 23:08:40-05:00 handhelds.org!kergoth
Add linux-libc-headers 2.6.11.1.

2005/03/25 16:44:54-08:00 kalmiopsis!jbowler
ssh does not allow login as a user unless that user has a password.
Unmodified NSLU2 boxes running OpenSlug only allow login via dropbear
(ssh), therefore a password is required for root (the only user in
the initial setup.)  This changed version of the root-home.patch
adds a password, the password is documented in the README file.

2005/03/25 15:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 00:02:41+01:00 vanille.de!mickeyl
oz.conf: last updates - approaching 3.5.3

2005/03/25 07:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 16:05:02+01:00 uni-frankfurt.de!mickeyl
switch oz-3.5.3 to release mode and update

2005/03/25 04:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 13:29:29+01:00 uni-frankfurt.de!mickeyl
add generic distro configuration and x86 machine configuration

2005/03/25 00:35:27-10:00 (none)!dyoung
change DISTRO_TYPE from = to ?= construct to simplify future testing.

2005/03/24 23:55:09-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/openembedded

2005/03/24 23:54:07-10:00 (none)!dereky
openslug-image.bb:
  change base-passwd to version 3.5.9

2005/03/25 01:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 10:37:35+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/25 10:37:05+01:00 utwente.nl!koen
x11_cvs.bb:  fix is upstream now, threads.patch is obsolete now

2005/03/24 17:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 20:29:38-05:00 handhelds.org!kergoth
Add unionfs version 1.0.11.

2005/03/25 09:16:21+10:30 (none)!rwhitby
Fixed the nsswitch.conf for Unslung

2005/03/25 07:38:46+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/25 07:38:18+10:30 (none)!rwhitby
Added /etc/nsswitch.conf to Unslung rootfs

2005/03/24 12:41:31-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 21:04:24+01:00 zeckescompany.nl!alwin
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into zeckescompany.nl:/home/ral/progs/Zaurus/oe/openembedded

2005/03/24 21:04:07+01:00 zeckescompany.nl!alwin
fixed typo in base-files/c7x0/fstab

2005/03/24 10:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 19:07:47+01:00 utwente.nl!koen
x11_cvs.bb:  add threads.patch

2005/03/24 02:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 11:12:07+01:00 uni-frankfurt.de!mickeyl
base.bbclass: add function base_conditional that serves as an equivalent of the
'?' operator in C. this is very handy to simplify some constructs in our .bb files, i.e. appending things based on if a variable has a
certain value or not. Example Use: SRC_URI_append = '{base_conditional(DISTRO_TYPE,debug,file://allow-root-pw.patch,'',d)}'

2005/03/24 11:01:31+01:00 uni-frankfurt.de!mickeyl
bump timezones to 1.2.0

2005/03/24 01:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 10:17:49+01:00 handhelds.org!CoreDump
Just a test, no changes

2005/03/23 17:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 01:59:38+01:00 handhelds.org!zecke
Libopie2 Visibility changes:
	-There is no difference between 1.2.0 and cvs in regards to visibility
	-Quote the string inside the message
	-Remove include-cvs.pro as it is not needed anymore

2005/03/23 16:41:34-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:45:36+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/opie_move

2005/03/24 00:44:26+01:00 handhelds.org!zecke
Opie 1.1.9 -> 1.2.0:
	-increment PV on the _cvs.bb files
	-remove PR from the .bb files

2005/03/23 15:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:37:00+01:00 handhelds.org!zecke
Opie 1.1.9 -> 1.2.0:
	Update courtsey python and kergoths super cow power über sed skills

	-mv 1.1.9.bb to 1.2.0.bb
	-remove PR fromm 1.2.0.bb and _cvs.bb
	-bump PV in the _cvs.bb

2005/03/24 00:31:44+01:00 zeckescompany.nl!alwin
corrected corgikeymap

BKrev: 42459626c9gSuz7RwCyChCjKFbynfA

4 files changed, 3 insertions, 105 deletions

diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-sh/opie-sh.inc
diff --git a/packages/opie-sh/opie-sh_1.1.9.bb b/packages/opie-sh/opie-sh_1.1.9.bb
deleted file mode 100644
index ad5e357824..0000000000
--- a/packages/opie-sh/opie-sh_1.1.9.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "A QDialog shell frontend"
-SECTION = "opie/Shell"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-PR = "r0"
-
-APPNAME = "opie-sh"
-APPTYPE = "binary"
-
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/bin"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
-do_install() {
-	install -d ${D}${palmtopdir}/bin
-	install -m 0755 ${WORKDIR}/${APPNAME}/scripts/*.sh ${D}${palmtopdir}/bin/
-	install -m 0755 ${WORKDIR}/bin/opie-sh-howto.sh ${D}${palmtopdir}/bin/
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-        install -d ${D}${palmtopdir}/pics/opie-sh-scripts/
-        install -m 0644 ${WORKDIR}/pics/opie-sh-scripts/*.png ${D}${palmtopdir}/pics/opie-sh-scripts/
-	install -d ${D}${palmtopdir}/apps/Opie-SH/
-	install -m 0644 ${WORKDIR}/apps/Opie-SH/*.desktop ${D}${palmtopdir}/apps/Opie-SH/
-	install -d ${D}${palmtopdir}/help/${APPNAME}/
-	install -m 0644 ${WORKDIR}/help/${APPNAME}/*.html ${D}${palmtopdir}/help/${APPNAME}/
-	install -d ${D}${palmtopdir}/share/config
-	install -m 0644 ${WORKDIR}/share/config/*.cfg  ${D}${palmtopdir}/share/config/
-}
-
-PACKAGES = " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \
-opie-sh-killproc opie-sh-launcher-refresh opie-sh-logviewer opie-sh-rsynchelper \
-opie-sh-servicemanager opie-sh-ssh-askpass opie-sh-stowawayctrl opie-sh-usbnetctrl \
-opie-sh-wavelanchooser opie-sh"
-
-FILES_opie-sh-microkbd = " ${palmtopdir}/bin/microkbd.sh ${palmtopdir}/apps/Opie-SH/microkbd.desktop ${palmtopdir}/pics/opie-sh-scripts/keyz-cfg.png"
-FILES_opie-sh-diskfree = " ${palmtopdir}/bin/diskfree.sh ${palmtopdir}/apps/Opie-SH/diskfree.desktop ${palmtopdir}/pics/opie-sh-scripts/diskfree.png"
-FILES_opie-sh-fsmounter = " ${palmtopdir}/bin/filesystem_mounter.sh ${palmtopdir}/pics/opie-sh-scripts/fsmounter.png ${palmtopdir}/apps/Opie-SH/filesystem_mounter.desktop"
-FILES_opie-sh-hostlist = " ${palmtopdir}/bin/hostlist.sh ${palmtopdir}/pics/opie-sh-scripts/hostlist.png ${palmtopdir}/apps/Opie-SH/hostlist.desktop ${palmtopdir}/share/config/hostlist.cfg"
-FILES_opie-sh-killproc = " ${palmtopdir}/bin/killproc.sh ${palmtopdir}/apps/Opie-SH/killproc.desktop ${palmtopdir}/pics/opie-sh-scripts/killproc.png"
-FILES_opie-sh-launcher-refresh = " ${palmtopdir}/bin/launcher_refresh.sh ${palmtopdir}/pics/opie-sh-scripts/launcher_refresh.png ${palmtopdir}/apps/Opie-SH/launcher_refresh.desktop"
-FILES_opie-sh-logviewer = " ${palmtopdir}/bin/logviewer.sh ${palmtopdir}/apps/Opie-SH/logviewer.desktop ${palmtopdir}/pics/opie-sh-scripts/logviewer.png"
-FILES_opie-sh-rsynchelper = " ${palmtopdir}/bin/rsyncme.sh ${palmtopdir}/apps/Opie-SH/rsyncme.desktop ${palmtopdir}/pics/opie-sh-scripts/rsyncme.png ${palmtopdir}/share/config/rsyncme.cfg"
-FILES_opie-sh-servicemanager = " ${palmtopdir}/bin/service_manager.sh ${palmtopdir}/apps/Opie-SH/service_manager.desktop ${palmtopdir}/pics/opie-sh-scripts/service_manager.png"
-FILES_opie-sh-ssh-askpass = " ${palmtopdir}/bin/opie-sh-ssh-askpass.sh"
-FILES_opie-sh-stowawayctrl = " ${palmtopdir}/bin/stowctrl.sh ${palmtopdir}/apps/Opie-SH/stowctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/stowctrl.png"
-FILES_opie-sh-usbnetctrl = " ${palmtopdir}/bin/usbnetctrl.sh ${palmtopdir}/apps/Opie-SH/usbnetctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/usbnetctrl.png"
-FILES_opie-sh-wavelanchooser = " ${palmtopdir}/bin/opie-sh-wavelanchooser.sh ${palmtopdir}/apps/Opie-SH/opie-sh-wavelanchooser.desktop ${palmtopdir}/pics/opie-sh-scripts/qtwavelan.png"
-FILES_opie-sh = " ${palmtopdir}/bin/opie-sh-howto.sh ${palmtopdir}/bin/opie-sh ${palmtopdir}/apps/Opie-SH/opie-sh.desktop ${palmtopdir}/pics/opie-sh/*.png ${palmtopdir}/opie-sh/*.html"
diff --git a/packages/opie-sh/opie-sh_1.2.0.bb b/packages/opie-sh/opie-sh_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-sh/opie-sh_1.2.0.bb
diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb
index d4fbdfdffa..64873637b2 100644
--- a/packages/opie-sh/opie-sh_cvs.bb
+++ b/packages/opie-sh/opie-sh_cvs.bb
@@ -1,11 +1,6 @@
-DESCRIPTION = "A QDialog shell frontend"
-SECTION = "opie/Shell"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-PV = "1.1.9+cvs-${CVSDATE}"
-APPNAME = "opie-sh"
-APPTYPE = "binary"
+include ${PN}.inc
+    
+PV = "1.2.0+cvs-${CVSDATE}"
 PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \
@@ -14,43 +9,3 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \
            ${HANDHELDS_CVS};module=opie/share \
            ${HANDHELDS_CVS};module=opie/apps \
            ${HANDHELDS_CVS};module=opie/bin"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
-do_install() {
-	install -d ${D}${palmtopdir}/bin
-	install -m 0755 ${WORKDIR}/${APPNAME}/scripts/*.sh ${D}${palmtopdir}/bin/
-	install -m 0755 ${WORKDIR}/bin/opie-sh-howto.sh ${D}${palmtopdir}/bin/
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-        install -d ${D}${palmtopdir}/pics/opie-sh-scripts/
-        install -m 0644 ${WORKDIR}/pics/opie-sh-scripts/*.png ${D}${palmtopdir}/pics/opie-sh-scripts/
-	install -d ${D}${palmtopdir}/apps/Opie-SH/
-	install -m 0644 ${WORKDIR}/apps/Opie-SH/*.desktop ${D}${palmtopdir}/apps/Opie-SH/
-	install -d ${D}${palmtopdir}/help/${APPNAME}/
-	install -m 0644 ${WORKDIR}/help/${APPNAME}/*.html ${D}${palmtopdir}/help/${APPNAME}/
-	install -d ${D}${palmtopdir}/share/config
-	install -m 0644 ${WORKDIR}/share/config/*.cfg  ${D}${palmtopdir}/share/config/
-}
-
-PACKAGES = " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \
-opie-sh-killproc opie-sh-launcher-refresh opie-sh-logviewer opie-sh-rsynchelper \
-opie-sh-servicemanager opie-sh-ssh-askpass opie-sh-stowawayctrl opie-sh-usbnetctrl \
-opie-sh-wavelanchooser opie-sh"
-
-FILES_opie-sh-microkbd = " ${palmtopdir}/bin/microkbd.sh ${palmtopdir}/apps/Opie-SH/microkbd.desktop ${palmtopdir}/pics/opie-sh-scripts/keyz-cfg.png"
-FILES_opie-sh-diskfree = " ${palmtopdir}/bin/diskfree.sh ${palmtopdir}/apps/Opie-SH/diskfree.desktop ${palmtopdir}/pics/opie-sh-scripts/diskfree.png"
-FILES_opie-sh-fsmounter = " ${palmtopdir}/bin/filesystem_mounter.sh ${palmtopdir}/pics/opie-sh-scripts/fsmounter.png ${palmtopdir}/apps/Opie-SH/filesystem_mounter.desktop"
-FILES_opie-sh-hostlist = " ${palmtopdir}/bin/hostlist.sh ${palmtopdir}/pics/opie-sh-scripts/hostlist.png ${palmtopdir}/apps/Opie-SH/hostlist.desktop ${palmtopdir}/share/config/hostlist.cfg"
-FILES_opie-sh-killproc = " ${palmtopdir}/bin/killproc.sh ${palmtopdir}/apps/Opie-SH/killproc.desktop ${palmtopdir}/pics/opie-sh-scripts/killproc.png"
-FILES_opie-sh-launcher-refresh = " ${palmtopdir}/bin/launcher_refresh.sh ${palmtopdir}/pics/opie-sh-scripts/launcher_refresh.png ${palmtopdir}/apps/Opie-SH/launcher_refresh.desktop"
-FILES_opie-sh-logviewer = " ${palmtopdir}/bin/logviewer.sh ${palmtopdir}/apps/Opie-SH/logviewer.desktop ${palmtopdir}/pics/opie-sh-scripts/logviewer.png"
-FILES_opie-sh-rsynchelper = " ${palmtopdir}/bin/rsyncme.sh ${palmtopdir}/apps/Opie-SH/rsyncme.desktop ${palmtopdir}/pics/opie-sh-scripts/rsyncme.png ${palmtopdir}/share/config/rsyncme.cfg"
-FILES_opie-sh-servicemanager = " ${palmtopdir}/bin/service_manager.sh ${palmtopdir}/apps/Opie-SH/service_manager.desktop ${palmtopdir}/pics/opie-sh-scripts/service_manager.png"
-FILES_opie-sh-ssh-askpass = " ${palmtopdir}/bin/opie-sh-ssh-askpass.sh"
-FILES_opie-sh-stowawayctrl = " ${palmtopdir}/bin/stowctrl.sh ${palmtopdir}/apps/Opie-SH/stowctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/stowctrl.png"
-FILES_opie-sh-usbnetctrl = " ${palmtopdir}/bin/usbnetctrl.sh ${palmtopdir}/apps/Opie-SH/usbnetctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/usbnetctrl.png"
-FILES_opie-sh-wavelanchooser = " ${palmtopdir}/bin/opie-sh-wavelanchooser.sh ${palmtopdir}/apps/Opie-SH/opie-sh-wavelanchooser.desktop ${palmtopdir}/pics/opie-sh-scripts/qtwavelan.png"
-FILES_opie-sh = " ${palmtopdir}/bin/opie-sh-howto.sh ${palmtopdir}/bin/opie-sh ${palmtopdir}/apps/Opie-SH/opie-sh.desktop ${palmtopdir}/pics/opie-sh/*.png ${palmtopdir}/opie-sh/*.html"