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

6 files changed, 41 insertions, 204 deletions

diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libopie/libopie2.inc
diff --git a/packages/libopie/libopie2/include-cvs.pro b/packages/libopie/libopie2/include-cvs.pro
deleted file mode 100644
index 119d298ad4..0000000000
--- a/packages/libopie/libopie2/include-cvs.pro
+++ /dev/null
@@ -1,36 +0,0 @@
-# we don't want to modify subdir .pro's
-!contains( TEMPLATE, subdirs ) {
-# if it's already a lib, we ignore it
-!contains( TEMPLATE, lib ) {
-
-  contains( CONFIG, quick-app ) {
-    message ( Building a quicklaunch application )
-    TEMPLATE = lib
-    CONFIG += plugin
-    DEFINES += OPIE_APP_INTERFACE
-    DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
-
-    system ( touch visibility_qmake_test.c )
-    # Test if the compiler supports visibility
-    system ( $$(CC) -fvisibility=hidden -c -o visibility_qmake_test.o visibility_qmake_test.c ) {
-        message ( Your compiler does support visibility, we will use it )
-        DEFINES += GCC_SUPPORTS_VISIBILITY
-        QMAKE_CFLAGS   += -fvisibility=hidden -fvisibility-inlines-hidden
-        QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-	system ( rm visibility_qmake_test.o )
-    }
-    system ( rm visibility_qmake_test.c )
-
-  }
-
-  !contains ( CONFIG, quick-app ) {
-    message( Building a standalone application )
-    TEMPLATE = app
-    DEFINES -= OPIE_APP_INTERFACE
-    DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
-  }
-}
-}
-
-DEFINES += OPIE_NEW_MALLOC 
-DEFINES += OPIE_NO_ERASE_RECT_HACKFIX
diff --git a/packages/libopie/libopie2/include.pro b/packages/libopie/libopie2/include.pro
index e69de29bb2..c76634a239 100644
--- a/packages/libopie/libopie2/include.pro
+++ b/packages/libopie/libopie2/include.pro
@@ -0,0 +1,36 @@
+# we don't want to modify subdir .pro's
+!contains( TEMPLATE, subdirs ) {
+# if it's already a lib, we ignore it
+!contains( TEMPLATE, lib ) {
+
+  contains( CONFIG, quick-app ) {
+    message ( Building a quicklaunch application )
+    TEMPLATE = lib
+    CONFIG += plugin
+    DEFINES += OPIE_APP_INTERFACE
+    DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
+
+    system ( touch visibility_qmake_test.c )
+    # Test if the compiler supports visibility
+    system ( $$(CC) -fvisibility=hidden -c -o visibility_qmake_test.o visibility_qmake_test.c ) {
+        message ( "Your compiler does support visibility, we will use it" )
+        DEFINES += GCC_SUPPORTS_VISIBILITY
+        QMAKE_CFLAGS   += -fvisibility=hidden -fvisibility-inlines-hidden
+        QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+	system ( rm visibility_qmake_test.o )
+    }
+    system ( rm visibility_qmake_test.c )
+
+  }
+
+  !contains ( CONFIG, quick-app ) {
+    message( Building a standalone application )
+    TEMPLATE = app
+    DEFINES -= OPIE_APP_INTERFACE
+    DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
+  }
+}
+}
+
+DEFINES += OPIE_NEW_MALLOC 
+DEFINES += OPIE_NO_ERASE_RECT_HACKFIX
diff --git a/packages/libopie/libopie2_1.1.9.bb b/packages/libopie/libopie2_1.1.9.bb
deleted file mode 100644
index 6a1b95cae3..0000000000
--- a/packages/libopie/libopie2_1.1.9.bb
+++ /dev/null
@@ -1,85 +0,0 @@
-DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
-HOMEPAGE = "http://opie.handhelds.org"
-SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "LGPL"
-I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite3 libpcap"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PR = "r0"
-
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
-           file://include.pro"
-S = "${WORKDIR}/libopie2"
-
-inherit opie
-
-PARALLEL_MAKE = ""
-
-#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
-
-EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
-                        DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
-			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
-			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
-
-# uclibc doesn't have backtrace()
-python __anonymous () {
-    import bb, re
-    if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
-}
-
-do_compile() {
-	install -d ${STAGING_INCDIR}/opie2
-	install -d ${STAGING_INCDIR}/opie2/private
-	for i in `find . -name "*.h"`
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
-	done
-
-	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h
-	do
-		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
-	done
-
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
-}
-
-LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
-
-# need some special case for uic-created header files here
-do_stage() {
-        for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
-	done
-
-	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/
-	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
-	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
-	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
-}
-
-do_install() {
-	install -d ${D}${palmtopdir}/lib
-	for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
-	done
-}
-
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
-
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
-
-#FIXME: Add individual package descriptions and dependencies
diff --git a/packages/libopie/libopie2_1.2.0.bb b/packages/libopie/libopie2_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libopie/libopie2_1.2.0.bb
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 2b6cf8086f..a5cf0c8c34 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,85 +1,7 @@
-DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
-HOMEPAGE = "http://opie.handhelds.org"
-SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "LGPL"
-I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite3 libpcap"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
-PR = "r12"
-PV = "1.1.9+cvs-${CVSDATE}"
+include ${PN}.inc
+    
+PV = "1.2.0+cvs-${CVSDATE}"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
-           file://include-cvs.pro"
-S = "${WORKDIR}/libopie2"
-
-inherit opie
-
-PARALLEL_MAKE = ""
-
-#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
-
-EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
-                        DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
-			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
-			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
-
-# uclibc doesn't have backtrace()
-python __anonymous () {
-    import bb, re
-    if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
-}
-
-do_compile() {
-	install -d ${STAGING_INCDIR}/opie2
-	install -d ${STAGING_INCDIR}/opie2/private
-	for i in `find . -name "*.h"`
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
-	done
-
-	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h
-	do
-		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
-	done
-
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
-}
-
-LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
-
-# need some special case for uic-created header files here
-do_stage() {
-        for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
-	done
-
-	install -m 0644 ${WORKDIR}/include-cvs.pro ${OPIEDIR}/include.pro
-	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
-	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
-	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
-}
-
-do_install() {
-	install -d ${D}${palmtopdir}/lib
-	for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
-	done
-}
-
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
-
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
-
-#FIXME: Add individual package descriptions and dependencies
+           file://include.pro"