summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/kernel.bbclass5
-rw-r--r--classes/opie.bbclass8
-rw-r--r--classes/palmtop.bbclass3
-rw-r--r--conf/bitbake.conf4
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3-pre.inc2
-rw-r--r--conf/machine/h2200.conf2
-rw-r--r--packages/bluez/bluez-dtl1-workaround_1.0.bb17
-rw-r--r--packages/bluez/bluez-utils.inc2
-rw-r--r--packages/bluez/bluez-utils/02dtl1_cs.sh57
-rw-r--r--packages/bluez/bluez-utils_3.11.bb6
-rw-r--r--packages/bluez/bluez-utils_3.12.bb6
-rw-r--r--packages/bluez/bluez-utils_3.4.bb2
-rw-r--r--packages/bluez/bluez-utils_3.7.bb2
-rw-r--r--packages/bluez/bluez-utils_3.8.bb4
-rw-r--r--packages/glib-2.0/glib-2.0_2.12.12.bb2
-rw-r--r--packages/glib-2.0/glib.inc3
-rw-r--r--packages/gpephone/xoo-vm_0.7-20070204.bb4
-rw-r--r--packages/gtkmm/gtkmm.inc3
-rw-r--r--packages/libopie/libopie2.inc20
-rw-r--r--packages/libopie/libopie2_cvs.bb2
-rw-r--r--packages/libopietooth/libopietooth1.inc2
-rw-r--r--packages/libopietooth/libopietooth1_cvs.bb1
-rw-r--r--packages/libqpe/libqpe-opie.inc17
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb2
-rw-r--r--packages/libqtaux/libqtaux2.inc5
-rw-r--r--packages/linux/linux-rp_2.6.21.bb4
-rw-r--r--packages/linux/linux-x86-2.6.20/i486-defconfig256
-rw-r--r--packages/linux/linux-x86_2.6.20.bb2
-rw-r--r--packages/opie-alarm/opie-alarm.inc6
-rwxr-xr-xpackages/opie-alarm/opie-alarm/01opiealarm4
-rw-r--r--packages/opie-alarm/opie-alarm_cvs.bb1
-rw-r--r--packages/opie-init/opie-init.inc8
-rwxr-xr-xpackages/opie-init/opie-init/c7x0/opie85
-rwxr-xr-xpackages/opie-init/opie-init/mnci/opie79
-rwxr-xr-xpackages/opie-init/opie-init/opie28
-rw-r--r--packages/opie-init/opie-init_1.2.2.bb2
-rw-r--r--packages/opie-multikey/files/fix-rpath.patch11
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb5
-rw-r--r--packages/opie-networksettings/opie-networksettings.inc2
-rw-r--r--packages/opie-networksettings/opie-networksettings_cvs.bb2
-rw-r--r--packages/opie-qcop/opie-qcop.inc4
-rw-r--r--packages/opie-qcop/opie-qcop_cvs.bb2
-rw-r--r--packages/opie-qss/opie-qss.inc4
-rw-r--r--packages/opie-qss/opie-qss_cvs.bb1
-rw-r--r--packages/opie-quicklauncher/opie-quicklauncher.inc5
-rw-r--r--packages/opie-quicklauncher/opie-quicklauncher_cvs.bb1
-rw-r--r--packages/opie-taskbar/opie-taskbar.inc13
-rw-r--r--packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch35
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb3
-rw-r--r--packages/opie-ttf-support/opie-ttf-support_1.1.bb2
-rw-r--r--packages/qte/qte-common_2.3.10.inc12
-rw-r--r--packages/qte/qte-mt_2.3.10.bb3
-rw-r--r--packages/tasks/task-base.bb5
-rw-r--r--packages/uclibc/files/errno_values.h.patch21
-rw-r--r--packages/uclibc/files/termios.h.patch22
-rw-r--r--packages/uclibc/uclibc_0.9.29.bb8
-rw-r--r--packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb12
-rw-r--r--packages/udev/udev_092.bb9
-rw-r--r--packages/udev/udev_097.bb5
-rw-r--r--packages/udev/udev_100.bb9
60 files changed, 412 insertions, 440 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 4cc3784b6f..658bbbf675 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -183,6 +183,11 @@ ALLOW_EMPTY_kernel = "1"
ALLOW_EMPTY_kernel-base = "1"
ALLOW_EMPTY_kernel-image = "1"
+# Userspace workarounds for kernel modules issues
+# This is shame, fix the kernel instead!
+DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+
pkg_postinst_kernel-image () {
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 916a8a4a30..c11cf0b4de 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -80,6 +80,7 @@ python opie_do_opie_install() {
D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
WORKDIR = bb.data.getVar( "WORKDIR", d, True )
palmtopdir = bb.data.getVar( "palmtopdir", d, True )
+ gnubindir = bb.data.getVar( "bindir", d, True )
APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
if desktopdir is not None:
@@ -89,11 +90,12 @@ python opie_do_opie_install() {
os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
if APPTYPE == "binary":
- os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+ os.system( "install -d %s%s/" % ( D, gnubindir ) )
+ os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) )
elif APPTYPE == "quicklaunch":
os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
- os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
- os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+ os.system( "install -d %s%s/" % ( D, gnubindir ) )
+ os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) )
elif APPTYPE == "plugin":
os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
}
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index e99b31aaa3..fa25d598e9 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -19,8 +19,7 @@ DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN
QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
-FILES_${PN} = " ${palmtopdir} "
-FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so "
+FILES_${PN} += " ${palmtopdir} "
FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
${palmtopdir}/bin/.debug \
${palmtopdir}/plugins/*/.debug "
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 38561149d7..a4dd4b18a8 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,8 +319,8 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = ""
export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export palmtopdir = "${prefix}"
-export palmqtdir = "${prefix}"
+export palmtopdir = "${libdir}/opie"
+export palmqtdir = "${palmtopdir}"
##################################################################
# Download locations and utilities.
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
index 4d422ca537..fe71a6ab90 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -3,7 +3,7 @@
QTE_VERSION ?= "2.3.10"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070702"
+OPIE_SRCDATE ?= "20070703"
OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 6c43e75625..56f1d17c04 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -26,7 +26,7 @@ PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader"
+MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
#
diff --git a/packages/bluez/bluez-dtl1-workaround_1.0.bb b/packages/bluez/bluez-dtl1-workaround_1.0.bb
new file mode 100644
index 0000000000..413d220508
--- /dev/null
+++ b/packages/bluez/bluez-dtl1-workaround_1.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume."
+SECTION = "console"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://02dtl1_cs.sh"
+
+do_install() {
+ install -d ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+PACKAGE_ARCH = "all"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index b6f9660fa7..8eb4fbfbf0 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -10,7 +10,6 @@ LICENSE = "GPL"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1 \
file://handle-eintr.patch;patch=1;status=applied"
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
}
diff --git a/packages/bluez/bluez-utils/02dtl1_cs.sh b/packages/bluez/bluez-utils/02dtl1_cs.sh
deleted file mode 100644
index fd81508010..0000000000
--- a/packages/bluez/bluez-utils/02dtl1_cs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- suspend)
- if [ "`/bin/hciconfig`" != "" ]; then
- #If hciconfig outputs anything then there's probably a Bluetooth
- # CF card in the slot so shut it down.
- hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'`
- hciconfig hci0 down
- killall hciattach > /dev/null 2>&1
- fi
- ;;
-
- resume)
- #check for kernel version
- if [ "`uname -r | grep 2.4.`" != "" ]; then
- k="o"
- elif [ "`uname -r | grep 2.6.`" != "" ]; then
- k="ko"
- else
- exit 0
- fi
-
- if test -e /sbin/cardctl; then
- CARDCTL=/sbin/cardctl
- elif test -e /sbin/pccardctl; then
- CARDCTL=/sbin/pccardctl
- else
- exit 0
- fi
-
- if [ "`lsmod | grep hci_uart`" != "" ]; then
- #If the hci_usb module is still loaded then there's a serial based
- # Bluetooth CF card in the slot, which only needs a resume to get it going
- # again.
- rfcomm bind all
- $CARDCTL resume
- hciconfig hci0 up
- else
- # only works for nokia dtl1 cards
- for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k
- do
- #Enumerate all the self-contained Bluetooth CF card drivers
- f=`echo $f | sed 's/\.'$k'$//'`
- f=`basename $f`
- if [ "`lsmod | grep $f`" != "" ]; then
- #If one of these drivers is still loaded, then there is probably
- #a non-serial based Bluetooth CF card in the slot that needs
- #ejecting and reinserting to get it going again
- rfcomm bind all
- $CARDCTL eject
- $CARDCTL insert
- hciconfig hci0 up
- fi
- done
- fi
-esac
diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb
index 2419f431f6..6cadfc1a53 100644
--- a/packages/bluez/bluez-utils_3.11.bb
+++ b/packages/bluez/bluez-utils_3.11.bb
@@ -6,9 +6,8 @@ DEPENDS += "glib-2.0"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
"
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = " \
--enable-bccmd \
@@ -84,9 +83,6 @@ FILES_${PN} = " \
${base_sbindir}/hciattach \
"
-#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
-FILES_${PN} += "${sysconfdir}/apm/"
-
FILES_${PN}-dbg += " \
${libdir}/bluetooth/.debug \
"
diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb
index e543eed649..4710aa6779 100644
--- a/packages/bluez/bluez-utils_3.12.bb
+++ b/packages/bluez/bluez-utils_3.12.bb
@@ -4,9 +4,8 @@ DEPENDS += "glib-2.0"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = " \
--enable-bccmd \
@@ -82,9 +81,6 @@ FILES_${PN} = " \
${base_sbindir}/hciattach \
"
-#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
-FILES_${PN} += "${sysconfdir}/apm/"
-
FILES_${PN}-dbg += " \
${libdir}/bluetooth/.debug \
"
diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb
index 49e6ded250..f2bbd15507 100644
--- a/packages/bluez/bluez-utils_3.4.bb
+++ b/packages/bluez/bluez-utils_3.4.bb
@@ -11,7 +11,6 @@ PR = "r1"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
}
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb
index 3dbaa030c1..7a76cb3200 100644
--- a/packages/bluez/bluez-utils_3.7.bb
+++ b/packages/bluez/bluez-utils_3.7.bb
@@ -11,7 +11,6 @@ PR = "r0"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
}
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb
index d549d12d30..f2bbd15507 100644
--- a/packages/bluez/bluez-utils_3.8.bb
+++ b/packages/bluez/bluez-utils_3.8.bb
@@ -7,11 +7,10 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
RREPLACES = "bluez-utils-dbus"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
- file://02dtl1_cs.sh \
file://hciattach-ti-bts.patch;patch=1"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
rmdir ${D}${bindir} ${D}${sbindir}
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
}
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/glib-2.0/glib-2.0_2.12.12.bb b/packages/glib-2.0/glib-2.0_2.12.12.bb
index f8eb9e5537..974081afce 100644
--- a/packages/glib-2.0/glib-2.0_2.12.12.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.12.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
index 6b384ad6c7..57f4af4cc4 100644
--- a/packages/glib-2.0/glib.inc
+++ b/packages/glib-2.0/glib.inc
@@ -8,12 +8,13 @@ SECTION = "libs"
PRIORITY = "optional"
DEPENDS += "glib-2.0-native gtk-doc"
DEPENDS += "virtual/libiconv virtual/libintl"
-PACKAGES =+ "glib-2.0-utils "
+PACKAGES =+ "${PN}-dev glib-2.0-utils "
PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0"
EXTRA_OECONF = "--disable-debug "
diff --git a/packages/gpephone/xoo-vm_0.7-20070204.bb b/packages/gpephone/xoo-vm_0.7-20070204.bb
index b927269db2..0bdda47359 100644
--- a/packages/gpephone/xoo-vm_0.7-20070204.bb
+++ b/packages/gpephone/xoo-vm_0.7-20070204.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
SRCDATE = 20070204
PV = "0.7+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
file://gpephone-vm.patch;patch=1;pnum=0"
@@ -14,3 +14,5 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
S = "${WORKDIR}/Xoo"
inherit autotools
+
+FILES_${PN} += "${datadir}/xoo"
diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc
index b99bf9b395..9dd1e43d54 100644
--- a/packages/gtkmm/gtkmm.inc
+++ b/packages/gtkmm/gtkmm.inc
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.gtkmm.org/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-DEPENDS = "atk glibmm gtk+"
-PR = "r0"
+DEPENDS = "atk glibmm gtk+ cairomm"
inherit gnome autotools pkgconfig flow-lossage
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 17cc4be40d..a5a5cef0bd 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -71,29 +71,29 @@ do_stage() {
}
do_install() {
- install -d ${D}${palmtopdir}/lib
+ install -d ${D}${libdir}
for f in ${LIBS}
do
- oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
+ oe_libinstall -so libopie$f ${D}${libdir}
done
}
PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*"
+FILES_libopiecore2 = "${libdir}/libopiecore2.so.*"
DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*"
+FILES_libopiedb2 = "${libdir}/libopiedb2.so.*"
DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*"
+FILES_libopiemm2 = "${libdir}/libopiemm2.so.*"
DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*"
+FILES_libopienet2 = "${libdir}/libopienet2.so.*"
DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*"
+FILES_libopiepim2 = "${libdir}/libopiepim2.so.*"
DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*"
+FILES_libopieui2 = "${libdir}/libopieui2.so.*"
DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*"
+FILES_libopiesecurity2 = "${libdir}/libopiesecurity2.so.*"
DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library"
-FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*"
+FILES_libopiebluez2 = "${libdir}/libopiebluez2.so.*"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index a832ee85f8..2e5772cd81 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libopietooth/libopietooth1.inc b/packages/libopietooth/libopietooth1.inc
index 4b81f26cab..2ceae495c3 100644
--- a/packages/libopietooth/libopietooth1.inc
+++ b/packages/libopietooth/libopietooth1.inc
@@ -16,6 +16,6 @@ do_stage() {
}
do_install() {
- oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
+ oe_libinstall -so libopietooth1 ${D}${libdir}
}
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index db2d069a96..d58832315e 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,4 +1,5 @@
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
PV = "${OPIE_CVS_PV}"
+PR = "r1"
require libopietooth1.inc
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 292a29f7bd..2218734fea 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -16,14 +16,6 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-#CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
-
-do_compile_prepend_mnci () {
- ln -s custom-ramses.h custom.h
-}
do_compile() {
mkdir -p ${STAGING_INCDIR}/qpe \
@@ -53,9 +45,9 @@ do_stage() {
}
do_install() {
- oe_libinstall -so libqpe ${D}${palmtopdir}/lib
+ oe_libinstall -so libqpe ${D}${libdir}
- install -d ${D}${includedir}/qpe \
+ install -d ${D}${includedir}/qpe \
${D}${includedir}/qtopia/private
for i in ${S}/*.h
@@ -72,8 +64,3 @@ do_install() {
done
rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
}
-
-FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
-FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*.so"
-FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
-#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index a91ccfcc01..f206529480 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
diff --git a/packages/libqtaux/libqtaux2.inc b/packages/libqtaux/libqtaux2.inc
index f8721678cf..d83c3608c9 100644
--- a/packages/libqtaux/libqtaux2.inc
+++ b/packages/libqtaux/libqtaux2.inc
@@ -22,8 +22,5 @@ do_stage() {
}
do_install() {
- oe_libinstall -so libqtaux2 ${D}${palmtopdir}/lib
+ oe_libinstall -so libqtaux2 ${D}${libdir}
}
-
-FILES_${PN}="${palmtopdir}/lib"
-
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index fdac72324f..5c3b5e3a28 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r7"
+PR = "r8"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -84,7 +84,7 @@ SRC_URI_append_collie = "\
${TKSRC}/locomo_spi-r4.patch;patch=1 \
${TKSRC}/sharpsl_pm-r2.patch;patch=1 \
${TKSRC}/collie_pm-r2.patch;patch=1 \
- ${TKSRC}/locomokeyb_suspendkey.patch;patch=1 \
+ ${TKSRC}/locomokeyb_suspendkey-2.patch;patch=1 \
${TKSRC}/pcmcia_suspend.patch;patch=1 \
${TKSRC}/ucb1x00_suspend.patch;patch=1 \
"
diff --git a/packages/linux/linux-x86-2.6.20/i486-defconfig b/packages/linux/linux-x86-2.6.20/i486-defconfig
index ed299d667d..d0c170f9eb 100644
--- a/packages/linux/linux-x86-2.6.20/i486-defconfig
+++ b/packages/linux/linux-x86-2.6.20/i486-defconfig
@@ -1,30 +1,21 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20
-# Tue Feb 20 09:02:49 2007
+# Wed Jul 4 16:53:32 2007
#
-CONFIG_X86_64=y
-CONFIG_64BIT=y
-CONFIG_X86=y
-CONFIG_ZONE_DMA32=y
+CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_X86=y
CONFIG_MMU=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_EARLY_PRINTK=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_DMI=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_GENERIC_BUG=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
@@ -56,6 +47,7 @@ CONFIG_INITRAMFS_SOURCE=""
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -89,7 +81,9 @@ CONFIG_STOP_MACHINE=y
# Block layer
#
CONFIG_BLOCK=y
+# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
#
# IO Schedulers
@@ -107,72 +101,124 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
#
# Processor type and features
#
+CONFIG_SMP=y
CONFIG_X86_PC=y
-# CONFIG_X86_VSMP is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_PARAVIRT is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
# CONFIG_MCORE2 is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=128
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_INTERNODE_CACHE_BYTES=128
-CONFIG_X86_TSC=y
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_CMPXCHG64=y
CONFIG_X86_GOOD_APIC=y
-# CONFIG_MICROCODE is not set
-# CONFIG_X86_MSR is not set
-# CONFIG_X86_CPUID is not set
-CONFIG_X86_HT=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_MTRR=y
-CONFIG_SMP=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_HPET_TIMER=y
+CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_BKL=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_NONFATAL is not set
+# CONFIG_X86_MCE_P4THERMAL is not set
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y
-CONFIG_NR_CPUS=8
-# CONFIG_HOTPLUG_CPU is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_HPET_TIMER=y
-CONFIG_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x200000
+# CONFIG_HIGHPTE is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_IRQBALANCE=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
-# CONFIG_REORDER is not set
-CONFIG_K8_NB=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_ISA_DMA_API=y
-CONFIG_GENERIC_PENDING_IRQ=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_HOTPLUG_CPU is not set
+CONFIG_COMPAT_VDSO=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
-# Power management options
+# Power management options (ACPI, APM)
#
CONFIG_PM=y
CONFIG_PM_LEGACY=y
@@ -205,19 +251,34 @@ CONFIG_X86_PM_TIMER=y
# CONFIG_ACPI_CONTAINER is not set
#
+# APM (Advanced Power Management) BIOS Support
+#
+# CONFIG_APM is not set
+
+#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set
#
-# Bus options (PCI etc.)
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_MSI is not set
CONFIG_HT_IRQ=y
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+CONFIG_K8_NB=y
#
# PCCARD (PCMCIA/CardBus) support
@@ -230,11 +291,11 @@ CONFIG_HT_IRQ=y
# CONFIG_HOTPLUG_PCI is not set
#
-# Executable file formats / Emulations
+# Executable file formats
#
CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_MISC=y
-# CONFIG_IA32_EMULATION is not set
#
# Networking
@@ -339,6 +400,7 @@ CONFIG_IP_NF_QUEUE=y
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_IEEE80211 is not set
+CONFIG_WIRELESS_EXT=y
#
# Device Drivers
@@ -457,6 +519,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
@@ -526,6 +589,8 @@ CONFIG_CHR_DEV_SG=y
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
@@ -549,6 +614,7 @@ CONFIG_CHR_DEV_SG=y
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set
@@ -642,17 +708,18 @@ CONFIG_MII=y
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
+CONFIG_PCNET32=y
+# CONFIG_PCNET32_NAPI is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
+CONFIG_E100=m
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
+CONFIG_NE2K_PCI=m
# CONFIG_8139CP is not set
CONFIG_8139TOO=y
CONFIG_8139TOO_PIO=y
@@ -662,6 +729,7 @@ CONFIG_8139TOO_PIO=y
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_NET_POCKET is not set
@@ -703,6 +771,29 @@ CONFIG_S2IO=m
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+CONFIG_NET_WIRELESS=y
#
# Wan interfaces
@@ -827,11 +918,18 @@ CONFIG_RTC=m
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
CONFIG_AGP_AMD64=y
CONFIG_AGP_INTEL=y
+# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
+# CONFIG_AGP_EFFICEON is not set
CONFIG_DRM=y
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not set
@@ -845,6 +943,8 @@ CONFIG_DRM=y
# CONFIG_DRM_SAVAGE is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
+# CONFIG_CS5535_GPIO is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set
@@ -919,6 +1019,7 @@ CONFIG_FB_VESA=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
@@ -930,6 +1031,7 @@ CONFIG_FB_VESA=y
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_CYBLA is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_VIRTUAL is not set
@@ -977,6 +1079,7 @@ CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
+CONFIG_SND_RAWMIDI=y
CONFIG_SND_SEQUENCER=y
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
@@ -1020,6 +1123,7 @@ CONFIG_SND_AC97_CODEC=y
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5535AUDIO is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
@@ -1035,7 +1139,7 @@ CONFIG_SND_AC97_CODEC=y
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
+CONFIG_SND_ENS1371=y
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
@@ -1285,13 +1389,6 @@ CONFIG_RTC_DRV_V3020=m
# CONFIG_KVM is not set
#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
-
-#
# File systems
#
CONFIG_EXT2_FS=y
@@ -1469,6 +1566,10 @@ CONFIG_UNUSED_SYMBOLS=y
# CONFIG_DEBUG_KERNEL is not set
CONFIG_LOG_BUF_SHIFT=15
CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
+CONFIG_DOUBLEFAULT=y
#
# Security options
@@ -1502,10 +1603,10 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
-# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_AES=m
-# CONFIG_CRYPTO_AES_X86_64 is not set
+# CONFIG_CRYPTO_AES_586 is not set
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_TEA=m
@@ -1520,6 +1621,10 @@ CONFIG_CRYPTO_CRC32C=m
#
# Hardware crypto devices
#
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
#
# Library routines
@@ -1529,7 +1634,16 @@ CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
CONFIG_PLIST=y
CONFIG_IOMAP_COPY=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_KTIME_SCALAR=y
diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index cfc8af6f21..969fd55f0e 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel for x86 compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 "
diff --git a/packages/opie-alarm/opie-alarm.inc b/packages/opie-alarm/opie-alarm.inc
index d193653924..60ef1e1eaa 100644
--- a/packages/opie-alarm/opie-alarm.inc
+++ b/packages/opie-alarm/opie-alarm.inc
@@ -10,9 +10,7 @@ S = "${WORKDIR}/opiealarm"
inherit opie
do_install() {
- install -d ${D}${palmtopdir}/bin/ ${D}${sysconfdir}/apm/event.d/
- install -m 0755 ${S}/opiealarm ${D}${palmtopdir}/bin/
+ install -d ${D}${bindir} ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${S}/opiealarm ${D}${bindir}/
install -m 0755 ${WORKDIR}/01opiealarm ${D}${sysconfdir}/apm/event.d/
}
-
-FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/packages/opie-alarm/opie-alarm/01opiealarm b/packages/opie-alarm/opie-alarm/01opiealarm
index 4ab70fe3a8..6a12319cdc 100755
--- a/packages/opie-alarm/opie-alarm/01opiealarm
+++ b/packages/opie-alarm/opie-alarm/01opiealarm
@@ -3,9 +3,9 @@
# and wakes it up when the RTC alarm goes off.
if [ "$1" = suspend ]; then
- /opt/QtPalmtop/bin/opiealarm -s -f
+ opiealarm -s -f
elif [ "$1" = resume ] && [ "$2" != standby ]; then
- /opt/QtPalmtop/bin/opiealarm -r -a 120
+ opiealarm -r -a 120
fi
: exit 0
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index 0dd6254dbe..b5927363d1 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,6 +1,7 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
file://01opiealarm "
diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc
index ce128b3b12..138d07cb17 100644
--- a/packages/opie-init/opie-init.inc
+++ b/packages/opie-init/opie-init.inc
@@ -15,15 +15,15 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
do_install() {
install -d ${D}${sysconfdir}/init.d
install -d ${D}${sysconfdir}/profile.d
- install -d ${D}${palmtopdir}/bin
+ install -d ${D}${bindir}
install -d ${D}${palmtopdir}/etc/skel
sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie >${WORKDIR}/opie.tmp
sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie_defaults >${WORKDIR}/opie_defaults.tmp
install -m 0755 ${WORKDIR}/opie.tmp ${D}${sysconfdir}/init.d/opie
- install -m 0644 ${WORKDIR}/opie_defaults.tmp ${D}${sysconfdir}/profile.d/
+ install -m 0644 ${WORKDIR}/opie_defaults.tmp ${D}${sysconfdir}/profile.d/opie_defaults
- install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
+ install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${bindir}/
install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
if [ -s ${WORKDIR}/locale.conf ]; then
@@ -40,6 +40,6 @@ do_install() {
esac
}
-FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
+#FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-init/opie-init/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie
deleted file mode 100755
index 84f3b3e673..0000000000
--- a/packages/opie-init/opie-init/c7x0/opie
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-# we need to tinker directly with qws_display until the ODevice
-# default (which is now W100:Rot0:0) works flawlessly with rotation
-# and survives a suspend/resume cycle
-export QWS_DISPLAY=Transformed:Rot0:0
-# export QWS_DISPLAY=W100:Rot0:0
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
- echo Opie not installed
- exit 0
-fi
-
-. /etc/profile
-
-for conf in $OPIEDIR/etc/skel/*.conf; do
- conf_basename=`basename $conf`
- if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
- echo "Copying default $conf_basename into $HOME/Settings/"
- mkdir -p $HOME/Settings/
- cat $conf >$HOME/Settings/$conf_basename
- fi
-done
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
- mkdir -p $HOME/systeminfo/
- echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
- ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
- #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
-
- if [ -x "$OPIEDIR/bin/opie-login" ]; then
- echo Starting Opie-login....
- $OPIEDIR/bin/opie-login -terminal 2
- else
- $OPIEDIR/bin/opie-reorgfiles
- if [ -x /usr/bin/ssh-agent ]; then
- SSHAGENT=/usr/bin/ssh-agent
- else
- SSHAGENT=""
- fi
-
- if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
- export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
- fi
- echo Starting Opie....
- $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
- fi
-
- ;;
-
-'stop')
- echo "Stopping Opie..."
- killall qpe 2>/dev/null
- killall opie-login 2>/dev/null
- killall quicklauncher 2>/dev/null
-
- ;;
-
-'restart')
- $0 stop && $0 start
-
- ;;
-
-*)
- echo "usage: $0 { start | stop | restart }"
-
- ;;
-
-esac
-
diff --git a/packages/opie-init/opie-init/mnci/opie b/packages/opie-init/opie-init/mnci/opie
deleted file mode 100755
index d5e2955b10..0000000000
--- a/packages/opie-init/opie-init/mnci/opie
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-# export QWS_KEYBOARD=KernelTTY
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
- echo Opie not installed
- exit 0
-fi
-
-. /etc/profile
-
-if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
- mkdir -p $HOME/Settings
- cp $OPIEDIR/etc/skel/* $HOME/Settings
-fi
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
- mkdir -p $HOME/systeminfo/
- echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
- ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
- if [ -x "$OPIEDIR/bin/opie-login" ]; then
- echo Starting Opie-login....
- $OPIEDIR/bin/opie-login -terminal 2
- else
- $OPIEDIR/bin/opie-reorgfiles >/dev/null
- if [ -x /usr/bin/ssh-agent ]; then
- SSHAGENT=/usr/bin/ssh-agent
- else
- SSHAGENT=""
- fi
-
- if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
- export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
- fi
- echo Starting Opie....
- $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 2>/dev/null
- fi
-
- ;;
-
-'stop')
- echo "Stopping Opie..."
- killall qpe 2>/dev/null
- killall opie-login 2>/dev/null
- killall quicklauncher 2>/dev/null
- sleep 1
- killall -9 qpe 2>/dev/null
- killall -9 opie-login 2>/dev/null
- killall -9 quicklauncher 2>/dev/null
-
- ;;
-
-'restart')
- $0 stop && $0 start
-
- ;;
-
-*)
- echo "usage: $0 { start | stop | restart }"
-
- ;;
-
-esac
-
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 248ec464da..56c54e0a43 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -8,10 +8,16 @@ export OPIEDIR="$QTDIR"
export QPEDIR="$QTDIR"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
+# Following is from c7x0 override, check for validity, etc.
+## we need to tinker directly with qws_display until the ODevice
+## default (which is now W100:Rot0:0) works flawlessly with rotation
+## and survives a suspend/resume cycle
+#export QWS_DISPLAY=Transformed:Rot0:0
+## export QWS_DISPLAY=W100:Rot0:0
+
+if [ -z `which qpe` ] ; then
echo Opie not installed
- exit 0
+ exit 0
fi
. /etc/profile
@@ -34,14 +40,8 @@ if [ ! -e "$HOME/systeminfo/linkver" ] ; then
echo "1.13" >$HOME/systeminfo/linkver
fi
-if [ ! -e "/opt/Qtopia" ] ; then
- ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
case $1 in
'start')
- #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
-
# Turn off psplash if any - sleep is required for anti-race
if [ -e /mnt/.psplash ]; then
TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
@@ -52,7 +52,7 @@ case $1 in
echo Starting Opie-login....
$OPIEDIR/bin/opie-login -terminal 3
else
- $OPIEDIR/bin/opie-reorgfiles
+ opie-reorgfiles
if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
@@ -60,15 +60,15 @@ case $1 in
echo Starting Opie....
(
test -x /usr/bin/ssh-agent && eval $(/usr/bin/ssh-agent -s) && echo $SSH_AGENT_PID>/var/run/opie-ssh-agent.pid ;
- $OPIEDIR/bin/qpe -terminal 3
+ qpe -terminal 3
)
echo -n >/var/log/opie-qss.log
- test -x $OPIEDIR/bin/qpe && { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do
+ { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do
sleep 1
echo "Waiting for qcop to startup: $attempt ..." >>/var/log/opie-qss.log
- $OPIEDIR/bin/qcop QPE/System 'ping()' || continue
+ qcop QPE/System 'ping()' || continue
echo "Starting qss" >>/var/log/opie-qss.log
- $OPIEDIR/bin/qss </dev/null >>/var/log/opie-qss.log 2>&1
+ qss </dev/null >>/var/log/opie-qss.log 2>&1
echo "qss exited, will try to restart" >>/var/log/opie-qss.log
done; rm /var/run/opie-qss-loop.pid; } &
echo $! >/var/run/opie-qss-loop.pid
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index 419221609a..9d84d6188b 100644
--- a/packages/opie-init/opie-init_1.2.2.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r5"
+PR = "r7"
SRC_URI = "file://opie-reorgfiles \
file://opie \
diff --git a/packages/opie-multikey/files/fix-rpath.patch b/packages/opie-multikey/files/fix-rpath.patch
new file mode 100644
index 0000000000..786f618324
--- /dev/null
+++ b/packages/opie-multikey/files/fix-rpath.patch
@@ -0,0 +1,11 @@
+--- multikey/multikey.pro.org 2005-06-16 01:54:51.000000000 +0300
++++ multikey/multikey.pro 2007-07-04 21:02:52.000000000 +0300
+@@ -11,7 +11,7 @@
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH += ../../launcher
+ LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2
+-QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS += -Wl,-rpath,$(palmtopdir)/plugins/inputmethods
+ VERSION = 1.0.0
+
+ include( $(OPIEDIR)/include.pro )
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 53d8db91b4..c16c36616b 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,9 +1,10 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
- ${HANDHELDS_CVS};module=opie/share"
+ ${HANDHELDS_CVS};module=opie/share \
+ file://fix-rpath.patch;patch=1"
# file://friendly-button-names.patch;patch=1"
diff --git a/packages/opie-networksettings/opie-networksettings.inc b/packages/opie-networksettings/opie-networksettings.inc
index 6eeb217309..82c99b29cf 100644
--- a/packages/opie-networksettings/opie-networksettings.inc
+++ b/packages/opie-networksettings/opie-networksettings.inc
@@ -31,7 +31,7 @@ do_install() {
install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
install -d ${D}${palmtopdir}/lib/
- oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib
+ oe_libinstall -so libinterfaces ${D}${libdir}
install -d ${D}${palmtopdir}/plugins/networksettings/
for plugin in kppp wlan
do
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index 9b5ddf5af8..423037e7cf 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-qcop/opie-qcop.inc b/packages/opie-qcop/opie-qcop.inc
index 8c3632877d..b9b0309913 100644
--- a/packages/opie-qcop/opie-qcop.inc
+++ b/packages/opie-qcop/opie-qcop.inc
@@ -8,6 +8,6 @@ S = "${WORKDIR}/qcop"
inherit opie
do_install() {
- install -d ${D}${palmtopdir}/bin/
- install -m 0755 ${S}/qcop ${D}${palmtopdir}/bin/qcop
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/qcop ${D}${bindir}/qcop
}
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index 7a68c6eb20..01a1d1b407 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-qss/opie-qss.inc b/packages/opie-qss/opie-qss.inc
index 10abdf20ea..1e7ea3afde 100644
--- a/packages/opie-qss/opie-qss.inc
+++ b/packages/opie-qss/opie-qss.inc
@@ -8,6 +8,6 @@ S = "${WORKDIR}/qss"
inherit opie
do_install() {
- install -d ${D}${palmtopdir}/bin/
- install -m 0755 ${S}/qss ${D}${palmtopdir}/bin/qss
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/qss ${D}${bindir}/qss
}
diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
index 765849976e..915fefafc0 100644
--- a/packages/opie-qss/opie-qss_cvs.bb
+++ b/packages/opie-qss/opie-qss_cvs.bb
@@ -1,5 +1,6 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher.inc b/packages/opie-quicklauncher/opie-quicklauncher.inc
index d445f6993d..e20572838a 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher.inc
+++ b/packages/opie-quicklauncher/opie-quicklauncher.inc
@@ -8,7 +8,6 @@ S = "${WORKDIR}/quicklauncher"
inherit opie
do_install() {
- install -d ${D}${palmtopdir}/bin/
- install -m 755 quicklauncher ${D}${palmtopdir}/bin/
-
+ install -d ${D}${bindir}
+ install -m 755 quicklauncher ${D}${bindir}/
}
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index 992279d24a..4255a2bf0a 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -1,5 +1,6 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index 8dae3b2484..aea8ff3486 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -7,15 +7,6 @@ APPNAME = "qpe"
S = "${WORKDIR}/launcher"
-# Caps/Numlock icons for devices with keyboard
-EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_spitz = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_akita = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_htcuniversal= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-
# Wallpaper and welcome splash
PIXMAP_SIZE = ""
PIXMAP_SIZE_c7x0 = "-640x480"
@@ -44,7 +35,7 @@ SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
do_install() {
- install -d ${D}${palmtopdir}/bin
+ install -d ${D}${bindir}
for i in ${SECTIONS}
do
install -d ${D}${palmtopdir}/apps/$i/
@@ -57,7 +48,7 @@ do_install() {
install -d ${D}${palmtopdir}/etc/skel
install -d ${D}${sysconfdir}
- install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe
+ install -m 0755 ${S}/qpe ${D}${bindir}/qpe
install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/
install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/
diff --git a/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch b/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
new file mode 100644
index 0000000000..e356682768
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
@@ -0,0 +1,35 @@
+--- launcher/taskbar.h.org 2004-08-23 00:35:22.000000000 +0300
++++ launcher/taskbar.h 2007-07-04 19:23:54.000000000 +0300
+@@ -84,6 +84,7 @@
+ LockKeyState* lockState;
+ StartMenu *sm;
+ bool resizeRunningApp;
++ bool showKbdLockState;
+ };
+
+
+--- launcher/taskbar.cpp.org 2005-07-04 01:13:00.000000000 +0300
++++ launcher/taskbar.cpp 2007-07-04 19:24:48.000000000 +0300
+@@ -213,12 +213,9 @@
+ (void)new SafeMode( this );
+ #endif
+
+- // ## make customizable in some way?
+-#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
+- lockState = new LockKeyState( this );
+-#else
+ lockState = 0;
+-#endif
++ if ( showKbdLockState )
++ lockState = new LockKeyState( this );
+
+ #if defined(Q_WS_QWS)
+ #if !defined(QT_NO_COP)
+@@ -388,6 +385,7 @@
+ Config cfg( "Launcher" );
+ cfg.setGroup( "InputMethods" );
+ resizeRunningApp = cfg.readBoolEntry( "Resize", true );
++ showKbdLockState = cfg.readBoolEntry( "ShowKbdLocks", true );
+ }
+
+ #include "taskbar.moc"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 81e2131be9..7db76aa8dd 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r8"
+PR = "r10"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -11,5 +11,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/etc \
file://nomax.patch;patch=1;pnum=3 \
file://no-builtin-qss-startup.patch;patch=1 \
+ file://kbdlocks-runtime.patch;patch=1 \
file://server.pro \
"
diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index 33307082d0..74de9116b7 100644
--- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta-package for Opie TTF support"
DEPENDS = "freetype"
SECTION = "opie/fonts"
-PR = "r1"
+PR = "r2"
SRC_URI = "file://update-qtttffontdir.c"
S = "${WORKDIR}"
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 7e9cc8ea83..d0e3795d68 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -152,8 +152,10 @@ do_configure() {
> `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
sed -e 's,-linux-,-linux-gnueabi-,g' < $f \
> `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'`
+ sed -e 's,-linux-,-linux-uclibcgnueabi-,g' < $f \
+ > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibcgnueabi-,'`
done
- echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qte failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
do_compile() {
@@ -179,12 +181,12 @@ do_stage() {
}
do_install() {
- oe_libinstall -so -C lib lib${PN} ${D}${palmqtdir}/lib/
+ oe_libinstall -so -C lib lib${PN} ${D}${libdir}
install -d ${D}/${includedir}/qte
install -m 0644 include/*.h ${D}/${includedir}/qte/
}
-FILES_${PN} = "${palmqtdir}/lib/lib${PN}.so.*"
-FILES_${PN}-dev = "${includedir}/* ${palmqtdir}/lib/lib${PN}.so"
-FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
+FILES_${PN} = "${libdir}/lib${PN}.so.*"
+FILES_${PN}-dev = "${includedir}/* ${libdir}/lib${PN}.so"
+FILES_${PN}-dbg = "${libdir}/.debug/"
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index 0624c02b53..6cc5595401 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,7 +1,6 @@
require qte-common_${PV}.inc
-PR = "r14"
+PR = "r15"
EXTRA_OECONF += "-thread"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${palmqtdir}/lib/*.so.*"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 0c11eeedc1..1ef70f63cd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r37"
+PR = "r38"
DEPENDS = "task-boot"
PROVIDES = "${PACKAGES}"
@@ -46,7 +46,10 @@ PACKAGE_ARCH = "all"
PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}"
PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}"
#
# linux-hotplug or none
diff --git a/packages/uclibc/files/errno_values.h.patch b/packages/uclibc/files/errno_values.h.patch
new file mode 100644
index 0000000000..a1e39c181b
--- /dev/null
+++ b/packages/uclibc/files/errno_values.h.patch
@@ -0,0 +1,21 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h
+===================================================================
+--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2002-08-23 20:48:19.000000000 +0200
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2007-07-01 22:11:53.000000000 +0200
+@@ -134,4 +134,16 @@
+ #define ENOMEDIUM 123 /* No medium found */
+ #define EMEDIUMTYPE 124 /* Wrong medium type */
+
++/* the following errornumbers are only in 2.6 */
++
++#define ECANCELED 125 /* Operation Canceled */
++#define ENOKEY 126 /* Required key not available */
++#define EKEYEXPIRED 127 /* Key has expired */
++#define EKEYREVOKED 128 /* Key has been revoked */
++#define EKEYREJECTED 129 /* Key was rejected by service */
++
++/* for robust mutexes */
++#define EOWNERDEAD 130 /* Owner died */
++#define ENOTRECOVERABLE 131 /* State not recoverable */
++
+ #endif /* _BITS_ERRNO_VALUES_H */
diff --git a/packages/uclibc/files/termios.h.patch b/packages/uclibc/files/termios.h.patch
new file mode 100644
index 0000000000..f7200ba393
--- /dev/null
+++ b/packages/uclibc/files/termios.h.patch
@@ -0,0 +1,22 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
+===================================================================
+--- uClibc-0.9.29.orig/libc/sysdeps/linux/common/bits/termios.h 2006-02-13 09:41:37.000000000 +0100
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2007-07-03 00:41:27.000000000 +0200
+@@ -156,7 +156,6 @@
+ #endif
+ #define B57600 0010001
+ #define B115200 0010002
+-#if 0 /* limited on uClibc, keep in sync w/ cfsetspeed.c */
+ #define B230400 0010003
+ #define B460800 0010004
+ #define B500000 0010005
+@@ -171,9 +170,6 @@
+ #define B3500000 0010016
+ #define B4000000 0010017
+ #define __MAX_BAUD B4000000
+-#else
+-#define __MAX_BAUD B115200
+-#endif
+ #ifdef __USE_MISC
+ # define CIBAUD 002003600000 /* input baud rate (not used) */
+ # define CMSPAR 010000000000 /* mark or space (stick) parity */
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index df849064e2..f27bbe7c22 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,13 +7,17 @@
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.29"
-PR = "r5"
+PR = "r6"
require uclibc.inc
PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
-SRC_URI += "file://uClibc.machine file://uClibc.distro"
+SRC_URI += "file://uClibc.machine file://uClibc.distro \
+ file://errno_values.h.patch;patch=1 \
+ file://termios.h.patch;patch=1 \
+ "
+
# mmap-unsigned-shift_bugid1303.patch
# http://uclibc.org/lists/uclibc-cvs/2007-May/011360.html;patch=1"
diff --git a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
new file mode 100644
index 0000000000..4076cb2dd6
--- /dev/null
+++ b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \
+card one sweet day."
+PR = "r1"
+
+SRC_URI = " file://50-hostap_cs.rules "
+
+do_install() {
+ install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 06b18d8baa..b946b98c56 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
the hotplug package and requires a kernel not older than 2.6.12."
RPROVIDES_${PN} = "hotplug"
-PR = "r19"
+PR = "r20"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -14,9 +14,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz
file://mount.blacklist \
"
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
require udev.inc
INITSCRIPT_PARAMS = "start 03 S ."
@@ -55,10 +52,6 @@ do_install () {
install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize
}
-do_install_append_h2200() {
- install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
pkg_postinst_append() {
# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index c1eff0d083..360e6019d5 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r9"
+PR = "r10"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -18,9 +18,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz
require udev.inc
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
INITSCRIPT_PARAMS = "start 03 S ."
FILES_${PN} += "${base_libdir}/udev/*"
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index f36a75ac29..e4ef8395a6 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r8"
+PR = "r9"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
@@ -19,9 +19,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz
require udev.inc
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
INITSCRIPT_PARAMS = "start 03 S ."
FILES_${PN} += "${base_libdir}/udev/*"
@@ -56,10 +53,6 @@ do_install () {
install -d ${D}${base_libdir}/udev/
}
-do_install_append_h2200() {
- install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
pkg_postinst_append() {
# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,