From b294f7bd556fb724296aa68599bddc5e52ca2557 Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 15 Dec 2006 02:02:05 +0000 Subject: Add a bb for python gstreamer bindings. --- packages/python/python-gstreamer_0.10.6.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/python/python-gstreamer_0.10.6.bb (limited to 'packages') diff --git a/packages/python/python-gstreamer_0.10.6.bb b/packages/python/python-gstreamer_0.10.6.bb new file mode 100644 index 0000000000..28dba93cb5 --- /dev/null +++ b/packages/python/python-gstreamer_0.10.6.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL" +DESCRIPTION = "Python gstreamer Bindings" +SECTION = "devel/python" +HOMEPAGE = "http://gstreamer.freedesktop.org" +PRIORITY = "optional" +#DEPENDS = "gstreamer" +#RDEPENDS = "gstreamer" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.gz" +S = "${WORKDIR}/gst-python-${PV}" + +inherit autotools pkgconfig + +do_configure() { + oe_runconf +} -- cgit v1.2.3 From 453ecdacaa60ae46fdfc88cad601bfc411fd1471 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 19 Mar 2007 00:59:57 +0000 Subject: gst-plugins.inc: PR makes no sense for an include file --- packages/gstreamer/gst-plugins.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index f0531dc570..020dfc2ec7 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -2,7 +2,6 @@ DESCRIPTION = "Plugins for GStreamer" SECTION = "multimedia" PRIORITY = "optional" DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound" -PR = "r1" PACKAGES_DYNAMIC = "gst-plugin-*" -- cgit v1.2.3 From a0c00ff8342e3b41f3feb60b3710665ea7879546 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 19 Mar 2007 01:38:00 +0000 Subject: gstreamer: Bump all PR to prevent it from going backwards as a result of removing PR from the include file. --- packages/gstreamer/gst-plugins-bad_0.10.1.bb | 2 ++ packages/gstreamer/gst-plugins-bad_0.10.3.bb | 2 ++ packages/gstreamer/gst-plugins-base_0.10.11.bb | 2 ++ packages/gstreamer/gst-plugins-base_0.10.5.bb | 2 ++ packages/gstreamer/gst-plugins-base_0.10.6.bb | 2 ++ packages/gstreamer/gst-plugins-base_0.10.7.bb | 2 ++ packages/gstreamer/gst-plugins-good_0.10.2.bb | 2 ++ packages/gstreamer/gst-plugins-good_0.10.4.bb | 2 ++ packages/gstreamer/gst-plugins-ugly_0.10.2.bb | 2 ++ packages/gstreamer/gst-plugins-ugly_0.10.4.bb | 2 ++ packages/gstreamer/gstreamer_0.10.11.bb | 1 - packages/gstreamer/gstreamer_0.10.4.bb | 2 ++ packages/gstreamer/gstreamer_0.10.5.bb | 2 ++ packages/gstreamer/gstreamer_0.10.6.bb | 2 ++ packages/gstreamer/gstreamer_0.10.8.bb | 2 ++ 15 files changed, 28 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gstreamer/gst-plugins-bad_0.10.1.bb b/packages/gstreamer/gst-plugins-bad_0.10.1.bb index 7c548acf7d..42f6df4d9d 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.1.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.1.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb index 7c548acf7d..42f6df4d9d 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-base_0.10.11.bb b/packages/gstreamer/gst-plugins-base_0.10.11.bb index 4286a50c61..c2f022f283 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.11.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.11.bb @@ -1,5 +1,7 @@ require gst-plugins.inc + PROVIDES += "gst-plugins" +PR = "r2" do_stage() { autotools_stage_all diff --git a/packages/gstreamer/gst-plugins-base_0.10.5.bb b/packages/gstreamer/gst-plugins-base_0.10.5.bb index 34b5504551..afb0657964 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.5.bb @@ -1 +1,3 @@ require gst-plugins.inc + +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-base_0.10.6.bb b/packages/gstreamer/gst-plugins-base_0.10.6.bb index 48e24bf756..84bd2a9fe6 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.6.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.6.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + PROVIDES_${PN} += "gst-plugins" +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-base_0.10.7.bb b/packages/gstreamer/gst-plugins-base_0.10.7.bb index 4286a50c61..c2f022f283 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.7.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.7.bb @@ -1,5 +1,7 @@ require gst-plugins.inc + PROVIDES += "gst-plugins" +PR = "r2" do_stage() { autotools_stage_all diff --git a/packages/gstreamer/gst-plugins-good_0.10.2.bb b/packages/gstreamer/gst-plugins-good_0.10.2.bb index 7c548acf7d..42f6df4d9d 100644 --- a/packages/gstreamer/gst-plugins-good_0.10.2.bb +++ b/packages/gstreamer/gst-plugins-good_0.10.2.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-good_0.10.4.bb b/packages/gstreamer/gst-plugins-good_0.10.4.bb index 7c548acf7d..42f6df4d9d 100644 --- a/packages/gstreamer/gst-plugins-good_0.10.4.bb +++ b/packages/gstreamer/gst-plugins-good_0.10.4.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb index 7c548acf7d..42f6df4d9d 100644 --- a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb +++ b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb index 7c548acf7d..42f6df4d9d 100644 --- a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb +++ b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb @@ -1,2 +1,4 @@ require gst-plugins.inc + DEPENDS += "gst-plugins-base" +PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.11.bb b/packages/gstreamer/gstreamer_0.10.11.bb index 59e224eab5..b56db69cd6 100644 --- a/packages/gstreamer/gstreamer_0.10.11.bb +++ b/packages/gstreamer/gstreamer_0.10.11.bb @@ -6,7 +6,6 @@ LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "libxml2 glib-2.0 gettext-native popt" -PR = "r0" # until we have decided a final naming scheme, # don't use this package as a replacement for # version 0.8 diff --git a/packages/gstreamer/gstreamer_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb index fcb5ad79ba..69e7637cc6 100644 --- a/packages/gstreamer/gstreamer_0.10.4.bb +++ b/packages/gstreamer/gstreamer_0.10.4.bb @@ -1 +1,3 @@ require gstreamer.inc + +PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb index fcb5ad79ba..69e7637cc6 100644 --- a/packages/gstreamer/gstreamer_0.10.5.bb +++ b/packages/gstreamer/gstreamer_0.10.5.bb @@ -1 +1,3 @@ require gstreamer.inc + +PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb index fcb5ad79ba..69e7637cc6 100644 --- a/packages/gstreamer/gstreamer_0.10.6.bb +++ b/packages/gstreamer/gstreamer_0.10.6.bb @@ -1 +1,3 @@ require gstreamer.inc + +PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb index fcb5ad79ba..69e7637cc6 100644 --- a/packages/gstreamer/gstreamer_0.10.8.bb +++ b/packages/gstreamer/gstreamer_0.10.8.bb @@ -1 +1,3 @@ require gstreamer.inc + +PR = "r2" -- cgit v1.2.3 From e331cce33abbcf242f8c8fa1dd152ca4ca3f7eb9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 19 Mar 2007 19:17:26 +0000 Subject: python-pygtk2: fix staging --- packages/python/python-pygtk2_2.6.3.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages') diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk2_2.6.3.bb index b1c4476b54..61250631ef 100644 --- a/packages/python/python-pygtk2_2.6.3.bb +++ b/packages/python/python-pygtk2_2.6.3.bb @@ -24,5 +24,11 @@ do_configure_prepend() { do_stage() { autotools_stage_includes + sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ + install -d ${STAGING_DATADIR}/pygtk/2.0/codegen + install -d ${STAGING_DATADIR}/pygtk/2.0/defs/ + cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/ + cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ + cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ } -- cgit v1.2.3 From 0b8f21805badca0721be2f3bc9f3e6448b48aad8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 19 Mar 2007 19:48:04 +0000 Subject: llvm: add llvm-native 1.9 --- packages/llvm/.mtn2git_empty | 0 packages/llvm/llvm-native_1.9.bb | 9 +++++++++ packages/llvm/llvm.inc | 16 ++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 packages/llvm/.mtn2git_empty create mode 100644 packages/llvm/llvm-native_1.9.bb create mode 100644 packages/llvm/llvm.inc (limited to 'packages') diff --git a/packages/llvm/.mtn2git_empty b/packages/llvm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/llvm/llvm-native_1.9.bb b/packages/llvm/llvm-native_1.9.bb new file mode 100644 index 0000000000..1493bab886 --- /dev/null +++ b/packages/llvm/llvm-native_1.9.bb @@ -0,0 +1,9 @@ +require llvm.inc + +inherit native + +S = "${WORKDIR}/llvm-${PV}" + +do_stage() { + install -m 755 ${S}/Release/bin/* ${STAGING_BINDIR_NATIVE}/ +} diff --git a/packages/llvm/llvm.inc b/packages/llvm/llvm.inc new file mode 100644 index 0000000000..d9664aeebd --- /dev/null +++ b/packages/llvm/llvm.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "The Low Level Virtual Machine" +HOMEPAGE = "http://llvm.org" +LICENSE = "various" + +SRC_URI = "http://llvm.org/releases/1.9/llvm-${PV}.tar.gz" + +inherit autotools + +do_configure() { + oe_runconf +} + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 3aea1c400ca4298e347ab5d49658a01e537bc311 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 19 Mar 2007 20:26:01 +0000 Subject: libgsmd: gsmd init script updates - split out machine configuration into /etc/default/gsmd - add machine configuration for magician - remove uucp/spool handling, it is not needed for gsmd --- packages/gsm/files/fic-gta01/default | 9 +++ packages/gsm/files/fic-gta01/gsmd | 109 ----------------------------- packages/gsm/files/gsmd | 103 +++++++++++++++++++++++++++ packages/gsm/files/magician/.mtn2git_empty | 0 packages/gsm/files/magician/default | 9 +++ packages/gsm/libgsmd_svn.bb | 5 +- 6 files changed, 125 insertions(+), 110 deletions(-) create mode 100644 packages/gsm/files/fic-gta01/default delete mode 100644 packages/gsm/files/fic-gta01/gsmd create mode 100644 packages/gsm/files/gsmd create mode 100644 packages/gsm/files/magician/.mtn2git_empty create mode 100644 packages/gsm/files/magician/default (limited to 'packages') diff --git a/packages/gsm/files/fic-gta01/default b/packages/gsm/files/fic-gta01/default new file mode 100644 index 0000000000..1511376a6c --- /dev/null +++ b/packages/gsm/files/fic-gta01/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +GSM_DEV="/dev/ttySAC0" diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd deleted file mode 100644 index 822abf57ca..0000000000 --- a/packages/gsm/files/fic-gta01/gsmd +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -# If you must specify special options, uncomment and modify the next line -GSMD_OPTS="-s 115200 -F" -# If your GSM device needs to be powered up, uncommend and modify the next line -GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" -GSM_DEV="/dev/ttySAC0" - -# Source function library. -#. /etc/rc.d/init.d/functions - -RETVAL=0 -prog="gsmd" - -start() { - # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on - # Power on GSM device - if [ -e "${GSM_POW}" ] - then - echo -n "Powering up GSM device..." - echo "1" > ${GSM_POW} - sleep 1 - echo "done" - else - echo "GSM device not found. Aborting startup" - return false - fi - # Start daemons. - echo -n "Starting $prog: " - # We don't use the daemon function here because of a known bug - # in initlog -- it spuriously returns a nonzero status when - # starting daemons that fork themselves. See - # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629 - # for discussion. Fortunately: - # - # 1. gsmd startup can't fail, or at least not in the absence of - # much larger resource-exhaustion problems that would be very obvious. - # - # 2. We don't need all the logging crud that daemon/initlog sets - # up -- gsmd does its own syslog calls. - # - if [ -e "${GSM_DEV}" ] - then - chown uucp.uucp ${GSM_DEV} - mkdir -p /usr/spool/uucp - chown uucp.uucp /usr/spool/uucp - stty -F /dev/ttySAC0 crtscts - gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & - echo "success" - else - # User needs to symlink ${GPS_DEV} to the right thing - echo "No ${GSM_DEV} device, aborting gsmd startup." - fi - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd - return $RETVAL -} - -stop() { - # Stop daemons. - echo -n "Shutting down $prog: " - killall gsmd -# killproc gsmd - RETVAL=$? - echo - if [ $RETVAL -eq 0 ] - then - rm -f /var/lock/subsys/gsmd; - fi - return $RETVAL -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - RETVAL=$? - ;; - condrestart) - if [ -f /var/lock/subsys/gsmd ]; then - stop - start - RETVAL=$? - fi - ;; - status) -# status gsmd -# RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd new file mode 100644 index 0000000000..26ff56aa5c --- /dev/null +++ b/packages/gsm/files/gsmd @@ -0,0 +1,103 @@ +#!/bin/sh +# +# gsmd This shell script starts and stops gsmd. +# +# chkconfig: 345 90 40 +# description: Gsmd manages access to a serial- or USB-connected GSM +# processname: gsmd + +# Source configuration +. /etc/default/gsmd + +# Source function library. +#. /etc/rc.d/init.d/functions + +RETVAL=0 +prog="gsmd" + +start() { + # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on + # Power on GSM device + if [ -e "${GSM_POW}" ] + then + echo -n "Powering up GSM device..." + echo "1" > ${GSM_POW} + sleep 1 + echo "done" + else + echo "GSM device not found. Aborting startup" + return false + fi + # Start daemons. + echo -n "Starting $prog: " + # We don't use the daemon function here because of a known bug + # in initlog -- it spuriously returns a nonzero status when + # starting daemons that fork themselves. See + # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629 + # for discussion. Fortunately: + # + # 1. gsmd startup can't fail, or at least not in the absence of + # much larger resource-exhaustion problems that would be very obvious. + # + # 2. We don't need all the logging crud that daemon/initlog sets + # up -- gsmd does its own syslog calls. + # + if [ -e "${GSM_DEV}" ] + then + stty -F ${GSM_DEV} crtscts + gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & + echo "success" + else + # User needs to symlink ${GPS_DEV} to the right thing + echo "No ${GSM_DEV} device, aborting gsmd startup." + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd + return $RETVAL +} + +stop() { + # Stop daemons. + echo -n "Shutting down $prog: " + killall gsmd +# killproc gsmd + RETVAL=$? + echo + if [ $RETVAL -eq 0 ] + then + rm -f /var/lock/subsys/gsmd; + fi + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + RETVAL=$? + ;; + condrestart) + if [ -f /var/lock/subsys/gsmd ]; then + stop + start + RETVAL=$? + fi + ;; + status) +# status gsmd +# RETVAL=$? + ;; + *) + echo "Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/packages/gsm/files/magician/.mtn2git_empty b/packages/gsm/files/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default new file mode 100644 index 0000000000..fb19d46fd5 --- /dev/null +++ b/packages/gsm/files/magician/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +GSM_DEV="/dev/ttyS1" diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 79623f1897..720ba55d76 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -7,7 +7,8 @@ PV = "0.0+svn${SRCDATE}" PR = "r6" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ - file://gsmd" + file://gsmd \ + file://default" S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d @@ -22,6 +23,8 @@ do_stage() { do_install_append() { install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/default + install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd } PACKAGES =+ "${PN}-tools gsmd" -- cgit v1.2.3 From 833525598beb7be30c588de38bbbf2a2bac014e5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Mar 2007 11:25:09 +0000 Subject: cairo: add 1.4.2 (latest stable) + surface-cache patch --- packages/cairo/cairo_1.4.2.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/cairo/cairo_1.4.2.bb (limited to 'packages') diff --git a/packages/cairo/cairo_1.4.2.bb b/packages/cairo/cairo_1.4.2.bb new file mode 100644 index 0000000000..3e5d2fdb15 --- /dev/null +++ b/packages/cairo/cairo_1.4.2.bb @@ -0,0 +1,7 @@ +require cairo.inc + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + file://cairo-surface-cache-3.patch;patch=1" + +PR = "r0" + -- cgit v1.2.3 From 2dca37a95c953b9c8d19b9fd958dbe9c0ba4771d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Mar 2007 14:57:32 +0000 Subject: linux-gta01: remove bogus CMD_CON that breaks the gsm modem --- packages/linux/linux-gta01_2.6.20.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-gta01_2.6.20.bb b/packages/linux/linux-gta01_2.6.20.bb index a041877c55..67e6c76960 100644 --- a/packages/linux/linux-gta01_2.6.20.bb +++ b/packages/linux/linux-gta01_2.6.20.bb @@ -5,7 +5,7 @@ HOMEPAGE = "N/A" LICENSE = "GPL" DEPENDS += "u-boot-mkimage-gta01-native" MOKOR = "moko8" -PR = "${MOKOR}-r1" +PR = "${MOKOR}-r2" VANILLA_VERSION = "2.6.20" @@ -29,7 +29,7 @@ ALLOW_EMPTY = "1" COMPATIBLE_MACHINE = 'fic-gta01' -CMDLINE_CON = "console=ttySAC0,115200n8" +CMDLINE_CON = "" #CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" # uncomment if you want to boot over NFS #CMDLINE_ROOT = "root=/dev/nfs nfsroot=192.168.1.10:/export/opie-image rootdelay=5 3" -- cgit v1.2.3 From ca656fc8927bd7f530d3101f975b68ca9f7ee175 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Mar 2007 14:59:58 +0000 Subject: libgsmd: hack around bug where the kernel console is pointed to the gsm modem --- packages/gsm/files/gsmd | 4 ++++ packages/gsm/libgsmd_svn.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 26ff56aa5c..254fe0a451 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -18,6 +18,10 @@ prog="gsmd" start() { # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on # Power on GSM device + + # Hack for broken uboot and/or kernel on the neo1973 + dmesg -n1 + if [ -e "${GSM_POW}" ] then echo -n "Powering up GSM device..." diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 720ba55d76..734624b3ff 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r6" +PR = "r7" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 641c1e3a046058117d109e26f4a9a290ce5165c1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 20 Mar 2007 15:06:37 +0000 Subject: gpephone: Update some library descriptions. --- packages/gpephone/libabenabler_0.1.bb | 2 +- packages/gpephone/libcalenabler_1.0.bb | 2 +- packages/gpephone/libim_0.2.bb | 2 +- packages/gpephone/libmsgenabler_1.0.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/libabenabler_0.1.bb b/packages/gpephone/libabenabler_0.1.bb index 7a8efb8382..c76d8f469b 100644 --- a/packages/gpephone/libabenabler_0.1.bb +++ b/packages/gpephone/libabenabler_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS address book library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" diff --git a/packages/gpephone/libcalenabler_1.0.bb b/packages/gpephone/libcalenabler_1.0.bb index f4be78092e..c23e1b42a5 100644 --- a/packages/gpephone/libcalenabler_1.0.bb +++ b/packages/gpephone/libcalenabler_1.0.bb @@ -1,5 +1,5 @@ LICENSE = "LiPS" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS calendar database backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" diff --git a/packages/gpephone/libim_0.2.bb b/packages/gpephone/libim_0.2.bb index 4d59957d79..a802aface5 100644 --- a/packages/gpephone/libim_0.2.bb +++ b/packages/gpephone/libim_0.2.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS instant messenger library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent" diff --git a/packages/gpephone/libmsgenabler_1.0.bb b/packages/gpephone/libmsgenabler_1.0.bb index 385501c959..0522507db0 100644 --- a/packages/gpephone/libmsgenabler_1.0.bb +++ b/packages/gpephone/libmsgenabler_1.0.bb @@ -1,5 +1,5 @@ LICENSE = "LiPS" -DESCRIPTION = "LiPS event model library." +DESCRIPTION = "LiPS message backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" -- cgit v1.2.3 From e4dd6ef9c80c6a74d542a24697467a4a766b98fb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Mar 2007 17:51:09 +0000 Subject: tzdata: also rconflict with timezones --- packages/tzdata/tzdata_2007c.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tzdata/tzdata_2007c.bb b/packages/tzdata/tzdata_2007c.bb index 3b6c45502b..1e8ff25137 100644 --- a/packages/tzdata/tzdata_2007c.bb +++ b/packages/tzdata/tzdata_2007c.bb @@ -3,11 +3,13 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" +PR = "r1" + PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" RPROVIDES = "tzdata" -RCONFLICTS= "timezone-africa timezone-america timezone-antarctica \ +RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ timezone-australia timezone-europe timezone-indian \ timezone-iso3166.tab timezone-pacific timezone-zone.tab" -- cgit v1.2.3 From ddf7b46c66b130f5cd3ed15709183c0fe5f8188a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 20 Mar 2007 19:44:01 +0000 Subject: foonas-image: Move preprocessing away --- packages/images/foonas-image.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index db5ff198fc..8dc2370b5e 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -2,15 +2,11 @@ DESCRIPTION = "Foonas image" LICENSE = "GPL" PR = "r0" -inherit image +inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" -IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" -IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" -IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" -FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" +EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" IMAGE_LINGUAS = "" RDEPENDS = " \ @@ -20,11 +16,10 @@ RDEPENDS = " \ module-init-tools-depmod modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ libgcc1 diffutils cpio findutils\ - portmap dropbear e2fsprogs-blkid \ + dropbear e2fsprogs-blkid \ mdadm hdparm mtd-utils udev \ ${FOONAS_SUPPORT} \ ${FOONAS_KERNEL} " PACKAGE_INSTALL = "${RDEPENDS}" -inherit n2100-image turbostation-image lsppchg-image lsppchd-image \ No newline at end of file -- cgit v1.2.3 From 47dd1d922104b464b93bdda8f646b94b82908e9d Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 20 Mar 2007 21:06:34 +0000 Subject: angstrom-e: add e-image and tasks for angstrom --- packages/angstrom/angstrom-e-image.bb | 37 +++++++++++++++++++++++++++++++++++ packages/angstrom/task-angstrom-e.bb | 27 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 packages/angstrom/angstrom-e-image.bb create mode 100644 packages/angstrom/task-angstrom-e.bb (limited to 'packages') diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb new file mode 100644 index 0000000000..da40f7e00c --- /dev/null +++ b/packages/angstrom/angstrom-e-image.bb @@ -0,0 +1,37 @@ +#Angstrom e image +LICENSE = "MIT" +PR = "r0" + + +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" + +ANGSTROM_EXTRA_INSTALL ?= "" +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "e-image" + +DEPENDS = "task-base" +RDEPENDS = "\ + ${XSERVER} \ + task-base-core-default \ + task-base \ + angstrom-e-base-depends \ + angstrom-e-depends \ + angstrom-gpe-task-settings \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export PACKAGE_INSTALL = "${RDEPENDS}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb new file mode 100644 index 0000000000..ab963dee57 --- /dev/null +++ b/packages/angstrom/task-angstrom-e.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Task packages for the Angstrom distribution" +PR = "r0" +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PACKAGES = "\ + angstrom-e-base-depends \ + angstrom-e-depends" + +RDEPENDS_angstrom-e-base-depends := "\ + angstrom-x11-base-depends \ + rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera gpe-bootsplash-theme-e \ + entrance e-wm \ + glibc-charmap-utf-8 glibc-localedata-i18n" +#xserver-kdrive-fbdev + +RDEPENDS_angstrom-e-depends := "\ + pango-module-basic-fc \ + gdk-pixbuf-loader-bmp \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-pnm \ + gdk-pixbuf-loader-xbm \ + gdk-pixbuf-loader-xpm" \ No newline at end of file -- cgit v1.2.3 From f90f361ece64d0e5c999d6c4e6ee22f976339b52 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Mar 2007 21:36:37 +0000 Subject: disapproval of revision '6cb06ec6fefb58a8630562ccfdd7e9b156c05f3d' --- packages/angstrom/angstrom-e-image.bb | 37 ----------------------------------- packages/angstrom/task-angstrom-e.bb | 27 ------------------------- 2 files changed, 64 deletions(-) delete mode 100644 packages/angstrom/angstrom-e-image.bb delete mode 100644 packages/angstrom/task-angstrom-e.bb (limited to 'packages') diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb deleted file mode 100644 index da40f7e00c..0000000000 --- a/packages/angstrom/angstrom-e-image.bb +++ /dev/null @@ -1,37 +0,0 @@ -#Angstrom e image -LICENSE = "MIT" -PR = "r0" - - -PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" -PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" -PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" - -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" - -ANGSTROM_EXTRA_INSTALL ?= "" -XSERVER ?= "xserver-kdrive-fbdev" - -export IMAGE_BASENAME = "e-image" - -DEPENDS = "task-base" -RDEPENDS = "\ - ${XSERVER} \ - task-base-core-default \ - task-base \ - angstrom-e-base-depends \ - angstrom-e-depends \ - angstrom-gpe-task-settings \ - ${ANGSTROM_EXTRA_INSTALL}" - - -export PACKAGE_INSTALL = "${RDEPENDS}" - -#zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' - -inherit image diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb deleted file mode 100644 index ab963dee57..0000000000 --- a/packages/angstrom/task-angstrom-e.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r0" -ALLOW_EMPTY = "1" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PACKAGES = "\ - angstrom-e-base-depends \ - angstrom-e-depends" - -RDEPENDS_angstrom-e-base-depends := "\ - angstrom-x11-base-depends \ - rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera gpe-bootsplash-theme-e \ - entrance e-wm \ - glibc-charmap-utf-8 glibc-localedata-i18n" -#xserver-kdrive-fbdev - -RDEPENDS_angstrom-e-depends := "\ - pango-module-basic-fc \ - gdk-pixbuf-loader-bmp \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-pnm \ - gdk-pixbuf-loader-xbm \ - gdk-pixbuf-loader-xpm" \ No newline at end of file -- cgit v1.2.3 From 4f638ac8976f54caba8e27c62ff28719a394832b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 21 Mar 2007 05:10:16 +0000 Subject: linux-rp-2.6.20: add sharpsl-rc patch for the CE-RH2 remote --- packages/linux/linux-rp-2.6.20/defconfig-spitz | 1 + packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch | 491 +++++++++++++++++++++ packages/linux/linux-rp_2.6.20.bb | 3 +- 3 files changed, 494 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch (limited to 'packages') diff --git a/packages/linux/linux-rp-2.6.20/defconfig-spitz b/packages/linux/linux-rp-2.6.20/defconfig-spitz index 824fd57aaa..91f73ed4e9 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.20/defconfig-spitz @@ -1601,3 +1601,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_SHARPSL_RC=m \ No newline at end of file diff --git a/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch new file mode 100644 index 0000000000..9761f43aca --- /dev/null +++ b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch @@ -0,0 +1,491 @@ +Index: linux-2.6.20/arch/arm/mach-pxa/spitz.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/spitz.c ++++ linux-2.6.20/arch/arm/mach-pxa/spitz.c +@@ -244,6 +244,13 @@ static struct platform_device spitzkbd_d + .id = -1, + }; + ++/* ++ * Spitz Remote Control Device ++ */ ++static struct platform_device sharpsl_rc_device = { ++ .name = "sharpsl-remote-control", ++ .id = -1, ++}; + + /* + * Spitz LEDs +@@ -476,6 +483,7 @@ static struct platform_device *devices[] + &spitzscoop_device, + &spitzssp_device, + &spitzkbd_device, ++ &sharpsl_rc_device, + &spitzts_device, + &spitzbl_device, + &spitzled_device, +Index: linux-2.6.20/drivers/input/keyboard/Kconfig +=================================================================== +--- linux-2.6.20.orig/drivers/input/keyboard/Kconfig ++++ linux-2.6.20/drivers/input/keyboard/Kconfig +@@ -154,6 +154,17 @@ config KEYBOARD_SPITZ + To compile this driver as a module, choose M here: the + module will be called spitzkbd. + ++config SHARPSL_RC ++ tristate "Sharp SL-Cxx00 Remote Control" ++ depends on PXA_SHARPSL ++ default y ++ help ++ Say Y here to enable the remote on the Sharp Zaurus SL-Cxx00, ++ SL-C1000, SL-C3000 and Sl-C3100 series of PDAs. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called sharpsl_rc. ++ + config KEYBOARD_AMIGA + tristate "Amiga keyboard" + depends on AMIGA +Index: linux-2.6.20/drivers/input/keyboard/Makefile +=================================================================== +--- linux-2.6.20.orig/drivers/input/keyboard/Makefile ++++ linux-2.6.20/drivers/input/keyboard/Makefile +@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON) += newton + obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o + obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o + obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o ++obj-$(CONFIG_SHARPSL_RC) += sharpsl_rc.o + obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o + obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o + obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o +Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c +=================================================================== +--- /dev/null ++++ linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c +@@ -0,0 +1,263 @@ ++/* ++ * Keyboard driver for Sharp Clamshell Models (SL-Cxx00) ++ * ++ * Copyright (c) 2004-2005 Richard Purdie ++ * ++ * Based on corgikbd.c and Sharp's RC driver ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#define DEBUG 1 ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DPRINTK(fmt, args...) dev_dbg(data->dev, fmt "\n", ##args) ++ ++struct remote_control_key { ++ unsigned char min; ++ unsigned char max; ++ unsigned char key; ++}; ++ ++static struct remote_control_key spitz_remote_keys[] = { ++ { 25, 35, KEY_STOPCD}, ++ { 55, 65, KEY_PLAYPAUSE}, ++ { 85, 95, KEY_NEXTSONG}, ++ { 115, 125, KEY_VOLUMEUP}, ++ { 145, 155, KEY_PREVIOUSSONG}, ++ { 180, 190, KEY_MUTE}, ++ { 215, 225, KEY_VOLUMEDOWN}, ++}; ++ ++#define RELEASE_HI 230 ++#define MAX_EARPHONE 6 ++#define RC_POLL_MS 10 ++#define RC_FINISH_MS 500 ++#define WAIT_STATE 3 ++#define NOISE_THRESHOLD 100 ++ ++struct sharpsl_rc { ++ struct input_dev *input; ++ struct device *dev; ++ ++ spinlock_t lock; ++ struct timer_list rctimer; ++ struct timer_list rctimer_finish; ++ ++ unsigned int handling_press; ++ unsigned int noise; ++ unsigned int state; ++ unsigned int last_key; ++}; ++ ++static int get_remocon_raw(void) ++{ ++ int i, val; ++ ++ val = sharpsl_pm_pxa_read_max1111(MAX1111_REMCOM); ++ for (i = 0; i < ARRAY_SIZE(spitz_remote_keys); ++i) { ++ if (val >= spitz_remote_keys[i].min ++ && val <= spitz_remote_keys[i].max) { ++ printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, spitz_remote_keys[i].key); ++ return spitz_remote_keys[i].key; ++ } ++ } ++ return 0; ++} ++ ++static irqreturn_t sharpsl_rc_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ struct sharpsl_rc *data = dev_id; ++ DPRINTK("sharpsl_rc_interrupt %d\n", irq); ++ if (!data->handling_press) { ++ DPRINTK("handling interrupt"); ++ data->handling_press = 1; ++ data->noise = 0; ++ data->state = 0; ++ data->last_key = 0; ++ ++ reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP); ++ ++ mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); ++ } ++ return IRQ_HANDLED; ++} ++ ++static void sharpsl_rc_timer_callback(unsigned long dataPtr) ++{ ++ struct sharpsl_rc *data = (struct sharpsl_rc *) dataPtr; ++ int timer = 1; ++ int key = get_remocon_raw(); ++ DPRINTK("timer callback, key: %d", key); ++ ++ //wait for value to stabilize ++ if (data->state < WAIT_STATE) { ++ if (data->last_key != key) { ++ ++data->noise; ++ if (data->noise > NOISE_THRESHOLD) { ++ DPRINTK("too much noise, bailing"); ++ timer = 0; ++ } ++ data->state = 0; ++ } else { ++ ++data->state; ++ } ++ data->last_key = key; ++ ++ //stable value, send event ++ } else if (data->state == WAIT_STATE) { ++ data->noise = 0; ++ //non-key returned, skip the rest of the states and bail now ++ if (data->last_key == 0) { ++ DPRINTK("non-key detected %d, noise: %d", data->last_key, data->noise); ++ timer = 0; ++ //send button press ++ } else { ++ DPRINTK("key press detected %d, noise %d", data->last_key, data->noise); ++ input_report_key(data->input, data->last_key, 1); ++ } ++ ++data->state; ++ ++ //wait until key is released ++ } else if (data->state < WAIT_STATE * 2) { ++ if (key == data->last_key ++ && data->noise < NOISE_THRESHOLD) { ++ data->state = WAIT_STATE + 1; ++ ++data->noise; ++ } else { ++ ++data->state; ++ } ++ //key is released, send event ++ } else { ++ //send button release ++ DPRINTK("release key %d", data->last_key); ++ input_report_key(data->input, data->last_key, 0); ++ timer = 0; ++ } ++ if (timer) { ++ mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); ++ } else { ++ set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP); ++ data->handling_press = 0; ++ } ++} ++ ++static int __init sharpsl_rc_probe(struct platform_device *pdev) ++{ ++ struct sharpsl_rc *sharpsl_rc; ++ struct input_dev *input_dev; ++ int i, ret; ++ ++ dev_dbg(&pdev->dev, "sharpsl_rc_probe\n"); ++ ++ sharpsl_rc = kzalloc(sizeof(struct sharpsl_rc), GFP_KERNEL); ++ input_dev = input_allocate_device(); ++ if (!sharpsl_rc || !input_dev) { ++ kfree(sharpsl_rc); ++ input_free_device(input_dev); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(pdev, sharpsl_rc); ++ ++ sharpsl_rc->dev = &pdev->dev; ++ sharpsl_rc->input = input_dev; ++ spin_lock_init(&sharpsl_rc->lock); ++ ++ /* Init Remote Control Timer */ ++ init_timer(&sharpsl_rc->rctimer); ++ sharpsl_rc->rctimer.function = sharpsl_rc_timer_callback; ++ sharpsl_rc->rctimer.data = (unsigned long) sharpsl_rc; ++ ++ input_dev->name = "Spitz Remote Control"; ++ input_dev->phys = "sharpsl_rc/input0"; ++ input_dev->id.bustype = BUS_HOST; ++ input_dev->id.vendor = 0x0001; ++ input_dev->id.product = 0x0001; ++ input_dev->id.version = 0x0100; ++ input_dev->cdev.dev = &pdev->dev; ++ input_dev->private = sharpsl_rc; ++ ++ input_dev->evbit[0] = BIT(EV_KEY); ++ ++ for (i = 0; i <= ARRAY_SIZE(spitz_remote_keys); i++) ++ set_bit(spitz_remote_keys[i].key, input_dev->keybit); ++ ++ input_register_device(sharpsl_rc->input); ++ ++ pxa_gpio_mode(SPITZ_GPIO_AK_INT | GPIO_IN); ++ ret = request_irq(SPITZ_IRQ_GPIO_AK_INT, ++ sharpsl_rc_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED, ++ "sharpsl_rc", ++ sharpsl_rc); ++ if (ret < 0) { ++ dev_dbg(&pdev->dev, "Can't get IRQ: %d!\n", i); ++ kfree(sharpsl_rc); ++ input_free_device(input_dev); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int sharpsl_rc_remove(struct platform_device *pdev) ++{ ++ struct sharpsl_rc *sharpsl_rc = platform_get_drvdata(pdev); ++ ++ dev_dbg(&pdev->dev, "sharpsl_rc_remove\n"); ++ ++ free_irq(SPITZ_IRQ_GPIO_AK_INT, sharpsl_rc); ++ del_timer_sync(&sharpsl_rc->rctimer); ++ input_unregister_device(sharpsl_rc->input); ++ kfree(sharpsl_rc); ++ ++ return 0; ++} ++ ++static struct platform_driver sharpsl_rc_driver = { ++ .probe = sharpsl_rc_probe, ++ .remove = sharpsl_rc_remove, ++ .suspend = NULL, ++ .resume = NULL, ++ .driver = { ++ .name = "sharpsl-remote-control", ++ }, ++}; ++ ++static int __devinit sharpsl_rc_init(void) ++{ ++ printk("sharpsl_rc_init\n"); ++ return platform_driver_register(&sharpsl_rc_driver); ++} ++ ++static void __exit sharpsl_rc_exit(void) ++{ ++ printk("sharpsl_rc_exit\n"); ++ platform_driver_unregister(&sharpsl_rc_driver); ++} ++ ++module_init(sharpsl_rc_init); ++module_exit(sharpsl_rc_exit); ++ ++MODULE_AUTHOR("Justin Patrin "); ++MODULE_AUTHOR("Richard Purdie "); ++MODULE_DESCRIPTION("SharpSL Remote Control Driver"); ++MODULE_LICENSE("GPL"); +Index: linux-2.6.20/drivers/input/keyboard/spitzkbd.c +=================================================================== +--- linux-2.6.20.orig/drivers/input/keyboard/spitzkbd.c ++++ linux-2.6.20/drivers/input/keyboard/spitzkbd.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -279,13 +280,21 @@ static irqreturn_t spitzkbd_hinge_isr(in + static int sharpsl_hinge_state; + static int hinge_count; + ++void spitzkbd_handle_sharpsl_rc(void *arg) { ++ request_module("sharpsl_rc"); ++} ++ ++DECLARE_WORK(spitzkbd_work, spitzkbd_handle_sharpsl_rc); ++ + static void spitzkbd_hinge_timer(unsigned long data) + { + struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data; + unsigned long state; + unsigned long flags; ++ unsigned int headphone, remote; + + state = GPLR(SPITZ_GPIO_SWA) & (GPIO_bit(SPITZ_GPIO_SWA)|GPIO_bit(SPITZ_GPIO_SWB)); ++ state |= (GPLR(SPITZ_GPIO_HP_IN) & GPIO_bit(SPITZ_GPIO_HP_IN)); + state |= (GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)); + if (state != sharpsl_hinge_state) { + hinge_count = 0; +@@ -299,9 +308,18 @@ static void spitzkbd_hinge_timer(unsigne + + input_report_switch(spitzkbd_data->input, SW_LID, ((GPLR(SPITZ_GPIO_SWA) & GPIO_bit(SPITZ_GPIO_SWA)) != 0)); + input_report_switch(spitzkbd_data->input, SW_TABLET_MODE, ((GPLR(SPITZ_GPIO_SWB) & GPIO_bit(SPITZ_GPIO_SWB)) != 0)); +- input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) != 0)); ++ ++ headphone = ((GPLR(SPITZ_GPIO_HP_IN) & GPIO_bit(SPITZ_GPIO_HP_IN)) != 0); ++ input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, headphone); ++ ++ remote = headphone && ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) == 0); ++ input_report_switch(spitzkbd_data->input, SW_REMOTE_INSERT, remote); + input_sync(spitzkbd_data->input); + ++ if (remote) { ++ schedule_work(&spitzkbd_work); ++ } ++ + spin_unlock_irqrestore(&spitzkbd_data->lock, flags); + } else { + mod_timer(&spitzkbd_data->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL)); +@@ -394,6 +412,7 @@ static int __init spitzkbd_probe(struct + set_bit(SW_LID, input_dev->swbit); + set_bit(SW_TABLET_MODE, input_dev->swbit); + set_bit(SW_HEADPHONE_INSERT, input_dev->swbit); ++ set_bit(SW_REMOTE_INSERT, input_dev->swbit); + + err = input_register_device(input_dev); + if (err) +@@ -431,9 +450,12 @@ static int __init spitzkbd_probe(struct + request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr, + IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + "Spitzkbd SWB", spitzkbd); +- request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, ++ request_irq(SPITZ_IRQ_GPIO_HP_IN, spitzkbd_hinge_isr, + IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + "Spitzkbd HP", spitzkbd); ++ request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED, ++ "Spitzkbd HP Type", spitzkbd); + + return 0; + +@@ -454,6 +476,7 @@ static int spitzkbd_remove(struct platfo + free_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd); + free_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd); + free_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd); ++ free_irq(SPITZ_IRQ_GPIO_HP_IN, spitzkbd); + free_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd); + + del_timer_sync(&spitzkbd->htimer); +Index: linux-2.6.20/arch/arm/mach-pxa/sharpsl.h +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/sharpsl.h ++++ linux-2.6.20/arch/arm/mach-pxa/sharpsl.h +@@ -50,15 +50,10 @@ void spitz_wait_hsync(void); + + #define READ_GPIO_BIT(x) (GPLR(x) & GPIO_bit(x)) + +-/* MAX1111 Channel Definitions */ +-#define MAX1111_BATT_VOLT 4u +-#define MAX1111_BATT_TEMP 2u +-#define MAX1111_ACIN_VOLT 6u +- + extern struct battery_thresh spitz_battery_levels_acin[]; + extern struct battery_thresh spitz_battery_levels_noac[]; + void sharpsl_pm_pxa_init(void); + void sharpsl_pm_pxa_remove(void); +-int sharpsl_pm_pxa_read_max1111(int channel); ++ + + +Index: linux-2.6.20/arch/arm/mach-pxa/sharpsl_pm.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/sharpsl_pm.c ++++ linux-2.6.20/arch/arm/mach-pxa/sharpsl_pm.c +@@ -135,6 +135,8 @@ int sharpsl_pm_pxa_read_max1111(int chan + | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR); + } + ++EXPORT_SYMBOL(sharpsl_pm_pxa_read_max1111); ++ + void sharpsl_pm_pxa_init(void) + { + pxa_gpio_mode(sharpsl_pm.machinfo->gpio_acin | GPIO_IN); +Index: linux-2.6.20/include/asm-arm/hardware/sharpsl_pm.h +=================================================================== +--- linux-2.6.20.orig/include/asm-arm/hardware/sharpsl_pm.h ++++ linux-2.6.20/include/asm-arm/hardware/sharpsl_pm.h +@@ -104,3 +104,10 @@ irqreturn_t sharpsl_ac_isr(int irq, void + irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id); + irqreturn_t sharpsl_fatal_isr(int irq, void *dev_id); + ++/* MAX1111 Channel Definitions */ ++#define MAX1111_REMCOM 0u ++#define MAX1111_BATT_VOLT 4u ++#define MAX1111_BATT_TEMP 2u ++#define MAX1111_ACIN_VOLT 6u ++ ++int sharpsl_pm_pxa_read_max1111(int channel); +Index: linux-2.6.20/include/linux/input.h +=================================================================== +--- linux-2.6.20.orig/include/linux/input.h ++++ linux-2.6.20/include/linux/input.h +@@ -602,6 +602,7 @@ struct input_absinfo { + #define SW_LID 0x00 /* set = lid shut */ + #define SW_TABLET_MODE 0x01 /* set = tablet mode */ + #define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ ++#define SW_REMOTE_INSERT 0x04 /* set = remote */ + #define SW_MAX 0x0f + + /* +Index: linux-2.6.20/arch/arm/mach-pxa/spitz_pm.c +=================================================================== +--- linux-2.6.20.orig/arch/arm/mach-pxa/spitz_pm.c ++++ linux-2.6.20/arch/arm/mach-pxa/spitz_pm.c +@@ -161,6 +161,13 @@ static int spitz_should_wakeup(unsigned + if (resume_on_alarm && (PEDR & PWER_RTC)) + is_resume |= PWER_RTC; + ++ printk("wakeup: PEDR: %x, PKSR: %x, HP_IN: %x, AK_INT: %x\n", PEDR, PKSR, GPIO_bit(SPITZ_GPIO_HP_IN), GPIO_bit(SPITZ_GPIO_AK_INT)); ++ ++ //remote/headphone interrupt, wakeup ++ if (PEDR == 0 && (PKSR & 0xc0d01) != 0) { ++ is_resume |= PWER_RTC; ++ } ++ + dev_dbg(sharpsl_pm.dev, "is_resume: %x\n",is_resume); + return is_resume; + } diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 49446a772a..70aa40610a 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -53,6 +53,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ file://squashfs3.0-2.6.15.patch;patch=1;status=external \ file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \ + file://sharpsl-rc-r0.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-hx2000 \ file://defconfig-collie \ -- cgit v1.2.3 From 156e6ceaba33c139b3ed0b44b4052999db124f0e Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 21 Mar 2007 05:18:46 +0000 Subject: angstrom: re-add e-image and tasks without gpe-bootsplash --- packages/angstrom/angstrom-e-image.bb | 37 +++++++++++++++++++++++++++++++++++ packages/angstrom/task-angstrom-e.bb | 27 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 packages/angstrom/angstrom-e-image.bb create mode 100644 packages/angstrom/task-angstrom-e.bb (limited to 'packages') diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb new file mode 100644 index 0000000000..da40f7e00c --- /dev/null +++ b/packages/angstrom/angstrom-e-image.bb @@ -0,0 +1,37 @@ +#Angstrom e image +LICENSE = "MIT" +PR = "r0" + + +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" + +ANGSTROM_EXTRA_INSTALL ?= "" +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "e-image" + +DEPENDS = "task-base" +RDEPENDS = "\ + ${XSERVER} \ + task-base-core-default \ + task-base \ + angstrom-e-base-depends \ + angstrom-e-depends \ + angstrom-gpe-task-settings \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export PACKAGE_INSTALL = "${RDEPENDS}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb new file mode 100644 index 0000000000..228c637158 --- /dev/null +++ b/packages/angstrom/task-angstrom-e.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Task packages for the Angstrom distribution" +PR = "r0" +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PACKAGES = "\ + angstrom-e-base-depends \ + angstrom-e-depends" + +RDEPENDS_angstrom-e-base-depends := "\ + angstrom-x11-base-depends \ + rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera \ + entrance e-wm \ + glibc-charmap-utf-8 glibc-localedata-i18n" +#xserver-kdrive-fbdev + +RDEPENDS_angstrom-e-depends := "\ + pango-module-basic-fc \ + gdk-pixbuf-loader-bmp \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-pnm \ + gdk-pixbuf-loader-xbm \ + gdk-pixbuf-loader-xpm" \ No newline at end of file -- cgit v1.2.3 From 36c8a5a94672b5710166d07bc5fcbdd2eaa80162 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Wed, 21 Mar 2007 09:13:46 +0000 Subject: packages/ipkg/ipkg-collateral.bb: Add dest definitions for oplinux and oplinux-uclibc --- packages/ipkg/ipkg-collateral.bb | 2 +- packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty | 0 packages/ipkg/ipkg-collateral/oplinux-uclibc/dest | 3 +++ packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty | 0 packages/ipkg/ipkg-collateral/oplinux/dest | 3 +++ 5 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty create mode 100644 packages/ipkg/ipkg-collateral/oplinux-uclibc/dest create mode 100644 packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty create mode 100644 packages/ipkg/ipkg-collateral/oplinux/dest (limited to 'packages') diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index ec45a10e2d..cfe7d71c2d 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "all" SRC_URI = " \ diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest new file mode 100644 index 0000000000..b786746b63 --- /dev/null +++ b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest @@ -0,0 +1,3 @@ +dest root / +dest ram /tmp +dest smbfs /tmp/smbfs diff --git a/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ipkg/ipkg-collateral/oplinux/dest b/packages/ipkg/ipkg-collateral/oplinux/dest new file mode 100644 index 0000000000..b786746b63 --- /dev/null +++ b/packages/ipkg/ipkg-collateral/oplinux/dest @@ -0,0 +1,3 @@ +dest root / +dest ram /tmp +dest smbfs /tmp/smbfs -- cgit v1.2.3 From 58171c20855a04126b223d981326a9772032ccce Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Wed, 21 Mar 2007 09:19:25 +0000 Subject: packages/base-files/base-files_3.0.14.bb: Add semi-custom profile for oplinux and oplinux-uclibc --- .../base-files/base-files/oplinux-uclibc/profile | 32 ++++++++++++++++++++++ packages/base-files/base-files/oplinux/profile | 32 ++++++++++++++++++++++ packages/base-files/base-files_3.0.14.bb | 2 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 packages/base-files/base-files/oplinux-uclibc/profile create mode 100644 packages/base-files/base-files/oplinux/profile (limited to 'packages') diff --git a/packages/base-files/base-files/oplinux-uclibc/profile b/packages/base-files/base-files/oplinux-uclibc/profile new file mode 100644 index 0000000000..f6ae329b57 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/profile @@ -0,0 +1,32 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/usr/bin/nano" # needed for packages like cron +TERM="linux" # Basic terminal capab. For screen etc. + +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + +if [ "`id -u`" -eq 0 ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in `ls /etc/profile.d/`; do + . /etc/profile.d/$i + done + unset i +fi + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/packages/base-files/base-files/oplinux/profile b/packages/base-files/base-files/oplinux/profile new file mode 100644 index 0000000000..f6ae329b57 --- /dev/null +++ b/packages/base-files/base-files/oplinux/profile @@ -0,0 +1,32 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/usr/bin/nano" # needed for packages like cron +TERM="linux" # Basic terminal capab. For screen etc. + +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + +if [ "`id -u`" -eq 0 ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in `ls /etc/profile.d/`; do + . /etc/profile.d/$i + done + unset i +fi + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 1cf58d7ebb..393e0e3ec2 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r63" +PR = "r64" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From 7d5283c53da68ede4d5ae2e99f2c27fd50253203 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 09:32:42 +0000 Subject: openmoko-session: start dialer so people can receive phonecalls by default :) --- packages/openmoko-base/files/session | 1 + packages/openmoko-base/openmoko-session_svn.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index b2e7fd0a69..1fc2f4d17a 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -14,5 +14,6 @@ matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets= mbinputmgr & openmoko-footer & +openmoko-dialer & exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 5f0a88cfbf..c085606a7d 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r6" +PR = "r7" inherit openmoko-base -- cgit v1.2.3 From 895a9b4cabafc642d676732ac26ca6cdabc6b448 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 10:15:15 +0000 Subject: openmoko-image: install a terminal, virtual keyboard and other stuff to make it useable --- packages/images/openmoko-image.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 0ebddcb276..632963076c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -14,7 +14,9 @@ export PACKAGE_INSTALL = "\ task-openmoko-phone \ task-openmoko-finger \ task-openmoko-pim \ -" + task-openmoko-demo \ + " + DEPENDS = "\ ${MACHINE_TASK_PROVIDER} \ task-openmoko \ -- cgit v1.2.3 From 9eb4349e80b325143f58c98c929f63497f57b44a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 10:17:49 +0000 Subject: openmoko-icon-theme-standard: merge from openmoko svn --- packages/openmoko-base/openmoko-icon-theme-standard_svn.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/openmoko-base/openmoko-icon-theme-standard_svn.bb (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb new file mode 100644 index 0000000000..8be6211d68 --- /dev/null +++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +inherit openmoko-base autotools + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http" +S = "${WORKDIR}/icons" + +PACKAGE_ARCH = "all" -- cgit v1.2.3 From 44965620ed77fd5079b9e57719130bb70d38341e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 21 Mar 2007 11:08:47 +0000 Subject: contacts: added 0.4, unified recipes, fixed PV in svn version, disabled gnome-vfs (from Poky) --- packages/pimlico/contacts.inc | 16 ++++++++++++++++ packages/pimlico/contacts_0.3.bb | 25 ------------------------- packages/pimlico/contacts_0.4.bb | 5 +++++ packages/pimlico/contacts_svn.bb | 30 +++++++++--------------------- 4 files changed, 30 insertions(+), 46 deletions(-) create mode 100644 packages/pimlico/contacts.inc delete mode 100644 packages/pimlico/contacts_0.3.bb create mode 100644 packages/pimlico/contacts_0.4.bb (limited to 'packages') diff --git a/packages/pimlico/contacts.inc b/packages/pimlico/contacts.inc new file mode 100644 index 0000000000..5fa493fab3 --- /dev/null +++ b/packages/pimlico/contacts.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "Address-book application." +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ eds-dbus" +RDEPENDS = "libedata-book" + +inherit autotools pkgconfig + +do_install_append () { + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps +} + +FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ + ${datadir}/pixmaps/stock_person.png" diff --git a/packages/pimlico/contacts_0.3.bb b/packages/pimlico/contacts_0.3.bb deleted file mode 100644 index 799698b7a0..0000000000 --- a/packages/pimlico/contacts_0.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus" -RDEPENDS = "libedata-book" -DESCRIPTION = "Contacts is an address-book application." - -PR = "r1" - -SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \ - file://stock_contact.png \ - file://stock_person.png" - -inherit autotools pkgconfig - -S = "${WORKDIR}/${PN}-${PV}" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps -} - -FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png" - diff --git a/packages/pimlico/contacts_0.4.bb b/packages/pimlico/contacts_0.4.bb new file mode 100644 index 0000000000..28e4cc29ce --- /dev/null +++ b/packages/pimlico/contacts_0.4.bb @@ -0,0 +1,5 @@ +require contacts.inc + +SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \ + file://stock_contact.png \ + file://stock_person.png" diff --git a/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb index bffa1832fd..7687210b52 100644 --- a/packages/pimlico/contacts_svn.bb +++ b/packages/pimlico/contacts_svn.bb @@ -1,29 +1,17 @@ -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs" -RDEPENDS = "gnome-vfs-plugin-file" -RRECOMMENDS = "gnome-vfs-plugin-http" -DESCRIPTION = "Contacts is an address-book application." -PR = "r5" +require contacts.inc -PV = "0.1+svn${SRCDATE}" +#DEPENDS += "gnome-vfs" +#RDEPENDS += "gnome-vfs-plugin-file" +#RRECOMMENDS += "gnome-vfs-plugin-http" + +PV = "0.4+svn${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://stock_contact.png \ file://stock_person.png" -inherit autotools pkgconfig - S = "${WORKDIR}/trunk" -EXTRA_OECONF = "--enable-gnome-vfs" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps -} - -FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png" - +#EXTRA_OECONF = "--enable-gnome-vfs" -- cgit v1.2.3 From baab7d5c3a254cc67ffb71102d94612b21b3051f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 21 Mar 2007 11:09:02 +0000 Subject: tasks: added 0.4, unified recipes, fixed PV in svn version (from Poky) --- packages/pimlico/tasks.inc | 6 ++++++ packages/pimlico/tasks_0.2.bb | 12 ------------ packages/pimlico/tasks_0.4.bb | 3 +++ packages/pimlico/tasks_svn.bb | 8 ++++++++ 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 packages/pimlico/tasks.inc delete mode 100644 packages/pimlico/tasks_0.2.bb create mode 100644 packages/pimlico/tasks_0.4.bb create mode 100644 packages/pimlico/tasks_svn.bb (limited to 'packages') diff --git a/packages/pimlico/tasks.inc b/packages/pimlico/tasks.inc new file mode 100644 index 0000000000..9b7c245ad3 --- /dev/null +++ b/packages/pimlico/tasks.inc @@ -0,0 +1,6 @@ +DESCRIPTION = "Task list application" +LICENSE = "GPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ eds-dbus" + +inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/tasks_0.2.bb b/packages/pimlico/tasks_0.2.bb deleted file mode 100644 index ea9c1b0703..0000000000 --- a/packages/pimlico/tasks_0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Tasks is a simple TODO application." -SECTION = "x11" -LICENSE = "LGPL" -PR = "r0" - -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" - -SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz" - -inherit autotools pkgconfig gtk-icon-cache - - diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb new file mode 100644 index 0000000000..679dedf9da --- /dev/null +++ b/packages/pimlico/tasks_0.4.bb @@ -0,0 +1,3 @@ +require tasks.inc + +SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz" diff --git a/packages/pimlico/tasks_svn.bb b/packages/pimlico/tasks_svn.bb new file mode 100644 index 0000000000..9d9786cbdd --- /dev/null +++ b/packages/pimlico/tasks_svn.bb @@ -0,0 +1,8 @@ +require tasks.inc + +DEFAULT_PREFERENCE = "-1" + +PV = "0.4+svn${SRCDATE}" +S = "${WORKDIR}/trunk" + +SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" -- cgit v1.2.3 From 2e7cbdc4beada61a4b8a190312d29b221aa9f688 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 21 Mar 2007 11:09:17 +0000 Subject: dates: unify recipes, fix PV in svn version (from Poky) --- packages/pimlico/dates.inc | 17 +++++++++++++++++ packages/pimlico/dates_0.3.1.bb | 14 +++----------- packages/pimlico/dates_svn.bb | 18 ++++-------------- 3 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 packages/pimlico/dates.inc (limited to 'packages') diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc new file mode 100644 index 0000000000..fd640844ba --- /dev/null +++ b/packages/pimlico/dates.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "Dates is a calendar application." +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" +RDEPENDS = "libedata-cal" + +inherit autotools pkgconfig gtk-icon-cache + +# EXTRA_OECONF = "--disable-debug" + +FILES_${PN} += "${datadir}/pixmaps/dates.png" + +do_install_append () { + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ +} + diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 8dab1db54b..51d3acc9ed 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,13 +1,5 @@ -DESCRIPTION = "Dates is a calendar application." -SECTION = "x11" -LICENSE = "LGPL" -PR = "r1" - -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" - -SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz" +require dates.inc -inherit autotools pkgconfig gtk-icon-cache - -FILES_${PN} += "${datadir}/pixmaps/dates.png" +PR = "r1" +SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 162e6f61a1..474fdde27a 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,18 +1,8 @@ -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -DESCRIPTION = "Dates is a calendar application." +require dates.inc -PV = "0.1+svn${SRCDATE}" +DEFAULT_PREFERENCE = "-1" + +PV = "0.3.1+svn${SRCDATE}" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" - -inherit autotools pkgconfig gtk-icon-cache - -FILES_${PN} += "${datadir}/pixmaps/dates.png" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ -} -- cgit v1.2.3 From bc6a2cecfe312c651ec8c643ccc3e730cb8ff18d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 11:45:28 +0000 Subject: gtk: remove 2.10.x cruft --- packages/gtk+/gtk+-2.10.3/.mtn2git_empty | 0 packages/gtk+/gtk+-2.10.3/automake-lossage.patch | 24 - packages/gtk+/gtk+-2.10.3/disable-print.patch | 50 - packages/gtk+/gtk+-2.10.3/disable-tooltips.patch | 11 - packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch | 236 -- packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch | 10 - packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch | 29 - packages/gtk+/gtk+-2.10.3/menu-deactivate.patch | 51 - packages/gtk+/gtk+-2.10.3/migration.patch | 615 ------ packages/gtk+/gtk+-2.10.3/no-demos.patch | 10 - packages/gtk+/gtk+-2.10.3/no-xwc.patch | 151 -- packages/gtk+/gtk+-2.10.3/run-iconcache.patch | 19 - packages/gtk+/gtk+-2.10.3/scroll-timings.patch | 11 - packages/gtk+/gtk+-2.10.3/single-click.patch | 54 - packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch | 267 --- packages/gtk+/gtk+-2.10.3/spinbutton.patch | 128 -- packages/gtk+/gtk+-2.10.3/xsettings.patch | 16 - packages/gtk+/gtk+-2.10.6/.mtn2git_empty | 0 packages/gtk+/gtk+-2.10.6/automake-lossage.patch | 24 - packages/gtk+/gtk+-2.10.6/disable-print.patch | 50 - packages/gtk+/gtk+-2.10.6/disable-tooltips.patch | 11 - packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch | 149 -- packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch | 10 - packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch | 29 - packages/gtk+/gtk+-2.10.6/menu-deactivate.patch | 51 - packages/gtk+/gtk+-2.10.6/migration.patch | 611 ----- packages/gtk+/gtk+-2.10.6/no-demos.patch | 10 - packages/gtk+/gtk+-2.10.6/no-xwc.patch | 151 -- packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff | 2456 --------------------- packages/gtk+/gtk+-2.10.6/run-iconcache.patch | 21 - packages/gtk+/gtk+-2.10.6/scroll-timings.patch | 11 - packages/gtk+/gtk+-2.10.6/single-click.patch | 56 - packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch | 267 --- packages/gtk+/gtk+-2.10.6/spinbutton.patch | 130 -- packages/gtk+/gtk+-2.10.6/xsettings.patch | 16 - packages/gtk+/gtk+-2.10.7/.mtn2git_empty | 0 packages/gtk+/gtk+-2.10.7/automake-lossage.patch | 24 - packages/gtk+/gtk+-2.10.7/disable-print.patch | 50 - packages/gtk+/gtk+-2.10.7/disable-tooltips.patch | 11 - packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch | 217 -- packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch | 149 -- packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch | 10 - packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch | 29 - packages/gtk+/gtk+-2.10.7/integer-pixops.patch | 348 --- packages/gtk+/gtk+-2.10.7/menu-deactivate.patch | 51 - packages/gtk+/gtk+-2.10.7/migration.patch | 611 ----- packages/gtk+/gtk+-2.10.7/no-demos.patch | 10 - packages/gtk+/gtk+-2.10.7/no-xwc.patch | 151 -- packages/gtk+/gtk+-2.10.7/run-iconcache.patch | 19 - packages/gtk+/gtk+-2.10.7/scroll-timings.patch | 11 - packages/gtk+/gtk+-2.10.7/single-click.patch | 56 - packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch | 267 --- packages/gtk+/gtk+-2.10.7/spinbutton.patch | 130 -- packages/gtk+/gtk+-2.10.7/xsettings.patch | 16 - packages/gtk+/gtk+_2.10.3.bb | 103 - packages/gtk+/gtk+_2.10.6.bb | 103 - packages/gtk+/gtk+_2.10.7.bb | 24 - 57 files changed, 8125 deletions(-) delete mode 100644 packages/gtk+/gtk+-2.10.3/.mtn2git_empty delete mode 100644 packages/gtk+/gtk+-2.10.3/automake-lossage.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/disable-print.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch delete mode 100644 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/migration.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/no-demos.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/no-xwc.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/run-iconcache.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/scroll-timings.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/single-click.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/spinbutton.patch delete mode 100644 packages/gtk+/gtk+-2.10.3/xsettings.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/.mtn2git_empty delete mode 100644 packages/gtk+/gtk+-2.10.6/automake-lossage.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/disable-print.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/disable-tooltips.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch delete mode 100644 packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/menu-deactivate.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/migration.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/no-demos.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/no-xwc.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff delete mode 100644 packages/gtk+/gtk+-2.10.6/run-iconcache.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/scroll-timings.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/single-click.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/spinbutton.patch delete mode 100644 packages/gtk+/gtk+-2.10.6/xsettings.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/.mtn2git_empty delete mode 100644 packages/gtk+/gtk+-2.10.7/automake-lossage.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/disable-print.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/disable-tooltips.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch delete mode 100644 packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/integer-pixops.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/menu-deactivate.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/migration.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/no-demos.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/no-xwc.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/run-iconcache.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/scroll-timings.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/single-click.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/spinbutton.patch delete mode 100644 packages/gtk+/gtk+-2.10.7/xsettings.patch delete mode 100644 packages/gtk+/gtk+_2.10.3.bb delete mode 100644 packages/gtk+/gtk+_2.10.6.bb delete mode 100644 packages/gtk+/gtk+_2.10.7.bb (limited to 'packages') diff --git a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty b/packages/gtk+/gtk+-2.10.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.10.3/disable-print.patch b/packages/gtk+/gtk+-2.10.3/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.3/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch deleted file mode 100644 index 20481f059b..0000000000 --- a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch +++ /dev/null @@ -1,236 +0,0 @@ ---- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000 -@@ -29,7 +29,7 @@ - #include "gtkarrow.h" - #include "gtkintl.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - GType - gtk_arrow_get_type (void) -@@ -111,6 +113,7 @@ - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -166,13 +169,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } ---- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000 -@@ -340,6 +340,9 @@ - static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar, - guint day); - -+static void gtk_calendar_do_select_day (GtkCalendar *calendar, -+ guint day); -+ - static void gtk_calendar_paint_arrow (GtkWidget *widget, - guint arrow); - static void gtk_calendar_paint_day_num (GtkWidget *widget, -@@ -861,13 +864,13 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else - { - if (calendar->selected_day < 0) - calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1]; -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - } - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); -@@ -908,10 +911,10 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); - gtk_calendar_thaw (calendar); -@@ -939,10 +942,10 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); - gtk_calendar_thaw (calendar); -@@ -974,10 +977,10 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); - gtk_calendar_thaw (calendar); -@@ -2480,9 +2483,9 @@ - return TRUE; - } - --void --gtk_calendar_select_day (GtkCalendar *calendar, -- guint day) -+static void -+gtk_calendar_do_select_day (GtkCalendar *calendar, -+ guint day) - { - g_return_if_fail (GTK_IS_CALENDAR (calendar)); - g_return_if_fail (day <= 31); -@@ -2499,6 +2502,13 @@ - if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) - gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day); - } -+} -+ -+void -+gtk_calendar_select_day (GtkCalendar *calendar, -+ guint day) -+{ -+ gtk_calendar_do_select_day (calendar, day); - - calendar->selected_day = day; - ---- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000 -+++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000 -@@ -557,6 +557,15 @@ - 0.0, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ _("Minimum width"), -+ _("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ - signals[POPULATE_POPUP] = - g_signal_new ("populate_popup", - G_OBJECT_CLASS_TYPE (gobject_class), -@@ -1124,7 +1133,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - PangoContext *context; - - gtk_widget_ensure_style (widget); -@@ -1140,9 +1149,11 @@ - - xborder += INNER_BORDER; - yborder += INNER_BORDER; -- -+ -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2; -+ requisition->width = min_width + xborder * 2; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); ---- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000 -@@ -180,6 +180,7 @@ - static GtkWidgetClass *parent_class = NULL; - static guint signals[LAST_SIGNAL]; - -+static GdkAtom recognize_protocols_atom, atom_atom; - - GType - gtk_range_get_type (void) -@@ -220,6 +221,9 @@ - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - -+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); -+ atom_atom = gdk_atom_intern ("ATOM", FALSE); -+ - parent_class = g_type_class_peek_parent (class); - - gobject_class->set_property = gtk_range_set_property; -@@ -815,6 +819,12 @@ - &attributes, attributes_mask); - gdk_window_set_user_data (range->event_window, range); - -+ gdk_property_change (range->event_window, -+ recognize_protocols_atom, -+ atom_atom, -+ 32, GDK_PROP_MODE_REPLACE, -+ NULL, 0); -+ - widget->style = gtk_style_attach (widget->style, widget->window); - } - -@@ -1186,7 +1196,7 @@ - - /* ignore presses when we're already doing something else. */ - if (range->layout->grab_location != MOUSE_OUTSIDE) -- return FALSE; -+ return TRUE; - - range->layout->mouse_x = event->x; - range->layout->mouse_y = event->y; -@@ -1364,7 +1374,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch deleted file mode 100644 index bdbdb32f97..0000000000 --- a/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100 -+++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100 -@@ -370,7 +370,7 @@ - AC_MSG_CHECKING([Whether to write dependencies into .pc files]) - case $enable_explicit_deps in - auto) -- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -768,7 +768,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1600,7 +1600,7 @@ - # - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.3/migration.patch b/packages/gtk+/gtk+-2.10.3/migration.patch deleted file mode 100644 index 4850f85e4f..0000000000 --- a/packages/gtk+/gtk+-2.10.3/migration.patch +++ /dev/null @@ -1,615 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvs/gnome/gtk+/configure.in,v -retrieving revision 1.419.2.4 -diff -u -r1.419.2.4 configure.in ---- configure.in 8 Feb 2005 21:39:42 -0000 1.419.2.4 -+++ configure.in 27 Feb 2005 13:10:16 -0000 -@@ -1495,6 +1495,16 @@ - GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" - GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v -retrieving revision 1.266.2.1 -diff -u -r1.266.2.1 Makefile.am ---- gtk/Makefile.am 13 Jan 2005 15:18:21 -0000 1.266.2.1 -+++ gtk/Makefile.am 27 Feb 2005 13:10:17 -0000 -@@ -520,6 +520,10 @@ - gtkwindow.c \ - xembed.h - -+if ENABLE_MIGRATION -+gtk_c_sources += gtkmigration.c -+endif -+ - if OS_UNIX - gtk_private_h_sources += gtkfilesystemunix.h - gtk_c_sources += gtkfilesystemunix.c -Index: gtk/gtkmain.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v -retrieving revision 1.255 -diff -u -r1.255 gtkmain.c ---- gtk/gtkmain.c 27 Dec 2004 05:25:15 -0000 1.255 -+++ gtk/gtkmain.c 27 Feb 2005 13:10:19 -0000 -@@ -491,6 +491,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; ---- /dev/null 2005-02-20 01:07:50.714416160 +0000 -+++ gtk/gtkmigration.c 2005-02-27 15:05:04.052757352 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} ---- gtk/gtkwindow.c~ 2006-07-05 13:07:08.000000000 +0200 -+++ gtk/gtkwindow.c 2006-07-05 13:07:08.000000000 +0200 -@@ -50,6 +50,9 @@ - #include "x11/gdkx.h" - #endif - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ -+ - enum { - SET_FOCUS, - FRAME_EVENT, -@@ -823,6 +826,10 @@ - - g_signal_connect (window->screen, "composited_changed", - G_CALLBACK (gtk_window_on_composited_changed), window); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void diff --git a/packages/gtk+/gtk+-2.10.3/no-demos.patch b/packages/gtk+/gtk+-2.10.3/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.3/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.3/no-xwc.patch b/packages/gtk+/gtk+-2.10.3/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.3/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 -@@ -576,12 +576,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -613,6 +615,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -633,6 +636,7 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 -+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 -@@ -525,10 +525,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -578,6 +580,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -595,6 +598,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -667,6 +671,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -681,6 +686,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -753,6 +759,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -780,6 +787,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 -@@ -48,6 +48,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -93,7 +94,8 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -- -+#endif -+ - return; - } - -@@ -136,6 +138,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -178,6 +181,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -210,6 +214,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -242,6 +247,7 @@ - return len_cpy; - } - else -+#endif - { - gint i; - diff --git a/packages/gtk+/gtk+-2.10.3/run-iconcache.patch b/packages/gtk+/gtk+-2.10.3/run-iconcache.patch deleted file mode 100644 index f0bb6ba842..0000000000 --- a/packages/gtk+/gtk+-2.10.3/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk+-2.10.0/gtk/Makefile.am~ 2006-07-05 16:49:16.000000000 +0200 -+++ gtk+-2.10.0/gtk/Makefile.am 2006-07-05 16:49:16.000000000 +0200 -@@ -1088,11 +1088,11 @@ - done \ - && touch stamp-icons - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache -- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ -- ./gtk-update-icon-cache --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache -+# GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ -+# ./gtk-update-icon-cache --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.3/scroll-timings.patch b/packages/gtk+/gtk+-2.10.3/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.3/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "gtkalias.h" - - #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.10.3/single-click.patch b/packages/gtk+/gtk+-2.10.3/single-click.patch deleted file mode 100644 index 3bb208d4d6..0000000000 --- a/packages/gtk+/gtk+-2.10.3/single-click.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c ---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 -+++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00 -@@ -1023,9 +1023,11 @@ - } - - gtk_calendar_select_and_focus_day (calendar, day); -- } -+ -+ // This change causes the calendar to disappear after choosing a day -+/* } - else if (event->type == GDK_2BUTTON_PRESS) -- { -+ {*/ - private_data->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c ---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 -+++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00 -@@ -2468,6 +2468,33 @@ - if (fs->last_selected != NULL) - g_free (fs->last_selected); - -+ // Single-click directory entry -+ if (new_names->len == 1) -+ { -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ tree_view = gtk_tree_selection_get_tree_view (selection); -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ { -+ path = gtk_tree_model_get_path (model, &iter); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (!is_file) -+ { -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ } -+ -+ gtk_tree_path_free (path); -+ } -+ } -+ - fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); - filename = get_real_filename (fs->last_selected, FALSE); - diff --git a/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.10.3/spinbutton.patch b/packages/gtk+/gtk+-2.10.3/spinbutton.patch deleted file mode 100644 index 8ad7507af0..0000000000 --- a/packages/gtk+/gtk+-2.10.3/spinbutton.patch +++ /dev/null @@ -1,128 +0,0 @@ ---- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100 -@@ -733,7 +733,7 @@ - - spin = GTK_SPIN_BUTTON (widget); - arrow_size = spin_button_get_arrow_size (spin); -- panel_width = arrow_size + 2 * widget->style->xthickness; -+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; - - widget->allocation = *allocation; - -@@ -866,19 +866,16 @@ - { - width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; - -+ y = widget->style->ythickness; -+ height = widget->requisition.height - (2 * y); -+ - if (arrow_type == GTK_ARROW_UP) - { - x = 0; -- y = 0; -- -- height = widget->requisition.height / 2; - } - else - { -- x = 0; -- y = widget->requisition.height / 2; -- -- height = (widget->requisition.height + 1) / 2; -+ x = width; - } - - if (spin_button_at_limit (spin_button, arrow_type)) -@@ -908,32 +905,17 @@ - shadow_type = GTK_SHADOW_OUT; - } - } -- -+ - gtk_paint_box (widget->style, spin_button->panel, - state_type, shadow_type, - NULL, widget, -- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", -+ NULL, - x, y, width, height); - - height = widget->requisition.height; - -- if (arrow_type == GTK_ARROW_DOWN) -- { -- y = height / 2; -- height = height - y - 2; -- } -- else -- { -- y = 2; -- height = height / 2 - 2; -- } -- - width -= 3; -- -- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- x = 2; -- else -- x = 1; -+ height -= 3; - - w = width / 2; - w -= w % 2 - 1; /* force odd */ -@@ -1108,7 +1090,7 @@ - if (GTK_ENTRY (widget)->editable) - gtk_spin_button_update (spin); - -- if (event->y <= widget->requisition.height / 2) -+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) - { - if (event->button == 1) - start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); -@@ -1143,44 +1125,11 @@ - - arrow_size = spin_button_get_arrow_size (spin); - -- if (event->button == spin->button) -- { -- int click_child = spin->click_child; -+ gtk_spin_button_stop_spinning (spin); - -- gtk_spin_button_stop_spinning (spin); -- -- if (event->button == 3) -- { -- if (event->y >= 0 && event->x >= 0 && -- event->y <= widget->requisition.height && -- event->x <= arrow_size + 2 * widget->style->xthickness) -- { -- if (click_child == GTK_ARROW_UP && -- event->y <= widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->upper - spin->adjustment->value; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, diff); -- } -- else if (click_child == GTK_ARROW_DOWN && -- event->y > widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->value - spin->adjustment->lower; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, -diff); -- } -- } -- } -- spin_button_redraw (spin); -+ spin_button_redraw (spin); - -- return TRUE; -- } -- else -- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.3/xsettings.patch b/packages/gtk+/gtk+-2.10.3/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.3/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.10.6/.mtn2git_empty b/packages/gtk+/gtk+-2.10.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gtk+/gtk+-2.10.6/automake-lossage.patch b/packages/gtk+/gtk+-2.10.6/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.6/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.10.6/disable-print.patch b/packages/gtk+/gtk+-2.10.6/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.6/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,9 @@ - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - -+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); -+ atom_atom = gdk_atom_intern ("ATOM", FALSE); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,12 @@ - &attributes, attributes_mask); - gdk_window_set_user_data (range->event_window, range); - -+ gdk_property_change (range->event_window, -+ recognize_protocols_atom, -+ atom_atom, -+ 32, GDK_PROP_MODE_REPLACE, -+ NULL, 0); -+ - widget->style = gtk_style_attach (widget->style, widget->window); - } - -@@ -1569,7 +1579,7 @@ - - /* ignore presses when we're already doing something else. */ - if (range->layout->grab_location != MOUSE_OUTSIDE) -- return FALSE; -+ return TRUE; - - range->layout->mouse_x = event->x; - range->layout->mouse_y = event->y; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch deleted file mode 100644 index bdbdb32f97..0000000000 --- a/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100 -+++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100 -@@ -370,7 +370,7 @@ - AC_MSG_CHECKING([Whether to write dependencies into .pc files]) - case $enable_explicit_deps in - auto) -- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -768,7 +768,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1600,7 +1600,7 @@ - # - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.6/migration.patch b/packages/gtk+/gtk+-2.10.6/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.6/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -50,6 +50,9 @@ - #include "x11/gdkx.h" - #endif - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ -+ - enum { - SET_FOCUS, - FRAME_EVENT, -@@ -823,6 +826,10 @@ - - g_signal_connect (window->screen, "composited_changed", - G_CALLBACK (gtk_window_on_composited_changed), window); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void diff --git a/packages/gtk+/gtk+-2.10.6/no-demos.patch b/packages/gtk+/gtk+-2.10.6/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.6/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.6/no-xwc.patch b/packages/gtk+/gtk+-2.10.6/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.6/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 -@@ -576,12 +576,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -613,6 +615,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -633,6 +636,7 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 -+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 -@@ -525,10 +525,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -578,6 +580,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -595,6 +598,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -667,6 +671,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -681,6 +686,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -753,6 +759,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -780,6 +787,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 -@@ -48,6 +48,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -93,7 +94,8 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -- -+#endif -+ - return; - } - -@@ -136,6 +138,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -178,6 +181,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -210,6 +214,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -242,6 +247,7 @@ - return len_cpy; - } - else -+#endif - { - gint i; - diff --git a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff deleted file mode 100644 index 63828cec63..0000000000 --- a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff +++ /dev/null @@ -1,2456 +0,0 @@ -http://mail.gnome.org/archives/performance-list/2006-October/msg00063.html - -From: Xan Lópe -To: ext Matt Hoosier -Cc: performance-list gnome org -Subject: Re: [patch] Remove pangocairo from Gtk+ 2.8.20 -Date: Mon, 30 Oct 2006 14:31:56 +0200 -Hi, - -I've upgraded your patch against GTK+ 2.10.6, and we are getting great -performance figures compared to GTK+ 2.10.6 with pangocairo too -(basically at the level of GTK+ 2.6.10 again). Right now I'm working on -a python/cairo script to get some nice graphics from a torture test -session with several GTK+s, hope to get it ready soon. - -Index: gtk+-2.10.6/configure.in -=================================================================== ---- gtk+-2.10.6.orig/configure.in 2006-10-30 12:59:28.000000000 +0000 -+++ gtk+-2.10.6/configure.in 2006-10-30 12:59:30.000000000 +0000 -@@ -1435,7 +1435,7 @@ - if test "x$gdktarget" = "xwin32"; then - PANGO_PACKAGES="pangowin32 pangocairo" - else -- PANGO_PACKAGES="pango pangocairo" -+ PANGO_PACKAGES="pango pangocairo pangoxft" - fi - - AC_MSG_CHECKING(Pango flags) -Index: gtk+-2.10.6/gdk/gdkaliasdef.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkaliasdef.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkaliasdef.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1799,9 +1799,6 @@ - #undef gdk_pango_context_get - extern __typeof (gdk_pango_context_get) gdk_pango_context_get __attribute((alias("IA__gdk_pango_context_get"), visibility("default"))); - --#undef gdk_pango_context_get_for_screen --extern __typeof (gdk_pango_context_get_for_screen) gdk_pango_context_get_for_screen __attribute((alias("IA__gdk_pango_context_get_for_screen"), visibility("default"))); -- - #ifndef GDK_DISABLE_DEPRECATED - #undef gdk_pango_context_set_colormap - extern __typeof (gdk_pango_context_set_colormap) gdk_pango_context_set_colormap __attribute((alias("IA__gdk_pango_context_set_colormap"), visibility("default"))); -@@ -1836,6 +1833,13 @@ - - #endif - #endif -+#if IN_HEADER(__GDK_PANGO_H__) -+#if IN_FILE(__GDK_PANGO_X11_C__) -+#undef gdk_pango_context_get_for_screen -+extern __typeof (gdk_pango_context_get_for_screen) gdk_pango_context_get_for_screen __attribute((alias("IA__gdk_pango_context_get_for_screen"), visibility("default"))); -+ -+#endif -+#endif - #if IN_HEADER(__GDK_PIXBUF_H__) - #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) - #undef gdk_pixbuf_get_from_drawable -Index: gtk+-2.10.6/gdk/gdkalias.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkalias.h 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkalias.h 2006-10-30 12:59:30.000000000 +0000 -@@ -1796,9 +1796,6 @@ - extern __typeof (gdk_pango_context_get) IA__gdk_pango_context_get __attribute((visibility("hidden"))); - #define gdk_pango_context_get IA__gdk_pango_context_get - --extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden"))); --#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen -- - #ifndef GDK_DISABLE_DEPRECATED - extern __typeof (gdk_pango_context_set_colormap) IA__gdk_pango_context_set_colormap __attribute((visibility("hidden"))); - #define gdk_pango_context_set_colormap IA__gdk_pango_context_set_colormap -@@ -1833,6 +1830,13 @@ - - #endif - #endif -+#if IN_HEADER(__GDK_PANGO_H__) -+#if IN_FILE(__GDK_PANGO_X11_C__) -+extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden"))); -+#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen -+ -+#endif -+#endif - #if IN_HEADER(__GDK_PIXBUF_H__) - #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) - extern __typeof (gdk_pixbuf_get_from_drawable) IA__gdk_pixbuf_get_from_drawable __attribute((visibility("hidden"))); -Index: gtk+-2.10.6/gdk/gdkdraw.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkdraw.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkdraw.c 2006-10-30 12:59:30.000000000 +0000 -@@ -909,9 +909,9 @@ - { - g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (GDK_IS_GC (gc)); -- -- real_draw_glyphs (drawable, gc, NULL, font, -- x, y, glyphs); -+ -+ -+ GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs (drawable, gc, font, x, y, glyphs); - } - - /** -@@ -949,8 +949,9 @@ - g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (GDK_IS_GC (gc)); - -- real_draw_glyphs (drawable, gc, matrix, font, -- x / PANGO_SCALE, y / PANGO_SCALE, glyphs); -+ if (GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs_transformed) -+ GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs_transformed (drawable, gc, matrix, -+ font, x, y, glyphs); - } - - /** -@@ -974,28 +975,12 @@ - GdkTrapezoid *trapezoids, - gint n_trapezoids) - { -- cairo_t *cr; -- int i; -- - g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - g_return_if_fail (GDK_IS_GC (gc)); - g_return_if_fail (n_trapezoids == 0 || trapezoids != NULL); - -- cr = gdk_cairo_create (drawable); -- _gdk_gc_update_context (gc, cr, NULL, NULL, TRUE); -- -- for (i = 0; i < n_trapezoids; i++) -- { -- cairo_move_to (cr, trapezoids[i].x11, trapezoids[i].y1); -- cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y1); -- cairo_line_to (cr, trapezoids[i].x22, trapezoids[i].y2); -- cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y2); -- cairo_close_path (cr); -- } -- -- cairo_fill (cr); -- -- cairo_destroy (cr); -+ GDK_DRAWABLE_GET_CLASS (drawable)->draw_trapezoids (drawable, gc, -+ trapezoids, n_trapezoids); - } - - /** -Index: gtk+-2.10.6/gdk/gdkpango.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkpango.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkpango.c 2006-10-30 12:59:30.000000000 +0000 -@@ -50,19 +50,34 @@ - GdkBitmap *stipple[MAX_RENDER_PART + 1]; - gboolean embossed; - -- cairo_t *cr; -- PangoRenderPart last_part; -+ /* When switching between the normal and shadow copies when -+ * drawing shadows we can get unexpected recursion into the -+ * drawing functions; the 'in_emboss' flag guards against that. -+ */ -+ gboolean in_emboss; - - /* Current target */ - GdkDrawable *drawable; - GdkGC *base_gc; - - gboolean gc_changed; -+ -+ /* Cached GC, derived from base_gc */ -+ GdkGC *gc; -+ PangoColor gc_color; -+ gboolean gc_color_set; -+ GdkBitmap *gc_stipple; -+ -+ /* we accumulate trapezoids for the same PangoRenderPart */ -+ GArray *trapezoids; -+ PangoRenderPart trapezoid_part; - }; - - static PangoAttrType gdk_pango_attr_stipple_type; - static PangoAttrType gdk_pango_attr_embossed_type; - -+static void flush_trapezoids (GdkPangoRenderer *gdk_renderer); -+ - enum { - PROP_0, - PROP_SCREEN -@@ -77,6 +92,10 @@ - GdkPangoRendererPrivate *priv = gdk_renderer->priv; - int i; - -+ if (priv->gc) -+ g_object_unref (priv->gc); -+ if (priv->gc_stipple) -+ g_object_unref (priv->gc_stipple); - if (priv->base_gc) - g_object_unref (priv->base_gc); - if (priv->drawable) -@@ -86,6 +105,8 @@ - if (priv->stipple[i]) - g_object_unref (priv->stipple[i]); - -+ g_array_free (priv->trapezoids, TRUE); -+ - G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->finalize (object); - } - -@@ -112,25 +133,6 @@ - return object; - } - --/* Adjusts matrix and color for the renderer to draw the secondary -- * "shadow" copy for embossed text */ --static void --emboss_context (cairo_t *cr) --{ -- cairo_matrix_t tmp_matrix; -- -- /* The gymnastics here to adjust the matrix are because we want -- * to offset by +1,+1 in device-space, not in user-space, -- * so we can't just draw the layout at x + 1, y + 1 -- */ -- cairo_get_matrix (cr, &tmp_matrix); -- tmp_matrix.x0 += 1.0; -- tmp_matrix.y0 += 1.0; -- cairo_set_matrix (cr, &tmp_matrix); -- -- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); --} -- - static inline gboolean - color_equal (PangoColor *c1, PangoColor *c2) - { -@@ -146,74 +148,154 @@ - return FALSE; - } - --static cairo_t * --get_cairo_context (GdkPangoRenderer *gdk_renderer, -- PangoRenderPart part) -+/* Adjusts matrix and color for the renderer to draw the secondar -+ * "shadow" copy for embossed text */ -+static void -+emboss_renderer (PangoRenderer *renderer, -+ PangoRenderPart part, -+ PangoMatrix **save_matrix, -+ PangoColor **save_color) -+{ -+ GdkPangoRendererPrivate *priv = GDK_PANGO_RENDERER(renderer)->priv; -+ static const PangoColor white = { 0xffff, 0xffff, 0xffff }; -+ PangoMatrix tmp_matrix = PANGO_MATRIX_INIT; -+ -+ priv->in_emboss = TRUE; -+ -+ *save_color = pango_renderer_get_color (renderer, part); -+ if (*save_color) -+ *save_color = pango_color_copy (*save_color); -+ -+ *save_matrix = renderer->matrix; -+ if (*save_matrix) -+ { -+ *save_matrix = pango_matrix_copy (*save_matrix); -+ tmp_matrix = **save_matrix; -+ } -+ -+ /* The gymnastics here to adjust the matrix are because we want -+ * to offset by +1,+1 in device-space, not in user-space, -+ * so we can't just draw the layout at x + 1, y + 1 -+ */ -+ tmp_matrix.x0 += 1; -+ tmp_matrix.y0 += 1; -+ -+ pango_renderer_set_matrix (renderer, &tmp_matrix); -+ pango_renderer_set_color (renderer, part, &white); -+} -+ -+/* Restores from emboss_renderer() */ -+static void -+unemboss_renderer (PangoRenderer *renderer, -+ PangoRenderPart part, -+ PangoMatrix **save_matrix, -+ PangoColor **save_color) -+{ -+ GdkPangoRendererPrivate *priv = GDK_PANGO_RENDERER(renderer)->priv; -+ pango_renderer_set_matrix (renderer, *save_matrix); -+ pango_renderer_set_color (renderer, part, *save_color); -+ -+ if (*save_matrix) -+ pango_matrix_free (*save_matrix); -+ if (*save_color) -+ pango_color_free (*save_color); -+ -+ priv->in_emboss = FALSE; -+} -+ -+/* Gets the GC for drawing @part. This make involve copying the base GC -+ * for the renderer, in which case we keep a one-GC cache. */ -+static GdkGC * -+get_gc (GdkPangoRenderer *gdk_renderer, -+ PangoRenderPart part) - { - PangoRenderer *renderer = PANGO_RENDERER (gdk_renderer); -+ PangoColor *color; -+ GdkBitmap *stipple; - GdkPangoRendererPrivate *priv = gdk_renderer->priv; - -- if (!priv->cr) -+ color = pango_renderer_get_color (renderer, part); -+ -+ if (part <= MAX_RENDER_PART) -+ stipple = priv->stipple[part]; -+ else -+ stipple = NULL; -+ -+ if (!color && !stipple) /* nothing override, use base_gc */ -+ return priv->base_gc; -+ else - { -- const PangoMatrix *matrix; -+ gboolean new_stipple = FALSE; -+ gboolean new_color = FALSE; - -- priv->cr = gdk_cairo_create (priv->drawable); -+ if (stipple != priv->gc_stipple) -+ new_stipple = TRUE; - -- matrix = pango_renderer_get_matrix (renderer); -- if (matrix) -+ if ((priv->gc_color_set && !color) || -+ (!priv->gc_color_set && color) || -+ priv->gc_color.red != color->red || -+ priv->gc_color.green != color->green || -+ priv->gc_color.blue != color->blue) -+ new_color = TRUE; -+ -+ if (!priv->gc) - { -- cairo_matrix_t cairo_matrix; -- -- cairo_matrix_init (&cairo_matrix, -- matrix->xx, matrix->yx, -- matrix->xy, matrix->yy, -- matrix->x0, matrix->y0); -- cairo_set_matrix (priv->cr, &cairo_matrix); -+ priv->gc = gdk_gc_new (priv->drawable); -+ gdk_gc_copy (priv->gc, priv->base_gc); -+ } -+ else if (new_color && priv->gc_color_set && !color) -+ { -+ /* We have to recopy the original GC onto the cached GC -+ * to get the default color */ -+ new_stipple = TRUE; -+ gdk_gc_copy (priv->gc, priv->base_gc); -+ } -+ else if (new_stipple && priv->gc_stipple && !stipple) -+ { -+ /* Similarly, we need to make a new copy to restore to the -+ * default stipple state (the caller may have set a stipple -+ * on the GC, and even if not, gdk_gc_set_stipple (gc, NULL) -+ * doesn't work currently to restore to the default X stipple) */ -+ new_color = TRUE; -+ gdk_gc_copy (priv->gc, priv->base_gc); - } -- } -- -- if (part != priv->last_part) -- { -- PangoColor *pango_color; -- GdkColor *color; -- GdkColor tmp_color; -- gboolean changed; - -- pango_color = pango_renderer_get_color (renderer, part); -- -- if (priv->last_part != -1) -- changed = priv->gc_changed || -- priv->stipple[priv->last_part] != priv->stipple[part] || -- !color_equal (pango_color, -- pango_renderer_get_color (renderer, priv->last_part)); -- else -- changed = TRUE; -- -- if (changed) -+ if (new_color) - { -- if (pango_color) -+ if (color) - { -- tmp_color.red = pango_color->red; -- tmp_color.green = pango_color->green; -- tmp_color.blue = pango_color->blue; -+ GdkColor gdk_color; -+ -+ gdk_color.red = color->red; -+ gdk_color.green = color->green; -+ gdk_color.blue = color->blue; - -- color = &tmp_color; -+ gdk_gc_set_rgb_fg_color (priv->gc, &gdk_color); -+ -+ priv->gc_color = *color; -+ priv->gc_color_set = TRUE; - } - else -- color = NULL; -+ priv->gc_color_set = FALSE; -+ } - -- _gdk_gc_update_context (priv->base_gc, -- priv->cr, -- color, -- priv->stipple[part], -- priv->gc_changed); -+ if (new_stipple) -+ { -+ if (priv->gc_stipple) -+ g_object_unref (priv->gc_stipple); -+ -+ if (stipple) -+ { -+ gdk_gc_set_stipple (priv->gc, stipple); -+ gdk_gc_set_fill (priv->gc, GDK_STIPPLED); -+ priv->gc_stipple = g_object_ref (stipple); -+ } -+ else -+ priv->gc_stipple = NULL; - } - -- priv->last_part = part; -- priv->gc_changed = FALSE; -+ return priv->gc; - } -- -- return priv->cr; - } - - static void -@@ -225,133 +307,78 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- cairo_t *cr; - -- cr = get_cairo_context (gdk_renderer, -- PANGO_RENDER_PART_FOREGROUND); -+ flush_trapezoids (gdk_renderer); - -- if (priv->embossed) -+ if (!priv->in_emboss && priv->embossed) - { -- cairo_save (cr); -- emboss_context (cr); -- cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); -- pango_cairo_show_glyph_string (cr, font, glyphs); -- cairo_restore (cr); -- } -- -- cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); -- pango_cairo_show_glyph_string (cr, font, glyphs); --} -- --/* Draws an error underline that looks like one of: -- * H E H -- * /\ /\ /\ /\ /\ - -- * A/ \ / \ / \ A/ \ / \ | -- * \ \ / \ / /D \ \ / \ | -- * \ \/ C \/ / \ \/ C \ | height = HEIGHT_SQUARES * square -- * \ /\ F / \ F /\ \ | -- * \ / \ / \ / \ \G | -- * \ / \ / \ / \ / | -- * \/ \/ \/ \/ - -- * B B -- * |----| -- * unit_width = (HEIGHT_SQUARES - 1) * square -- * -- * The x, y, width, height passed in give the desired bounding box; -- * x/width are adjusted to make the underline a integer number of units -- * wide. -- */ --#define HEIGHT_SQUARES 2.5 -+ PangoMatrix *save_matrix; -+ PangoColor *save_color; - --/* Cut-and-pasted between here and pango/pango/pangocairo-render.c */ -+ emboss_renderer (renderer, PANGO_RENDER_PART_FOREGROUND, &save_matrix, &save_color); -+ gdk_draw_glyphs_transformed (priv->drawable, -+ get_gc (gdk_renderer, PANGO_RENDER_PART_FOREGROUND), -+ renderer->matrix, font, x, y, glyphs); -+ unemboss_renderer (renderer, PANGO_RENDER_PART_FOREGROUND, &save_matrix, &save_color); -+ } -+ -+ gdk_draw_glyphs_transformed (priv->drawable, -+ get_gc (gdk_renderer, PANGO_RENDER_PART_FOREGROUND), -+ renderer->matrix, font, x, y, glyphs); -+} -+ -+/* Outputs any pending trapezoids, we do this when the part or -+ * part color changes, when we are about to draw text, etc. */ - static void --draw_error_underline (cairo_t *cr, -- double x, -- double y, -- double width, -- double height) --{ -- double square = height / HEIGHT_SQUARES; -- double unit_width = (HEIGHT_SQUARES - 1) * square; -- int width_units = (width + unit_width / 2) / unit_width; -- double y_top, y_bottom; -- int i; -+flush_trapezoids (GdkPangoRenderer *gdk_renderer) -+{ -+ GdkPangoRendererPrivate *priv = gdk_renderer->priv; - -- x += (width - width_units * unit_width) / 2; -- width = width_units * unit_width; -+ if (!priv->trapezoids || priv->trapezoids->len == 0) -+ return; - -- y_top = y; -- y_bottom = y + height; -- -- /* Bottom of squiggle */ -- cairo_move_to (cr, x - square / 2, y_top + square / 2); /* A */ -- for (i = 0; i < width_units; i += 2) -- { -- double x_middle = x + (i + 1) * unit_width; -- double x_right = x + (i + 2) * unit_width; -- -- cairo_line_to (cr, x_middle, y_bottom); /* B */ -- -- if (i + 1 == width_units) -- /* Nothing */; -- else if (i + 2 == width_units) -- cairo_line_to (cr, x_right + square / 2, y_top + square / 2); /* D */ -- else -- cairo_line_to (cr, x_right, y_top + square); /* C */ -- } -- -- /* Top of squiggle */ -- for (i -= 2; i >= 0; i -= 2) -- { -- double x_left = x + i * unit_width; -- double x_middle = x + (i + 1) * unit_width; -- double x_right = x + (i + 2) * unit_width; -- -- if (i + 1 == width_units) -- cairo_line_to (cr, x_middle + square / 2, y_bottom - square / 2); /* G */ -- else { -- if (i + 2 == width_units) -- cairo_line_to (cr, x_right, y_top); /* E */ -- cairo_line_to (cr, x_middle, y_bottom - square); /* F */ -- } -- -- cairo_line_to (cr, x_left, y_top); /* H */ -- } -+ gdk_draw_trapezoids (priv->drawable, -+ get_gc (gdk_renderer, priv->trapezoid_part), -+ (GdkTrapezoid *)priv->trapezoids->data, -+ priv->trapezoids->len); - -- cairo_close_path (cr); -- cairo_fill (cr); -+ g_array_set_size (priv->trapezoids, 0); - } - -+/* Draws a single trapezoid ... we don't draw it immediately, but rather -+ * cache it to join together with other trapezoids that form part of the -+ * same logical shape */ - static void --gdk_pango_renderer_draw_rectangle (PangoRenderer *renderer, -- PangoRenderPart part, -- int x, -- int y, -- int width, -- int height) -+gdk_pango_renderer_draw_trapezoid (PangoRenderer *renderer, -+ PangoRenderPart part, -+ double y1, -+ double x11, -+ double x21, -+ double y2, -+ double x12, -+ double x22) - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); -- GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- cairo_t *cr; -- -- cr = get_cairo_context (gdk_renderer, part); -- -- if (priv->embossed && part != PANGO_RENDER_PART_BACKGROUND) -- { -- cairo_save (cr); -- emboss_context (cr); -- cairo_rectangle (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -+ GdkTrapezoid trap; - -- cairo_fill (cr); -- cairo_restore (cr); -- } -+ if (!gdk_renderer->priv->trapezoids) -+ gdk_renderer->priv->trapezoids = g_array_new (FALSE, FALSE, -+ sizeof (GdkTrapezoid)); -+ -+ if (gdk_renderer->priv->trapezoids->len > 0 && -+ gdk_renderer->priv->trapezoid_part != part) -+ flush_trapezoids (gdk_renderer); -+ -+ gdk_renderer->priv->trapezoid_part = part; -+ -+ trap.y1 = y1; -+ trap.x11 = x11 / 2; -+ trap.x21 = x21; -+ trap.y2 = y2; -+ trap.x12 = x12; -+ trap.x22 = x22; - -- cairo_rectangle (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -- cairo_fill (cr); -+ g_array_append_val (gdk_renderer->priv->trapezoids, trap); - } - - static void -@@ -363,23 +390,51 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- cairo_t *cr; -- -- cr = get_cairo_context (gdk_renderer, PANGO_RENDER_PART_UNDERLINE); -- -- if (priv->embossed) -+ -+ if (!priv->in_emboss && priv->embossed) - { -- cairo_save (cr); -- emboss_context (cr); -- draw_error_underline (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -- cairo_restore (cr); -+ PangoMatrix *save_matrix; -+ PangoColor *save_color; -+ -+ emboss_renderer (renderer, PANGO_RENDER_PART_UNDERLINE, &save_matrix, &save_color); -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_error_underline (renderer, -+ x, y, width, height); -+ unemboss_renderer (renderer, PANGO_RENDER_PART_UNDERLINE, &save_matrix, &save_color); - } - -- draw_error_underline (cr, -- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, -- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_error_underline (renderer, -+ x, y, width, height); -+} -+ -+/* We can't handle embossing at the level of trapezoids, because when an -+ * underline is split into multiple trapezoids, the normal and shadow -+ * trapezoids will be drawn mixed together. Instead, we have to emboss -+ * and entire rectangle or error underline -+ */ -+static void -+gdk_pango_renderer_draw_rectangle (PangoRenderer *renderer, -+ PangoRenderPart part, -+ int x, -+ int y, -+ int width, -+ int height) -+{ -+ GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); -+ GdkPangoRendererPrivate *priv = gdk_renderer->priv; -+ -+ if (!priv->in_emboss && priv->embossed && part != PANGO_RENDER_PART_BACKGROUND) -+ { -+ PangoMatrix *save_matrix; -+ PangoColor *save_color; -+ -+ emboss_renderer (renderer, part, &save_matrix, &save_color); -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_rectangle (renderer, part, -+ x, y, width, height); -+ unemboss_renderer (renderer, part, &save_matrix, &save_color); -+ } -+ -+ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_rectangle (renderer, part, -+ x, y, width, height); - } - - static void -@@ -388,8 +443,8 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - -- if (gdk_renderer->priv->last_part == part) -- gdk_renderer->priv->last_part = (PangoRenderPart)-1; -+ if (part == gdk_renderer->priv->trapezoid_part) -+ flush_trapezoids (gdk_renderer); - } - - static void -@@ -410,13 +465,8 @@ - { - GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); - GdkPangoRendererPrivate *priv = gdk_renderer->priv; -- -- if (priv->cr) -- { -- cairo_destroy (priv->cr); -- priv->cr = NULL; -- } -- priv->last_part = (PangoRenderPart)-1; -+ -+ flush_trapezoids (gdk_renderer); - } - - static void -@@ -515,7 +565,6 @@ - GDK_TYPE_PANGO_RENDERER, - GdkPangoRendererPrivate); - -- renderer->priv->last_part = (PangoRenderPart)-1; - renderer->priv->gc_changed = TRUE; - } - -@@ -527,6 +576,7 @@ - PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass); - - renderer_class->draw_glyphs = gdk_pango_renderer_draw_glyphs; -+ renderer_class->draw_trapezoid = gdk_pango_renderer_draw_trapezoid; - renderer_class->draw_rectangle = gdk_pango_renderer_draw_rectangle; - renderer_class->draw_error_underline = gdk_pango_renderer_draw_error_underline; - renderer_class->part_changed = gdk_pango_renderer_part_changed; -@@ -647,6 +697,8 @@ - - priv = gdk_renderer->priv; - -+ flush_trapezoids (gdk_renderer); -+ - if (priv->drawable != drawable) - { - if (priv->drawable) -@@ -681,6 +733,8 @@ - - priv = gdk_renderer->priv; - -+ flush_trapezoids (gdk_renderer); -+ - if (priv->base_gc != gc) - { - if (priv->base_gc) -@@ -689,6 +743,20 @@ - if (priv->base_gc) - g_object_ref (priv->base_gc); - -+ if (priv->gc) -+ { -+ g_object_unref (priv->gc); -+ priv->gc = NULL; -+ } -+ -+ priv->gc_color_set = FALSE; -+ -+ if (priv->gc_stipple) -+ { -+ g_object_unref (priv->gc_stipple); -+ priv->gc_stipple = NULL; -+ } -+ - priv->gc_changed = TRUE; - } - } -@@ -1414,50 +1482,5 @@ - return gdk_pango_context_get_for_screen (gdk_screen_get_default ()); - } - --/** -- * gdk_pango_context_get_for_screen: -- * @screen: the #GdkScreen for which the context is to be created. -- * -- * Creates a #PangoContext for @screen. -- * -- * The context must be freed when you're finished with it. -- * -- * When using GTK+, normally you should use gtk_widget_get_pango_context() -- * instead of this function, to get the appropriate context for -- * the widget you intend to render text onto. -- * -- * The newly created context will have the default font options -- * (see #cairo_font_options_t) for the screen; if these options -- * change it will not be updated. Using gtk_widget_get_pango_context() -- * is more convenient if you want to keep a context around and track -- * changes to the screen's font rendering settings. -- * -- * Return value: a new #PangoContext for @screen -- * -- * Since: 2.2 -- **/ --PangoContext * --gdk_pango_context_get_for_screen (GdkScreen *screen) --{ -- PangoFontMap *fontmap; -- PangoContext *context; -- const cairo_font_options_t *options; -- double dpi; -- -- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); -- -- fontmap = pango_cairo_font_map_get_default (); -- -- context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap)); -- -- options = gdk_screen_get_font_options (screen); -- pango_cairo_context_set_font_options (context, options); -- -- dpi = gdk_screen_get_resolution (screen); -- pango_cairo_context_set_resolution (context, dpi); -- -- return context; --} -- - #define __GDK_PANGO_C__ - #include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/gdk.symbols -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdk.symbols 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdk.symbols 2006-10-30 12:59:30.000000000 +0000 -@@ -861,7 +861,6 @@ - gdk_pango_attr_embossed_new - gdk_pango_attr_stipple_new - gdk_pango_context_get --gdk_pango_context_get_for_screen - #ifndef GDK_DISABLE_DEPRECATED - gdk_pango_context_set_colormap - #endif -@@ -877,6 +876,12 @@ - #endif - #endif - -+#if IN_HEADER(__GDK_PANGO_H__) -+#if IN_FILE(__GDK_PANGO_X11_C__) -+gdk_pango_context_get_for_screen -+#endif -+#endif -+ - #if IN_HEADER(__GDK_PIXBUF_H__) - #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) - gdk_pixbuf_get_from_drawable -Index: gtk+-2.10.6/gdk/gdkwindow.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/gdkwindow.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/gdkwindow.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1834,9 +1834,14 @@ - } - else - { -- method->cr = cairo_create (paint->surface); -+ /*method->cr = cairo_create (paint->surface); - -- gdk_cairo_set_source_color (method->cr, &private->bg_color); -+ gdk_cairo_set_source_color (method->cr, &private->bg_color);*/ -+ GdkGC *gc = _gdk_drawable_get_scratch_gc (paint->pixmap, FALSE); -+ -+ gdk_gc_set_foreground (gc, &(private->bg_color)); -+ -+ method->gc = g_object_ref (gc); - } - } - -Index: gtk+-2.10.6/gdk/x11/gdkdisplay-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdisplay-x11.c 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdisplay-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -190,7 +190,8 @@ - display_x11->leader_window_title_set = FALSE; - - display_x11->have_render = GDK_UNKNOWN; -- -+ display_x11->have_render_with_trapezoids = GDK_UNKNOWN; -+ - #ifdef HAVE_XFIXES - if (XFixesQueryExtension (display_x11->xdisplay, - &display_x11->xfixes_event_base, -Index: gtk+-2.10.6/gdk/x11/gdkdisplay-x11.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdisplay-x11.h 2006-10-30 12:58:29.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdisplay-x11.h 2006-10-30 12:59:30.000000000 +0000 -@@ -78,6 +78,7 @@ - gboolean use_xshm; - gboolean have_shm_pixmaps; - GdkTristate have_render; -+ GdkTristate have_render_with_trapezoids; - gboolean have_xfixes; - gint xfixes_event_base; - -Index: gtk+-2.10.6/gdk/x11/gdkdrawable-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdrawable-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdrawable-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -26,6 +26,8 @@ - - #include - -+#include -+ - #include "gdkx.h" - #include "gdkregion-generic.h" - -@@ -106,7 +108,21 @@ - GdkGC *gc, - GdkPoint *points, - gint npoints); -- -+ -+static void gdk_x11_draw_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs); -+static void gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoMatrix *matrix, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs); -+ - static void gdk_x11_draw_image (GdkDrawable *drawable, - GdkGC *gc, - GdkImage *image, -@@ -129,6 +145,11 @@ - gint x_dither, - gint y_dither); - -+static void gdk_x11_draw_trapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ GdkTrapezoid *trapezoids, -+ gint n_trapezoids); -+ - static cairo_surface_t *gdk_x11_ref_cairo_surface (GdkDrawable *drawable); - - static void gdk_x11_set_colormap (GdkDrawable *drawable, -@@ -163,8 +184,11 @@ - drawable_class->draw_points = gdk_x11_draw_points; - drawable_class->draw_segments = gdk_x11_draw_segments; - drawable_class->draw_lines = gdk_x11_draw_lines; -+ drawable_class->draw_glyphs = gdk_x11_draw_glyphs; -+ drawable_class->draw_glyphs_transformed = gdk_x11_draw_glyphs_transformed; - drawable_class->draw_image = gdk_x11_draw_image; - drawable_class->draw_pixbuf = gdk_x11_draw_pixbuf; -+ drawable_class->draw_trapezoids = gdk_x11_draw_trapezoids; - - drawable_class->ref_cairo_surface = gdk_x11_ref_cairo_surface; - -@@ -327,6 +351,72 @@ - return x11display->have_render == GDK_YES; - } - -+gboolean -+_gdk_x11_have_render_with_trapezoids (GdkDisplay *display) -+{ -+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); -+ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); -+ -+ if (x11display->have_render_with_trapezoids == GDK_UNKNOWN) -+ { -+ x11display->have_render_with_trapezoids = GDK_NO; -+ if (_gdk_x11_have_render (display)) -+ { -+ /* -+ * Require protocol >= 0.4 for CompositeTrapezoids support. -+ */ -+ int major_version, minor_version; -+ -+#define XRENDER_TETRAPEZOIDS_MAJOR 0 -+#define XRENDER_TETRAPEZOIDS_MINOR 4 -+ -+ if (XRenderQueryVersion (xdisplay, &major_version, -+ &minor_version)) -+ if ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) && -+ (minor_version >= XRENDER_TETRAPEZOIDS_MINOR)) -+ x11display->have_render_with_trapezoids = GDK_YES; -+ } -+ } -+ -+ return x11display->have_render_with_trapezoids == GDK_YES; -+} -+ -+static XftDraw * -+gdk_x11_drawable_get_xft_draw (GdkDrawable *drawable) -+{ -+ GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable); -+ -+ if (impl->xft_draw == NULL) -+ { -+ GdkColormap *colormap = gdk_drawable_get_colormap (drawable); -+ -+ if (colormap) -+ { -+ GdkVisual *visual; -+ -+ visual = gdk_colormap_get_visual (colormap); -+ -+ impl->xft_draw = XftDrawCreate (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid, -+ GDK_VISUAL_XVISUAL (visual), GDK_COLORMAP_XCOLORMAP (colormap)); -+ } -+ else if (gdk_drawable_get_depth (drawable) == 1) -+ { -+ impl->xft_draw = XftDrawCreateBitmap (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid); -+ } -+ else -+ { -+ g_warning ("Using Xft rendering requires the drawable argument to\n" -+ "have a specified colormap. All windows have a colormap,\n" -+ "however, pixmaps only have colormap by default if they\n" -+ "were created with a non-NULL window argument. Otherwise\n" -+ "a colormap must be set on them with gdk_drawable_set_colormap"); -+ return NULL; -+ } -+ } -+ -+ return impl->xft_draw; -+} -+ - static Picture - gdk_x11_drawable_get_picture (GdkDrawable *drawable) - { -@@ -393,6 +483,57 @@ - } - } - -+static void -+gdk_x11_drawable_update_xft_clip (GdkDrawable *drawable, -+ GdkGC *gc) -+{ -+ XftDraw *xft_draw = gdk_x11_drawable_get_xft_draw (drawable); -+ GdkRegion *clip_region = _gdk_gc_get_clip_region (gc); -+ -+ if (gc && clip_region) -+ { -+ GdkRegionBox *boxes = clip_region->rects; -+ gint n_boxes = clip_region->numRects; -+#if 0 /* Until XftDrawSetClipRectangles is there */ -+ XRectangle *rects = g_new (XRectangle, n_boxes); -+ int i; -+ -+ for (i=0; i < n_boxes; i++) -+ { -+ rects[i].x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); -+ rects[i].y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); -+ rects[i].width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rects[i].x; -+ rects[i].height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rects[i].y; -+ } -+ XftDrawSetClipRectangles (xft_draw, 0, 0, rects, n_boxes); -+ -+ g_free (rects); -+#else -+ Region xregion = XCreateRegion (); -+ int i; -+ -+ for (i=0; i < n_boxes; i++) -+ { -+ XRectangle rect; -+ -+ rect.x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); -+ rect.y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); -+ rect.width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rect.x; -+ rect.height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rect.y; -+ -+ XUnionRectWithRegion (&rect, xregion, xregion); -+ } -+ -+ XftDrawSetClip (xft_draw, xregion); -+ XDestroyRegion (xregion); -+#endif -+ } -+ else -+ { -+ XftDrawSetClip (xft_draw, NULL); -+ } -+} -+ - /***************************************************** - * X11 specific implementations of generic functions * - *****************************************************/ -@@ -780,6 +921,45 @@ - } - - static void -+gdk_x11_draw_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs) -+{ -+ gdk_x11_draw_glyphs_transformed (drawable, gc, NULL, -+ font, -+ x * PANGO_SCALE, -+ y * PANGO_SCALE, -+ glyphs); -+} -+ -+static void -+gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, -+ GdkGC *gc, -+ PangoMatrix *matrix, -+ PangoFont *font, -+ gint x, -+ gint y, -+ PangoGlyphString *glyphs) -+{ -+ GdkDrawableImplX11 *impl; -+ PangoRenderer *renderer; -+ -+ impl = GDK_DRAWABLE_IMPL_X11 (drawable); -+ -+ g_return_if_fail (PANGO_XFT_IS_FONT (font)); -+ -+ renderer = _gdk_x11_renderer_get (drawable, gc); -+ if (matrix) -+ pango_renderer_set_matrix (renderer, matrix); -+ pango_renderer_draw_glyphs (renderer, font, glyphs, x, y); -+ if (matrix) -+ pango_renderer_set_matrix (renderer, NULL); -+} -+ -+static void - gdk_x11_draw_image (GdkDrawable *drawable, - GdkGC *gc, - GdkImage *image, -@@ -1444,6 +1624,47 @@ - } - - static void -+gdk_x11_draw_trapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ GdkTrapezoid *trapezoids, -+ gint n_trapezoids) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkDisplay *display = gdk_screen_get_display (screen); -+ XTrapezoid *xtrapezoids; -+ gint i; -+ -+ if (!_gdk_x11_have_render_with_trapezoids (display)) -+ { -+ GdkDrawable *wrapper = GDK_DRAWABLE_IMPL_X11 (drawable)->wrapper; -+ GDK_DRAWABLE_CLASS (_gdk_drawable_impl_x11_parent_class)->draw_trapezoids (wrapper, gc, -+ trapezoids, n_trapezoids); -+ return; -+ } -+ -+ xtrapezoids = g_new (XTrapezoid, n_trapezoids); -+ -+ for (i = 0; i < n_trapezoids; i++) -+ { -+ xtrapezoids[i].top = XDoubleToFixed (trapezoids[i].y1); -+ xtrapezoids[i].bottom = XDoubleToFixed (trapezoids[i].y2); -+ xtrapezoids[i].left.p1.x = XDoubleToFixed (trapezoids[i].x11); -+ xtrapezoids[i].left.p1.y = XDoubleToFixed (trapezoids[i].y1); -+ xtrapezoids[i].left.p2.x = XDoubleToFixed (trapezoids[i].x12); -+ xtrapezoids[i].left.p2.y = XDoubleToFixed (trapezoids[i].y2); -+ xtrapezoids[i].right.p1.x = XDoubleToFixed (trapezoids[i].x21); -+ xtrapezoids[i].right.p1.y = XDoubleToFixed (trapezoids[i].y1); -+ xtrapezoids[i].right.p2.x = XDoubleToFixed (trapezoids[i].x22); -+ xtrapezoids[i].right.p2.y = XDoubleToFixed (trapezoids[i].y2); -+ } -+ -+ _gdk_x11_drawable_draw_xtrapezoids (drawable, gc, -+ xtrapezoids, n_trapezoids); -+ -+ g_free (xtrapezoids); -+} -+ -+static void - gdk_x11_cairo_surface_destroy (void *data) - { - GdkDrawableImplX11 *impl = data; -@@ -1498,5 +1719,89 @@ - return impl->cairo_surface; - } - -+void -+_gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ XTrapezoid *xtrapezoids, -+ int n_trapezoids) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkDisplay *display = gdk_screen_get_display (screen); -+ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); -+ -+ XftDraw *draw; -+ -+ if (!_gdk_x11_have_render_with_trapezoids (display)) -+ { -+ /* This is the case of drawing the borders of the unknown glyph box -+ * without render on the display, we need to feed it back to -+ * fallback code. Not efficient, but doesn't matter. -+ */ -+ GdkTrapezoid *trapezoids = g_new (GdkTrapezoid, n_trapezoids); -+ int i; -+ -+ for (i = 0; i < n_trapezoids; i++) -+ { -+ trapezoids[i].y1 = XFixedToDouble (xtrapezoids[i].top); -+ trapezoids[i].y2 = XFixedToDouble (xtrapezoids[i].bottom); -+ trapezoids[i].x11 = XFixedToDouble (xtrapezoids[i].left.p1.x); -+ trapezoids[i].x12 = XFixedToDouble (xtrapezoids[i].left.p2.x); -+ trapezoids[i].x21 = XFixedToDouble (xtrapezoids[i].right.p1.x); -+ trapezoids[i].x22 = XFixedToDouble (xtrapezoids[i].right.p2.x); -+ } -+ -+ gdk_x11_draw_trapezoids (drawable, gc, trapezoids, n_trapezoids); -+ g_free (trapezoids); -+ -+ return; -+ } -+ -+ gdk_x11_drawable_update_xft_clip (drawable, gc); -+ draw = gdk_x11_drawable_get_xft_draw (drawable); -+ -+ if (!x11display->mask_format) -+ x11display->mask_format = XRenderFindStandardFormat (x11display->xdisplay, -+ PictStandardA8); -+ -+ XRenderCompositeTrapezoids (x11display->xdisplay, PictOpOver, -+ _gdk_x11_gc_get_fg_picture (gc), -+ XftDrawPicture (draw), -+ x11display->mask_format, -+ - gc->ts_x_origin, - gc->ts_y_origin, -+ xtrapezoids, n_trapezoids); -+} -+ -+void -+_gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ XftFont *xft_font, -+ XftGlyphSpec *glyphs, -+ gint n_glyphs) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkDisplay *display = gdk_screen_get_display (screen); -+ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); -+ XftDraw *draw; -+ -+ gdk_x11_drawable_update_xft_clip (drawable, gc); -+ draw = gdk_x11_drawable_get_xft_draw (drawable); -+ -+ if (_gdk_x11_have_render (display)) -+ { -+ XftGlyphSpecRender (x11display->xdisplay, PictOpOver, -+ _gdk_x11_gc_get_fg_picture (gc), -+ xft_font, -+ XftDrawPicture (draw), -+ - gc->ts_x_origin, - gc->ts_y_origin, -+ glyphs, n_glyphs); -+ } -+ else -+ { -+ XftColor color; -+ -+ _gdk_gc_x11_get_fg_xft_color (gc, &color); -+ XftDrawGlyphSpec (draw, &color, xft_font, glyphs, n_glyphs); -+ } -+} - #define __GDK_DRAWABLE_X11_C__ - #include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/x11/gdkdrawable-x11.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkdrawable-x11.h 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkdrawable-x11.h 2006-10-30 12:59:30.000000000 +0000 -@@ -33,6 +33,7 @@ - - #include - #include -+#include - - G_BEGIN_DECLS - -@@ -68,6 +69,8 @@ - Window xid; - GdkScreen *screen; - -+ XftDraw *xft_draw; -+ - Picture picture; - cairo_surface_t *cairo_surface; - }; -@@ -92,7 +95,15 @@ - /* Note that the following take GdkDrawableImplX11, not the wrapper drawable */ - void _gdk_x11_drawable_finish (GdkDrawable *drawable); - void _gdk_x11_drawable_update_size (GdkDrawable *drawable); -- -+void _gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, -+ GdkGC *gc, -+ XTrapezoid *xtrapezoids, -+ int n_trapezoids); -+void _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, -+ GdkGC *gc, -+ XftFont *xft_font, -+ XftGlyphSpec *glyphs, -+ gint n_glyphs); - G_END_DECLS - - #endif /* __GDK_DRAWABLE_X11_H__ */ -Index: gtk+-2.10.6/gdk/x11/gdkgc-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkgc-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkgc-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -80,7 +80,10 @@ - gdk_gc_x11_finalize (GObject *object) - { - GdkGCX11 *x11_gc = GDK_GC_X11 (object); -- -+ -+ if (x11_gc->fg_picture != None) -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), x11_gc->fg_picture); -+ - XFreeGC (GDK_GC_XDISPLAY (x11_gc), GDK_GC_XGC (x11_gc)); - - G_OBJECT_CLASS (_gdk_gc_x11_parent_class)->finalize (object); -@@ -110,7 +113,7 @@ - - private->dirty_mask = 0; - private->have_clip_mask = FALSE; -- -+ - private->screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; - - private->depth = gdk_drawable_get_depth (drawable); -@@ -339,6 +342,18 @@ - } - - static void -+clear_fg_picture (GdkGC *gc) -+{ -+ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); -+ -+ if (x11_gc->fg_picture != None) -+ { -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), x11_gc->fg_picture); -+ x11_gc->fg_picture = None; -+ } -+} -+ -+static void - gdk_x11_gc_set_values (GdkGC *gc, - GdkGCValues *values, - GdkGCValuesMask values_mask) -@@ -367,6 +382,29 @@ - x11_gc->have_clip_mask = values->clip_mask != NULL; - } - -+ if (values_mask & GDK_GC_BACKGROUND) -+ { -+ if (_gdk_gc_get_fill (gc) == GDK_OPAQUE_STIPPLED) -+ clear_fg_picture (gc); -+ } -+ -+ if (values_mask & GDK_GC_FILL) -+ { -+ clear_fg_picture (gc); -+ } -+ -+ if (values_mask & GDK_GC_STIPPLE) -+ { -+ if (_gdk_gc_get_fill (gc) == GDK_STIPPLED || _gdk_gc_get_fill (gc) == GDK_OPAQUE_STIPPLED) -+ clear_fg_picture (gc); -+ } -+ -+ if (values_mask & GDK_GC_TILE) -+ { -+ if (_gdk_gc_get_fill (gc) == GDK_TILED) -+ clear_fg_picture (gc); -+ } -+ - gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask); - - XChangeGC (GDK_GC_XDISPLAY (gc), -@@ -642,6 +680,8 @@ - x11_dst_gc->dirty_mask = x11_src_gc->dirty_mask; - x11_dst_gc->have_clip_region = x11_src_gc->have_clip_region; - x11_dst_gc->have_clip_mask = x11_src_gc->have_clip_mask; -+ -+ clear_fg_picture (dst_gc); - } - - /** -@@ -701,5 +741,359 @@ - return gc_x11->xgc; - } - -+/* Various bits of the below are roughly cribbed from XFree86 -+ * lib/Xft/xftdraw.c, Copyright 2000, Keith Packard -+ */ -+ -+static XRenderPictFormat * -+foreground_format (GdkGC *gc) -+{ -+ XRenderPictFormat pf; -+ -+ pf.type = PictTypeDirect; -+ pf.depth = 32; -+ pf.direct.redMask = 0xff; -+ pf.direct.greenMask = 0xff; -+ pf.direct.blueMask = 0xff; -+ pf.direct.alphaMask = 0xff; -+ -+ return XRenderFindFormat (GDK_GC_XDISPLAY (gc), -+ (PictFormatType | -+ PictFormatDepth | -+ PictFormatRedMask | -+ PictFormatGreenMask | -+ PictFormatBlueMask | -+ PictFormatAlphaMask), -+ &pf, -+ 0); -+} -+ -+static Picture -+make_fg_tile_picture (GdkGC *gc) -+{ -+ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); -+ GdkVisual *visual = gdk_drawable_get_visual (_gdk_gc_get_tile (gc)); -+ XRenderPictFormat *format = NULL; -+ -+ if (visual) -+ { -+ format = XRenderFindVisualFormat (GDK_GC_XDISPLAY (gc), -+ GDK_VISUAL_XVISUAL (visual)); -+ } -+ else if (x11_gc->depth == 1) -+ { -+ format = XRenderFindStandardFormat (GDK_GC_XDISPLAY (gc), -+ PictStandardA1); -+ } -+ -+ if (format) -+ { -+ XRenderPictureAttributes pa; -+ pa.repeat = True; -+ -+ return XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ GDK_PIXMAP_XID (_gdk_gc_get_tile (gc)), -+ format, -+ CPRepeat, &pa); -+ } -+ -+ return None; -+} -+ -+static Picture -+make_stipple_picture (GdkGC *gc) -+{ -+ XRenderPictFormat *format = NULL; -+ XRenderPictureAttributes pa; -+ -+ format = XRenderFindStandardFormat (GDK_GC_XDISPLAY (gc), -+ PictStandardA1); -+ -+ pa.repeat = True; -+ return XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ GDK_PIXMAP_XID (_gdk_gc_get_stipple (gc)), -+ format, -+ CPRepeat, &pa); -+} -+ -+static Picture -+make_color_picture (GdkGC *gc, -+ XRenderColor *color) -+{ -+ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); -+ XRenderPictureAttributes pa; -+ XRenderPictFormat *pix_format = foreground_format (gc); -+ Pixmap pix; -+ Picture picture; -+ -+ if (!pix_format) -+ return None; -+ -+ pix = XCreatePixmap (GDK_GC_XDISPLAY (gc), -+ GDK_SCREEN_XROOTWIN (x11_gc->screen), -+ 1, 1, pix_format->depth); -+ pa.repeat = True; -+ picture = XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ pix, -+ pix_format, -+ CPRepeat, &pa); -+ XFreePixmap (GDK_GC_XDISPLAY (gc), pix); -+ -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ picture, color, -+ 0, 0, 1, 1); -+ -+ return picture; -+} -+ -+static void -+get_bg_color (GdkGC *gc, -+ XRenderColor *render_color) -+{ -+ GdkColormap *cmap; -+ -+ cmap = gdk_gc_get_colormap (gc); -+ -+ if (cmap) -+ { -+ GdkColor color; -+ -+ gdk_colormap_query_color (cmap, _gdk_gc_get_bg_pixel (gc), &color); -+ -+ render_color->alpha = 0xffff; -+ render_color->red = color.red; -+ render_color->green = color.green; -+ render_color->blue = color.blue; -+ } -+ else /* Not worth warning, just use black */ -+ { -+ render_color->alpha = 0xffff; -+ render_color->red = 0; -+ render_color->green = 0; -+ render_color->blue = 0; -+ } -+} -+ -+/** -+ * _gdk_x11_gc_get_fg_picture: -+ * @gc: a #GdkGC -+ * -+ * Gets a Xrender Picture object suitable for being the source -+ * drawable for drawing with the foreground the graphics context. -+ * -+ * Return value: a Picture, owned by the GC; this cannot be -+ * used over subsequent modification of the GC. -+ **/ -+Picture -+_gdk_x11_gc_get_fg_picture (GdkGC *gc) -+{ -+ GdkGCX11 *x11_gc; -+ gboolean new = FALSE; -+ XftColor xftcolor; -+ GdkFill fill; -+ int width, height; -+ -+ g_return_val_if_fail (GDK_IS_GC_X11 (gc), None); -+ -+ if (!_gdk_x11_have_render (GDK_GC_DISPLAY (gc))) -+ return None; -+ -+ x11_gc = GDK_GC_X11 (gc); -+ -+ fill = GDK_SOLID; -+ width = 1; -+ height = 1; -+ -+ switch (_gdk_gc_get_fill (gc)) -+ { -+ case GDK_SOLID: -+ break; -+ case GDK_TILED: -+ if (_gdk_gc_get_tile (gc)) -+ { -+ if (!x11_gc->fg_picture) -+ x11_gc->fg_picture = make_fg_tile_picture (gc); -+ -+ if (x11_gc->fg_picture != None) -+ return x11_gc->fg_picture; -+ } -+ break; -+ case GDK_STIPPLED: -+ case GDK_OPAQUE_STIPPLED: -+ if (_gdk_gc_get_stipple (gc)) -+ { -+ gdk_drawable_get_size (_gdk_gc_get_stipple (gc), &width, &height); -+ fill = _gdk_gc_get_fill (gc); -+ } -+ break; -+ } -+ -+ if (x11_gc->fg_picture == None) -+ { -+ XRenderPictureAttributes pa; -+ XRenderPictFormat *pix_format = foreground_format (gc); -+ Pixmap pix; -+ -+ if (!pix_format) -+ return None; -+ -+ pix = XCreatePixmap (GDK_GC_XDISPLAY (gc), -+ GDK_SCREEN_XROOTWIN (x11_gc->screen), -+ width, height, pix_format->depth); -+ pa.repeat = True; -+ x11_gc->fg_picture = XRenderCreatePicture (GDK_GC_XDISPLAY (gc), -+ pix, -+ pix_format, -+ CPRepeat, &pa); -+ XFreePixmap (GDK_GC_XDISPLAY (gc), pix); -+ -+ new = TRUE; -+ } -+ -+ _gdk_gc_x11_get_fg_xft_color (gc, &xftcolor); -+ -+ if (x11_gc->fg_picture_color.alpha != 0xffff || -+ x11_gc->fg_picture_color.red != xftcolor.color.red || -+ x11_gc->fg_picture_color.green != xftcolor.color.green || -+ x11_gc->fg_picture_color.blue != xftcolor.color.blue) -+ { -+ x11_gc->fg_picture_color.alpha = 0xffff; -+ x11_gc->fg_picture_color.red = xftcolor.color.red; -+ x11_gc->fg_picture_color.green = xftcolor.color.green; -+ x11_gc->fg_picture_color.blue = xftcolor.color.blue; -+ -+ new = TRUE; -+ } -+ -+ switch (fill) -+ { -+ case GDK_SOLID: -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ x11_gc->fg_picture, &x11_gc->fg_picture_color, -+ 0, 0, width, height); -+ break; -+ case GDK_STIPPLED: -+ { -+ Picture stipple_picture = make_stipple_picture (gc); -+ -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ x11_gc->fg_picture, &x11_gc->fg_picture_color, -+ 0, 0, width, height); -+ XRenderComposite (GDK_GC_XDISPLAY (gc), -+ PictOpInReverse, -+ stipple_picture, None, x11_gc->fg_picture, -+ 0, 0, 0, 0, 0, 0, width, height); -+ -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), stipple_picture); -+ } -+ break; -+ case GDK_OPAQUE_STIPPLED: -+ { -+ XRenderColor bg_color; -+ -+ Picture stipple_picture = make_stipple_picture (gc); -+ Picture fg_picture = make_color_picture (gc, &x11_gc->fg_picture_color); -+ -+ get_bg_color (gc, &bg_color); -+ -+ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, -+ x11_gc->fg_picture, &bg_color, -+ 0, 0, width, height); -+ XRenderComposite (GDK_GC_XDISPLAY (gc), -+ PictOpOver, -+ fg_picture, stipple_picture, x11_gc->fg_picture, -+ 0, 0, 0, 0, 0, 0, width, height); -+ -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), stipple_picture); -+ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), fg_picture); -+ } -+ break; -+ case GDK_TILED: -+ g_assert_not_reached (); /* handled above */ -+ break; -+ } -+ -+ return x11_gc->fg_picture; -+} -+ -+/** -+ * _gdk_gc_x11_get_fg_xft_color: -+ * @gc: a #GdkGC -+ * @xftcolor: location to store the color -+ * -+ * Gets the foreground color of the GC as a XftColor. -+ **/ -+void -+_gdk_gc_x11_get_fg_xft_color (GdkGC *gc, -+ XftColor *xftcolor) -+{ -+ GdkGCX11 *x11_gc; -+ GdkColormap *cmap; -+ GdkColor color; -+ -+ g_return_if_fail (GDK_IS_GC_X11 (gc)); -+ -+ x11_gc = GDK_GC_X11 (gc); -+ -+ cmap = gdk_gc_get_colormap (gc); -+ -+ xftcolor->pixel = _gdk_gc_get_fg_pixel (gc); -+ -+ if (cmap) -+ { -+ gdk_colormap_query_color (cmap, xftcolor->pixel, &color); -+ xftcolor->color.alpha = 0xffff; -+ xftcolor->color.red = color.red; -+ xftcolor->color.green = color.green; -+ xftcolor->color.blue = color.blue; -+ } -+ else if (x11_gc->depth == 1) -+ { -+ /* Drawing with Xft on a bitmap is a bit bizzare; it -+ * takes alpha >= 0x8000 to mean 'set to 1' and -+ * alpha < 0x8000 to mean 'set to 0'. -+ */ -+ if (xftcolor->pixel) -+ { -+ xftcolor->color.red = 0xffff; -+ xftcolor->color.green = 0xffff; -+ xftcolor->color.blue = 0xffff; -+ xftcolor->color.alpha = 0xffff; -+ } -+ else -+ { -+ xftcolor->color.red = 0; -+ xftcolor->color.green = 0; -+ xftcolor->color.blue = 0; -+ xftcolor->color.alpha = 0; -+ } -+ } -+ else -+ { -+ g_warning ("Using Xft rendering requires the GC argument to have a\n" -+ "specified colormap. If the GC was created for a drawable\n" -+ "with a colormap, the colormap will be set on the GC\n" -+ "automatically. Otherwise, a colormap must be set on it with" -+ "gdk_gc_set_colormap"); -+ } -+} -+ -+void -+_gdk_windowing_gc_get_foreground (GdkGC *gc, -+ GdkColor *color) -+{ -+ GdkColormap *cmap; -+ -+ g_return_if_fail (GDK_IS_GC_X11 (gc)); -+ -+ color->pixel = _gdk_gc_get_fg_pixel (gc); -+ -+ cmap = gdk_gc_get_colormap (gc); -+ -+ if (cmap) -+ gdk_colormap_query_color (cmap, _gdk_gc_get_fg_pixel (gc), color); -+ else -+ g_warning ("No colormap in _gdk_windowing_gc_get_foreground"); -+} - #define __GDK_GC_X11_C__ - #include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/x11/gdkprivate-x11.h -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkprivate-x11.h 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkprivate-x11.h 2006-10-30 12:59:30.000000000 +0000 -@@ -63,6 +63,9 @@ - guint have_clip_region : 1; - guint have_clip_mask : 1; - guint depth : 8; -+ -+ Picture fg_picture; -+ XRenderColor fg_picture_color; - }; - - struct _GdkGCX11Class -@@ -102,6 +105,11 @@ - GType _gdk_gc_x11_get_type (void); - - gboolean _gdk_x11_have_render (GdkDisplay *display); -+gboolean _gdk_x11_have_render_with_trapezoids (GdkDisplay *display); -+ -+Picture _gdk_x11_gc_get_fg_picture (GdkGC *gc); -+void _gdk_gc_x11_get_fg_xft_color (GdkGC *gc, -+ XftColor *xftcolor); - - GdkGC *_gdk_x11_gc_new (GdkDrawable *drawable, - GdkGCValues *values, -Index: gtk+-2.10.6/gdk/x11/gdkwindow-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkwindow-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkwindow-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1114,7 +1114,8 @@ - { - GdkWindowObject *private = (GdkWindowObject *)window; - GdkToplevelX11 *toplevel; -- -+ GdkDrawableImplX11 *draw_impl; -+ - g_return_if_fail (GDK_IS_WINDOW (window)); - - _gdk_selection_window_destroyed (window); -@@ -1126,6 +1127,11 @@ - if (toplevel) - gdk_toplevel_x11_free_contents (GDK_WINDOW_DISPLAY (window), toplevel); - -+ draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl); -+ -+ if (draw_impl->xft_draw) -+ XftDrawDestroy (draw_impl->xft_draw); -+ - _gdk_x11_drawable_finish (private->impl); - - if (!recursing && !foreign_destroy) -Index: gtk+-2.10.6/gdk/x11/Makefile.am -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/Makefile.am 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/Makefile.am 2006-10-30 12:59:30.000000000 +0000 -@@ -37,6 +37,7 @@ - gdkinput.c \ - gdkkeys-x11.c \ - gdkmain-x11.c \ -+ gdkpango-x11.c \ - gdkpixmap-x11.c \ - gdkpixmap-x11.h \ - gdkproperty-x11.c \ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-10-30 12:59:30.000000000 +0000 -@@ -1821,7 +1821,7 @@ - } - } - -- -+ - /**************************************** - * Repainting * - ****************************************/ -@@ -1831,7 +1831,7 @@ - { - GtkWidget *widget = GTK_WIDGET (calendar); - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; -+ GdkGC *gc; - char buffer[255]; - int x, y; - gint header_width; -@@ -1849,7 +1849,7 @@ - else - year_left = !priv->year_before; - -- cr = gdk_cairo_create (priv->header_win); -+ gc = calendar->gc; - - header_width = widget->allocation.width - 2 * widget->style->xthickness; - -@@ -1902,9 +1902,9 @@ - - (max_year_width - logical_rect.width)/2); - - -- gdk_cairo_set_source_color (cr, HEADER_FG_COLOR (GTK_WIDGET (calendar))); -- cairo_move_to (cr, x, y); -- pango_cairo_show_layout (cr, layout); -+ gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar))); -+ gdk_draw_layout (priv->header_win, gc, x, y, layout); -+ - - /* Draw month */ - g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[calendar->month]); -@@ -1924,19 +1924,19 @@ - else - x = 3 + priv->arrow_width + (max_month_width - logical_rect.width)/2; - -- cairo_move_to (cr, x, y); -- pango_cairo_show_layout (cr, layout); -- -+ gdk_draw_layout (priv->header_win, gc, x, y, layout); -+ -+ gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar))); -+ - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void - calendar_paint_day_names (GtkCalendar *calendar) - { - GtkWidget *widget = GTK_WIDGET (calendar); -+ GdkGC *gc; - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; - char buffer[255]; - int day,i; - int day_width, cal_width; -@@ -1946,8 +1946,7 @@ - gint focus_padding; - gint focus_width; - -- cr = gdk_cairo_create (priv->day_name_win); -- -+ gc = calendar->gc; - gtk_widget_style_get (GTK_WIDGET (widget), - "focus-line-width", &focus_width, - "focus-padding", &focus_padding, -@@ -1961,22 +1960,19 @@ - * Draw rectangles as inverted background for the labels. - */ - -- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); -- cairo_rectangle (cr, -- CALENDAR_MARGIN, CALENDAR_MARGIN, -- cal_width-CALENDAR_MARGIN * 2, -- priv->day_name_h - CALENDAR_MARGIN); -- cairo_fill (cr); -- -+ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget)); -+ gdk_draw_rectangle (priv->day_name_win, gc, TRUE, -+ CALENDAR_MARGIN, CALENDAR_MARGIN, -+ cal_width-CALENDAR_MARGIN * 2, -+ priv->day_name_h - CALENDAR_MARGIN); -+ - if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS) -- { -- cairo_rectangle (cr, -- CALENDAR_MARGIN, -- priv->day_name_h - CALENDAR_YSEP, -- priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN, -- CALENDAR_YSEP); -- cairo_fill (cr); -- } -+ gdk_draw_rectangle (priv->day_name_win, gc, TRUE, -+ CALENDAR_MARGIN, -+ priv->day_name_h - CALENDAR_YSEP, -+ priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN, -+ CALENDAR_YSEP); -+ - - /* - * Write the labels -@@ -1984,7 +1980,7 @@ - - layout = gtk_widget_create_pango_layout (widget, NULL); - -- gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget)); -+ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget)); - for (i = 0; i < 7; i++) - { - if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL) -@@ -1997,19 +1993,18 @@ - pango_layout_set_text (layout, buffer, -1); - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); - -- cairo_move_to (cr, -- (CALENDAR_MARGIN + -- + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? -- (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0)) -- : 0) -- + day_wid_sep * i -- + (day_width - logical_rect.width)/2), -- CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y); -- pango_cairo_show_layout (cr, layout); -+ gdk_draw_layout (priv->day_name_win, gc, -+ (CALENDAR_MARGIN + -+ + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? -+ (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0)) -+ : 0) -+ + day_wid_sep * i -+ + (day_width - logical_rect.width)/2), -+ CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y, -+ layout); - } - - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void -@@ -2017,7 +2012,7 @@ - { - GtkWidget *widget = GTK_WIDGET (calendar); - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; -+ GdkGC *gc; - gint row, week = 0, year; - gint x_loc; - char buffer[32]; -@@ -2027,7 +2022,7 @@ - gint focus_padding; - gint focus_width; - -- cr = gdk_cairo_create (priv->week_win); -+ gc = calendar->gc; - - gtk_widget_style_get (GTK_WIDGET (widget), - "focus-line-width", &focus_width, -@@ -2038,20 +2033,20 @@ - * Draw a rectangle as inverted background for the labels. - */ - -- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); -+ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget)); - if (priv->day_name_win) -- cairo_rectangle (cr, -- CALENDAR_MARGIN, -- 0, -- priv->week_width - CALENDAR_MARGIN, -- priv->main_h - CALENDAR_MARGIN); -+ gdk_draw_rectangle (priv->week_win, gc, TRUE, -+ CALENDAR_MARGIN, -+ 0, -+ priv->week_width - CALENDAR_MARGIN, -+ priv->main_h - CALENDAR_MARGIN); - else -- cairo_rectangle (cr, -- CALENDAR_MARGIN, -- CALENDAR_MARGIN, -- priv->week_width - CALENDAR_MARGIN, -- priv->main_h - 2 * CALENDAR_MARGIN); -- cairo_fill (cr); -+ gdk_draw_rectangle (priv->week_win, gc, TRUE, -+ CALENDAR_MARGIN, -+ CALENDAR_MARGIN, -+ priv->week_width - CALENDAR_MARGIN, -+ priv->main_h - 2 * CALENDAR_MARGIN); -+ - - /* - * Write the labels -@@ -2059,7 +2054,7 @@ - - layout = gtk_widget_create_pango_layout (widget, NULL); - -- gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget)); -+ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget)); - day_height = calendar_row_height (calendar); - for (row = 0; row < 6; row++) - { -@@ -2095,12 +2090,10 @@ - - logical_rect.width - - CALENDAR_XSEP - focus_padding - focus_width); - -- cairo_move_to (cr, x_loc, y_loc); -- pango_cairo_show_layout (cr, layout); -+ gdk_draw_layout (priv->week_win, gc, x_loc, y_loc, layout); - } - - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void -@@ -2149,7 +2142,7 @@ - { - GtkWidget *widget = GTK_WIDGET (calendar); - GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); -- cairo_t *cr; -+ GdkGC *gc; - GdkColor *text_color; - gchar buffer[32]; - gint day; -@@ -2162,7 +2155,7 @@ - g_return_if_fail (row < 6); - g_return_if_fail (col < 7); - -- cr = gdk_cairo_create (priv->main_win); -+ gc = calendar->gc; - - day = calendar->day[row][col]; - -@@ -2170,11 +2163,11 @@ - - if (calendar->day_month[row][col] == MONTH_PREV) - { -- text_color = PREV_MONTH_COLOR (widget); -+ gdk_gc_set_foreground (gc, PREV_MONTH_COLOR (GTK_WIDGET (calendar))); - } - else if (calendar->day_month[row][col] == MONTH_NEXT) - { -- text_color = NEXT_MONTH_COLOR (widget); -+ gdk_gc_set_foreground (gc, NEXT_MONTH_COLOR (GTK_WIDGET (calendar))); - } - else - { -@@ -2188,16 +2181,16 @@ - #endif - if (calendar->selected_day == day) - { -- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); -- gdk_cairo_rectangle (cr, &day_rect); -- cairo_fill (cr); -+ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (GTK_WIDGET (calendar))); -+ gdk_draw_rectangle (priv->main_win, gc, TRUE, day_rect.x, day_rect.y, -+ day_rect.width, day_rect.height); - } - if (calendar->selected_day == day) -- text_color = SELECTED_FG_COLOR (widget); -+ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar))); - else if (calendar->marked_date[day-1]) -- text_color = MARKED_COLOR (widget); -+ gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar))); - else -- text_color = NORMAL_DAY_COLOR (widget); -+ gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar))); - } - - /* Translators: this defines whether the day numbers should use -@@ -2219,16 +2212,13 @@ - x_loc -= logical_rect.width; - y_loc = day_rect.y + (day_rect.height - logical_rect.height) / 2; - -- gdk_cairo_set_source_color (cr, text_color); -- cairo_move_to (cr, x_loc, y_loc); -- pango_cairo_show_layout (cr, layout); -+ gdk_draw_layout (priv->main_win, gc, -+ x_loc, y_loc, layout); - - if (calendar->marked_date[day-1] - && calendar->day_month[row][col] == MONTH_CURRENT) -- { -- cairo_move_to (cr, x_loc - 1, y_loc); -- pango_cairo_show_layout (cr, layout); -- } -+ gdk_draw_layout (priv->main_win, gc, -+ x_loc-1, y_loc, layout); - - if (GTK_WIDGET_HAS_FOCUS (calendar) - && calendar->focus_row == row && calendar->focus_col == col) -@@ -2253,7 +2243,6 @@ - } - - g_object_unref (layout); -- cairo_destroy (cr); - } - - static void -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-10-30 12:59:30.000000000 +0000 -@@ -3333,7 +3333,6 @@ - if (GTK_WIDGET_DRAWABLE (entry)) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); -- cairo_t *cr; - gint x, y; - gint start_pos, end_pos; - -@@ -3341,56 +3340,60 @@ - - get_layout_position (entry, &x, &y); - -- cr = gdk_cairo_create (entry->text_area); -- -- cairo_move_to (cr, x, y); -- gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); -- pango_cairo_show_layout (cr, layout); -- -+ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state], -+ x, y, -+ layout); -+ - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) - { - gint *ranges; - gint n_ranges, i; - PangoRectangle logical_rect; -- GdkColor *selection_color, *text_color; -+ GdkGC *selection_gc, *text_gc; - GtkBorder inner_border; -- -+ GdkRegion *clip_region; -+ - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); - gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); - - if (GTK_WIDGET_HAS_FOCUS (entry)) - { -- selection_color = &widget->style->base [GTK_STATE_SELECTED]; -- text_color = &widget->style->text [GTK_STATE_SELECTED]; -+ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED]; -+ text_gc = widget->style->text_gc [GTK_STATE_SELECTED]; - } - else - { -- selection_color = &widget->style->base [GTK_STATE_ACTIVE]; -- text_color = &widget->style->text [GTK_STATE_ACTIVE]; -+ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE]; -+ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE]; - } -- -+ -+ clip_region = gdk_region_new (); - _gtk_entry_effective_inner_border (entry, &inner_border); - - for (i = 0; i < n_ranges; ++i) -- cairo_rectangle (cr, -- inner_border.left - entry->scroll_offset + ranges[2 * i], -- y, -- ranges[2 * i + 1], -- logical_rect.height); -+ { -+ GdkRectangle rect; - -- cairo_clip (cr); -- -- gdk_cairo_set_source_color (cr, selection_color); -- cairo_paint (cr); -+ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i]; -+ rect.y = y; -+ rect.width = ranges[2 * i + 1]; -+ rect.height = logical_rect.height; -+ -+ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE, -+ rect.x, rect.y, rect.width, rect.height); - -- cairo_move_to (cr, x, y); -- gdk_cairo_set_source_color (cr, text_color); -- pango_cairo_show_layout (cr, layout); -+ gdk_region_union_with_rect (clip_region, &rect); -+ } - -+ gdk_gc_set_clip_region (text_gc, clip_region); -+ gdk_draw_layout (entry->text_area, text_gc, -+ x, y, -+ layout); -+ gdk_gc_set_clip_region (text_gc, NULL); -+ -+ gdk_region_destroy (clip_region); - g_free (ranges); - } -- -- cairo_destroy (cr); - } - } - -Index: gtk+-2.10.6/gtk/gtkwidget.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkwidget.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkwidget.c 2006-10-30 12:59:30.000000000 +0000 -@@ -5445,7 +5445,8 @@ - GdkScreen *screen; - - update_pango_context (widget, context); -- -+/* TODO: Figure out the proper way to handle this in a pangoxft setting -+ - screen = gtk_widget_get_screen_unchecked (widget); - if (screen) - { -@@ -5453,7 +5454,7 @@ - gdk_screen_get_resolution (screen)); - pango_cairo_context_set_font_options (context, - gdk_screen_get_font_options (screen)); -- } -+ }*/ - } - } - -Index: gtk+-2.10.6/gdk/x11/gdkpango-x11.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkpango-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -0,0 +1,174 @@ -+/* GDK - The GIMP Drawing Kit -+ * Copyright (C) 2000 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include -+ -+#include "gdkx.h" -+#include "gdkdisplay-x11.h" -+#include "gdkpango.h" -+#include -+#include -+#include "gdkalias.h" -+ -+#include -+ -+typedef struct _GdkX11Renderer GdkX11Renderer; -+typedef struct _GdkX11RendererClass GdkX11RendererClass; -+ -+#define GDK_TYPE_X11_RENDERER (_gdk_x11_renderer_get_type()) -+#define GDK_X11_RENDERER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_RENDERER, GdkX11Renderer)) -+#define GDK_IS_X11_RENDERER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_RENDERER)) -+#define GDK_X11_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_RENDERER, GdkX11RendererClass)) -+#define GDK_IS_X11_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_RENDERER)) -+#define GDK_X11_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_RENDERER, GdkX11RendererClass)) -+ -+#define MAX_RENDER_PART PANGO_RENDER_PART_STRIKETHROUGH -+ -+struct _GdkX11Renderer -+{ -+ PangoXftRenderer parent_instance; -+ -+ XRenderPictFormat *mask_format; -+ -+ GdkDrawable *drawable; -+ GdkGC *gc; -+}; -+ -+struct _GdkX11RendererClass -+{ -+ PangoXftRendererClass parent_class; -+}; -+ -+G_DEFINE_TYPE (GdkX11Renderer, _gdk_x11_renderer, PANGO_TYPE_XFT_RENDERER) -+ -+static void -+gdk_x11_renderer_finalize (GObject *object) -+{ -+ G_OBJECT_CLASS (_gdk_x11_renderer_parent_class)->finalize (object); -+} -+ -+static void -+gdk_x11_renderer_composite_trapezoids (PangoXftRenderer *xftrenderer, -+ PangoRenderPart part, -+ XTrapezoid *trapezoids, -+ int n_trapezoids) -+{ -+ /* Because we only use this renderer for "draw_glyphs()" calls, we -+ * won't hit this code path much. However, it is hit for drawing -+ * the "unknown glyph" hex squares. We can safely ignore the part, -+ */ -+ GdkX11Renderer *x11_renderer = GDK_X11_RENDERER (xftrenderer); -+ -+ _gdk_x11_drawable_draw_xtrapezoids (x11_renderer->drawable, -+ x11_renderer->gc, -+ trapezoids, n_trapezoids); -+ -+} -+ -+static void -+gdk_x11_renderer_composite_glyphs (PangoXftRenderer *xftrenderer, -+ XftFont *xft_font, -+ XftGlyphSpec *glyphs, -+ gint n_glyphs) -+{ -+ GdkX11Renderer *x11_renderer = GDK_X11_RENDERER (xftrenderer); -+ -+ _gdk_x11_drawable_draw_xft_glyphs (x11_renderer->drawable, -+ x11_renderer->gc, -+ xft_font, glyphs, n_glyphs); -+} -+ -+static void -+_gdk_x11_renderer_init (GdkX11Renderer *renderer) -+{ -+} -+ -+static void -+_gdk_x11_renderer_class_init (GdkX11RendererClass *klass) -+{ -+ PangoXftRendererClass *xftrenderer_class = PANGO_XFT_RENDERER_CLASS (klass); -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ -+ xftrenderer_class->composite_glyphs = gdk_x11_renderer_composite_glyphs; -+ xftrenderer_class->composite_trapezoids = gdk_x11_renderer_composite_trapezoids; -+ -+ object_class->finalize = gdk_x11_renderer_finalize; -+} -+ -+PangoRenderer * -+_gdk_x11_renderer_get (GdkDrawable *drawable, -+ GdkGC *gc) -+{ -+ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; -+ GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); -+ GdkX11Renderer *x11_renderer; -+ -+ if (!screen_x11->renderer) -+ { -+ screen_x11->renderer = g_object_new (GDK_TYPE_X11_RENDERER, -+ "display", GDK_SCREEN_XDISPLAY (screen), -+ "screen", GDK_SCREEN_XNUMBER (screen), -+ NULL); -+ } -+ -+ x11_renderer = GDK_X11_RENDERER (screen_x11->renderer); -+ -+ x11_renderer->drawable = drawable; -+ x11_renderer->gc = gc; -+ -+ return screen_x11->renderer; -+} -+ -+/** -+ * gdk_pango_context_get_for_screen: -+ * @screen: the #GdkScreen for which the context is to be created. -+ * -+ * Creates a #PangoContext for @screen. -+ * -+ * The context must be freed when you're finished with it. -+ * -+ * When using GTK+, normally you should use gtk_widget_get_pango_context() -+ * instead of this function, to get the appropriate context for -+ * the widget you intend to render text onto. -+ * -+ * Return value: a new #PangoContext for @screen -+ * -+ * Since: 2.2 -+ **/ -+PangoContext * -+gdk_pango_context_get_for_screen (GdkScreen *screen) -+{ -+ PangoContext *context; -+ -+ g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); -+ -+ if (screen->closed) -+ return NULL; -+ -+ context = pango_xft_get_context (GDK_SCREEN_XDISPLAY (screen), -+ GDK_SCREEN_X11 (screen)->screen_num); -+ -+ g_object_set_data (G_OBJECT (context), "gdk-pango-screen", screen); -+ -+ return context; -+} -+ -+#define __GDK_PANGO_X11_C__ -+#include "gdkaliasdef.c" -Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c -=================================================================== ---- gtk+-2.10.6.orig/gdk/x11/gdkpixmap-x11.c 2006-10-30 12:58:30.000000000 +0000 -+++ gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c 2006-10-30 12:59:30.000000000 +0000 -@@ -119,6 +119,9 @@ - { - GdkDrawableImplX11 *draw_impl = GDK_DRAWABLE_IMPL_X11 (impl); - -+ if (draw_impl->xft_draw) -+ XftDrawDestroy (draw_impl->xft_draw); -+ - _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl)); - } - ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig 2006-11-14 14:39:34.000000000 -0800 -+++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-11-14 14:37:34.000000000 -0800 -@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget) - BACKGROUND_COLOR ( GTK_WIDGET ( calendar))); - gdk_window_show (priv->main_win); - gdk_window_set_user_data (priv->main_win, widget); -+ -+ /* Set widgets gc */ -+ calendar->gc = gdk_gc_new (widget->window); -+ - gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget)); - gdk_window_show (widget->window); - gdk_window_set_user_data (widget->window, widget); diff --git a/packages/gtk+/gtk+-2.10.6/run-iconcache.patch b/packages/gtk+/gtk+-2.10.6/run-iconcache.patch deleted file mode 100644 index 5c114dbdda..0000000000 --- a/packages/gtk+/gtk+-2.10.6/run-iconcache.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: gtk+-2.10.6/gtk/Makefile.am -=================================================================== ---- gtk+-2.10.6.orig/gtk/Makefile.am 2006-10-30 12:56:34.000000000 +0000 -+++ gtk+-2.10.6/gtk/Makefile.am 2006-10-30 12:57:08.000000000 +0000 -@@ -1119,11 +1119,11 @@ - done \ - && touch stamp-icons - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ -- ./gtk-update-icon-cache --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -+# GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ -+# ./gtk-update-icon-cache --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.6/scroll-timings.patch b/packages/gtk+/gtk+-2.10.6/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.6/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "gtkalias.h" - - #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.10.6/single-click.patch b/packages/gtk+/gtk+-2.10.6/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.6/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - calendar_select_and_focus_day (calendar, day); -- } -+ -+ // This change causes the calendar to disappear after choosing a day -+/* } - else if (event->type == GDK_2BUTTON_PRESS) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - if (fs->last_selected != NULL) - g_free (fs->last_selected); - -+ // Single-click directory entry -+ if (new_names->len == 1) -+ { -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ tree_view = gtk_tree_selection_get_tree_view (selection); -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ { -+ path = gtk_tree_model_get_path (model, &iter); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (!is_file) -+ { -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ } -+ -+ gtk_tree_path_free (path); -+ } -+ } -+ - fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); - filename = get_real_filename (fs->last_selected, FALSE); - diff --git a/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.10.6/spinbutton.patch b/packages/gtk+/gtk+-2.10.6/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.6/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - spin = GTK_SPIN_BUTTON (widget); - arrow_size = spin_button_get_arrow_size (spin); -- panel_width = arrow_size + 2 * widget->style->xthickness; -+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; - - widget->allocation = *allocation; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; - -+ y = widget->style->ythickness; -+ height = widget->requisition.height - (2 * y); -+ - if (arrow_type == GTK_ARROW_UP) - { - x = 0; -- y = 0; -- -- height = widget->requisition.height / 2; - } - else - { -- x = 0; -- y = widget->requisition.height / 2; -- -- height = (widget->requisition.height + 1) / 2; -+ x = width; - } - - if (spin_button_at_limit (spin_button, arrow_type)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - shadow_type = GTK_SHADOW_OUT; - } - } -- -+ - gtk_paint_box (widget->style, spin_button->panel, - state_type, shadow_type, - NULL, widget, -- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", -+ NULL, - x, y, width, height); - - height = widget->requisition.height; - -- if (arrow_type == GTK_ARROW_DOWN) -- { -- y = height / 2; -- height = height - y - 2; -- } -- else -- { -- y = 2; -- height = height / 2 - 2; -- } -- - width -= 3; -- -- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- x = 2; -- else -- x = 1; -+ height -= 3; - - w = width / 2; - w -= w % 2 - 1; /* force odd */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - if (GTK_ENTRY (widget)->editable) - gtk_spin_button_update (spin); - -- if (event->y <= widget->requisition.height / 2) -+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) - { - if (event->button == 1) - start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - arrow_size = spin_button_get_arrow_size (spin); - -- if (event->button == spin->button) -- { -- int click_child = spin->click_child; -+ gtk_spin_button_stop_spinning (spin); - -- gtk_spin_button_stop_spinning (spin); -- -- if (event->button == 3) -- { -- if (event->y >= 0 && event->x >= 0 && -- event->y <= widget->requisition.height && -- event->x <= arrow_size + 2 * widget->style->xthickness) -- { -- if (click_child == GTK_ARROW_UP && -- event->y <= widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->upper - spin->adjustment->value; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, diff); -- } -- else if (click_child == GTK_ARROW_DOWN && -- event->y > widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->value - spin->adjustment->lower; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, -diff); -- } -- } -- } -- spin_button_redraw (spin); -+ spin_button_redraw (spin); - -- return TRUE; -- } -- else -- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.6/xsettings.patch b/packages/gtk+/gtk+-2.10.6/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.6/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.10.7/.mtn2git_empty b/packages/gtk+/gtk+-2.10.7/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gtk+/gtk+-2.10.7/automake-lossage.patch b/packages/gtk+/gtk+-2.10.7/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.10.7/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.10.7/disable-print.patch b/packages/gtk+/gtk+-2.10.7/disable-print.patch deleted file mode 100644 index 1067773f12..0000000000 --- a/packages/gtk+/gtk+-2.10.7/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch deleted file mode 100644 index c31868462a..0000000000 --- a/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c ---- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005 -+++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006 -@@ -71,35 +71,24 @@ get_check_shift (int check_size) - return check_shift; - } - --static void --pixops_scale_nearest (guchar *dest_buf, -- int render_x0, -- int render_y0, -- int render_x1, -- int render_y1, -- int dest_rowstride, -- int dest_channels, -- gboolean dest_has_alpha, -- const guchar *src_buf, -- int src_width, -- int src_height, -- int src_rowstride, -- int src_channels, -- gboolean src_has_alpha, -- double scale_x, -- double scale_y) --{ -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -- const guchar *p; -+typedef struct { guchar a,b,c; } b3; -+extern void BUG_bad_size_of_struct_b3(void); - --#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \ -+#define INNER_LOOP_PREP() \ -+ do { \ -+ x = render_x0 * x_step + x_step / 2; \ - xmax = x + (render_x1 - render_x0) * x_step; \ - xstart = MIN (0, xmax); \ - xstop = MIN (src_width << SCALE_SHIFT, xmax); \ -+ } while(0) -+ -+#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\ -+ do { \ -+ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \ -+ y_pos = CLAMP (y_pos, 0, src_height - 1); \ -+ src = src_buf + y_pos * src_rowstride; \ -+ dest = dest_buf + i * dest_rowstride; \ -+ x = render_x0 * x_step + x_step / 2; \ - p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \ - while (x < xstart) \ - { \ -@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des - ASSIGN_PIXEL; \ - dest += DEST_CHANNELS; \ - x += x_step; \ -- } -+ } \ -+ } while(0) - -- for (i = 0; i < (render_y1 - render_y0); i++) -- { -- const guchar *src; -- guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -+static void -+pixops_scale_nearest (guchar *dest_buf, -+ int render_x0, -+ int render_y0, -+ int render_x1, -+ int render_y1, -+ int dest_rowstride, -+ int dest_channels, -+ gboolean dest_has_alpha, -+ const guchar *src_buf, -+ int src_width, -+ int src_height, -+ int src_rowstride, -+ int src_channels, -+ gboolean src_has_alpha, -+ double scale_x, -+ double scale_y) -+{ -+ int i; -+ int x; -+ int x_step = (1 << SCALE_SHIFT) / scale_x; -+ int y_step = (1 << SCALE_SHIFT) / scale_y; -+ int xmax, xstart, xstop, x_pos, y_pos; -+ const guchar *p; - -- x = render_x0 * x_step + x_step / 2; -+ const guchar *src; -+ guchar *dest; - -- if (src_channels == 3) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff); -- } -- } -- else if (src_channels == 4) -- { -- if (dest_channels == 3) -- { -- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); -- } -- else -- { -- guint32 *p32; -- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); -- } -- } -+ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3(); -+ -+ INNER_LOOP_PREP(); -+ -+ if (src_channels == 3) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) ); -+ } -+ else if (src_channels == 4) -+ { -+ if (dest_channels == 3) -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p); -+ else -+ for (i = 0; i < (render_y1 - render_y0); i++) -+ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p)); - } - } - -@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; - -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha) / 0xff; - else -@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar - case 0: - break; - case 255: -- dest[0] = p[0]; -- dest[1] = p[1]; -- dest[2] = p[2]; -+ *(b3*)dest = *(b3*)p; - if (dest_has_alpha) - dest[3] = 0xff; - break; -@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar - const guchar *p; - unsigned int a0; - -+ INNER_LOOP_PREP(); -+ - for (i = 0; i < (render_y1 - render_y0); i++) - { - const guchar *src; - guchar *dest; -- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; -- y_pos = CLAMP (y_pos, 0, src_height - 1); -- src = src_buf + y_pos * src_rowstride; -- dest = dest_buf + i * dest_rowstride; -- -- x = render_x0 * x_step + x_step / 2; -- - - if (((i + check_y) >> check_shift) & 1) - { -@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar - } - - j = 0; -- INNER_LOOP(src_channels, dest_channels, -+ INNER_LOOP_BODY(src_channels, dest_channels, - if (src_has_alpha) - a0 = (p[3] * overall_alpha + 0xff) >> 8; - else -@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar - ); - } - } --#undef INNER_LOOP -+#undef INNER_LOOP_BODY -+#undef INNER_LOOP_PREP - - static void - composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha, diff --git a/packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch deleted file mode 100644 index 1ea86ce6b2..0000000000 --- a/packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkarrow.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 -+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 -@@ -31,7 +31,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - - G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) -@@ -88,6 +90,7 @@ - GTK_PARAM_READWRITE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -143,13 +146,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } -Index: gtk+-2.10.6/gtk/gtkentry.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 -@@ -577,6 +577,18 @@ - 0.0, - GTK_PARAM_READWRITE)); - -+ // Added by gtk+-handhelds.patch -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ P_("Minimum width"), -+ P_("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); -+ -+ -+ - /** - * GtkEntry:truncate-multiline: - * -@@ -1286,7 +1298,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - GtkBorder inner_border; - PangoContext *context; - -@@ -1302,8 +1314,10 @@ - _gtk_entry_get_borders (entry, &xborder, &yborder); - _gtk_entry_effective_inner_border (entry, &inner_border); - -+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); -+ - if (entry->width_chars < 0) -- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; -+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); -Index: gtk+-2.10.6/gtk/gtkrange.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 -+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 -@@ -197,6 +197,7 @@ - static gboolean gtk_range_key_press (GtkWidget *range, - GdkEventKey *event); - -+static GdkAtom recognize_protocols_atom, atom_atom; - - static guint signals[LAST_SIGNAL]; - -@@ -213,6 +214,9 @@ - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - -+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); -+ atom_atom = gdk_atom_intern ("ATOM", FALSE); -+ - gobject_class->set_property = gtk_range_set_property; - gobject_class->get_property = gtk_range_get_property; - gobject_class->finalize = gtk_range_finalize; -@@ -1020,6 +1024,12 @@ - &attributes, attributes_mask); - gdk_window_set_user_data (range->event_window, range); - -+ gdk_property_change (range->event_window, -+ recognize_protocols_atom, -+ atom_atom, -+ 32, GDK_PROP_MODE_REPLACE, -+ NULL, 0); -+ - widget->style = gtk_style_attach (widget->style, widget->window); - } - -@@ -1569,7 +1579,7 @@ - - /* ignore presses when we're already doing something else. */ - if (range->layout->grab_location != MOUSE_OUTSIDE) -- return FALSE; -+ return TRUE; - - range->layout->mouse_x = event->x; - range->layout->mouse_y = event->y; -@@ -1778,7 +1788,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch deleted file mode 100644 index 6adb0cfef6..0000000000 --- a/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 -+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 -@@ -371,7 +371,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -773,7 +773,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1611,7 +1611,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.7/integer-pixops.patch b/packages/gtk+/gtk+-2.10.7/integer-pixops.patch deleted file mode 100644 index 490a60dd8a..0000000000 --- a/packages/gtk+/gtk+-2.10.7/integer-pixops.patch +++ /dev/null @@ -1,348 +0,0 @@ ---- /tmp/config.h.in 2006-12-23 00:00:38.000000000 +0100 -+++ gtk+-2.10.6/config.h.in 2006-12-23 00:01:05.632227000 +0100 -@@ -253,3 +253,7 @@ - - /* Define to `int' if doesn't define. */ - #undef uid_t -+ -+/* Define to use integer math rather than floating point where possible. */ -+#undef ENABLE_INTEGER_PIXOPS -+ ---- /tmp/configure.in 2006-12-23 00:02:16.000000000 +0100 -+++ gtk+-2.10.6/configure.in 2006-12-23 00:05:11.172227000 +0100 -@@ -203,6 +203,15 @@ - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, - [enable_rebuilds=yes]) -+AC_ARG_ENABLE(integer-pixops, -+ [AC_HELP_STRING([--enable-integer-pixops], -+ [use integer math where possible])],, -+ [enable_integer_pixops=no]) -+ -+if test "x$enable_integer_pixops" = "xyes"; then -+ AC_DEFINE(ENABLE_INTEGER_PIXOPS) -+fi -+ - AC_ARG_ENABLE(visibility, - [AC_HELP_STRING([--disable-visibility], - [don't use ELF visibility attributes])],, ---- /tmp/pixops.c 2006-12-23 10:04:02.000000000 +0100 -+++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c 2006-12-23 10:04:21.772227000 +0100 -@@ -28,6 +28,10 @@ - #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) - #define SCALE_SHIFT 16 - -+#ifdef ENABLE_INTEGER_PIXOPS -+#define FRAC 0x10000ULL -+#endif -+ - typedef struct _PixopsFilter PixopsFilter; - typedef struct _PixopsFilterDimension PixopsFilterDimension; - -@@ -972,6 +976,29 @@ - (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a); - } - -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+correct_total (int *weights, -+ int n_x, -+ int n_y, -+ int total, -+ unsigned long overall_alpha) -+{ -+ int correction = (int)(overall_alpha - total); -+ int i; -+ for (i = n_x * n_y - 1; i >= 0; i--) -+ { -+ if (*(weights + i) + correction >= 0) -+ { -+ *(weights + i) += correction; -+ break; -+ } -+ } -+} -+ -+#else -+ - static void - correct_total (int *weights, - int n_x, -@@ -998,6 +1025,8 @@ - } - } - -+#endif -+ - static int * - make_filter_table (PixopsFilter *filter) - { -@@ -1026,7 +1055,11 @@ - *(pixel_weights + n_x * i + j) = weight; - } - -- correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); -+#ifdef ENABLE_INTEGER_PIXOPS -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC); -+#else -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+#endif - } - - return weights; -@@ -1178,6 +1211,93 @@ - /* Compute weights for reconstruction by replication followed by - * sampling with a box filter - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = FRAC / x_scale; -+ unsigned long y_scale_r = FRAC / y_scale; -+ -+ int n_x = ceil(1/x_scale_d + 1); -+ int n_y = ceil(1/y_scale_d + 1); -+ -+ filter->x_offset = 0; -+ filter->y_offset = 0; -+ filter->n_x = n_x; -+ filter->n_y = n_y; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ for (i_offset=0; i_offsetweights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long tw, th; -+ -+ if (i < y) -+ { -+ -+ if (i + FRAC > y) -+ th = MIN(i+FRAC, y + y_scale_r) - y; -+ else -+ th = 0; -+ } -+ else -+ { -+ if (y + FRAC/y_scale > i) -+ th = MIN(i+FRAC, y + y_scale_r) - i; -+ else -+ th = 0; -+ } -+ -+ for (j = 0; j < n_x; j++) -+ { -+ int weight; -+ -+ if (j < x) -+ { -+ if (j + FRAC > x) -+ tw = MIN(j+FRAC, x + x_scale_r) - x; -+ else -+ tw = 0; -+ } -+ else -+ { -+ if (x + FRAC/x_scale > j) -+ tw = MIN(j+FRAC, x + x_scale_r) - j; -+ else -+ tw = 0; -+ } -+ -+ { -+ unsigned long lweight = (tw * x_scale) / FRAC; -+ lweight = (lweight * th) / FRAC; -+ lweight = (lweight * y_scale) / FRAC; -+ lweight = (lweight * overall_alpha) / FRAC; -+ weight = lweight; -+ } -+ total += weight; -+ *(pixel_weights + n_x * i + j) = weight; -+ } -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+} -+ -+#else -+ - static void - tile_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1216,10 +1336,151 @@ - } - } - -+#endif -+ - /* Compute weights for a filter that, for minification - * is the same as 'tiles', and for magnification, is bilinear - * reconstruction followed by a sampling with a delta function. - */ -+#ifdef ENABLE_INTEGER_PIXOPS -+ -+static void -+bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) -+{ -+ int i_offset, j_offset; -+ unsigned long *x_weights, *y_weights; -+ int n_x, n_y; -+ unsigned long x_scale = x_scale_d * FRAC; -+ unsigned long y_scale = y_scale_d * FRAC; -+ unsigned long overall_alpha = overall_alpha_d * FRAC; -+ unsigned long x_scale_r = (FRAC / x_scale_d); -+ unsigned long y_scale_r = (FRAC / y_scale_d); -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ n_x = 2; -+ filter->x_offset = 0.5 * (1/x_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_x = ceil(1.0 + 1.0/x_scale_d); -+ filter->x_offset = 0.0; -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ n_y = 2; -+ filter->y_offset = 0.5 * (1/y_scale_d - 1); -+ } -+ else /* Tile */ -+ { -+ n_y = ceil(1.0 + 1.0/y_scale_d); -+ filter->y_offset = 0.0; -+ } -+ -+ filter->n_y = n_y; -+ filter->n_x = n_x; -+ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ -+ x_weights = g_new (unsigned long, n_x); -+ y_weights = g_new (unsigned long, n_y); -+ -+ for (i_offset=0; i_offsetweights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; -+ unsigned long x = j_offset * FRAC / SUBSAMPLE; -+ unsigned long y = i_offset * FRAC / SUBSAMPLE; -+ int i,j; -+ int total = 0; -+ -+ if (x_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_x; i++) -+ { -+ /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */ -+ unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r); -+ x_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* x -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_x; i++) -+ { -+ if (i < x) -+ { -+ if (i + 1 > x) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ else -+ { -+ if (x + 1/x_scale > i) -+ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC); -+ else -+ x_weights[i] = 0; -+ } -+ } -+ } -+ -+ if (y_scale > FRAC) /* Bilinear */ -+ { -+ for (i = 0; i < n_y; i++) -+ { -+ unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r); -+ y_weights[i] = w / FRAC; -+ } -+ } -+ else /* Tile */ -+ { -+ /* y -+ * ---------|--.-|----|--.-|------- SRC -+ * ------------|---------|--------- DEST -+ */ -+ for (i = 0; i < n_y; i++) -+ { -+ if (i < y) -+ { -+ if (i + 1 > y) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ else -+ { -+ if (y + 1/y_scale > i) -+ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC); -+ else -+ y_weights[i] = 0; -+ } -+ } -+ } -+ -+ for (i = 0; i < n_y; i++) -+ for (j = 0; j < n_x; j++) -+ { -+ unsigned long long weight = (x_weights[j] * x_scale) / FRAC; -+ weight = (weight * y_weights[i]) / FRAC; -+ weight = (weight * y_scale) / FRAC; -+ weight = (weight * overall_alpha) / FRAC; -+ *(pixel_weights + n_x * i + j) = (unsigned long)weight; -+ total += (unsigned long)weight; -+ } -+ -+ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); -+ } -+ -+ g_free (x_weights); -+ g_free (y_weights); -+} -+ -+#else -+ - static void - bilinear_magnify_make_weights (PixopsFilterDimension *dim, - double scale) -@@ -1283,6 +1544,8 @@ - } - } - -+#endif -+ - /* Computes the integral from b0 to b1 of - * - * f(x) = x; 0 <= x < 1 diff --git a/packages/gtk+/gtk+-2.10.7/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.7/menu-deactivate.patch deleted file mode 100644 index cfb8849e9f..0000000000 --- a/packages/gtk+/gtk+-2.10.7/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.7/migration.patch b/packages/gtk+/gtk+-2.10.7/migration.patch deleted file mode 100644 index 4ee786e688..0000000000 --- a/packages/gtk+/gtk+-2.10.7/migration.patch +++ /dev/null @@ -1,611 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 -+++ configure.in 2006-10-30 12:58:33.000000000 +0000 -@@ -1529,6 +1529,16 @@ - GTK_EXTRA_CFLAGS="$msnative_struct" - fi - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== ---- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 -+++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 -@@ -589,6 +589,11 @@ - gtkwindow-decorate.c \ - gtkwindow.c \ - $(gtk_clipboard_dnd_c_sources) -+ -+if ENABLE_MIGRATION -+gtk_base_c_sources += gtkmigration.c -+endif -+ - gtk_c_sources = $(gtk_base_c_sources) - gtk_all_c_sources = $(gtk_base_c_sources) - -Index: gtk/gtkmain.c -=================================================================== ---- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 -+++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 -@@ -507,6 +507,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkmigration.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} -Index: gtk/gtkwindow.c -=================================================================== ---- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 -+++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 -@@ -50,6 +50,9 @@ - #include "x11/gdkx.h" - #endif - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ -+ - enum { - SET_FOCUS, - FRAME_EVENT, -@@ -823,6 +826,10 @@ - - g_signal_connect (window->screen, "composited_changed", - G_CALLBACK (gtk_window_on_composited_changed), window); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void diff --git a/packages/gtk+/gtk+-2.10.7/no-demos.patch b/packages/gtk+/gtk+-2.10.7/no-demos.patch deleted file mode 100644 index 0fc4c48d1a..0000000000 --- a/packages/gtk+/gtk+-2.10.7/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.7/no-xwc.patch b/packages/gtk+/gtk+-2.10.7/no-xwc.patch deleted file mode 100644 index affb4a303e..0000000000 --- a/packages/gtk+/gtk+-2.10.7/no-xwc.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 -@@ -576,12 +576,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -613,6 +615,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -633,6 +636,7 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 -+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 -@@ -525,10 +525,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -578,6 +580,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -595,6 +598,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -667,6 +671,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -681,6 +686,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -753,6 +759,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -780,6 +787,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 -+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 -@@ -48,6 +48,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -93,7 +94,8 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -- -+#endif -+ - return; - } - -@@ -136,6 +138,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -178,6 +181,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -210,6 +214,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -242,6 +247,7 @@ - return len_cpy; - } - else -+#endif - { - gint i; - diff --git a/packages/gtk+/gtk+-2.10.7/run-iconcache.patch b/packages/gtk+/gtk+-2.10.7/run-iconcache.patch deleted file mode 100644 index ac15e9ab24..0000000000 --- a/packages/gtk+/gtk+-2.10.7/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 -+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 -@@ -1128,11 +1128,11 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.7/scroll-timings.patch b/packages/gtk+/gtk+-2.10.7/scroll-timings.patch deleted file mode 100644 index 3f823a7880..0000000000 --- a/packages/gtk+/gtk+-2.10.7/scroll-timings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "gtkalias.h" - - #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.10.7/single-click.patch b/packages/gtk+/gtk+-2.10.7/single-click.patch deleted file mode 100644 index 250f1629f5..0000000000 --- a/packages/gtk+/gtk+-2.10.7/single-click.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkcalendar.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkcalendar.c -+++ gtk+-2.10.6/gtk/gtkcalendar.c -@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar - } - - calendar_select_and_focus_day (calendar, day); -- } -+ -+ // This change causes the calendar to disappear after choosing a day -+/* } - else if (event->type == GDK_2BUTTON_PRESS) -- { -+ {*/ - priv->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -Index: gtk+-2.10.6/gtk/gtkfilesel.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkfilesel.c -+++ gtk+-2.10.6/gtk/gtkfilesel.c -@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree - if (fs->last_selected != NULL) - g_free (fs->last_selected); - -+ // Single-click directory entry -+ if (new_names->len == 1) -+ { -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ tree_view = gtk_tree_selection_get_tree_view (selection); -+ -+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ { -+ path = gtk_tree_model_get_path (model, &iter); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (!is_file) -+ { -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ } -+ -+ gtk_tree_path_free (path); -+ } -+ } -+ - fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); - filename = get_real_filename (fs->last_selected, FALSE); - diff --git a/packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.10.7/spinbutton.patch b/packages/gtk+/gtk+-2.10.7/spinbutton.patch deleted file mode 100644 index c26dc6d93c..0000000000 --- a/packages/gtk+/gtk+-2.10.7/spinbutton.patch +++ /dev/null @@ -1,130 +0,0 @@ -Index: gtk+-2.10.6/gtk/gtkspinbutton.c -=================================================================== ---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c -+++ gtk+-2.10.6/gtk/gtkspinbutton.c -@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget - - spin = GTK_SPIN_BUTTON (widget); - arrow_size = spin_button_get_arrow_size (spin); -- panel_width = arrow_size + 2 * widget->style->xthickness; -+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; - - widget->allocation = *allocation; - -@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto - { - width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; - -+ y = widget->style->ythickness; -+ height = widget->requisition.height - (2 * y); -+ - if (arrow_type == GTK_ARROW_UP) - { - x = 0; -- y = 0; -- -- height = widget->requisition.height / 2; - } - else - { -- x = 0; -- y = widget->requisition.height / 2; -- -- height = (widget->requisition.height + 1) / 2; -+ x = width; - } - - if (spin_button_at_limit (spin_button, arrow_type)) -@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto - shadow_type = GTK_SHADOW_OUT; - } - } -- -+ - gtk_paint_box (widget->style, spin_button->panel, - state_type, shadow_type, - NULL, widget, -- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", -+ NULL, - x, y, width, height); - - height = widget->requisition.height; - -- if (arrow_type == GTK_ARROW_DOWN) -- { -- y = height / 2; -- height = height - y - 2; -- } -- else -- { -- y = 2; -- height = height / 2 - 2; -- } -- - width -= 3; -- -- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- x = 2; -- else -- x = 1; -+ height -= 3; - - w = width / 2; - w -= w % 2 - 1; /* force odd */ -@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget - if (GTK_ENTRY (widget)->editable) - gtk_spin_button_update (spin); - -- if (event->y <= widget->requisition.height / 2) -+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) - { - if (event->button == 1) - start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); -@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge - - arrow_size = spin_button_get_arrow_size (spin); - -- if (event->button == spin->button) -- { -- int click_child = spin->click_child; -+ gtk_spin_button_stop_spinning (spin); - -- gtk_spin_button_stop_spinning (spin); -- -- if (event->button == 3) -- { -- if (event->y >= 0 && event->x >= 0 && -- event->y <= widget->requisition.height && -- event->x <= arrow_size + 2 * widget->style->xthickness) -- { -- if (click_child == GTK_ARROW_UP && -- event->y <= widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->upper - spin->adjustment->value; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, diff); -- } -- else if (click_child == GTK_ARROW_DOWN && -- event->y > widget->requisition.height / 2) -- { -- gdouble diff; -- -- diff = spin->adjustment->value - spin->adjustment->lower; -- if (diff > EPSILON) -- gtk_spin_button_real_spin (spin, -diff); -- } -- } -- } -- spin_button_redraw (spin); -+ spin_button_redraw (spin); - -- return TRUE; -- } -- else -- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.10.7/xsettings.patch b/packages/gtk+/gtk+-2.10.7/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.10.7/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb deleted file mode 100644 index 51a79598dd..0000000000 --- a/packages/gtk+/gtk+_2.10.3.bb +++ /dev/null @@ -1,103 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r3" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://disable-print.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1" -# file://gtk+-handhelds.patch;patch=1 -# file://single-click.patch;patch=1 -# file://spinbutton.patch;patch=1 \ - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gtk-update-icon-cache \ - ${bindir}/gtk-query-immodules-2.0 \ - ${libdir}/lib*.so.* \ - ${datadir}/themes ${sysconfdir} \ - ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" -FILES_${PN}-dev += " \ - ${datadir}/gtk-2.0/include \ - ${libdir}/gtk-2.0/include \ - ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ - ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ - ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ - ${bindir}/gdk-pixbuf-csource" -FILES_${PN}-dbg += " \ - ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" - - -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" - -EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" - -LIBV = "2.10.0" - -do_stage () { - oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - - autotools_stage_includes - - mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include - install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h - - install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ -} - -do_install_append () { - install -d ${D}${sysconfdir}/gtk-2.0 -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} - -PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" - -python populate_packages_prepend () { - import os.path - - prologue = bb.data.getVar("postinst_prologue", d, 1) - - gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) - loaders_root = os.path.join(gtk_libdir, 'loaders') - immodules_root = os.path.join(gtk_libdir, 'immodules') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') - do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') - do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') - - if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) -} diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb deleted file mode 100644 index 33be0019cb..0000000000 --- a/packages/gtk+/gtk+_2.10.6.bb +++ /dev/null @@ -1,103 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r7" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://pangoxft2.10.6.diff;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gtk-update-icon-cache \ - ${bindir}/gtk-query-immodules-2.0 \ - ${libdir}/lib*.so.* \ - ${datadir}/themes ${sysconfdir} \ - ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" -FILES_${PN}-dev += " \ - ${datadir}/gtk-2.0/include \ - ${libdir}/gtk-2.0/include \ - ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ - ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ - ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ - ${bindir}/gdk-pixbuf-csource" -FILES_${PN}-dbg += " \ - ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" - - -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" - -EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" - -LIBV = "2.10.0" - -do_stage () { - oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - - autotools_stage_includes - - mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include - install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h - - install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ -} - -do_install_append () { - install -d ${D}${sysconfdir}/gtk-2.0 -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} - -PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" - -python populate_packages_prepend () { - import os.path - - prologue = bb.data.getVar("postinst_prologue", d, 1) - - gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) - loaders_root = os.path.join(gtk_libdir, 'loaders') - immodules_root = os.path.join(gtk_libdir, 'immodules') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') - do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') - do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') - - if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) -} diff --git a/packages/gtk+/gtk+_2.10.7.bb b/packages/gtk+/gtk+_2.10.7.bb deleted file mode 100644 index f78b9d459c..0000000000 --- a/packages/gtk+/gtk+_2.10.7.bb +++ /dev/null @@ -1,24 +0,0 @@ -require gtk-2.10.inc - -PR = "r0" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1" - -- cgit v1.2.3 From efdccb14f56b5bba31b19617f114f9004bd635c2 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Wed, 21 Mar 2007 12:15:48 +0000 Subject: packages/mysql/mysql-native_4.1.18.bb: Make sure mysql-native does a full install in staging as php-native now builds with mysql support --- packages/mysql/mysql-native_4.1.18.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb index dc87549e24..9a81bc8f00 100644 --- a/packages/mysql/mysql-native_4.1.18.bb +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -1,6 +1,7 @@ SECTION = "console/network" require mysql_${PV}.bb inherit native +PR="r3" RDEPENDS_${PN} = "" @@ -9,7 +10,7 @@ DEPENDS = "ncurses-native" EXTRA_OEMAKE = "" EXTRA_OECONF = " --with-embedded-server " -do_stage() { +do_stage_append() { install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ } -- cgit v1.2.3 From 1d91c1d9470461aaee1e961614b557596972067f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 13:27:50 +0000 Subject: apt: sync apt.conf with Poky --- packages/apt/apt_0.6.46.2.bb | 3 +-- packages/apt/files/apt.conf | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb index 1cd8eb270e..73285f37c3 100644 --- a/packages/apt/apt_0.6.46.2.bb +++ b/packages/apt/apt_0.6.46.2.bb @@ -1,7 +1,6 @@ require apt.inc -SRC_URI += "file://autofoo.patch;patch=1 \ - file://nodoc.patch;patch=1" +SRC_URI += "file://nodoc.patch;patch=1" require apt-package.inc diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index fc19018533..6fd653dfcd 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -21,6 +21,10 @@ Dir "${STAGING_DIR}/" apt-get "apt-get"; apt-cache "apt-cache"; }; + Etc "etc/apt/" + { + Preferences "preferences"; + }; }; APT -- cgit v1.2.3 From 76eb025c76dfc754aa08cd2063f22938a72caf05 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 13:35:51 +0000 Subject: openpbx.org: Update to use sox-native to create the sounds when building --- .../openpbx/openpbx.org-1.2-rc3/.mtn2git_empty | 0 .../openpbx/openpbx.org-1.2-rc3/bootstrap.patch | 37 ----------------- .../openpbx/openpbx.org-1.2-rc3/openssl.m4.patch | 46 ---------------------- .../openpbx/openpbx.org-1.2_rc3/.mtn2git_empty | 0 .../openpbx/openpbx.org-1.2_rc3/bootstrap.patch | 37 +++++++++++++++++ .../openpbx/openpbx.org-1.2_rc3/openssl.m4.patch | 46 ++++++++++++++++++++++ packages/openpbx/openpbx.org-perl.bb | 24 +++++++++++ packages/openpbx/openpbx.org_1.2_rc3.bb | 41 +++++++++++++------ 8 files changed, 137 insertions(+), 94 deletions(-) delete mode 100644 packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty delete mode 100644 packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch delete mode 100644 packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch create mode 100644 packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty create mode 100644 packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch create mode 100644 packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch create mode 100644 packages/openpbx/openpbx.org-perl.bb (limited to 'packages') diff --git a/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch deleted file mode 100644 index 7f89772efa..0000000000 --- a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch +++ /dev/null @@ -1,37 +0,0 @@ -*** openpbx.org-1.2_rc3.old/bootstrap.sh Mon Feb 26 16:02:40 2007 ---- openpbx.org-1.2_rc3/bootstrap.sh Mon Feb 26 16:04:11 2007 -*************** -*** 89,104 **** - # Check for required version and die if unhappy - - if [ "x$UNAME" = "xFreeBSD" ]; then -! version_compare libtoolize 1 5 20 || exit 1 -! version_compare automake19 1 9 6 || exit 1 - version_compare autoconf259 2 59 || exit 1 - ACLOCAL=aclocal19 - AUTOHEADER=autoheader259 - AUTOMAKE=automake19 - AUTOCONF=autoconf259 - else -! version_compare libtoolize 1 5 20 || exit 1 -! version_compare automake 1 9 6 || exit 1 - version_compare autoconf 2 59 || exit 1 - ACLOCAL=aclocal - AUTOHEADER=autoheader ---- 89,104 ---- - # Check for required version and die if unhappy - - if [ "x$UNAME" = "xFreeBSD" ]; then -! version_compare libtoolize 1 5 10 || exit 1 -! version_compare automake19 1 9 3 || exit 1 - version_compare autoconf259 2 59 || exit 1 - ACLOCAL=aclocal19 - AUTOHEADER=autoheader259 - AUTOMAKE=automake19 - AUTOCONF=autoconf259 - else -! version_compare libtoolize 1 5 10 || exit 1 -! version_compare automake 1 9 3 || exit 1 - version_compare autoconf 2 59 || exit 1 - ACLOCAL=aclocal - AUTOHEADER=autoheader diff --git a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch deleted file mode 100644 index 55d0d33832..0000000000 --- a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch +++ /dev/null @@ -1,46 +0,0 @@ -*** openpbx.org-1.2_rc3.old/acmacros/openssl.m4 Tue Mar 6 15:21:39 2007 ---- openpbx.org-1.2_rc3/acmacros/openssl.m4 Tue Mar 6 15:23:18 2007 -*************** -*** 3,13 **** - # - AC_DEFUN([CHECK_SSL], - [AC_MSG_CHECKING(if ssl is wanted) -! # AC_ARG_WITH(ssl, -! # [ --with-ssl enable ssl [will check /usr/local/ssl -! # /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] -! # ], -! #[ AC_MSG_RESULT(yes) - for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do - ssldir="$dir" - if test -f "$dir/include/openssl/ssl.h"; then ---- 3,13 ---- - # - AC_DEFUN([CHECK_SSL], - [AC_MSG_CHECKING(if ssl is wanted) -! AC_ARG_WITH(ssl, -! [ --with-ssl enable ssl [will check /usr/local/ssl -! /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] -! ], -! [ AC_MSG_RESULT(yes) - for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do - ssldir="$dir" - if test -f "$dir/include/openssl/ssl.h"; then -*************** -*** 33,40 **** - AC_SUBST([HAVE_SSL]) - AC_SUBST([SSL_LIBS]) - AC_SUBST([SSL_CFLAGS]) -! #], -! #[ -! # AC_MSG_RESULT(no) -! #]) - ])dnl ---- 33,40 ---- - AC_SUBST([HAVE_SSL]) - AC_SUBST([SSL_LIBS]) - AC_SUBST([SSL_CFLAGS]) -! ], -! [ -! AC_MSG_RESULT(no) -! ]) - ])dnl diff --git a/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2_rc3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch new file mode 100644 index 0000000000..7f89772efa --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch @@ -0,0 +1,37 @@ +*** openpbx.org-1.2_rc3.old/bootstrap.sh Mon Feb 26 16:02:40 2007 +--- openpbx.org-1.2_rc3/bootstrap.sh Mon Feb 26 16:04:11 2007 +*************** +*** 89,104 **** + # Check for required version and die if unhappy + + if [ "x$UNAME" = "xFreeBSD" ]; then +! version_compare libtoolize 1 5 20 || exit 1 +! version_compare automake19 1 9 6 || exit 1 + version_compare autoconf259 2 59 || exit 1 + ACLOCAL=aclocal19 + AUTOHEADER=autoheader259 + AUTOMAKE=automake19 + AUTOCONF=autoconf259 + else +! version_compare libtoolize 1 5 20 || exit 1 +! version_compare automake 1 9 6 || exit 1 + version_compare autoconf 2 59 || exit 1 + ACLOCAL=aclocal + AUTOHEADER=autoheader +--- 89,104 ---- + # Check for required version and die if unhappy + + if [ "x$UNAME" = "xFreeBSD" ]; then +! version_compare libtoolize 1 5 10 || exit 1 +! version_compare automake19 1 9 3 || exit 1 + version_compare autoconf259 2 59 || exit 1 + ACLOCAL=aclocal19 + AUTOHEADER=autoheader259 + AUTOMAKE=automake19 + AUTOCONF=autoconf259 + else +! version_compare libtoolize 1 5 10 || exit 1 +! version_compare automake 1 9 3 || exit 1 + version_compare autoconf 2 59 || exit 1 + ACLOCAL=aclocal + AUTOHEADER=autoheader diff --git a/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch new file mode 100644 index 0000000000..55d0d33832 --- /dev/null +++ b/packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch @@ -0,0 +1,46 @@ +*** openpbx.org-1.2_rc3.old/acmacros/openssl.m4 Tue Mar 6 15:21:39 2007 +--- openpbx.org-1.2_rc3/acmacros/openssl.m4 Tue Mar 6 15:23:18 2007 +*************** +*** 3,13 **** + # + AC_DEFUN([CHECK_SSL], + [AC_MSG_CHECKING(if ssl is wanted) +! # AC_ARG_WITH(ssl, +! # [ --with-ssl enable ssl [will check /usr/local/ssl +! # /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] +! # ], +! #[ AC_MSG_RESULT(yes) + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then +--- 3,13 ---- + # + AC_DEFUN([CHECK_SSL], + [AC_MSG_CHECKING(if ssl is wanted) +! AC_ARG_WITH(ssl, +! [ --with-ssl enable ssl [will check /usr/local/ssl +! /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ] +! ], +! [ AC_MSG_RESULT(yes) + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then +*************** +*** 33,40 **** + AC_SUBST([HAVE_SSL]) + AC_SUBST([SSL_LIBS]) + AC_SUBST([SSL_CFLAGS]) +! #], +! #[ +! # AC_MSG_RESULT(no) +! #]) + ])dnl +--- 33,40 ---- + AC_SUBST([HAVE_SSL]) + AC_SUBST([SSL_LIBS]) + AC_SUBST([SSL_CFLAGS]) +! ], +! [ +! AC_MSG_RESULT(no) +! ]) + ])dnl diff --git a/packages/openpbx/openpbx.org-perl.bb b/packages/openpbx/openpbx.org-perl.bb new file mode 100644 index 0000000000..124dfcfc8b --- /dev/null +++ b/packages/openpbx/openpbx.org-perl.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Openpbx::OGI Perl Gateway Interface Module" +HOMEPAGE = "http://www.openpbx.org" +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "install-native" +RDEPENDS = "perl openpbx.org-ogi" +PR = "r0" + +OPBXV = "openpbx.org-1.2_rc3" + +SRC_URI = "http://www.openpbx.org/releases/${OPBXV}.tar.gz" + +S = "${WORKDIR}/${OPBXV}/contrib/ogi-perl/openpbx-perl-${PV}" + +inherit cpan + +do_install_append () { + install -d ${D}${datadir}/openpbx.org/ogi/perl + install ${S}/examples/* ${D}${datadir}/openpbx.org/ogi/perl +} + +PACKAGES =+ "${PN}-examples" + +FILES_${PN}-examples = "${datadir}/openpbx.org/ogi/perl" diff --git a/packages/openpbx/openpbx.org_1.2_rc3.bb b/packages/openpbx/openpbx.org_1.2_rc3.bb index 64778d0f7c..76c1f0c7bd 100644 --- a/packages/openpbx/openpbx.org_1.2_rc3.bb +++ b/packages/openpbx/openpbx.org_1.2_rc3.bb @@ -3,14 +3,16 @@ HOMEPAGE = "http://www.openpbx.org" #RDEPENDS = "ssmtp" SECTION = "voip" LICENSE = "GPL" -DEPENDS = "openssl zlib tiff libcap spandsp speex readline js" +DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \ + sox-native findutils-native" DEPENDS_${PN}-ldap = "openldap" RRECOMMENDS = "logrotate" -RRECOMMENDS_${PN}-ogi = "perl perl-module-strict" +RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl" PV = "1.2_rc3" -PR = "r0" +PR = "r1" SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \ + svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \ file://bootstrap.patch;patch=1 \ file://openssl.m4.patch;patch=1 \ file://logrotate \ @@ -45,17 +47,34 @@ do_install_append() { install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openpbx install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/openpbx install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/openpbx + # And now for sounds... + for file in `find ${WORKDIR}/MelanieTaylor -name \*.wav`; do + echo $file + sox -V $file -t raw -s -r 8000 -c 1 -w `echo $file|sed -e s/\.wav$/.sln/` resample -ql; + sox -V $file -t raw -U -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.ulaw/` resample -ql; + sox -V $file -t raw -A -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.alaw/` resample -ql; + sox -V $file -t gsm -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.gsm/` resample -ql; + relfile=`echo $file|sed -e s:^${WORKDIR}/MelanieTaylor/::` + relfile2=`echo $relfile|sed -e s:\.wav$::` + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.sln ${D}${datadir}/openpbx.org/sounds/$relfile2.sln + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.ulaw ${D}${datadir}/openpbx.org/sounds/$relfile2.ulaw + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.alaw ${D}${datadir}/openpbx.org/sounds/$relfile2.alaw + install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.gsm ${D}${datadir}/openpbx.org/sounds/$relfile2.gsm + done } -PACKAGES =+ "${PN}-fax ${PN}-ogi ${PN}-musiconhold ${PN}-ldap" +PACKAGES = "${PN}-sounds ${PN}-fax ${PN}-ogi ${PN}-ldap ${PN}-doc ${PN}-dev ${PN}" -FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.* \ - ${libdir}/openpbx.org/modules/app_rxfax.* \ - ${libdir}/openpbx.org/modules/app_txfax.* \ +FILES_${PN}-sounds = "${datadir}/openpbx.org/sounds/*" +FILES_${PN}-dev = "${libdir}/openpbx.org/modules/*.la \ + ${libdir}/openpbx.org/*.la \ + ${includedir}/openpbx/*" +FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.so \ + ${libdir}/openpbx.org/modules/app_rxfax.so \ + ${libdir}/openpbx.org/modules/app_txfax.so \ + ${libdir}/openpbx.org/modules/app_faxdetect.so \ ${sysconfdir}/openpbx.org/chan_fax.conf" -FILES_${PN}-musiconhold = "${libdir}/openpbx.org/modules/res_musiconhold.* \ - ${sysconfdir}/openpbx.org/musiconhold.conf" -FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.* \ +FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.so \ ${datadir}/openpbx.org/ogi/*" FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*" @@ -67,7 +86,7 @@ pkg_postinst_prepend() { } CONFFILES_${PN}-fax += "${sysconfdir}/openpbx.org/chan_fax.conf" -CONFFILES_${PN}-musiconhold += "${sysconfdir}/openpbx.org/musiconhold.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/musiconhold.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/agents.conf" -- cgit v1.2.3 From 9ede5dc2c95dbe53ec5a00c0e22837263673e172 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 13:37:00 +0000 Subject: sox: Add updated sox and new package sox-native --- packages/sox/sox-native_13.0.0.bb | 19 +++++++++++++++++++ packages/sox/sox_12.17.5.bb | 2 +- packages/sox/sox_13.0.0.bb | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 packages/sox/sox-native_13.0.0.bb create mode 100644 packages/sox/sox_13.0.0.bb (limited to 'packages') diff --git a/packages/sox/sox-native_13.0.0.bb b/packages/sox/sox-native_13.0.0.bb new file mode 100644 index 0000000000..9b4dd29433 --- /dev/null +++ b/packages/sox/sox-native_13.0.0.bb @@ -0,0 +1,19 @@ +include sox_${PV}.bb + +S = "${WORKDIR}/sox-${PV}" + +inherit native + +do_patch() { + true +} + +do_stage() { + make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install + rm ${STAGING_BINDIR}/rec + ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec +} + +do_install() { + true +} diff --git a/packages/sox/sox_12.17.5.bb b/packages/sox/sox_12.17.5.bb index 6c70eaad7b..a3cd84e726 100644 --- a/packages/sox/sox_12.17.5.bb +++ b/packages/sox/sox_12.17.5.bb @@ -4,7 +4,7 @@ DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ It converts audio files among various standard audio file formats \ -and can apply different effects and filters to the audio data." +and can apply different effects and filters to the audio data." LICENSE="GPL" HOMEPAGE="http://sox.sourceforge.net" diff --git a/packages/sox/sox_13.0.0.bb b/packages/sox/sox_13.0.0.bb new file mode 100644 index 0000000000..f5c554799d --- /dev/null +++ b/packages/sox/sox_13.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ +It converts audio files among various standard audio file formats \ +and can apply different effects and filters to the audio data." +HOMEPAGE = "http://sox.sourceforge.net" +SECTION = "audio" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ + file://src-Makefile.am.patch;patch=1" + +inherit autotools + +do_install() { + make bindir="${D}${bindir}" libdir="${D}${libdir}" mandir="${D}/${mandir}" includedir="${D}${includedir}" install + rm ${D}${bindir}/rec + ln -s /usr/bin/play ${D}${bindir}/rec +} -- cgit v1.2.3 From 6543facde736a0bcafa01b6610a2e1c293fe11b5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 13:38:11 +0000 Subject: sox: Add missing patch --- packages/sox/sox/src-Makefile.am.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/sox/sox/src-Makefile.am.patch (limited to 'packages') diff --git a/packages/sox/sox/src-Makefile.am.patch b/packages/sox/sox/src-Makefile.am.patch new file mode 100644 index 0000000000..b5ffd398ae --- /dev/null +++ b/packages/sox/sox/src-Makefile.am.patch @@ -0,0 +1,11 @@ +--- sox-13.0.0.old/src/Makefile.am 2007-03-18 22:19:52.296535098 -0400 ++++ sox-13.0.0/src/Makefile.am 2007-03-18 22:21:48.968947731 -0400 +@@ -42,7 +42,7 @@ + $(MAKE) -C libgsm + + play rec: sox$(EXEEXT) +- ./sox --help > /dev/null ++# ./sox --help > /dev/null + test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@ + + install-exec-hook: -- cgit v1.2.3 From af45ae1d6cde2a37bff09038a74b3f4a9e954980 Mon Sep 17 00:00:00 2001 From: Cyril Romain Date: Wed, 21 Mar 2007 19:02:10 +0000 Subject: prismstumbler: bug #1679, fix inclusion of host headers and incorrect ranlib and ar calls, thanks to Cyril Romain --- .../prismstumbler-0.7.3/fix-includes.patch | 26 ---------------------- packages/prismstumbler/prismstumbler_0.7.3.bb | 12 +++++++--- 2 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch (limited to 'packages') diff --git a/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch b/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch deleted file mode 100644 index 9aef61e9d3..0000000000 --- a/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- prismstumbler-0.7.3/src/gpsd/Makefile.in~fix-includes -+++ prismstumbler-0.7.3/src/gpsd/Makefile.in -@@ -92,18 +92,6 @@ - COMPILE_AND_LINK.c = \ - $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) - --## Where to look for X include files. (-I/usr/X11R5/include) --X_INCLUDE = @X_CFLAGS@ -- --## Where to look for include files. --INCLUDE = -I. $(X_INCLUDE) -- --## Implicit rules. --.SUFFIXES: .c --.c.o: -- $(COMPILE.c) $(INCLUDE) -o $@ $< -- -- - ## Libraries and object files - LIB_OBJECTS = netlib.o nmea_parse.o serial.o tm.o em.o $(MOTIF_OBJECTS) - diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index 8699e5668b..bf38d10ca1 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r4" +PR = "r5" PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" @@ -9,12 +9,18 @@ RDEPENDS = "wireless-tools" SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \ file://bogoconf.patch;patch=1 \ - file://fix-includes.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ file://libz.patch;patch=1;pnum=0" inherit autotools pkgconfig -EXTRA_OECONF = "--with-libpcap=${STAGING_DIR}/${HOST_SYS} --with-sqlite-libs=${STAGING_LIBDIR} --with-sqlite-includes=${STAGING_INCDIR}" +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-sqlite-includes=${STAGING_INCDIR} \ + --with-sqlite-libs=${STAGING_LIBDIR} \ + --without-athena" + CFLAGS =+ "-I${S}/include -D_GNU_SOURCE" FILES_${PN} = "${bindir}/prismstumbler" -- cgit v1.2.3 From 59c2c3b70ce92c111271b1771411f7f0b1084e51 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 21 Mar 2007 19:10:16 +0000 Subject: prismstumbler: add missing crosscompile.patch, made a few additions to Makefile.arm to patch in bug #1679 --- .../prismstumbler-0.7.3/crosscompile.patch | 166 +++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch (limited to 'packages') diff --git a/packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch b/packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch new file mode 100644 index 0000000000..63e9f677a5 --- /dev/null +++ b/packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch @@ -0,0 +1,166 @@ +Index: prismstumbler-0.7.3/src/gpsd/Makefile.in +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.in ++++ prismstumbler-0.7.3/src/gpsd/Makefile.in +@@ -128,8 +128,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status +Index: prismstumbler-0.7.3/src/gpsd/Makefile +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile ++++ prismstumbler-0.7.3/src/gpsd/Makefile +@@ -1,4 +1,3 @@ +-# Generated automatically from Makefile.in by configure. + # Makefile.in + # $Modified: Thu Jan 22 11:55:32 1998 by brook $ + +@@ -7,10 +6,10 @@ + + # What we use to compile C files. + # CC = cc +-CC = gcc ++CC = ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=xscale + + # The flags we use to compile C files. +-CFLAGS = -g -O2 ++CFLAGS = -I/home/papercrane/oe/angstrom.build/tmp/work/armv5te-angstrom-linux-gnueabi/prismstumbler-0.7.3-r5/prismstumbler-0.7.3/include -D_GNU_SOURCE -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os + + + ## The C preprocessor. +@@ -19,7 +18,7 @@ CFLAGS = -g -O2 + CPP = @CPP_TRADITIONAL@ + + # Flags passed to the C preprocessor. () +-CPPFLAGS = ++CPPFLAGS = -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include + + # Definitions to be passed to the C preprocessor. (-DHAVE_CONFIG_H) + DEFS = -DHAVE_CONFIG_H +@@ -28,10 +27,10 @@ DEFS = -DHAVE_CONFIG_H + ## The Linker. + + # Flags passed to the linker. (-g -O) +-LDFLAGS = ++LDFLAGS = -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1 + + # Use this for building statically linked executables with GCC. +-# LDFLAGS = -static ++# LDFLAGS = -static -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1 + + + ## Local libraries +@@ -52,7 +51,7 @@ NETLIBS = $(LIBNSL) $(LIBSOCKET) + ## X Libraries + + # Special flags for linking with X. (-L/usr/X11R5/lib) +-X_LDFLAGS = -L/usr/X11R6/lib ++X_LDFLAGS = -L/usr/lib -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib + + # Motif library. (-lXm) + LIBXM = +@@ -62,10 +61,10 @@ LIBXM = + # LIBXM = -Wl,-Bstatic -Wl,-Bdynamic + + # X extension library; needed for Athena and Motif >= 2.0. (-lXext) +-LIBXEXT = -lXext ++LIBXEXT = + + # Xpm library; needed for DDD and sometimes for Motif >= 2.0. (-lXpm) +-LIBXPM = -lXpm ++LIBXPM = + + # Xp library; sometimes needed for Motif >= 2.1. (-lXp) + LIBXP = +@@ -74,13 +73,13 @@ LIBXP = + LIBGEN = + + # X toolkit library. (-lXt) +-LIBXT = -lXt ++LIBXT = + + # Xaw library. (-lXaw) +-LIBXAW = -lXaw ++LIBXAW = + + # X library. (-lSM -lICE -lX11 -lnsl -lsocket) +-LIBX11 = -lSM -lICE -lX11 ++LIBX11 = -lSM -lICE + + # All libraries shown above + ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXP) $(LIBXPM) $(LIBXEXT) \ +@@ -94,7 +93,7 @@ COMPILE_AND_LINK.c = \ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) + + ## Where to look for X include files. (-I/usr/X11R5/include) +-X_INCLUDE = -I/usr/X11R6/include ++X_INCLUDE = -I/usr/include -I/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include/X11 + + ## Where to look for include files. + INCLUDE = -I. $(X_INCLUDE) +@@ -129,8 +128,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status +Index: prismstumbler-0.7.3/src/gpsd/Makefile.arm +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.arm ++++ prismstumbler-0.7.3/src/gpsd/Makefile.arm +@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) + + ## Where to look for X include files. (-I/usr/X11R5/include) +-X_INCLUDE = -I/skiff/local/arm-linux/include/X11 ++X_INCLUDE = @X_CFLAGS@ + + ## Where to look for include files. + INCLUDE = -I. $(X_INCLUDE) +@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status +Index: prismstumbler-0.7.3/src/gpsd/Makefile.i386 +=================================================================== +--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.i386 ++++ prismstumbler-0.7.3/src/gpsd/Makefile.i386 +@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) + + ## Where to look for X include files. (-I/usr/X11R5/include) +-X_INCLUDE = -I/usr/X11R6/include ++X_INCLUDE = @X_CFLAGS@ + + ## Where to look for include files. + INCLUDE = -I. $(X_INCLUDE) +@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS) + $(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS) + + libgpsd.a: $(LIB_OBJECTS) +- ar -r libgpsd.a $(LIB_OBJECTS) +- ranlib libgpsd.a ++ $(AR) -r libgpsd.a $(LIB_OBJECTS) ++ $(RANLIB) libgpsd.a + + clean: + rm -f *.o *.a gpsd gps *~ config.status -- cgit v1.2.3 From 621125c98ac5007f4b53927752d79308f8dfb374 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 21 Mar 2007 20:02:18 +0000 Subject: libsgnomeui: make 2.16.1 not preferred by default --- packages/gnome/libgnomeui_2.16.1.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb index 8f3e0a725c..a6700434c3 100644 --- a/packages/gnome/libgnomeui_2.16.1.bb +++ b/packages/gnome/libgnomeui_2.16.1.bb @@ -4,6 +4,8 @@ PR = "r0" DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" DESCRIPTION = "GNOME User Interface Library" +DEFAULT_PREFERENCE = "-1" + FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ ${libdir}/libglade/*/lib*.so" -- cgit v1.2.3 From 8c5b447ffadcfc3b76af95af0c4e62415a8e0e69 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 22:24:00 +0000 Subject: monotone-6: Add '-f' to rm, incase the file isn't there. --- packages/monotone/monotone-6_0.33.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/monotone/monotone-6_0.33.bb b/packages/monotone/monotone-6_0.33.bb index 47e58a48c6..29332a971d 100644 --- a/packages/monotone/monotone-6_0.33.bb +++ b/packages/monotone/monotone-6_0.33.bb @@ -25,7 +25,7 @@ inherit autotools #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -PR = "r0" +PR = "r1" SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \ file://txt2c-cross-post-0.22.patch;patch=1 \ @@ -42,7 +42,7 @@ do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite cp -pPR tests ${D}${tsd}/tests - rm ${D}/home/monotone/monotone-6/tests/tests/diff_a_binary_file/binary + rm -f ${D}/home/monotone/monotone-6/tests/tests/diff_a_binary_file/binary } PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -- cgit v1.2.3 From df30e95c8af93e2fafac7cc7bca7ef0f4c27e035 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 21 Mar 2007 22:36:17 +0000 Subject: monotone-6: Fix path instead of trying to remove a file in a nonexisting location --- packages/monotone/monotone-6_0.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/monotone/monotone-6_0.33.bb b/packages/monotone/monotone-6_0.33.bb index 29332a971d..64b1d1699e 100644 --- a/packages/monotone/monotone-6_0.33.bb +++ b/packages/monotone/monotone-6_0.33.bb @@ -42,7 +42,7 @@ do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite cp -pPR tests ${D}${tsd}/tests - rm -f ${D}/home/monotone/monotone-6/tests/tests/diff_a_binary_file/binary + rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary } PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -- cgit v1.2.3 From 23cc5ff492484c5e8bf9a7c1e3c5692b5c94fc0c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 22 Mar 2007 06:28:45 +0000 Subject: slugos-packages.bb: Add wireshark. --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 784d765cf7..18647c5c07 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r25" +PR = "r26" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -171,6 +171,7 @@ SLUGOS_PACKAGES = "\ watchdog \ wget \ wireless-tools \ + wireshark \ wpa-supplicant \ zd1211-firmware \ zip \ -- cgit v1.2.3 From 32225722e7cfc429dea4498b51c597d335fef191 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 22 Mar 2007 07:44:42 +0000 Subject: glibc: recommit my glibc clean-up (minus the one change that broke things) only semantic change is what is being discussed in bug 1987 --- packages/glibc/glibc-package.bbclass | 2 +- packages/glibc/glibc.inc | 13 +++++++++++-- packages/glibc/glibc_2.2.5.bb | 8 -------- packages/glibc/glibc_2.3.2+cvs20040726.bb | 9 --------- packages/glibc/glibc_2.3.2.bb | 10 ---------- packages/glibc/glibc_2.3.3+cvs20041128.bb | 9 --------- packages/glibc/glibc_2.3.3+cvs20050221.bb | 9 --------- packages/glibc/glibc_2.3.3+cvs20050420.bb | 9 --------- packages/glibc/glibc_2.3.3.bb | 9 --------- packages/glibc/glibc_2.3.5+cvs20050627.bb | 8 -------- packages/glibc/glibc_2.4.bb | 8 -------- packages/glibc/glibc_2.5.bb | 8 -------- packages/glibc/glibc_cvs.bb | 8 -------- 13 files changed, 12 insertions(+), 98 deletions(-) (limited to 'packages') diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 4cad10fd73..5783ab1fcf 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -40,7 +40,7 @@ FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" FILES_nscd = "${sbindir}/nscd*" FILES_glibc-utils = "${bindir}/* ${sbindir}/*" FILES_glibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += " ${libdir}/gconv/.debug" +FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug" FILES_catchsegv = "${bindir}/catchsegv" RDEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index 7078a1c09f..10c2796825 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -3,7 +3,16 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" - +# nptl needs unwind support in gcc, which can't be built without glibc. +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" +PROVIDES += "virtual/libintl virtual/libiconv" + +inherit autotools + +GLIBC_EXTRA_OECONF ?= "" +INHIBIT_DEFAULT_DEPS = "1" + +PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 75f08be942..adb8a45283 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -6,7 +6,6 @@ PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -24,12 +23,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" @@ -113,8 +107,6 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 40fef7bed4..85f64371a8 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -6,13 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r22" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" - -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -38,8 +31,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 1dba326201..87a6906915 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -5,7 +5,6 @@ PR = "r11" DEFAULT_PREFERENCE_sh3 = "-99" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -23,13 +22,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PROVIDES += "virtual/libintl virtual/libiconv" - -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" @@ -114,8 +106,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 9286fce398..6bbc8ec8af 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -6,7 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r7" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" @@ -29,12 +28,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -57,8 +50,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 6382d12e57..576047ce1e 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -6,19 +6,12 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r7" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" DEFAULT_PREFERENCE_sh3 = "0" DEFAULT_PREFERENCE_sh4 = "0" -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -42,8 +35,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index f955a6e0a0..4a548fa9bc 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -8,16 +8,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r5" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -43,8 +36,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 0db2616a75..3f3690a73c 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -8,7 +8,6 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mipsel = "0" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -26,12 +25,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" @@ -58,8 +51,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 985df1dfaa..1319fb33d3 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -8,7 +8,6 @@ PR = "r13" DEFAULT_PREFERENCE_sh3="-1" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN" @@ -28,12 +27,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -71,8 +65,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 4cf0b82b92..3752da1040 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -14,7 +14,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" @@ -34,12 +33,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -76,8 +70,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" S = "${WORKDIR}/glibc-2.4" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index e34bf99a59..ee137541bb 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -15,7 +15,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" @@ -35,12 +34,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -84,8 +78,6 @@ SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index c85aa500f1..0ddcb8a447 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -5,7 +5,6 @@ PR = "r5" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" @@ -25,11 +24,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" # file://noinfo.patch;patch=1 @@ -58,8 +52,6 @@ SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ -- cgit v1.2.3 From 09c298cf5a0e286d9a8630445d215680b455d95c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Mar 2007 07:56:54 +0000 Subject: geoclue: don't build panelapplet to prevent pulling in half of gnome --- packages/geoclue/geoclue_svn.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/geoclue/geoclue_svn.bb b/packages/geoclue/geoclue_svn.bb index f0d8bc16d8..4237d1ebe6 100644 --- a/packages/geoclue/geoclue_svn.bb +++ b/packages/geoclue/geoclue_svn.bb @@ -1,9 +1,10 @@ DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application" HOMEPAGE = "http://live.gnome.org/GeoClue" -DEPENDS = "gpsd gnome-panel libsoup dbus-glib" +DEPENDS = "gpsd libsoup dbus-glib" PV = "0.0+svn${SRCDATE}" +PR = "r1" inherit autotools pkgconfig @@ -11,6 +12,9 @@ SRC_URI = "svn://svn.foinse-project.org/geoclue;module=trunk;proto=http" S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--disable-panel-applet" + do_install_append() { mkdir -p ${D}/usr/share/ cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share -- cgit v1.2.3 From e31e448d2d7c29052026f0a14058ac4af8104fba Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Mar 2007 10:39:45 +0000 Subject: task-base: ECB is needed to get WEP working --- packages/tasks/task-base.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 5bc38f6a79..4d16501d6b 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 = "r20" +PR = "r21" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -273,6 +273,7 @@ task-distro-wifi-rrecommends = "\ kernel-module-ieee80211-crypt-ccmp \ kernel-module-ieee80211-crypt-tkip \ kernel-module-ieee80211-crypt-wep \ + kernel-module-ecb \ kernel-module-arc4 \ kernel-module-michael-mic \ kernel-module-aes" -- cgit v1.2.3 From cf5eff4a2efa6718b72e44936a4ef661bb00a7b9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Mar 2007 12:48:04 +0000 Subject: task-openmoko: ship openmoko-today, openmoko-icon-theme-standard and settings-daemon by default --- packages/tasks/task-openmoko.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ae705dd387..cad921020e 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r29" +PR = "r30" PACKAGES = "\ task-openmoko-linux \ @@ -19,7 +19,6 @@ PACKAGES = "\ task-openmoko-demo \ task-openmoko-examples \ task-openmoko-debug \ - task-openmoko-native-sdk \ " RDEPENDS_task-openmoko-everything := "${PACKAGES}" @@ -92,6 +91,8 @@ RDEPENDS_task-openmoko-ui = "\ openmoko-common \ openmoko-session \ openmoko-theme-standard \ + openmoko-icon-theme-standard \ + settings-daemon \ # psplash \ " @@ -134,6 +135,7 @@ RDEPENDS_task-openmoko-pim = "\ eds-dbus \ openmoko-contacts \ openmoko-dates \ + openmoko-today \ " # @@ -166,7 +168,6 @@ RDEPENDS_task-openmoko-demo = "\ openmoko-panel-gsm \ openmoko-panel-mainmenu \ xcursor-transparent-theme \ - settings-daemon \ web \ rxvt-unicode \ gpe-terminal \ -- cgit v1.2.3 From 55fe948f9408ab6791ce2482e82f69cdf11272fa Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Mar 2007 12:58:14 +0000 Subject: gpe-terminal: recommend rxvt-unicode --- packages/gpe-terminal/gpe-terminal_1.1.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/gpe-terminal/gpe-terminal_1.1.bb b/packages/gpe-terminal/gpe-terminal_1.1.bb index 578f02b712..3d89e355e9 100644 --- a/packages/gpe-terminal/gpe-terminal_1.1.bb +++ b/packages/gpe-terminal/gpe-terminal_1.1.bb @@ -1,8 +1,11 @@ -SECTION = "gpe" -SRC_URI = "file://${PN}.desktop file://${PN}.png" DESCRIPTION = "GPE terminal wrapper" -PV = "1.1" +SECTION = "gpe" LICENSE = "GPL" +RRECOMMENDS = "rxvt-unicode" +PR = "r1" + +SRC_URI = "file://${PN}.desktop file://${PN}.png" + do_install() { install -d ${D}${datadir}/applications install -d ${D}${datadir}/pixmaps -- cgit v1.2.3 From ac9da3af2e494054ad999d1df2c27d574adc95b3 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 22 Mar 2007 15:42:22 +0000 Subject: libgnomeui-2.16.1: add unpackagedd files to -dev and -dbg --- packages/gnome/libgnomeui_2.16.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb index a6700434c3..ca299d8cac 100644 --- a/packages/gnome/libgnomeui_2.16.1.bb +++ b/packages/gnome/libgnomeui_2.16.1.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r0" +PR = "r1" DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" DESCRIPTION = "GNOME User Interface Library" @@ -11,6 +11,9 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ inherit gnome +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/" + SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" EXTRA_OECONF = "--disable-gtk-doc" @@ -20,5 +23,5 @@ do_configure_prepend() { } do_stage() { -autotools_stage_all + autotools_stage_all } -- cgit v1.2.3 From c9deab71103a58d92fbab9c15d0d68ac5eb87541 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 22 Mar 2007 15:48:43 +0000 Subject: libgnomeui-2.12.0: add unpackagedd files to -dev and -dbg --- packages/gnome/libgnomeui_2.12.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gnome/libgnomeui_2.12.0.bb b/packages/gnome/libgnomeui_2.12.0.bb index 2465de03ca..9324676cec 100644 --- a/packages/gnome/libgnomeui_2.12.0.bb +++ b/packages/gnome/libgnomeui_2.12.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r2" +PR = "r3" DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" DESCRIPTION = "GNOME User Interface Library" @@ -9,6 +9,9 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ inherit gnome +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/" + SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" EXTRA_OECONF = "--disable-gtk-doc" -- cgit v1.2.3 From 5f96bdfd284a81a45cf7999ec858287fb3d1b8be Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 22 Mar 2007 16:40:39 +0000 Subject: gpe-session-scripts-phone: Save dbus session bus address to a file. --- packages/gpephone/gpe-session-scripts-phone/phonesession | 5 ++++- packages/gpephone/gpe-session-scripts-phone_0.67.bb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession index 8fb5065d67..689b3c01ed 100755 --- a/packages/gpephone/gpe-session-scripts-phone/phonesession +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -48,5 +48,8 @@ soundserver & #cms92init & gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx & -# Start PhoneServer +#save session bus address to a file +echo $DBUS_SESSION_BUS_ADDRESS > /tmp/dbusaddress + +# Start PhoneServer - do not stop, it keeps the session running phoneserver diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index afa4fb1683..5312d63249 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://phonesession \ file://disable-composite.xsettings" -PR = "r2" +PR = "r3" S = "${WORKDIR}/gpe-session-scripts-${PV}" -- cgit v1.2.3 From d4de519438094201014033bf13d43d7db6713d78 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Mar 2007 17:19:40 +0000 Subject: nfs-utils: give file with exports for mountd to get it working (from Poky) - mountd should read /etc/exports by default but it did not --- packages/nfs-utils/files/nfsserver | 2 +- packages/nfs-utils/nfs-utils_1.0.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index 1f1794f760..4ff75916d0 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -53,7 +53,7 @@ create_directories(){ #mountd start_mountd(){ echo -n 'starting mountd: ' - start-stop-daemon --start --exec "$NFS_MOUNTD" -- "$@" + start-stop-daemon --start --exec "$NFS_MOUNTD" -- "-f /etc/exports $@" echo done } stop_mountd(){ diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 8ca082114e..a941843488 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r8" +PR = "r9" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ -- cgit v1.2.3 From c7ac7a3d1b132af81a03976a9c2142df97bded6a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 22 Mar 2007 22:28:28 +0000 Subject: yeaphone: Added rrecommends for required kernel modules --- packages/yeaphone/yeaphone_0.1.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb index e1e06d52e9..90bbf3411e 100644 --- a/packages/yeaphone/yeaphone_0.1.bb +++ b/packages/yeaphone/yeaphone_0.1.bb @@ -5,15 +5,16 @@ LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "liblinphone" RDEPENDS = "liblinphone" -PR = "r1" +RRECOMMENDS = "\ + kernel-module-yealink \ + kernel-module-usbhid \ + kernel-module-snd-usb-audio \ + " + +PR = "r2" SRC_URI = "http://download.devbase.at/voip/yeaphone-${PV}.tar.gz" S = "${WORKDIR}/yeaphone-${PV}" inherit autotools - -#EXTRA_OECONF = "" - -#do_install_append() { -#} -- cgit v1.2.3 From e0bcd4a604f60cec9b2a3201f4e1055b91de895d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 22 Mar 2007 23:58:23 +0000 Subject: slugos-packages: Added gspcav1, w3cam and webcam-server --- packages/meta/slugos-packages.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 18647c5c07..0779a4363f 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r26" +PR = "r27" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -71,6 +71,7 @@ SLUGOS_PACKAGES = "\ glib-2.0 \ gnu-config \ grep \ + gspcav1 \ gtk-doc \ gzip \ hdparm \ @@ -167,8 +168,10 @@ SLUGOS_PACKAGES = "\ vim \ vlan \ vsftpd \ + w3cam \ wakelan \ watchdog \ + webcam-server \ wget \ wireless-tools \ wireshark \ -- cgit v1.2.3 From ee149e0c97bcef321efbd50cbe229924907147d8 Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Thu, 22 Mar 2007 23:58:32 +0000 Subject: librsvg 2.16.0: fix "QA Issue: non debug package contains .debug directory". --- packages/librsvg/librsvg_2.16.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/librsvg/librsvg_2.16.0.bb b/packages/librsvg/librsvg_2.16.0.bb index 3110c12148..230ba1b43f 100644 --- a/packages/librsvg/librsvg_2.16.0.bb +++ b/packages/librsvg/librsvg_2.16.0.bb @@ -15,7 +15,8 @@ FILES_rsvg = "${bindir}/rsvg \ ${bindir}/rsvg-convert \ ${datadir}/pixmaps/svg-viewer.svg" FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*" -FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*" +FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \ + ${libdir}/gtk-2.0/*/*.la" FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug" EXTRA_OECONF = "--disable-mozilla-plugin" -- cgit v1.2.3 From a12ac56357b7776233de666d936349d41121c29d Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Thu, 22 Mar 2007 23:58:59 +0000 Subject: python-misc: fix "QA Issue: non debug package contains .debug directory". --- packages/python/python-2.4.4-manifest.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python-2.4.4-manifest.inc index 88755a8e9d..7a1035ac50 100644 --- a/packages/python/python-2.4.4-manifest.inc +++ b/packages/python/python-2.4.4-manifest.inc @@ -12,6 +12,10 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils pyt PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc" +DESCRIPTION_python-misc-dbg="Misc Python debug files" +FILES_python-misc-dbg="${libdir}/python2.4/lib-dynload/.debug" +RDEPENDS_python-misc-dbg="python-core" + DESCRIPTION_python-misc="Misc Python files" FILES_python-misc="${libdir}/python2.4/" RDEPENDS_python-misc="python-core" -- cgit v1.2.3 From 95312a5176e4e171b12874d5883931c5b4c431e5 Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 23 Mar 2007 00:17:08 +0000 Subject: python-gstreamer: Rename to py-gst. --- packages/python/python-gst_0.10.6.bb | 16 ++++++++++++++++ packages/python/python-gstreamer_0.10.6.bb | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 packages/python/python-gst_0.10.6.bb delete mode 100644 packages/python/python-gstreamer_0.10.6.bb (limited to 'packages') diff --git a/packages/python/python-gst_0.10.6.bb b/packages/python/python-gst_0.10.6.bb new file mode 100644 index 0000000000..28dba93cb5 --- /dev/null +++ b/packages/python/python-gst_0.10.6.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL" +DESCRIPTION = "Python gstreamer Bindings" +SECTION = "devel/python" +HOMEPAGE = "http://gstreamer.freedesktop.org" +PRIORITY = "optional" +#DEPENDS = "gstreamer" +#RDEPENDS = "gstreamer" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.gz" +S = "${WORKDIR}/gst-python-${PV}" + +inherit autotools pkgconfig + +do_configure() { + oe_runconf +} diff --git a/packages/python/python-gstreamer_0.10.6.bb b/packages/python/python-gstreamer_0.10.6.bb deleted file mode 100644 index 28dba93cb5..0000000000 --- a/packages/python/python-gstreamer_0.10.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Python gstreamer Bindings" -SECTION = "devel/python" -HOMEPAGE = "http://gstreamer.freedesktop.org" -PRIORITY = "optional" -#DEPENDS = "gstreamer" -#RDEPENDS = "gstreamer" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.gz" -S = "${WORKDIR}/gst-python-${PV}" - -inherit autotools pkgconfig - -do_configure() { - oe_runconf -} -- cgit v1.2.3 From fb53a3a3963caa5604cca530737c46879acb6f54 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 23 Mar 2007 01:20:31 +0000 Subject: puppy: Added patch to handle usb header location change in recent kernels --- packages/puppy/files/.mtn2git_empty | 0 packages/puppy/files/usb-header.patch | 20 ++++++++++++++++++++ packages/puppy/puppy_1.11.bb | 5 +++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 packages/puppy/files/.mtn2git_empty create mode 100644 packages/puppy/files/usb-header.patch (limited to 'packages') diff --git a/packages/puppy/files/.mtn2git_empty b/packages/puppy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/puppy/files/usb-header.patch b/packages/puppy/files/usb-header.patch new file mode 100644 index 0000000000..3768ff8ff6 --- /dev/null +++ b/packages/puppy/files/usb-header.patch @@ -0,0 +1,20 @@ +--- puppy/usb_io.h.~1.14.~ 2007-02-01 16:39:20.000000000 +1030 ++++ puppy/usb_io.h 2007-03-23 11:47:21.000000000 +1030 +@@ -30,12 +30,13 @@ + #include + #include + +-#include +-#include +- +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++/* linux/usb_ch9.h wasn't separated out until 2.4.23 */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23) + #include "usb_ch9.h" ++#else ++#include "usb.h" + #endif ++#include + + #include "mjd.h" + #include "tf_bytes.h" diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb index 94e90d216d..ee9254bd01 100644 --- a/packages/puppy/puppy_1.11.bb +++ b/packages/puppy/puppy_1.11.bb @@ -3,9 +3,10 @@ SECTION = "network" PRIORITY = "optional" HOMEPAGE = "http://sf.net/projects/puppy/" LICENSE = "GPL" -PR = "r2" +PR = "r3" -SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11" +SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11 \ + file://usb-header.patch;patch=1" S = "${WORKDIR}/puppy" inherit autotools -- cgit v1.2.3 From f0416f37be64803188de5818ee128c5fd5e1f2fd Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 23 Mar 2007 01:29:11 +0000 Subject: yeaphone: Added linephonec rrecommends --- packages/yeaphone/yeaphone_0.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb index 90bbf3411e..2612b37e9a 100644 --- a/packages/yeaphone/yeaphone_0.1.bb +++ b/packages/yeaphone/yeaphone_0.1.bb @@ -6,12 +6,13 @@ PRIORITY = "optional" DEPENDS = "liblinphone" RDEPENDS = "liblinphone" RRECOMMENDS = "\ + linphonec \ kernel-module-yealink \ kernel-module-usbhid \ kernel-module-snd-usb-audio \ " -PR = "r2" +PR = "r3" SRC_URI = "http://download.devbase.at/voip/yeaphone-${PV}.tar.gz" -- cgit v1.2.3 From 188d2ba477a9ef188c844c34c41fda3251e4f273 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 23 Mar 2007 01:29:51 +0000 Subject: slugos-packages: Demoted mysql and packages that depend on it. Promoted puppy and ftpd-topfield. --- packages/meta/slugos-packages.bb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 0779a4363f..a69db4f173 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r27" +PR = "r28" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -63,6 +63,7 @@ SLUGOS_PACKAGES = "\ flac \ flex \ flite \ + ftpd-topfield \ fuse \ gawk \ gcc \ @@ -142,6 +143,7 @@ SLUGOS_PACKAGES = "\ pkgconfig \ ppp \ procps \ + puppy \ python \ quilt \ reiserfsprogs reiser4progs \ @@ -184,7 +186,6 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ bwmon \ - ftpd-topfield \ gphoto2 \ irssi \ libgphoto2 \ @@ -192,7 +193,6 @@ SLUGOS_BROKEN_PACKAGES = "\ mediatomb \ mpd \ netpbm \ - puppy \ pvrusb2-mci \ qc-usb-messenger \ syslog-ng \ @@ -202,6 +202,9 @@ SLUGOS_BROKEN_PACKAGES = "\ lirc \ pwc \ zd1211 \ + mysql \ + wview-sim-mysql wview-vpro-mysql \ + wview-wxt510-mysql \ " # These packages will never build because uclibc lacks (and always will lack) @@ -247,20 +250,12 @@ SLUGOS_PACKAGES_append_linux = "\ screen \ timezones \ wview-sim wview-vpro wview-wxt510 \ - wview-sim-mysql wview-vpro-mysql \ - wview-wxt510-mysql \ xinetd \ " SLUGOS_PACKAGES_append_linux-uclibc = "\ " -# These packages are not in the build because they have a significant compilation -# time, add them to SLUGOS_EXTRA_PACKAGES if required -SLUGOS_OPTIONAL_PACKAGES = "\ - mysql \ - " - SLUGOS_EXTRA_PACKAGES ?= "" # The package-index at the end causes regeneration of the Packages.gz and -- cgit v1.2.3 From dcd9fceff1cf3a30581065590a56bf7a6c2da60d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 23 Mar 2007 05:04:06 +0000 Subject: ixp4xx-kernel: Updated to latest SVN defconfig, which enables a whole lot more netfilter modules. --- packages/linux/ixp4xx-kernel/2.6.20/defconfig | 60 ++++++++++++++++++++------- packages/linux/ixp4xx-kernel_2.6.20.bb | 2 +- 2 files changed, 45 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig index 7b32c7e723..27fab8ab73 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -310,36 +310,43 @@ CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration # -# CONFIG_NETFILTER_NETLINK is not set +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK_ENABLED=m CONFIG_NF_CONNTRACK_SUPPORT=y # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set CONFIG_NF_CONNTRACK=m -# CONFIG_NF_CT_ACCT is not set -# CONFIG_NF_CONNTRACK_MARK is not set -# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m -# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set -# CONFIG_NF_CONNTRACK_PPTP is not set +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -348,11 +355,11 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m @@ -383,18 +390,20 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_SAME=m -# CONFIG_NF_NAT_SNMP_BASIC is not set +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_TFTP=m CONFIG_NF_NAT_AMANDA=m -# CONFIG_NF_NAT_PPTP is not set +CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m @@ -403,7 +412,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration (EXPERIMENTAL) # -# CONFIG_NF_CONNTRACK_IPV6 is not set +CONFIG_NF_CONNTRACK_IPV6=m # CONFIG_IP6_NF_QUEUE is not set CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_RT=m @@ -424,7 +433,26 @@ CONFIG_IP6_NF_RAW=m # # Bridge: Netfilter Configuration # -# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m # # DCCP Configuration (EXPERIMENTAL) diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 38762069cc..e5868232f2 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "774" +IXP4XX_KERNEL_SVN_REV = "800" # # The directory containing the patches to be applied is # specified below -- cgit v1.2.3 From a64bb5d2b964bafe23d158dd455446ce5d5015ea Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 10:03:29 +0000 Subject: linux-omap 2.6.18: refreshed defconfig to get it build on RHEL4 (no changes) --- packages/linux/linux-omap1-2.6.18-omap1/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/linux/linux-omap1-2.6.18-omap1/defconfig b/packages/linux/linux-omap1-2.6.18-omap1/defconfig index 7906b901ea..3efaf468f6 100644 --- a/packages/linux/linux-omap1-2.6.18-omap1/defconfig +++ b/packages/linux/linux-omap1-2.6.18-omap1/defconfig @@ -915,6 +915,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_OMAP_AIC23=y # CONFIG_SND_OMAP_TSC2101 is not set +# CONFIG_SND_OMAP_TSC2102 is not set # # USB devices -- cgit v1.2.3 From cf6d86bd48c0ebb7d095096fc38c94cff4495a79 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 23 Mar 2007 10:28:45 +0000 Subject: linux-handhelds-2.6: add 2.6.20-hh3, update cvs HHV to -hh3. --- packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb | 11 +++++++++++ packages/linux/linux-handhelds-2.6_cvs.bb | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index 0f9a38b631..ef60a0f9a9 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -2,14 +2,14 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r5" +PR = "r0" DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "20" -HHV = "2" +HHV = "3" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" -- cgit v1.2.3 From 9840a3458d188fc6c1e44ae7760d9007117dfbea Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 10:53:46 +0000 Subject: python-pygtk2: make it build on 64bit host for 32bit machine (from Poky) Informations why it is needed sent to mailing list. --- packages/python/python-pygtk2/acinclude.m4 | 6 ++++++ packages/python/python-pygtk2_2.10.3.bb | 1 + packages/python/python-pygtk2_2.6.3.bb | 2 ++ packages/python/python-pygtk2_2.8.6.bb | 6 ++++-- 4 files changed, 13 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/python/python-pygtk2/acinclude.m4 b/packages/python/python-pygtk2/acinclude.m4 index eec3758afc..53518fb2eb 100644 --- a/packages/python/python-pygtk2/acinclude.m4 +++ b/packages/python/python-pygtk2/acinclude.m4 @@ -43,12 +43,18 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES +AC_ARG_WITH(python-includes, + [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) +if test x$py_exec_prefix != x; then +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" +else py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" if test "$py_prefix" != "$py_exec_prefix"; then PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" fi +fi AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index d040299a0e..f7366af401 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar S = "${WORKDIR}/${SRCNAME}-${PV}" EXTRA_OECONF = "--disable-docs" +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" inherit autotools pkgconfig distutils-base diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk2_2.6.3.bb index 61250631ef..ffd837f0da 100644 --- a/packages/python/python-pygtk2_2.6.3.bb +++ b/packages/python/python-pygtk2_2.6.3.bb @@ -13,6 +13,8 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools pkgconfig distutils-base +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}" FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gtk/.debug \ ${libdir}/python2.4/site-packages/gtk-2.0/.debug" diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb index ab571bdfd9..b3d8c93584 100644 --- a/packages/python/python-pygtk2_2.8.6.bb +++ b/packages/python/python-pygtk2_2.8.6.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Python GTK+ Bindings" SECTION = "devel/python" -# needs gtk+-2.8.x +PRIORITY = "optional" DEPENDS = "gtk+ libglade" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml0" +PR = "r1" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \ file://acinclude.m4" @@ -13,6 +13,8 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools pkgconfig distutils-base +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } -- cgit v1.2.3 From aecc06a22bfbba7a2ec7242183fc2aaf2305cf1c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 11:06:52 +0000 Subject: python-gst: updated to 0.10.7, added fix to get it built on 64bit (from Poky) --- packages/python/python-gst/.mtn2git_empty | 0 packages/python/python-gst/python-path.patch | 24 ++++++++++++++++++++++++ packages/python/python-gst_0.10.6.bb | 16 ---------------- packages/python/python-gst_0.10.7.bb | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 packages/python/python-gst/.mtn2git_empty create mode 100644 packages/python/python-gst/python-path.patch delete mode 100644 packages/python/python-gst_0.10.6.bb create mode 100644 packages/python/python-gst_0.10.7.bb (limited to 'packages') diff --git a/packages/python/python-gst/.mtn2git_empty b/packages/python/python-gst/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-gst/python-path.patch b/packages/python/python-gst/python-path.patch new file mode 100644 index 0000000000..465d5b180a --- /dev/null +++ b/packages/python/python-gst/python-path.patch @@ -0,0 +1,24 @@ +Index: gst-python-0.10.7/acinclude.m4 +=================================================================== +--- gst-python-0.10.7.orig/acinclude.m4 2007-03-02 14:10:28.652128590 +0100 ++++ gst-python-0.10.7/acinclude.m4 2007-03-02 14:41:00.106728708 +0100 +@@ -43,12 +43,19 @@ + [AC_REQUIRE([AM_PATH_PYTHON]) + AC_MSG_CHECKING(for headers required to compile python extensions) + dnl deduce PYTHON_INCLUDES ++ ++AC_ARG_WITH(python-includes, ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++if test x$py_exec_prefix != x; then ++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/python-gst_0.10.6.bb b/packages/python/python-gst_0.10.6.bb deleted file mode 100644 index 28dba93cb5..0000000000 --- a/packages/python/python-gst_0.10.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "Python gstreamer Bindings" -SECTION = "devel/python" -HOMEPAGE = "http://gstreamer.freedesktop.org" -PRIORITY = "optional" -#DEPENDS = "gstreamer" -#RDEPENDS = "gstreamer" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.gz" -S = "${WORKDIR}/gst-python-${PV}" - -inherit autotools pkgconfig - -do_configure() { - oe_runconf -} diff --git a/packages/python/python-gst_0.10.7.bb b/packages/python/python-gst_0.10.7.bb new file mode 100644 index 0000000000..d206c0ab12 --- /dev/null +++ b/packages/python/python-gst_0.10.7.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Python Gstreamer bindings" +SECTION = "devel/python" +LICENSE = "LGPL" +DEPENDS = "gstreamer" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ + file://python-path.patch;patch=1" + +S = "${WORKDIR}/gst-python-${PV}" + +inherit autotools distutils-base pkgconfig + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + +do_configure_prepend() { + install -d ${S}/m4 + install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/ +} + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 2bf05f47299bbd092ec27a7782d0ac883db41bdf Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 11:08:17 +0000 Subject: python-pygobject: updated to 2.12.3, added fix to get it built on 64bit (from Poky) --- packages/python/python-pygobject-native_2.12.3.bb | 7 +++++++ packages/python/python-pygobject/.mtn2git_empty | 0 packages/python/python-pygobject/python-path.patch | 23 ++++++++++++++++++++++ packages/python/python-pygobject_2.12.3.bb | 22 +++++++++++++++++++++ 4 files changed, 52 insertions(+) create mode 100644 packages/python/python-pygobject-native_2.12.3.bb create mode 100644 packages/python/python-pygobject/.mtn2git_empty create mode 100644 packages/python/python-pygobject/python-path.patch create mode 100644 packages/python/python-pygobject_2.12.3.bb (limited to 'packages') diff --git a/packages/python/python-pygobject-native_2.12.3.bb b/packages/python/python-pygobject-native_2.12.3.bb new file mode 100644 index 0000000000..86d778c5ab --- /dev/null +++ b/packages/python/python-pygobject-native_2.12.3.bb @@ -0,0 +1,7 @@ +require python-pygobject_${PV}.bb + +DEPENDS = "python-native" + +SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 " + +inherit native diff --git a/packages/python/python-pygobject/.mtn2git_empty b/packages/python/python-pygobject/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-pygobject/python-path.patch b/packages/python/python-pygobject/python-path.patch new file mode 100644 index 0000000000..2ab7bdce6e --- /dev/null +++ b/packages/python/python-pygobject/python-path.patch @@ -0,0 +1,23 @@ +Index: pygobject-2.12.3/m4/python.m4 +=================================================================== +--- pygobject-2.12.3.orig/m4/python.m4 2007-03-02 15:00:20.945635455 +0100 ++++ pygobject-2.12.3/m4/python.m4 2007-03-02 15:00:43.532189734 +0100 +@@ -43,12 +43,18 @@ + [AC_REQUIRE([AM_PATH_PYTHON]) + AC_MSG_CHECKING(for headers required to compile python extensions) + dnl deduce PYTHON_INCLUDES ++AC_ARG_WITH(python-includes, ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++if test x$py_exec_prefix != x; then ++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/python-pygobject_2.12.3.bb b/packages/python/python-pygobject_2.12.3.bb new file mode 100644 index 0000000000..04ba363857 --- /dev/null +++ b/packages/python/python-pygobject_2.12.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Python GObject bindings" +SECTION = "devel/python" +LICENSE = "LGPL" +DEPENDS = "python-pygobject-native" +PR = "r1" + +SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \ + file://python-path.patch;patch=1" + +S = "${WORKDIR}/pygobject-${PV}" + +inherit autotools distutils-base pkgconfig + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + +do_stage() { + autotools_stage_all + install -d ${STAGING_LIBDIR}/../share/pygobject/ + cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ + install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ + cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ +} -- cgit v1.2.3 From 2dfd6528b6eb84aa9fee8656d6469c840bcbe35f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 23 Mar 2007 11:21:24 +0000 Subject: openmoko-session: start openmoko-mainmenu plugin by default --- packages/openmoko-base/files/session | 2 +- packages/openmoko-base/openmoko-session_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 1fc2f4d17a..6f4fe6356e 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -8,7 +8,7 @@ matchbox-desktop --icon-size 96 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & +matchbox-panel --start-applets=openmoko-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & #start some old-style panel plugins to get a keyboard and battery status mbinputmgr & diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index c085606a7d..c352cb7d91 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r7" +PR = "r8" inherit openmoko-base -- cgit v1.2.3 From a2726a79c3c6d090e92c26c5f101adce20b470b4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 23 Mar 2007 12:44:17 +0000 Subject: openmoko-rssreader: add svn version --- packages/openmoko-apps/openmoko-rssreader_svn.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/openmoko-apps/openmoko-rssreader_svn.bb (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb new file mode 100644 index 0000000000..0e7d06447e --- /dev/null +++ b/packages/openmoko-apps/openmoko-rssreader_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The OpenMoko Main Menu" +SECTION = "openmoko/applications" +PV = "0.0.1+svn${SRCDATE}" + +inherit openmoko + +DEPENDS += "libmrss" + -- cgit v1.2.3 From 440118224b248719f3c28547b9b65ad4b73e1cf0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 23 Mar 2007 12:51:20 +0000 Subject: openmoko-rss-reader: fix description --- packages/openmoko-apps/openmoko-rssreader_svn.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb index 0e7d06447e..ea3f6ca50d 100644 --- a/packages/openmoko-apps/openmoko-rssreader_svn.bb +++ b/packages/openmoko-apps/openmoko-rssreader_svn.bb @@ -1,6 +1,8 @@ -DESCRIPTION = "The OpenMoko Main Menu" +DESCRIPTION = "The OpenMoko RSS Reader" SECTION = "openmoko/applications" + PV = "0.0.1+svn${SRCDATE}" +PR = "r1" inherit openmoko -- cgit v1.2.3 From c441bcc8f3371a91baeef98c55ffc6d147182fd7 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 23 Mar 2007 14:08:06 +0000 Subject: linux-libc-headers: add UTS_RELEASE to version.h. Fixes uClibc builds with these headers --- packages/linux-libc-headers/linux-libc-headers_2.6.18.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages') diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index 8e1c5dc3e8..005b229eab 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -67,4 +67,10 @@ do_stage () { cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/ cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/ cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/ + # Add UTS_RELEASE to version.h. UTS_RELEASE was moved from version.h to + # utsrelease.h in order to avoid recompiling a kernel every time a localversion + # changed. Since the our headers are static and we're not compiling an + # actual kernel, re-adding UTS_RELEASE does't hurt, and it allows uclibc to + # compile with kernel headers that work with EABI on ARM + echo '#define UTS_RELEASE "2.6.18"' >> ${CROSS_DIR}/${TARGET_SYS}/include/linux/version.h } -- cgit v1.2.3 From ae5721a9897293737ccf6db8faff0c6185fab834 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 23 Mar 2007 15:23:45 +0000 Subject: linux-rp-2.6.20: add CONFIG_SHARPSL_RC=n for non-spitz machines --- packages/linux/linux-rp-2.6.20/defconfig-akita | 1 + packages/linux/linux-rp-2.6.20/defconfig-c7x0 | 1 + packages/linux/linux-rp-2.6.20/defconfig-collie | 1 + packages/linux/linux-rp-2.6.20/defconfig-hx2000 | 1 + packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270 | 2 +- packages/linux/linux-rp-2.6.20/defconfig-poodle | 1 + packages/linux/linux-rp-2.6.20/defconfig-qemuarm | 1 + packages/linux/linux-rp-2.6.20/defconfig-qemux86 | 1 + packages/linux/linux-rp-2.6.20/defconfig-spitz | 2 +- packages/linux/linux-rp-2.6.20/defconfig-tosa | 1 + 10 files changed, 10 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-rp-2.6.20/defconfig-akita b/packages/linux/linux-rp-2.6.20/defconfig-akita index 249466ac87..cdaf06f7bc 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-akita +++ b/packages/linux/linux-rp-2.6.20/defconfig-akita @@ -1570,3 +1570,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-c7x0 b/packages/linux/linux-rp-2.6.20/defconfig-c7x0 index 1d702f60c0..73d826ff24 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.20/defconfig-c7x0 @@ -1606,3 +1606,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie index f488d42d93..55336bae96 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-collie +++ b/packages/linux/linux-rp-2.6.20/defconfig-collie @@ -1639,3 +1639,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-hx2000 b/packages/linux/linux-rp-2.6.20/defconfig-hx2000 index 296c462641..e0df2ae453 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.20/defconfig-hx2000 @@ -1159,3 +1159,4 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y CONFIG_IOMAP_COPY=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270 b/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270 index cb7cce7bdd..b31a1e4071 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270 +++ b/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270 @@ -1018,4 +1018,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y - +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-poodle b/packages/linux/linux-rp-2.6.20/defconfig-poodle index deacd170f2..f332c72d56 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.20/defconfig-poodle @@ -1653,3 +1653,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-qemuarm b/packages/linux/linux-rp-2.6.20/defconfig-qemuarm index e34fe5c090..ed8f122cb0 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.20/defconfig-qemuarm @@ -1188,3 +1188,4 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-qemux86 b/packages/linux/linux-rp-2.6.20/defconfig-qemux86 index 6fe280985f..39ca9ffea7 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.20/defconfig-qemux86 @@ -1560,3 +1560,4 @@ CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_SHARPSL_RC=n diff --git a/packages/linux/linux-rp-2.6.20/defconfig-spitz b/packages/linux/linux-rp-2.6.20/defconfig-spitz index 91f73ed4e9..572f212544 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.20/defconfig-spitz @@ -1601,4 +1601,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m -CONFIG_SHARPSL_RC=m \ No newline at end of file +CONFIG_SHARPSL_RC=m diff --git a/packages/linux/linux-rp-2.6.20/defconfig-tosa b/packages/linux/linux-rp-2.6.20/defconfig-tosa index 4144e5cf38..476f07cabe 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.20/defconfig-tosa @@ -1606,3 +1606,4 @@ CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_GENERIC_ALLOCATOR=y +CONFIG_SHARPSL_RC=n -- cgit v1.2.3 From c6184de917b17e4192105fd362ff9352c6daf4a9 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 23 Mar 2007 17:30:00 +0000 Subject: btxml: clean up bb file (reorder fields). no semantic change, no PR bump. --- packages/btxml/btxml.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/btxml/btxml.bb b/packages/btxml/btxml.bb index b48ebb79f6..d072b85bac 100644 --- a/packages/btxml/btxml.bb +++ b/packages/btxml/btxml.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Bluetooh Download Data from remote phones" -PRIORITY = "optional" -SECTIONS = "apps" -DEPENDS = "bluez-libs" HOMEPAGE = "http://www.saftware.de" +SECTION = "apps" +PRIORITY = "optional" LICENSE = "GPL" +DEPENDS = "bluez-libs" SRC_URI = "http://www.saftware.de/bluetooth/btxml.c" S = "${WORKDIR}" -- cgit v1.2.3 From 8fc5afd475c8c2a1fd4de81937cd736c5931bb7c Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 23 Mar 2007 17:36:58 +0000 Subject: gpe-bluetooth: unify --- packages/gpe-bluetooth/gpe-bluetooth.inc | 11 +++++++++++ packages/gpe-bluetooth/gpe-bluetooth_0.49.bb | 11 +---------- packages/gpe-bluetooth/gpe-bluetooth_0.51.bb | 14 ++------------ packages/gpe-bluetooth/gpe-bluetooth_0.52.bb | 14 +------------- packages/gpe-bluetooth/gpe-bluetooth_0.53.bb | 14 +------------- packages/gpe-bluetooth/gpe-bluetooth_0.54.bb | 14 ++------------ 6 files changed, 18 insertions(+), 60 deletions(-) create mode 100644 packages/gpe-bluetooth/gpe-bluetooth.inc (limited to 'packages') diff --git a/packages/gpe-bluetooth/gpe-bluetooth.inc b/packages/gpe-bluetooth/gpe-bluetooth.inc new file mode 100644 index 0000000000..c258832c8b --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "GPE bluetooth support user interface tool." +SECTION = "gpe" +LICENSE = "GPL" +PRIORITY = "optional" +DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" +RDEPENDS = "bluez-utils-dbus blueprobe" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpe autotools + +FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb index f3129fcf17..396beeb014 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb @@ -1,12 +1,3 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support" -SECTION = "gpe" -PRIORITY = "optional" +require gpe-bluetooth.inc DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus libcontactsdb" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb index 15d8ccafcc..98cdbc4b7f 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb @@ -1,16 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r1" +require gpe-bluetooth.inc -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' +PR = "r1" do_configure () { autotools_do_configure diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb index b6dcfcca61..66bc3f0b24 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb @@ -1,13 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' +require gpe-bluetooth.inc diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb index b6dcfcca61..66bc3f0b24 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb @@ -1,13 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' +require gpe-bluetooth.inc diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb index e664f51959..9164cc4088 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb @@ -1,16 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r1" +require gpe-bluetooth.inc -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools +PR = "r1" SRC_URI += "file://hciattach-bts.patch;patch=1 \ file://include-sdp_lib.patch;patch=1" - -FILES_${PN} += '${datadir}/bluez-pin' -- cgit v1.2.3 From 4d8969947f20857631fb65fd8d739d2d92efac75 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 23 Mar 2007 18:23:55 +0000 Subject: altboot: - CVS -> SVN - Fix do_install() and do_configure to use instead of fixed path --- packages/altboot/altboot_1.0.5.bb | 32 +++++++-------- packages/altboot/altboot_1.0.8.bb | 28 ++++++------- packages/altboot/altboot_wip.bb | 32 +++++++-------- .../altboot-menu/Advanced/30-bootUSB-Stick | 47 ---------------------- 4 files changed, 46 insertions(+), 93 deletions(-) delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick (limited to 'packages') diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index 2762001dbd..f70edc19b6 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -20,9 +20,9 @@ PACKAGE_ARCH = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=4" -S = "${WORKDIR}/altboot/" +S = "${WORKDIR}/${TAG}/" ###################################################################################### @@ -35,37 +35,37 @@ do_install() { if test -d ${WORKDIR}/altboot/${MACHINE} then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + install -m 0644 ${S}/altboot*.cfg ${D}/etc fi - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ + if test -d ${S}/${MACHINE}/altboot-menu/ then - install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu else - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu fi - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/ + if test -d ${S}/${MACHINE}/altboot-menu/Advanced/ then - install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced else - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced fi - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc } ###################################################################################### do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot } ###################################################################################### diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index c52c0972a3..a83d2b5d16 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -34,9 +34,9 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" -S = "${WORKDIR}/altboot/" +S = "${WORKDIR}/${TAG}/" ###################################################################################### @@ -52,30 +52,30 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - if test -d ${WORKDIR}/altboot/${MACHINE} + if test -d ${S}/${MACHINE} then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + install -m 0644 ${S}/altboot*.cfg ${D}/etc fi - install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc } ###################################################################################### do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot } ###################################################################################### diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index 2de4c812b9..d857e5b454 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -38,9 +38,9 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" -S = "${WORKDIR}/altboot/" +S = "${WORKDIR}/${TAG}/" ###################################################################################### @@ -57,32 +57,32 @@ do_install() { install -d ${D}/usr/share/sounds install -d ${D}/etc/skel/altboot - if test -d ${WORKDIR}/altboot/${MACHINE} + if test -d ${S}/${MACHINE} then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi - install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altboot/altbootctl ${D}/sbin + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc } ###################################################################################### do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot } ###################################################################################### diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick deleted file mode 100644 index b573e7a10c..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick +++ /dev/null @@ -1,47 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot USB Storage" - -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - echo "Starting USB..." - - for module in $USB_STORAGE_MODULES - do - echo -en "\t - $module: " - modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" - done - - echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 - - mkdir -p /media/usb-storage >/dev/null 2>&1 - - sleep "$USB_STORAGE_WAIT" - - /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Check for a real fs and loop-images. - check_target "/media/usb-storage" >/dev/tty0 -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - -- cgit v1.2.3 From def0e1d60fa293b5d9fffd605e37df08e0dea397 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 23 Mar 2007 18:47:49 +0000 Subject: altboot_1.1.1+wip-20061123.bb: Add fixed snapshot for Zaurus models --- packages/altboot/altboot_1.1.1+wip-20061123.bb | 99 ++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 packages/altboot/altboot_1.1.1+wip-20061123.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-20061123.bb b/packages/altboot/altboot_1.1.1+wip-20061123.bb new file mode 100644 index 0000000000..d857e5b454 --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-20061123.bb @@ -0,0 +1,99 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +WIP_DATE = "20061123" + +PV = "1.1.1+wip-${WIP_DATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" + +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" + +S = "${WORKDIR}/${TAG}/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + install -d ${D}/etc/skel/altboot + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + update-alternatives --remove init /sbin/init.altboot +} + -- cgit v1.2.3 From da428e8a3b734914adc34ab20d30199a1d7e49e5 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 23 Mar 2007 19:27:47 +0000 Subject: altboot: Update _wip.bb to 20070323, enabling first Neo1973 aka fic-gta01 support. --- packages/altboot/altboot_wip.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index d857e5b454..9b4f5092cd 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### -WIP_DATE = "20061123" +WIP_DATE = "20070323" PV = "1.1.1+wip-${WIP_DATE}" PR = "r0" @@ -38,7 +38,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=6" S = "${WORKDIR}/${TAG}/" -- cgit v1.2.3 From 8cceec03812e487d023a132f0e6f4ba7dbdbdce0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 23 Mar 2007 23:02:19 +0000 Subject: openmoko-apps: fix description in openmoko-messages --- packages/openmoko-apps/openmoko-messages_svn.bb | 5 +++-- packages/openmoko-apps/openmoko-rssreader_svn.bb | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index d7a708b85c..4411b860a1 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -1,7 +1,8 @@ -DESCRIPTION = "The OpenMoko Application Manager" +DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" -DEPENDS += "ipkg" + PV = "0.0.1+svn${SRCDATE}" +PR = "r1" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb index ea3f6ca50d..aed1ff08d8 100644 --- a/packages/openmoko-apps/openmoko-rssreader_svn.bb +++ b/packages/openmoko-apps/openmoko-rssreader_svn.bb @@ -1,10 +1,9 @@ DESCRIPTION = "The OpenMoko RSS Reader" SECTION = "openmoko/applications" +DEPENDS += "libmrss" PV = "0.0.1+svn${SRCDATE}" PR = "r1" inherit openmoko -DEPENDS += "libmrss" - -- cgit v1.2.3 From 8ecde9c8ec093f6e33a8bf63ed031cc8a390fb79 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 09:33:41 +0000 Subject: mplayer: add optimizations for a780 and hx4700 --- packages/mplayer/mplayer_svn.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index a9d8d0f1ff..886dbb072f 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -167,13 +167,24 @@ EXTRA_OECONF = " \ --disable-runtime-cpudetection \ " +EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2" + +#enable support for the ati imageon series (w100 and w3220) EXTRA_OECONF_append_c7x0 = " --enable-w100 " EXTRA_OECONF_append_hx4700 = " --enable-imageon " -EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2" + +#enable pxa270 overlay support EXTRA_OECONF_append_spitz = " --enable-pxa " +EXTRA_OECONF_append_a780 = " --enable-pxa " +#build with support for the iwmmxt instruction support (pxa270 and up) TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH_spitz = "iwmmxt" +TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_a780 = "iwmmxt" +TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_hx4700= "iwmmxt" + do_configure() { cp ${WORKDIR}/vo_w100.c ${S}/libvo -- cgit v1.2.3 From 8d3e0e6921054399f6e263b8dd81e6d047d6057c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 09:35:55 +0000 Subject: gsm: add default 'default' file --- packages/gsm/files/default | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/gsm/files/default (limited to 'packages') diff --git a/packages/gsm/files/default b/packages/gsm/files/default new file mode 100644 index 0000000000..161c97f5fb --- /dev/null +++ b/packages/gsm/files/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +#GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +#GSM_DEV="/dev/ttyS1" -- cgit v1.2.3 From eda1cd8de4efb77de391963e3238c534bd5724af Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 09:39:44 +0000 Subject: task-openmoko: remove some duplication with task-base and add sms and rss app --- packages/tasks/task-openmoko.bb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index cad921020e..dc4c7dcb0f 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r30" +PR = "r31" PACKAGES = "\ task-openmoko-linux \ @@ -29,21 +29,9 @@ RDEPENDS_task-openmoko-everything := "${PACKAGES}" DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services" RDEPENDS_task-openmoko-linux = "\ task-base \ - base-files \ - base-passwd \ - busybox \ - dropbear \ - fuser \ - initscripts \ - netbase \ sysfsutils \ - setserial \ - sysvinit \ - sysvinit-pidof \ - tinylogin \ modutils-initscripts \ module-init-tools-depmod \ - udev \ rsync \ # update-alternatives \ " @@ -167,6 +155,9 @@ RDEPENDS_task-openmoko-demo = "\ openmoko-panel-demo-simple \ openmoko-panel-gsm \ openmoko-panel-mainmenu \ + openmoko-rssreader \ + openmoko-messages \ + openmoko-today \ xcursor-transparent-theme \ web \ rxvt-unicode \ -- cgit v1.2.3 From 91af788b8040fa8aae027ad7da2790d19db3fda3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 14:47:16 +0000 Subject: bluez-utils: enable cups backend and package it seperately so only bluez-cups-backend depends on cups at runtime --- packages/bluez/bluez-utils.inc | 9 ++++--- packages/bluez/bluez-utils_3.7.bb | 56 +++++++++++++++++++++++++++++++++++++++ packages/bluez/bluez-utils_3.9.bb | 2 +- 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 packages/bluez/bluez-utils_3.7.bb (limited to 'packages') diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index a22431eaf9..eb4425d650 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." SECTION = "console" PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" +DEPENDS = "bluez-libs-${PV} dbus cups" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" RREPLACES = "bluez-utils-dbus" @@ -20,7 +20,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" S = "${WORKDIR}/bluez-utils-${PV}" -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-cups" # --enable-obex enable OBEX support # --enable-alsa enable ALSA support # --enable-cups install CUPS backend support @@ -48,7 +48,10 @@ do_install_append() { CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ ${sysconfdir}/default/bluetooth" -PACKAGES =+ "${PN}-ciptool" +PACKAGES =+ "${PN}-ciptool bluez-cups-backend" FILES_${PN}-ciptool = "/bin/ciptool" RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb new file mode 100644 index 0000000000..3dbaa030c1 --- /dev/null +++ b/packages/bluez/bluez-utils_3.7.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex" +PROVIDES = "bluez-utils-dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" +LICENSE = "GPL" +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 +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + 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 \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool bluez-cups-backend" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index 36410ee2ec..dce6648afe 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1,3 +1,3 @@ require bluez-utils.inc -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 4c83c9f064e16f78e6ab01e874a0dcea541856a1 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 24 Mar 2007 17:34:42 +0000 Subject: altboot: Replace rev= with proto=svn.... and update altboot_0.0.0.bb to latest svn --- packages/altboot/altboot_0.0.0.bb | 8 ++- packages/altboot/altboot_1.0.5.bb | 2 +- packages/altboot/altboot_1.0.8.bb | 2 +- packages/altboot/altboot_wip.bb | 2 +- packages/altboot/files/altboot-menu/10-noGui | 2 + .../files/altboot-menu/Advanced/70-install-tgz | 2 + packages/altboot/files/init.altboot | 73 +++++++++++++--------- 7 files changed, 56 insertions(+), 35 deletions(-) (limited to 'packages') diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 31aaeb3e7a..930a30c1ac 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -8,6 +8,7 @@ DESCRIPTION = "The altboot bootmanager" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" LICENSE = "GPL" +INHIBIT_PACKAGE_STRIP = "1" ###################################################################################### @@ -24,7 +25,7 @@ RDEPENDS_${PN}_fic-gta01 = "${PN}-conf kernel-module-ext2 kernel-module-loop ker ###################################################################################### -PR = "r51" +PR = "r52" ###################################################################################### @@ -68,7 +69,10 @@ do_install() { install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + if test -d ${WORKDIR}/altboot-menu/Advanced + then + install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index f70edc19b6..3a8a0a74b7 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -20,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=4" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index a83d2b5d16..aed66b47a8 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -34,7 +34,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index 9b4f5092cd..37a8b5f9dd 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -38,7 +38,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=6" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/files/altboot-menu/10-noGui b/packages/altboot/files/altboot-menu/10-noGui index 57141d498d..cf3c10c381 100644 --- a/packages/altboot/files/altboot-menu/10-noGui +++ b/packages/altboot/files/altboot-menu/10-noGui @@ -1,6 +1,8 @@ # !/bin/sh M_TITLE="Don't launch GUI" +test "$DISABLE_NOGUI_BOOT" = yes && exit 0 + run_module() { clear ; exec $REAL_INIT "$NO_GUI_RL" diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index aca0d047c6..b6e5d94d5d 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -2,6 +2,8 @@ M_TITLE="Install RootFS from tar.gz" M_FLAGS="noRemember" +test "$DISABLE_INSTTGZ_BOOT" = yes && exit 0 + run_module(){ test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 5eb6122a2a..30868024b8 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -20,12 +20,6 @@ test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5 # If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...) OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1" -if test -z "$OUT_TTY" -then - OUT_TTY="/dev/tty1" - echo "WARNING: Assgnment of OUT_TTY failed!" > "$OUT_TTY" -fi - if ( echo "$OUT_TTY" | grep -q "not" ) then OUT_TTY="/dev/tty1" @@ -47,7 +41,7 @@ then rm "${ALTBOOT_CFG_FILE}.next-reboot" fi -test "$ENABLE_DEBUGGING" = "yes" && ENABLE_DEBUG="yes" +ENABLE_DEBUG="$ENABLE_DEBUGGING" C_RED="\033[31m" C_YELLOW="\033[33m" @@ -81,10 +75,9 @@ debug_shell() { show_menu() { test -z "$1" && die "DEBUG: Parameter 1 is empty in show_menu" ! test -d "$1" && die "show_menu: [$1] not found or no directory." - + echo "" - echo -e "altboot v$VERSION\n" - + echo -e "altboot v$VERSION\n" m_entry="" @@ -93,6 +86,7 @@ show_menu() { cnt=0 ; reset_pref "menu_filelist" for file in `ls -1` do +# debug_echo "show_menu(): file = [$file]" if ! test -d "$1/$file" then # NOTE: It is important to use "." here so that the script inherits @@ -165,11 +159,7 @@ show_menu() { fi done - echo "" - -# export_pref "$menu_filelist" /tmp/menu_filelist.cache -# export_pref "$menu_fileflags" /tmp/menu_fileflags.cache - + echo "" } # This function is used to display the content of directories below @@ -178,11 +168,7 @@ show_sub_menu() { dirname="`basename "$1"`" d_entries="`dump_pref "menu_filelist" | grep "$dirname/"`" - - #dump_pref "menu_filelist" - #dump_pref "menu_fileflags" - #echo "[$d_entries]" - + echo -e "\naltboot v$VERSION: $dirname menu\n" for d_entry in $d_entries @@ -190,11 +176,7 @@ show_sub_menu() { d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`" d_entry_file="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\2/p"`" d_entry_title="`$d_entry_file title`" - -# echo "number: [$d_entry_number]" -# echo "file: [$d_entry_file]" -# echo "title: [$d_entry_title]" - + echo -e "\t\t[$d_entry_number] $d_entry_title" done @@ -231,7 +213,7 @@ get_kbd_ints(){ # Shows the timer and sets $launch_altboot to yes if a keypress was detected run_timer() { - if test "$TIMEOUT" != 0 + if test "$TIMEOUT" != 0 -a "$TIMEOUT" != "[none]" then mount -t proc proc /proc >/dev/null 2>&1 @@ -278,6 +260,17 @@ run_timer() { else launch_altboot=yes fi + + if test "$TIMEOUT" = "[none]" + then + echo "" + echo -e "altboot v$VERSION ($MACHINE)\n" + + echo "NOTE: The menu is not available on this device" + echo "Use \"set-bootdev\" to change the boot device" + + launch_altboot=no + fi } # $1 = ID @@ -313,7 +306,7 @@ launch_selection() { file="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\1/p"`" test -z "$file" && file="$file_" - #echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" +# debug_echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" # The selected menu-item points to a directory if test "$type" = DIR @@ -494,10 +487,29 @@ fi # Note: this is positively ugly. If someone knows a better way to detect whether # we are already booted into a runlevel _without_ reading /var and / or using `runlevel` # PLEASE let me know. +# +# The NSLU2 is an exception as it uses the way-ugly busybox "ps" +# + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" -if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1" != "+force" +case "$MACHINE" in + *NSLU2) if test -f /proc/cmdline -a "`ps |wc -l|tr -d " "`" -gt 25 -a "$1" != "-force" -a "$1" != "+force" + then + user_called=1 + fi + ;; + + *) if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1"!= "+force" >/dev/null 2>&1 + then + user_called=1 + fi + ;; +esac + +if test "$user_called" = "1" then - echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >"$OUT_TTY" + echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY" exec $REAL_INIT $* # exec $SH_SHELL /dev/tty0 2>&1 exit 0 @@ -543,7 +555,8 @@ else echo "Booting last selection: [$last_selection]" >"$OUT_TTY" # Set up the wanna-be array of available menu entries and their numbers - show_menu /etc/altboot-menu >/dev/null + show_menu /etc/altboot-menu >/dev/null 2>&1 + junk="$last_selection" launch_selection /etc/altboot-menu >"$OUT_TTY" fi -- cgit v1.2.3 From e06636078b375d497bba32b0a8b29394f8b21aaa Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 24 Mar 2007 04:47:35 +0000 Subject: gpstk: Open source libraries and applications to facilitate working with GPS data for research and high accuracy uses. --- packages/gpstk/.mtn2git_empty | 0 packages/gpstk/files/.mtn2git_empty | 0 packages/gpstk/files/configure.patch | 10 ++++++++++ packages/gpstk/gpstk_1.2.bb | 13 +++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 packages/gpstk/.mtn2git_empty create mode 100644 packages/gpstk/files/.mtn2git_empty create mode 100644 packages/gpstk/files/configure.patch create mode 100644 packages/gpstk/gpstk_1.2.bb (limited to 'packages') diff --git a/packages/gpstk/.mtn2git_empty b/packages/gpstk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpstk/files/.mtn2git_empty b/packages/gpstk/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpstk/files/configure.patch b/packages/gpstk/files/configure.patch new file mode 100644 index 0000000000..b975512131 --- /dev/null +++ b/packages/gpstk/files/configure.patch @@ -0,0 +1,10 @@ +--- gpstk-1.2/configure.ac~ 2006-12-21 06:59:41.000000000 +1030 ++++ gpstk-1.2/configure.ac 2007-03-24 14:59:42.000000000 +1030 +@@ -53,6 +53,7 @@ + apps/ionosphere/Makefile + apps/MDPtools/Makefile + apps/mergetools/Makefile ++ apps/multipath/Makefile + apps/reszilla/Makefile + apps/time/Makefile + apps/positioning/Makefile diff --git a/packages/gpstk/gpstk_1.2.bb b/packages/gpstk/gpstk_1.2.bb new file mode 100644 index 0000000000..8d13b5f225 --- /dev/null +++ b/packages/gpstk/gpstk_1.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Libraries and applications to facilitate working with GPS data for research and high accuracy uses." +HOMEPAGE = "http://www.gpstk.org/" +LICENSE = "LGPL" +SECTION = "libs" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \ + file://configure.patch;patch=1" + +inherit autotools lib_package + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 8ece62c5b6636aff97af5933fd5b16494d4dad25 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 24 Mar 2007 09:51:08 +0000 Subject: openmoko-today: Added missing eds-dbus build time dependency. --- packages/openmoko-pim/openmoko-today_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb index 8eb098bebb..74e79b85f1 100644 --- a/packages/openmoko-pim/openmoko-today_svn.bb +++ b/packages/openmoko-pim/openmoko-today_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko Today application." SECTION = "openmoko/pim" LICENSE = "GPL" -DEPENDS = "openmoko-libs" +DEPENDS = "openmoko-libs eds-dbus" PV = "0.1+svn${SRCDATE}" inherit autotools pkgconfig gtk-icon-cache openmoko -- cgit v1.2.3 From 683486ef28c1a8413b027c36daaff85005653d9f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Mar 2007 09:26:46 +0000 Subject: gpstk: add a custom do_install * the autotools based system doesn't build everything * only a static libgpstk is created * somehow strip fails, leaving us with a 9.5MB big gpstk-bin package --- packages/gpstk/gpstk_1.2.bb | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'packages') diff --git a/packages/gpstk/gpstk_1.2.bb b/packages/gpstk/gpstk_1.2.bb index 8d13b5f225..64ed3e025f 100644 --- a/packages/gpstk/gpstk_1.2.bb +++ b/packages/gpstk/gpstk_1.2.bb @@ -3,11 +3,70 @@ HOMEPAGE = "http://www.gpstk.org/" LICENSE = "LGPL" SECTION = "libs" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \ file://configure.patch;patch=1" inherit autotools lib_package +EXTRA_OECONF = "--enable-shared" + do_stage() { autotools_stage_all } + + +# This is a handcrafted do_install because 'make install' isn't working. +# This should install the same files as my native (x86) jam based build, but doesn't since the Makefiles +# aren't up to date (e.g. bc2sp3 is missing). +# Koen - 20070325 +do_install() { + +install -d ${D}${bindir} +install -d ${D}${libdir} +install -d ${D}${includedir}/ + +for i in bc2sp3 calgps DDBase ddmerge DiscFix EditRinex ephdiff example1 example2 example3 example4 example5 \ + fic2rin ficacheck ficafic ficcheck ficdiff ficfica findMoreThan12 IonoBias mergeFIC mergeRinMet \ + mergeRinNav mergeRinObs mergeSRI mkord mpsolve navdmp NavMerge novaRinex ordClock ordEdit ordGen \ + ordLinEs ordPlot ordStats poscvt posInterp PRSolve ResCor resplot reszilla RinexDump rinexpvt \ + rinexthin RinSum rmwcheck rmwdiff rnwcheck rnwdiff rowcheck rowdiff rstats rtAshtech sp3version \ + TECMaps timeconvert tnl tsrif tsrifsu tsriftu vecsol wheresat + do install -m 755 `find . -name $i` ${D}${bindir}/ || true +done + cp -pPr src/.libs/libgps* ${D}${libdir}/ + +for i in AlmanacStore.hpp AlmOrbit.hpp ANSITime.hpp Bancroft.hpp BasicFramework.hpp BCEphemerisStore.hpp \ + BinexData.hpp BinexFilterOperators.hpp BinexStream.hpp BinUtils.hpp BivarStats.hpp CheckPRData.hpp \ + CivilTime.hpp ClockModel.hpp CodeBuffer.hpp CommandOption.hpp CommandOptionParser.hpp \ + CommandOptionWithCommonTimeArg.hpp CommandOptionWithPositionArg.hpp CommandOptionWithTimeArg.hpp \ + CommonTime.hpp convhelp.hpp DayTime.hpp DOP.hpp ECEF.hpp EngAlmanac.hpp EngEphemeris.hpp EngNav.hpp \ + EphemerisRange.hpp EphemerisStore.hpp EpochClockModel.hpp Exception.hpp Expression.hpp ExtractC1.hpp \ + ExtractCombinationData.hpp ExtractD1.hpp ExtractD2.hpp ExtractData.hpp ExtractL1.hpp ExtractL2.hpp \ + ExtractLC.hpp ExtractP1.hpp ExtractP2.hpp ExtractPC.hpp FFBinaryStream.hpp FFData.hpp FFStreamError.hpp \ + FFStream.hpp FFTextStream.hpp FICAStream.hpp FICBase.hpp FICData109.hpp FICData162.hpp FICData62.hpp \ + FICData9.hpp FICData.hpp FICFilterOperators.hpp FICHeader.hpp FICStreamBase.hpp FICStream.hpp \ + FileFilterFrame.hpp FileFilterFrameWithHeader.hpp FileFilter.hpp FileHunter.hpp FileSpec.hpp \ + FileStore.hpp FileUtils.hpp GenXSequence.hpp Geodetic.hpp GeoidModel.hpp geometry.hpp getopt.h \ + gps_constants.hpp GPSEpochWeekSecond.hpp GPSGeoid.hpp gpstkplatform.h GPSWeekSecond.hpp GPSWeekZcount.hpp \ + GPSZcount29.hpp GPSZcount32.hpp GPSZcount.hpp icd_200_constants.hpp IonoModel.hpp IonoModelStore.hpp \ + JulianDate.hpp LinearClockModel.hpp LoopedFramework.hpp MathBase.hpp MatrixBase.hpp \ + MatrixBaseOperators.hpp MatrixFunctors.hpp Matrix.hpp MatrixImplementation.hpp MatrixOperators.hpp \ + mergePCodeWords.h MiscMath.hpp MJD.hpp ModeledPR.hpp ModeledPseudorangeBase.hpp ModeledReferencePR.hpp \ + MOPSWeight.hpp MSCData.hpp MSCStream.hpp ObsClockModel.hpp ObsEpochMap.hpp ObsID.hpp ObsRngDev.hpp \ + ORDEpoch.hpp PCodeConst.hpp PolyFit.hpp Position.hpp PRSolution.hpp RACRotation.hpp \ + RinexEphemerisStore.hpp RinexMetBase.hpp RinexMetData.hpp RinexMetFilterOperators.hpp \ + RinexMetHeader.hpp RinexMetStream.hpp RinexNavBase.hpp RinexNavData.hpp RinexNavFilterOperators.hpp \ + RinexNavHeader.hpp RinexNavStream.hpp RinexObsBase.hpp RinexObsData.hpp RinexObsFilterOperators.hpp \ + RinexObsHeader.hpp RinexObsID.hpp RinexObsStream.hpp RinexSatID.hpp RinexUtilities.hpp RTFileFrame.hpp \ + RungeKutta4.hpp SatID.hpp SimpleIURAWeight.hpp SMODFData.hpp SMODFStream.hpp SolverBase.hpp SolverLMS.hpp \ + SolverWMS.hpp SP3Base.hpp SP3Data.hpp SP3EphemerisStore.hpp SP3Header.hpp SP3SatID.hpp SP3Stream.hpp \ + Stats.hpp stl_helpers.hpp StringUtils.hpp SVExclusionList.hpp SVPCodeGen.hpp SystemTime.hpp \ + TabularEphemerisStore.hpp TimeConstants.hpp TimeConverters.hpp TimeString.hpp TimeTag.hpp Triple.hpp \ + TropModel.hpp UnixTime.hpp ValidType.hpp VectorBase.hpp VectorBaseOperators.hpp \ + Vector.hpp VectorOperators.hpp WeightBase.hpp WGS84Geoid.hpp WxObsMap.hpp X1Sequence.hpp \ + X2Sequence.hpp Xvt.hpp YDSTime.hpp + do install -m 644 `find . -name $i` ${D}${includedir}/ || true +done +} -- cgit v1.2.3 From 36085720c44a9ecdc149d3dcb214a08992d8b7c5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 00:34:32 +0000 Subject: slugos-packages: Added upslug2, devio and slugimage --- packages/meta/slugos-packages.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index a69db4f173..41ddc79e8d 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r28" +PR = "r29" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -47,6 +47,7 @@ SLUGOS_PACKAGES = "\ cyrus-imapd \ cyrus-sasl \ db \ + devio \ devlabel \ diffstat \ diffutils \ @@ -154,6 +155,7 @@ SLUGOS_PACKAGES = "\ setpwc \ setserial \ sipsak \ + slugimage \ smartmontools \ ssmtp \ strace \ @@ -165,6 +167,7 @@ SLUGOS_PACKAGES = "\ tiff \ tzdata \ unzip \ + upslug2 \ usbutils \ util-linux \ vim \ -- cgit v1.2.3 From 65adc5f0c8da5f9fee2e226926ef82bbb4befe70 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 10:58:58 +0000 Subject: haserl: Add package haserl --- packages/haserl/.mtn2git_empty | 0 packages/haserl/haserl_0.8.0.bb | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 packages/haserl/.mtn2git_empty create mode 100644 packages/haserl/haserl_0.8.0.bb (limited to 'packages') diff --git a/packages/haserl/.mtn2git_empty b/packages/haserl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb new file mode 100644 index 0000000000..4df013a5ef --- /dev/null +++ b/packages/haserl/haserl_0.8.0.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "A cgi wrapper for embedding shell scripts into html documents" +SECTION = "console/network" +DEPENDS = "" +PR = "r0" +LICENSE = "GPL" + +SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/haserl/haserl-0.8.0.tar.gz" + +inherit autotools gettext -- cgit v1.2.3 From 60b031c351624fae9d511eb50b8cd7c5aac860b9 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 11:43:24 +0000 Subject: haserl: Fix SRC_URI --- packages/haserl/haserl_0.8.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb index 4df013a5ef..3011e6329a 100644 --- a/packages/haserl/haserl_0.8.0.bb +++ b/packages/haserl/haserl_0.8.0.bb @@ -4,6 +4,6 @@ DEPENDS = "" PR = "r0" LICENSE = "GPL" -SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/haserl/haserl-0.8.0.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/haserl/haserl-${PV}.tar.gz" inherit autotools gettext -- cgit v1.2.3 From fe305985f767faee287b00e7f818b338c7889dcf Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 11:58:52 +0000 Subject: haserl: Correct my SRC_URI-commit --- packages/haserl/haserl_0.8.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb index 3011e6329a..ba10060c9c 100644 --- a/packages/haserl/haserl_0.8.0.bb +++ b/packages/haserl/haserl_0.8.0.bb @@ -4,6 +4,6 @@ DEPENDS = "" PR = "r0" LICENSE = "GPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/haserl/haserl-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" inherit autotools gettext -- cgit v1.2.3 From 905e42a65b6b3a4545da57885a436c58d15d5939 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 15:02:49 +0000 Subject: uboot: Update linkstation uboot --- .../defconfig_linkstationppchd | 500 --------------------- .../defconfig_linkstationppchg | 500 --------------------- .../uboot/u-boot-linkstationppc/defconfig_lsppchd | 500 +++++++++++++++++++++ .../uboot/u-boot-linkstationppc/defconfig_lsppchg | 500 +++++++++++++++++++++ packages/uboot/u-boot-linkstationppc_git.bb | 7 +- 5 files changed, 1004 insertions(+), 1003 deletions(-) delete mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd delete mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg create mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_lsppchd create mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_lsppchg (limited to 'packages') diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd b/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd deleted file mode 100644 index 5919f5eb2c..0000000000 --- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd +++ /dev/null @@ -1,500 +0,0 @@ -/* - * Copyright (C) 2006 Mihai Georgian - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#if 0 -#define DEBUG -#endif - -/*----------------------------------------------------------------------- - * User configurable settings: - * Mandatory settings: - * CONFIG_IPADDR_LS - the IP address of the LinkStation - * CONFIG_SERVERIP_LS - the address of the server for NFS/TFTP/DHCP/BOOTP - * Optional settins: - * CONFIG_NCIP_LS - the adress of the computer running net console - * if not configured, it will be set to - * CONFIG_SERVERIP_LS - */ - -#define CONFIG_IPADDR_LS 192.168.11.150 -#define CONFIG_SERVERIP_LS 192.168.11.149 - -#if !defined(CONFIG_IPADDR_LS) || !defined(CONFIG_SERVERIP_LS) -#error Both CONFIG_IPADDR_LS and CONFIG_SERVERIP_LS must be defined -#endif - -#if !defined(CONFIG_NCIP_LS) -#define CONFIG_NCIP_LS CONFIG_SERVERIP_LS -#endif - -/*---------------------------------------------------------------------- - * DO NOT CHANGE ANYTHING BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING - *---------------------------------------------------------------------*/ - -#define CONFIG_MPC8245 1 -#define CONFIG_LINKSTATION 1 - -/*--------------------------------------- - * Supported models - * - * LinkStation HDLAN /KuroBox Standard (CONFIG_HLAN) - * LinkStation old model (CONFIG_LAN) - totally untested - * LinkStation HGLAN / KuroBox HG (CONFIG_HGLAN) - * - * Models not supported yet - * TeraStatin (CONFIG_HTGL) - */ - -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define CONFIG_IDENT_STRING " LinkStation / KuroBox" -#elif defined(CONFIG_HGLAN) -#define CONFIG_IDENT_STRING " LinkStation HG / KuroBox HG" -#elif defined(CONFIG_HTGL) -#define CONFIG_IDENT_STRING " TeraStation" -#else -#error No LinkStation model defined -#endif - -#define CONFIG_BOOTDELAY 10 -#define CONFIG_ZERO_BOOTDELAY_CHECK -#undef CONFIG_BOOT_RETRY_TIME - -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..." -#define CONFIG_AUTOBOOT_STOP_STR "s" - -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_LOADS | \ - CFG_CMD_LOADB | \ - CFG_CMD_FLASH | \ - CFG_CMD_MEMORY | \ - CFG_CMD_NET | \ - CFG_CMD_ENV | \ - CFG_CMD_IDE | \ - CFG_CMD_PCI | \ - CFG_CMD_BOOTD | \ - CFG_CMD_CONSOLE | \ - CFG_CMD_RUN | \ - CFG_CMD_ECHO | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_NFS | \ - CFG_CMD_EXT2 ) -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL - -#define CONFIG_OF_FLAT_TREE 1 - -#ifdef CONFIG_OF_FLAT_TREE -#define OF_CPU "PowerPC,603e" -#define OF_SOC "soc10x@80000000" -#define OF_STDOUT_PATH "/soc10x/serial@80004600" -#endif - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include - -/* - * Miscellaneous configurable options - */ -#define CFG_LONGHELP /* undef to save memory */ -#define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ - -#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) -#define CFG_MAXARGS 16 /* Max number of command args */ -#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -#define CFG_LOAD_ADDR 0x00800000 /* Default load address: 8 MB */ - -//#define CONFIG_BOOTCOMMAND "run nfsboot" -#define CONFIG_BOOTCOMMAND "run bootcmd1" -#define CONFIG_BOOTARGS "root=/dev/sda1 netconsole=6666@192.168.11.150/,@192.168.11.149/ rtc-rs5c372.probe=0,0x32" -#define CONFIG_NFSBOOTCOMMAND "bootp;run nfsargs;bootm" - -#define CFG_CONSOLE_IS_IN_ENV - -#define XMK_STR(x) #x -#define MK_STR(x) XMK_STR(x) - -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define UBFILE "share/u-boot/u-boot-hd.flash.bin" -#elif defined(CONFIG_HGLAN) -#define UBFILE "share/u-boot/u-boot-hg.flash.bin" -#elif defined(CONFIG_HTGL) -#define UBFILE "share/u-boot/u-boot-ht.flash.bin" -#else -#error No LinkStation model defined -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "autoload=no\0" \ - "stdin=nc\0" \ - "stdout=nc\0" \ - "stderr=nc\0" \ - "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0" \ - "netmask=255.255.255.0\0" \ - "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0" \ - "ncip="MK_STR(CONFIG_NCIP_LS)"\0" \ - "netretry=no\0" \ - "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0" \ - "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0" \ - "ldaddr=800000\0" \ - "hdpart=0:1\0" \ - "hdfile=boot/uImage\0" \ - "hdload=echo Loading ${hdpart}:${hdfile};ext2load ide ${hdpart} ${ldaddr} ${hdfile};ext2load ide ${hdpart} 7f0000 boot/kuroboxHD.dtb\0" \ - "boothd=setenv bootargs " CONFIG_BOOTARGS ";bootm ${ldaddr} - 7f0000\0" \ - "hdboot=run hdload boothd\0" \ - "flboot=setenv bootargs root=/dev/hda1;bootm ffc00000\0" \ - "emboot=setenv bootargs root=/dev/ram0;bootm ffc00000\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \ - "bootretry=30\0" \ - "bootcmd1=run hdboot;run flboot\0" \ - "bootcmd2=run flboot\0" \ - "bootcmd3=run emboot\0" \ - "writeng=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4e474e47 1;cp.b 800000 fff70000 4\0" \ - "writeok=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4f4b4f4b 1;cp.b 800000 fff70000 4\0" \ - "ubpart=0:1\0" \ - "ubfile="UBFILE"\0" \ - "ubload=echo Loading ${ubpart}:${ubfile};ext2load ide ${ubpart} ${ldaddr} ${ubfile}\0" \ - "ubsaddr=fff00000\0" \ - "ubeaddr=fff2ffff\0" \ - "ubflash=protect off ${ubsaddr} ${ubeaddr};era ${ubsaddr} ${ubeaddr};cp.b ${ldaddr} ${ubsaddr} ${filesize};cmp.b ${ldaddr} ${ubsaddr} ${filesize}\0" \ - "upgrade=run ubload ubflash\0" - -/*----------------------------------------------------------------------- - * PCI stuff - */ -#define CONFIG_PCI -#undef CONFIG_PCI_PNP -#define CONFIG_PCI_SCAN_SHOW - -#ifndef CONFIG_PCI_PNP -/* Keep the following defines in sync with the BAT mappings */ - -#define PCI_ETH_IOADDR 0xbfff00 -#define PCI_ETH_MEMADDR 0xbffffc00 -#define PCI_IDE_IOADDR 0xbffed0 -#define PCI_IDE_MEMADDR 0xbffffb00 -#define PCI_USB0_IOADDR 0 -#define PCI_USB0_MEMADDR 0xbfffe000 -#define PCI_USB1_IOADDR 0 -#define PCI_USB1_MEMADDR 0xbfffd000 -#define PCI_USB2_IOADDR 0 -#define PCI_USB2_MEMADDR 0xbfffcf00 - -#endif - -/*----------------------------------------------------------------------- - * Ethernet stuff - */ -#define CONFIG_NET_MULTI - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) -#define CONFIG_TULIP -#define CONFIG_TULIP_USE_IO -#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) -#define CONFIG_RTL8169 -#endif - -#define CONFIG_NET_RETRY_COUNT 5 - -#define CONFIG_NETCONSOLE - -/*----------------------------------------------------------------------- - * Start addresses for the final memory configuration - * (Set up by the startup code) - * Please note that CFG_SDRAM_BASE _must_ start at 0 - */ -#define CFG_SDRAM_BASE 0x00000000 - -#define CFG_FLASH_BASE 0xFFC00000 -#define CFG_MONITOR_BASE TEXT_BASE - -#define CFG_RESET_ADDRESS 0xFFF00100 -#define CFG_EUMB_ADDR 0x80000000 -#define CFG_PCI_MEM_ADDR 0xB0000000 -#define CFG_MISC_REGION_ADDR 0xFE000000 - -#define CFG_MONITOR_LEN 0x00040000 /* 256 kB */ -#define CFG_MALLOC_LEN (512 << 10) /* Reserve some kB for malloc() */ - -#define CFG_MEMTEST_START 0x00100000 /* memtest works on */ -#define CFG_MEMTEST_END 0x00800000 /* 1M ... 8M in DRAM */ - -/* Maximum amount of RAM */ -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define CFG_MAX_RAM_SIZE 0x04000000 /* 64MB of SDRAM */ -#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) -#define CFG_MAX_RAM_SIZE 0x08000000 /* 128MB of SDRAM */ -#else -#error Unknown LinkStation type -#endif - -/*----------------------------------------------------------------------- - * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build - * - * RAM based builds are for testing purposes. A Linux module, uloader.o, - * exists to load U-Boot and pass control to it - * - * Always do "make clean" after changing the build type - */ -#if CFG_MONITOR_BASE < CFG_FLASH_BASE -#define CFG_RAMBOOT -#endif - -/*----------------------------------------------------------------------- - * Definitions for initial stack pointer and data area - */ -#if 1 /* RAM is available when the first C function is called */ -#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) -#else -#define CFG_INIT_RAM_ADDR 0x40000000 -#endif -#define CFG_INIT_RAM_END 0x1000 -#define CFG_GBL_DATA_SIZE 128 -#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) - -/*---------------------------------------------------------------------- - * Serial configuration - */ -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 57600 -#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -#define CFG_NS16550 -#define CFG_NS16550_SERIAL - -#define CFG_NS16550_REG_SIZE 1 - -#define CFG_NS16550_CLK get_bus_freq(0) - -#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ -#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ - -/* - * Low Level Configuration Settings - * (address mappings, register initial values, etc.) - * You should know what you are doing if you make changes here. - * For the detail description refer to the MPC8245 user's manual. - * - * Unless indicated otherwise, the values are - * taken from the orignal Linkstation boot code - * - * Most of the low level configuration setttings are normally used - * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. - * Low level initialisation is done in board/linkstation/early_init.S - * The values below are included for reference purpose only - */ - -/* FIXME: 32.768 MHz is the crystal frequency but */ -/* the real frequency is lower by about 0.75% */ -#define CONFIG_SYS_CLK_FREQ 32768000 -#define CFG_HZ 1000 - -/* Bit-field values for MCCR1. */ -#define CFG_ROMNAL 0 -#define CFG_ROMFAL 11 - -#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ -#define CFG_BANK1_ROW 0 -#define CFG_BANK2_ROW 0 -#define CFG_BANK3_ROW 0 -#define CFG_BANK4_ROW 0 -#define CFG_BANK5_ROW 0 -#define CFG_BANK6_ROW 0 -#define CFG_BANK7_ROW 0 - -/* Bit-field values for MCCR2. */ -#define CFG_TSWAIT 0 -#define CFG_REFINT 1400 - -/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ -#define CFG_BSTOPRE 121 - -/* Bit-field values for MCCR3. */ -#define CFG_REFREC 7 - -/* Bit-field values for MCCR4. */ -#define CFG_PRETOACT 2 -#define CFG_ACTTOPRE 5 /* Original value was 2 */ -#define CFG_ACTORW 2 -#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ -#define CFG_REGISTERD_TYPE_BUFFER 1 -#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ -#define CFG_REGDIMM 0 -#define CFG_DBUS_SIZE2 1 -#define CFG_SDMODE_WRAP 0 - -#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ -#define CFG_SDRAM_DSCD 0x30 - -/* Memory bank settings. - * Only bits 20-29 are actually used from these vales to set the - * start/end addresses. The upper two bits will always be 0, and the lower - * 20 bits will be 0x00000 for a start address, or 0xfffff for an end - * address. Refer to the MPC8240 book. - */ - -#define CFG_BANK0_START 0x00000000 -#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) -#define CFG_BANK0_ENABLE 1 -#define CFG_BANK1_START 0x3ff00000 -#define CFG_BANK1_END 0x3fffffff -#define CFG_BANK1_ENABLE 0 -#define CFG_BANK2_START 0x3ff00000 -#define CFG_BANK2_END 0x3fffffff -#define CFG_BANK2_ENABLE 0 -#define CFG_BANK3_START 0x3ff00000 -#define CFG_BANK3_END 0x3fffffff -#define CFG_BANK3_ENABLE 0 -#define CFG_BANK4_START 0x3ff00000 -#define CFG_BANK4_END 0x3fffffff -#define CFG_BANK4_ENABLE 0 -#define CFG_BANK5_START 0x3ff00000 -#define CFG_BANK5_END 0x3fffffff -#define CFG_BANK5_ENABLE 0 -#define CFG_BANK6_START 0x3ff00000 -#define CFG_BANK6_END 0x3fffffff -#define CFG_BANK6_ENABLE 0 -#define CFG_BANK7_START 0x3ff00000 -#define CFG_BANK7_END 0x3fffffff -#define CFG_BANK7_ENABLE 0 - -#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ - -/*---------------------------------------------------------------------- - * Initial BAT mappings - */ - -/* NOTES: - * 1) GUARDED and WRITETHROUGH not allowed in IBATS - * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT - */ - -/* SDRAM */ -#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) -#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) - -#define CFG_DBAT0L CFG_IBAT0L -#define CFG_DBAT0U CFG_IBAT0U - -/* EUMB: 1MB of address space */ -#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) - -#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT1U CFG_IBAT1U - -/* PCI Mem: 256MB of address space */ -#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT2U CFG_IBAT2U - -/* PCI and local ROM/Flash: last 32MB of address space */ -#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) - -#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT3U CFG_IBAT3U - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - * - * FIXME: This doesn't appear to be true for the newer kernels - * which map more that 8 MB - */ -#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ - -/*----------------------------------------------------------------------- - * FLASH organization - */ -#undef CFG_FLASH_PROTECTION -#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ -#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ - -#define CFG_FLASH_ERASE_TOUT 12000 -#define CFG_FLASH_WRITE_TOUT 1000 - - -#define CFG_ENV_IS_IN_FLASH -/* - * The original LinkStation flash organisation uses - * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader - * We use the last sector of this area to store the environment - * which leaves max. 384 kB for the U-Boot itself - */ -#define CFG_ENV_ADDR 0xFFF60000 -#define CFG_ENV_SIZE 0x00010000 -#define CFG_ENV_SECT_SIZE 0x00010000 - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ -#endif - -/*----------------------------------------------------------------------- - * IDE/ATA definitions - */ -#undef CONFIG_IDE_LED /* No IDE LED */ -#define CONFIG_IDE_RESET /* no reset for ide supported */ -#define CONFIG_IDE_PREINIT /* check for units */ -#define CONFIG_LBA48 /* 48 bit LBA supported */ - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) -#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ -#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ -#elif defined(CONFIG_HGTL) -#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ -#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ -#else -#error Config IDE: Unknown LinkStation type -#endif - -#define CFG_ATA_BASE_ADDR 0 - -#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ -#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ -#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ - -/*----------------------------------------------------------------------- - * Partitions and file system - */ -#define CONFIG_DOS_PARTITION - -/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -#endif /* __CONFIG_H */ - -/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg b/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg deleted file mode 100644 index b9943b4c76..0000000000 --- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg +++ /dev/null @@ -1,500 +0,0 @@ -/* - * Copyright (C) 2006 Mihai Georgian - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#if 0 -#define DEBUG -#endif - -/*----------------------------------------------------------------------- - * User configurable settings: - * Mandatory settings: - * CONFIG_IPADDR_LS - the IP address of the LinkStation - * CONFIG_SERVERIP_LS - the address of the server for NFS/TFTP/DHCP/BOOTP - * Optional settins: - * CONFIG_NCIP_LS - the adress of the computer running net console - * if not configured, it will be set to - * CONFIG_SERVERIP_LS - */ - -#define CONFIG_IPADDR_LS 192.168.11.150 -#define CONFIG_SERVERIP_LS 192.168.11.149 - -#if !defined(CONFIG_IPADDR_LS) || !defined(CONFIG_SERVERIP_LS) -#error Both CONFIG_IPADDR_LS and CONFIG_SERVERIP_LS must be defined -#endif - -#if !defined(CONFIG_NCIP_LS) -#define CONFIG_NCIP_LS CONFIG_SERVERIP_LS -#endif - -/*---------------------------------------------------------------------- - * DO NOT CHANGE ANYTHING BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING - *---------------------------------------------------------------------*/ - -#define CONFIG_MPC8245 1 -#define CONFIG_LINKSTATION 1 - -/*--------------------------------------- - * Supported models - * - * LinkStation HDLAN /KuroBox Standard (CONFIG_HLAN) - * LinkStation old model (CONFIG_LAN) - totally untested - * LinkStation HGLAN / KuroBox HG (CONFIG_HGLAN) - * - * Models not supported yet - * TeraStatin (CONFIG_HTGL) - */ - -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define CONFIG_IDENT_STRING " LinkStation / KuroBox" -#elif defined(CONFIG_HGLAN) -#define CONFIG_IDENT_STRING " LinkStation HG / KuroBox HG" -#elif defined(CONFIG_HTGL) -#define CONFIG_IDENT_STRING " TeraStation" -#else -#error No LinkStation model defined -#endif - -#define CONFIG_BOOTDELAY 10 -#define CONFIG_ZERO_BOOTDELAY_CHECK -#undef CONFIG_BOOT_RETRY_TIME - -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..." -#define CONFIG_AUTOBOOT_STOP_STR "s" - -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_LOADS | \ - CFG_CMD_LOADB | \ - CFG_CMD_FLASH | \ - CFG_CMD_MEMORY | \ - CFG_CMD_NET | \ - CFG_CMD_ENV | \ - CFG_CMD_IDE | \ - CFG_CMD_PCI | \ - CFG_CMD_BOOTD | \ - CFG_CMD_CONSOLE | \ - CFG_CMD_RUN | \ - CFG_CMD_ECHO | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_NFS | \ - CFG_CMD_EXT2 ) -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL - -#define CONFIG_OF_FLAT_TREE 1 - -#ifdef CONFIG_OF_FLAT_TREE -#define OF_CPU "PowerPC,603e" -#define OF_SOC "soc10x@80000000" -#define OF_STDOUT_PATH "/soc10x/serial@80004600" -#endif - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include - -/* - * Miscellaneous configurable options - */ -#define CFG_LONGHELP /* undef to save memory */ -#define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ - -#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) -#define CFG_MAXARGS 16 /* Max number of command args */ -#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -#define CFG_LOAD_ADDR 0x00800000 /* Default load address: 8 MB */ - -//#define CONFIG_BOOTCOMMAND "run nfsboot" -#define CONFIG_BOOTCOMMAND "run bootcmd1" -#define CONFIG_BOOTARGS "root=/dev/sda1 netconsole=6666@192.168.11.150/,@192.168.11.149/ rtc-rs5c372.probe=0,0x32" -#define CONFIG_NFSBOOTCOMMAND "bootp;run nfsargs;bootm" - -#define CFG_CONSOLE_IS_IN_ENV - -#define XMK_STR(x) #x -#define MK_STR(x) XMK_STR(x) - -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define UBFILE "share/u-boot/u-boot-hd.flash.bin" -#elif defined(CONFIG_HGLAN) -#define UBFILE "share/u-boot/u-boot-hg.flash.bin" -#elif defined(CONFIG_HTGL) -#define UBFILE "share/u-boot/u-boot-ht.flash.bin" -#else -#error No LinkStation model defined -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "autoload=no\0" \ - "stdin=nc\0" \ - "stdout=nc\0" \ - "stderr=nc\0" \ - "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0" \ - "netmask=255.255.255.0\0" \ - "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0" \ - "ncip="MK_STR(CONFIG_NCIP_LS)"\0" \ - "netretry=no\0" \ - "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0" \ - "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0" \ - "ldaddr=800000\0" \ - "hdpart=0:1\0" \ - "hdfile=boot/uImage\0" \ - "hdload=echo Loading ${hdpart}:${hdfile};ext2load ide ${hdpart} ${ldaddr} ${hdfile};ext2load ide ${hdpart} 7f0000 boot/kuroboxHG.dtb\0" \ - "boothd=setenv bootargs " CONFIG_BOOTARGS ";bootm ${ldaddr} - 7f0000\0" \ - "hdboot=run hdload boothd\0" \ - "flboot=setenv bootargs root=/dev/hda1;bootm ffc00000\0" \ - "emboot=setenv bootargs root=/dev/ram0;bootm ffc00000\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \ - "bootretry=30\0" \ - "bootcmd1=run hdboot;run flboot\0" \ - "bootcmd2=run flboot\0" \ - "bootcmd3=run emboot\0" \ - "writeng=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4e474e47 1;cp.b 800000 fff70000 4\0" \ - "writeok=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4f4b4f4b 1;cp.b 800000 fff70000 4\0" \ - "ubpart=0:1\0" \ - "ubfile="UBFILE"\0" \ - "ubload=echo Loading ${ubpart}:${ubfile};ext2load ide ${ubpart} ${ldaddr} ${ubfile}\0" \ - "ubsaddr=fff00000\0" \ - "ubeaddr=fff2ffff\0" \ - "ubflash=protect off ${ubsaddr} ${ubeaddr};era ${ubsaddr} ${ubeaddr};cp.b ${ldaddr} ${ubsaddr} ${filesize};cmp.b ${ldaddr} ${ubsaddr} ${filesize}\0" \ - "upgrade=run ubload ubflash\0" - -/*----------------------------------------------------------------------- - * PCI stuff - */ -#define CONFIG_PCI -#undef CONFIG_PCI_PNP -#define CONFIG_PCI_SCAN_SHOW - -#ifndef CONFIG_PCI_PNP -/* Keep the following defines in sync with the BAT mappings */ - -#define PCI_ETH_IOADDR 0xbfff00 -#define PCI_ETH_MEMADDR 0xbffffc00 -#define PCI_IDE_IOADDR 0xbffed0 -#define PCI_IDE_MEMADDR 0xbffffb00 -#define PCI_USB0_IOADDR 0 -#define PCI_USB0_MEMADDR 0xbfffe000 -#define PCI_USB1_IOADDR 0 -#define PCI_USB1_MEMADDR 0xbfffd000 -#define PCI_USB2_IOADDR 0 -#define PCI_USB2_MEMADDR 0xbfffcf00 - -#endif - -/*----------------------------------------------------------------------- - * Ethernet stuff - */ -#define CONFIG_NET_MULTI - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) -#define CONFIG_TULIP -#define CONFIG_TULIP_USE_IO -#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) -#define CONFIG_RTL8169 -#endif - -#define CONFIG_NET_RETRY_COUNT 5 - -#define CONFIG_NETCONSOLE - -/*----------------------------------------------------------------------- - * Start addresses for the final memory configuration - * (Set up by the startup code) - * Please note that CFG_SDRAM_BASE _must_ start at 0 - */ -#define CFG_SDRAM_BASE 0x00000000 - -#define CFG_FLASH_BASE 0xFFC00000 -#define CFG_MONITOR_BASE TEXT_BASE - -#define CFG_RESET_ADDRESS 0xFFF00100 -#define CFG_EUMB_ADDR 0x80000000 -#define CFG_PCI_MEM_ADDR 0xB0000000 -#define CFG_MISC_REGION_ADDR 0xFE000000 - -#define CFG_MONITOR_LEN 0x00040000 /* 256 kB */ -#define CFG_MALLOC_LEN (512 << 10) /* Reserve some kB for malloc() */ - -#define CFG_MEMTEST_START 0x00100000 /* memtest works on */ -#define CFG_MEMTEST_END 0x00800000 /* 1M ... 8M in DRAM */ - -/* Maximum amount of RAM */ -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define CFG_MAX_RAM_SIZE 0x04000000 /* 64MB of SDRAM */ -#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) -#define CFG_MAX_RAM_SIZE 0x08000000 /* 128MB of SDRAM */ -#else -#error Unknown LinkStation type -#endif - -/*----------------------------------------------------------------------- - * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build - * - * RAM based builds are for testing purposes. A Linux module, uloader.o, - * exists to load U-Boot and pass control to it - * - * Always do "make clean" after changing the build type - */ -#if CFG_MONITOR_BASE < CFG_FLASH_BASE -#define CFG_RAMBOOT -#endif - -/*----------------------------------------------------------------------- - * Definitions for initial stack pointer and data area - */ -#if 1 /* RAM is available when the first C function is called */ -#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) -#else -#define CFG_INIT_RAM_ADDR 0x40000000 -#endif -#define CFG_INIT_RAM_END 0x1000 -#define CFG_GBL_DATA_SIZE 128 -#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) - -/*---------------------------------------------------------------------- - * Serial configuration - */ -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 57600 -#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -#define CFG_NS16550 -#define CFG_NS16550_SERIAL - -#define CFG_NS16550_REG_SIZE 1 - -#define CFG_NS16550_CLK get_bus_freq(0) - -#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ -#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ - -/* - * Low Level Configuration Settings - * (address mappings, register initial values, etc.) - * You should know what you are doing if you make changes here. - * For the detail description refer to the MPC8245 user's manual. - * - * Unless indicated otherwise, the values are - * taken from the orignal Linkstation boot code - * - * Most of the low level configuration setttings are normally used - * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. - * Low level initialisation is done in board/linkstation/early_init.S - * The values below are included for reference purpose only - */ - -/* FIXME: 32.768 MHz is the crystal frequency but */ -/* the real frequency is lower by about 0.75% */ -#define CONFIG_SYS_CLK_FREQ 32768000 -#define CFG_HZ 1000 - -/* Bit-field values for MCCR1. */ -#define CFG_ROMNAL 0 -#define CFG_ROMFAL 11 - -#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ -#define CFG_BANK1_ROW 0 -#define CFG_BANK2_ROW 0 -#define CFG_BANK3_ROW 0 -#define CFG_BANK4_ROW 0 -#define CFG_BANK5_ROW 0 -#define CFG_BANK6_ROW 0 -#define CFG_BANK7_ROW 0 - -/* Bit-field values for MCCR2. */ -#define CFG_TSWAIT 0 -#define CFG_REFINT 1400 - -/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ -#define CFG_BSTOPRE 121 - -/* Bit-field values for MCCR3. */ -#define CFG_REFREC 7 - -/* Bit-field values for MCCR4. */ -#define CFG_PRETOACT 2 -#define CFG_ACTTOPRE 5 /* Original value was 2 */ -#define CFG_ACTORW 2 -#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ -#define CFG_REGISTERD_TYPE_BUFFER 1 -#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ -#define CFG_REGDIMM 0 -#define CFG_DBUS_SIZE2 1 -#define CFG_SDMODE_WRAP 0 - -#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ -#define CFG_SDRAM_DSCD 0x30 - -/* Memory bank settings. - * Only bits 20-29 are actually used from these vales to set the - * start/end addresses. The upper two bits will always be 0, and the lower - * 20 bits will be 0x00000 for a start address, or 0xfffff for an end - * address. Refer to the MPC8240 book. - */ - -#define CFG_BANK0_START 0x00000000 -#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) -#define CFG_BANK0_ENABLE 1 -#define CFG_BANK1_START 0x3ff00000 -#define CFG_BANK1_END 0x3fffffff -#define CFG_BANK1_ENABLE 0 -#define CFG_BANK2_START 0x3ff00000 -#define CFG_BANK2_END 0x3fffffff -#define CFG_BANK2_ENABLE 0 -#define CFG_BANK3_START 0x3ff00000 -#define CFG_BANK3_END 0x3fffffff -#define CFG_BANK3_ENABLE 0 -#define CFG_BANK4_START 0x3ff00000 -#define CFG_BANK4_END 0x3fffffff -#define CFG_BANK4_ENABLE 0 -#define CFG_BANK5_START 0x3ff00000 -#define CFG_BANK5_END 0x3fffffff -#define CFG_BANK5_ENABLE 0 -#define CFG_BANK6_START 0x3ff00000 -#define CFG_BANK6_END 0x3fffffff -#define CFG_BANK6_ENABLE 0 -#define CFG_BANK7_START 0x3ff00000 -#define CFG_BANK7_END 0x3fffffff -#define CFG_BANK7_ENABLE 0 - -#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ - -/*---------------------------------------------------------------------- - * Initial BAT mappings - */ - -/* NOTES: - * 1) GUARDED and WRITETHROUGH not allowed in IBATS - * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT - */ - -/* SDRAM */ -#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) -#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) - -#define CFG_DBAT0L CFG_IBAT0L -#define CFG_DBAT0U CFG_IBAT0U - -/* EUMB: 1MB of address space */ -#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) - -#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT1U CFG_IBAT1U - -/* PCI Mem: 256MB of address space */ -#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT2U CFG_IBAT2U - -/* PCI and local ROM/Flash: last 32MB of address space */ -#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) - -#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT3U CFG_IBAT3U - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - * - * FIXME: This doesn't appear to be true for the newer kernels - * which map more that 8 MB - */ -#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ - -/*----------------------------------------------------------------------- - * FLASH organization - */ -#undef CFG_FLASH_PROTECTION -#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ -#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ - -#define CFG_FLASH_ERASE_TOUT 12000 -#define CFG_FLASH_WRITE_TOUT 1000 - - -#define CFG_ENV_IS_IN_FLASH -/* - * The original LinkStation flash organisation uses - * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader - * We use the last sector of this area to store the environment - * which leaves max. 384 kB for the U-Boot itself - */ -#define CFG_ENV_ADDR 0xFFF60000 -#define CFG_ENV_SIZE 0x00010000 -#define CFG_ENV_SECT_SIZE 0x00010000 - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ -#endif - -/*----------------------------------------------------------------------- - * IDE/ATA definitions - */ -#undef CONFIG_IDE_LED /* No IDE LED */ -#define CONFIG_IDE_RESET /* no reset for ide supported */ -#define CONFIG_IDE_PREINIT /* check for units */ -#define CONFIG_LBA48 /* 48 bit LBA supported */ - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) -#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ -#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ -#elif defined(CONFIG_HGTL) -#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ -#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ -#else -#error Config IDE: Unknown LinkStation type -#endif - -#define CFG_ATA_BASE_ADDR 0 - -#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ -#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ -#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ - -/*----------------------------------------------------------------------- - * Partitions and file system - */ -#define CONFIG_DOS_PARTITION - -/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -#endif /* __CONFIG_H */ - -/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd new file mode 100644 index 0000000000..5919f5eb2c --- /dev/null +++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd @@ -0,0 +1,500 @@ +/* + * Copyright (C) 2006 Mihai Georgian + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#if 0 +#define DEBUG +#endif + +/*----------------------------------------------------------------------- + * User configurable settings: + * Mandatory settings: + * CONFIG_IPADDR_LS - the IP address of the LinkStation + * CONFIG_SERVERIP_LS - the address of the server for NFS/TFTP/DHCP/BOOTP + * Optional settins: + * CONFIG_NCIP_LS - the adress of the computer running net console + * if not configured, it will be set to + * CONFIG_SERVERIP_LS + */ + +#define CONFIG_IPADDR_LS 192.168.11.150 +#define CONFIG_SERVERIP_LS 192.168.11.149 + +#if !defined(CONFIG_IPADDR_LS) || !defined(CONFIG_SERVERIP_LS) +#error Both CONFIG_IPADDR_LS and CONFIG_SERVERIP_LS must be defined +#endif + +#if !defined(CONFIG_NCIP_LS) +#define CONFIG_NCIP_LS CONFIG_SERVERIP_LS +#endif + +/*---------------------------------------------------------------------- + * DO NOT CHANGE ANYTHING BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING + *---------------------------------------------------------------------*/ + +#define CONFIG_MPC8245 1 +#define CONFIG_LINKSTATION 1 + +/*--------------------------------------- + * Supported models + * + * LinkStation HDLAN /KuroBox Standard (CONFIG_HLAN) + * LinkStation old model (CONFIG_LAN) - totally untested + * LinkStation HGLAN / KuroBox HG (CONFIG_HGLAN) + * + * Models not supported yet + * TeraStatin (CONFIG_HTGL) + */ + +#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) +#define CONFIG_IDENT_STRING " LinkStation / KuroBox" +#elif defined(CONFIG_HGLAN) +#define CONFIG_IDENT_STRING " LinkStation HG / KuroBox HG" +#elif defined(CONFIG_HTGL) +#define CONFIG_IDENT_STRING " TeraStation" +#else +#error No LinkStation model defined +#endif + +#define CONFIG_BOOTDELAY 10 +#define CONFIG_ZERO_BOOTDELAY_CHECK +#undef CONFIG_BOOT_RETRY_TIME + +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..." +#define CONFIG_AUTOBOOT_STOP_STR "s" + +#define CONFIG_COMMANDS (CFG_CMD_BDI | \ + CFG_CMD_LOADS | \ + CFG_CMD_LOADB | \ + CFG_CMD_FLASH | \ + CFG_CMD_MEMORY | \ + CFG_CMD_NET | \ + CFG_CMD_ENV | \ + CFG_CMD_IDE | \ + CFG_CMD_PCI | \ + CFG_CMD_BOOTD | \ + CFG_CMD_CONSOLE | \ + CFG_CMD_RUN | \ + CFG_CMD_ECHO | \ + CFG_CMD_DHCP | \ + CFG_CMD_PING | \ + CFG_CMD_NFS | \ + CFG_CMD_EXT2 ) +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL + +#define CONFIG_OF_FLAT_TREE 1 + +#ifdef CONFIG_OF_FLAT_TREE +#define OF_CPU "PowerPC,603e" +#define OF_SOC "soc10x@80000000" +#define OF_STDOUT_PATH "/soc10x/serial@80004600" +#endif + +/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ +#include + +/* + * Miscellaneous configurable options + */ +#define CFG_LONGHELP /* undef to save memory */ +#define CFG_PROMPT "=> " /* Monitor Command Prompt */ +#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ + +#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) +#define CFG_MAXARGS 16 /* Max number of command args */ +#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ +#define CFG_LOAD_ADDR 0x00800000 /* Default load address: 8 MB */ + +//#define CONFIG_BOOTCOMMAND "run nfsboot" +#define CONFIG_BOOTCOMMAND "run bootcmd1" +#define CONFIG_BOOTARGS "root=/dev/sda1 netconsole=6666@192.168.11.150/,@192.168.11.149/ rtc-rs5c372.probe=0,0x32" +#define CONFIG_NFSBOOTCOMMAND "bootp;run nfsargs;bootm" + +#define CFG_CONSOLE_IS_IN_ENV + +#define XMK_STR(x) #x +#define MK_STR(x) XMK_STR(x) + +#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) +#define UBFILE "share/u-boot/u-boot-hd.flash.bin" +#elif defined(CONFIG_HGLAN) +#define UBFILE "share/u-boot/u-boot-hg.flash.bin" +#elif defined(CONFIG_HTGL) +#define UBFILE "share/u-boot/u-boot-ht.flash.bin" +#else +#error No LinkStation model defined +#endif + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "autoload=no\0" \ + "stdin=nc\0" \ + "stdout=nc\0" \ + "stderr=nc\0" \ + "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0" \ + "netmask=255.255.255.0\0" \ + "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0" \ + "ncip="MK_STR(CONFIG_NCIP_LS)"\0" \ + "netretry=no\0" \ + "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0" \ + "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0" \ + "ldaddr=800000\0" \ + "hdpart=0:1\0" \ + "hdfile=boot/uImage\0" \ + "hdload=echo Loading ${hdpart}:${hdfile};ext2load ide ${hdpart} ${ldaddr} ${hdfile};ext2load ide ${hdpart} 7f0000 boot/kuroboxHD.dtb\0" \ + "boothd=setenv bootargs " CONFIG_BOOTARGS ";bootm ${ldaddr} - 7f0000\0" \ + "hdboot=run hdload boothd\0" \ + "flboot=setenv bootargs root=/dev/hda1;bootm ffc00000\0" \ + "emboot=setenv bootargs root=/dev/ram0;bootm ffc00000\0" \ + "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \ + "bootretry=30\0" \ + "bootcmd1=run hdboot;run flboot\0" \ + "bootcmd2=run flboot\0" \ + "bootcmd3=run emboot\0" \ + "writeng=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4e474e47 1;cp.b 800000 fff70000 4\0" \ + "writeok=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4f4b4f4b 1;cp.b 800000 fff70000 4\0" \ + "ubpart=0:1\0" \ + "ubfile="UBFILE"\0" \ + "ubload=echo Loading ${ubpart}:${ubfile};ext2load ide ${ubpart} ${ldaddr} ${ubfile}\0" \ + "ubsaddr=fff00000\0" \ + "ubeaddr=fff2ffff\0" \ + "ubflash=protect off ${ubsaddr} ${ubeaddr};era ${ubsaddr} ${ubeaddr};cp.b ${ldaddr} ${ubsaddr} ${filesize};cmp.b ${ldaddr} ${ubsaddr} ${filesize}\0" \ + "upgrade=run ubload ubflash\0" + +/*----------------------------------------------------------------------- + * PCI stuff + */ +#define CONFIG_PCI +#undef CONFIG_PCI_PNP +#define CONFIG_PCI_SCAN_SHOW + +#ifndef CONFIG_PCI_PNP +/* Keep the following defines in sync with the BAT mappings */ + +#define PCI_ETH_IOADDR 0xbfff00 +#define PCI_ETH_MEMADDR 0xbffffc00 +#define PCI_IDE_IOADDR 0xbffed0 +#define PCI_IDE_MEMADDR 0xbffffb00 +#define PCI_USB0_IOADDR 0 +#define PCI_USB0_MEMADDR 0xbfffe000 +#define PCI_USB1_IOADDR 0 +#define PCI_USB1_MEMADDR 0xbfffd000 +#define PCI_USB2_IOADDR 0 +#define PCI_USB2_MEMADDR 0xbfffcf00 + +#endif + +/*----------------------------------------------------------------------- + * Ethernet stuff + */ +#define CONFIG_NET_MULTI + +#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) +#define CONFIG_TULIP +#define CONFIG_TULIP_USE_IO +#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) +#define CONFIG_RTL8169 +#endif + +#define CONFIG_NET_RETRY_COUNT 5 + +#define CONFIG_NETCONSOLE + +/*----------------------------------------------------------------------- + * Start addresses for the final memory configuration + * (Set up by the startup code) + * Please note that CFG_SDRAM_BASE _must_ start at 0 + */ +#define CFG_SDRAM_BASE 0x00000000 + +#define CFG_FLASH_BASE 0xFFC00000 +#define CFG_MONITOR_BASE TEXT_BASE + +#define CFG_RESET_ADDRESS 0xFFF00100 +#define CFG_EUMB_ADDR 0x80000000 +#define CFG_PCI_MEM_ADDR 0xB0000000 +#define CFG_MISC_REGION_ADDR 0xFE000000 + +#define CFG_MONITOR_LEN 0x00040000 /* 256 kB */ +#define CFG_MALLOC_LEN (512 << 10) /* Reserve some kB for malloc() */ + +#define CFG_MEMTEST_START 0x00100000 /* memtest works on */ +#define CFG_MEMTEST_END 0x00800000 /* 1M ... 8M in DRAM */ + +/* Maximum amount of RAM */ +#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) +#define CFG_MAX_RAM_SIZE 0x04000000 /* 64MB of SDRAM */ +#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) +#define CFG_MAX_RAM_SIZE 0x08000000 /* 128MB of SDRAM */ +#else +#error Unknown LinkStation type +#endif + +/*----------------------------------------------------------------------- + * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build + * + * RAM based builds are for testing purposes. A Linux module, uloader.o, + * exists to load U-Boot and pass control to it + * + * Always do "make clean" after changing the build type + */ +#if CFG_MONITOR_BASE < CFG_FLASH_BASE +#define CFG_RAMBOOT +#endif + +/*----------------------------------------------------------------------- + * Definitions for initial stack pointer and data area + */ +#if 1 /* RAM is available when the first C function is called */ +#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) +#else +#define CFG_INIT_RAM_ADDR 0x40000000 +#endif +#define CFG_INIT_RAM_END 0x1000 +#define CFG_GBL_DATA_SIZE 128 +#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) + +/*---------------------------------------------------------------------- + * Serial configuration + */ +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 57600 +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +#define CFG_NS16550 +#define CFG_NS16550_SERIAL + +#define CFG_NS16550_REG_SIZE 1 + +#define CFG_NS16550_CLK get_bus_freq(0) + +#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ +#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ + +/* + * Low Level Configuration Settings + * (address mappings, register initial values, etc.) + * You should know what you are doing if you make changes here. + * For the detail description refer to the MPC8245 user's manual. + * + * Unless indicated otherwise, the values are + * taken from the orignal Linkstation boot code + * + * Most of the low level configuration setttings are normally used + * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. + * Low level initialisation is done in board/linkstation/early_init.S + * The values below are included for reference purpose only + */ + +/* FIXME: 32.768 MHz is the crystal frequency but */ +/* the real frequency is lower by about 0.75% */ +#define CONFIG_SYS_CLK_FREQ 32768000 +#define CFG_HZ 1000 + +/* Bit-field values for MCCR1. */ +#define CFG_ROMNAL 0 +#define CFG_ROMFAL 11 + +#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ +#define CFG_BANK1_ROW 0 +#define CFG_BANK2_ROW 0 +#define CFG_BANK3_ROW 0 +#define CFG_BANK4_ROW 0 +#define CFG_BANK5_ROW 0 +#define CFG_BANK6_ROW 0 +#define CFG_BANK7_ROW 0 + +/* Bit-field values for MCCR2. */ +#define CFG_TSWAIT 0 +#define CFG_REFINT 1400 + +/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ +#define CFG_BSTOPRE 121 + +/* Bit-field values for MCCR3. */ +#define CFG_REFREC 7 + +/* Bit-field values for MCCR4. */ +#define CFG_PRETOACT 2 +#define CFG_ACTTOPRE 5 /* Original value was 2 */ +#define CFG_ACTORW 2 +#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ +#define CFG_REGISTERD_TYPE_BUFFER 1 +#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ +#define CFG_REGDIMM 0 +#define CFG_DBUS_SIZE2 1 +#define CFG_SDMODE_WRAP 0 + +#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ +#define CFG_SDRAM_DSCD 0x30 + +/* Memory bank settings. + * Only bits 20-29 are actually used from these vales to set the + * start/end addresses. The upper two bits will always be 0, and the lower + * 20 bits will be 0x00000 for a start address, or 0xfffff for an end + * address. Refer to the MPC8240 book. + */ + +#define CFG_BANK0_START 0x00000000 +#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) +#define CFG_BANK0_ENABLE 1 +#define CFG_BANK1_START 0x3ff00000 +#define CFG_BANK1_END 0x3fffffff +#define CFG_BANK1_ENABLE 0 +#define CFG_BANK2_START 0x3ff00000 +#define CFG_BANK2_END 0x3fffffff +#define CFG_BANK2_ENABLE 0 +#define CFG_BANK3_START 0x3ff00000 +#define CFG_BANK3_END 0x3fffffff +#define CFG_BANK3_ENABLE 0 +#define CFG_BANK4_START 0x3ff00000 +#define CFG_BANK4_END 0x3fffffff +#define CFG_BANK4_ENABLE 0 +#define CFG_BANK5_START 0x3ff00000 +#define CFG_BANK5_END 0x3fffffff +#define CFG_BANK5_ENABLE 0 +#define CFG_BANK6_START 0x3ff00000 +#define CFG_BANK6_END 0x3fffffff +#define CFG_BANK6_ENABLE 0 +#define CFG_BANK7_START 0x3ff00000 +#define CFG_BANK7_END 0x3fffffff +#define CFG_BANK7_ENABLE 0 + +#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ + +/*---------------------------------------------------------------------- + * Initial BAT mappings + */ + +/* NOTES: + * 1) GUARDED and WRITETHROUGH not allowed in IBATS + * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT + */ + +/* SDRAM */ +#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) +#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) + +#define CFG_DBAT0L CFG_IBAT0L +#define CFG_DBAT0U CFG_IBAT0U + +/* EUMB: 1MB of address space */ +#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) + +#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT1U CFG_IBAT1U + +/* PCI Mem: 256MB of address space */ +#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) + +#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT2U CFG_IBAT2U + +/* PCI and local ROM/Flash: last 32MB of address space */ +#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) + +#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT3U CFG_IBAT3U + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + * + * FIXME: This doesn't appear to be true for the newer kernels + * which map more that 8 MB + */ +#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ + +/*----------------------------------------------------------------------- + * FLASH organization + */ +#undef CFG_FLASH_PROTECTION +#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ +#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ + +#define CFG_FLASH_ERASE_TOUT 12000 +#define CFG_FLASH_WRITE_TOUT 1000 + + +#define CFG_ENV_IS_IN_FLASH +/* + * The original LinkStation flash organisation uses + * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader + * We use the last sector of this area to store the environment + * which leaves max. 384 kB for the U-Boot itself + */ +#define CFG_ENV_ADDR 0xFFF60000 +#define CFG_ENV_SIZE 0x00010000 +#define CFG_ENV_SECT_SIZE 0x00010000 + +/*----------------------------------------------------------------------- + * Cache Configuration + */ +#define CFG_CACHELINE_SIZE 32 +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ +#endif + +/*----------------------------------------------------------------------- + * IDE/ATA definitions + */ +#undef CONFIG_IDE_LED /* No IDE LED */ +#define CONFIG_IDE_RESET /* no reset for ide supported */ +#define CONFIG_IDE_PREINIT /* check for units */ +#define CONFIG_LBA48 /* 48 bit LBA supported */ + +#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) +#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ +#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ +#elif defined(CONFIG_HGTL) +#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ +#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ +#else +#error Config IDE: Unknown LinkStation type +#endif + +#define CFG_ATA_BASE_ADDR 0 + +#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ +#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ +#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ + +/*----------------------------------------------------------------------- + * Partitions and file system + */ +#define CONFIG_DOS_PARTITION + +/*----------------------------------------------------------------------- + * Internal Definitions + * + * Boot Flags + */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ + +#endif /* __CONFIG_H */ + +/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg new file mode 100644 index 0000000000..b9943b4c76 --- /dev/null +++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg @@ -0,0 +1,500 @@ +/* + * Copyright (C) 2006 Mihai Georgian + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#if 0 +#define DEBUG +#endif + +/*----------------------------------------------------------------------- + * User configurable settings: + * Mandatory settings: + * CONFIG_IPADDR_LS - the IP address of the LinkStation + * CONFIG_SERVERIP_LS - the address of the server for NFS/TFTP/DHCP/BOOTP + * Optional settins: + * CONFIG_NCIP_LS - the adress of the computer running net console + * if not configured, it will be set to + * CONFIG_SERVERIP_LS + */ + +#define CONFIG_IPADDR_LS 192.168.11.150 +#define CONFIG_SERVERIP_LS 192.168.11.149 + +#if !defined(CONFIG_IPADDR_LS) || !defined(CONFIG_SERVERIP_LS) +#error Both CONFIG_IPADDR_LS and CONFIG_SERVERIP_LS must be defined +#endif + +#if !defined(CONFIG_NCIP_LS) +#define CONFIG_NCIP_LS CONFIG_SERVERIP_LS +#endif + +/*---------------------------------------------------------------------- + * DO NOT CHANGE ANYTHING BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING + *---------------------------------------------------------------------*/ + +#define CONFIG_MPC8245 1 +#define CONFIG_LINKSTATION 1 + +/*--------------------------------------- + * Supported models + * + * LinkStation HDLAN /KuroBox Standard (CONFIG_HLAN) + * LinkStation old model (CONFIG_LAN) - totally untested + * LinkStation HGLAN / KuroBox HG (CONFIG_HGLAN) + * + * Models not supported yet + * TeraStatin (CONFIG_HTGL) + */ + +#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) +#define CONFIG_IDENT_STRING " LinkStation / KuroBox" +#elif defined(CONFIG_HGLAN) +#define CONFIG_IDENT_STRING " LinkStation HG / KuroBox HG" +#elif defined(CONFIG_HTGL) +#define CONFIG_IDENT_STRING " TeraStation" +#else +#error No LinkStation model defined +#endif + +#define CONFIG_BOOTDELAY 10 +#define CONFIG_ZERO_BOOTDELAY_CHECK +#undef CONFIG_BOOT_RETRY_TIME + +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..." +#define CONFIG_AUTOBOOT_STOP_STR "s" + +#define CONFIG_COMMANDS (CFG_CMD_BDI | \ + CFG_CMD_LOADS | \ + CFG_CMD_LOADB | \ + CFG_CMD_FLASH | \ + CFG_CMD_MEMORY | \ + CFG_CMD_NET | \ + CFG_CMD_ENV | \ + CFG_CMD_IDE | \ + CFG_CMD_PCI | \ + CFG_CMD_BOOTD | \ + CFG_CMD_CONSOLE | \ + CFG_CMD_RUN | \ + CFG_CMD_ECHO | \ + CFG_CMD_DHCP | \ + CFG_CMD_PING | \ + CFG_CMD_NFS | \ + CFG_CMD_EXT2 ) +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL + +#define CONFIG_OF_FLAT_TREE 1 + +#ifdef CONFIG_OF_FLAT_TREE +#define OF_CPU "PowerPC,603e" +#define OF_SOC "soc10x@80000000" +#define OF_STDOUT_PATH "/soc10x/serial@80004600" +#endif + +/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ +#include + +/* + * Miscellaneous configurable options + */ +#define CFG_LONGHELP /* undef to save memory */ +#define CFG_PROMPT "=> " /* Monitor Command Prompt */ +#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ + +#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) +#define CFG_MAXARGS 16 /* Max number of command args */ +#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ +#define CFG_LOAD_ADDR 0x00800000 /* Default load address: 8 MB */ + +//#define CONFIG_BOOTCOMMAND "run nfsboot" +#define CONFIG_BOOTCOMMAND "run bootcmd1" +#define CONFIG_BOOTARGS "root=/dev/sda1 netconsole=6666@192.168.11.150/,@192.168.11.149/ rtc-rs5c372.probe=0,0x32" +#define CONFIG_NFSBOOTCOMMAND "bootp;run nfsargs;bootm" + +#define CFG_CONSOLE_IS_IN_ENV + +#define XMK_STR(x) #x +#define MK_STR(x) XMK_STR(x) + +#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) +#define UBFILE "share/u-boot/u-boot-hd.flash.bin" +#elif defined(CONFIG_HGLAN) +#define UBFILE "share/u-boot/u-boot-hg.flash.bin" +#elif defined(CONFIG_HTGL) +#define UBFILE "share/u-boot/u-boot-ht.flash.bin" +#else +#error No LinkStation model defined +#endif + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "autoload=no\0" \ + "stdin=nc\0" \ + "stdout=nc\0" \ + "stderr=nc\0" \ + "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0" \ + "netmask=255.255.255.0\0" \ + "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0" \ + "ncip="MK_STR(CONFIG_NCIP_LS)"\0" \ + "netretry=no\0" \ + "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0" \ + "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0" \ + "ldaddr=800000\0" \ + "hdpart=0:1\0" \ + "hdfile=boot/uImage\0" \ + "hdload=echo Loading ${hdpart}:${hdfile};ext2load ide ${hdpart} ${ldaddr} ${hdfile};ext2load ide ${hdpart} 7f0000 boot/kuroboxHG.dtb\0" \ + "boothd=setenv bootargs " CONFIG_BOOTARGS ";bootm ${ldaddr} - 7f0000\0" \ + "hdboot=run hdload boothd\0" \ + "flboot=setenv bootargs root=/dev/hda1;bootm ffc00000\0" \ + "emboot=setenv bootargs root=/dev/ram0;bootm ffc00000\0" \ + "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \ + "bootretry=30\0" \ + "bootcmd1=run hdboot;run flboot\0" \ + "bootcmd2=run flboot\0" \ + "bootcmd3=run emboot\0" \ + "writeng=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4e474e47 1;cp.b 800000 fff70000 4\0" \ + "writeok=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4f4b4f4b 1;cp.b 800000 fff70000 4\0" \ + "ubpart=0:1\0" \ + "ubfile="UBFILE"\0" \ + "ubload=echo Loading ${ubpart}:${ubfile};ext2load ide ${ubpart} ${ldaddr} ${ubfile}\0" \ + "ubsaddr=fff00000\0" \ + "ubeaddr=fff2ffff\0" \ + "ubflash=protect off ${ubsaddr} ${ubeaddr};era ${ubsaddr} ${ubeaddr};cp.b ${ldaddr} ${ubsaddr} ${filesize};cmp.b ${ldaddr} ${ubsaddr} ${filesize}\0" \ + "upgrade=run ubload ubflash\0" + +/*----------------------------------------------------------------------- + * PCI stuff + */ +#define CONFIG_PCI +#undef CONFIG_PCI_PNP +#define CONFIG_PCI_SCAN_SHOW + +#ifndef CONFIG_PCI_PNP +/* Keep the following defines in sync with the BAT mappings */ + +#define PCI_ETH_IOADDR 0xbfff00 +#define PCI_ETH_MEMADDR 0xbffffc00 +#define PCI_IDE_IOADDR 0xbffed0 +#define PCI_IDE_MEMADDR 0xbffffb00 +#define PCI_USB0_IOADDR 0 +#define PCI_USB0_MEMADDR 0xbfffe000 +#define PCI_USB1_IOADDR 0 +#define PCI_USB1_MEMADDR 0xbfffd000 +#define PCI_USB2_IOADDR 0 +#define PCI_USB2_MEMADDR 0xbfffcf00 + +#endif + +/*----------------------------------------------------------------------- + * Ethernet stuff + */ +#define CONFIG_NET_MULTI + +#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) +#define CONFIG_TULIP +#define CONFIG_TULIP_USE_IO +#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) +#define CONFIG_RTL8169 +#endif + +#define CONFIG_NET_RETRY_COUNT 5 + +#define CONFIG_NETCONSOLE + +/*----------------------------------------------------------------------- + * Start addresses for the final memory configuration + * (Set up by the startup code) + * Please note that CFG_SDRAM_BASE _must_ start at 0 + */ +#define CFG_SDRAM_BASE 0x00000000 + +#define CFG_FLASH_BASE 0xFFC00000 +#define CFG_MONITOR_BASE TEXT_BASE + +#define CFG_RESET_ADDRESS 0xFFF00100 +#define CFG_EUMB_ADDR 0x80000000 +#define CFG_PCI_MEM_ADDR 0xB0000000 +#define CFG_MISC_REGION_ADDR 0xFE000000 + +#define CFG_MONITOR_LEN 0x00040000 /* 256 kB */ +#define CFG_MALLOC_LEN (512 << 10) /* Reserve some kB for malloc() */ + +#define CFG_MEMTEST_START 0x00100000 /* memtest works on */ +#define CFG_MEMTEST_END 0x00800000 /* 1M ... 8M in DRAM */ + +/* Maximum amount of RAM */ +#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) +#define CFG_MAX_RAM_SIZE 0x04000000 /* 64MB of SDRAM */ +#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) +#define CFG_MAX_RAM_SIZE 0x08000000 /* 128MB of SDRAM */ +#else +#error Unknown LinkStation type +#endif + +/*----------------------------------------------------------------------- + * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build + * + * RAM based builds are for testing purposes. A Linux module, uloader.o, + * exists to load U-Boot and pass control to it + * + * Always do "make clean" after changing the build type + */ +#if CFG_MONITOR_BASE < CFG_FLASH_BASE +#define CFG_RAMBOOT +#endif + +/*----------------------------------------------------------------------- + * Definitions for initial stack pointer and data area + */ +#if 1 /* RAM is available when the first C function is called */ +#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) +#else +#define CFG_INIT_RAM_ADDR 0x40000000 +#endif +#define CFG_INIT_RAM_END 0x1000 +#define CFG_GBL_DATA_SIZE 128 +#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) + +/*---------------------------------------------------------------------- + * Serial configuration + */ +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 57600 +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +#define CFG_NS16550 +#define CFG_NS16550_SERIAL + +#define CFG_NS16550_REG_SIZE 1 + +#define CFG_NS16550_CLK get_bus_freq(0) + +#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ +#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ + +/* + * Low Level Configuration Settings + * (address mappings, register initial values, etc.) + * You should know what you are doing if you make changes here. + * For the detail description refer to the MPC8245 user's manual. + * + * Unless indicated otherwise, the values are + * taken from the orignal Linkstation boot code + * + * Most of the low level configuration setttings are normally used + * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. + * Low level initialisation is done in board/linkstation/early_init.S + * The values below are included for reference purpose only + */ + +/* FIXME: 32.768 MHz is the crystal frequency but */ +/* the real frequency is lower by about 0.75% */ +#define CONFIG_SYS_CLK_FREQ 32768000 +#define CFG_HZ 1000 + +/* Bit-field values for MCCR1. */ +#define CFG_ROMNAL 0 +#define CFG_ROMFAL 11 + +#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ +#define CFG_BANK1_ROW 0 +#define CFG_BANK2_ROW 0 +#define CFG_BANK3_ROW 0 +#define CFG_BANK4_ROW 0 +#define CFG_BANK5_ROW 0 +#define CFG_BANK6_ROW 0 +#define CFG_BANK7_ROW 0 + +/* Bit-field values for MCCR2. */ +#define CFG_TSWAIT 0 +#define CFG_REFINT 1400 + +/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ +#define CFG_BSTOPRE 121 + +/* Bit-field values for MCCR3. */ +#define CFG_REFREC 7 + +/* Bit-field values for MCCR4. */ +#define CFG_PRETOACT 2 +#define CFG_ACTTOPRE 5 /* Original value was 2 */ +#define CFG_ACTORW 2 +#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ +#define CFG_REGISTERD_TYPE_BUFFER 1 +#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ +#define CFG_REGDIMM 0 +#define CFG_DBUS_SIZE2 1 +#define CFG_SDMODE_WRAP 0 + +#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ +#define CFG_SDRAM_DSCD 0x30 + +/* Memory bank settings. + * Only bits 20-29 are actually used from these vales to set the + * start/end addresses. The upper two bits will always be 0, and the lower + * 20 bits will be 0x00000 for a start address, or 0xfffff for an end + * address. Refer to the MPC8240 book. + */ + +#define CFG_BANK0_START 0x00000000 +#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) +#define CFG_BANK0_ENABLE 1 +#define CFG_BANK1_START 0x3ff00000 +#define CFG_BANK1_END 0x3fffffff +#define CFG_BANK1_ENABLE 0 +#define CFG_BANK2_START 0x3ff00000 +#define CFG_BANK2_END 0x3fffffff +#define CFG_BANK2_ENABLE 0 +#define CFG_BANK3_START 0x3ff00000 +#define CFG_BANK3_END 0x3fffffff +#define CFG_BANK3_ENABLE 0 +#define CFG_BANK4_START 0x3ff00000 +#define CFG_BANK4_END 0x3fffffff +#define CFG_BANK4_ENABLE 0 +#define CFG_BANK5_START 0x3ff00000 +#define CFG_BANK5_END 0x3fffffff +#define CFG_BANK5_ENABLE 0 +#define CFG_BANK6_START 0x3ff00000 +#define CFG_BANK6_END 0x3fffffff +#define CFG_BANK6_ENABLE 0 +#define CFG_BANK7_START 0x3ff00000 +#define CFG_BANK7_END 0x3fffffff +#define CFG_BANK7_ENABLE 0 + +#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ + +/*---------------------------------------------------------------------- + * Initial BAT mappings + */ + +/* NOTES: + * 1) GUARDED and WRITETHROUGH not allowed in IBATS + * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT + */ + +/* SDRAM */ +#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) +#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) + +#define CFG_DBAT0L CFG_IBAT0L +#define CFG_DBAT0U CFG_IBAT0U + +/* EUMB: 1MB of address space */ +#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) + +#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT1U CFG_IBAT1U + +/* PCI Mem: 256MB of address space */ +#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) + +#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT2U CFG_IBAT2U + +/* PCI and local ROM/Flash: last 32MB of address space */ +#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) + +#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT3U CFG_IBAT3U + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + * + * FIXME: This doesn't appear to be true for the newer kernels + * which map more that 8 MB + */ +#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ + +/*----------------------------------------------------------------------- + * FLASH organization + */ +#undef CFG_FLASH_PROTECTION +#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ +#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ + +#define CFG_FLASH_ERASE_TOUT 12000 +#define CFG_FLASH_WRITE_TOUT 1000 + + +#define CFG_ENV_IS_IN_FLASH +/* + * The original LinkStation flash organisation uses + * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader + * We use the last sector of this area to store the environment + * which leaves max. 384 kB for the U-Boot itself + */ +#define CFG_ENV_ADDR 0xFFF60000 +#define CFG_ENV_SIZE 0x00010000 +#define CFG_ENV_SECT_SIZE 0x00010000 + +/*----------------------------------------------------------------------- + * Cache Configuration + */ +#define CFG_CACHELINE_SIZE 32 +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ +#endif + +/*----------------------------------------------------------------------- + * IDE/ATA definitions + */ +#undef CONFIG_IDE_LED /* No IDE LED */ +#define CONFIG_IDE_RESET /* no reset for ide supported */ +#define CONFIG_IDE_PREINIT /* check for units */ +#define CONFIG_LBA48 /* 48 bit LBA supported */ + +#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) +#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ +#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ +#elif defined(CONFIG_HGTL) +#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ +#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ +#else +#error Config IDE: Unknown LinkStation type +#endif + +#define CFG_ATA_BASE_ADDR 0 + +#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ +#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ +#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ + +/*----------------------------------------------------------------------- + * Partitions and file system + */ +#define CONFIG_DOS_PARTITION + +/*----------------------------------------------------------------------- + * Internal Definitions + * + * Boot Flags + */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ + +#endif /* __CONFIG_H */ + +/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc_git.bb b/packages/uboot/u-boot-linkstationppc_git.bb index 2fe2f9e7ff..7baac2ba7c 100644 --- a/packages/uboot/u-boot-linkstationppc_git.bb +++ b/packages/uboot/u-boot-linkstationppc_git.bb @@ -3,15 +3,16 @@ PROVIDES = "virtual/bootloader" SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "linkstationppc" +COMPATIBLE_MACHINE = "(lsppchd|lsppchg)" SRC_URI = "git://www.jdl.com/software/u-boot-86xx.git;protocol=git \ file://u-boot-kurobox.patch;patch=1 \ file://u-boot-kurobox-fdt.patch;patch=1 \ - file://defconfig_linkstationppchg \ - file://defconfig_linkstationppchd \ + file://defconfig_lsppchg \ + file://defconfig_lsppchd \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From f9a697a2fd26e5ca7f0ea4eb153d4a3c2aafdbbe Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 25 Mar 2007 18:06:11 +0000 Subject: glibc, local.conf.sample: Introduce and handle new OE variable, GLIBC_GENERATE_LOCALES to limit set of generated binary locales. * If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge time-savior for developmental builds. Format: list of locale.encoding pairs with spaces as separators, e.g.: GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" * Check your distro for minimal set of locales required. Old-time default is "en_GB.UTF-8 de_DE.UTF-8 fr_FR.UTF-8". * Angstrom requires en_GB only. * This commit does not changes the default, which is still generation of all available locales. * Closes #1966. --- packages/glibc/glibc-package.bbclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 5783ab1fcf..4bd4223657 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -202,9 +202,14 @@ python package_do_split_gconvs () { do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) - f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") - supported = f.readlines() - f.close() + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + else: + supported = supported.split() + supported = map(lambda s:s.replace(".", " ") + "\n", supported) dot_re = re.compile("(.*)\.(.*)") -- cgit v1.2.3 From 5eaa8e1dd0f11b98dd38c50e3d7a9c20452db123 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Mar 2007 18:55:53 +0000 Subject: matchbox-panel2: don't make the applets replace mb-panel, that breaks image generation if you build both --- packages/matchbox2/matchbox-panel-2_svn.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index a0f4a7f484..5022afa41a 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,11 +3,11 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RREPLACES = "matchbox-panel" -RCONFLICTS = "matchbox-panel" +RREPLACES_${PN} = "matchbox-panel" +RCONFLICTS_${PN} = "matchbox-panel" PV = "0.1+svn${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From c591e0475f84089bdae68d5cbdef2282cdc02bd2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 26 Mar 2007 08:47:38 +0000 Subject: ltrace: make it buildable on misc architectures (copied some stuff from linux-libc-headers recipe) - bug reported by Dodji Seketeli@OpenedHand --- packages/ltrace/ltrace_0.4.bb | 50 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb index 97b7d18d22..bae6d49b65 100644 --- a/packages/ltrace/ltrace_0.4.bb +++ b/packages/ltrace/ltrace_0.4.bb @@ -3,29 +3,61 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html" SECTION = "devel" DEPENDS = "libelf" LICENSE = "GPL" -PR = "r0" +PR = "r1" -SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \ - ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ file://no-usr-include.patch;patch=1" inherit autotools PARALLEL_MAKE = "" -EXTRA_OEMAKE = "ARCH=${LTRACE_ARCH} \ - INSTALL_FILE='$(INSTALL) -p -m 0644' \ +EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \ INSTALL_PROGRAM='$(INSTALL) -p -m 0755' \ INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \ INSTALL_DIR='$(INSTALL) -p -d -m 0755' " export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include" -LTRACE_ARCH = "${TARGET_ARCH}" -LTRACE_ARCH_x86 = "i386" - do_configure_prepend() { ln -sf ./linux-gnu sysdeps/linux-gnueabi } do_compile() { - oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} + case ${TARGET_ARCH} in + alpha*) LTRACE_ARCH=alpha ;; + arm*) LTRACE_ARCH=arm ;; + cris*) LTRACE_ARCH=cris ;; + hppa*) LTRACE_ARCH=parisc ;; + i*86*) LTRACE_ARCH=i386 ;; + ia64*) LTRACE_ARCH=ia64 ;; + mips*) LTRACE_ARCH=mips ;; + m68k*) LTRACE_ARCH=m68k ;; + powerpc*) LTRACE_ARCH=ppc ;; + s390*) LTRACE_ARCH=s390 ;; + sh*) LTRACE_ARCH=sh ;; + sparc64*) LTRACE_ARCH=sparc64 ;; + sparc*) LTRACE_ARCH=sparc ;; + x86_64*) LTRACE_ARCH=x86_64 ;; + esac + oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} +} + +do_install() { + case ${TARGET_ARCH} in + alpha*) LTRACE_ARCH=alpha ;; + arm*) LTRACE_ARCH=arm ;; + cris*) LTRACE_ARCH=cris ;; + hppa*) LTRACE_ARCH=parisc ;; + i*86*) LTRACE_ARCH=i386 ;; + ia64*) LTRACE_ARCH=ia64 ;; + mips*) LTRACE_ARCH=mips ;; + m68k*) LTRACE_ARCH=m68k ;; + powerpc*) LTRACE_ARCH=ppc ;; + s390*) LTRACE_ARCH=s390 ;; + sh*) LTRACE_ARCH=sh ;; + sparc64*) LTRACE_ARCH=sparc64 ;; + sparc*) LTRACE_ARCH=sparc ;; + x86_64*) LTRACE_ARCH=x86_64 ;; + esac + oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D} } -- cgit v1.2.3 From 4755608021d2eb9322c27e6d9f76182b16497467 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 26 Mar 2007 09:51:46 +0000 Subject: libxaw: split into libxaw6/7/8 as our apps depend on one of them only so why install all --- packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb index 3961042a2d..ff240607cb 100644 --- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -1,9 +1,9 @@ require xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." - DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" +PR = "r1" XORG_PN = "libXaw" @@ -13,3 +13,9 @@ do_stage () { ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so } + +PACKAGES =+ "libxaw6 libxaw7 libxaw8" + +FILES_libxaw6 = "${libdir}/libXaw6.so.6*" +FILES_libxaw7 = "${libdir}/libXaw7.so.7*" +FILES_libxaw8 = "${libdir}/libXaw8.so.8*" -- cgit v1.2.3 From 79bf00a684dc72aaaaa1a6e154b20615137f5606 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 26 Mar 2007 11:36:47 +0000 Subject: gpe-conf: depends on tzdata instead of timezones, makes the USians a bit happier --- packages/gpe-conf/gpe-conf_0.2.3.bb | 4 ++-- packages/gpe-conf/gpe-conf_0.2.4.bb | 4 ++-- packages/gpe-conf/gpe-conf_0.2.5.bb | 4 ++-- packages/gpe-conf/gpe-conf_svn.bb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb index 3f8ae1e9d5..0cb645c5d4 100644 --- a/packages/gpe-conf/gpe-conf_0.2.3.bb +++ b/packages/gpe-conf/gpe-conf_0.2.3.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons tzdata" RDEPENDS_gpe-conf-panel = "gpe-conf" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb index aa458d089e..15a5bce0f3 100644 --- a/packages/gpe-conf/gpe-conf_0.2.4.bb +++ b/packages/gpe-conf/gpe-conf_0.2.4.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" -RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr" +RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr" RDEPENDS_gpe-conf-panel = "gpe-conf" -PR = "r1" +PR = "r2" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb index 39f7679cc0..eff9f55033 100644 --- a/packages/gpe-conf/gpe-conf_0.2.5.bb +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -4,13 +4,13 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" -RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr" +RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr" RDEPENDS_gpe-conf-panel = "gpe-conf" RPROVIDES_${PN} += " bl" RCONFLICTS_${PN} = "bl" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-conf/gpe-conf_svn.bb b/packages/gpe-conf/gpe-conf_svn.bb index f3782ef0ac..266053073a 100644 --- a/packages/gpe-conf/gpe-conf_svn.bb +++ b/packages/gpe-conf/gpe-conf_svn.bb @@ -6,13 +6,13 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons" +RDEPENDS_${PN} = "xst tzdata xset ntpdate gpe-login gpe-icons" RDEPENDS_gpe-conf-panel = "gpe-conf" inherit autotools gpe PV = "0.2.5+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 1b38ddfb48196763677fa144cc26c5fa3651b9a8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 26 Mar 2007 17:08:59 +0000 Subject: librsvg: add 2.16.1 --- packages/librsvg/librsvg_2.16.1.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/librsvg/librsvg_2.16.1.bb (limited to 'packages') diff --git a/packages/librsvg/librsvg_2.16.1.bb b/packages/librsvg/librsvg_2.16.1.bb new file mode 100644 index 0000000000..49513128d7 --- /dev/null +++ b/packages/librsvg/librsvg_2.16.1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Library for rendering SVG files" +SECTION = "x11/utils" +DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt" +LICENSE = "LGPL" + +EXTRA_OECONF = "--disable-mozilla-plugin" + +inherit autotools pkgconfig gnome + +PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" +FILES_${PN} = "${libdir}/*.so.*" +FILES_rsvg = "${bindir}/rsvg \ + ${bindir}/rsvg-view \ + ${bindir}/rsvg-convert \ + ${datadir}/pixmaps/svg-viewer.svg" +FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*" +FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \ + ${libdir}/gtk-2.0/*/*.la" +FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug" + +EXTRA_OECONF = "--disable-mozilla-plugin" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 273489f987423d573d486620efb723fd438001d7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:30:51 +0000 Subject: unslung-kernel, unslung-image: Changed to use the generic nslu2_pack_image class. --- packages/images/unslung-image.bb | 48 ++----------------------- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 4 +-- 2 files changed, 4 insertions(+), 48 deletions(-) (limited to 'packages') diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index 897fb131c1..d77d5c96dc 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -12,17 +12,11 @@ DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" RDEPENDS = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg \ - libipkg \ -# cpio \ -# findutils \ + libc6-unslung slingbox ipkg libipkg \ ${UNSLUNG_EXTRA_RDEPENDS}" PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg \ - libipkg \ -# cpio \ -# findutils \ + libc6-unslung slingbox ipkg libipkg \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" @@ -76,27 +70,6 @@ unslung_clean_image () { ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 -# MJW - experimental right now, but no longer need cpio and find - # We need cpio and find, but we don't need any of the other stuff in - # the packages (users can install the full package with ipkg after - # unsling). Remove the extra files and executables, and clean up - # the entries from the ipkg database manually. - - #-- these are for cpio: -# rm -f ${IMAGE_ROOTFS}/usr/bin/mt -# rm -rf ${IMAGE_ROOTFS}/usr/libexec -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.* -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt -# sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status - - #-- and these for find: -# rm -f ${IMAGE_ROOTFS}/usr/bin/locate -# rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb -# rm -f ${IMAGE_ROOTFS}/usr/bin/xargs -# rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.* -# sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status - # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" # behavior to create an extra file named .debug/ containing # the stripped symbols. These files are supposed to be packaged @@ -120,20 +93,3 @@ unslung_clean_image () { # #### End of Hack! } - -nslu2_pack_image () { - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img - rm -rf ${DEPLOY_DIR_IMAGE}/slug -} - -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 531f389898..df3141725c 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" -PR = "r17" +PR = "r18" COMPATIBLE_HOST = 'arm.*-linux' COMPATIBLE_MACHINE = "nslu2" @@ -39,7 +39,7 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" -KERNEL_SUFFIX = "unslung" +KERNEL_SUFFIX = "${MACHINE}" CMDLINE_CONSOLE ?= "ttyS0,115200" CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}" -- cgit v1.2.3 From c94d05d33f4d266cb9c3996ed4d14c04868d24a8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:34:06 +0000 Subject: unslung-image: Bump the PR --- packages/images/unslung-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index d77d5c96dc..a24271a9d6 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PR = "r25" +PR = "r26" COMPATIBLE_MACHINE = "nslu2" IMAGE_BASENAME = "unslung" -- cgit v1.2.3 From 91a686ccf1d8c457b592f924d81e4ac502283199 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:34:56 +0000 Subject: unslung-rootfs: Removed cpio and findutils stuff from unsling --- packages/nslu2-binary-only/unslung-rootfs/unsling | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling index 6c4dc4ca52..539a1d2b58 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs/unsling @@ -182,9 +182,7 @@ if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passw echo "the device, or the formatting of the device." exit 1 fi -# /usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ -# rm -rf $targ/dev ; mv $targ/dev.state $targ/dev -# rm -rf $targ/var ; mv $targ/var.state $targ/var + echo "./var/tmp" > /tmp/xfile echo "./dev.state" >> /tmp/xfile echo "./var.state" >> /tmp/xfile -- cgit v1.2.3 From fa2a25a2700d2211fa302a27cb180ce8475f9cd8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 11:38:45 +0000 Subject: sysconf: A general utility for storing network configuration and CONFFILES in a flash partition --- packages/sysconf/.mtn2git_empty | 0 packages/sysconf/files/.mtn2git_empty | 0 packages/sysconf/files/conffiles | 56 ++ packages/sysconf/files/sysconf | 1041 +++++++++++++++++++++++++++++++++ packages/sysconf/files/sysconfsetup | 59 ++ packages/sysconf/sysconf_0.1.bb | 52 ++ 6 files changed, 1208 insertions(+) create mode 100644 packages/sysconf/.mtn2git_empty create mode 100644 packages/sysconf/files/.mtn2git_empty create mode 100644 packages/sysconf/files/conffiles create mode 100644 packages/sysconf/files/sysconf create mode 100644 packages/sysconf/files/sysconfsetup create mode 100644 packages/sysconf/sysconf_0.1.bb (limited to 'packages') diff --git a/packages/sysconf/.mtn2git_empty b/packages/sysconf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sysconf/files/.mtn2git_empty b/packages/sysconf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sysconf/files/conffiles b/packages/sysconf/files/conffiles new file mode 100644 index 0000000000..d99047ce24 --- /dev/null +++ b/packages/sysconf/files/conffiles @@ -0,0 +1,56 @@ +# conffiles +# Known configuration files. These files are preserved on +# a flash upgrade. Other configuration files, found from: +# +# /usr/lib/ipkg/*.conffiles +# /etc/*.conf +# +# are preserved too with an operation of 'diff' if they have been +# changed since /etc/.configured was created. +# +# Lines starting with # are comments, other lines have +# two fields: +# +# operation file +# +# The file must *NOT* have a leading / +# +# operation may be: +# ignore Do not preserve this file +# preserve Preserve this file unconditionally +# diff Compare file with the new version, ask if different +# +preserve linuxrc +preserve etc/.configured +preserve etc/TZ +diff etc/default/conffiles +diff etc/default/devpts +preserve etc/default/rcS +preserve etc/default/sysconf +diff etc/default/usbd +preserve etc/defaultdomain +preserve etc/dropbear/dropbear_dss_host_key +preserve etc/dropbear/dropbear_rsa_host_key +preserve etc/ssh/ssh_host_dsa_key +preserve etc/ssh/ssh_host_dsa_key.pub +preserve etc/ssh/ssh_host_rsa_key +preserve etc/ssh/ssh_host_rsa_key.pub +preserve etc/fstab +preserve etc/group +preserve etc/gshadow +preserve etc/hostname +preserve etc/hosts +preserve etc/localtime +ignore etc/modules +ignore etc/modules.conf +preserve etc/motd +preserve etc/network/interfaces +preserve etc/ntp.drift +preserve etc/passwd +preserve etc/profile +preserve etc/resolv.conf +preserve etc/shadow +preserve etc/syslog.conf +preserve etc/timezone +preserve root/.ssh/authorized_keys +preserve home/root/.ssh/authorized_keys diff --git a/packages/sysconf/files/sysconf b/packages/sysconf/files/sysconf new file mode 100644 index 0000000000..9499b4daa9 --- /dev/null +++ b/packages/sysconf/files/sysconf @@ -0,0 +1,1041 @@ +#!/bin/sh +# sysconf +# +# Utility to manipulate system configuration information held +# in a System Configuration partition +# + +# hardware +# the 'Hardware' string from cpuinfo +hardware(){ + sed -n 's!^Hardware *: !!p' /proc/cpuinfo +} +# +# machine +# outputs an identifier of the current machine - i.e. the board +# slugos is running on. +machine(){ + case "$(hardware)" in + *Coyote*) echo coyote;; + *IXDPG425*) echo ixdpg425;; + *WRV54G*) echo wrv54g;; + *IXDP425*) echo ixdp425;; + *IXDP465*) echo ixdp465;; + *IXCDP1100*) echo ixcdp1100*;; + *Avila*) echo avila;; + *Loft*) echo loft;; + *NAS?100d*) echo nas100d;; + *DSM?G600*) echo dsmg600;; + *NSLU2*) echo nslu2;; + *FSG?3*) echo fsg3;; + *) echo unknown;; + esac +} + +# NSLU2 flash layout is non-standard. +case "$(machine)" in +nslu2) + kpart="Kernel" + syspart="SysConf" + ffspart="Flashdisk";; +*) + kpart="kernel" + syspart="sysconfig" + ffspart="filesystem";; +esac + +# +# mtblockdev "name" +# return (output) the block device name for flash parition "name" +# /proc/mtd has the general form: +# dev: size erasesize name +# mtd5: 00020000 00020000 "FIS directory" +# use this rather than hard-wiring the device because the partition +# table can change - looking in /proc/mtd is more reliable. +mtblockdev(){ + sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtdblock\1!p' /proc/mtd +} + +# +# sysconf_valid +# return true if the SysConf partition exists and seems to be +# potentially valid (it starts with a reasonable length). +sysconf_valid(){ + local sysdev + sysdev="$(mtblockdev $syspart)" + test -n "$sysdev" -a -b "$sysdev" && + devio "<<$sysdev" '!! b.10>s32768<&!' +} + +# +# sysvalmatch "section" "name" 'pattern' "configuration file" +# sysvalof "section" "name" "configuration file" +# sysval "section" "name" +# outputs the value of the SysConf variable 'name' from section 'section', +# if there are multiple definitions only the last is output +# NOTE: these functions should only be used internally, add entries to 'config' +# below if necessary. This is because 'config' does the defaulting. +sysvalmatch(){ + sed -n '/^\['"$1"'\]$/,/^\[.*\]$/s/^'"$2"'=\('"$3"'\)$/\1/p' "$4" | sed -n '$p' +} +sysvalof(){ + sysvalmatch "$1" "$2" '.*' "$3" +} +sysval(){ + test -r "$config_root/etc/default/sysconf" && + sysvalof "$1" "$2" "$config_root/etc/default/sysconf" +} +# +# syssection "section" +# outputs all the values from the given section changed to the format "name value" +# (i.e. the '=' is dropped). +syssection(){ + test -r "$config_root/etc/default/sysconf" && + sed -n '/^\['"$1"'\]$/,/^\[.*\]$/s/^\([^=]*\)=\(.*\)$/\1 \2/p' "$config_root/etc/default/sysconf" +} +# +# config "value" +# convenience callers for specific values to avoid mis-typing in scripts +# NOTE: this function does the defaulting, 'sysval' does not! +# config_root: if set this will override the root where config/sysval +# looks for /etc/default/sysconf +config(){ + case "$1" in + host) if test -n "$(sysval network disk_server_name)" + then + sysval network disk_server_name + elif test -n "$(sysval network default_server_name)" + then + sysval network default_server_name + else + # because we want the name to remain constant: + echo "brokenslug" + fi;; + domain) sysval network w_d_name;; + iface) if test -n "$(sysval network lan_interface)" + then + sysval network lan_interface + else + echo eth0 + fi;; + ip) if test -n "$(sysval network ip_addr)" + then + sysval network ip_addr + else + echo 192.168.1.77 + fi;; + netmask)sysval network netmask;; + gateway)sysval network gateway;; + dns) sysval network dns_server1;; + dns2) sysval network dns_server2;; + dns3) sysval network dns_server3;; + boot) if test -n "$(sysval network bootproto)" + then + sysval network bootproto + else + echo dhcp + fi;; + valid) test -r "$config_root/etc/default/sysconf";; + *) return 1;; + esac +} + +# +# sysconf_read [prefix] +# read the $syspart partition (if present) writing the result into +# /etc/default/sysconf, if the result is empty it will be removed. +sysconf_read(){ + local sysdev sedcmd config_root + config_root="$1" + rm -f /tmp/sysconf.new + sysdev="$(mtblockdev $syspart)" + if sysconf_valid + then + # Read the defined part of $syspart into /etc/default/sysconf. + # $syspart has lines of two forms: + # + # [section] + # name=value + # + # In practice $syspart also contains other stuff, use the command: + # + # devio '</tmp/sysconf.new + fi + # + # test the result - sysconf must be non-empty + if test -s /tmp/sysconf.new + then + mv /tmp/sysconf.new "$config_root/etc/default/sysconf" + else + rm -f /tmp/sysconf.new + return 1 + fi +} + +# +# sysconf_default [prefix] +# Provde a default /etc/default/sysconf when there is no $syspart partition, +# or when it is invalid, this function will read from an existing sysconf, +# copying the values into the new one. +# sysconf_line tag config-tag +# write an appropriate line if the config value is non-empty +sysconf_line(){ + config "$2" | { + local value + read value + test -n "$value" && echo "$1"="$value" + } +} +# +sysconf_default(){ + local config_root + config_root="$1" + { echo '[network]' + sysconf_line disk_server_name host + sysconf_line w_d_name domain + sysconf_line lan_interface iface + sysconf_line ip_addr ip + sysconf_line netmask netmask + sysconf_line gateway gateway + sysconf_line dns_server1 dns + sysconf_line dns_server2 dns2 + sysconf_line dns_server3 dns3 + sysconf_line bootproto boot + } >/tmp/sysconf.new + mv /tmp/sysconf.new "$config_root/etc/default/sysconf" +} + +# +# sysconf_reload [prefix] +# read the values from /etc/default/sysconf and use these values to set +# up the following system files: +# +# /etc/hostname +# /etc/defaultdomain +# /etc/resolv.conf +# /etc/network/interfaces +# /etc/motd +# +sysconf_reload(){ + local config_root host domain iface boot ip netmask gateway ifname iftype + config_root="$1" + host="$(config host)" + test -n "$host" && echo "$host" >"$config_root/etc/hostname" + domain="$(config domain)" + test -n "$domain" && echo "$domain" >"$config_root/etc/defaultdomain" + # + # The DNS server information gives up to three nameservers, + # but this currently only binds in the first. + { + test -n "$domain" && echo "search $domain" + test -n "$(config dns)" && echo "nameserver $(config dns)" + test -n "$(config dns2)" && echo "nameserver $(config dns2)" + test -n "$(config dns3)" && echo "nameserver $(config dns3)" + } >"$config_root/etc/resolv.conf" + # + # Ethernet information. This goes into /etc/network/interfaces, + # however this is only used for static setup (and this is not + # the default). With dhcp the slugos udhcp script, + # /etc/udhcpc.d/50default, loads the values from sysconf. + iface="$(config iface)" + boot="$(config boot)" + # Only dhcp and static are supported at present - bootp + # support requires installation of appropriate packages + # dhcp is the fail-safe + case "$boot" in + dhcp|static) ;; + *) boot=dhcp;; + esac + # + ip="$(config ip)" + netmask="$(config netmask)" + gateway="$(config gateway)" + { + echo "# /etc/network/interfaces" + echo "# configuration file for ifup(8), ifdown(8)" + echo "#" + echo "# The loopback interface" + echo "auto lo" + echo "iface lo inet loopback" + echo "#" + echo "# The interface used by default during boot" + echo "auto $iface" + echo "# Automatically generated from /etc/default/sysconf" + echo "# address, netmask and gateway are ignored for 'dhcp'" + echo "# but required for 'static'" + echo "iface $iface inet $boot" + # The following are ignored for DHCP but are harmless + test -n "$ip" && echo " address $ip" + test -n "$netmask" && echo " netmask $netmask" + test -n "$gateway" && echo " gateway $gateway" + # + # Now read all the other ARPHRD_ETHER (type=1) interfaces + # and add an entry for each. + for ifname in $(test -d /sys/class/net && ls /sys/class/net) + do + if test -r "/sys/class/net/$ifname/type" -a "$ifname" != "$iface" + then + read iftype <"/sys/class/net/$ifname/type" + case "$iftype" in + 1) echo "#" + echo "# /sys/class/net/$ifname:" + echo "auto $ifname" + echo "iface $ifname inet dhcp";; + esac + fi + done + } >"$config_root/etc/network/interfaces" + # + # Finally rewrite /etc/motd + { echo "Host name: $host" + echo "Domain name: $domain" + echo "Network boot method: $boot" + case "$boot" in + static) echo "Host IP address: $ip";; + esac + echo "Use 'sysconf init' to reset the configuration" + echo "Use 'sysconf save' to save the configuration permanently" + echo "Use 'sysconf restore' to restore a previously saved configuration" + echo "Use 'sysconf help' for more information" + } >"$config_root/etc/motd" +} + +# +# sysconf_save_conffiles +# preserve the configuration files in a directory or in a CPIO archive +# (which is *not* compressed). If is a directory the files are +# copied, otherwise a CPIO archive is made with that name. is +# the listing file giving the preserved files and the processing option. +sysconf_save_conffiles(){ + local ffsdir dest list file + ffsdir="$1" + saved="$2" + list="$3" + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -n "$saved" -a -n "$list" || { + echo "sysconf_save_conffiles: invalid arguments: '$*'" >&2 + echo " usage sysconf_save_conffiles " >&2 + return 1 + } + # + ( cd "$ffsdir" + find etc/*.conf $(sed 's!^/!!' usr/lib/ipkg/info/*.conffiles) ! -type d -newer etc/.configured -print | + sed 's/^/diff /' + exec sed 's/#.*$//;/^[ ]*$/d' etc/default/conffiles + ) | sed 's!^/*!!' | + awk '{ op=$1; $1=""; file[$0]=op } + END{ for (f in file) if (file[f] != "ignore") print file[f] f }' | + while read op file + do + if test -e "$ffsdir/$file" + then + echo "$op $file" >&3 + echo "$file" + fi + done 3>"$list" | ( + cd "$ffsdir" + if test -d "$saved" + then + exec cpio -p -d -m -u "$saved" + else + exec cpio -o -H crc >"$saved" + fi + ) +} + +# +# sysconf_verify file +# this is called with the name of a 'diff' file which is, indeed, +# different and with all the std streams connected to the tty. It +# returns a status code to say whether (0) or not (1) to copy the +# file over. +# +# globals: the following must be defined in the calling context! +# saved: the directory containing the unpacked saved files +# ffsdir: the flash directory to which the files are being restored (/) +# +sysconf_verify_help() { + echo "Please specify how to handle this file or link, the options are as follows," + echo "two character abbreviations may be used:" + echo + echo " keep: retain the old file, overwrite the new flash image file" + echo " upgrade: retain the new file, the old (saved) file is not used" + echo " diff: display the differences between the old and the new using diff -u" + echo " shell: temporarily start an interactive shell (sh -i), exit to continue" + echo " skip: ignore this file for the moment. The file is left in the directory" + echo " $saved and many be handled after this script has completed" +} +# +sysconf_verify() { + local command file + + # return 1 here causes the file not to be overwritten, + # control should never get here! + test -n "$sysconf_noninteractive" && { + echo "$0: $*: changed file cannot be handled non-interactively" >&2 + return 1 + } + + file="$1" + echo "$0: $file: configuration file changed." + sysconf_verify_help "$file" + while : + do + echo -n "option: " + read command + case "$command" in + ke*) return 0;; + up*) rm "$saved/$file" + return 1;; + di*) echo "DIFF OLD($saved) NEW($ffsdir)" + diff -u "$saved/$file" "$ffsdir/$file";; + sh*) PS1="$file: " sh -i;; + sk*) return 1;; + *) sysconf_verify_help "$file";; + esac + done +} +# the same, but for a link +sysconf_verify_link() { + local command link + + # return 1 here causes the file not to be overwritten, + # control should never get here! + test -n "$sysconf_noninteractive" && { + echo "$0: $*: changed link cannot be handled non-interactively" >&2 + return 1 + } + + link="$1" + echo "reflash: $link: configuration link changed." + sysconf_verify_help "$link" + while : + do + echo -n "option: " + read command + case "$command" in + ke*) return 0;; + up*) rm "$saved/$link" + return 1;; + di*) echo "DIFF:" + echo "OLD($saved): $link -> $(readlink "$saved/$link")" + echo "NEW($ffsdir): $link -> $(readlink "$ffsdir/$link")";; + sh*) PS1="$link: " sh -i;; + sk*) return 1;; + *) sysconf_verify_help "$link";; + esac + done +} + +# +# sysconf_restore_conffiles +# restore the configuration files from a directory. 'source-dir' +# If is a directory of files from sysconf_save_conffiles. The +# list of files restored is written to the third argument (restore), +# but is not required (/dev/null would be ok). +# +# the list of files to restore is read from stdin, along with the +# processing option for each file (the format is as produced by +# sysconf_save_conffiles in the 'list' output). +sysconf_restore_conffiles(){ + local ffsdir saved restore + # these are the globals used by the above function + ffsdir="$1" + saved="$2" + restore="$3" + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -d "$saved" -a -n "$restore" || { + echo "restore_conffiles: invalid arguments: '$*'" >&2 + echo " usage sysconf_restore_conffiles " >&2 + return 1 + } + # + # read the list and process each given file + while read op file + do + # handle .configured specially (to preserve the original datestamp) + if test "$file" = "etc/.configured" + then + # this should definately not fail because of the test above! + if cp -a "$saved/$file" "$ffsdir/$file" + then + echo "$file" >&3 + else + echo "sysconf_restore_conffiles: $file: timestamp copy failed (ignored)" >&2 + fi + elif test -h "$saved/file" -o -h "$ffsdir/$file" + then + # new or old symbolic link + if test -h "$saved/$file" -a -h "$ffsdir/$file" && + test "$(readlink "$saved/$file")" = "$(readlink "$ffsdir/$file")" + then + # no change + echo "$file" >&3 + else + # assume a change regardless + case "$op" in + preserve) + echo "$file" + echo "$file" >&3;; + diff) # need user input + if sysconf_verify_link "$file" <>/dev/tty >&0 2>&0 + then + echo "$file" + echo "$file" >&3 + fi;; + esac + fi + else + # only overwrite if necessary + if test -e "$ffsdir/$file" && cmp -s "$saved/$file" "$ffsdir/$file" + then + # do not overwrite + echo "$file" >&3 + elif test ! -e "$ffsdir/$file" + then + # always preserve + echo "$file" + echo "$file" >&3 + else + case "$op" in + preserve) + echo "$file" + echo "$file" >&3;; + diff) # the files are different, get user input + if sysconf_verify "$file" <>/dev/tty >&0 2>&0 + then + echo "$file" + echo "$file" >&3 + fi;; + esac + fi + fi + done 3>"$restore" | (cd "$saved"; exec cpio -p -d -u "$ffsdir") +} + +# +# sysconf_test_restore +# return true only if the restore does not need to do an interactive +# compare +sysconf_test_restore(){ + local ffsdir saved + # these are the globals used by the above function + ffsdir="$1" + saved="$2" + # this is an error case, but return 0 so that the error is + # detected later + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -d "$saved" || + return 0 + # + # read the list and check each diff file (this is just a copy of the + # logic above with all the work removed!) + while read op file + do + # handle .configured specially (to preserve the original datestamp) + if test "$op" != diff + then + : # no diff required + elif test "$file" = "etc/.configured" + then + : # special handling + elif test -h "$saved/file" -o -h "$ffsdir/$file" + then + # new or old symbolic link + if test -h "$saved/$file" -a -h "$ffsdir/$file" && + test "$(readlink "$saved/$file")" = "$(readlink "$ffsdir/$file")" + then + : # no change + else + # assume a change regardless + return 1 + fi + else + # only overwrite if necessary + if test -e "$ffsdir/$file" && cmp -s "$saved/$file" "$ffsdir/$file" + then + : # do not overwrite + elif test ! -e "$ffsdir/$file" + then + : # always preserve + else + # a change + return 1 + fi + fi + done + + return 0 +} + +# +# mountflash "flash device" "flash root directory" {mount options} +# Finds and mounts the flash file system on the given directory +mountflash(){ + local ffsdev ffsdir + + ffsdev="$1" + test -n "$ffsdev" -a -b "$ffsdev" || { + echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 + return 1 + } + shift + + ffsdir="$1" + test -n "$ffsdir" -a -d "$ffsdir" || { + echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2 + return 1 + } + shift + + mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || { + echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2 + return 1 + } + return 0 +} + +# +# umountflash [-r] "flash device" +# unmount any instance of the given flash device, if -r is specified a mount on +# root is an error, otherwise a mount on root is ignored (and remains). +umountflash(){ + local rootok ffsno ffsdev + rootok=1 + case "$1" in + -r) rootok= + shift;; + esac + # + # The argument is ffsdev + ffsdev="$1" + ffsno="$(devio "<<$ffsdev" prd)" + test -n "$ffsno" -a "$ffsno" -ge 0 || { + echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2 + return 1 + } + # + # Make sure that Flashdisk isn't mounted on / + if test -z "$rootok" -a "$(devio "<&2 + return 1 + fi + # + # The function is currently always used interactively, so output + echo "$0: umounting any existing mount of $ffsdev" >&2 + # + # check each mount point, do this last first because otherwise nested + # mounts of ffsdev cannot be umounted. + ffs_umount() { + local device mp type options stuff + + read device mp type options stuff + test -z "$device" && return 0 + + # handle following entries first + ffs_umount || return 1 + + # handle this entry, since this is currently only used for unmounting + # the flash root partition we know a file which must exist... + case "$mp/$type" in + //jffs2);; # skip / + */jffs2)test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" || + umount "$mp" || { + echo "$0: $mp: unable to umount $ffsdev" >&2 + return 1 + };; + esac + + return 0 + } + # + ffs_umount &2 + return 1 + } + + return 0 +} + +# +# sysconf_save +# save the system configuration to $syspart - $syspart must exist and +# there must be a writeable device for it. +sysconf_save(){ + local sysdev ffsdev ffsdir saved list size status + ffsdev="$(mtblockdev $ffspart)" + sysdev="$(mtblockdev $syspart)" + status=1 + if test -n "$sysdev" -a -b "$sysdev" -a -n "$ffsdev" -a -b "$ffsdev" + then + # this will succeed silently if the flash device is on / + umountflash "$ffsdev" || exit 1 + # + # Everything is umounted, now remount on a temporary directory. + ffsdir="/tmp/flashdisk.$$" + mkdir "$ffsdir" || { + echo "$0: $ffsdir: failed to create temporary directory" >&2 + exit 1 + } + # + mountflash "$ffsdev" "$ffsdir" -o ro || { + rmdir "$ffsdir" + exit 1 + } + # need temporary files for the cpio output and the listing + saved=/tmp/cpio.$$ + list=/tmp/preserve.$$ + rm -rf "$saved" "$list" + sysconf_save_conffiles "$ffsdir" "$saved" "$list" || { + echo "$0: $saved: archive of saved configuration files failed" >&2 + rm -rf "$saved" + rm "$list" + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + return 1 + } + # ignore the error in this case: + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + # + # we now have: + # /etc/default/sysconf the basic config + # /tmp/preserve.$$ the list of saved files + # /tmp/cpio.$$ the CPIO archive of those files + # + # make one big file with the sysconf data followed by the + # compressed archive in /tmp/sysconf.$$ + { { cat /etc/default/sysconf + echo '[preserve]' + } | sed -n '1,/^\[preserve\]^/p' + while read op file + do + echo "$op"="$file" + done <"$list" + } >/tmp/sysconf.$$ + size="$(devio "<>/tmp/sysconf.$$ + # + # more cleanup, then try to write the new sysconf to $syspart + # the format is a 4 byte big-endian length then the text data + # if the data won't fit exit with error code 7 + rm "$saved" "$list" + devio -p "<>$sysdev" ' + $( $4+ # > + !! 7 + $) 0 + wb '"$size"',4 + cp $' + case $? in + 0) echo " done" >&2 + status=0;; + 1) echo " failed" >&2 + echo " $syspart could not be written (no changes made)" >&2;; + 3) echo " failed" >&2 + echo " $syspart partially written, you may want to reset it" >&2;; + 7) echo " failed" >&2 + echo " $syspart is too small: $size bytes required" >&2 + echo " No change made" >&2;; + *) echo " failed" >&2 + echo " Internal error writing $syspart" >&2;; + esac + # + rm -f /tmp/sysconf.$$ + else + echo "sysconf save: $syspart or $ffspart partition not found" >&2 + echo " A RedBoot partition named '$syspart' must exist in the system" >&2 + echo " flash memory for this command to work, and there must be a" >&2 + echo " block device to access this partition (udev will normally" >&2 + echo " create this automatically. The flash partition contents must" >&2 + echo " also be accessible in a partition called '$ffspart'" >&2 + echo + echo " To create the $syspart partition use the 'fis create' command" >&2 + echo " in the RedBoot boot loader, it is sufficient to make the" >&2 + echo " partition one erase block in size unless you have substantially" >&2 + echo " increased the size of the files listed in /etc/default/conffiles" >&2 + fi + + return $status +} + +# +# sysconf_restore [auto] +# restore previously saved configuration information from $syspart +sysconf_restore_error(){ + local root + root="$1" + shift + # ------------------------------------------------------------------------------- + { echo " WARNING: saved configuration files not restored" + test -n "$1" && echo "$*" + echo + echo "The configuration of this machine has been reinitialised using the values" + echo "from /etc/default/sysconf, however configuration files saved in the $syspart" + echo "partition have not been restored." + echo + echo "You can restore these files by correcting any reported errors then running" + echo + echo " sysconf restore" + echo + echo "from the command line. This will completely reinitialise the configuration" + echo "using the information in the $syspart partition." + } >"$root/etc/motd" + cat "$root/etc/motd" >&2 +} +# +sysconf_restore(){ + local sysdev ffsdev ffsdir saved restore size status sysconf_noninteractive config_root + + # if set this means 'do no diff' - this avoids the code above which + # would open /dev/tty and therefore allows this stuff to be done from + # an init script + sysconf_noninteractive= + test "$1" = auto && sysconf_noninteractive=1 + + ffsdev="$(mtblockdev $ffspart)" + sysdev="$(mtblockdev $syspart)" + status=1 + if test -n "$sysdev" -a -b "$sysdev" -a -n "$ffsdev" -a -b "$ffsdev" && + sysconf_valid + then + # this will succeed silently if the flash device is on / + umountflash "$ffsdev" || exit 1 + # + # Everything is umounted, now remount on a temporary directory. + ffsdir="/tmp/flashdisk.$$" + config_root="$ffsdir" + mkdir "$ffsdir" || { + echo "$0: $ffsdir: failed to create temporary directory" >&2 + exit 1 + } + # + mountflash "$ffsdev" "$ffsdir" || { + rmdir "$ffsdir" + exit 1 + } + # + # first restore the $syspart section + sysconf_read "$ffsdir" || sysconf_default "$ffsdir" + # + # now use this to regenerate the system files + sysconf_reload "$ffsdir" + # + # now examine the [preserve] section, if it is there restore + # it if possible. + if test -n "$(syssection preserve)" + then + # 'saved' is a directory, 'restore' is a file (which is + # used to detect unrestored files). The directory needs + # to be populated with files. + saved=/tmp/cpio.$$ + restore=/tmp/restore.$$ + rm -rf "$saved" "$restore" + # + mkdir "$saved" || { + sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory" + return 1 + } + # + # the CPIO archive is gzip compressed after the text part + # of sysconf, gzip will handle the LZ stream termination + # correctly (and break the pipe) so we don't need to know + # the real length of the data + devio "<<$sysdev" '<=b4+.' 'cp $s-' | gunzip | ( + cd "$saved" + exec cpio -i -d -m -u + ) || { + rm -rf "$saved" + sysconf_restore_error "$ffsdir" "$saved: cpio -i failed" + return 1 + } + # either there must be no 'diff' files or it must + # be possible to interact with a real user. + if test -z "$sysconf_noninteractive" || + syssection preserve | sysconf_test_restore "$ffsdir" "$saved" + then + # + # remove the 'init' motd from sysconf_reload + rm "$ffsdir/etc/motd" + # + # now restore from the directory, using the information in + # the preserve section, if this fails in a non-interactive + # setting the system might not reboot + syssection preserve | + sysconf_restore_conffiles "$ffsdir" "$saved" "$restore" || { + # there is a chance of the user cleaning this up +#------------------------------------------------------------------------------ + sysconf_restore_error "$ffsdir" \ +"$0: $saved: restore of saved configuration files failed. + The flash file system is mounted on $ffsdir. + The saved files are in $saved and the list of files selected for + restore is in $restore. + You should restore any required configuration from $saved, then umount + $ffsdir and reboot." + # this prevents cleanup/umount + return 1 + } + # + # remove the copied files (i.e. the ones which were preserved) + ( cd "$saved" + exec rm $(cat "$restore") + ) + rm "$restore" + # + # clean up, files left in $saved need to be handled by the user + files="$(find "$saved" ! -type d -print)" + if test -n "$files" + then +#------------------------------------------------------------------------------ + sysconf_restore_error "$ffsdir" \ +"$0: some saved configuration files have not been handled: + +$files + +These files can be examined in $saved and restored to +$ffsdir if required. The saved files are in a temporary +directory and will not be retained across a reboot - copy then elsewhere if +you are unsure whether they are needed." + return 1 + fi + # + # so this is safe now (no files, links etc) + rm -rf "$saved" + else + rm -rf "$saved" + # non-interactive and some changed diff files + sysconf_restore_error "$ffsdir" \ +"$0: some of the saved configuration files must be +examined before restoration" + # but continue to the umount + fi + fi + # + # ignore the error in this case: + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + status=0 + else + echo "sysconf restore: $syspart or $ffspart partition not found" >&2 + echo " You must have used 'sysconf save' to save configuration data" >&2 + echo " into the $syspart partition before using this command. The command" >&2 + echo " will restore the configuration data to the flash root partition" >&2 + echo " named '$ffspart' - this must also be accessible." >&2 + fi + + return $status +} + +# +# read_one 'prompt' 'group' 'name' +# read a single value +read_one() { + local n o + o="$(sysval "$2" "$3")" + echo -n "$1 [$o]: " >/dev/tty + read n > /etc/hosts + ;; + dhcp) sed -i -e "s/localhost\$/localhost $disk_server_name/" /etc/hosts + ;; + *) bootproto=dhcp;; + esac + # + # The other stuff which cannot be changed + lan_interface="$(config iface)" + # + # Write this out to a new sysconf + { echo "[network]" + echo "lan_interface=$lan_interface" + test -n "$disk_server_name" && echo "disk_server_name=$disk_server_name" + test -n "$w_d_name" && echo "w_d_name=$w_d_name" + echo "bootproto=$bootproto" + case "$bootproto" in + static) echo "ip_addr=$ip_addr" + test -n "$netmask" && echo "netmask=$netmask" + test -n "$gateway" && echo "gateway=$gateway" + test -n "$dns_server1" && echo "dns_server1=$dns_server1" + test -n "$dns_server2" && echo "dns_server2=$dns_server2" + test -n "$dns_server3" && echo "dns_server3=$dns_server3" + ;; + esac + } >/etc/default/sysconf + # + # And reload the result + sysconf_reload + # + # The remove the spurious 'init' motd + rm /etc/motd +} + +# +# sysconf_help +# help text +sysconf_help(){ + # ------------------------------------------------------------------------------- + echo "sysconf: usage: sysconf init|read|default|reload|save|restore" >&2 + echo " init: initialise network information when DHCP is not available" >&2 + echo " read: the current $syspart partition is read into /etc/default/sysconf" >&2 + echo " default: a default /etc/default/sysconf is created" >&2 + echo " reload: system configuration files are recreated from /etc/default/sysconf" >&2 + echo " save: /etc/default/sysconf and the files listed in /etc/default/conffiles" >&2 + echo " are written to the $syspart partition" >&2 + echo " restore: the configuration information in the $syspart partition saved by" >&2 + echo " 'sysconf save' is restored" >&2 +} + +# +# the real commands +sysconf_command="$1" +test $# -gt 0 && shift +case "$sysconf_command" in +init) sysconf_init "$@";; +read) sysconf_read "$@";; +default)sysconf_default "$@";; +reload) sysconf_reload "$@";; +save) sysconf_save "$@";; +restore)sysconf_restore "$@";; +valid) sysconf_valid "$@";; + +sysconf)# just load the functions + ;; + +*) # help text + sysconf_help "$@";; +esac diff --git a/packages/sysconf/files/sysconfsetup b/packages/sysconf/files/sysconfsetup new file mode 100644 index 0000000000..7b91a0e331 --- /dev/null +++ b/packages/sysconf/files/sysconfsetup @@ -0,0 +1,59 @@ +#!/bin/sh +# This script is run once when the system first boots. Its sole +# purpose is to create /etc/default/sysconf (the overall system +# configuration file) and other files derived from this. +# +# The script runs immediately after S10checkroot.sh - this is the +# point at which the rootfs will be mounted rw even if the kernel +# booted with it ro. +# +# rm or mv the file (/etc/default/sysconf) to recreate it, run this +# script with the reload option to overwrite the system files. The +# configuration files described in sysconf_reload (in +# /sbin/sysconf) will be overwritten on reload. +# +# start: standard startup, do a complete (auto) restore if necessary +# reinit: always do a complete auto restore +# reload: just reload sysconf (no config files!) +# +# /etc/default/functions contains useful utility functions - it's +# in a separate file so that it can be loaded by any script +# load_functions "source" +# load the functions in '/sbin/source' - relies on /sbin/source being +# a shell script and having support for this function. + +# load_functions "source" +# load the functions in '/sbin/source' - relies on /sbin/source being +# a shell script and having support for this function. +load_functions(){ + test -n "$1" -a -x "/sbin/$1" && . "/sbin/$1" || { + echo "$0: /sbin/$1: script not found" >&2 + return 1 + } +} + +load_functions sysconf || exit 1 + +case "$1" in +start) test -s /etc/default/sysconf || { + if sysconf_read + then + if sysconf_valid + then + sysconf_restore auto + else + sysconf_reload + fi + else + sysconf_default + sysconf_reload + fi + };; + +reload) test -s /etc/default/sysconf || sysconf_read || sysconf_default + sysconf_reload;; + +reinit) sysconf_restore auto;; + +*) ;; +esac diff --git a/packages/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb new file mode 100644 index 0000000000..fd37cd01f7 --- /dev/null +++ b/packages/sysconf/sysconf_0.1.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "System Configuration save/restore functionality" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "devio cpio findutils diffutils" +PR = "r8" + +# Currently, the scripts only support ixp4xx machines. +# Feel free to add to the scripts ... +COMPATIBLE_MACHINE = '(ixp4xx|nslu2)' + +SRC_URI = "file://sysconfsetup \ + file://conffiles \ + file://sysconf \ + " + +SCRIPTS = "sysconf" +INITSCRIPTS = "sysconfsetup" + +# This just makes things easier... +S="${WORKDIR}" + +do_install() { + # Directories + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d \ + ${D}${base_sbindir} + + # Init scripts + install -m 0755 sysconfsetup ${D}${sysconfdir}/init.d/ + + # Configuration files + install -m 0644 conffiles ${D}${sysconfdir}/default + + # Shell scripts + install -m 0755 sysconf ${D}${base_sbindir}/sysconf +} + +pkg_postinst() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt sysconfsetup start 12 S . +} + +pkg_postrm() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt sysconfsetup remove +} + +CONFFILES = "${sysconfdir}/default/conffiles" -- cgit v1.2.3 From 039f604e475ef472d701bcfaca22b0098e1a8dea Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 11:39:27 +0000 Subject: arm-kernel-shim: Updated the configs, so that the console is listed first --- packages/arm-kernel-shim/arm-kernel-shim_1.3.bb | 2 +- packages/arm-kernel-shim/files/config-dsmg600.h | 2 +- packages/arm-kernel-shim/files/config-nas100d.h | 2 +- packages/arm-kernel-shim/files/config-nslu2.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb index 4014d9e866..339f663e25 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r4" +PR = "r5" COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index 3203052d51..f8caccecd4 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE \ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 964 diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 846161d016..62c5556999 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 865 diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index d641523841..2b597c2b7f 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 597 -- cgit v1.2.3 From ef45e99c4cd8b2c979d05af13632f2dbb3978c66 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Mar 2007 09:53:29 +0000 Subject: tzcode-native: Replace unfetchable 2007c with 2007d. --- packages/tzcode/tzcode-native_2007c.bb | 21 --------------------- packages/tzcode/tzcode-native_2007d.bb | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 packages/tzcode/tzcode-native_2007c.bb create mode 100644 packages/tzcode/tzcode-native_2007d.bb (limited to 'packages') diff --git a/packages/tzcode/tzcode-native_2007c.bb b/packages/tzcode/tzcode-native_2007c.bb deleted file mode 100644 index aed4253e81..0000000000 --- a/packages/tzcode/tzcode-native_2007c.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" - -PR = "r2" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -inherit native - -do_stage () { - install -d ${STAGING_BINDIR_NATIVE} - install -m 755 zic ${STAGING_BINDIR_NATIVE}/ - install -m 755 zdump ${STAGING_BINDIR_NATIVE}/ - install -m 755 tzselect ${STAGING_BINDIR_NATIVE}/ -} - -do_install () { - : -} diff --git a/packages/tzcode/tzcode-native_2007d.bb b/packages/tzcode/tzcode-native_2007d.bb new file mode 100644 index 0000000000..8e721d6d9a --- /dev/null +++ b/packages/tzcode/tzcode-native_2007d.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" + +PR = "r0" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ + ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +inherit native + +do_stage () { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 zic ${STAGING_BINDIR_NATIVE}/ + install -m 755 zdump ${STAGING_BINDIR_NATIVE}/ + install -m 755 tzselect ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + : +} -- cgit v1.2.3 From 20f234ec25f14c0a2ac1d23ddd079530fcc392b1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Mar 2007 09:56:53 +0000 Subject: tzdata: replace unfetchable 2007c with 2007d --- packages/tzdata/tzdata_2007c.bb | 158 ---------------------------------------- packages/tzdata/tzdata_2007d.bb | 158 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 158 deletions(-) delete mode 100644 packages/tzdata/tzdata_2007c.bb create mode 100644 packages/tzdata/tzdata_2007d.bb (limited to 'packages') diff --git a/packages/tzdata/tzdata_2007c.bb b/packages/tzdata/tzdata_2007c.bb deleted file mode 100644 index 1e8ff25137..0000000000 --- a/packages/tzdata/tzdata_2007c.bb +++ /dev/null @@ -1,158 +0,0 @@ -DESCRIPTION = "Timezone data" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "tzcode-native" - -PR = "r1" - -PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -RPROVIDES = "tzdata" -RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -TZONES= "africa antarctica asia australasia europe northamerica southamerica \ - factory solar87 solar88 solar89 etcetera backward systemv \ -# pacificnew \ - " - -do_compile () { - for zone in ${TZONES}; do \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - done -} - -do_install () { - install -d ${D}/usr ${D}${datadir}/zoneinfo - cp -pPR ${S}/usr ${D}/ -} - -# Packages primarily organized by directory with a major city -# in most time zones in the base package - -PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" - -FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" -RPROVIDES_tzdata-africa = "tzdata-africa" - -FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ - ${datadir}/zoneinfo/US/* \ - ${datadir}/zoneinfo/Brazil/* \ - ${datadir}/zoneinfo/Canada/* \ - ${datadir}/zoneinfo/Mexico/* \ - ${datadir}/zoneinfo/Chile/*" -RPROVIDES_tzdata-americas = "tzdata-americas" - -FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" -RPROVIDES_tzdata-antarctica = "tzdata-antarctica" - -FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" -RPROVIDES_tzdata-arctic = "tzdata-arctic" - -FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ - ${datadir}/zoneinfo/Indian/* \ - ${datadir}/zoneinfo/Mideast/*" -RPROVIDES_tzdata-asia = "tzdata-asia" - -FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" -RPROVIDES_tzdata-atlantic = "tzdata-atlantic" - -FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" -RPROVIDES_tzdata-australia = "tzdata-australia" - -FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" -RPROVIDES_tzdata-europe = "tzdata-europe" - -FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" -RPROVIDES_tzdata-pacific = "tzdata-pacific" - -FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" -RPROVIDES_tzdata-posix = "tzdata-posix" - -FILES_tzdata-right += "${datadir}/zoneinfo/right/*" -RPROVIDES_tzdata-right = "tzdata-right" - - -FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ - ${datadir}/zoneinfo/Egypt \ - ${datadir}/zoneinfo/Eire \ - ${datadir}/zoneinfo/Factory \ - ${datadir}/zoneinfo/GB-Eire \ - ${datadir}/zoneinfo/Hongkong \ - ${datadir}/zoneinfo/Iceland \ - ${datadir}/zoneinfo/Iran \ - ${datadir}/zoneinfo/Israel \ - ${datadir}/zoneinfo/Jamaica \ - ${datadir}/zoneinfo/Japan \ - ${datadir}/zoneinfo/Kwajalein \ - ${datadir}/zoneinfo/Libya \ - ${datadir}/zoneinfo/Navajo \ - ${datadir}/zoneinfo/Poland \ - ${datadir}/zoneinfo/Portugal \ - ${datadir}/zoneinfo/Singapore \ - ${datadir}/zoneinfo/Turkey" -RPROVIDES_tzdata-misc = "tzdata-misc" - - -FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ - ${datadir}/zoneinfo/America/Anchorage \ - ${datadir}/zoneinfo/America/Los_Angeles \ - ${datadir}/zoneinfo/America/Denver \ - ${datadir}/zoneinfo/America/Chicago \ - ${datadir}/zoneinfo/America/New_York \ - ${datadir}/zoneinfo/America/Caracas \ - ${datadir}/zoneinfo/America/Sao_Paulo \ - ${datadir}/zoneinfo/Europe/London \ - ${datadir}/zoneinfo/Europe/Paris \ - ${datadir}/zoneinfo/Africa/Cairo \ - ${datadir}/zoneinfo/Europe/Moscow \ - ${datadir}/zoneinfo/Asia/Dubai \ - ${datadir}/zoneinfo/Asia/Karachi \ - ${datadir}/zoneinfo/Asia/Dhaka \ - ${datadir}/zoneinfo/Asia/Bankok \ - ${datadir}/zoneinfo/Asia/Hong_Kong \ - ${datadir}/zoneinfo/Asia/Tokyo \ - ${datadir}/zoneinfo/Australia/Sydney \ - ${datadir}/zoneinfo/Pacific/Noumea \ - ${datadir}/zoneinfo/CET \ - ${datadir}/zoneinfo/CST6CDT \ - ${datadir}/zoneinfo/EET \ - ${datadir}/zoneinfo/EST \ - ${datadir}/zoneinfo/EST5EDT \ - ${datadir}/zoneinfo/GB \ - ${datadir}/zoneinfo/GMT \ - ${datadir}/zoneinfo/GMT+0 \ - ${datadir}/zoneinfo/GMT-0 \ - ${datadir}/zoneinfo/GMT0 \ - ${datadir}/zoneinfo/Greenwich \ - ${datadir}/zoneinfo/HST \ - ${datadir}/zoneinfo/MET \ - ${datadir}/zoneinfo/MST \ - ${datadir}/zoneinfo/MST7MDT \ - ${datadir}/zoneinfo/NZ \ - ${datadir}/zoneinfo/NZ-CHAT \ - ${datadir}/zoneinfo/PRC \ - ${datadir}/zoneinfo/PST8PDT \ - ${datadir}/zoneinfo/ROC \ - ${datadir}/zoneinfo/ROK \ - ${datadir}/zoneinfo/UCT \ - ${datadir}/zoneinfo/UTC \ - ${datadir}/zoneinfo/Universal \ - ${datadir}/zoneinfo/W-SU \ - ${datadir}/zoneinfo/WET \ - ${datadir}/zoneinfo/Zulu \ - ${datadir}/zoneinfo/Etc/*" diff --git a/packages/tzdata/tzdata_2007d.bb b/packages/tzdata/tzdata_2007d.bb new file mode 100644 index 0000000000..46d941c269 --- /dev/null +++ b/packages/tzdata/tzdata_2007d.bb @@ -0,0 +1,158 @@ +DESCRIPTION = "Timezone data" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "tzcode-native" + +PR = "r0" + +PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +RPROVIDES = "tzdata" +RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ + timezone-arctic timezone-asia timezone-atlantic \ + timezone-australia timezone-europe timezone-indian \ + timezone-iso3166.tab timezone-pacific timezone-zone.tab" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +TZONES= "africa antarctica asia australasia europe northamerica southamerica \ + factory solar87 solar88 solar89 etcetera backward systemv \ +# pacificnew \ + " + +do_compile () { + for zone in ${TZONES}; do \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + done +} + +do_install () { + install -d ${D}/usr ${D}${datadir}/zoneinfo + cp -pPR ${S}/usr ${D}/ +} + +# Packages primarily organized by directory with a major city +# in most time zones in the base package + +PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" + +FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" +RPROVIDES_tzdata-africa = "tzdata-africa" + +FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ + ${datadir}/zoneinfo/US/* \ + ${datadir}/zoneinfo/Brazil/* \ + ${datadir}/zoneinfo/Canada/* \ + ${datadir}/zoneinfo/Mexico/* \ + ${datadir}/zoneinfo/Chile/*" +RPROVIDES_tzdata-americas = "tzdata-americas" + +FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" +RPROVIDES_tzdata-antarctica = "tzdata-antarctica" + +FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" +RPROVIDES_tzdata-arctic = "tzdata-arctic" + +FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ + ${datadir}/zoneinfo/Indian/* \ + ${datadir}/zoneinfo/Mideast/*" +RPROVIDES_tzdata-asia = "tzdata-asia" + +FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" +RPROVIDES_tzdata-atlantic = "tzdata-atlantic" + +FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" +RPROVIDES_tzdata-australia = "tzdata-australia" + +FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" +RPROVIDES_tzdata-europe = "tzdata-europe" + +FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" +RPROVIDES_tzdata-pacific = "tzdata-pacific" + +FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" +RPROVIDES_tzdata-posix = "tzdata-posix" + +FILES_tzdata-right += "${datadir}/zoneinfo/right/*" +RPROVIDES_tzdata-right = "tzdata-right" + + +FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ + ${datadir}/zoneinfo/Egypt \ + ${datadir}/zoneinfo/Eire \ + ${datadir}/zoneinfo/Factory \ + ${datadir}/zoneinfo/GB-Eire \ + ${datadir}/zoneinfo/Hongkong \ + ${datadir}/zoneinfo/Iceland \ + ${datadir}/zoneinfo/Iran \ + ${datadir}/zoneinfo/Israel \ + ${datadir}/zoneinfo/Jamaica \ + ${datadir}/zoneinfo/Japan \ + ${datadir}/zoneinfo/Kwajalein \ + ${datadir}/zoneinfo/Libya \ + ${datadir}/zoneinfo/Navajo \ + ${datadir}/zoneinfo/Poland \ + ${datadir}/zoneinfo/Portugal \ + ${datadir}/zoneinfo/Singapore \ + ${datadir}/zoneinfo/Turkey" +RPROVIDES_tzdata-misc = "tzdata-misc" + + +FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ + ${datadir}/zoneinfo/America/Anchorage \ + ${datadir}/zoneinfo/America/Los_Angeles \ + ${datadir}/zoneinfo/America/Denver \ + ${datadir}/zoneinfo/America/Chicago \ + ${datadir}/zoneinfo/America/New_York \ + ${datadir}/zoneinfo/America/Caracas \ + ${datadir}/zoneinfo/America/Sao_Paulo \ + ${datadir}/zoneinfo/Europe/London \ + ${datadir}/zoneinfo/Europe/Paris \ + ${datadir}/zoneinfo/Africa/Cairo \ + ${datadir}/zoneinfo/Europe/Moscow \ + ${datadir}/zoneinfo/Asia/Dubai \ + ${datadir}/zoneinfo/Asia/Karachi \ + ${datadir}/zoneinfo/Asia/Dhaka \ + ${datadir}/zoneinfo/Asia/Bankok \ + ${datadir}/zoneinfo/Asia/Hong_Kong \ + ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Sydney \ + ${datadir}/zoneinfo/Pacific/Noumea \ + ${datadir}/zoneinfo/CET \ + ${datadir}/zoneinfo/CST6CDT \ + ${datadir}/zoneinfo/EET \ + ${datadir}/zoneinfo/EST \ + ${datadir}/zoneinfo/EST5EDT \ + ${datadir}/zoneinfo/GB \ + ${datadir}/zoneinfo/GMT \ + ${datadir}/zoneinfo/GMT+0 \ + ${datadir}/zoneinfo/GMT-0 \ + ${datadir}/zoneinfo/GMT0 \ + ${datadir}/zoneinfo/Greenwich \ + ${datadir}/zoneinfo/HST \ + ${datadir}/zoneinfo/MET \ + ${datadir}/zoneinfo/MST \ + ${datadir}/zoneinfo/MST7MDT \ + ${datadir}/zoneinfo/NZ \ + ${datadir}/zoneinfo/NZ-CHAT \ + ${datadir}/zoneinfo/PRC \ + ${datadir}/zoneinfo/PST8PDT \ + ${datadir}/zoneinfo/ROC \ + ${datadir}/zoneinfo/ROK \ + ${datadir}/zoneinfo/UCT \ + ${datadir}/zoneinfo/UTC \ + ${datadir}/zoneinfo/Universal \ + ${datadir}/zoneinfo/W-SU \ + ${datadir}/zoneinfo/WET \ + ${datadir}/zoneinfo/Zulu \ + ${datadir}/zoneinfo/Etc/*" -- cgit v1.2.3 From 2f9ed18e211a6aceb79bcc3e0958cb862894226a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Mar 2007 10:18:09 +0000 Subject: libsdl-directfb: lower preference, depends on directfb which fails to build. --- packages/libsdl/libsdl-directfb_1.2.9.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/libsdl/libsdl-directfb_1.2.9.bb b/packages/libsdl/libsdl-directfb_1.2.9.bb index 9145f5ad31..aa089e0ecb 100644 --- a/packages/libsdl/libsdl-directfb_1.2.9.bb +++ b/packages/libsdl/libsdl-directfb_1.2.9.bb @@ -6,6 +6,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" PR = "r1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ -- cgit v1.2.3 From 1ed622eced613ef83ac842e78d23bacbdc6e9171 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 13:38:24 +0000 Subject: cpio: Move cpio from /usr/bin to /bin and use update-alternatives to select it in preference to the busybox cpio. --- packages/cpio/cpio_2.5.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb index 9762b2e764..c21a59a44a 100644 --- a/packages/cpio/cpio_2.5.bb +++ b/packages/cpio/cpio_2.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GNU cpio is a program to manage archives of files." HOMEPAGE = "http://www.gnu.org/software/cpio/" SECTION = "console" LICENSE = "GPL" -PR = "r3" +PR = "r4" DEPENDS += " texinfo-native " @@ -14,16 +14,20 @@ inherit autotools do_install () { autotools_do_install + install -d ${D}${base_bindir}/ + mv ${D}${bindir}/cpio ${D}${base_bindir}/cpio.${PN} mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} } pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50 } pkg_prerm_${PN} () { + update-alternatives --remove cpio cpio.${PN} update-alternatives --remove rmt rmt.${PN} } -- cgit v1.2.3 From 04dd5164a7a07d9ca2b07385551f0e1c6a31535b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 26 Mar 2007 01:06:34 +0000 Subject: task-slugos: Made rng-tools conditional on not uclibc --- packages/tasks/task-slugos.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 92820e069c..99b9ea44ae 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -68,9 +68,12 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " + # Add daemon required for HW RNG support +SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools" +SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = "" SLUGOS_STANDARD_RRECOMMENDS += "\ -rng-tools \ +${SLUGOS_RNG_TOOLS_PACKAGE} \ " # Add modules required for usb support -- cgit v1.2.3 From b2baa20455ce4ddd908c8e95b62a40465c7000a5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 27 Mar 2007 16:24:49 +0000 Subject: ipkg-collateral: Should be marked as machine specific since it uses machine specific file overrides --- packages/ipkg/ipkg-collateral.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index cfe7d71c2d..244d29d08a 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,8 +1,8 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" -PR = "r6" -PACKAGE_ARCH = "all" +PR = "r7" +PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = " \ file://ipkg.conf.comments \ -- cgit v1.2.3 From b566a6e647b2c769a2e3c431ab7d76727bc77243 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 27 Mar 2007 17:56:24 +0000 Subject: openpbx: Update openpbx.org, thanks to hillct --- packages/openpbx/openpbx.org_1.2_rc3.bb | 35 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/openpbx/openpbx.org_1.2_rc3.bb b/packages/openpbx/openpbx.org_1.2_rc3.bb index 76c1f0c7bd..e343eb8729 100644 --- a/packages/openpbx/openpbx.org_1.2_rc3.bb +++ b/packages/openpbx/openpbx.org_1.2_rc3.bb @@ -1,6 +1,10 @@ DESCRIPTION = "A flexible VOIP soft switch/PBX." +DESCRIPTION_${PN}-ogi = "OpenPBX Gateway Inerface for scripted PBX call processing" +DESCRIPTION_${PN}-fax = "Fax send/receive file and T.38 support for OpenPBX" +DESCRIPTION_${PN}-ldap = "LDAP Directory services interface for OpenPBX" +DESCRIPTION_${PN}-sounds = "Standard set of audio prompts for OpenPBX" HOMEPAGE = "http://www.openpbx.org" -#RDEPENDS = "ssmtp" +RDEPENDS = "ssmtp" SECTION = "voip" LICENSE = "GPL" DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \ @@ -9,7 +13,7 @@ DEPENDS_${PN}-ldap = "openldap" RRECOMMENDS = "logrotate" RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl" PV = "1.2_rc3" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \ svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \ @@ -26,10 +30,10 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \ - --disable-zaptel --with-directory-layout=lsb --with-chan_fax \ + --disable-zaptel --with-directory-layout=lsb --enable-t38 \ --with-codec-speex=${STAGING_DIR}/${HOST_SYS} --with-app_ldap \ --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \ - --enable-t38 --with-javascript --with-res_js \ + --with-javascript --with-res_js \ --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \ --includedir=${includedir} --infodir=${infodir} --mandir=${mandir} \ --localstatedir=${localstatedir} --libdir=${libdir}" @@ -69,11 +73,10 @@ FILES_${PN}-sounds = "${datadir}/openpbx.org/sounds/*" FILES_${PN}-dev = "${libdir}/openpbx.org/modules/*.la \ ${libdir}/openpbx.org/*.la \ ${includedir}/openpbx/*" -FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.so \ - ${libdir}/openpbx.org/modules/app_rxfax.so \ - ${libdir}/openpbx.org/modules/app_txfax.so \ +FILES_${PN}-fax = "${libdir}/openpbx.org/modules/app_backgrounddetect.so \ ${libdir}/openpbx.org/modules/app_faxdetect.so \ - ${sysconfdir}/openpbx.org/chan_fax.conf" + ${libdir}/openpbx.org/modules/app_rxfax.so \ + ${libdir}/openpbx.org/modules/app_txfax.so" FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.so \ ${datadir}/openpbx.org/ogi/*" FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*" @@ -81,11 +84,22 @@ FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*" pkg_postinst_prepend() { grep -q openpbx ${sysconfdir}/group || addgroup --system openpbx grep -q openpbx ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/openpbx.org --no-create-home --disabled-password --ingroup openpbx -s ${base_bindir}/false openpbx - chown -R openpbx:openpbx ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org + chown -R openpbx:openpbx ${libdir}/openpbx.org ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org /etc/init.d/populate-volatile.sh update } -CONFFILES_${PN}-fax += "${sysconfdir}/openpbx.org/chan_fax.conf" +pkg_postinst_${PN}-fax () { + chown -R openpbx:openpbx ${libdir}/openpbx.org +} + +pkg_postinst_${PN}-ldap () { + chown -R openpbx:openpbx ${libdir}/openpbx.org +} + +pkg_postinst_${PN}-sounds () { + chown -R openpbx:openpbx ${datadir}/openpbx.org +} + CONFFILES_${PN} += "${sysconfdir}/openpbx.org/musiconhold.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf" @@ -99,6 +113,7 @@ CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dnsmgr.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dundi.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/enum.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extconfig.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.ael" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/features.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/iax.conf" -- cgit v1.2.3 From 09b18d1fff43cef84dcaa8fa0723f0e38b92d5d1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Mar 2007 17:58:00 +0000 Subject: apt-package.inc: disable magic that doesn't work and causes builds to fail. Disable oe_libinstall as well, since lib* got built statically * people that care about and/or know apt internals should fix this --- packages/apt/apt-package.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc index 43f54cadab..8bf2b56739 100644 --- a/packages/apt/apt-package.inc +++ b/packages/apt/apt-package.inc @@ -77,11 +77,11 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + #eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + #oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true + #ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so + #oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true + #ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ -- cgit v1.2.3 From 1566696e78ee5757811d43ef5eae09bad406d050 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Mar 2007 18:27:43 +0000 Subject: apt.inc: provide an example on how to provide the glibc version to configure --- packages/apt/apt.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages') diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index b18ed93782..dbf5765205 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -8,3 +8,8 @@ S = "${WORKDIR}/apt-${PV}" inherit autotools gettext EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" + +# Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use +# Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4) +# Koen - 20070327 +EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4" -- cgit v1.2.3 From 84475325fed1cf7e271ac66b0fd9cb36532e4d4f Mon Sep 17 00:00:00 2001 From: Manuel Teira Date: Tue, 27 Mar 2007 18:31:20 +0000 Subject: xserver-kdrive: update imageon patch, closes #2052 --- .../xserver-kdrive/kdrive-imageon.patch | 66 +++++----------------- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 2 +- 2 files changed, 16 insertions(+), 52 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch index 86ab49e1b2..f4272f80e0 100644 --- a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch @@ -6,6 +6,7 @@ # -XV Extension # -Internal and External Imageon offscreen memory support # -Hardware RandR rotation (without using a shadow framebuffer) +# -Support for RandR mode changing # # Patch managed by http://www.holgerschurig.de/patcher.html @@ -128,7 +129,7 @@ + $(FBDEV_LIBS) --- /dev/null +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon.c -@@ -0,0 +1,607 @@ +@@ -0,0 +1,606 @@ +/* + * Copyright © 2007 Manuel Teira + * @@ -419,14 +420,13 @@ + + w100c->hw_window.offset = W100_HOST2CARD(screen->fb[0].frameBuffer); + -+ -+ W100ComputeMouseMatrix(&m, screen->randr, -+ w100StartupInfo.portrait ? -+ W100_MIN(screen->width, screen->height) : -+ W100_MAX(screen->width, screen->height), -+ w100StartupInfo.portrait ? -+ W100_MAX(screen->width, screen->height) : -+ W100_MIN(screen->width, screen->height)); ++ KdComputeMouseMatrix(&m, screen->randr, ++ w100StartupInfo.portrait ? ++ W100_MIN(screen->width, screen->height) : ++ W100_MAX(screen->width, screen->height), ++ w100StartupInfo.portrait ? ++ W100_MAX(screen->width, screen->height) : ++ W100_MIN(screen->width, screen->height)); + + KdSetMouseMatrix(&m); + @@ -527,7 +527,7 @@ + screen->randr = randr; + screen->width = pScreen->width; + screen->height = pScreen->height; -+ w100c->hw_window.randr = KdAddRotation(randr, w100StartupInfo.randr); ++ w100c->hw_window.randr = KdSubRotation(w100StartupInfo.randr, randr); + w100c->hw_window.mode = W100GetBestMode(w100c, pScreen->width, pScreen->height); + + KdOffscreenSwapOut(screen->pScreen); @@ -902,7 +902,7 @@ +#endif --- /dev/null +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon_cursor.c -@@ -0,0 +1,563 @@ +@@ -0,0 +1,566 @@ +/* + * Copyright © 2007 Manuel Teira + * @@ -1157,6 +1157,7 @@ + (CARD32*) tmpCursor0, + (CARD32*) tmpCursor1); + ++ DUMP_CURSOR((CARD32*)tmpCursor1); + /* Correct endianness */ + src = (CARD32*) tmpCursor1; + dst = (CARD32*) (pCurPriv->area->vidmem->base + pCurPriv->area->offset); @@ -1275,6 +1276,7 @@ + W100CardInfo(pScreenPriv); + W100ScreenInfo(pScreenPriv); + W100Cursor *pCurPriv = &w100s->cursor; ++ DBG_IMAGEON(("W100RealizeCursor\n")); + + if (!pScreenPriv->enabled) { + return TRUE; @@ -1293,6 +1295,7 @@ +static Bool +W100UnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) +{ ++ DBG_IMAGEON(("W100UnrealizeCursor\n")); + return TRUE; +} + @@ -6228,7 +6231,7 @@ +} --- /dev/null +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon_support.c -@@ -0,0 +1,1477 @@ +@@ -0,0 +1,1438 @@ +/* + * Copyright © 2007 Manuel Teira + * @@ -7656,45 +7659,6 @@ + return TRUE; +} + -+void -+W100ComputeMouseMatrix(KdMouseMatrix *m, Rotation randr, int width, int height) -+{ -+ int x_dir = 1, y_dir = 1; -+ int i, j; -+ int size[2]; -+ -+ size[0] = width; size[1] = height; -+ if (randr & RR_Reflect_X) -+ x_dir = -1; -+ if (randr & RR_Reflect_Y) -+ y_dir = -1; -+ switch (randr & (RR_Rotate_All)) { -+ case RR_Rotate_0: -+ m->matrix[0][0] = x_dir; m->matrix[0][1] = 0; -+ m->matrix[1][0] = 0; m->matrix[1][1] = y_dir; -+ break; -+ case RR_Rotate_90: -+ m->matrix[0][0] = 0; m->matrix[0][1] = x_dir; -+ m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0; -+ break; -+ case RR_Rotate_180: -+ m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0; -+ m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir; -+ break; -+ case RR_Rotate_270: -+ m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir; -+ m->matrix[1][0] = y_dir; m->matrix[1][1] = 0; -+ break; -+ } -+ for (i = 0; i < 2; i++) -+ { -+ m->matrix[i][2] = 0; -+ for (j = 0 ; j < 2; j++) -+ if (m->matrix[i][j] < 0) -+ m->matrix[i][2] = size[j] - 1; -+ } -+} -+ +void W100TransformTsLibCoordinates(long *x, long *y, void *closure) +{ + W100CardInfo *w100c = closure; diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index e3fd09f602..fafad38b1a 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PR = "r8" +PR = "r9" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -- cgit v1.2.3 From 4ff882fcb5831da2b573900d295724e87eb5b954 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Mar 2007 18:44:25 +0000 Subject: xserver-kdrive-imageon: bump PR of the right xserver --- packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb index 75b4a9956b..106d5405a6 100644 --- a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb @@ -11,7 +11,7 @@ DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PR = "r0" +PR = "r1" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive" -- cgit v1.2.3 From 1944b83357f5afec7e0560124ddfcf81b8fc07a5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 27 Mar 2007 21:53:18 +0000 Subject: linux-linkstationppc: Upgrade to 2.6.21-rc5 --- packages/linux/linux-linkstationppc_2.6.21-rc4.bb | 43 ----------------------- packages/linux/linux-linkstationppc_2.6.21-rc5.bb | 42 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 packages/linux/linux-linkstationppc_2.6.21-rc4.bb create mode 100644 packages/linux/linux-linkstationppc_2.6.21-rc5.bb (limited to 'packages') diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc4.bb b/packages/linux/linux-linkstationppc_2.6.21-rc4.bb deleted file mode 100644 index 0410c86706..0000000000 --- a/packages/linux/linux-linkstationppc_2.6.21-rc4.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc4" -SECTION = "kernel" -LICENSE = "GPL" -PR = "r0" - -DEPENDS = "dtc-native" - -COMPATIBLE_MACHINE = "linkstationppc" - -SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.21-rc4.bz2;patch=1 \ - file://defconfig \ - " - -S = "${WORKDIR}/linux-2.6.20" - -inherit kernel - -export ARCH="powerpc" - -KERNEL_IMAGETYPE = "uImage" - -FILES_kernel += "/boot/kuroboxHG.dtb \ - /boot/kuroboxHD.dtb" - -do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - ARCH=${ARCH} oe_runmake oldconfig -} - -do_install_append() { - dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHG.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHG.dts - dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHD.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHD.dts -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot -} - -do_deploy[dirs] = "${S}" - -addtask deploy before do_build after do_compile diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb new file mode 100644 index 0000000000..7a6efb0059 --- /dev/null +++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r0" + +DEPENDS = "dtc-native" +COMPATIBLE_MACHINE = "(lsppchd|lsppchg)" + +SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ + http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.21-rc5.bz2;patch=1 \ + file://defconfig \ + " + +S = "${WORKDIR}/linux-2.6.20" + +inherit kernel + +export ARCH="powerpc" + +KERNEL_IMAGETYPE = "uImage" + +FILES_kernel-image += "/boot/kuroboxHG.dtb \ + /boot/kuroboxHD.dtb" + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + ARCH=${ARCH} oe_runmake oldconfig +} + +do_install_append() { + dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHG.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHG.dts + dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHD.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHD.dts +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From e55d052b8fe7279f2fc23944fd5dd75e743d1a4b Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 27 Mar 2007 22:22:45 +0000 Subject: altboot: Update to latest version --- .../altboot/files/altboot-menu/Advanced/55-bin-sh | 4 +- packages/altboot/files/altboot.func | 2 +- packages/altboot/files/init.altboot | 13 +- packages/altboot/files/nslu2le/.mtn2git_empty | 0 packages/altboot/files/nslu2le/altboot-2.6.cfg | 55 +++++++ .../files/nslu2le/altboot-handlers/.mtn2git_empty | 0 .../files/nslu2le/altboot-handlers/05-USB-Storage | 90 +++++++++++ .../nslu2le/altboot-handlers/10-Onboard-Flash | 18 +++ .../files/nslu2le/altboot-menu/.mtn2git_empty | 0 .../altboot/files/nslu2le/altboot-menu/00-Default | 17 ++ .../files/nslu2le/altboot-menu/30-bootUSB-Stick | 174 +++++++++++++++++++++ .../altboot/files/nslu2le/altboot-menu/55-bin-sh | 27 ++++ .../files/nslu2le/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/set-bootdev | 150 ++++++++++++++++++ 14 files changed, 546 insertions(+), 4 deletions(-) create mode 100644 packages/altboot/files/nslu2le/.mtn2git_empty create mode 100644 packages/altboot/files/nslu2le/altboot-2.6.cfg create mode 100644 packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty create mode 100644 packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage create mode 100644 packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash create mode 100644 packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty create mode 100644 packages/altboot/files/nslu2le/altboot-menu/00-Default create mode 100644 packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick create mode 100644 packages/altboot/files/nslu2le/altboot-menu/55-bin-sh create mode 100644 packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty create mode 100755 packages/altboot/files/set-bootdev (limited to 'packages') diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh index 6c9aef3f3e..e4fe99ebae 100644 --- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh +++ b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh @@ -7,7 +7,7 @@ run_module() { test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/tty0 + test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/$OUT_TTY # Mount /proc, etc init_rootfs @@ -15,7 +15,7 @@ run_module() { echo -e "\nBoot system with 'exec /sbin/init 5'\n" while true do - exec $SH_SHELL /dev/tty0 2>&1 + exec $SH_SHELL /dev/$OUT_TTY 2>&1 echo "WARNING: Shell was killed!" done } diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index e990a06862..ae38c5b437 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -392,7 +392,7 @@ verify_master_pw() { test -e /etc/altboot.pwd && . /etc/altboot.pwd - if ! test -z "$MASTER_PASSWORD" + if test -n "$MASTER_PASSWORD" -a "$MASTER_PASSWORD" != "[none]" then auth_timeout="3" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 30868024b8..74200d1ec9 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -90,7 +90,7 @@ show_menu() { if ! test -d "$1/$file" then # NOTE: It is important to use "." here so that the script inherits - # the shell environment / all set variables! + # the shell environment / all set variables! M_TITLE="`. $1/$file title`" FLAGS="`$1/$file flags`" @@ -109,6 +109,8 @@ show_menu() { fi done +# debug_echo "FILES READ" + # Display directories below /etc/altboot-menu as menu-item # and add all scripts inside the directory to m_entry for dir in `ls -1` @@ -159,6 +161,8 @@ show_menu() { fi done +# debug_echo "DIRS READ" + echo "" } @@ -491,6 +495,7 @@ fi # The NSLU2 is an exception as it uses the way-ugly busybox "ps" # +mount | grep -q "^/proc" || mount -t proc proc /proc MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" case "$MACHINE" in @@ -507,6 +512,12 @@ case "$MACHINE" in ;; esac +if test "`basename "$0"`" = "altboot" +then + show_menu /etc/altboot-menu + exit 0 +fi + if test "$user_called" = "1" then echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY" diff --git a/packages/altboot/files/nslu2le/.mtn2git_empty b/packages/altboot/files/nslu2le/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/nslu2le/altboot-2.6.cfg b/packages/altboot/files/nslu2le/altboot-2.6.cfg new file mode 100644 index 0000000000..626c543085 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-2.6.cfg @@ -0,0 +1,55 @@ +# +# Altboot machine configuration for: NSLU2 / Kernel 2.6 +# + +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" + +# If set to "0" the menu will always be shown, if set to +# "[none]" there will be no menu and no delay +TIMEOUT="[none]" + +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +ENABLE_SOUND="no" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="yes" + + +# Can't do that due to missing console +ENABLE_IMAGECONF="no" + +SD_DEVICE="" +SD_KERNEL_MODULE="" + + +USB_HOST_AVAILABLE="yes" +USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +USB_NETWORKING_AVAILABLE="no" +USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" +USB_NW_DEVICE="usb0" + +INIT_RUNLEVEL="3" +NO_GUI_RL="" + +# The if set to "", altboot will force you to set a master password on +# first-boot +MASTER_PASSWORD="[none]" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" + +DISABLE_SD_BOOT="yes" +DISABLE_CF_BOOT="yes" +DISABLE_NOGUI_BOOT="yes" +DISABLE_BINSH_BOOT="yes" +DISABLE_INSTTGZ_BOOT="yes" diff --git a/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage new file mode 100644 index 0000000000..50d35ed542 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage @@ -0,0 +1,90 @@ +#!/bin/sh +# NOTE: Ported to altboot by CoreDump +# Based on the original turnup helper script. +# +# All parts by Matthias 'CoreDump' Hentges are hereby placed +# under the terms of the GPL +# +# boot from the hard disk partition "$1" (which +# must be given) using options from the rest of +# the command line. +# + +M_TITLE="Boot USB Storage" +test "$USB_HOST_AVAILABLE" = "yes" || exit 0 + +run_module() { + x=x +} + +case "$1" in +title) echo "$M_TITLE" ; exit 0 ;; +run) run_module "$2";; +esac + +nslu2_feeback heartbeat + +bootdev_data="$*" +bootdev_mode="`echo "$bootdev_data" | awk '{print $1}'`" +bootdev_name="`echo "$bootdev_data" | awk '{print $2}'`" +bootdev_uuid="`echo "$bootdev_data" | awk '{print $3}'`" + + +# Use the standard init path (see /etc/init.d/rcS) +export PATH=/sbin:/bin:/usr/sbin:/usr/bin +# +# Load the helper functions +. /etc/default/functions +. /etc/default/modulefunctions +# +leds boot system +# +if test -n "$1" +then + device="$bootdev_name" + UUID="$bootdev_uuid" + + shift + # proc is needed for UUID mount and module load + mount -t proc proc /proc + # load USB & SCSI storage modules (/proc required!) + echo "boot: loading modules required for disk boot" + loaddiskmods + # waiting for disk (FIXME) + sleep=6 + test "$sleep" -gt 0 && sleep "$sleep" + # + # fire the boot + echo "boot: rootfs: mount $* $device [$UUID]" + # + # Mount read-write because before exec'ing init + # If a UUID is given (in the environment) this + # is used in preference to the device, but if + # the UUID mount fails a standard device mount + # is attempted. + if test -n "$UUID" && + mount "$@" -U "$UUID" /mnt || + mount "$@" "$device" /mnt + then + # checkmount checks for sh, chroot, init + # and /mnt (i.e. /mnt/mnt in this case) + if checkmount /mnt + then + # pivot to /initrd if available, else /mnt + cd / + if test -d /mnt/initrd + then + swivel mnt initrd + else + swivel mnt mnt + fi + # swivel failed + fi + # Failure: unmount the partition + umount /mnt + fi +fi + +# fallback - use the flash boot +nslu2_feeback failure +exec /boot/flash diff --git a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash new file mode 100644 index 0000000000..394279c2af --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash @@ -0,0 +1,18 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: 10-Onboard-Flash +# Date: 20070218 (YMD) + +leds beep +. /etc/default/functions +leds boot system +test -x /sbin/init && exec /sbin/init +# fallback if /sbin/init has been deleted (bad!) +leds boot system panic +exec <>/dev/console >&0 2>&0 +test -x /sbin/sulogin && exec /sbin/sulogin +test -x /bin/sh && exec /bin/sh +exit 1 diff --git a/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/nslu2le/altboot-menu/00-Default b/packages/altboot/files/nslu2le/altboot-menu/00-Default new file mode 100644 index 0000000000..cb06661d72 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-menu/00-Default @@ -0,0 +1,17 @@ +# !/bin/sh +M_TITLE="Flash" + + +run_module() { + leds beep + leds boot system + exec $REAL_INIT "$INIT_RUNLEVEL" + exit 0 +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module;; +*) echo "Unknown parameter [$1]";; +esac + diff --git a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick new file mode 100644 index 0000000000..c6c215ecc4 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick @@ -0,0 +1,174 @@ +# !/bin/sh +# +# Copyright Matthias Hentges (c) 2005 +# +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) + + +M_TITLE="USB Attached Storage" + +test "$USB_HOST_AVAILABLE" = "yes" || exit 0 + +# This function is activated by init.altboot by calling this script with the "run" option +run_module() { + + test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" + + # Mount /proc, etc + init_rootfs + + echo -e "\nStarting USB..." + + for module in $USB_STORAGE_MODULES + do + echo -en "\t - $module: " + modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" + done + + echo "" + scan_devices + usb_show_menu + +# echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 +# +# mkdir -p /media/usb-storage >/dev/null 2>&1 +# +# sleep "$USB_STORAGE_WAIT" +# +# /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" +# +# echo "" +# +# # Check for a real fs and loop-images. +# check_target "/media/usb-storage" >/dev/tty0 +} + +scan_devices() { + reset_pref "available_devices" + + cnt=1 + + for scsi_disk in `ls -1 /sys/block/ | grep ^sd` + do + scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" + test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" + test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" + + test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" + test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" + + scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" + test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" + + set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" + set_pref "available_devices_short" "$cnt" "$scsi_disk" + set_pref "available_devices_type" "$cnt" "usb" + + let cnt=$cnt+1 + done + +} + +usb_show_menu() { + + cnt2=0 ; let cnt=$cnt-1 + while test "$cnt" != "$cnt2" + do + let cnt2=$cnt2+1 + get_pref "available_devices" "$cnt2" dev + + echo -e "\t[$cnt2] - $dev" + done + + while test -z "$selected_dev" + do + echo -en "\nYour choice: " + read junk + get_pref "available_devices" "$junk" selected_dev + get_pref "available_devices_type" "$junk" part_mode + +# debug_echo "show_menu(): selected: [$selected_dev]" + done + + if ( echo "$selected_dev" | grep -q "^Flash" ) + then + boot_from flash + else + get_pref "available_devices_short" "$junk" selected_dev +# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" + + partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" + test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" + + + echo -e "\nPlease select a partition on $selected_dev to boot from:\n" + + cnt=1 + for partition in $partitions + do + # We assume that partitions with a "size" < 10 are extended partitions + # and should not be listed. TYPE=swap is blacklisted as well. + part_size="`cat /sys/block/$selected_dev/$partition/size`" + part_type="`blkid -s TYPE -o value /dev/$partition`" + + if test "$part_size" -gt 10 -a "$part_type" != "swap" + then + let part_size="($part_size/2)/1000" + echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" + set_pref "available_partitions" "$cnt" "$partition" + + let cnt=$cnt+1 + fi + done + + while test -z "$selected_partition" + do + echo -en "\nYour choice: " + read junk + get_pref "available_partitions" "$junk" selected_partition + done + + part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" + + boot_from "$part_mode" "$selected_partition" "$part_uuid" + fi +} + +boot_from() { + debug_echo "boot_from() [$*]" + + part_mode="$1" + part_name="$2" + part_uuid="$3" + + case "$part_mode" in + usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 + rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev + + if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) + then + echo "** Note: UUID mount for $part_name failed" + mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" + fi + + if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit + then + copy_rootfs /tmp/mnt.set-bootdev/ + else + umount /tmp/mnt.set-bootdev + echo -e "\nSetting /dev/$part_name as boot-partition" + echo "3 $part_name $part_uuid" > /etc/altboot.last + fi + ;; + esac +} + +copy_rootfs() { + debug_echo "copy_rootfs() [$*]" +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module "$2";; +esac + diff --git a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh new file mode 100644 index 0000000000..1c3fccd9d9 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh @@ -0,0 +1,27 @@ +# !/bin/sh +M_TITLE="init=/bin/sh" + +test "$DISABLE_BINSH_BOOT" = yes && exit 0 + +run_module() { + + test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" + + test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >$OUT_TTY + + # Mount /proc, etc + init_rootfs + + echo -e "\nBoot system with 'exec /sbin/init 5'\n" + while true + do + exec $SH_SHELL <$OUT_TTY >$OUT_TTY 2>&1 + echo "WARNING: Shell was killed!" + done +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module;; +esac + diff --git a/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/set-bootdev b/packages/altboot/files/set-bootdev new file mode 100755 index 0000000000..60d0283dc4 --- /dev/null +++ b/packages/altboot/files/set-bootdev @@ -0,0 +1,150 @@ +#!/bin/sh + +VERSION="0.0.1" +ENABLE_DEBUG="yes" + +die() { + echo -e "ERROR: $1" + exit 1 +} + +. /etc/altboot.func || die "/etc/altboot.func is missing!" +test -d /sys/block || die "Sysfs problem? (/sys/block not found)" + +debug_echo() { + test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" +} + +scan_devices() { + reset_pref "available_devices" + + cnt=1 + set_pref "available_devices" "$cnt" "Flash" ; let cnt=$cnt+1 + + for scsi_disk in `ls -1 /sys/block/ | grep ^sd` + do + scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" + test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" + test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" + + test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" + test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" + + scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" + test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" + + set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" + set_pref "available_devices_short" "$cnt" "$scsi_disk" + set_pref "available_devices_type" "$cnt" "usb" + + let cnt=$cnt+1 + done + +} + +show_menu() { + echo -e "\nset-bootdev v$VERSION\n" + + echo -e "Please select the device you wish to boot from:\n" + + cnt2=0 ; let cnt=$cnt-1 + while test "$cnt" != "$cnt2" + do + let cnt2=$cnt2+1 + get_pref "available_devices" "$cnt2" dev + + echo -e "\t[$cnt2] - $dev" + done + + while test -z "$selected_dev" + do + echo -en "\nYour choice: " + read junk + get_pref "available_devices" "$junk" selected_dev + get_pref "available_devices_type" "$junk" part_mode + +# debug_echo "show_menu(): selected: [$selected_dev]" + done + + if ( echo "$selected_dev" | grep -q "^Flash" ) + then + boot_from flash + else + get_pref "available_devices_short" "$junk" selected_dev +# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" + + partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" + test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" + + + echo -e "\nPlease select a partition on $selected_dev to boot from:\n" + + cnt=1 + for partition in $partitions + do + # We assume that partitions with a "size" < 10 are extended partitions + # and should not be listed. TYPE=swap is blacklisted as well. + part_size="`cat /sys/block/$selected_dev/$partition/size`" + part_type="`blkid -s TYPE -o value /dev/$partition`" + + if test "$part_size" -gt 10 -a "$part_type" != "swap" + then + let part_size="($part_size/2)/1000" + echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" + set_pref "available_partitions" "$cnt" "$partition" + + let cnt=$cnt+1 + fi + done + + while test -z "$selected_partition" + do + echo -en "\nYour choice: " + read junk + get_pref "available_partitions" "$junk" selected_partition + done + + part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" + + boot_from "$part_mode" "$selected_partition" "$part_uuid" + fi +} + +boot_from() { + debug_echo "boot_from() [$*]" + + part_mode="$1" + part_name="$2" + part_uuid="$3" + + case "$part_mode" in + usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 + rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev + + if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) + then + echo "** Note: UUID mount for $part_name failed" + mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" + fi + + if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit + then + copy_rootfs /tmp/mnt.set-bootdev/ + else + umount /tmp/mnt.set-bootdev + echo -e "\nSetting /dev/$part_name as boot-partition" + echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf + fi + ;; + flash) echo "Setting the onboard flash as boot-partition" + echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf + ;; + esac +} + +copy_rootfs() { + debug_echo "copy_rootfs() [$*]" +} + +scan_devices +show_menu -- cgit v1.2.3 From efcbd9327aa0036799d20282b4639030203142f2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 27 Mar 2007 23:02:15 +0000 Subject: qte-mt, qte-mt-static 2.3.12: 2.3.12 is not fully tested version, lower DEF_PREF. * There were reports of build issues. --- packages/qte/qte-mt-static_2.3.12.bb | 2 ++ packages/qte/qte-mt_2.3.12.bb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb index c6e4f72667..9210d85dc3 100644 --- a/packages/qte/qte-mt-static_2.3.12.bb +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -1,6 +1,8 @@ require qte-common_${PV}.inc PR = "r4" +DEFAULT_PREFERENCE = "-1" + EXTRA_OECONF += "-static -thread" do_stage() { diff --git a/packages/qte/qte-mt_2.3.12.bb b/packages/qte/qte-mt_2.3.12.bb index 90e84fe38d..704081e639 100644 --- a/packages/qte/qte-mt_2.3.12.bb +++ b/packages/qte/qte-mt_2.3.12.bb @@ -1,6 +1,8 @@ require qte-common_${PV}.inc PR = "r2" +DEFAULT_PREFERENCE = "-1" + EXTRA_OECONF += "-thread" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 236ee589a8921c2f96c18f02d0ed3aeab38958b5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 27 Mar 2007 23:17:10 +0000 Subject: snes9x-sdl-qpe 1.39: Support both qte and qte-mt. * Closes #1975. --- packages/snes9x/snes9x-sdl-qpe_1.39.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb index 4e8a294d2b..adf49650d9 100644 --- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb +++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb @@ -3,7 +3,7 @@ SECTION = "opie/games" PRIORITY = "optional" DEPENDS = "libsdl-qpe" LICENSE = "snes9x" -PR = "r3" +PR = "r4" SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \ file://compile.patch;patch=1" @@ -13,10 +13,12 @@ FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE inherit qmake-base +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' + do_compile() { oe_runmake CC="${CC}" CCC="${CXX}" \ INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \ - LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -lqte" + LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -l${QT_LIBRARY}" } do_install() { -- cgit v1.2.3 From bc6a7c3e28e23252895ad1a11cd957e0548b1476 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 08:22:53 +0000 Subject: openmoko-keyboard: add openmoko-keyboard recipe based on matchbox-keyboard, and add it to task-openmoko --- packages/openmoko-apps/openmoko-keyboard_svn.bb | 19 +++++++++++++++++++ packages/tasks/task-openmoko.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-apps/openmoko-keyboard_svn.bb (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-keyboard_svn.bb b/packages/openmoko-apps/openmoko-keyboard_svn.bb new file mode 100644 index 0000000000..5bf5bbdd6a --- /dev/null +++ b/packages/openmoko-apps/openmoko-keyboard_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" +LICENSE = "GPL" +DEPENDS = "libfakekey expat libxft" +SECTION = "openmoko/input-methods" +PV = "0.0+svn${SRCDATE}" + +inherit openmoko autotools pkgconfig gettext + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = "--disable-cairo" + +FILES_${PN} = "${bindir}/* \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/openmoko-keyboard" + diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index dc4c7dcb0f..ece303d62a 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r31" +PR = "r32" PACKAGES = "\ task-openmoko-linux \ @@ -141,6 +141,7 @@ DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications" RDEPENDS_task-openmoko-demo = "\ matchbox-desktop \ matchbox-keyboard \ + openmoko-keyboard \ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ -- cgit v1.2.3 From fa3f91a6bdc75a97b9e562bdee897a979a4417b2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:23:31 +0000 Subject: X11R7.2 preparation: xorg-apps - add individual release support to xorg-app-common.inc - add new X11R7.2 releases (individual release versions) they have smaller versions than anything where PV begins with "X11R7."... but the epoch is set PE="1". Thus the new packages will only be selected by either bitbake with epoch support or by a distro that sets PREFERRED_VERSIONs for X11R7.2. --- packages/xorg-app/appres_1.0.1.bb | 7 +++++++ packages/xorg-app/bdftopcf_1.0.1.bb | 7 +++++++ packages/xorg-app/beforelight_1.0.2.bb | 7 +++++++ packages/xorg-app/editres_1.0.2.bb | 7 +++++++ packages/xorg-app/fonttosfnt_1.0.3.bb | 7 +++++++ packages/xorg-app/luit_1.0.2.bb | 7 +++++++ packages/xorg-app/sessreg_1.0.2.bb | 7 +++++++ packages/xorg-app/setxkbmap_1.0.3.bb | 7 +++++++ packages/xorg-app/twm_1.0.3.bb | 11 +++++++++++ packages/xorg-app/xauth_1.0.2.bb | 7 +++++++ packages/xorg-app/xdbedizzy_1.0.2.bb | 7 +++++++ packages/xorg-app/xdm_1.1.3.bb | 8 ++++++++ packages/xorg-app/xf86dga_1.0.2.bb | 7 +++++++ packages/xorg-app/xfs_1.0.4.bb | 7 +++++++ packages/xorg-app/xinit_1.0.3.bb | 8 ++++++++ packages/xorg-app/xmodmap_1.0.2.bb | 8 ++++++++ packages/xorg-app/xorg-app-common.inc | 3 ++- packages/xorg-app/xprop_1.0.2.bb | 7 +++++++ 18 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-app/appres_1.0.1.bb create mode 100644 packages/xorg-app/bdftopcf_1.0.1.bb create mode 100644 packages/xorg-app/beforelight_1.0.2.bb create mode 100644 packages/xorg-app/editres_1.0.2.bb create mode 100644 packages/xorg-app/fonttosfnt_1.0.3.bb create mode 100644 packages/xorg-app/luit_1.0.2.bb create mode 100644 packages/xorg-app/sessreg_1.0.2.bb create mode 100644 packages/xorg-app/setxkbmap_1.0.3.bb create mode 100644 packages/xorg-app/twm_1.0.3.bb create mode 100644 packages/xorg-app/xauth_1.0.2.bb create mode 100644 packages/xorg-app/xdbedizzy_1.0.2.bb create mode 100644 packages/xorg-app/xdm_1.1.3.bb create mode 100644 packages/xorg-app/xf86dga_1.0.2.bb create mode 100644 packages/xorg-app/xfs_1.0.4.bb create mode 100644 packages/xorg-app/xinit_1.0.3.bb create mode 100644 packages/xorg-app/xmodmap_1.0.2.bb create mode 100644 packages/xorg-app/xprop_1.0.2.bb (limited to 'packages') diff --git a/packages/xorg-app/appres_1.0.1.bb b/packages/xorg-app/appres_1.0.1.bb new file mode 100644 index 0000000000..4b6447a82e --- /dev/null +++ b/packages/xorg-app/appres_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "The appres program prints the resources seen by an application." + +DEPENDS += " virtual/libx11 libxt" + diff --git a/packages/xorg-app/bdftopcf_1.0.1.bb b/packages/xorg-app/bdftopcf_1.0.1.bb new file mode 100644 index 0000000000..c3e6ad2136 --- /dev/null +++ b/packages/xorg-app/bdftopcf_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." + +DEPENDS += " libxfont" + diff --git a/packages/xorg-app/beforelight_1.0.2.bb b/packages/xorg-app/beforelight_1.0.2.bb new file mode 100644 index 0000000000..a83c84eb79 --- /dev/null +++ b/packages/xorg-app/beforelight_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" + diff --git a/packages/xorg-app/editres_1.0.2.bb b/packages/xorg-app/editres_1.0.2.bb new file mode 100644 index 0000000000..e5bf19bd71 --- /dev/null +++ b/packages/xorg-app/editres_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxt libxmu libxaw" + diff --git a/packages/xorg-app/fonttosfnt_1.0.3.bb b/packages/xorg-app/fonttosfnt_1.0.3.bb new file mode 100644 index 0000000000..8b7d7be108 --- /dev/null +++ b/packages/xorg-app/fonttosfnt_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xproto freetype libfontenc" + diff --git a/packages/xorg-app/luit_1.0.2.bb b/packages/xorg-app/luit_1.0.2.bb new file mode 100644 index 0000000000..67fc3266ae --- /dev/null +++ b/packages/xorg-app/luit_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " zlib zlib virtual/libx11 libfontenc" + diff --git a/packages/xorg-app/sessreg_1.0.2.bb b/packages/xorg-app/sessreg_1.0.2.bb new file mode 100644 index 0000000000..dc281b41b0 --- /dev/null +++ b/packages/xorg-app/sessreg_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" + diff --git a/packages/xorg-app/setxkbmap_1.0.3.bb b/packages/xorg-app/setxkbmap_1.0.3.bb new file mode 100644 index 0000000000..9b97cf437a --- /dev/null +++ b/packages/xorg-app/setxkbmap_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxkbfile virtual/libx11" + diff --git a/packages/xorg-app/twm_1.0.3.bb b/packages/xorg-app/twm_1.0.3.bb new file mode 100644 index 0000000000..b8e75b2bbd --- /dev/null +++ b/packages/xorg-app/twm_1.0.3.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "tiny window manager" + +DEPENDS += " virtual/libx11 libxext libxt libxmu" + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" diff --git a/packages/xorg-app/xauth_1.0.2.bb b/packages/xorg-app/xauth_1.0.2.bb new file mode 100644 index 0000000000..45aaafb1ce --- /dev/null +++ b/packages/xorg-app/xauth_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxau libxext libxmu" + diff --git a/packages/xorg-app/xdbedizzy_1.0.2.bb b/packages/xorg-app/xdbedizzy_1.0.2.bb new file mode 100644 index 0000000000..43d5a4bbb8 --- /dev/null +++ b/packages/xorg-app/xdbedizzy_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxp libxprintutil libxp libxau libxext" + diff --git a/packages/xorg-app/xdm_1.1.3.bb b/packages/xorg-app/xdm_1.1.3.bb new file mode 100644 index 0000000000..7b4195e3d8 --- /dev/null +++ b/packages/xorg-app/xdm_1.1.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display manager" + +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" + +EXTRA_OECONF += " --with-random-device=/dev/urandom" diff --git a/packages/xorg-app/xf86dga_1.0.2.bb b/packages/xorg-app/xf86dga_1.0.2.bb new file mode 100644 index 0000000000..462797a68d --- /dev/null +++ b/packages/xorg-app/xf86dga_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu" + diff --git a/packages/xorg-app/xfs_1.0.4.bb b/packages/xorg-app/xfs_1.0.4.bb new file mode 100644 index 0000000000..b6db0f9b81 --- /dev/null +++ b/packages/xorg-app/xfs_1.0.4.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X fontserver" + +DEPENDS += " libfs libxfont xtrans" + diff --git a/packages/xorg-app/xinit_1.0.3.bb b/packages/xorg-app/xinit_1.0.3.bb new file mode 100644 index 0000000000..155bfc7c43 --- /dev/null +++ b/packages/xorg-app/xinit_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" +FILES_${PN} += " /usr/lib/X11/xinit" + diff --git a/packages/xorg-app/xmodmap_1.0.2.bb b/packages/xorg-app/xmodmap_1.0.2.bb new file mode 100644 index 0000000000..b934ebfa48 --- /dev/null +++ b/packages/xorg-app/xmodmap_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11" + diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index b2a73f9ca8..15f76ab5e2 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/packages/xorg-app/xprop_1.0.2.bb b/packages/xorg-app/xprop_1.0.2.bb new file mode 100644 index 0000000000..8623021717 --- /dev/null +++ b/packages/xorg-app/xprop_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxmu virtual/libx11" + -- cgit v1.2.3 From 2ed8a4553687b1708ec50794360237761640f8e4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:29:34 +0000 Subject: X11R7.2 preparation: xorg-doc - add individual release support to xorg-doc-common.inc - add new X11R7.2 release (individual release version) of xorg-sgml-doctools --- packages/xorg-doc/xorg-doc-common.inc | 3 ++- packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb (limited to 'packages') diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc index de47e60df1..4c3d6e8987 100644 --- a/packages/xorg-doc/xorg-doc-common.inc +++ b/packages/xorg-doc/xorg-doc-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/doc/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb new file mode 100644 index 0000000000..18a3ef964a --- /dev/null +++ b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-doc-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +FILES_${PN} += " /usr/share/X11/sgml" -- cgit v1.2.3 From ee75ba0da96d14917b86a37af7d680baf23bbcbe Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:44:43 +0000 Subject: remove non-existant bdftopcf 1.0.1 --- packages/xorg-app/bdftopcf_1.0.1.bb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/xorg-app/bdftopcf_1.0.1.bb (limited to 'packages') diff --git a/packages/xorg-app/bdftopcf_1.0.1.bb b/packages/xorg-app/bdftopcf_1.0.1.bb deleted file mode 100644 index c3e6ad2136..0000000000 --- a/packages/xorg-app/bdftopcf_1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc -PE = "1" - -DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." - -DEPENDS += " libxfont" - -- cgit v1.2.3 From bab81fec328ef6838db19cc2795bddd561f51fef Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:05:48 +0000 Subject: X11R7.2 preparation: xorg-driver - add individual release support to xorg-driver-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-driver/xf86-input-keyboard_1.1.1.bb | 7 +++++++ packages/xorg-driver/xf86-input-mouse_1.1.2.bb | 7 +++++++ packages/xorg-driver/xf86-input-penmount_1.2.0.bb | 7 +++++++ packages/xorg-driver/xf86-video-ati_6.6.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-fbdev_0.3.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-i128_1.1.0.6.bb | 6 ++++++ packages/xorg-driver/xf86-video-i810_1.6.5.bb | 7 +++++++ packages/xorg-driver/xf86-video-newport_0.2.1.bb | 7 +++++++ packages/xorg-driver/xf86-video-nsc_2.8.2.bb | 7 +++++++ packages/xorg-driver/xf86-video-nv_1.2.2.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-rendition_4.1.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-s3_0.5.0.bb | 6 ++++++ packages/xorg-driver/xf86-video-savage_2.1.2.bb | 6 ++++++ packages/xorg-driver/xf86-video-sis_0.9.3.bb | 7 +++++++ packages/xorg-driver/xf86-video-tdfx_1.3.0.bb | 6 ++++++ packages/xorg-driver/xf86-video-trident_1.2.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-tseng_1.1.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-vesa_1.3.0.bb | 8 ++++++++ packages/xorg-driver/xf86-video-via_0.2.2.bb | 6 ++++++ packages/xorg-driver/xf86-video-vmware_10.14.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-voodoo_1.1.1.bb | 6 ++++++ packages/xorg-driver/xorg-driver-common.inc | 3 ++- 22 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-driver/xf86-input-keyboard_1.1.1.bb create mode 100644 packages/xorg-driver/xf86-input-mouse_1.1.2.bb create mode 100644 packages/xorg-driver/xf86-input-penmount_1.2.0.bb create mode 100644 packages/xorg-driver/xf86-video-ati_6.6.3.bb create mode 100644 packages/xorg-driver/xf86-video-fbdev_0.3.1.bb create mode 100644 packages/xorg-driver/xf86-video-i128_1.1.0.6.bb create mode 100644 packages/xorg-driver/xf86-video-i810_1.6.5.bb create mode 100644 packages/xorg-driver/xf86-video-newport_0.2.1.bb create mode 100644 packages/xorg-driver/xf86-video-nsc_2.8.2.bb create mode 100644 packages/xorg-driver/xf86-video-nv_1.2.2.1.bb create mode 100644 packages/xorg-driver/xf86-video-rendition_4.1.3.bb create mode 100644 packages/xorg-driver/xf86-video-s3_0.5.0.bb create mode 100644 packages/xorg-driver/xf86-video-savage_2.1.2.bb create mode 100644 packages/xorg-driver/xf86-video-sis_0.9.3.bb create mode 100644 packages/xorg-driver/xf86-video-tdfx_1.3.0.bb create mode 100644 packages/xorg-driver/xf86-video-trident_1.2.3.bb create mode 100644 packages/xorg-driver/xf86-video-tseng_1.1.1.bb create mode 100644 packages/xorg-driver/xf86-video-vesa_1.3.0.bb create mode 100644 packages/xorg-driver/xf86-video-via_0.2.2.bb create mode 100644 packages/xorg-driver/xf86-video-vmware_10.14.1.bb create mode 100644 packages/xorg-driver/xf86-video-voodoo_1.1.1.bb (limited to 'packages') diff --git a/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb b/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb new file mode 100644 index 0000000000..b4ef6c683e --- /dev/null +++ b/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " kbproto" + diff --git a/packages/xorg-driver/xf86-input-mouse_1.1.2.bb b/packages/xorg-driver/xf86-input-mouse_1.1.2.bb new file mode 100644 index 0000000000..eb464ad5a6 --- /dev/null +++ b/packages/xorg-driver/xf86-input-mouse_1.1.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +DESCRIPTION = "Mouse Support in X11" + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-input-penmount_1.2.0.bb b/packages/xorg-driver/xf86-input-penmount_1.2.0.bb new file mode 100644 index 0000000000..f6032bceaa --- /dev/null +++ b/packages/xorg-driver/xf86-input-penmount_1.2.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-video-ati_6.6.3.bb b/packages/xorg-driver/xf86-video-ati_6.6.3.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-ati_6.6.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb b/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb b/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb new file mode 100644 index 0000000000..89cedc8b1a --- /dev/null +++ b/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "Number Nine I128 for X11" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i810_1.6.5.bb b/packages/xorg-driver/xf86-video-i810_1.6.5.bb new file mode 100644 index 0000000000..198985f247 --- /dev/null +++ b/packages/xorg-driver/xf86-video-i810_1.6.5.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "I810 for X11" + +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-newport_0.2.1.bb b/packages/xorg-driver/xf86-video-newport_0.2.1.bb new file mode 100644 index 0000000000..b9f88fcc6f --- /dev/null +++ b/packages/xorg-driver/xf86-video-newport_0.2.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-video-nsc_2.8.2.bb b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb new file mode 100644 index 0000000000..9fc4277ad8 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xf86dgaproto" + diff --git a/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb b/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-rendition_4.1.3.bb b/packages/xorg-driver/xf86-video-rendition_4.1.3.bb new file mode 100644 index 0000000000..e6c89a8c74 --- /dev/null +++ b/packages/xorg-driver/xf86-video-rendition_4.1.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3_0.5.0.bb b/packages/xorg-driver/xf86-video-s3_0.5.0.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-s3_0.5.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-savage_2.1.2.bb b/packages/xorg-driver/xf86-video-savage_2.1.2.bb new file mode 100644 index 0000000000..999b319b23 --- /dev/null +++ b/packages/xorg-driver/xf86-video-savage_2.1.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-sis_0.9.3.bb b/packages/xorg-driver/xf86-video-sis_0.9.3.bb new file mode 100644 index 0000000000..ab53a64646 --- /dev/null +++ b/packages/xorg-driver/xf86-video-sis_0.9.3.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb b/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb new file mode 100644 index 0000000000..999b319b23 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-trident_1.2.3.bb b/packages/xorg-driver/xf86-video-trident_1.2.3.bb new file mode 100644 index 0000000000..065e64dfb1 --- /dev/null +++ b/packages/xorg-driver/xf86-video-trident_1.2.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-tseng_1.1.1.bb b/packages/xorg-driver/xf86-video-tseng_1.1.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tseng_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vesa_1.3.0.bb b/packages/xorg-driver/xf86-video-vesa_1.3.0.bb new file mode 100644 index 0000000000..1e6760c3dc --- /dev/null +++ b/packages/xorg-driver/xf86-video-vesa_1.3.0.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +PE = "1" + +SRC_URI += "file://fix-includepath.patch;patch=1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-via_0.2.2.bb b/packages/xorg-driver/xf86-video-via_0.2.2.bb new file mode 100644 index 0000000000..a3ce7324c3 --- /dev/null +++ b/packages/xorg-driver/xf86-video-via_0.2.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto libxvmc" diff --git a/packages/xorg-driver/xf86-video-vmware_10.14.1.bb b/packages/xorg-driver/xf86-video-vmware_10.14.1.bb new file mode 100644 index 0000000000..c8169407cb --- /dev/null +++ b/packages/xorg-driver/xf86-video-vmware_10.14.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for VMware SVGA Device" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb b/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb new file mode 100644 index 0000000000..bfceb2995c --- /dev/null +++ b/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for Voodoo/Voodoo2" + +DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index ae85f602f0..8053e6c236 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -7,7 +7,8 @@ PR = "r1" DEPENDS = "randrproto xorg-server xproto" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/driver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -- cgit v1.2.3 From 90f4b2907d7755fb16f89d4184202b8278ff2cfd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:11:50 +0000 Subject: X11R7.2 preparation: xorg-font - add individual release support to xorg-font-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-font/encodings_1.0.2.bb | 8 ++++++++ packages/xorg-font/xorg-font-common.inc | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-font/encodings_1.0.2.bb (limited to 'packages') diff --git a/packages/xorg-font/encodings_1.0.2.bb b/packages/xorg-font/encodings_1.0.2.bb new file mode 100644 index 0000000000..da67d037aa --- /dev/null +++ b/packages/xorg-font/encodings_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-font-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS = "mkfontscale-native" +RDEPENDS = "" + diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 137ee0917f..148437a3e3 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -6,7 +6,8 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n RDEPENDS = "encodings font-util font-alias" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -- cgit v1.2.3 From 2fbac633f4f49ee742e8ff18a788ed6bb2031749 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:24:20 +0000 Subject: avahi: add scripts to start avahi-autoipd from udhcpc --- packages/avahi/avahi.inc | 28 ++++++++++++++++++++++++++-- packages/avahi/files/.mtn2git_empty | 0 packages/avahi/files/00avahi-autoipd | 10 ++++++++++ packages/avahi/files/99avahi-autoipd | 10 ++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 packages/avahi/files/.mtn2git_empty create mode 100755 packages/avahi/files/00avahi-autoipd create mode 100755 packages/avahi/files/99avahi-autoipd (limited to 'packages') diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index 3a0b28cc53..fb71361a1d 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,12 +4,14 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" +PR="r1" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ + file://00avahi-autoipd file://99avahi-autoipd" inherit autotools pkgconfig update-rc.d @@ -35,7 +37,8 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_avahi-utils = "${bindir}/avahi-*" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ - ${sysconfdir}/avahi/avahi-autoipd.action" + ${sysconfdir}/avahi/avahi-autoipd.action \ + ${sysconfdir}/udhcpc.d/*avahi-autoipd" CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" @@ -62,11 +65,32 @@ pkg_postinst_avahi-daemon () { fi } +pkg_postinst_avahi-autoipd () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep avahi-autoipd /etc/group || addgroup avahi-autoipd + grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" +} + pkg_postrm_avahi-daemon () { deluser avahi || true delgroup avahi || true } +pkg_postrm_avahi-autoipd () { + deluser avahi-autoipd || true + delgroup avahi-autoipd || true +} + +do_install() { + autotools_do_install + install -d ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d +} + do_stage() { autotools_stage_all } diff --git a/packages/avahi/files/.mtn2git_empty b/packages/avahi/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/avahi/files/00avahi-autoipd b/packages/avahi/files/00avahi-autoipd new file mode 100755 index 0000000000..a0ab814603 --- /dev/null +++ b/packages/avahi/files/00avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + deconfig|renew|bound) + /usr/sbin/avahi-autoipd -k $interface 2> /dev/null + ;; +esac diff --git a/packages/avahi/files/99avahi-autoipd b/packages/avahi/files/99avahi-autoipd new file mode 100755 index 0000000000..234cdaa3eb --- /dev/null +++ b/packages/avahi/files/99avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + leasefail) + /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null + ;; +esac -- cgit v1.2.3 From 779bdbe42f923c547512fd05bf0925c20f540ade Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:48:42 +0000 Subject: X11R7.2 preparation: xorg-lib - add individual release support to xorg-lib-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-lib/diet-x11_1.1.1.bb | 11 +++++++++++ packages/xorg-lib/libfontenc_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libsm_1.0.2.bb | 10 ++++++++++ packages/xorg-lib/libx11_1.1.1.bb | 24 ++++++++++++++++++++++++ packages/xorg-lib/libxau_1.0.3.bb | 11 +++++++++++ packages/xorg-lib/libxcomposite_0.3.1.bb | 12 ++++++++++++ packages/xorg-lib/libxcursor_1.1.8.bb | 11 +++++++++++ packages/xorg-lib/libxdamage_1.0.4.bb | 11 +++++++++++ packages/xorg-lib/libxdmcp-native_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxdmcp_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxevie_1.0.2.bb | 9 +++++++++ packages/xorg-lib/libxext_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxfixes_4.0.3.bb | 10 ++++++++++ packages/xorg-lib/libxfont_1.2.7.bb | 14 ++++++++++++++ packages/xorg-lib/libxfontcache_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libxi_1.0.2.bb | 9 +++++++++ packages/xorg-lib/libxkbfile_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libxmu_1.0.3.bb | 17 +++++++++++++++++ packages/xorg-lib/libxpm_3.5.6.bb | 14 ++++++++++++++ packages/xorg-lib/libxrandr_1.1.2.bb | 10 ++++++++++ packages/xorg-lib/libxrender_0.9.2.bb | 10 ++++++++++ packages/xorg-lib/libxres_1.0.3.bb | 9 +++++++++ packages/xorg-lib/libxscrnsaver_1.1.2.bb | 14 ++++++++++++++ packages/xorg-lib/libxt_1.0.4.bb | 20 ++++++++++++++++++++ packages/xorg-lib/libxvmc_1.0.4.bb | 9 +++++++++ packages/xorg-lib/xorg-lib-common.inc | 3 ++- packages/xorg-lib/xtrans_1.0.3.bb | 9 +++++++++ 27 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-lib/diet-x11_1.1.1.bb create mode 100644 packages/xorg-lib/libfontenc_1.0.4.bb create mode 100644 packages/xorg-lib/libsm_1.0.2.bb create mode 100644 packages/xorg-lib/libx11_1.1.1.bb create mode 100644 packages/xorg-lib/libxau_1.0.3.bb create mode 100644 packages/xorg-lib/libxcomposite_0.3.1.bb create mode 100644 packages/xorg-lib/libxcursor_1.1.8.bb create mode 100644 packages/xorg-lib/libxdamage_1.0.4.bb create mode 100644 packages/xorg-lib/libxdmcp-native_1.0.2.bb create mode 100644 packages/xorg-lib/libxdmcp_1.0.2.bb create mode 100644 packages/xorg-lib/libxevie_1.0.2.bb create mode 100644 packages/xorg-lib/libxext_1.0.2.bb create mode 100644 packages/xorg-lib/libxfixes_4.0.3.bb create mode 100644 packages/xorg-lib/libxfont_1.2.7.bb create mode 100644 packages/xorg-lib/libxfontcache_1.0.4.bb create mode 100644 packages/xorg-lib/libxi_1.0.2.bb create mode 100644 packages/xorg-lib/libxkbfile_1.0.4.bb create mode 100644 packages/xorg-lib/libxmu_1.0.3.bb create mode 100644 packages/xorg-lib/libxpm_3.5.6.bb create mode 100644 packages/xorg-lib/libxrandr_1.1.2.bb create mode 100644 packages/xorg-lib/libxrender_0.9.2.bb create mode 100644 packages/xorg-lib/libxres_1.0.3.bb create mode 100644 packages/xorg-lib/libxscrnsaver_1.1.2.bb create mode 100644 packages/xorg-lib/libxt_1.0.4.bb create mode 100644 packages/xorg-lib/libxvmc_1.0.4.bb create mode 100644 packages/xorg-lib/xtrans_1.0.3.bb (limited to 'packages') diff --git a/packages/xorg-lib/diet-x11_1.1.1.bb b/packages/xorg-lib/diet-x11_1.1.1.bb new file mode 100644 index 0000000000..8dc3174a16 --- /dev/null +++ b/packages/xorg-lib/diet-x11_1.1.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +require libx11_${PV}.bb + +EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1 \ + file://xchar2b.patch;patch=1" diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb new file mode 100644 index 0000000000..afb7ffe10e --- /dev/null +++ b/packages/xorg-lib/libfontenc_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X fontenc library (used by libxfont)." +LICENSE = "BSD-X" +PRIORITY = "optional" + +DEPENDS += " zlib xproto" + diff --git a/packages/xorg-lib/libsm_1.0.2.bb b/packages/xorg-lib/libsm_1.0.2.bb new file mode 100644 index 0000000000..e5113dfc76 --- /dev/null +++ b/packages/xorg-lib/libsm_1.0.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "Session management library" +PRIORITY = "optional" + +DEPENDS += " libice xproto xtrans" + +XORG_PN = "libSM" + diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb new file mode 100644 index 0000000000..de47042dc4 --- /dev/null +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -0,0 +1,24 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "Base X libs." +SRC_URI += "file://makekeys.diff;patch=1" + +DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" + +XORG_PN = "libX11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + ) || exit 1 + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libxau_1.0.3.bb b/packages/xorg-lib/libxau_1.0.3.bb new file mode 100644 index 0000000000..dcde9b4da2 --- /dev/null +++ b/packages/xorg-lib/libxau_1.0.3.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "A Sample Authorization Protocol for X" +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xau" + +XORG_PN = "libXau" + diff --git a/packages/xorg-lib/libxcomposite_0.3.1.bb b/packages/xorg-lib/libxcomposite_0.3.1.bb new file mode 100644 index 0000000000..71842d4a4d --- /dev/null +++ b/packages/xorg-lib/libxcomposite_0.3.1.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Composite extension library." +LICENSE= "BSD-X" + +DEPENDS += " compositeproto virtual/libx11 libxfixes" +PROVIDES = "xcomposite" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb new file mode 100644 index 0000000000..bf795757f6 --- /dev/null +++ b/packages/xorg-lib/libxcursor_1.1.8.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Cursor library" +LICENSE= "BSD-X" + +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" + +XORG_PN = "libXcursor" + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxdamage_1.0.4.bb b/packages/xorg-lib/libxdamage_1.0.4.bb new file mode 100644 index 0000000000..dd6fc42df6 --- /dev/null +++ b/packages/xorg-lib/libxdamage_1.0.4.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Damage extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" +PROVIDES = "xdamage" + +XORG_PN = "libXdamage" + diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb new file mode 100644 index 0000000000..2438a7b599 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "BSD-X" +PE = "1" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2" +S = "${WORKDIR}/libXdmcp-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb new file mode 100644 index 0000000000..109c5b5615 --- /dev/null +++ b/packages/xorg-lib/libxdmcp_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Display Manager Control Protocol library." +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xdmcp" + +XORG_PN = "libXdmcp" + diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb new file mode 100644 index 0000000000..06985bd112 --- /dev/null +++ b/packages/xorg-lib/libxevie_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + diff --git a/packages/xorg-lib/libxext_1.0.2.bb b/packages/xorg-lib/libxext_1.0.2.bb new file mode 100644 index 0000000000..a64067e2ad --- /dev/null +++ b/packages/xorg-lib/libxext_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Server Extension library" +PRIORITY = "optional" + +DEPENDS += " xproto virtual/libx11 xextproto libxau" +PROVIDES = "xext" + +XORG_PN = "libXext" + diff --git a/packages/xorg-lib/libxfixes_4.0.3.bb b/packages/xorg-lib/libxfixes_4.0.3.bb new file mode 100644 index 0000000000..cffe56a03a --- /dev/null +++ b/packages/xorg-lib/libxfixes_4.0.3.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Fixes extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" + +XORG_PN = "libXfixes" + diff --git a/packages/xorg-lib/libxfont_1.2.7.bb b/packages/xorg-lib/libxfont_1.2.7.bb new file mode 100644 index 0000000000..cc855c0106 --- /dev/null +++ b/packages/xorg-lib/libxfont_1.2.7.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X font library (used by the X server)." +LICENSE= "BSD-X" +PRIORITY = "optional" + +SRC_URI += "file://no-scalable-crash.patch;patch=1" + +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb new file mode 100644 index 0000000000..1e45867950 --- /dev/null +++ b/packages/xorg-lib/libxfontcache_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/packages/xorg-lib/libxi_1.0.2.bb b/packages/xorg-lib/libxi_1.0.2.bb new file mode 100644 index 0000000000..84c67f5ae3 --- /dev/null +++ b/packages/xorg-lib/libxi_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Input extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" + +XORG_PN = "libXi" + diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb new file mode 100644 index 0000000000..2d9b778d02 --- /dev/null +++ b/packages/xorg-lib/libxkbfile_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X11 keyboard library" +LICENSE= "GPL" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 kbproto" + diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb new file mode 100644 index 0000000000..e055874b3d --- /dev/null +++ b/packages/xorg-lib/libxmu_1.0.3.bb @@ -0,0 +1,17 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Window System miscellaneous utility library" +PRIORITY = "optional" + +DEPENDS += " libxt libxext xextproto virtual/libx11" +PROVIDES = "xmu" + +XORG_PN = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb new file mode 100644 index 0000000000..60779da43f --- /dev/null +++ b/packages/xorg-lib/libxpm_3.5.6.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Pixmap library." +PRIORITY = "optional" +LICENSE = "X-BSD" + +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxrandr_1.1.2.bb b/packages/xorg-lib/libxrandr_1.1.2.bb new file mode 100644 index 0000000000..18e5deffb8 --- /dev/null +++ b/packages/xorg-lib/libxrandr_1.1.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Resize and Rotate extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" + +XORG_PN = "libXrandr" + diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb new file mode 100644 index 0000000000..b1372d3dac --- /dev/null +++ b/packages/xorg-lib/libxrender_0.9.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Render extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 renderproto" + +XORG_PN = "libXrender" + diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb new file mode 100644 index 0000000000..b9d2fd68ce --- /dev/null +++ b/packages/xorg-lib/libxres_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Resource usage library." + +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" + +XORG_PN = "libXres" + diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb new file mode 100644 index 0000000000..163ca199c1 --- /dev/null +++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X screen saver extension library." +LICENSE = "GPL" + +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" + +XORG_PN = "libXScrnSaver" + +PROVIDES = "libxss" +RREPLACES = "libxss" + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxt_1.0.4.bb b/packages/xorg-lib/libxt_1.0.4.bb new file mode 100644 index 0000000000..e67590bdf1 --- /dev/null +++ b/packages/xorg-lib/libxt_1.0.4.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Toolkit Intrinsics" +PRIORITY = "optional" + +DEPENDS += " libsm virtual/libx11 xproto kbproto" +PROVIDES = "xt" + +XORG_PN = "libXt" + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) || exit 1 + oe_runmake +} diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb new file mode 100644 index 0000000000..54aaa895ff --- /dev/null +++ b/packages/xorg-lib/libxvmc_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index 0c6c1388d2..e1f783e352 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -4,7 +4,8 @@ LICENSE = "MIT-X" DEPENDS = "util-macros xorg-headers-native" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-lib/xtrans_1.0.3.bb b/packages/xorg-lib/xtrans_1.0.3.bb new file mode 100644 index 0000000000..e32509a5c4 --- /dev/null +++ b/packages/xorg-lib/xtrans_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + -- cgit v1.2.3 From 83d964336d4e28d1be067ca515ea643c588e6b2a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:54:20 +0000 Subject: X11R7.2 preparation: xorg-proto - add individual release support to xorg-proto-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-proto/glproto_1.4.8.bb | 6 ++++++ packages/xorg-proto/xorg-proto-common.inc | 3 ++- packages/xorg-proto/xproto_7.0.10.bb | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-proto/glproto_1.4.8.bb create mode 100644 packages/xorg-proto/xproto_7.0.10.bb (limited to 'packages') diff --git a/packages/xorg-proto/glproto_1.4.8.bb b/packages/xorg-proto/glproto_1.4.8.bb new file mode 100644 index 0000000000..7a4888d489 --- /dev/null +++ b/packages/xorg-proto/glproto_1.4.8.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE="1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc index 017e8755a8..1dc4f12fc7 100644 --- a/packages/xorg-proto/xorg-proto-common.inc +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/proto/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-proto/xproto_7.0.10.bb b/packages/xorg-proto/xproto_7.0.10.bb new file mode 100644 index 0000000000..3f598df1bb --- /dev/null +++ b/packages/xorg-proto/xproto_7.0.10.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 9178b2e1c457061710f3ee95b98ba845cf09cdc1 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:06:48 +0000 Subject: X11R7.2 preparation: xorg-xserver - add individual release support to xorg-xserver-common.inc - add new xorg-server 1.2.0 release --- packages/xorg-xserver/xorg-xserver-common.inc | 3 +- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 130 ++++++++++++++++++++++++++ packages/xorg-xserver/xserver-xorg_1.2.0.bb | 10 ++ 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-kdrive_1.2.0.bb create mode 100644 packages/xorg-xserver/xserver-xorg_1.2.0.bb (limited to 'packages') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 3aa3aaf3c6..fcfec6d4f7 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -19,7 +19,8 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" RDEPENDS_${PN} = "rgb" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/xserver/${XORG_PN}-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \ file://xorg.conf" diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb new file mode 100644 index 0000000000..5789004fd1 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -0,0 +1,130 @@ +LICENSE = "MIT" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PE = "1" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev \ + xserver-kdrive-sdl \ + xserver-kdrive-fake \ + xserver-kdrive-xephyr \ + xserver-kdrive-epson \ + xserver-kdrive-w100 \ + xserver-kdrive-ati \ + xserver-kdrive-chips \ + xserver-kdrive-i810 \ + xserver-kdrive-mach64 \ + xserver-kdrive-mga \ + xserver-kdrive-neomagic \ + xserver-kdrive-nvidia \ + xserver-kdrive-pm2 \ + xserver-kdrive-r128 \ + xserver-kdrive-smi \ + xserver-kdrive-vesa \ + xserver-kdrive-via \ + " + +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" +DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" +DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" +DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" +DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" +DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-chips = "${bindir}/Xchips" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" +FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" +FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" +FILES_xserver-kdrive-r128 = "${bindir}/Xr128" +FILES_xserver-kdrive-smi = "${bindir}/Xsmi" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" +RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-chips = "${PN}" +RDEPENDS_xserver-kdrive-i810 = "${PN}" +RDEPENDS_xserver-kdrive-mach64 = "${PN}" +RDEPENDS_xserver-kdrive-mga = "${PN}" +RDEPENDS_xserver-kdrive-neomagic = "${PN}" +RDEPENDS_xserver-kdrive-nvidia = "${PN}" +RDEPENDS_xserver-kdrive-pm2 = "${PN}" +RDEPENDS_xserver-kdrive-r128 = "${PN}" +RDEPENDS_xserver-kdrive-smi = "${PN}" +RDEPENDS_xserver-kdrive-vesa = "${PN}" +RDEPENDS_xserver-kdrive-via = "${PN}" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +S = "${WORKDIR}/xorg-server-${PV}" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb new file mode 100644 index 0000000000..900c3266cb --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -0,0 +1,10 @@ +require xorg-xserver-common.inc +PE = "1" + +SRC_URI += "file://drmfix.patch;patch=1" + +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 2969cc50e8e3ae6f457e2436633199b2e2e68740 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:48:11 +0000 Subject: xcb: update to xcb-proto/libxcb 0.9.3, xcb-util 0.2 --- packages/xcb/libxcb_0.9.93.bb | 46 ++++++++++++++++++++++++++++++++++++++++ packages/xcb/xcb-proto_0.9.93.bb | 19 +++++++++++++++++ packages/xcb/xcb-util_0.2.bb | 41 +++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 packages/xcb/libxcb_0.9.93.bb create mode 100644 packages/xcb/xcb-proto_0.9.93.bb create mode 100644 packages/xcb/xcb-util_0.2.bb (limited to 'packages') diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb new file mode 100644 index 0000000000..26eea1d576 --- /dev/null +++ b/packages/xcb/libxcb_0.9.93.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" + +PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ + libxcb-randr libxcb-record libxcb-render libxcb-res \ + libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ + libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ + libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc" + +FILES_${PN} = "${libdir}/libxcb.so.*" +#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" +FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" +FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" +FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" +FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" +FILES_libxcb-record = "${libdir}/libxcb-record.so.*" +FILES_libxcb-render = "${libdir}/libxcb-render.so.*" +FILES_libxcb-res = "${libdir}/libxcb-res.so.*" +FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" +FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" +FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*" +FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*" +FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*" +FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*" +FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*" +FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" +FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" +FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" +FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" +FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-proto_0.9.93.bb b/packages/xcb/xcb-proto_0.9.93.bb new file mode 100644 index 0000000000..f7f4160d5b --- /dev/null +++ b/packages/xcb/xcb-proto_0.9.93.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" + +inherit autotools pkgconfig + +FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/xcb.xsd" + +do_stage() { + oe_runmake DESTDIR="${D}" install + mkdir -p ${STAGING_LIBDIR}/pkgconfig + install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig + mkdir -p ${STAGING_DATADIR}/xcb + install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb +} diff --git a/packages/xcb/xcb-util_0.2.bb b/packages/xcb/xcb-util_0.2.bb new file mode 100644 index 0000000000..b0efa9f669 --- /dev/null +++ b/packages/xcb/xcb-util_0.2.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-${PV}.tar.bz2" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From bf303b546f3ed8d3050e4c21c14d03232f56463e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 11:20:05 +0000 Subject: libx11-1.1.1: depends on libxcb --- packages/xorg-lib/libx11_1.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index de47042dc4..88225a8eb7 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Base X libs." SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" + libxcb libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" RPROVIDES = "virtual/libx11" -- cgit v1.2.3 From 93eb9085a1a551875e241eacf8127dce5aa0f426 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 11:23:48 +0000 Subject: xserver-kdrive-1.2.0: depends on libxkbfile --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 5789004fd1..4e7d438b3e 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxkbfile libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PE = "1" -- cgit v1.2.3 From 9b72859f629ba81ea1d07c955dfbef070a9f7011 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 12:04:06 +0000 Subject: xserver-kdrive: add initial -common.inc to be used by all xserver-kdrive versions --- packages/xorg-xserver/xserver-kdrive-common.inc | 129 ++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-common.inc (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc new file mode 100644 index 0000000000..47ed5d0267 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -0,0 +1,129 @@ +LICENSE = "MIT" +DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto videoproto xextproto xproto \ + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libsdl virtual/libx11 xtrans" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev \ + xserver-kdrive-sdl \ + xserver-kdrive-fake \ + xserver-kdrive-xephyr \ + xserver-kdrive-epson \ + xserver-kdrive-w100 \ + xserver-kdrive-ati \ + xserver-kdrive-chips \ + xserver-kdrive-i810 \ + xserver-kdrive-mach64 \ + xserver-kdrive-mga \ + xserver-kdrive-neomagic \ + xserver-kdrive-nvidia \ + xserver-kdrive-pm2 \ + xserver-kdrive-r128 \ + xserver-kdrive-smi \ + xserver-kdrive-vesa \ + xserver-kdrive-via \ + " + +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" +DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" +DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" +DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" +DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" +DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-chips = "${bindir}/Xchips" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" +FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" +FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" +FILES_xserver-kdrive-r128 = "${bindir}/Xr128" +FILES_xserver-kdrive-smi = "${bindir}/Xsmi" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" +RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-chips = "${PN}" +RDEPENDS_xserver-kdrive-i810 = "${PN}" +RDEPENDS_xserver-kdrive-mach64 = "${PN}" +RDEPENDS_xserver-kdrive-mga = "${PN}" +RDEPENDS_xserver-kdrive-neomagic = "${PN}" +RDEPENDS_xserver-kdrive-nvidia = "${PN}" +RDEPENDS_xserver-kdrive-pm2 = "${PN}" +RDEPENDS_xserver-kdrive-r128 = "${PN}" +RDEPENDS_xserver-kdrive-smi = "${PN}" +RDEPENDS_xserver-kdrive-vesa = "${PN}" +RDEPENDS_xserver-kdrive-via = "${PN}" + +SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES}" +KDRIVE_COMMON_PATCHES = " \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1 \ + " + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 551a53a388f30bbdc39aa29cea9411b5fe1e0dcb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 13:16:37 +0000 Subject: randrproto: add 1.2.1 (>= 1.2 is needed for xserver-kdrive_git) --- packages/xorg-proto/randrproto_1.2.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/randrproto_1.2.1.bb (limited to 'packages') diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb new file mode 100644 index 0000000000..1116da8f93 --- /dev/null +++ b/packages/xorg-proto/randrproto_1.2.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "randrext" -- cgit v1.2.3 From 3d54ca9f03dca695922e65e59549857ccc002842 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 13:58:48 +0000 Subject: damageproto: add 1.1.0 (>= 1.1 needed by xserver-kdrive_git) --- packages/xorg-proto/damageproto_1.1.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/damageproto_1.1.0.bb (limited to 'packages') diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb new file mode 100644 index 0000000000..ae54c06a64 --- /dev/null +++ b/packages/xorg-proto/damageproto_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "damageext" -- cgit v1.2.3 From 69a046148be38774781d90fc22a339136917d4ee Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 14:00:20 +0000 Subject: inputproto: add 1.4.1 (>= 1.4 needed by xserver-kdrive_git) --- packages/xorg-proto/inputproto_1.4.1.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/xorg-proto/inputproto_1.4.1.bb (limited to 'packages') diff --git a/packages/xorg-proto/inputproto_1.4.1.bb b/packages/xorg-proto/inputproto_1.4.1.bb new file mode 100644 index 0000000000..40af1d2115 --- /dev/null +++ b/packages/xorg-proto/inputproto_1.4.1.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" -- cgit v1.2.3 From 609c4163e5e3d3a51f353d7baa4ec39ad5cfdffc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 14:12:15 +0000 Subject: xserver-kdrive-common.inc: shuffle w100/imageon support a bit --- packages/xorg-xserver/xserver-kdrive-common.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 47ed5d0267..bc1ac64c81 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -9,7 +9,6 @@ PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-fake \ xserver-kdrive-xephyr \ xserver-kdrive-epson \ - xserver-kdrive-w100 \ xserver-kdrive-ati \ xserver-kdrive-chips \ xserver-kdrive-i810 \ @@ -35,6 +34,7 @@ DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset" DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" @@ -56,6 +56,7 @@ FILES_xserver-kdrive-w100 = "${bindir}/Xw100" FILES_xserver-kdrive-ati = "${bindir}/Xati" FILES_xserver-kdrive-chips = "${bindir}/Xchips" FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-imageon = "${bindir}/Ximageon" FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" FILES_xserver-kdrive-mga = "${bindir}/Xmga" FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" @@ -97,7 +98,6 @@ KDRIVE_COMMON_PATCHES = " \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ file://enable-epson.patch;patch=1 \ - file://w100.patch;patch=1 \ file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ @@ -114,16 +114,13 @@ inherit autotools pkgconfig ARM_INSTRUCTION_SET = "arm" -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ + --disable-dmx ${W100_OECONF} ${IMAGEON_OECONF} \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From b2fb28dbc919753212298bd283c118d6f1aea086 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 14:53:17 +0000 Subject: xorg-app-common: add dep on util-macros --- packages/xorg-app/xorg-app-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index 15f76ab5e2..a33d107675 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/applications" LICENSE = "MIT-X" -#DEPENDS = "" +DEPENDS = "util-macros" XORG_PN = "${PN}" XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" -- cgit v1.2.3 From 8cbb367f96dd5826c03d10a9ec8abadf0073f717 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 15:09:53 +0000 Subject: openmoko: add qvga theme and mark themes as arch agnostic --- .../openmoko-theme-standard-qvga_svn.bb | 25 ++++++++++++++++++++++ .../openmoko-base/openmoko-theme-standard_svn.bb | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb new file mode 100644 index 0000000000..0c19db77ac --- /dev/null +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +inherit openmoko-base + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http" +S = "${WORKDIR}" + +dirs = "themes/openmoko-standard" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir}/themes/ + for i in ${dirs}; do + cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/ + done + + install -d ${D}${sysconfdir}/gtk-2.0 + echo 'include "${datadir}/themes/openmoko-standard-qvga/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc +} + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index e7a6def235..6265526de6 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.0+svn${SRCDATE}" -PR = "r3" +PR = "r4" inherit openmoko-base @@ -21,4 +21,5 @@ do_install() { echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } +PACKAGE_ARCH = "all" FILES_${PN} = "${datadir} ${sysconfdir}" -- cgit v1.2.3 From b1b331bce16c054ebf9c32935ac6c487a6149116 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:23:36 +0000 Subject: xserver-kdrive-common: the tslib is patch not needed anymore in 1.2, the other two have to be modified --- packages/xorg-xserver/xserver-kdrive-common.inc | 3 - .../xserver-kdrive/enable-epson-1.2.patch | 11 + .../xserver-kdrive/xcalibrate-1.2.patch | 356 +++++++++++++++++++++ 3 files changed, 367 insertions(+), 3 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index bc1ac64c81..3cb038648e 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -97,9 +97,6 @@ KDRIVE_COMMON_PATCHES = " \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ " diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch new file mode 100644 index 0000000000..1a1fc373d5 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch @@ -0,0 +1,356 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-28 17:00:33.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-28 16:59:42.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-28 17:02:05.000000000 +0200 +@@ -647,6 +647,12 @@ + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) + fi + ++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) ++if test "x$XCALIBRATE" = xyes; then ++ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" ++fi ++ + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) + if test "x$XEVIE" = xyes; then + AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) +@@ -1539,7 +1545,7 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) +Index: xorg-server-1.2.0/include/kdrive-config.h.in +=================================================================== +--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-28 17:00:33.000000000 +0200 +@@ -25,4 +25,7 @@ + /* Verbose debugging output hilarity */ + #undef DEBUG + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #endif /* _KDRIVE_CONFIG_H_ */ +Index: xorg-server-1.2.0/Xext/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/Xext/Makefile.am 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/Xext/Makefile.am 2007-03-28 17:00:33.000000000 +0200 +@@ -91,6 +91,11 @@ + # XCalibrare needs tslib + endif + ++XCALIBRATE_SRCS = xcalibrate.c ++if XCALIBRATE ++BUILTIN_SRCS += $(XCALIBRATE_SRCS) ++endif ++ + # X EVent Interception Extension: allows accessibility helpers & composite + # managers to intercept events from input devices and transform as needed + # before the clients see them. +@@ -169,6 +174,7 @@ + $(XCSECURITY_SRCS) \ + $(XCALIBRATE_SRCS) \ + $(XINERAMA_SRCS) \ ++ $(XCALIBRATE_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) \ +Index: xorg-server-1.2.0/Xext/xcalibrate.c +=================================================================== +--- xorg-server-1.2.0.orig/Xext/xcalibrate.c 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/Xext/xcalibrate.c 2007-03-28 17:00:33.000000000 +0200 +@@ -260,3 +260,265 @@ + + xcalibrate_client = 0; + } ++/* ++ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ ++ * ++ * Copyright © 2003 Philip Blundell ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Philip Blundell not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Philip Blundell makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_KDRIVE_CONFIG_H ++#include ++#endif ++ ++#define NEED_EVENTS ++#define NEED_REPLIES ++ ++#include ++#include ++#include "misc.h" ++#include "os.h" ++#include "dixstruct.h" ++#include "extnsionst.h" ++#include "swaprep.h" ++ ++#include ++#include ++ ++extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); ++extern void *tslib_raw_event_closure; ++ ++static CARD8 XCalibrateReqCode; ++int XCalibrateEventBase; ++int XCalibrateReqBase; ++int XCalibrateErrorBase; ++ ++static ClientPtr xcalibrate_client; ++ ++static void ++xcalibrate_event_hook (int x, int y, int pressure, void *closure) ++{ ++ ClientPtr pClient = (ClientPtr) closure; ++ xXCalibrateRawTouchscreenEvent ev; ++ ++ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; ++ ev.sequenceNumber = pClient->sequence; ++ ev.x = x; ++ ev.y = y; ++ ev.pressure = pressure; ++ ++ if (!pClient->clientGone) ++ WriteEventsToClient (pClient, 1, (xEvent *) &ev); ++} ++ ++static int ++ProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ xXCalibrateQueryVersionReply rep; ++ CARD16 client_major, client_minor; /* not used */ ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ ++ client_major = stuff->majorVersion; ++ client_minor = stuff->minorVersion; ++ ++ fprintf(stderr, "%s(): called\n", __func__); ++ ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; ++ rep.minorVersion = XCALIBRATE_MINOR_VERSION; ++ if (client->swapped) { ++ int n; ++ swaps(&rep.sequenceNumber, n); ++ swapl(&rep.length, n); ++ swaps(&rep.majorVersion, n); ++ swaps(&rep.minorVersion, n); ++ } ++ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); ++ return (client->noClientException); ++} ++ ++static int ++SProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ swaps(&stuff->majorVersion,n); ++ swaps(&stuff->minorVersion,n); ++ return ProcXCalibrateQueryVersion(client); ++} ++ ++static int ++ProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ xXCalibrateRawModeReply rep; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ memset (&rep, 0, sizeof (rep)); ++ rep.type = X_Reply; ++ rep.sequenceNumber = client->sequence; ++ ++ if (stuff->on) ++ { ++ if (xcalibrate_client == NULL) ++ { ++ /* Start calibrating. */ ++ xcalibrate_client = client; ++ tslib_raw_event_hook = xcalibrate_event_hook; ++ tslib_raw_event_closure = client; ++ rep.status = GrabSuccess; ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ else ++ { ++ if (xcalibrate_client == client) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ rep.status = GrabSuccess; ++ ++ /* Cycle input off and on to reload configuration. */ ++ KdDisableInput (); ++ KdEnableInput (); ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ ++ if (client->swapped) ++ { ++ int n; ++ ++ swaps (&rep.sequenceNumber, n); ++ swaps (&rep.status, n); ++ } ++ WriteToClient(client, sizeof (rep), (char *) &rep); ++ return (client->noClientException); ++} ++ ++ ++static int ++SProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ swaps(&stuff->on, n); ++ ++ return ProcXCalibrateSetRawMode(client); ++} ++ ++static void ++XCalibrateResetProc (ExtensionEntry *extEntry) ++{ ++} ++ ++static int ++ProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return ProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return ProcXCalibrateSetRawMode(client); ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static int ++SProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ int n; ++ ++ swaps(&stuff->length,n); ++ ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return SProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return SProcXCalibrateSetRawMode(client); ++ ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static void ++XCalibrateClientCallback (CallbackListPtr *list, ++ pointer closure, ++ pointer data) ++{ ++ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ++ ClientPtr pClient = clientinfo->client; ++ ++ if (clientinfo->setup == NULL ++ && xcalibrate_client != NULL ++ && xcalibrate_client == pClient) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ } ++} ++ ++void ++XCalibrateExtensionInit(void) ++{ ++ ExtensionEntry *extEntry; ++ ++ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) ++ return; ++ ++ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, ++ ProcXCalibrateDispatch, SProcXCalibrateDispatch, ++ XCalibrateResetProc, StandardMinorOpcode); ++ ++ if (!extEntry) ++ return; ++ ++ XCalibrateReqCode = (unsigned char)extEntry->base; ++ XCalibrateEventBase = extEntry->eventBase; ++ XCalibrateErrorBase = extEntry->errorBase; ++ ++ xcalibrate_client = 0; ++} -- cgit v1.2.3 From a3c1863f7b18e552f43befc0e3231f7752991d1e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:30:27 +0000 Subject: xserver-kdrive: change X11R7.1-1.1.0 to use xserver-kdrive-common.inc --- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 131 ++------------------- 1 file changed, 11 insertions(+), 120 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index fafad38b1a..1aff9cdf79 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,130 +1,21 @@ -LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +require xserver-kdrive-common.inc -PR = "r9" +DEPENDS += "xcalibrateext" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev \ - xserver-kdrive-sdl \ - xserver-kdrive-fake \ - xserver-kdrive-xephyr \ - xserver-kdrive-epson \ - xserver-kdrive-w100 \ - xserver-kdrive-ati \ - xserver-kdrive-chips \ - xserver-kdrive-i810 \ - xserver-kdrive-mach64 \ - xserver-kdrive-mga \ - xserver-kdrive-neomagic \ - xserver-kdrive-nvidia \ - xserver-kdrive-pm2 \ - xserver-kdrive-r128 \ - xserver-kdrive-smi \ - xserver-kdrive-vesa \ - xserver-kdrive-via \ - " +PR = "r10" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" -DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" -DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" -DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" -DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" -DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" +PACKAGES =+ "xserver-kdrive-w100" -FILES_${PN} += "${libdir}/xserver/SecurityPolicy" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" -FILES_xserver-kdrive-w100 = "${bindir}/Xw100" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-chips = "${bindir}/Xchips" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" -FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" -FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" -FILES_xserver-kdrive-r128 = "${bindir}/Xr128" -FILES_xserver-kdrive-smi = "${bindir}/Xsmi" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" - -RDEPENDS_xserver-kdrive-fbdev = "${PN}" -RDEPENDS_xserver-kdrive-fake = "${PN}" -RDEPENDS_xserver-kdrive-xephyr = "${PN}" -RDEPENDS_xserver-kdrive-epson = "${PN}" -RDEPENDS_xserver-kdrive-sdl = "${PN}" -RDEPENDS_xserver-kdrive-w100 = "${PN}" -RDEPENDS_xserver-kdrive-ati = "${PN}" -RDEPENDS_xserver-kdrive-chips = "${PN}" -RDEPENDS_xserver-kdrive-i810 = "${PN}" -RDEPENDS_xserver-kdrive-mach64 = "${PN}" -RDEPENDS_xserver-kdrive-mga = "${PN}" -RDEPENDS_xserver-kdrive-neomagic = "${PN}" -RDEPENDS_xserver-kdrive-nvidia = "${PN}" -RDEPENDS_xserver-kdrive-pm2 = "${PN}" -RDEPENDS_xserver-kdrive-r128 = "${PN}" -RDEPENDS_xserver-kdrive-smi = "${PN}" -RDEPENDS_xserver-kdrive-vesa = "${PN}" -RDEPENDS_xserver-kdrive-via = "${PN}" - -SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES} \ file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ - file://kmode-palm.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_palmtx = "palmtx" -PACKAGE_ARCH_palmld = "palmld" -PACKAGE_ARCH_palmz72 = "palmz72" - -S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" - -inherit autotools pkgconfig + file://enable-epson.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://w100.patch;patch=1 \ + " -ARM_INSTRUCTION_SET = "arm" +S = "${WORKDIR}/xorg-server-${PV}" W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 285e3fcf035e239f072df60c5c323a20e21cd07a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:31:28 +0000 Subject: xserver-kdrive: change 1.2.0 to use xserver-kdrive-common.inc --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 136 +++----------------------- 1 file changed, 14 insertions(+), 122 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 4e7d438b3e..67e132d543 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -1,130 +1,22 @@ -LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxkbfile libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +require xserver-kdrive-common.inc -PE = "1" - -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev \ - xserver-kdrive-sdl \ - xserver-kdrive-fake \ - xserver-kdrive-xephyr \ - xserver-kdrive-epson \ - xserver-kdrive-w100 \ - xserver-kdrive-ati \ - xserver-kdrive-chips \ - xserver-kdrive-i810 \ - xserver-kdrive-mach64 \ - xserver-kdrive-mga \ - xserver-kdrive-neomagic \ - xserver-kdrive-nvidia \ - xserver-kdrive-pm2 \ - xserver-kdrive-r128 \ - xserver-kdrive-smi \ - xserver-kdrive-vesa \ - xserver-kdrive-via \ - " - -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" -DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" -DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" -DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" -DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" -DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" +DEPENDS += "libxkbfile libxcalibrate" -FILES_${PN} += "${libdir}/xserver/SecurityPolicy" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" -FILES_xserver-kdrive-w100 = "${bindir}/Xw100" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-chips = "${bindir}/Xchips" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" -FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" -FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" -FILES_xserver-kdrive-r128 = "${bindir}/Xr128" -FILES_xserver-kdrive-smi = "${bindir}/Xsmi" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" +PE = "1" +PR = "r1" -RDEPENDS_xserver-kdrive-fbdev = "${PN}" -RDEPENDS_xserver-kdrive-fake = "${PN}" -RDEPENDS_xserver-kdrive-xephyr = "${PN}" -RDEPENDS_xserver-kdrive-epson = "${PN}" -RDEPENDS_xserver-kdrive-sdl = "${PN}" -RDEPENDS_xserver-kdrive-w100 = "${PN}" -RDEPENDS_xserver-kdrive-ati = "${PN}" -RDEPENDS_xserver-kdrive-chips = "${PN}" -RDEPENDS_xserver-kdrive-i810 = "${PN}" -RDEPENDS_xserver-kdrive-mach64 = "${PN}" -RDEPENDS_xserver-kdrive-mga = "${PN}" -RDEPENDS_xserver-kdrive-neomagic = "${PN}" -RDEPENDS_xserver-kdrive-nvidia = "${PN}" -RDEPENDS_xserver-kdrive-pm2 = "${PN}" -RDEPENDS_xserver-kdrive-r128 = "${PN}" -RDEPENDS_xserver-kdrive-smi = "${PN}" -RDEPENDS_xserver-kdrive-vesa = "${PN}" -RDEPENDS_xserver-kdrive-via = "${PN}" +PACKAGES =+ "xserver-kdrive-imageon" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1 \ - file://kmode-palm.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_palmtx = "palmtx" -PACKAGE_ARCH_palmld = "palmld" -PACKAGE_ARCH_palmz72 = "palmz72" + ${KDRIVE_COMMON_PATCHES} \ + file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ + file://xcalibrate-1.2.patch;patch=1 \ + file://enable-epson-1.2.patch;patch=1 \ + file://kdrive-vidmemarea.patch;patch=1 \ + file://kdrive-imageon.patch;patch=1 \ + " S = "${WORKDIR}/xorg-server-${PV}" -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" - -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" +IMAGEON_OECONF = "--disable-imageon" +IMAGEON_OECONF_arm = "--enable-imageon" -- cgit v1.2.3 From f4f68b661bf5ba29ee8f05a8d04bc9e24ee7c881 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:32:21 +0000 Subject: xserver-kdrive: change git version to use xserver-kdrive-common.inc --- .../disable-xf86-dga-xorgcfg-1.2.patch | 39 ++++++++++++ .../disable-xf86-dga-xorgcfg-git.patch | 39 ------------ packages/xorg-xserver/xserver-kdrive_git.bb | 70 +++------------------- 3 files changed, 48 insertions(+), 100 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 -+++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 -@@ -513,7 +513,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1540,7 +1544,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1560,10 +1566,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 0fc9ec1997..6e53b40d05 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,71 +1,19 @@ -PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r7" +require xserver-kdrive-common.inc -LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" +DEPENDS += "libxkbfile libxcalibrate" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" - -FILES_${PN} += "${libdir}/xserver/SecurityPolicy" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" -FILES_xserver-kdrive-w100 = "${bindir}/Xw100" - -RDEPENDS_xserver-kdrive-fbdev = "${PN}" -RDEPENDS_xserver-kdrive-fake = "${PN}" -RDEPENDS_xserver-kdrive-xephyr = "${PN}" -RDEPENDS_xserver-kdrive-epson = "${PN}" -RDEPENDS_xserver-kdrive-sdl = "${PN}" -RDEPENDS_xserver-kdrive-w100 = "${PN}" +PE = "1" +PV = "1.2.0+git${SRCDATE}" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ + ${KDRIVE_COMMON_PATCHES} \ + file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ + file://xcalibrate-1.2.patch;patch=1 \ file://enable-epson.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg-git.patch;patch=1 \ - file://w100.patch;patch=1 \ + file://build-fix-panoramix.patch;patch=1 \ " -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From b8637ac39ef2ffdb98926f4583c0b22a56b69fef Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:39:09 +0000 Subject: xserver-kdrive: remove xcalibrate-1.2 patch, xcalibrate is upstream after all --- .../xserver-kdrive/xcalibrate-1.2.patch | 356 --------------------- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 1 - packages/xorg-xserver/xserver-kdrive_git.bb | 1 - 3 files changed, 358 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch deleted file mode 100644 index 1a1fc373d5..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch +++ /dev/null @@ -1,356 +0,0 @@ -Index: xorg-server-1.2.0/mi/miinitext.c -=================================================================== ---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 -+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-28 17:00:33.000000000 +0200 -@@ -372,6 +372,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XEVIE - extern void XevieExtensionInit(INITARGS); - #endif -@@ -663,6 +666,9 @@ - #ifdef DAMAGE - if (!noDamageExtension) DamageExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - void -Index: xorg-server-1.2.0/configure.ac -=================================================================== ---- xorg-server-1.2.0.orig/configure.ac 2007-03-28 16:59:42.000000000 +0200 -+++ xorg-server-1.2.0/configure.ac 2007-03-28 17:02:05.000000000 +0200 -@@ -647,6 +647,12 @@ - AC_DEFINE(XCSECURITY, 1, [Build Security extension]) - fi - -+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) -+if test "x$XCALIBRATE" = xyes; then -+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" -+fi -+ - AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) - if test "x$XEVIE" = xyes; then - AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) -@@ -1539,7 +1545,7 @@ - ;; - esac - KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' -- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" -+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" - - # check if we can build Xephyr - PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) -Index: xorg-server-1.2.0/include/kdrive-config.h.in -=================================================================== ---- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-01-23 06:39:17.000000000 +0100 -+++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-28 17:00:33.000000000 +0200 -@@ -25,4 +25,7 @@ - /* Verbose debugging output hilarity */ - #undef DEBUG - -+/* Enable XCalibrate extension */ -+#undef XCALIBRATE -+ - #endif /* _KDRIVE_CONFIG_H_ */ -Index: xorg-server-1.2.0/Xext/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/Xext/Makefile.am 2007-01-23 06:39:15.000000000 +0100 -+++ xorg-server-1.2.0/Xext/Makefile.am 2007-03-28 17:00:33.000000000 +0200 -@@ -91,6 +91,11 @@ - # XCalibrare needs tslib - endif - -+XCALIBRATE_SRCS = xcalibrate.c -+if XCALIBRATE -+BUILTIN_SRCS += $(XCALIBRATE_SRCS) -+endif -+ - # X EVent Interception Extension: allows accessibility helpers & composite - # managers to intercept events from input devices and transform as needed - # before the clients see them. -@@ -169,6 +174,7 @@ - $(XCSECURITY_SRCS) \ - $(XCALIBRATE_SRCS) \ - $(XINERAMA_SRCS) \ -+ $(XCALIBRATE_SRCS) \ - $(XEVIE_SRCS) \ - $(XPRINT_SRCS) \ - $(APPGROUP_SRCS) \ -Index: xorg-server-1.2.0/Xext/xcalibrate.c -=================================================================== ---- xorg-server-1.2.0.orig/Xext/xcalibrate.c 2007-01-23 06:39:15.000000000 +0100 -+++ xorg-server-1.2.0/Xext/xcalibrate.c 2007-03-28 17:00:33.000000000 +0200 -@@ -260,3 +260,265 @@ - - xcalibrate_client = 0; - } -+/* -+ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ -+ * -+ * Copyright © 2003 Philip Blundell -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Philip Blundell not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Philip Blundell makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_KDRIVE_CONFIG_H -+#include -+#endif -+ -+#define NEED_EVENTS -+#define NEED_REPLIES -+ -+#include -+#include -+#include "misc.h" -+#include "os.h" -+#include "dixstruct.h" -+#include "extnsionst.h" -+#include "swaprep.h" -+ -+#include -+#include -+ -+extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); -+extern void *tslib_raw_event_closure; -+ -+static CARD8 XCalibrateReqCode; -+int XCalibrateEventBase; -+int XCalibrateReqBase; -+int XCalibrateErrorBase; -+ -+static ClientPtr xcalibrate_client; -+ -+static void -+xcalibrate_event_hook (int x, int y, int pressure, void *closure) -+{ -+ ClientPtr pClient = (ClientPtr) closure; -+ xXCalibrateRawTouchscreenEvent ev; -+ -+ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; -+ ev.sequenceNumber = pClient->sequence; -+ ev.x = x; -+ ev.y = y; -+ ev.pressure = pressure; -+ -+ if (!pClient->clientGone) -+ WriteEventsToClient (pClient, 1, (xEvent *) &ev); -+} -+ -+static int -+ProcXCalibrateQueryVersion (ClientPtr client) -+{ -+ REQUEST(xXCalibrateQueryVersionReq); -+ xXCalibrateQueryVersionReply rep; -+ CARD16 client_major, client_minor; /* not used */ -+ -+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); -+ -+ client_major = stuff->majorVersion; -+ client_minor = stuff->minorVersion; -+ -+ fprintf(stderr, "%s(): called\n", __func__); -+ -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; -+ rep.minorVersion = XCALIBRATE_MINOR_VERSION; -+ if (client->swapped) { -+ int n; -+ swaps(&rep.sequenceNumber, n); -+ swapl(&rep.length, n); -+ swaps(&rep.majorVersion, n); -+ swaps(&rep.minorVersion, n); -+ } -+ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+static int -+SProcXCalibrateQueryVersion (ClientPtr client) -+{ -+ REQUEST(xXCalibrateQueryVersionReq); -+ int n; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); -+ swaps(&stuff->majorVersion,n); -+ swaps(&stuff->minorVersion,n); -+ return ProcXCalibrateQueryVersion(client); -+} -+ -+static int -+ProcXCalibrateSetRawMode (ClientPtr client) -+{ -+ REQUEST(xXCalibrateRawModeReq); -+ xXCalibrateRawModeReply rep; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); -+ -+ memset (&rep, 0, sizeof (rep)); -+ rep.type = X_Reply; -+ rep.sequenceNumber = client->sequence; -+ -+ if (stuff->on) -+ { -+ if (xcalibrate_client == NULL) -+ { -+ /* Start calibrating. */ -+ xcalibrate_client = client; -+ tslib_raw_event_hook = xcalibrate_event_hook; -+ tslib_raw_event_closure = client; -+ rep.status = GrabSuccess; -+ } -+ else -+ { -+ rep.status = AlreadyGrabbed; -+ } -+ } -+ else -+ { -+ if (xcalibrate_client == client) -+ { -+ /* Stop calibrating. */ -+ xcalibrate_client = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; -+ rep.status = GrabSuccess; -+ -+ /* Cycle input off and on to reload configuration. */ -+ KdDisableInput (); -+ KdEnableInput (); -+ } -+ else -+ { -+ rep.status = AlreadyGrabbed; -+ } -+ } -+ -+ if (client->swapped) -+ { -+ int n; -+ -+ swaps (&rep.sequenceNumber, n); -+ swaps (&rep.status, n); -+ } -+ WriteToClient(client, sizeof (rep), (char *) &rep); -+ return (client->noClientException); -+} -+ -+ -+static int -+SProcXCalibrateSetRawMode (ClientPtr client) -+{ -+ REQUEST(xXCalibrateRawModeReq); -+ int n; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); -+ -+ swaps(&stuff->on, n); -+ -+ return ProcXCalibrateSetRawMode(client); -+} -+ -+static void -+XCalibrateResetProc (ExtensionEntry *extEntry) -+{ -+} -+ -+static int -+ProcXCalibrateDispatch (ClientPtr client) -+{ -+ REQUEST(xReq); -+ switch (stuff->data) { -+ case X_XCalibrateQueryVersion: -+ return ProcXCalibrateQueryVersion(client); -+ case X_XCalibrateRawMode: -+ return ProcXCalibrateSetRawMode(client); -+ default: break; -+ } -+ -+ return BadRequest; -+} -+ -+static int -+SProcXCalibrateDispatch (ClientPtr client) -+{ -+ REQUEST(xReq); -+ int n; -+ -+ swaps(&stuff->length,n); -+ -+ switch (stuff->data) { -+ case X_XCalibrateQueryVersion: -+ return SProcXCalibrateQueryVersion(client); -+ case X_XCalibrateRawMode: -+ return SProcXCalibrateSetRawMode(client); -+ -+ default: break; -+ } -+ -+ return BadRequest; -+} -+ -+static void -+XCalibrateClientCallback (CallbackListPtr *list, -+ pointer closure, -+ pointer data) -+{ -+ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; -+ ClientPtr pClient = clientinfo->client; -+ -+ if (clientinfo->setup == NULL -+ && xcalibrate_client != NULL -+ && xcalibrate_client == pClient) -+ { -+ /* Stop calibrating. */ -+ xcalibrate_client = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; -+ } -+} -+ -+void -+XCalibrateExtensionInit(void) -+{ -+ ExtensionEntry *extEntry; -+ -+ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) -+ return; -+ -+ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, -+ ProcXCalibrateDispatch, SProcXCalibrateDispatch, -+ XCalibrateResetProc, StandardMinorOpcode); -+ -+ if (!extEntry) -+ return; -+ -+ XCalibrateReqCode = (unsigned char)extEntry->base; -+ XCalibrateEventBase = extEntry->eventBase; -+ XCalibrateErrorBase = extEntry->errorBase; -+ -+ xcalibrate_client = 0; -+} diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 67e132d543..ac276a8e60 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -10,7 +10,6 @@ PACKAGES =+ "xserver-kdrive-imageon" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://xcalibrate-1.2.patch;patch=1 \ file://enable-epson-1.2.patch;patch=1 \ file://kdrive-vidmemarea.patch;patch=1 \ file://kdrive-imageon.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 6e53b40d05..74d0aed432 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -11,7 +11,6 @@ PR = "r8" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ ${KDRIVE_COMMON_PATCHES} \ file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://xcalibrate-1.2.patch;patch=1 \ file://enable-epson.patch;patch=1 \ file://build-fix-panoramix.patch;patch=1 \ " -- cgit v1.2.3 From 7e18fbe25e35f1801955ee150622761a07c8b8f1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 20:28:49 +0000 Subject: mediatomb: merge 0.9.0 recipe from mediatom svn --- packages/mediatomb/mediatomb_0.9.0.bb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/mediatomb/mediatomb_0.9.0.bb (limited to 'packages') diff --git a/packages/mediatomb/mediatomb_0.9.0.bb b/packages/mediatomb/mediatomb_0.9.0.bb new file mode 100644 index 0000000000..f3ea9f54dd --- /dev/null +++ b/packages/mediatomb/mediatomb_0.9.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" +HOMEPAGE = "http://mediatomb.cc/" +LICENSE = "GPLv2" +DEPENDS = "sqlite3 libexif js zlib file id3lib" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-mysql \ + --disable-rpl-malloc \ + --enable-sqlite3 \ + --enable-libjs \ + --enable-libmagic \ + --enable-id3lib \ + --enable-libexif \ + --disable-largefile \ + --with-sqlite3-h=${STAGING_INCDIR} \ + --with-sqlite3-libs=${STAGING_LIBDIR} \ + --with-magic-h=${STAGING_INCDIR} \ + --with-magic-libs=${STAGING_LIBDIR} \ + --with-exif-h=${STAGING_INCDIR} \ + --with-exif-libs=${STAGING_LIBDIR} \ + --with-zlib-h=${STAGING_INCDIR} \ + --with-zlib-libs=${STAGING_LIBDIR} \ + --with-js-h=${STAGING_INCDIR}/js \ + --with-js-libs=${STAGING_LIBDIR} \ + --with-id3lib-h=${STAGING_INCDIR} \ + --with-id3lib-libs=${STAGING_LIBDIR}" -- cgit v1.2.3 From 2992d24c5ad56361a793281566b1ff7c76aa2836 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 28 Mar 2007 22:13:05 +0000 Subject: altboot: - Drop files/* and altboot_0.0.0.bb - Add altboot_svn.bb - Add README.txt explaining what the different versions do --- packages/altboot/README.txt | 5 + packages/altboot/altboot_0.0.0.bb | 99 --- packages/altboot/altboot_svn.bb | 95 +++ packages/altboot/files/.mtn2git_empty | 0 packages/altboot/files/akita/.mtn2git_empty | 0 packages/altboot/files/akita/altboot-2.4.cfg | 31 - packages/altboot/files/akita/altboot-2.6.cfg | 41 - packages/altboot/files/altboot-menu/.mtn2git_empty | 0 packages/altboot/files/altboot-menu/00-Default | 14 - packages/altboot/files/altboot-menu/10-noGui | 16 - packages/altboot/files/altboot-menu/15-bootSD | 32 - packages/altboot/files/altboot-menu/20-bootCF | 32 - .../files/altboot-menu/99-ownScripts-example | 68 -- .../files/altboot-menu/Advanced/.mtn2git_empty | 0 .../files/altboot-menu/Advanced/30-bootUSB-Stick | 47 -- .../altboot/files/altboot-menu/Advanced/40-bootNFS | 110 --- .../altboot/files/altboot-menu/Advanced/55-bin-sh | 27 - .../files/altboot-menu/Advanced/60-orig-init | 20 - .../files/altboot-menu/Advanced/70-install-tgz | 266 ------- .../files/altboot-menu/Advanced/70-setKernel | 68 -- .../files/altboot-menu/Advanced/80-configure-kexec | 248 ------ .../files/altboot-menu/Advanced/80-copyrootfs | 323 -------- packages/altboot/files/altboot.func | 870 --------------------- packages/altboot/files/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/altboot.rc/Readme.txt | 2 - .../altboot/files/altboot.rc/disable_printk.sh | 6 - packages/altboot/files/altboot.rc/loadkeymap.sh | 8 - packages/altboot/files/altboot.rc/playbeep.sh | 34 - packages/altboot/files/altbootctl | 311 -------- packages/altboot/files/altbootctl.conf | 98 --- packages/altboot/files/beep.raw | 1 - packages/altboot/files/c7x0/.mtn2git_empty | 0 packages/altboot/files/c7x0/altboot-2.4.cfg | 30 - packages/altboot/files/c7x0/altboot-2.6.cfg | 39 - packages/altboot/files/collie/.mtn2git_empty | 0 packages/altboot/files/collie/altboot-2.4.cfg | 26 - packages/altboot/files/fic-gta01/.mtn2git_empty | 0 packages/altboot/files/fic-gta01/altboot-2.6.cfg | 41 - .../files/fic-gta01/altboot-menu/.mtn2git_empty | 0 .../files/fic-gta01/altboot-menu/00-Default | 14 - .../altboot/files/fic-gta01/altboot-menu/15-bootSD | 32 - .../fic-gta01/altboot-menu/Advanced/.mtn2git_empty | 0 .../fic-gta01/altboot-menu/Advanced/40-bootNFS | 110 --- packages/altboot/files/init.altboot | 606 -------------- packages/altboot/files/nslu2le/.mtn2git_empty | 0 packages/altboot/files/nslu2le/altboot-2.6.cfg | 55 -- .../files/nslu2le/altboot-handlers/.mtn2git_empty | 0 .../files/nslu2le/altboot-handlers/05-USB-Storage | 90 --- .../nslu2le/altboot-handlers/10-Onboard-Flash | 18 - .../files/nslu2le/altboot-menu/.mtn2git_empty | 0 .../altboot/files/nslu2le/altboot-menu/00-Default | 17 - .../files/nslu2le/altboot-menu/30-bootUSB-Stick | 174 ----- .../altboot/files/nslu2le/altboot-menu/55-bin-sh | 27 - .../files/nslu2le/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/poodle/.mtn2git_empty | 0 packages/altboot/files/poodle/altboot-2.4.cfg | 26 - packages/altboot/files/poodle/altboot-2.6.cfg | 45 -- packages/altboot/files/set-bootdev | 150 ---- packages/altboot/files/spitz/.mtn2git_empty | 0 packages/altboot/files/spitz/altboot-2.6.cfg | 41 - packages/altboot/files/tosa/.mtn2git_empty | 0 packages/altboot/files/tosa/altboot-2.4.cfg | 32 - packages/altboot/files/tosa/altboot-2.6.cfg | 41 - 63 files changed, 100 insertions(+), 4386 deletions(-) create mode 100644 packages/altboot/README.txt delete mode 100644 packages/altboot/altboot_0.0.0.bb create mode 100644 packages/altboot/altboot_svn.bb delete mode 100644 packages/altboot/files/.mtn2git_empty delete mode 100644 packages/altboot/files/akita/.mtn2git_empty delete mode 100644 packages/altboot/files/akita/altboot-2.4.cfg delete mode 100644 packages/altboot/files/akita/altboot-2.6.cfg delete mode 100644 packages/altboot/files/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot-menu/00-Default delete mode 100644 packages/altboot/files/altboot-menu/10-noGui delete mode 100644 packages/altboot/files/altboot-menu/15-bootSD delete mode 100644 packages/altboot/files/altboot-menu/20-bootCF delete mode 100644 packages/altboot/files/altboot-menu/99-ownScripts-example delete mode 100644 packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick delete mode 100644 packages/altboot/files/altboot-menu/Advanced/40-bootNFS delete mode 100644 packages/altboot/files/altboot-menu/Advanced/55-bin-sh delete mode 100644 packages/altboot/files/altboot-menu/Advanced/60-orig-init delete mode 100644 packages/altboot/files/altboot-menu/Advanced/70-install-tgz delete mode 100644 packages/altboot/files/altboot-menu/Advanced/70-setKernel delete mode 100644 packages/altboot/files/altboot-menu/Advanced/80-configure-kexec delete mode 100644 packages/altboot/files/altboot-menu/Advanced/80-copyrootfs delete mode 100644 packages/altboot/files/altboot.func delete mode 100644 packages/altboot/files/altboot.rc/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot.rc/Readme.txt delete mode 100644 packages/altboot/files/altboot.rc/disable_printk.sh delete mode 100644 packages/altboot/files/altboot.rc/loadkeymap.sh delete mode 100644 packages/altboot/files/altboot.rc/playbeep.sh delete mode 100755 packages/altboot/files/altbootctl delete mode 100644 packages/altboot/files/altbootctl.conf delete mode 100644 packages/altboot/files/beep.raw delete mode 100644 packages/altboot/files/c7x0/.mtn2git_empty delete mode 100644 packages/altboot/files/c7x0/altboot-2.4.cfg delete mode 100644 packages/altboot/files/c7x0/altboot-2.6.cfg delete mode 100644 packages/altboot/files/collie/.mtn2git_empty delete mode 100644 packages/altboot/files/collie/altboot-2.4.cfg delete mode 100644 packages/altboot/files/fic-gta01/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-2.6.cfg delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/00-Default delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/15-bootSD delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS delete mode 100644 packages/altboot/files/init.altboot delete mode 100644 packages/altboot/files/nslu2le/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-2.6.cfg delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/00-Default delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/55-bin-sh delete mode 100644 packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty delete mode 100644 packages/altboot/files/poodle/.mtn2git_empty delete mode 100644 packages/altboot/files/poodle/altboot-2.4.cfg delete mode 100644 packages/altboot/files/poodle/altboot-2.6.cfg delete mode 100755 packages/altboot/files/set-bootdev delete mode 100644 packages/altboot/files/spitz/.mtn2git_empty delete mode 100644 packages/altboot/files/spitz/altboot-2.6.cfg delete mode 100644 packages/altboot/files/tosa/.mtn2git_empty delete mode 100644 packages/altboot/files/tosa/altboot-2.4.cfg delete mode 100644 packages/altboot/files/tosa/altboot-2.6.cfg (limited to 'packages') diff --git a/packages/altboot/README.txt b/packages/altboot/README.txt new file mode 100644 index 0000000000..07a41bef3d --- /dev/null +++ b/packages/altboot/README.txt @@ -0,0 +1,5 @@ +altboot_1.0.5.bb - Last known-working version for clamshell + Zauruses running kernel 2.4 +altboot_1.0.8.bb - Last known-working version for all Zauruses +altboot_1.1.1+wip-20061123.bb - Last known-working version for neo1973 +altboot_wip.bb diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb deleted file mode 100644 index 930a30c1ac..0000000000 --- a/packages/altboot/altboot_0.0.0.bb +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_0.0.0.bb -# Date: 07-May-06 - -DESCRIPTION = "The altboot bootmanager" -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" -INHIBIT_PACKAGE_STRIP = "1" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" - -# Currently the OM image for the Neo is lacking a few basic things... -RDEPENDS_${PN}_fic-gta01 = "${PN}-conf kernel-module-ext2 kernel-module-loop kernel-module-s3cmci " - - -###################################################################################### - -PR = "r52" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -#PACKAGE_ARCH_${PN} = "all" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "file://altboot-menu \ - file://altboot.rc \ - file://altboot.func \ - file://init.altboot \ - file://altboot*.cfg \ - file://altbootctl.conf \ - file://altbootctl \ - file://beep.raw" - -# S = "${WORKDIR}/altboot/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*.cfg" - -###################################################################################### - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - install -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc - install -m 0644 ${WORKDIR}/altboot.func ${D}/etc - install -m 0644 ${WORKDIR}/altbootctl.conf ${D}/etc - install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altbootctl ${D}/sbin - - install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${WORKDIR}/altboot-menu/Advanced - then - install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - - install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc -} - -###################################################################################### - -do_configure() { - cat ${WORKDIR}/init.altboot | sed "s/^VERSION=.*/VERSION=\"0.0.0 Developer Snapshot (${DATE})\"/" > ${WORKDIR}/init.altboot_ - mv ${WORKDIR}/init.altboot_ ${WORKDIR}/init.altboot -} - -###################################################################################### - -pkg_postinst_${PN}() { - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - update-alternatives --remove init /sbin/init.altboot -} - diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb new file mode 100644 index 0000000000..baf5116d70 --- /dev/null +++ b/packages/altboot/altboot_svn.bb @@ -0,0 +1,95 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +PV = "1.1.1+wip-${SRCDATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + install -d ${D}/etc/skel/altboot + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + update-alternatives --remove init /sbin/init.altboot +} + diff --git a/packages/altboot/files/.mtn2git_empty b/packages/altboot/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/akita/.mtn2git_empty b/packages/altboot/files/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/akita/altboot-2.4.cfg b/packages/altboot/files/akita/altboot-2.4.cfg deleted file mode 100644 index 4ea84ce32d..0000000000 --- a/packages/altboot/files/akita/altboot-2.4.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg deleted file mode 100644 index 62e8ea2434..0000000000 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/altboot-menu/.mtn2git_empty b/packages/altboot/files/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot-menu/00-Default b/packages/altboot/files/altboot-menu/00-Default deleted file mode 100644 index 9d29fdae2a..0000000000 --- a/packages/altboot/files/altboot-menu/00-Default +++ /dev/null @@ -1,14 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - - -run_module() { - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/10-noGui b/packages/altboot/files/altboot-menu/10-noGui deleted file mode 100644 index cf3c10c381..0000000000 --- a/packages/altboot/files/altboot-menu/10-noGui +++ /dev/null @@ -1,16 +0,0 @@ -# !/bin/sh -M_TITLE="Don't launch GUI" - -test "$DISABLE_NOGUI_BOOT" = yes && exit 0 - - -run_module() { - clear ; exec $REAL_INIT "$NO_GUI_RL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD deleted file mode 100644 index 3cf49deea5..0000000000 --- a/packages/altboot/files/altboot-menu/15-bootSD +++ /dev/null @@ -1,32 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot SD card" - -test "$DISABLE_SD_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - mount_sd - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/20-bootCF b/packages/altboot/files/altboot-menu/20-bootCF deleted file mode 100644 index 4add6e6631..0000000000 --- a/packages/altboot/files/altboot-menu/20-bootCF +++ /dev/null @@ -1,32 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot CF card" - -test "$DISABLE_CF_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - mount_cf - - # Check for a real fs and loop-images. - check_target "$CF_MOUNTPOINT" - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/99-ownScripts-example b/packages/altboot/files/altboot-menu/99-ownScripts-example deleted file mode 100644 index 7566416b87..0000000000 --- a/packages/altboot/files/altboot-menu/99-ownScripts-example +++ /dev/null @@ -1,68 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -# This file will teach you how to implement your own scripts while using existing altboot -# code. - -# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which -# return a title when run with the "title" parameter. -# Script which do not return a title will never be shown in the boot menu! -# -M_TITLE="altboot sample" - -# We can use that to deactivate certain scripts: -exit 0 - -# The "title" parameter is implemented at the end of this script so it will never be reached -# and the script will simply be ignored by altboot. - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - # altboot.func contains re-useable code. If you intend to use check_target (see below) - # you must keep this line. If not, delete it. - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - - # The only thing you'll have to do is get your medium mounted. - # The following lines mount a SD card on 2.4-series kernels on a Zaurus - - ########################################## - - # Mount /proc, etc - init_rootfs - - echo -n "Loading SD kernel module..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - - echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - ########################################## - - # Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere, - # just call check_target with the mountpoint as parameter. - # check_target searches the medium for a real filesystem and loop-images and - # asks the user what to boot if there are several choices. - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - - # Done :) - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick deleted file mode 100644 index b573e7a10c..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick +++ /dev/null @@ -1,47 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot USB Storage" - -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - echo "Starting USB..." - - for module in $USB_STORAGE_MODULES - do - echo -en "\t - $module: " - modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" - done - - echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 - - mkdir -p /media/usb-storage >/dev/null 2>&1 - - sleep "$USB_STORAGE_WAIT" - - /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Check for a real fs and loop-images. - check_target "/media/usb-storage" >/dev/tty0 -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 4f5c195be2..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 40-bootNFS -# Date: 14-Apr-06 - - -M_TITLE="Boot from NFS" - -test "$DISABLE_NFS_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - start_networking "$nfs_host" - - if test -z "$nfs_host" - then - mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" - - fi - - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - stty echo - echo -n "Boot NFS root: " - - if test "$AUTOBOOT" != "yes" - then - read junk < /dev/tty1 - else - if test -e /etc/.altboot-bootNFS-source.last - then - junk="`cat /etc/.altboot-bootNFS-source.last`" - test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" - else - read junk < /dev/tty1 - fi - fi - - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - echo "$junk" > /etc/.altboot-bootNFS-source.last - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - - if ( mount | grep -q "/media/nfsroot" ) - then - echo "/media/nfsroot already used, tying to umount..." - umount /media/image - losetup -d /dev/loop0 - umount /media/nfsroot || die "umount failed!" - fi - - mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" - - # Use configured resolv.conf in the pivoted rootfs - #echo -n "Copying resolv.conf..." - #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - - check_target "/media/nfsroot" bootNFS - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh deleted file mode 100644 index e4fe99ebae..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh +++ /dev/null @@ -1,27 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - -test "$DISABLE_BINSH_BOOT" = yes && exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/$OUT_TTY - - # Mount /proc, etc - init_rootfs - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL /dev/$OUT_TTY 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/60-orig-init b/packages/altboot/files/altboot-menu/Advanced/60-orig-init deleted file mode 100644 index ad9f2c78e1..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/60-orig-init +++ /dev/null @@ -1,20 +0,0 @@ -# !/bin/sh -M_TITLE="Boot original INIT" - -exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo "altboot: Using real init [$REAL_INIT] [$INIT_RUNLEVEL] *" >/dev/tty1 - exec $REAL_INIT $INIT_RUNLEVEL - exit 0 - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz deleted file mode 100644 index b6e5d94d5d..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ /dev/null @@ -1,266 +0,0 @@ -#!/bin/sh -M_TITLE="Install RootFS from tar.gz" -M_FLAGS="noRemember" - -test "$DISABLE_INSTTGZ_BOOT" = yes && exit 0 - -run_module(){ - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - # Mount - mount_sd ingore_errors - mount_cf - mount_home - - for source in /home /media/card /media/cf - do - #echo "source: [$source]" - rootfs_files="`ls -1 $source | grep "rootfs.tar.gz"`" - - #echo "rootfs_file: [$rootfs_files]" - if test "`echo "$rootfs_files" | wc -l | tr -d " "`" -gt 1 - then - echo "Multiple rootfs files not supported, yet" - else - if test -n "$rootfs_files" - then - rootfs_source="$source/$rootfs_files" - echo "Using [$rootfs_source]" - break - fi - fi - done - - test -z "$rootfs_source" && die "No rootfs.tar.gz found" - - echo -e "\nPlease choose the target of this installation:\n" - - echo -e "\t [1] SD / MMC" - echo -e "\t [2] Compact Flash" - - echo "" - while true - do - echo -n "Your target: " - read junk - - case "$junk" in - 1) if (mount | grep -q "/media/card ") - then - rootfs_target="/media/card"; break - else - echo -e "\nInstallation target [/media/card] not mounted\n" - fi ;; - 2) if (mount | grep -q "/media/cf ") - then - rootfs_target="/media/cf"; break - else - echo -e "\nInstallation target [/media/cf] not mounted\n" - fi ;; - esac - done - - echo -e "\nPlease choose the type of this installation:\n" - - echo -e "\t [1] Imagefile (loopfile)" - echo -e "\t [2] Direct Install" - - echo "" - while true - do - echo -n "Install type: " - read junk - - case "$junk" in - 1) if test -x /sbin/mkfs.ext2 - then - rootfs_type="image" - break - else - echo -e "\nNOTE: mkfs.ext2 (from e2fsprogs-mke2fs) not found, loop-images not supported\n" - fi ;; - 2) rootfs_type="direct" ; break ;; - esac - done - - case "$rootfs_type" in - image) install_rootfs_image "$rootfs_target";; - direct) install_rootfs_direct "$rootfs_target";; - esac -} - -clear_directories(){ - test "$1" = "/" -o "$1" = "/ " && die "clear_directories(): You don't want to do that." - - ! test -d "$1" && die "clear_directories(): [$1] not found." - - for d in bin dev media proc sys usr boot etc lib mnt sbin tmp var - do - if test -d "$1/$d" - then - echo "Removing [$1/$d]..." - rm -rf "$1/$d" - fi - done - -} - - -install_rootfs_direct(){ - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" - - echo -e "Do you want to remove existing directories from [$1]\n before installing the new rootfs?" - echo "" - - while true - do - echo -n "Remove old directories? [Y|n] " - read junk /dev/tty0 2>&1 - - case "$junk" in - Y|y|"") clear_directories "$1"; break ;; - esac - done - - echo "Please press to begin the installation" - read junk /dev/tty0 2>&1 - - test -d "$1" || die "Directory [$1] not found" - - echo -n "Installing rootfs, please wait..." - tar -xzf "$rootfs_source" -C "$1" >/dev/null 2>&1 && echo ok || die "tar -xzf \"$rootfs_source\" -C \"$1\" failed!" - - echo -n "Syncing drives..." - sync - echo "done" - -# umount "$1" - - echo "Press to bring up the altboot menu" - read junk /dev/tty0 2>&1 - exec /sbin/init.altboot -force - -} - -install_rootfs_image(){ - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" - - echo "" - echo "Please enter a name for the image file." - echo "Do not use the character" - echo "" - - - while true - do - echo -n "Image name: " - read junk - - if test -n "$junk" - then - if test -e "$1/boot-images/${junk}-rootfs.bin" - then - echo -e "\nFile [$1/boot-images/${junk}-rootfs.bin] already exists." - - while true - do - echo -n "Overwrite? [y|N] " - read junk2 - - case "$junk2" in - Y|y) break;; - n|N|"") install_rootfs_image "$1" - exit 0;; - esac - done - rootfs_image_name="${junk}-rootfs.bin" - break - else - echo -n "Use [$junk] as name? [Y|n] " - read junk2 - - case "$junk2" in - "Y"|"y"|"") rootfs_image_name="${junk}-rootfs.bin" - break ;; - *) echo "err ]$junk]";; - esac - fi - fi - done - - echo "" - echo "Please enter the image size in MegaBytes" - echo "Must be at least 30Mb" - echo "" - - while true - do - echo -n "Image size: " - read junk - - junk="`echo "$junk" | sed "s/[a-zA-Z]//g"`" - - if test -n "$junk" - then - if test "$junk" -gt 29 - then - echo -n "Is [${junk}Mb] correct? [Y|n] " - read junk2 - - case "$junk2" in - Y|y|"") rootfs_image_size="$junk" - break ;; - esac - - else - echo "Image size of [${junk}Mb] is too small!" - fi - fi - done - - test -z "$rootfs_image_name" -o -z "$rootfs_image_size" && die "DEBUG: Empty VAR in install_rootfs_image()" - - echo "" - echo "Creating [$rootfs_image_name] (${rootfs_image_size}Mb) on [$1]" - echo "Please wait..." - mkdir -p "$1/boot-images" - - dd if=/dev/zero of="$1/boot-images/$rootfs_image_name" bs=1024k count=$rootfs_image_size >/dev/null - - echo -n "Creating an ext2 filesystem on $rootfs_image_name..." - losetup /dev/loop0 "$1/boot-images/$rootfs_image_name" || die "losetup /dev/loop0 \"$1/boot-images/$rootfs_image_name\" failed!" - mkfs.ext2 -m0 /dev/loop0 >/dev/null 2>&1 && echo done || die "mkfs.ext2 -m0 /dev/loop0 failed!" - - echo -n "Mounting loopfile..." - mkdir -p /media/image - mount /dev/loop0 /media/image && echo ok || die "mount /dev/loop0 /media/image failed!" - - echo -n "Installing rootfs, please wait..." - tar -xzf "$rootfs_source" -C "/media/image" >/dev/null 2>&1 && echo ok || die "tar -xzf \"$rootfs_source\" -C \"$1\" failed!" - - echo -n "Syncing drives..." - sync - echo "done" - - umount "/media/image" && losetup -d /dev/loop0 - - echo "Press to bring up the altboot menu" - read junk /dev/tty0 2>&1 - exec /sbin/init.altboot -force - -} - - - -#run_module - -case "$1" in -title) echo "$M_TITLE";; -flags) echo "$M_FLAGS";; -run) run_module "$2";; -esac diff --git a/packages/altboot/files/altboot-menu/Advanced/70-setKernel b/packages/altboot/files/altboot-menu/Advanced/70-setKernel deleted file mode 100644 index 50f61d034f..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/70-setKernel +++ /dev/null @@ -1,68 +0,0 @@ -# !/bin/sh -M_TITLE="Choose kernel for next boot" - -# Deprecated due to altbootctl -exit 0 - -# Only kernel 2.6 offers kexec support -uname -r | grep -q "^2.6" || exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot" - test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]" - - # Mount /proc, etc - # init_rootfs - - if test `ls -1 $KEXEC_KERNEL_DIR | grep -v "kexec.cfg" | wc -l | tr -d " "` -gt 1 - then - echo -e "\nSelect the kernel for use of the next boot:\n" - - cnt=1 ; reset_pref "kexec_klist" - for k in `ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" ` - do - echo -e "\t[$cnt] $k" - set_pref "kexec_klist" "$cnt" "$k" - - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Select a kernel: " - read junk - - #echo_pref kexec_klist - - get_pref "kexec_klist" "$junk" KEXEC_SELECTED_KERNEL && break - - done - else - KEXEC_SELECTED_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `" - fi - - echo -e "\nUsing [$KEXEC_SELECTED_KERNEL]" - - if ! test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" - then - echo -e "\nWARNING: This kernel has not been configured." - echo -e "It will only boot correctly if CMDLINE is compiled in.\n" - fi - - export USE_KEXEC_ON_NEXT_BOOT=yes - export KEXEC_SELECTED_KERNEL - show_menu -} - - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec deleted file mode 100644 index 1b8fc6e547..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec +++ /dev/null @@ -1,248 +0,0 @@ -# !/bin/sh -M_TITLE="Configure kexec CMDLINE" - -# Deprecated due to altbootctl -exit 0 - - -# Only kernel 2.6 offers kexec support -uname -r | grep -q "^2.6" || exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot" - test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]" - - # Mount /proc, etc - init_rootfs - - if test `ls -1 $KEXEC_KERNEL_DIR | grep -v "kexec.cfg" | wc -l | tr -d " "` -gt 1 - then - echo -e "\nPlease select the kernel you want to configure:\n" - - cnt=1 ; reset_pref "kexec_klist" - for k in `ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" ` - do - echo -e "\t[$cnt] $k" - set_pref "kexec_klist" "$cnt" "$k" - - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Select a kernel: " - read junk - - get_pref "kexec_klist" "$junk" KEXEC_KERNEL && break - - done - else - KEXEC_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `" - fi - - echo -e "\nUsing [$KEXEC_KERNEL]" - - configure_rootdev - configure_roottype - configure_verbose - configure_custom - - CMDLINE="console=ttyS0,115200n8 console=tty1 dyntick=enable fbcon=rotate:1 noinitrd root=$KERNEL_ROOTDEV rootfstype=$KERNEL_ROOTFSTYPE $KERNEL_VERBOSE $KERNEL_CUSTOM" - - echo -en "\nWriting CMDLINE to $KEXEC_KERNEL.kexec.cfg..." - echo "$CMDLINE" > $KEXEC_KERNEL.kexec.cfg && echo ok || mdie FAILED - - show_menu -} - -configure_rootdev() { - - echo -e "\nPlease choose a root device (root=*):\n" - - cnt=1 ; reset_pref "kexec_rootdev" - for root in /dev/mtdblock2 /dev/hda1 "Manual Entry" - do - echo -e "\t[$cnt] $root" - set_pref kexec_rootdev "$cnt" "$root" - let cnt=cnt+1 - done - - echo "" - - while true - do - echo -n "Select a root device: " - read junk - - get_pref kexec_rootdev "$junk" KERNEL_ROOTDEV && break - done - - if test "$KERNEL_ROOTDEV" = "Manual Entry" - then - echo "" - - KERNEL_ROOTDEV="" - - while test -z "$KERNEL_ROOTDEV" - do - while true - do - echo -n "Enter the root device: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_ROOTDEV="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_ROOTDEV] as root device" -} - -configure_roottype() { - - echo -e "\nPlease choose a rootfs type (rootfs=*):\n" - - cnt=1 ; reset_pref "kexec_rootfstype" - for root in jffs2 ext2 ext3 "Manual Entry" - do - echo -e "\t[$cnt] $root" - set_pref kexec_rootfstype "$cnt" "$root" - let cnt=cnt+1 - done - - echo "" - - while true - do - echo -n "Select a rootfs type: " - read junk - - get_pref kexec_rootfstype "$junk" KERNEL_ROOTFSTYPE && break - done - - if test "$KERNEL_ROOTFSTYPE" = "Manual Entry" - then - echo "" - - KERNEL_ROOTFSTYPE="" - - while test -z "$KERNEL_ROOTFSTYPE" - do - while true - do - echo -n "Enter the rootfs type: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_ROOTFSTYPE="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_ROOTFSTYPE] as rootfs type" -} - -configure_verbose() { - echo -e "\nDo you want to see kernel messages? ([quiet | debug]):\n" - - echo -e "\t[1] Yes" - echo -e "\t[2] No" - - echo "" - - while true - do - echo -n "Select one of the above: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - - test "$junk" = 1 && KERNEL_VERBOSE="debug" || KERNEL_VERBOSE="quiet" - -} - -configure_custom() { - echo -e "\nDo you want to set custom kernel options?\n" - - echo -e "\t[1] Yes" - echo -e "\t[2] No" - - echo "" - - while true - do - echo -n "Select one of the above: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - - if test "$junk" = 1 - then - - echo "" - - KERNEL_CUSTOM="" - - while test -z "$KERNEL_CUSTOM" - do - while true - do - echo -n "Enter kernel options: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_CUSTOM="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_CUSTOM] as custom kernel options" - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs deleted file mode 100644 index 2d305e349f..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs +++ /dev/null @@ -1,323 +0,0 @@ -# !/bin/sh -M_TITLE="Copy rootfs to SD/CF" -M_FLAGS="noRemember" - -# Unfinished script. -exit 0 - -ask_target() { - available_disks="`mount | grep "/media" | grep -v ram | awk '{print $3}'`" - - if test -z "$available_disks" - then - die "No mounted targets found!" - fi - - cnt=1 - for d in $available_disks - do - echo -e "\t[$cnt] $d" - let cnt=$cnt+1 - done - - while test -z "$ROOTFS_TARGET" - do - echo -n "Target: " - read junk /dev/null 2>&1 - then - echo -n "Use [$junk]MB? [y|n] " - read junk2 - if test "$junk2" = y - then - ROOTFS_IMAGE_SIZE="$junk" - fi - fi - done - - echo -e "\nPlease enter a name for the image file." - echo "The name must _not_ contain whitespaces or the '-' sign." - - while test -z "$ROOTFS_IMAGE_NAME" - do - echo -n "File name: " - read junk - - if ! test -z "$junk" - then - echo -n "Use [$junk] as image name? [y|n] " - read junk2 - - if test "$junk2" = y - then - ROOTFS_IMAGE_NAME="$junk" - fi - fi - done - - echo -e "\nDo you want to format [$ROOTFS_TARGET_DEV] to the ext2 filesystem?" - - while true - do - echo -n "Format to ext2? [y|n] " - read junk - case "$junk" in - y) format_target - break ;; - n) break ;; - esac - done - - /etc/init.d/devices start - - echo -en "\nCreating image file [$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin] (${ROOTFS_IMAGE_SIZE}MB)..." - mkdir -p "$ROOTFS_TARGET/$IMAGE_PATH" - - dd if=/dev/zero of="$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" bs=1024k count=$ROOTFS_IMAGE_SIZE >/dev/null 2>&1 && echo ok || die "FAILED" - losetup /dev/loop1 "$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" - - echo -n "Creating filesystem..." - mkfs.ext2 -m0 /dev/loop1 >/dev/null 2>&1 && echo ok || die FAILED - - mkdir -p /media/temp - mount /dev/loop1 /media/temp || die "mount /dev/loop1 /media/temo FAILED!" - - copy_files - -} - -copy_files() { - echo -e "\nCopying files..." - - exclude_list="tmp sys proc var dev media root" - mkdir_list="var proc sys dev media/card media/cf /media/hdd" - - if (cat /etc/fstab | grep -q "/home") - then - echo "Note: /home appears to be mounted on a different flash partition: not copying /home" - exclude_list="$exclude_list home" - mkdir_list="$mkdir_list home/root" - - fi - - - - source_dirs="`ls -1 /`" - - echo -n "Excluding [" - for d in $exclude_list - do - echo -n "$d " - source_dirs="`echo "$source_dirs" | grep -v "$d"`" - done - echo "] from copy" - - - cd / - for dir in $source_dirs - do - if test -d "$dir" - then - echo -n "Copying [$dir]..." - cp -a $dir /media/temp && echo ok || echo FAILED - fi - done - - for dir in $mkdir_list - do - mkdir -p /media/temp/$dir - done - - rm /media/temp/etc/rcS.s/S39sd - -} -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo -e "${C_RED}* * * * * WARNING * * * * *${C_RESET}" - echo -e "${C_RED}Continueing will delete the content of the selected target device.\nTHIS IS NO JOKE. If you do now know what this menu-item does, exit NOW${C_RESET}" - - mount -o remount,rw / - - while true - do - echo -en "\nContinue? [y|n] " - read junk /dev/null 2>&1 && echo ok || echo "FAILED" -# -# echo -n "Trying to mount SD card..." -# /etc/init.d/sd start >/dev/null 2>&1 -# sleep 3 -# /etc/sdcontrol insert >/dev/null 2>&1 && echo ok || echo "FAILED" - - #exit 0 - echo -e "\nPlease select the target device:" - - # Sets ROOTFS_TARGET* - ask_target - - # Sets ROOTFS_TARGET_TYPE ([direct | image] - ask_format - - # Ask confirmation - ask_confirm - - case "$ROOTFS_TARGET_TYPE" in - direct) direct_install;; - image) image_install;; - esac -} - -case "$1" in -title) echo "$M_TITLE";; -flags) echo "$M_FLAGS";; -run) run_module;; -esac diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func deleted file mode 100644 index ae38c5b437..0000000000 --- a/packages/altboot/files/altboot.func +++ /dev/null @@ -1,870 +0,0 @@ -#! /bin/sh - -C_RED="\033[31m" -C_YELLOW="\033[35m" -C_BLUE="\033[34m" -C_WHITE="\033[38m" -C_RESET="\033[0m" - - -# This function checks for the presence of a real filesystem and loop-images on the target -# $1 = folder of rootfs, $2 = runlevel (defaults to 5) -# $2 = name of calling module -check_target() { - # Check if there is a /sbin/init or /sbin/init.sysvinit on the card - if test -x $1/sbin/init -o -x $1/$REAL_INIT - then - real_fs_found=1 - else - echo -e "Note: No INIT [$REAL_INIT] found on target" - fi - - # Check for loop-images - if (ls $1/$IMAGE_PATH/*rootfs.bin) >/dev/null 2>&1 - then - image_found=1 - else - echo "Note: No boot-images found in [$1/$IMAGE_PATH]" - fi - - # Check if we have both, a real fs and boot-images. If so, ask the user what to boot - if test "$real_fs_found" = 1 -a "$image_found" = 1 - then - echo -e "\nI have found a real filesystem and boot-images on the target" - echo -e "What do you want to boot?\n" - - echo -e "\t[1] The real filesystem" - echo -e "\t[2] A loop-image" - echo "" - - while test -z "$ans" - do - echo -n "Your choice: " - - if test "$AUTOBOOT" != "yes" - then - read junk < "$OUT_TTY" - else - if test -e /etc/.altboot-real-or-loop.last - then - junk="`cat /etc/.altboot-real-or-loop.last`" - test -z "$junk" && read junk < "$OUT_TTY" || echo "$junk (autoboot)" - else - read junk < "$OUT_TTY" - fi - fi - - if test "$junk" = 1 -o "$junk" = 2 - then - ans="$junk" - echo "$junk" > /etc/.altboot-real-or-loop.last - fi - done - - case "$ans" in - 1) pivot_realfs "$1" "$2">"$OUT_TTY";; - 2) pivot_image "$1" "$2">"$OUT_TTY";; - esac - - exit 0 - fi - - # Boot a real filesystem - test "$real_fs_found" = 1 && pivot_realfs "$1" >"$OUT_TTY" - - # Boot a loop-image - test "$image_found" = 1 && pivot_image "$1" >"$OUT_TTY" - - if test "$real_fs_found" != 1 -a "$image_found" != 1 - then - mdie "No direct-install or loop-images found. Nothing to do!" - fi -} - -boot_new_rootfs_splash() { -C_RED="\033[37;44m" -C_RESET="\033[0m" - - echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" - echo -e "${C_RED}| |${C_RESET}" - echo -e "${C_RED}| Booting the selected rootfs... |${C_RESET}" - echo -e "${C_RED}| |${C_RESET}" - echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" - -} - -# This function pivot_root's into a real filesystem calling $newrootfs/sbin/init -# $1 = The new rootfs -pivot_realfs() { - #test -z "$2" && RL="5" || RL="$2" - mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed" - - mount -o remount,ro / >/dev/null 2>&1 - - test "$ENABLE_IMAGECONF" = yes && image_conf $1 - - do_pivot "$1" "$RL" -} - -# This function loop-mounts an image-file and pivot_root's into it -# $1: The new rootfs -pivot_image() { - #test -z "$2" && RL="5" || RL="$2" - cd $1/$IMAGE_PATH - - # Check for rootfs images on the card - if test "`ls *rootfs.bin | wc -l | tr -d " "`" -gt 1 - then - echo -e "\n\nPlease select a rootfs:\n" - - # Show all available images - x=0 - for file in `ls *rootfs.bin` - do - let x=$x+1 - echo -e "\t\t[$x] $file" - done - - echo "" - - IMAGE_NAME="" - while test -z "$IMAGE_NAME" - do - echo -en "Please choose one of the above: " - if test "$AUTOBOOT" != "yes" - then - read junk < "$OUT_TTY" - else - if test -e /etc/.altboot-loopimage.last - then - junk="`cat /etc/.altboot-loopimage.last`" - test -z "$junk" && read junk < "$OUT_TTY" || echo "$junk (autoboot)" - else - read junk < "$OUT_TTY" - fi - fi - - x=0 - for file in `ls *rootfs.bin` - do - let x=$x+1 - if test "$x" = "$junk" - then - IMAGE_NAME="$file" - echo "$junk" > /etc/.altboot-loopimage.last - fi - done - done - else - IMAGE_NAME="`ls *rootfs.bin`" - test -z "$IMAGE_NAME" && die "No rootfs found (*rootfs.bin) in $1/$IMAGE_PATH" - fi - - - echo "" - - mkdir -p /media/image || die "mkdir -p /media/image failed" - - LOOP_MODULE="$(find /lib/modules/`uname -r`/ -name "loop.ko")" - test -n "$LOOP_MODULE" && ( insmod "$LOOP_MODULE" ; sleep 3 ) - - ! test -e /dev/loop0 && mknod /dev/loop0 b 7 0 - - losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!" - check_fs /dev/loop0 $IMAGE_TYPE - - echo -e "\n* * * Mounting rootfs image * * *\n" - - # Busybox's "mount" doesn't seem to like "-o loop" for some reason - # It works on collie and b0rks on poodle. - if [ "$IMAGE_TYPE" = "" ]; then - IMAGE_TYPE="auto" - fi - - # If mount fails it has the tendency to spew out a _lot_ of error messages. - # We direct the output to /dev/null so the user can see which step actually failed. - mount /dev/loop0 -t $IMAGE_TYPE /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!" - - mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed" - - test "$ENABLE_IMAGECONF" = yes && image_conf /media/image - - do_pivot /media/image "$RL" -} - -#$1=mountpoint of the soon-to-be rootfs, $2=Runlevel -do_pivot(){ - - if test "$USE_KEXEC_ON_NEXT_BOOT" = yes - then - if test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" - then - CMDLINE="--append=\"`cat $KEXEC_SELECTED_KERNEL.kexec.cfg`\"" - else - CMDLINE="" - echo "WARNING: This kernel has not been configured!" - echo "Trying to boot anyway..." - fi - - echo "$KEXEC_BIN -l $KEXEC_SELECTED_KERNEL $CMDLINE" - $KEXEC_BIN -l $KEXEC_SELECTED_KERNEL $CMDLINE - sync - - read junk - $KEXEC_BIN -e - exit 0 - fi - - - echo -n "Pivoting root..." - if (/sbin/pivot_root "$1" "$1/media/ROM") - then - echo "Success" - - # This is important since we are still cd'ed into the old root - cd / - - ! test -d "$1" && mkdir -p "$1" - - # Move mountpoints from the old rootfs into the new one. - # The *real* mount is kinda touchy feely about that - /bin/busybox mount -o move /media/ROM/proc /proc >/dev/null 2>&1 - - for mpt in ` mount | grep "/media/ROM/" | awk '{print $3}'` - do - new_mpt="`echo "$mpt" | sed -n "s/\/media\/ROM//p"`" - - echo "Moving mountpoint [$mpt] -> [$new_mpt]" >"$OUT_TTY" 2>&1 - - ! test -d "$new_mpt" && mkdir -p "$new_mpt" - /bin/busybox mount -o move "$mpt" "$new_mpt" - done - - clear - boot_new_rootfs_splash - echo "Calling INIT" - - exec /usr/sbin/chroot . $REAL_INIT $2 >"$OUT_TTY" 2>&1 - #exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1 - else - echo "FAILED" - die "* * * pivot_root failed! * * *" - fi - -} - -# $1: Path to mounted rootfs -image_conf(){ - ! test -d "$1" && die "image_conf: [$1] not found / no directory" - - test -e "$1/etc/.image_conf.done" && return - - echo -e "\n\n* * * rootfs configuration * * *\n" - echo -e "This setup lets you reconfigure your new rootfs." - echo "Most probably the rootfs is configured with" - echo "defaults based on a flash installation." - echo "If unsure, go with the defaults by pressing ." - echo "" - - if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/home " ) - then - while true - do - echo "Usually your /home directory is located on another flash partition." - echo -n "Do you want me to move /home inside the loop-image? [N|y] " - read junk - - if test "$junk" = "y" -o "$junk" = "Y" - then - cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.flash/" > $1/etc/fstab_ - mv $1/etc/fstab_ $1/etc/fstab - - mkdir -p $1/home.flash - break - fi - - test "$junk" = "" -o "$junk" = n -o "$junk" = N && break - done - - fi - - echo "" - - if ( cat $1/etc/ipkg.conf | grep -q ^lists_dir ) - then - while true - do - echo -e "Wasting RAM is never a good idea.\nOnly say Y if your rootfs is very small in size" - echo -en "Do you want to store ipkg package data\nin RAM? [N|y] " - read junk - - if test "$junk" = "" -o "$junk" = n -o "$junk" = N - then - cat $1/etc/ipkg.conf | sed "/^lists_dir.*/s/\(.*\)/#\ \1/"> $1/etc/ipkg.conf_ - mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf - break - fi - - test "$junk" = "y" -o "$junk" = "Y" && break - done - fi - - echo "" - - if ( cat $1/etc/ipkg.conf | grep -q "^dest sd" ) - then - while true - do - echo -en "Do you want to keep the SD, CF and /home\nipkg install targets? [N|y] " - read junk - - if test "$junk" = "" -o "$junk" = n -o "$junk" = N - then - cat $1/etc/ipkg.conf | sed "/^dest\ \(sd\|cf\|home\).*/s/\(.*\)/#\ \1/" > $1/etc/ipkg.conf_ - mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf - break - fi - - test "$junk" = "y" -o "$junk" = "Y" && break - done - fi - - - touch "$1/etc/.image_conf.done" -} - -# This functions configures the master password for altboot if none is set -set_password() { - - test -e /etc/altboot.pwd && . /etc/altboot.pwd - - mount -o remount,rw / - if test -z "$MASTER_PASSWORD" -a "$ENABLE_DEBUG" != yes - then - echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF, USB-Storage and NFS" - echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh." - echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}\n" - - while true - do - echo -en "\nNew password: " - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk1 < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - if ! test -z "$junk1" - then - echo -en "\nRepeat: " - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk2 < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - echo "" - - if test "$junk1" = "$junk2" - then - crypt_pw="`echo "$junk1" | md5sum | awk '{print $1}'`" - - if test -e "/etc/altboot.pwd" - then - sed "/^MASTER_PASSWORD/s/\(.*\=\).*/\1\"$crypt_pw\"/" "${ALTBOOT_CFG_FILE}" > ${ALTBOOT_CFG_FILE}_ - mv ${ALTBOOT_CFG_FILE}_ ${ALTBOOT_CFG_FILE} - MASTER_PASSWORD="$crypt_pw" - echo "Password changed." - else - echo "MASTER_PASSWORD=\"$crypt_pw\"" > /etc/altboot.pwd - echo "Password installed" - fi - - break - else - echo -e "Passwords didn't match, try again\n" - fi - fi - done - fi - -} - -# This function asks for altboots master password. It only returns if the correct password was supplied -verify_master_pw() { - - test -e /etc/altboot.pwd && . /etc/altboot.pwd - - if test -n "$MASTER_PASSWORD" -a "$MASTER_PASSWORD" != "[none]" - then - auth_timeout="3" - - echo -e "\nPlease enter your altboot master password" - - cnt=0 - while true - do - let cnt=$cnt+$auth_timeout - echo -n "Password: " - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - if test "`echo "$junk" | md5sum | awk '{print $1}'`" = "$MASTER_PASSWORD" - then - break - else - echo "[`echo "$junk" | md5sum | awk '{print $1}'`]" - echo "[$MASTER_PASSWORD]" - echo "Wrong password, sleeping $cnt seconds..." - sleep $cnt - -# if test "$cnt" -gt 10 -# then -# break -# fi - fi - done - - echo "" - fi -} - - -check_fs() { - if [ "$FSCK_IMAGES" = "yes" ] - then - FSCK="" - if [ "$2" = "" ]; then - FSTYPE="ext2" - else - FSTYPE="$2" - fi - case "$FSTYPE" in - ext2 | ext3) - if [ -e /sbin/fsck.ext3 ]; then - FSCK="/sbin/fsck.ext3" - elif [ -e /sbin/e3fsck ]; then - FSCK="/sbin/e3fsck" - elif [ -e /sbin/fsck.ext2 ]; then - FSCK="/sbin/fsck.ext2" - elif [ -e /sbin/e2fsck ]; then - FSCK="/sbin/e2fsck" - fi - test -n "$FSCK" && FSCK="$FSCK -p" - ;; - vfat) - if [ -e /sbin/dosfsck ]; then - FSCK="/sbin/dosfsck -a" - fi - ;; - esac - -# debug_echo "check_fs() FSCK / FSTYPE: [$FSCK] / [$FSTYPE]" - - if [ "$FSCK" = "" ]; then - echo "Could not find fsck for $FSTYPE!" - else - echo "Checking file system on $1" - $FSCK $1 || sleep 2 - fi - fi -} - -# Make the initial rootfs a bit more usable -init_rootfs(){ -# echo -n "Mounting rootfs rw..." - mount -o remount,rw / || die "mount -o remount,rw / failed" - - mount | grep -q "/proc " >/dev/null 2>&1 || mount proc -t proc /proc >"$OUT_TTY" 2>&1 - - if ( uname -r | grep -q "2.6." ) - then - mount | grep -q "/sys " >/dev/null 2>&1 || mount sys -t sysfs /sys >"$OUT_TTY" 2>&1 - fi - - /etc/init.d/devices start || die "FAILED" -} - -mount_sd(){ - if mount | grep -q "$SD_MOUNTPOINT" - then - echo "Note: $SD_MOUNTPOINT is already mounted" - else - # We can't trust that the SD device file is there when running kernel 2.6 w/ udev - # and starting udev at this point may not be the best idea... - if `uname -r | grep -q "2.6"` - then - #Let's just assume the device file name never changes... - dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`" - part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`" - ! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0 - ! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no - fi - - # Kernel 2.6 has the SD driver compiled into the kernel - if test -n "$SD_KERNEL_MODULE" - then - echo "Loading SD kernel module..." - if ( echo "$SD_KERNEL_MODULE" | grep -q "^/" ) - then - echo -e "\t- Using full path for SD module" - SD_PATTERN="`basename "$SD_KERNEL_MODULE" | sed "s/\.ko//;s/\.o//"`" - - if ( lsmod | grep -q "^$SD_PATTERN" ) - then - echo -e "\t- Already loaded..." - else - echo -e "\t- Loading..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - fi - - else - echo -e "\t- Searching [$SD_KERNEL_MODULE]" - SD_KERNEL_MODULE="$(find /lib/modules/`uname -r`/ -name "$SD_KERNEL_MODULE")" - echo -e "\t- Assuming module is [$SD_KERNEL_MODULE]" - - SD_PATTERN="`basename "$SD_KERNEL_MODULE" | sed "s/\.ko//;s/\.o//"`" - - if ( lsmod | grep -q "^$SD_PATTERN" ) - then - echo -e "\t- Already loaded..." - else - echo -e "\t- Loading..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - fi - fi - fi - - sleep 3 - - check_fs "$SD_DEVICE" - - if ! mount | grep -q "$SD_MOUNTPOINT" - then - echo -n "Mounting $SD_MOUNTPOINT..." >"$OUT_TTY" - - if test "$1" = ingore_errors - then - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 || echo "Could not mount SD card" - else - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 || die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - fi - else - echo "NOTE: Some sort of auto-mounting is going on..." - fi - fi - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 -} - -mount_cf(){ - if mount | grep -q "/media/cf " - then - echo "Note: /media/cf is already mounted" - else - if ( cat /etc/fstab | grep -v "^#" | grep -q "/media/cf" ) - then - # As of kernel 2.6.16, /e/i/pcmcia is replaced by udev - if test -x /etc/init.d/pcmcia - then - /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" - else - for n in 1 2 3 - do - ! test -e "/dev/hda$n" && mknod /dev/hda$n b 3 $n - done - fi - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - mount /media/cf -o async - else - echo "Note: Your system's fstab does not include an entry for /media/cf" - fi - fi -} - -mount_home(){ - if mount | grep -q "/home " - then - echo "Note: /home is already mounted" - else - - if ( cat /etc/fstab | grep -v "^#" | grep -q "/home " ) - then - echo "Mounting /home" - home_fstab="`grep "/home " /etc/fstab`" - home_dev="`echo "$home_fstab" | awk '{print $1}'`" - home_fs="`echo "$home_fstab" | awk '{print $3}'`" - home_options="`echo "$home_fstab" | awk '{print $4}'`" - - mount -t "$home_fs" -o $home_options "$home_dev" /home - else - echo "Note: Your system's fstab does not include an entry for /home" - fi - fi -} - -show_menu() { - - echo -e "\nPress to return to the menu" - read junk - - test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force<"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -mdie() { - echo -e "${C_RED}ERROR:${C_RESET}${C_WHITE} $1${C_RESET}" >"$OUT_TTY" - - echo -e "\nPress to return to the menu" - read junk - - test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force<"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -# $1: uniq name, $2 identifier, $3 value -set_pref() { - data_name="$1" - data_id="$2" - data_value="$3" - - #debug_echo "[$1] [$2] [$3]" - #export "${data_name}"="`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // | sed s/^$data_id.*//`" - - if test -z "$3" - then - debug_echo "set_pref(): WARNING, writing empty value to $data_name / $data_id! THIS WILL BREAK THINGS" - #data_value=" " - fi - export "${data_name}"="`eval echo -e \\$${data_name} `$data_id##$data_value###" -} - -# $1: uniq name -reset_pref() { - data_name="$1" - export "${data_name}"="" -} - -echo_pref() { - data_name="$1" - echo "****** $1 ******" - echo "`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // `" - echo "******" -} - -dump_pref() { - data_name="$1" - echo "`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // `" - - #echo "-- `eval echo ${data_name}` --" - #debug_echo "[$menu_fileflags]" -} - -# $1 = name, $2 = cache_file -export_pref() { - data_name="$1" - echo "`eval echo -e ${data_name}`" > "$2" -} - -# $1 = name, $2 = cache_file -import_pref() { - data_name="$1" - data_id="$2" - - #debug_echo "[$1] [$2] [$3]" - - if test -z "$3" - then - debug_echo "set_pref(): WARNING, writing empty value to $data_name / $data_id! THIS WILL BREAK THINGS" - #data_value=" " - fi - export "${data_name}"="`cat "$2"`" - -} - -# $1: uniq name, $2 identifier, $3 out var -get_pref() { - data_name="$1" - data_id="$2" - data_out="$3" - data_list="`eval echo -e \\$${data_name}`" - - #echo "data_list: [$data_list]" - #data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g"|sed s/^\ // | grep "^$data_id##" | sed -n "s/.*\#\(.*\)$/\1/p"`" - #data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g"|sed s/^\ // | sed -n "/^$data_id/s/.*\#\(.*\)$/\1/p"`" - data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g" | sed -n "s/^\ //;/^$data_id\#/s/.*\#\(.*\)$/\1/p"`" - #echo "WERT: [$data_value]" - - export "${data_out}"="$data_value" - test -n "$data_value" && return 0 -} - -debug_echo() { - test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" >"$OUT_TTY" 2>&1 -} - -start_networking() { - - test -z "$1" && mdie "No remote host configured, check /etc/fstab for NFS hosts" - - if test "$USB_NETWORKING_AVAILABLE" = "yes" - then - echo "" - echo "Select the type of your network connection:" - echo "" - echo -e "\t[1] LAN or WLAN NIC" - echo -e "\t[2] USB Connection" - echo "" - - if test "$AUTOBOOT" != "yes" -o ! -e /etc/.altboot-lanselect.last - then - while true - do - echo -n "Connection Type: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - else - junk="`cat /etc/.altboot-lanselect.last`" - test -z "$junk" && junk=1 - - echo "Connection Type: $junk (autoboot)" - fi - - case "$junk" in - 1) NW_TYPE="NIC" - ;; - 2) NW_TYPE="USB" - ;; - esac - - echo "$junk" > /etc/.altboot-lanselect.last - else - NW_TYPE=NIC - fi - - - - # Needed for NFS - /etc/init.d/portmap start >/dev/null 2>&1 || die "/etc/init.d/portmap start failed!" - - # For some reason NFS mounts hang if /e/i/networking is not run. - # For the time beeing I'm too lazy to investigate ;) - /etc/init.d/networking start >/dev/null 2>&1 || die "/etc/init.d/networking start failed!" - - sleep 2 - - if test "$NW_TYPE" = "NIC" - then - # After the PCMCIA service is started, an inserted WLAN card should automatically - # activate itself. - - if test -x /etc/init.d/pcmcia - then - echo -e "\nRunning cardctl to setup networking..." - /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!" - sleep 3 - else - # With kernel 2.6.16+ udev is used - echo -e "\nRunning udevd to setup networking..." - ps ax | grep -v grep | grep -q udevd || /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!" - - # Stop udev to work around some very ugly (yet harmless) error messages on boot - /etc/init.d/udev stop >/dev/null 2>&1 - fi - fi - - if test "$NW_TYPE" = "USB" - then - echo "" - for module in $USB_NW_MODULES - do - echo "modprobing [$module]" - modprobe $module || die "modprobe $module FAILED" - done - - ifdown "$USB_NW_DEVICE" >/dev/null 2>&1 - - - echo -e "\nPlease make sure that usb0 is up on your PC and hit ." - read junk - - ifup "$USB_NW_DEVICE" - fi - - WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" - - if test -z "$WLAN_NIC" - then - # cardctl needs some time.... - echo -n "Waiting for WLAN card.." - timeout=0 - while test "$timeout" -lt 10 - do - WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" - test -n "$WLAN_NIC" && break - echo -n "." - let timeout=$timeout+1 - sleep 1 - done - - if test -z "$WLAN_NIC" - then - debug_echo "WARNING: WLAN_NIC is empty!\n" - debug_echo "Filter result: [$WLAN_NIC]" - debug_echo "iwconfig: [`iwconfig`]" - mdie "No network interface found" - fi - fi - - # WLAN with DHCP needs some time to get a lease, set up the routing, etc. - echo -n "Waiting for host [$1] on [$WLAN_NIC]." - cnt=0 - while true - do - if (ping -c 1 $1) >/dev/null 2>&1 - then - echo " found" - break - else - if test "$cnt" = 30 -o "$cnt" = 60 - then - echo "" - echo "WARNING: $NW_TYPE didn't activate in $cnt seconds!" - - if test "$cnt" = 30 - then - let cnt=$cnt+1 - - if test "$NW_TYPE" = "NIC" - then - echo "Restarting udhcpc for [$WLAN_NIC]" - killall udhcpc - - udhcpc -i "$WLAN_NIC" -H `cat /etc/hostname` >"$OUT_TTY" 2>&1 - fi - - if test "$NW_TYPE" = "USB" - then - echo "ifdown/up $USB_NW_DEVICE..." - ifdown "$USB_NW_DEVICE" - sleep 1 - ifup "$USB_NW_DEVICE" - fi - - else - mdie "Failed to activate $NW_TYPE!" - break - fi - else - echo -n "." - let cnt=$cnt+1 - fi - fi - sleep 1 - done - - -} diff --git a/packages/altboot/files/altboot.rc/.mtn2git_empty b/packages/altboot/files/altboot.rc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot.rc/Readme.txt b/packages/altboot/files/altboot.rc/Readme.txt deleted file mode 100644 index 985e1fe7d0..0000000000 --- a/packages/altboot/files/altboot.rc/Readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Scripts (*.sh) in this folder are run by altboot before printing the menu. -Note: The rootfs is still mounted ro at this point. diff --git a/packages/altboot/files/altboot.rc/disable_printk.sh b/packages/altboot/files/altboot.rc/disable_printk.sh deleted file mode 100644 index af15adec44..0000000000 --- a/packages/altboot/files/altboot.rc/disable_printk.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -mount proc -t proc /proc >/dev/null 2>&1 - -echo 0 > /proc/sys/kernel/printk - diff --git a/packages/altboot/files/altboot.rc/loadkeymap.sh b/packages/altboot/files/altboot.rc/loadkeymap.sh deleted file mode 100644 index 97cff13dbb..0000000000 --- a/packages/altboot/files/altboot.rc/loadkeymap.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Note: With kernel 2.6 the standard keymap is unusable -test -x /etc/init.d/keymap && /etc/init.d/keymap start >/dev/null 2>&1 - -# Do not exit w/ errorcode when the if above fails -/bin/true - diff --git a/packages/altboot/files/altboot.rc/playbeep.sh b/packages/altboot/files/altboot.rc/playbeep.sh deleted file mode 100644 index b41f098630..0000000000 --- a/packages/altboot/files/altboot.rc/playbeep.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: playbeep.sh -# Date: 12-Apr-06 - -if test -x /usr/sbin/alsactl -a -e /etc/modules -a "$ENABLE_SOUND" = yes -then - for module in `cat /etc/modules | grep snd | grep -v ^#` - do - #echo "loading $module" - modprobe $module >/dev/null 2>&1 - done - - mount -o remount,rw / - - init_rootfs >/dev/null 2>&1 - - ! test -e /dev/audio && mknod /dev/audio c 14 4 - ! test -e /dev/dsp && mknod /dev/dsp c 14 3 - - mkdir /dev/snd >/dev/null 2>&1 - mknod /dev/snd/controlC0 c 116 0 >/dev/null 2>&1 - mknod /dev/snd/pcmC0D0c c 116 24 >/dev/null 2>&1 - mknod /dev/snd/pcmC0D0p c 116 16 >/dev/null 2>&1 - mknod /dev/snd/timer c 116 33 >/dev/null 2>&1 - /usr/sbin/alsactl restore >/dev/null 2>&1 - - test -e /usr/share/sounds/beep.raw && cat /usr/share/sounds/beep.raw > /dev/dsp -fi - -/bin/true diff --git a/packages/altboot/files/altbootctl b/packages/altboot/files/altbootctl deleted file mode 100755 index 58976afd0d..0000000000 --- a/packages/altboot/files/altbootctl +++ /dev/null @@ -1,311 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: hentges-setup.sh -# Date: 03-Jun-06 - -die() { - echo -e "$*" - exit 1 -} - - -PERMANENT_CFG="/etc/altboot-`uname -r | cut -c1-3`.cfg" -TEMPORARY_CFG="/etc/altboot-`uname -r | cut -c1-3`.cfg.next-reboot" - -CFG="$PERMANENT_CFG" -SCRIPT_CONFIG="/etc/altbootctl.conf" - -test -e "$SCRIPT_CONFIG" && . "$SCRIPT_CONFIG" || die "$SCRIPT_CONFIG not found" - -# $1= Setting, $2 = new value -set_pref() { - - if ( cat "$CFG" | grep -q "$1" ) - then - cat "$CFG" | sed "/^$1/s/\(.*\)\=\(.*\)/\1\=\"$2\"/" > ${CFG}_ - mv ${CFG}_ ${CFG} - else - echo "$1=\"$2\"" >> "${CFG}" - fi -} - -# $1= Setting -get_pref() { - n="$1" - value="`cat "${CFG}" | sed -n "/^$n/s/\(.*\)\=\\"\(.*\)\\"/\2/p"`" - #echo "cat "${CFG}" | sed -n "/^$n/s/\(.*\)\=\"\(.*\)\"/\2/p"" - test -z "$value" && die "Couldn't get value for [$n]" - echo "$value" -} - -ask_pref() { - SETTING_NAME="$1" - - SETTING_TEXT_="${SETTING_NAME}_TEXT" - SETTING_TEXT="`eval echo -e \\$${SETTING_TEXT_}`" - - SETTING_VALUES_="${SETTING_NAME}_VALUES" - SETTING_VALUES="`eval echo -e \\$${SETTING_VALUES_}`" - - SETTING_OLD_VALUE="`get_pref "$SETTING_NAME"`" - test -z "$SETTING_TEXT" -o -z "$SETTING_VALUES" && die "ask_pref: [$1] -> [$SETTING_TEXT] [$SETTING_VALUES]" - - #echo "[$1] -> $SETTING_OLD_VALUE" - #echo -e "$SETTING_TEXT" - - - if test "$SETTING_VALUES" = "" - then - while true - do - echo -e "\nPlease enter a new value [$SETTING_OLD_VALUE]" - echo -en "Your Choice: " - read junk - - echo "" - - while true - do - echo -n "Is the new value of [$junk] correct? [Y|n] " - read junk2 - - case "$junk2" in - y|Y|"") END_LOOP=true - break ;; - *) END_LOOP=false - break ;; - esac - done - - if test "$END_LOOP" = "true" - then - SETTING_NEW_VALUE="$junk" - break - fi - - done - - else - # If it's not a string, it's a fixed list of possible settings - echo -e "\nSelect one of the following:\n" - cnt=1 - - echo " $SETTING_VALUES" - for val in $SETTING_VALUES - do - if test "$val" != "$SETTING_OLD_VALUE" - then - echo -e "\t[$cnt] $val" - else - echo -e "\t[$cnt] $val *" - SETTING_OLD_VALUE_NUM="$cnt" - fi - let cnt=$cnt+1 - done - - echo "" - while true - do - echo -en "Your choice [$SETTING_OLD_VALUE_NUM]: " - read junk - - if test -n "$junk" - then - cnt=1 ; SETTING_NEW_VALUE="" - for val in $SETTING_VALUES - do - if test "$junk" = "$cnt" - then - SETTING_NEW_VALUE="$val" - break - fi - - let cnt=$cnt+1 - done - else - SETTING_NEW_VALUE="$SETTING_OLD_VALUE" - fi - - test -n "$SETTING_NEW_VALUE" && break - done - - fi - - - if test "$SETTING_NEW_VALUE" != "$SETTING_OLD_VALUE" - then - set_pref "$SETTING_NAME" "$SETTING_NEW_VALUE" - echo "Changed $SETTING_NAME to $SETTING_NEW_VALUE" - else - echo "$SETTING_NAME remains unchanged" - fi - echo -e "\n" -} - -build_menu() { - for setting in $TARGETS - do - # SETTING_MENUPOS contains $setting_MENUPOS - SETTING_MENUPOS_="${setting}_MENUPOS" - SETTING_MENUPOS="`eval echo -e \\$${SETTING_MENUPOS_}`" - - # Store all entries in variables named after the menu name - MENU_NAME="SUBMENU_${SETTING_MENUPOS}" - export "${MENU_NAME}"="`eval echo -e \\$${MENU_NAME} ` $setting" - - - echo "$AVAILABLE_MENUES" | grep -q "$SETTING_MENUPOS" || AVAILABLE_MENUES="$SETTING_MENUPOS $AVAILABLE_MENUES" - - done - - #echo "[$AVAILABLE_MENUES]" - - while true - do - echo -e "\nSelect a menu:\n" - cnt=1 - for menu in $AVAILABLE_MENUES Exit - do - MENU_NAME="SUBMENU_$menu" - echo -e "\t[$cnt] $menu" - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Your Choice: " - read junk - - cnt=1 ; GET_MENU="" - for menu in $AVAILABLE_MENUES Exit - do - if test "$cnt" = "$junk" - then - GET_MENU="$menu" - break - fi - let cnt=$cnt+1 - done - - if test "$GET_MENU" = "Exit" - then - EXIT_PROG=true - break - else - EXIT_PROG=false - fi - - if test -n "$GET_MENU" - then - show_menu "$menu" - break - fi - done - test "$EXIT_PROG" = true && break - done -} - -show_menu() { - MENU_NAME="SUBMENU_$1" - - - while true - do - echo -e "\nEntries in this menu:\n" - cnt=1 - for entry in `eval echo -e \\$${MENU_NAME}` Back - do - MENU_NAME_TEXT="${entry}_TEXT" || MENU_NAME_TEXT="${entry}" - - test "$entry" != Back && tmp_="`eval echo -e \\$${MENU_NAME_TEXT}`" || tmp_="Back" - - echo -e "\t[$cnt] $tmp_" - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -en "Your Choice: " - read junk - - cnt=1 ; GET_ENTRY="" - for entry in `eval echo -e \\$${MENU_NAME}` Back - do - if test "$cnt" = "$junk" - then - GET_ENTRY="$entry" - break - fi - let cnt=$cnt+1 - done - - if test "$GET_ENTRY" = "Back" - then - EXIT_MENU=true - break - else - EXIT_MENU=false - fi - - - # At this point the user has selected a menuitem != "Back" - if test -n "$GET_ENTRY" - then - select_config - ask_pref "$GET_ENTRY" - break - fi - done - - test "$EXIT_MENU" = true && break - done -} - -select_config() { - echo -e "\nChange this setting only for the next reboot or permanently?\n" - - echo -e "Select one of the following:\n" - - echo -e "\t[1] Only for the next reboot" - echo -e "\t[2] Permanently" - echo "" - - while true - do - echo -en "Your Choice: " - read junk - - case "$junk" in - 2) CFG="$PERMANENT_CFG" - break ;; - 1) CFG="$TEMPORARY_CFG" - break ;; - esac - done - - # Supress error message about missing config - ! test -e "$CFG" && touch "$CFG" - -} - -go() { - build_menu - - exit 0 - for setting in $TARGETS - do - ask_pref "$setting" - done - -} - - -! test -e "$CFG" && die "[$CFG] not found, exiting" -go diff --git a/packages/altboot/files/altbootctl.conf b/packages/altboot/files/altbootctl.conf deleted file mode 100644 index 13f22b7e91..0000000000 --- a/packages/altboot/files/altbootctl.conf +++ /dev/null @@ -1,98 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: hentges-setup.conf -# Date: 04-Jun-06 - - -TARGETS="REMEMBER_LAST_SELECTION ENABLE_ALTBOOT FSCK_IMAGES TIMEOUT INIT_RUNLEVEL NO_GUI_RL \ - USB_HOST_AVAILABLE USB_NETWORKING_AVAILABLE ASK_PW_ON_BOOT SD_DEVICE SD_KERNEL_MODULE \ - IMAGE_PATH IMAGE_TYPE ENABLE_IMAGECONF USB_STORAGE_MODULES USB_STORAGE_PARTITION \ - USB_STORAGE_WAIT SD_MOUNTPOINT ENABLE_DEBUGGING ENABLE_DEBUG_SHELL ENABLE_SOUND" - - -REMEMBER_LAST_SELECTION_VALUES="yes no" -REMEMBER_LAST_SELECTION_TEXT="Remember the last selected menu item for next boot" -REMEMBER_LAST_SELECTION_MENUPOS="Core" - -ENABLE_ALTBOOT_VALUES="yes no" -ENABLE_ALTBOOT_TEXT="Enable or disable the altboot boot-manager" -ENABLE_ALTBOOT_MENUPOS="Core" - -TIMEOUT_VALUES="" -TIMEOUT_TEXT="Altboot boot-menu timeout in seconds" -TIMEOUT_MENUPOS="Core" - -INIT_RUNLEVEL_VALUES="" -INIT_RUNLEVEL_TEXT="Default runlevel" -INIT_RUNLEVEL_MENUPOS="Core" - -NO_GUI_RL_VALUES="" -NO_GUI_RL_TEXT="GUI-less runlevel" -NO_GUI_RL_MENUPOS="Core" - -ENABLE_DEBUGGING_VALUES="auto yes no" -ENABLE_DEBUGGING_TEXT="Enable debugging output" -ENABLE_DEBUGGING_MENUPOS="Core" - -ENABLE_DEBUG_SHELL_VALUES="yes no" -ENABLE_DEBUG_SHELL_TEXT="Enable a shell prompt after kernel init" -ENABLE_DEBUG_SHELL_MENUPOS="Core" - -ENABLE_SOUND_VALUES="yes no" -ENABLE_SOUND_TEXT="Emmit a beep on boot" -ENABLE_SOUND_MENUPOS="Core" - -FSCK_IMAGES_VALUES="yes no" -FSCK_IMAGES_TEXT="Automatically fsck loop-images" -FSCK_IMAGES_MENUPOS="LoopImages" - -IMAGE_PATH_VALUES="" -IMAGE_PATH_TEXT="Subdirectory for loop-files" -IMAGE_PATH_MENUPOS="LoopImages" - -IMAGE_TYPE_VALUES="" -IMAGE_TYPE_TEXT="Image FS type" -IMAGE_TYPE_MENUPOS="LoopImages" - -ENABLE_IMAGECONF_VALUES="yes no" -ENABLE_IMAGECONF_TEXT="Configure new loop-images on 1st boot" -ENABLE_IMAGECONF_MENUPOS="LoopImages" - -USB_HOST_AVAILABLE_VALUES="yes no" -USB_HOST_AVAILABLE_TEXT="Device supports full USB *HOST* mode" -USB_HOST_AVAILABLE_MENUPOS="USB" - -USB_NETWORKING_AVAILABLE_VALUES="yes no" -USB_NETWORKING_AVAILABLE_TEXT="USB networking is available" -USB_NETWORKING_AVAILABLE_MENUPOS="USB" - -USB_STORAGE_MODULES_VALUES="" -USB_STORAGE_MODULES_TEXT="Kernelmodules required for USB" -USB_STORAGE_MODULES_MENUPOS="USB" - -USB_STORAGE_PARTITION_VALUES="" -USB_STORAGE_PARTITION_TEXT="USB storage device file" -USB_STORAGE_PARTITION_MENUPOS="USB" - -USB_STORAGE_WAIT_VALUES="" -USB_STORAGE_WAIT_TEXT="Wait x seconds before mount USB storage" -USB_STORAGE_WAIT_MENUPOS="USB" - -ASK_PW_ON_BOOT_VALUES="yes no" -ASK_PW_ON_BOOT_TEXT="Alway ask altboot password on boot" -ASK_PW_ON_BOOT_MENUPOS="Core" - -SD_DEVICE_VALUES="" -SD_DEVICE_TEXT="The device-file for the SD card" -SD_DEVICE_MENUPOS="SD_MMC" - -SD_KERNEL_MODULE_VALUES="" -SD_KERNEL_MODULE_TEXT="Kernelmodule required for SD operation" -SD_KERNEL_MODULE_MENUPOS="SD_MMC" - -SD_MOUNTPOINT_VALUES="" -SD_MOUNTPOINT_TEXT="Mointpoint for the SD card" -SD_MOUNTPOINT_MENUPOS="SD_MMC" diff --git a/packages/altboot/files/beep.raw b/packages/altboot/files/beep.raw deleted file mode 100644 index f76112185c..0000000000 --- a/packages/altboot/files/beep.raw +++ /dev/null @@ -1 +0,0 @@ -€~€~~~~€~€~€~€~~€~€~€~€~€~~€€~v…ok›”[l©‘Sp¯ŒMx³‚L‚³xM°nS’ªlT”®gOž°ZQ«©O\´œHj¸ŽFx¸€H…µuM°mR–«gVš¨dXœ¦aZŸ¤^[£¤Z\§¢U^­ Ob³›Jg·”Fo»ŒCx¼ƒC€»{Eˆ¸tIŽ´nM”¯iR—ªfX›¥b]žŸ_b¢š\h¥”Xo¨Vvª…T~«~T…«vUŒ©oX’¥j\—¡g`šœde›—cjœ’božŽasŸ‰_x¡…]|¢€\‚¤{Z‡¥uY¥pZ’¤k[–¢g^šŸcb›afŸ—_j¡“^o¢Ž]t£‰[y¤ƒ[¤~[„¤x\Š£r] l`•hc™™dh•al ^q¢‹]w£†\|£€\£{\†£v]Œ¡q_‘Ÿla•œgeš™chž•`m¡]r£‹[w¤†Z|¥€Z¥{[‡¤v\Œ¢q^Ÿma”œid˜™fhš•dlœbqžŒavŸ‡`{Ÿ‚a€}c…›xe‰™ugŒ—ri•oj’•kk–”flœ’`o¢ŽZt§ˆW{ªUªzV‡¨uXŒ¦qZ£m]“ j`–gcššcg•amŸ_r¡Š^x¢…]|¢€]¢|]…¡x^Š¡s_ŽŸoa’kd–™hh˜•fk™’eo›Žcr‹awŸ†_| €_‚ z`‡žvcŠšvhˆ“yq…Š|y‚‚€~ƒ~|ƒ~}€‚€~~‚~|‚„}{‚„}|‚ƒ}}~€}‚}€‚}€~~‚~|ƒ}|‚‚}~€~€€~€‚}€‚}€€~€€~~‚‚||„ƒz|…ƒz|„ƒ||‚„~z‡}w…‡ty’ƒe¡{Y‰§pY”£fa˜_m¡\w¤„Z~¦Wƒ©zUˆªtUŽ©nW”¦g[›¢a` œ]f¤–Zm¦Ys¦ŠYw¦…X|§W¨|W…¨xW‰§tYŒ¦pZ‘¥j\˜¢c` œ\g¥”Yn§Xu¦ˆZy¥„Z|¥€Z¥|[…£x\‰¢u^Œ¡r^ m_•Ÿga›œbe —]k£’[p¥ŒZu¦‡Y{¦‚Y€¦|Y†¥w[‹£r]¡m_”žib™›efœ—akŸ’^o¢]t£ˆ[y¤ƒ[~¤[ƒ£z\ˆ¢u^Œ¡q`‘žlb•›hf˜˜eiœ”bnž`r ‹^w¢†]|£\£{\†¢v]‹¡r_Ÿma”œhd™™ehœ•am ^r¢‹\w¤…Z}¥€Y‚¦zZˆ¥u[£p]’¡k_–žgcššdg–alŸ‘_q¡‹^v¢†]{¢]¢|^…¡w_Š s`Žžpb‘œme”™jh–•hk˜’fpšet›‰cx…b|€až|a…žxb‰tcœpd‘šlf”˜ii—•flš‘doœbtž‰axž…`}ž€až|b…œxcˆ›ue‹™rf˜nh’•jk—’fo›buž‡a{ž‚a~b‚{b†wcŠ›te™qh–nk’“mm“‘lo”jq–hu—‰lx…u{…ƒ~}…x€ˆw‡~z„~}‚€€€€€€|„z…~{„|€ƒ|ƒ~}‚}~‚~}ƒ}{‚…|zƒ„|{ƒƒ}|‚ƒ}|‚ƒ|{„„{{…„z|…‚{~ƒ}}‚‚~|ƒ~}€‚€}~ƒ€{‚…vy‘†ex¡†Yz©ƒT~«}T…ªvV§nZ”¢h_™žcdž˜_i¢“\n¥Ys¨ŠVwª…T|­€Q‚°zN‰±qN“¯gRœ«_W£¥Z]§ŸWcª™Ui«’Tp«ŒTvª…U}©V‚¨zXˆ¦tZ£p]‘¡l`•hc˜šeg›–ck’aoŸŽ`s ‰_x¡…^}¡€_‚ {_‡ v`ŒŸqamc”›ie—˜fi›”cmž`r ‹^w¢†]|£\£{\‡£v]Œ¡q_Ÿla•œhd™™dhœ•alŸ_q¡‹]v£†\{¤[€¤|[…£w\Š¢s^ n`“žjc—šffš—cj“`o Ž^s¢Š]x£…\}£€\‚£{]†¢v^‹ r`žnc“›jf——giš“dnœbržŠ`wŸ†_| _€ |`…Ÿxa‰žtbœpd‘™lg•–hj˜“fn›cqŒbvž‡azŸƒ`Ÿ~`„Ÿx`Šžsbnd“šjf—˜ghš•dkœ’bnž`r ‹^v¡†^{¡‚^ ~`ƒžzc‡›ve‹˜rh–nk““in˜dqœŒau ˆ^y¡„^}¡€^ |_…Ÿx`‰Ÿsažnb”œheš™chž•`l ‘_q¡Œ^u¡ˆ^y¢…]}£€[‚¤z[ˆ¤t\¡m`”œif–•jn“ŒoxŒƒv€†||…y€‡~y†~z„}‚~~‚~}‚}~ƒ{„{„~{‚ƒ||ƒ‚|~ƒ€{€„{„~{„}{‚„}|ƒƒ|}ƒ{€„|ƒ}}‚‚}}‚~~~~‚~~~€€~‚{~‡v„Œuo”hfœ^b¥Vd¬—Ql¯ŽPu¯…P}®~R„¬wT‹ªqV‘¨kX—¥e\œ¡`a ›]g£–\l¤[r¥‹Yw§†X|¨€V‚©zVˆ¨tW¦oZ“£j]˜ eaœ_e£—Yk¨Ts­‡P|°~O…°vPŒ®rR«pU©nW‘¨lW”¨iX˜¦e[¡`a¡›\h¥“Yp¦‹Xw§…X}¦Yƒ¥yZˆ¤t\¢p^’ ka–œhe™™ehœ•bmž`q Œ^u¢‡]z¢‚]¢~]„¢y^ˆ¡t_Ÿpa‘lc•›hf™—djœ“anŸ_r¡Š^w¢†]|¢]¢|]†¡w_ŠŸranc“šjg——gjš“dnœbsžŠ`wŸ…_| €_ |`†Ÿwa‹žrbœne“™jg—–fkš“cnarŸŠ_w †^{¡‚^€¡}^… x_‰ŸsaŽžoc’›ke•™hh˜•el›‘cpbužˆazŸƒ`~Ÿ~`ƒžyaˆucŒ›pe‘™mg”–ik—“fnšdrœ‹bwž†a{Ÿ`€Ÿ}`…Ÿxa‰žtbpc‘›ld•™if——fiš•dk’aoŸŽ_s¡Š]x¢„]~¢}_…žxc‰šug‹–sj”ql’on‘mq“ks”‹ju–‰hw˜‡fz™ƒh”}p„Šz{…€zƒ…y{ˆ„u{‹ƒu|Š‚w~‡z~…{~„€{€ƒ|€ƒ|€ƒ|€‚~}‚~}‚}}ƒ‚|~„€{€ƒ~}€}€‚}€‚~}~~€€~‚€|„{€„{€„~{ƒ~|‚„}z‚†}xƒˆ|w„ˆ{w„Šzp†–xcˆ¢uZŒ¦qY‘¥k\—¡daœ_f¢–\l¤‘Zq¦ŒXu¨‡Wz¨ƒW~¨Vƒ©yV‰¨rX¦kZ˜£d_Ÿ]e¥–Xm¨Vs©‰Uy«ƒT~«~TƒªyVˆ¨tX¦p[’£k^–Ÿgbš›cf—`k ’^o¢\t£ˆ[z¤ƒ[¤}\„£x]‰¢s^Ž n`“jc—›ff›—cjž“`n ^r¢‹\w¤†[|¥Z€¥|Z…¥x[‰¤s\Ž¢o^’Ÿka–œgdš™dh•alŸ‘_p¡Œ^u¢‡]z¢‚]¢}]„¡x^‰ t`Žžoc’›kf–˜giš”dmœaqŸ‹_v †^{¡]€¢}]…¡x^Š s_Žžnb“œjd—™ghš•cl‘apŸ_t¡ˆ^y¡„]~¢^‚¡z_‡ v`‹žrbœne“™kh––gk™’eo›ŽbsžŠawŸ…`| _€Ÿ|`…Ÿxa‰žtbœpd‘šlg•—ik—’go™Žfs™‹fv™‡eyš„e}›d‚›ze‡™ugŒ–rj“om‘‘mn“jo–gqšŒcu‡azžƒ`ž~a‚{b…xbˆœucŒ›qe™mh”•im˜frš‹cw†a|ž€až{a†vb‹œqd›me•šhfš˜ciž“_o¡_wžƒe€–{nˆŒuxŒ„sŒu‚‰~x†€z~…‚{|„„|zƒ…|zƒ†|yƒ†|y„†{y……z{„ƒ{}ƒ€}€€~€}~ƒ{~„{~„{}„‚{|„ƒ{{„„{z……yz‡„w{‰ƒu}Š€u€Š~w‚‡}{‚‚~~ƒ‚y}ˆv‚‹wrimœ•^j¦”Vn¬Rw¯‚Pƒ¯vQ¬kV™¦b\ŸŸ]c¤˜Yi¨“Vo«ŽSs­ŠQw¯…O}°Nƒ±yO‰¯sQ­lT•©gXš¥d]œ abŸš_h¡”]n£ŽZt¦ˆXz§‚W¨~Wƒ¨zX‡¦wZŠ¤t]¡p_‘žlc–šgg›–bl ]r¤‰Yy§ƒX€¨|W†§wYŠ¥s[Ž£p^ n`“žkb•œhd™šef˜ai •]l¤‘Zp¦Xu§ˆXz§‚Y€¥|[…¢w^‹Ÿramd“™jg—–fkš’což`t¡ˆ\z¤‚Y€§|X†§vX‹¦q[¢m_“ke“˜nkrtŠ‡x}…~|…‚x~‰€u€Šu€‰w€‡z€„|€‚}‚~}‚}}‚‚}}‚‚}}~~~€€€€~€~€~€~€~€~€€~€~€~€~€~€~€~€~€~€€~€~€~€~€~€~~€~€~€~€~~~~€~€€€€€€€€~€~€~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/packages/altboot/files/c7x0/.mtn2git_empty b/packages/altboot/files/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/c7x0/altboot-2.4.cfg b/packages/altboot/files/c7x0/altboot-2.4.cfg deleted file mode 100644 index 557730fa9f..0000000000 --- a/packages/altboot/files/c7x0/altboot-2.4.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# -# Altboot machine configuration for: C7x0 / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.28/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/c7x0/altboot-2.6.cfg b/packages/altboot/files/c7x0/altboot-2.6.cfg deleted file mode 100644 index 8d91602b25..0000000000 --- a/packages/altboot/files/c7x0/altboot-2.6.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# -# Altboot machine configuration for: c7x0 / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/collie/.mtn2git_empty b/packages/altboot/files/collie/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/collie/altboot-2.4.cfg b/packages/altboot/files/collie/altboot-2.4.cfg deleted file mode 100644 index 702902c9d0..0000000000 --- a/packages/altboot/files/collie/altboot-2.4.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Altboot machine configuration for: Collie / Kernel 2.4 -# - -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/fic-gta01/.mtn2git_empty b/packages/altboot/files/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-2.6.cfg b/packages/altboot/files/fic-gta01/altboot-2.6.cfg deleted file mode 100644 index 2ad9406083..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="no" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="s3cmci.ko" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty b/packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-menu/00-Default b/packages/altboot/files/fic-gta01/altboot-menu/00-Default deleted file mode 100644 index 9d29fdae2a..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/00-Default +++ /dev/null @@ -1,14 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - - -run_module() { - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD b/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD deleted file mode 100644 index 3cf49deea5..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD +++ /dev/null @@ -1,32 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot SD card" - -test "$DISABLE_SD_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - mount_sd - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 4f5c195be2..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 40-bootNFS -# Date: 14-Apr-06 - - -M_TITLE="Boot from NFS" - -test "$DISABLE_NFS_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - start_networking "$nfs_host" - - if test -z "$nfs_host" - then - mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" - - fi - - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - stty echo - echo -n "Boot NFS root: " - - if test "$AUTOBOOT" != "yes" - then - read junk < /dev/tty1 - else - if test -e /etc/.altboot-bootNFS-source.last - then - junk="`cat /etc/.altboot-bootNFS-source.last`" - test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" - else - read junk < /dev/tty1 - fi - fi - - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - echo "$junk" > /etc/.altboot-bootNFS-source.last - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - - if ( mount | grep -q "/media/nfsroot" ) - then - echo "/media/nfsroot already used, tying to umount..." - umount /media/image - losetup -d /dev/loop0 - umount /media/nfsroot || die "umount failed!" - fi - - mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" - - # Use configured resolv.conf in the pivoted rootfs - #echo -n "Copying resolv.conf..." - #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - - check_target "/media/nfsroot" bootNFS - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot deleted file mode 100644 index 74200d1ec9..0000000000 --- a/packages/altboot/files/init.altboot +++ /dev/null @@ -1,606 +0,0 @@ -#!/bin/sh -# -# altboot provides a simple bootmenu before init is beeing run. -# There are two default menu entries: "Normal boot" and "Single user mode" -# New menu entries can be created be putting files into /etc/altboot-menu. -# - -test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - -CURRENT_ENV="`set`" -VERSION="DEVELOPER SNAPSHOT" - -# Set some defaults in case altboot.cfg is missing -REAL_INIT="/sbin/init.sysvinit" - -# Read default runlevel from inittab -INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`" -test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5 - -# If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...) -OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1" - -if ( echo "$OUT_TTY" | grep -q "not" ) -then - OUT_TTY="/dev/tty1" - echo "WARNING: Assignment of OUT_TTY failed (2)!" > "$OUT_TTY" -fi - -case "`uname -r`" in -2.6*) ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";; -2.4*) ALTBOOT_CFG_FILE="/etc/altboot-2.4.cfg";; -*) echo "Warning: Unknown kernel [`uname -r`], using kernel 2.6 configuration!" - ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";; -esac - -test -e "$ALTBOOT_CFG_FILE" && . "$ALTBOOT_CFG_FILE" || echo "WARNING: No $ALTBOOT_CFG_FILE found! Check your installation of Altboot!" > "$OUT_TTY" - -if test -e "${ALTBOOT_CFG_FILE}.next-reboot" -then - . "${ALTBOOT_CFG_FILE}.next-reboot" - rm "${ALTBOOT_CFG_FILE}.next-reboot" -fi - -ENABLE_DEBUG="$ENABLE_DEBUGGING" - -C_RED="\033[31m" -C_YELLOW="\033[33m" -C_BLUE="\033[34m" -C_WHITE="\033[37m" -C_RESET="\033[0m" - - -die() { - echo -e "${C_RED}ERROR: $1${C_RESET}" >"$OUT_TTY" - exec $SH_SHELL <"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -debug_shell() { - # VT 2 = Opie, VT 3 = GPE - test -z "$1" && VT=4 || VT=$1 - - echo -e "\033c" > /dev/tty$VT - - echo -en "\nPress to activate the debug shell." > /dev/tty$VT - read junk /dev/tty$VT - /bin/sh /dev/tty$VT 2>&1 - - #openvt -lf -c$VT -- /bin/sh /dev/tty$VT 2>&1 -} - -# This function prints the boot-menu -# $1: Directory containing the scripts for the menu-items -show_menu() { - test -z "$1" && die "DEBUG: Parameter 1 is empty in show_menu" - ! test -d "$1" && die "show_menu: [$1] not found or no directory." - - echo "" - echo -e "altboot v$VERSION\n" - - m_entry="" - - cd $1 - - cnt=0 ; reset_pref "menu_filelist" - for file in `ls -1` - do -# debug_echo "show_menu(): file = [$file]" - if ! test -d "$1/$file" - then - # NOTE: It is important to use "." here so that the script inherits - # the shell environment / all set variables! - M_TITLE="`. $1/$file title`" - FLAGS="`$1/$file flags`" - - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - #m_entry="`echo -e "$m_entry\n$cnt:$file\n"`" - - set_pref "menu_filelist" "$cnt" "$file" - test -n "$FLAGS" && set_pref "menu_fileflags" "$cnt" "$FLAGS" - echo -e "\t\t[$cnt] $M_TITLE" - fi - M_TITLE="" - fi - done - -# debug_echo "FILES READ" - - # Display directories below /etc/altboot-menu as menu-item - # and add all scripts inside the directory to m_entry - for dir in `ls -1` - do - if test -d "$1/$dir" - then - M_TITLE="`basename "$1/$dir"`" - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - - set_pref "menu_filelist" "$cnt" "$dir:DIR" - - # Set noRemember flag for directories - set_pref "menu_fileflags" "$cnt" "noRemember" - - echo -e "\t\t[$cnt] $M_TITLE" - - OLD_PWD="$PWD" - cd "$1/$dir" - for file in `ls -1` - do - if ! test -d "$1/$dir/$file" - then - M_TITLE="`$1/$dir/$file title`" - FLAGS="`$1/$dir/$file flags`" - - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - - set_pref "menu_filelist" "$cnt" "$dir/$file" - test -n "$FLAGS" && set_pref "menu_fileflags" "$cnt" "$FLAGS" - fi - M_TITLE="" - fi - done - cd "$OLD_PWD" - - else - debug_echo "show_menu(): \$M_TITLE is empty" - fi - M_TITLE="" - fi - done - -# debug_echo "DIRS READ" - - echo "" -} - -# This function is used to display the content of directories below -# /etc/altboot-menu as menu-items -show_sub_menu() { - dirname="`basename "$1"`" - - d_entries="`dump_pref "menu_filelist" | grep "$dirname/"`" - - echo -e "\naltboot v$VERSION: $dirname menu\n" - - for d_entry in $d_entries - do - d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`" - d_entry_file="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\2/p"`" - d_entry_title="`$d_entry_file title`" - - echo -e "\t\t[$d_entry_number] $d_entry_title" - done - - echo "" - -} - -get_kbd_ints(){ - if ( uname -r | grep -q ^2.6 ) - then - if test -z "$KBD_INT" - then - # find out how the keyboard is called - for kbd in Spitzkbd corgikbd locomokbd tosakbd "Neo1973 AUX button" - do - if ( cat /proc/interrupts | grep -q "$kbd" ) - then - debug_echo "run_timer(): Using [$kbd] as keyboard interrupt" - KBD_INT="$kbd" - break - fi - done - fi - key_ints="`cat /proc/interrupts | grep "$KBD_INT"`" - #debug_echo "run_timer(): key_ints = [$key_ints]" - else - KBD_INT="$kbd" - debug_echo "\nrun_timer(): Using [keyboard] as keyboard interrupt in kernel-2.4 mode" - key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`" - fi - - test -z "$KBD_INT" && debug_echo "Couldn't read keyboard ints!" -} - -# Shows the timer and sets $launch_altboot to yes if a keypress was detected -run_timer() { - if test "$TIMEOUT" != 0 -a "$TIMEOUT" != "[none]" - then - - mount -t proc proc /proc >/dev/null 2>&1 - - get_kbd_ints - kbd_ints_old="$key_ints" - - #debug_echo "run_timer() old:`echo $key_ints | md5sum`" - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - case "$KBD_INT" in - Neo1973*) echo -en "\n\nPlease press [AUX] to launch altboot." > "$OUT_TTY" ;; - *) echo -en "\n\nPlease press any key to launch altboot." > "$OUT_TTY" ;; - esac - - test -z "$TIMEOUT" && TIMEOUT="3" - - cnt=0 - while test "$cnt" != "$TIMEOUT" - do - sleep 1 - - get_kbd_ints - kbd_ints_new="$key_ints" - - if test "$kbd_ints_new" != "$kbd_ints_old" -o -z "$kbd_ints_new" - then - launch_altboot=yes - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - break - fi - echo -n "." >"$OUT_TTY" - let cnt=$cnt+1 - done - - if test "$launch_altboot" != "yes" - then - AUTOBOOT=yes - else - rm -f /etc/.altboot*.last - fi - - else - launch_altboot=yes - fi - - if test "$TIMEOUT" = "[none]" - then - echo "" - echo -e "altboot v$VERSION ($MACHINE)\n" - - echo "NOTE: The menu is not available on this device" - echo "Use \"set-bootdev\" to change the boot device" - - launch_altboot=no - fi -} - -# $1 = ID -parse_module_flags() { - if test -n "$1" - then - # Each module can set "flags" to influence handling of the module - get_pref "menu_fileflags" "$1" flags - - test -n "$flags" && debug_echo "parse_module_flags(): [$1] has flags [$flags]" - - for flag in $flags - do - case "$flag" in - noRemember) REMEMBER_LAST_SELECTION=no;; - esac - done - else - debug_echo "parse_module_flags(): Empty \$1" - fi -} - -# This function launches the selected menu item / script -# $1: Directory containing the scripts for the menu-items -launch_selection() { - test -z "$1" && die "Parameter 1 of launch_selection is empty!" - - case "$junk" in - *) #file="`echo "$m_entry"| sed -n "/$junk\:/s/^.*\:\(.*\)/\1/p"`" - - get_pref "menu_filelist" "$junk" file_ - type="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\2/p"`" - file="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\1/p"`" - test -z "$file" && file="$file_" - -# debug_echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" - - # The selected menu-item points to a directory - if test "$type" = DIR - then - show_sub_menu /etc/altboot-menu/$file >"$OUT_TTY" - wait_for_input >"$OUT_TTY" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - if test "$type" = MAIN - then - show_sub_menu /etc/altboot-menu >"$OUT_TTY" - wait_for_input >"$OUT_TTY" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - - - . $1/$file run "$file" >"$OUT_TTY" - die "WARNING: Using failsafe shell" >"$OUT_TTY" - - ;; - esac -} - - -wait_for_input() { - - # Neo has only two buttons: AUX and PWR. - # Only AUX is easily readable from userspace, so are touchscreen taps - if test "$KBD_INT" = "Neo1973 AUX button" - then - ints_old="`cat /proc/interrupts | grep "$KBD_INT" | awk '{print $2}'`" - ts_ints_old="`cat /proc/interrupts |grep action| tail -1 | awk '{print $2}'`" - - echo "Please press [AUX] to set a menu number" <"$OUT_TTY" > "$OUT_TTY" 2>&1 - echo -e "Press the touchscreen to start\n" - - x="$last_selection" ; hold_events=0 - - echo -n "Your Choice: [$x / $cnt]" - - while true - do - - ts_ints_now="`cat /proc/interrupts |grep action| tail -1 | awk '{print $2}'`" - - if test "$ts_ints_now" = "$ts_ints_old" - then - ints_now="`cat /proc/interrupts | grep "$KBD_INT" | awk '{print $2}'`" - - if test "$ints_now" -gt "$ints_old" - then - # Only react on every second interupt as both PRESS and RELEASE generate - # one. - if test -n "$tmp" - then - #debug_echo "wait_for_input(): PRESS/RELEASE EVENT [$ints_now <-> $ints_old]" - - MAX_ENTRIES="$cnt" - - test "$x" = "$cnt" && x=1 || let x=$x+1 - - #\r : go to beginning of the current line - #\033[K : completely clear the current line - echo -en "\r\033[KYour Choice: [$x / $cnt]" - - - tmp="" - else - tmp=blahh - fi - fi - - ints_old="$ints_now" - else -# debug_echo "wait_for_input(): TOUCHSCREEN EVENT [$ts_ints_now <-> $ts_ints_old]" - ts_ints_old="$ts_ints_now" - - parse_module_flags "$x" - - if test "$REMEMBER_LAST_SELECTION" != no - then - # Don't remount rw if the drive is already mounted rw - # Only helpful for testing / debugging - if test "`mount|sed -n "/\/dev\/root/s/.*(\(.*\))/\1/p"`" != "rw" - then - mount -o remount,rw / >/dev/null 2>&1 - echo "$x" > /etc/altboot.conf - mount -o remount,ro / >/dev/null 2>&1 - else - echo "$x" > /etc/altboot.conf - fi - fi - - junk="$x" - break - - fi - done - else - while true - do - - # Do _not_ change the next few lines! - # - # This is required to work around an annoying busybox bug. - # Every key you press while this script runs will be - # picked up by the next "read $junk". - # So the next read would pick up the "any" key the user pressed - # above to launch the altboot menu. - - - # Bash throws an ugly error on kill - if ! (readlink /bin/sh | grep -q bash) - then - # This filters an "" from the user as "any key" - ( while :; do read x< "$OUT_TTY" 2>&1; done; ) > /dev/null 2>&1 & - sleep 1; kill $! >/dev/null 2>&1 - fi - - echo -n "Please choose one of the above [$last_selection]: " <"$OUT_TTY" > "$OUT_TTY" 2>&1 - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk< "$OUT_TTY" 2>&1 - - # This filters other chars the user may have used - - junk="`echo "$junk" | sed "s/[a-zA-Z]//g"`" - - if test "$junk" -lt "$cnt" -o "$junk" -eq "$cnt" - then - if test ! -z "$junk" - then - parse_module_flags "$junk" - - if test "$REMEMBER_LAST_SELECTION" != no - then - # Don't remount rw if the drive is already mounted rw - # Only helpful for testing / debugging - if test "`mount|sed -n "/\/dev\/root/s/.*(\(.*\))/\1/p"`" != "rw" - then - mount -o remount,rw / >/dev/null 2>&1 - echo "$junk" > /etc/altboot.conf - mount -o remount,ro / >/dev/null 2>&1 - else - echo "$junk" > /etc/altboot.conf - fi - fi - else - junk="$last_selection" - parse_module_flags "$junk" - break - fi - break - fi - done - fi -} - -# * * * * * * This is the main function * * * * * * - -if ( echo "$VERSION" | egrep -iq "(snapshot|-rc)" ) -then - if test "$ENABLE_DEBUGGING" = "auto" -o -z "$ENABLE_DEBUGGING" - then - ENABLE_DEBUG="yes" - fi -fi - -test "$ENABLE_DEBUG_SHELL" = "yes" && debug_shell 4 >/dev/null 2>&1 & - -if test "$ENABLE_DEBUGGING" = "yes" -then - ENABLE_DEBUG="yes" - debug_shell 4 >/dev/null 2>&1 & -fi - -# Note: this is positively ugly. If someone knows a better way to detect whether -# we are already booted into a runlevel _without_ reading /var and / or using `runlevel` -# PLEASE let me know. -# -# The NSLU2 is an exception as it uses the way-ugly busybox "ps" -# - -mount | grep -q "^/proc" || mount -t proc proc /proc -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" - -case "$MACHINE" in - *NSLU2) if test -f /proc/cmdline -a "`ps |wc -l|tr -d " "`" -gt 25 -a "$1" != "-force" -a "$1" != "+force" - then - user_called=1 - fi - ;; - - *) if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1"!= "+force" >/dev/null 2>&1 - then - user_called=1 - fi - ;; -esac - -if test "`basename "$0"`" = "altboot" -then - show_menu /etc/altboot-menu - exit 0 -fi - -if test "$user_called" = "1" -then - echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY" - exec $REAL_INIT $* -# exec $SH_SHELL /dev/tty0 2>&1 - exit 0 -else - # Boot original init if altboot is turned off - if test "$ENABLE_ALTBOOT" != "yes" - then - echo "altboot: Using real init [$REAL_INIT] **" >"$OUT_TTY" - exec $REAL_INIT $INIT_RUNLEVEL - exit 0 - fi - - # Execute scripts in /etc/altboot.rc before doing anything else. - # Required in special situations, like booting spitz - RC_FILES=`ls /etc/altboot.rc | grep \.sh$` - - for file in $RC_FILES - do - . /etc/altboot.rc/$file >"$OUT_TTY" 2>&1 || echo "/etc/altboot.rc/$file failed!" - done - - # Make sure altboots master password is set - set_password >"$OUT_TTY" - - test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >"$OUT_TTY" - - # When started with -force, always print the menu - echo "$*" | grep -q -- "-force" && TIMEOUT=0 - - # This timeout works by reading /proc/interrupts to see if the keyboard interrupt - # increases while the timer is running. A TIMEOUT of 0 will always launch altboot. - run_timer >"$OUT_TTY" - - echo "" >"$OUT_TTY" - - # launch_altboot is set to "yes" by run_timer when the user presses the button during the timeout - if test "$launch_altboot" != yes - then - # last_selection is the previously selected menu item by the user - last_selection="`cat /etc/altboot.conf`" >/dev/null 2>&1 - test -z "$last_selection" && last_selection="1" - - echo "Booting last selection: [$last_selection]" >"$OUT_TTY" - - # Set up the wanna-be array of available menu entries and their numbers - show_menu /etc/altboot-menu >/dev/null 2>&1 - - junk="$last_selection" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - # Anything after this point will never be reached if $launch_altboot != yes - - # Show the altboot menu - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - show_menu /etc/altboot-menu >"$OUT_TTY" - - # Load last selection for use as default if is pressed at the prompt - last_selection="`cat /etc/altboot.conf`" >/dev/null 2>&1 - test -z "$last_selection" && last_selection="1" - - # Ask the user which menu-item to use - wait_for_input >"$OUT_TTY" - - # This should _never_ happen. - if test -z "$junk" - then - echo "WARNING: Trying failsafe mode" >"$OUT_TTY" - mount -o remount,rw / >"$OUT_TTY" 2>&1 - echo "Dumping environment to /altboot.env" - echo "$CURRENT_ENV" > /altboot.env - mount -o remount,ro / >"$OUT_TTY" 2>&1 - junk=1 - fi - - launch_selection /etc/altboot-menu >"$OUT_TTY" - - # Uhoh, something went terribly wrong if we reach this point! - die "WARNING: Failsafe fall-through activated. Spawning emergency shell" - -fi - - diff --git a/packages/altboot/files/nslu2le/.mtn2git_empty b/packages/altboot/files/nslu2le/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-2.6.cfg b/packages/altboot/files/nslu2le/altboot-2.6.cfg deleted file mode 100644 index 626c543085..0000000000 --- a/packages/altboot/files/nslu2le/altboot-2.6.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# -# Altboot machine configuration for: NSLU2 / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" - -# If set to "0" the menu will always be shown, if set to -# "[none]" there will be no menu and no delay -TIMEOUT="[none]" - -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="no" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - - -# Can't do that due to missing console -ENABLE_IMAGECONF="no" - -SD_DEVICE="" -SD_KERNEL_MODULE="" - - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="no" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -INIT_RUNLEVEL="3" -NO_GUI_RL="" - -# The if set to "", altboot will force you to set a master password on -# first-boot -MASTER_PASSWORD="[none]" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -DISABLE_SD_BOOT="yes" -DISABLE_CF_BOOT="yes" -DISABLE_NOGUI_BOOT="yes" -DISABLE_BINSH_BOOT="yes" -DISABLE_INSTTGZ_BOOT="yes" diff --git a/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage deleted file mode 100644 index 50d35ed542..0000000000 --- a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# NOTE: Ported to altboot by CoreDump -# Based on the original turnup helper script. -# -# All parts by Matthias 'CoreDump' Hentges are hereby placed -# under the terms of the GPL -# -# boot from the hard disk partition "$1" (which -# must be given) using options from the rest of -# the command line. -# - -M_TITLE="Boot USB Storage" -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -run_module() { - x=x -} - -case "$1" in -title) echo "$M_TITLE" ; exit 0 ;; -run) run_module "$2";; -esac - -nslu2_feeback heartbeat - -bootdev_data="$*" -bootdev_mode="`echo "$bootdev_data" | awk '{print $1}'`" -bootdev_name="`echo "$bootdev_data" | awk '{print $2}'`" -bootdev_uuid="`echo "$bootdev_data" | awk '{print $3}'`" - - -# Use the standard init path (see /etc/init.d/rcS) -export PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Load the helper functions -. /etc/default/functions -. /etc/default/modulefunctions -# -leds boot system -# -if test -n "$1" -then - device="$bootdev_name" - UUID="$bootdev_uuid" - - shift - # proc is needed for UUID mount and module load - mount -t proc proc /proc - # load USB & SCSI storage modules (/proc required!) - echo "boot: loading modules required for disk boot" - loaddiskmods - # waiting for disk (FIXME) - sleep=6 - test "$sleep" -gt 0 && sleep "$sleep" - # - # fire the boot - echo "boot: rootfs: mount $* $device [$UUID]" - # - # Mount read-write because before exec'ing init - # If a UUID is given (in the environment) this - # is used in preference to the device, but if - # the UUID mount fails a standard device mount - # is attempted. - if test -n "$UUID" && - mount "$@" -U "$UUID" /mnt || - mount "$@" "$device" /mnt - then - # checkmount checks for sh, chroot, init - # and /mnt (i.e. /mnt/mnt in this case) - if checkmount /mnt - then - # pivot to /initrd if available, else /mnt - cd / - if test -d /mnt/initrd - then - swivel mnt initrd - else - swivel mnt mnt - fi - # swivel failed - fi - # Failure: unmount the partition - umount /mnt - fi -fi - -# fallback - use the flash boot -nslu2_feeback failure -exec /boot/flash diff --git a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash deleted file mode 100644 index 394279c2af..0000000000 --- a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2007 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 10-Onboard-Flash -# Date: 20070218 (YMD) - -leds beep -. /etc/default/functions -leds boot system -test -x /sbin/init && exec /sbin/init -# fallback if /sbin/init has been deleted (bad!) -leds boot system panic -exec <>/dev/console >&0 2>&0 -test -x /sbin/sulogin && exec /sbin/sulogin -test -x /bin/sh && exec /bin/sh -exit 1 diff --git a/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-menu/00-Default b/packages/altboot/files/nslu2le/altboot-menu/00-Default deleted file mode 100644 index cb06661d72..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/00-Default +++ /dev/null @@ -1,17 +0,0 @@ -# !/bin/sh -M_TITLE="Flash" - - -run_module() { - leds beep - leds boot system - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -*) echo "Unknown parameter [$1]";; -esac - diff --git a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick deleted file mode 100644 index c6c215ecc4..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick +++ /dev/null @@ -1,174 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="USB Attached Storage" - -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - echo -e "\nStarting USB..." - - for module in $USB_STORAGE_MODULES - do - echo -en "\t - $module: " - modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" - done - - echo "" - scan_devices - usb_show_menu - -# echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 -# -# mkdir -p /media/usb-storage >/dev/null 2>&1 -# -# sleep "$USB_STORAGE_WAIT" -# -# /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" -# -# echo "" -# -# # Check for a real fs and loop-images. -# check_target "/media/usb-storage" >/dev/tty0 -} - -scan_devices() { - reset_pref "available_devices" - - cnt=1 - - for scsi_disk in `ls -1 /sys/block/ | grep ^sd` - do - scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" - test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" - test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" - - test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" - test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" - - scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" - test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" - - set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" - set_pref "available_devices_short" "$cnt" "$scsi_disk" - set_pref "available_devices_type" "$cnt" "usb" - - let cnt=$cnt+1 - done - -} - -usb_show_menu() { - - cnt2=0 ; let cnt=$cnt-1 - while test "$cnt" != "$cnt2" - do - let cnt2=$cnt2+1 - get_pref "available_devices" "$cnt2" dev - - echo -e "\t[$cnt2] - $dev" - done - - while test -z "$selected_dev" - do - echo -en "\nYour choice: " - read junk - get_pref "available_devices" "$junk" selected_dev - get_pref "available_devices_type" "$junk" part_mode - -# debug_echo "show_menu(): selected: [$selected_dev]" - done - - if ( echo "$selected_dev" | grep -q "^Flash" ) - then - boot_from flash - else - get_pref "available_devices_short" "$junk" selected_dev -# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" - - partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" - test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" - - - echo -e "\nPlease select a partition on $selected_dev to boot from:\n" - - cnt=1 - for partition in $partitions - do - # We assume that partitions with a "size" < 10 are extended partitions - # and should not be listed. TYPE=swap is blacklisted as well. - part_size="`cat /sys/block/$selected_dev/$partition/size`" - part_type="`blkid -s TYPE -o value /dev/$partition`" - - if test "$part_size" -gt 10 -a "$part_type" != "swap" - then - let part_size="($part_size/2)/1000" - echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" - set_pref "available_partitions" "$cnt" "$partition" - - let cnt=$cnt+1 - fi - done - - while test -z "$selected_partition" - do - echo -en "\nYour choice: " - read junk - get_pref "available_partitions" "$junk" selected_partition - done - - part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" - - boot_from "$part_mode" "$selected_partition" "$part_uuid" - fi -} - -boot_from() { - debug_echo "boot_from() [$*]" - - part_mode="$1" - part_name="$2" - part_uuid="$3" - - case "$part_mode" in - usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 - rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev - - if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) - then - echo "** Note: UUID mount for $part_name failed" - mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" - fi - - if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit - then - copy_rootfs /tmp/mnt.set-bootdev/ - else - umount /tmp/mnt.set-bootdev - echo -e "\nSetting /dev/$part_name as boot-partition" - echo "3 $part_name $part_uuid" > /etc/altboot.last - fi - ;; - esac -} - -copy_rootfs() { - debug_echo "copy_rootfs() [$*]" -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh deleted file mode 100644 index 1c3fccd9d9..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh +++ /dev/null @@ -1,27 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - -test "$DISABLE_BINSH_BOOT" = yes && exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >$OUT_TTY - - # Mount /proc, etc - init_rootfs - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL <$OUT_TTY >$OUT_TTY 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/poodle/.mtn2git_empty b/packages/altboot/files/poodle/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/poodle/altboot-2.4.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg deleted file mode 100644 index 1bce54015c..0000000000 --- a/packages/altboot/files/poodle/altboot-2.4.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Altboot machine configuration for: Poodle / Kernel 2.4 -# - -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="no" -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -ENABLE_IMAGECONF="yes" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg deleted file mode 100644 index f867db6b05..0000000000 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# -# Altboot machine configuration for: Poodle / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="no" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -# Poodle already boots off SD natively! -DISABLE_SD_BOOT="yes" - diff --git a/packages/altboot/files/set-bootdev b/packages/altboot/files/set-bootdev deleted file mode 100755 index 60d0283dc4..0000000000 --- a/packages/altboot/files/set-bootdev +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/sh - -VERSION="0.0.1" -ENABLE_DEBUG="yes" - -die() { - echo -e "ERROR: $1" - exit 1 -} - -. /etc/altboot.func || die "/etc/altboot.func is missing!" -test -d /sys/block || die "Sysfs problem? (/sys/block not found)" - -debug_echo() { - test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" -} - -scan_devices() { - reset_pref "available_devices" - - cnt=1 - set_pref "available_devices" "$cnt" "Flash" ; let cnt=$cnt+1 - - for scsi_disk in `ls -1 /sys/block/ | grep ^sd` - do - scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" - test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" - test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" - - test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" - test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" - - scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" - test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" - - set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" - set_pref "available_devices_short" "$cnt" "$scsi_disk" - set_pref "available_devices_type" "$cnt" "usb" - - let cnt=$cnt+1 - done - -} - -show_menu() { - echo -e "\nset-bootdev v$VERSION\n" - - echo -e "Please select the device you wish to boot from:\n" - - cnt2=0 ; let cnt=$cnt-1 - while test "$cnt" != "$cnt2" - do - let cnt2=$cnt2+1 - get_pref "available_devices" "$cnt2" dev - - echo -e "\t[$cnt2] - $dev" - done - - while test -z "$selected_dev" - do - echo -en "\nYour choice: " - read junk - get_pref "available_devices" "$junk" selected_dev - get_pref "available_devices_type" "$junk" part_mode - -# debug_echo "show_menu(): selected: [$selected_dev]" - done - - if ( echo "$selected_dev" | grep -q "^Flash" ) - then - boot_from flash - else - get_pref "available_devices_short" "$junk" selected_dev -# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" - - partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" - test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" - - - echo -e "\nPlease select a partition on $selected_dev to boot from:\n" - - cnt=1 - for partition in $partitions - do - # We assume that partitions with a "size" < 10 are extended partitions - # and should not be listed. TYPE=swap is blacklisted as well. - part_size="`cat /sys/block/$selected_dev/$partition/size`" - part_type="`blkid -s TYPE -o value /dev/$partition`" - - if test "$part_size" -gt 10 -a "$part_type" != "swap" - then - let part_size="($part_size/2)/1000" - echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" - set_pref "available_partitions" "$cnt" "$partition" - - let cnt=$cnt+1 - fi - done - - while test -z "$selected_partition" - do - echo -en "\nYour choice: " - read junk - get_pref "available_partitions" "$junk" selected_partition - done - - part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" - - boot_from "$part_mode" "$selected_partition" "$part_uuid" - fi -} - -boot_from() { - debug_echo "boot_from() [$*]" - - part_mode="$1" - part_name="$2" - part_uuid="$3" - - case "$part_mode" in - usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 - rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev - - if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) - then - echo "** Note: UUID mount for $part_name failed" - mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" - fi - - if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit - then - copy_rootfs /tmp/mnt.set-bootdev/ - else - umount /tmp/mnt.set-bootdev - echo -e "\nSetting /dev/$part_name as boot-partition" - echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf - fi - ;; - flash) echo "Setting the onboard flash as boot-partition" - echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf - ;; - esac -} - -copy_rootfs() { - debug_echo "copy_rootfs() [$*]" -} - -scan_devices -show_menu diff --git a/packages/altboot/files/spitz/.mtn2git_empty b/packages/altboot/files/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/spitz/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg deleted file mode 100644 index 0a2b643b76..0000000000 --- a/packages/altboot/files/spitz/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Spitz / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="no" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg deleted file mode 100644 index f84e2d57b9..0000000000 --- a/packages/altboot/files/tosa/altboot-2.4.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# -# Altboot machine configuration for: Tosa / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/tosa/altboot-2.6.cfg b/packages/altboot/files/tosa/altboot-2.6.cfg deleted file mode 100644 index 62e8ea2434..0000000000 --- a/packages/altboot/files/tosa/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" -- cgit v1.2.3 From 022ee23989dcc00839c08cd50c674a428180d0d6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Mar 2007 08:55:18 +0000 Subject: linux-handhelds-2.6: Drop 2.6.20-hh2. Add 2.6.20-hh4. * Changes since 2.6.20-hh3: 1. htcathena port added. 2. Generic Device GPIO API (aka gpiodev) committed, based on virtual device methods pattern. 3. rs232_serial - generic driver for GPIO-controlled RS232 transceiver on serial port. 4. hx4700_serial, h4000_serial: Superceded by rs232_serial, removed. Last release available is 2.6.20-hh3. 5. pxa2xx-udc-gpio - generic driver to control UDC on PXA-based machine using Device GPIOs. 6. h4000: Added separate mach_type for h4300, to solve (rather move out of kernel) issues with h4300 keyboard support. Now, h43000_kbd can be safely built into the kernel - it will load only for MACH_H4300. 7. h4000: codebase cleanup. 8. ds2760_battery: remove APM code, realy on apm_power to do APM reporting. 9. h5000: Added ASoC support, ak4535 ASoC codec fixed. --- packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb deleted file mode 100644 index b34d4630a0..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3 From c046128ccc358561c39983ae99f4efacadbd27cc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Mar 2007 08:56:45 +0000 Subject: linux-handhelds-2.6: Drop 2.6.20-hh1. Add 2.6.20-hh5. * Changes since 2.6.20-hh4: 1. ts-adc-debounce: Use spec-originated formula for pressure calculation, still needs tweaking for real world; implement pressure cut off properly, and handle jitter in more sustainable manner: now samples with too much jitter are ignored, not cause TS sampling to abort. Still needs further elaboration to solve all outstanding issues and be able to support different machines well. 2. Anton Vorontsov's ADC classdev refactor merged, all ADC API clients are converted to it. 3. h5000: ADC/TS handling rewrote using ADC classdev. Light sensor support added. 4. htcuniversal: tweak keys/switches handling and preliminary code to handle PXA27x LCD controller features. 5. nand_base: Handle OOB operations more robustly. 6. ds1wm: Optmizations and more adherance to specs. --- packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb deleted file mode 100644 index b34d4630a0..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3 From d0848d856d6c32ef7bb5007d2d2a4fa192e324ef Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Mar 2007 08:58:49 +0000 Subject: linux-handhelds-2.6 cvs: HEAD is 2.6.20-hh5 now. --- packages/linux/linux-handhelds-2.6_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index ef60a0f9a9..d6ab646606 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "20" -HHV = "3" +HHV = "5" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" -- cgit v1.2.3 From 4ec046d48fc48f679fb40f570e2ce967197b2155 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 09:03:21 +0000 Subject: task-angstrom-x11: add keylaunch --- packages/angstrom/task-angstrom-x11.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 490955af9c..f427f15ab8 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r29" +PR = "r30" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -75,6 +75,7 @@ RDEPENDS_angstrom-gpe-task-settings := "\ gpe-package \ gpe-shield \ gpe-taskmanager \ + keylaunch \ minilite \ minimix \ xmonobut" -- cgit v1.2.3 From 29ecffc666e166906ccaa73f65c2e12ea17a1769 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 09:14:24 +0000 Subject: gpe-conf: fix for http://bugs.linuxtogo.org/show_bug.cgi?id=42 by Manuel Teira --- packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty | 0 packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch | 11 +++++++++++ packages/gpe-conf/gpe-conf_0.2.5.bb | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty create mode 100644 packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch (limited to 'packages') diff --git a/packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty b/packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch b/packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch new file mode 100644 index 0000000000..7a953c25ec --- /dev/null +++ b/packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch @@ -0,0 +1,11 @@ +--- gpe-conf-0.2.5/modules/screen/brightness.c~brightness ++++ gpe-conf-0.2.5/modules/screen/brightness.c +@@ -216,7 +216,7 @@ + FILE *f_power; + gint value = SYS_STATE_ON; + +- f_power = fopen(SYS_BRIGHTNESS, "r"); ++ f_power = fopen(SYS_POWER, "r"); + if (f_power != NULL) + { + fscanf(f_power,"%i", &value); diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb index eff9f55033..6cbddeedd0 100644 --- a/packages/gpe-conf/gpe-conf_0.2.5.bb +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -10,7 +10,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf" RPROVIDES_${PN} += " bl" RCONFLICTS_${PN} = "bl" -PR = "r1" +PR = "r2" GPE_TARBALL_SUFFIX = "bz2" @@ -22,3 +22,5 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ ${datadir}/gpe-conf" FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + +SRC_URI += "file://backlight-bugfix.patch;patch=1" -- cgit v1.2.3 From 5b092eca308028230d8e65384c2eeef3652e25a9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 10:10:26 +0000 Subject: xserver-kdrive: clean up different patch versions, drop imageon from 1.2 for now --- .../xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ++++++++++++++++++++++ .../xserver-kdrive-1.2/enable-epson.patch | 11 ++++++ .../xserver-kdrive-1.2/enable-tslib.patch | 28 ++++++++++++++++ .../xserver-kdrive-1.2/enable-xcalibrate.patch | 24 +++++++++++++ packages/xorg-xserver/xserver-kdrive-common.inc | 3 ++ .../xserver-kdrive/build-fix-panoramix.patch | 18 ++++++++++ .../disable-xf86-dga-xorgcfg-1.2.patch | 39 ---------------------- .../xserver-kdrive/enable-epson-1.2.patch | 11 ------ packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 11 ++---- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 3 -- 11 files changed, 125 insertions(+), 62 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch new file mode 100644 index 0000000000..1e72a3ea53 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch @@ -0,0 +1,28 @@ +Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 +@@ -6,6 +6,10 @@ + + bin_PROGRAMS = Xfbdev + ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ + libfbdev_a_SOURCES = \ + fbdev.c \ + fbdev.h +@@ -16,7 +20,10 @@ + Xfbdev_LDADD = \ + libfbdev.a \ + @KDRIVE_LIBS@ \ +- @XSERVER_LIBS@ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) + + Xfbdev_DEPENDENCIES = \ +- libfbdev.a ++ libfbdev.a \ ++ @KDRIVE_LIBS@ ++ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch new file mode 100644 index 0000000000..aec94a3a6d --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch @@ -0,0 +1,24 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 3cb038648e..72c2a87b32 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -96,7 +96,10 @@ KDRIVE_COMMON_PATCHES = " \ file://kdrive-use-evdev.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ " diff --git a/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch new file mode 100644 index 0000000000..f919b48f0e --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch @@ -0,0 +1,18 @@ +Index: git/composite/compext.c +=================================================================== +--- git.orig/composite/compext.c 2007-03-28 16:25:12.000000000 +0200 ++++ git/composite/compext.c 2007-03-28 16:25:15.000000000 +0200 +@@ -696,11 +696,13 @@ + if (GetPictureScreenIfSet(pScreen) == NULL) + return; + } ++#ifdef PANORAMIX + /* Xinerama's rewriting of window drawing before Composite gets to it + * breaks Composite. + */ + if (!noPanoramiXExtension) + return; ++#endif + + CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow); + if (!CompositeClientWindowType) diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 -+++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 -@@ -513,7 +513,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1540,7 +1544,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1560,10 +1566,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch deleted file mode 100644 index 8ec3a37c78..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: xorg-server-1.2.0/hw/kdrive/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 -@@ -1,5 +1,5 @@ - if KDRIVEFBDEV --FBDEV_SUBDIRS = fbdev -+FBDEV_SUBDIRS = fbdev epson - endif - - if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index ac276a8e60..d4c01f240a 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,19 +3,12 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r1" - -PACKAGES =+ "xserver-kdrive-imageon" +PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://enable-epson-1.2.patch;patch=1 \ - file://kdrive-vidmemarea.patch;patch=1 \ - file://kdrive-imageon.patch;patch=1 \ + file://enable-xcalibrate.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" -IMAGEON_OECONF = "--disable-imageon" -IMAGEON_OECONF_arm = "--enable-imageon" diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 1aff9cdf79..3f97527553 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -8,10 +8,7 @@ PACKAGES =+ "xserver-kdrive-w100" SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ file://w100.patch;patch=1 \ " -- cgit v1.2.3 From dcb7c19ada78eaebd5831dc3c07107e136ce3f35 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 10:18:26 +0000 Subject: xserver-kdrive: fix patch directory name for 1.2 --- .../xserver-kdrive-1.2.0/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ++++++++++++++++++++++ .../xserver-kdrive-1.2.0/enable-epson.patch | 11 ++++++ .../xserver-kdrive-1.2.0/enable-tslib.patch | 28 ++++++++++++++++ .../xserver-kdrive-1.2.0/enable-xcalibrate.patch | 24 +++++++++++++ .../xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ---------------------- .../xserver-kdrive-1.2/enable-epson.patch | 11 ------ .../xserver-kdrive-1.2/enable-tslib.patch | 28 ---------------- .../xserver-kdrive-1.2/enable-xcalibrate.patch | 24 ------------- 10 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch new file mode 100644 index 0000000000..1e72a3ea53 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -0,0 +1,28 @@ +Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 +@@ -6,6 +6,10 @@ + + bin_PROGRAMS = Xfbdev + ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ + libfbdev_a_SOURCES = \ + fbdev.c \ + fbdev.h +@@ -16,7 +20,10 @@ + Xfbdev_LDADD = \ + libfbdev.a \ + @KDRIVE_LIBS@ \ +- @XSERVER_LIBS@ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) + + Xfbdev_DEPENDENCIES = \ +- libfbdev.a ++ libfbdev.a \ ++ @KDRIVE_LIBS@ ++ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch new file mode 100644 index 0000000000..aec94a3a6d --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -0,0 +1,24 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 -+++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 -@@ -513,7 +513,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1540,7 +1544,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1560,10 +1566,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch deleted file mode 100644 index 8ec3a37c78..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: xorg-server-1.2.0/hw/kdrive/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 -@@ -1,5 +1,5 @@ - if KDRIVEFBDEV --FBDEV_SUBDIRS = fbdev -+FBDEV_SUBDIRS = fbdev epson - endif - - if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch deleted file mode 100644 index 1e72a3ea53..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 -@@ -6,6 +6,10 @@ - - bin_PROGRAMS = Xfbdev - -+if TSLIB -+TSLIB_FLAG = -lts -+endif -+ - libfbdev_a_SOURCES = \ - fbdev.c \ - fbdev.h -@@ -16,7 +20,10 @@ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ \ -- @XSERVER_LIBS@ -+ @XSERVER_LIBS@ \ -+ $(TSLIB_FLAG) - - Xfbdev_DEPENDENCIES = \ -- libfbdev.a -+ libfbdev.a \ -+ @KDRIVE_LIBS@ -+ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch deleted file mode 100644 index aec94a3a6d..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: xorg-server-1.2.0/mi/miinitext.c -=================================================================== ---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 -+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 -@@ -372,6 +372,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XEVIE - extern void XevieExtensionInit(INITARGS); - #endif -@@ -663,6 +666,9 @@ - #ifdef DAMAGE - if (!noDamageExtension) DamageExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - void -- cgit v1.2.3 From 0f58092c991ced1629b1b30bd08e2ea823d46c8d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 11:36:39 +0000 Subject: xserver-kdrive-1.2: fix enable-tslib.patch --- .../xserver-kdrive-1.2.0/enable-tslib.patch | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 1e72a3ea53..615f27a7c1 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -13,7 +13,7 @@ Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am libfbdev_a_SOURCES = \ fbdev.c \ fbdev.h -@@ -16,7 +20,10 @@ +@@ -16,7 +20,8 @@ Xfbdev_LDADD = \ libfbdev.a \ @KDRIVE_LIBS@ \ @@ -22,7 +22,16 @@ Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am + $(TSLIB_FLAG) Xfbdev_DEPENDENCIES = \ -- libfbdev.a -+ libfbdev.a \ -+ @KDRIVE_LIBS@ -+ + libfbdev.a +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-29 13:28:35.000000000 +0200 +@@ -1517,6 +1517,7 @@ + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi + AC_DEFINE(TSLIB, 1, [Have tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support]) + fi + + # damage shadow extension glx (NOTYET) fb mi -- cgit v1.2.3 From edc40a59a0f44223deacd1291e5e80b7b9360897 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 29 Mar 2007 11:56:01 +0000 Subject: packages/apt/apt_0.6.46.2.bb packages/apt/apt.inc packages/apt/apt-package.inc : build and package shared libs at all times. --- packages/apt/apt-package.inc | 17 ++++++++++++----- packages/apt/apt.inc | 6 ++++-- packages/apt/apt_0.6.46.2.bb | 3 +++ packages/apt/files/environment.patch | 13 +++++++++++++ 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 packages/apt/files/environment.patch (limited to 'packages') diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc index 8bf2b56739..5a5d56930e 100644 --- a/packages/apt/apt-package.inc +++ b/packages/apt/apt-package.inc @@ -77,11 +77,18 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - #eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - #oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - #oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + install -d ${D}${libdir} + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so + eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index dbf5765205..283b80d662 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg." LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://environment.patch;patch=1" S = "${WORKDIR}/apt-${PV}" inherit autotools gettext @@ -12,4 +13,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" # Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use # Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4) # Koen - 20070327 -EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4" +EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" + diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb index 73285f37c3..24023f2a58 100644 --- a/packages/apt/apt_0.6.46.2.bb +++ b/packages/apt/apt_0.6.46.2.bb @@ -6,3 +6,6 @@ require apt-package.inc FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" + +PR = "r1" + diff --git a/packages/apt/files/environment.patch b/packages/apt/files/environment.patch new file mode 100644 index 0000000000..5bea1a0130 --- /dev/null +++ b/packages/apt/files/environment.patch @@ -0,0 +1,13 @@ +Index: apt-0.6.46.2/buildlib/environment.mak.in +=================================================================== +--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 ++++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 +@@ -62,7 +62,7 @@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else -- cgit v1.2.3 From e916916c968c82478b0d4f3b09e25a49405ae04a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:04:44 +0000 Subject: xserver-kdrive: drop devfs.patch, nobody uses it anymore. --- packages/xorg-xserver/xserver-kdrive/devfs.patch | 47 ------------------------ 1 file changed, 47 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive/devfs.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch deleted file mode 100644 index a6238126c0..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/devfs.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/linux/linux.c~devfs -+++ xserver/hw/kdrive/linux/linux.c -@@ -82,10 +82,10 @@ - vtno = kdVirtualTerminal; - else - { -- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) -+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) - { - FatalError( -- "LinuxInit: Cannot open /dev/tty0 (%s)\n", -+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", - strerror(errno)); - } - if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || -@@ -96,7 +96,7 @@ - } - close(fd); - -- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ -+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ - - if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) - { -@@ -113,7 +113,7 @@ - * - * Why is this needed? - */ -- LinuxCheckChown ("/dev/tty0"); -+ LinuxCheckChown ("/dev/vc/0"); - /* - * Linux doesn't switch to an active vt after the last close of a vt, - * so we do this ourselves by remembering which is active now. -@@ -453,7 +453,7 @@ - activeVT = -1; - } - close(LinuxConsoleFd); /* make the vt-manager happy */ -- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); -+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); - if (fd >= 0) - { - memset (&vts, '\0', sizeof (vts)); /* valgrind */ -- cgit v1.2.3 From fd6a046d64f69c38be873309680b16c656dbb1f0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:05:33 +0000 Subject: xserver-kdrive-1.2: simplify enable-tslib.patch --- .../xserver-kdrive-1.2.0/enable-tslib.patch | 25 ---------------------- 1 file changed, 25 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 615f27a7c1..9a59530ed3 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -1,28 +1,3 @@ -Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 -@@ -6,6 +6,10 @@ - - bin_PROGRAMS = Xfbdev - -+if TSLIB -+TSLIB_FLAG = -lts -+endif -+ - libfbdev_a_SOURCES = \ - fbdev.c \ - fbdev.h -@@ -16,7 +20,8 @@ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ \ -- @XSERVER_LIBS@ -+ @XSERVER_LIBS@ \ -+ $(TSLIB_FLAG) - - Xfbdev_DEPENDENCIES = \ - libfbdev.a Index: xorg-server-1.2.0/configure.ac =================================================================== --- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 -- cgit v1.2.3 From c8b71beba89a1d40d4b195df28f5e753a03f876c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:53:15 +0000 Subject: dates/openmoko-dates: mark libgtkdatesview.so as PRIVATE, make them conflict - both packages provide libgtkdatesview.so.0 which is not used outside of dates - both packages provide binaries of same names --- packages/openmoko-pim/openmoko-dates_svn.bb | 5 ++++- packages/pimlico/dates.inc | 3 +++ packages/pimlico/dates_0.3.1.bb | 2 +- packages/pimlico/dates_svn.bb | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index 346a8d03e1..cc5978f546 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,8 +3,10 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" +RCONFLICTS = "dates" +RREPLACES = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r6" +PR = "r7" inherit gnome autotools pkgconfig gtk-icon-cache @@ -23,3 +25,4 @@ do_install_append () { FILES_${PN} += "${datadir}/pixmaps/dates.png \ ${datadir}/dates/" +PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index fd640844ba..641ff60aea 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -3,6 +3,8 @@ LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" +RCONFLICTS = "openmoko-dates" +RREPLACES = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache @@ -15,3 +17,4 @@ do_install_append () { install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ } +PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 51d3acc9ed..731ca31289 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 474fdde27a..956eb3dc64 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,5 +1,7 @@ require dates.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" PV = "0.3.1+svn${SRCDATE}" -- cgit v1.2.3 From f136df84b633c76c600bb2b46637e189e5db176b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:55:13 +0000 Subject: acpid: use update-rc.d class --- packages/acpid/acpid.inc | 19 +++++-------------- packages/acpid/acpid_1.0.2.bb | 2 +- packages/acpid/acpid_1.0.3.bb | 2 +- packages/acpid/acpid_1.0.4.bb | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/acpid/acpid.inc b/packages/acpid/acpid.inc index c96f431224..69517a7681 100644 --- a/packages/acpid/acpid.inc +++ b/packages/acpid/acpid.inc @@ -5,6 +5,11 @@ LICENSE="GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ file://init" +inherit update-rc.d + +INITSCRIPT_NAME = "acpid" +INITSCRIPT_PARAMS = "defaults" + EXTRA_OEMAKE = "" do_compile () { oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' @@ -16,17 +21,3 @@ do_install () { cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid chmod 755 ${D}${sysconfdir}/init.d/acpid } - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid remove -} diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb index 1b48266a9c..2a305eeac4 100644 --- a/packages/acpid/acpid_1.0.2.bb +++ b/packages/acpid/acpid_1.0.2.bb @@ -1,3 +1,3 @@ require acpid.inc -PR = "r1" +PR = "r2" diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb index d67ea96875..640acd5203 100644 --- a/packages/acpid/acpid_1.0.3.bb +++ b/packages/acpid/acpid_1.0.3.bb @@ -1,4 +1,4 @@ require acpid.inc SRC_URI += "file://gcc40.patch;patch=1" -PR = "r1" +PR = "r2" diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb index d67ea96875..640acd5203 100644 --- a/packages/acpid/acpid_1.0.4.bb +++ b/packages/acpid/acpid_1.0.4.bb @@ -1,4 +1,4 @@ require acpid.inc SRC_URI += "file://gcc40.patch;patch=1" -PR = "r1" +PR = "r2" -- cgit v1.2.3 From 8bd9a586faa6891c04882a4f36043a3437b59194 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:56:28 +0000 Subject: aumix: added ncurses to dependencies --- packages/aumix/aumix_2.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/aumix/aumix_2.8.bb b/packages/aumix/aumix_2.8.bb index 3edd51ddd9..50f2cec07a 100644 --- a/packages/aumix/aumix_2.8.bb +++ b/packages/aumix/aumix_2.8.bb @@ -1,7 +1,7 @@ -DEPENDS = "ncurses" DESCRIPTION = "A mixer for the terminal or X11, with mouse support." SECTION = "console/multimedia" LICENSE = "GPLV2" +DEPENDS = "ncurses" SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \ file://configure.patch;patch=1" -- cgit v1.2.3 From 4a78a42b65821710892c27dc20a821e35e95eb1e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:00:10 +0000 Subject: edje-native: fix staging --- packages/efl/edje-native_0.5.0.037.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index 1dc5c1de10..2b8c43644a 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -12,7 +12,7 @@ do_configure_prepend() { sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } -do_stage_append() { +do_install_append() { edje_data_dir=`edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include -- cgit v1.2.3 From d1406ee2bd3dcb5136d2d96daefd1e93505eaac6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:00:20 +0000 Subject: libx11-1.1.1: makekeys.diff is applied upstream --- packages/xorg-lib/libx11_1.1.1.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 88225a8eb7..07e0286a13 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -2,7 +2,6 @@ require xorg-lib-common.inc PE = "1" DESCRIPTION = "Base X libs." -SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxcb libxdmcp xf86bigfontproto kbproto inputproto" -- cgit v1.2.3 From 02e60d26770c6c1007f2f63944020d72422654c9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:02:23 +0000 Subject: gpe-mini-browser: do not comment code but remove it. we have SCM --- packages/gpe-mini-browser/gpe-mini-browser_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index 67c16862e8..30d9d83a49 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -50,4 +50,4 @@ pkg_postrm_${PN}-doc () { require gpe-mini-browser.inc -DEFAULT_PREFERENCE = "-1" +#DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 4fa85ceb0d08112ed4dcdb10b9e54310735cf70a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:03:21 +0000 Subject: gst-plugins-good: depend on gst-plugins-base (from Poky) --- packages/gstreamer/gst-plugins-good_0.10.5.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/gstreamer/gst-plugins-good_0.10.5.bb (limited to 'packages') diff --git a/packages/gstreamer/gst-plugins-good_0.10.5.bb b/packages/gstreamer/gst-plugins-good_0.10.5.bb new file mode 100644 index 0000000000..42f6df4d9d --- /dev/null +++ b/packages/gstreamer/gst-plugins-good_0.10.5.bb @@ -0,0 +1,4 @@ +require gst-plugins.inc + +DEPENDS += "gst-plugins-base" +PR = "r2" -- cgit v1.2.3 From 9bcd8283bdebc7cf75a7b1ff456a44745d3e325b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:04:36 +0000 Subject: hostap-daemon: do not depend on hostap-modules as they are 2.4 only now --- packages/hostap/hostap-daemon.inc | 2 +- packages/hostap/hostap-daemon_0.3.7.bb | 2 +- packages/hostap/hostap-daemon_0.4.4.bb | 2 +- packages/hostap/hostap-daemon_0.4.8.bb | 2 ++ packages/hostap/hostap-daemon_0.5.1.bb | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc index 08a6dba1f7..f723d07575 100644 --- a/packages/hostap/hostap-daemon.inc +++ b/packages/hostap/hostap-daemon.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "hostap-modules hostap-utils (${PV})" +RDEPENDS = "hostap-utils (${PV})" DEPENDS = "openssl" DEPENDS_append_mtx-1 = " madwifi-modules" DEPENDS_append_mtx-2 = " madwifi-modules" diff --git a/packages/hostap/hostap-daemon_0.3.7.bb b/packages/hostap/hostap-daemon_0.3.7.bb index a211dd0759..bece7d1450 100644 --- a/packages/hostap/hostap-daemon_0.3.7.bb +++ b/packages/hostap/hostap-daemon_0.3.7.bb @@ -1,3 +1,3 @@ require hostap-daemon.inc -PR = "r1" +PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb index a211dd0759..bece7d1450 100644 --- a/packages/hostap/hostap-daemon_0.4.4.bb +++ b/packages/hostap/hostap-daemon_0.4.4.bb @@ -1,3 +1,3 @@ require hostap-daemon.inc -PR = "r1" +PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.4.8.bb b/packages/hostap/hostap-daemon_0.4.8.bb index 4ef749c407..de3abdbea5 100644 --- a/packages/hostap/hostap-daemon_0.4.8.bb +++ b/packages/hostap/hostap-daemon_0.4.8.bb @@ -1,3 +1,5 @@ require hostap-daemon.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb index 4ef749c407..de3abdbea5 100644 --- a/packages/hostap/hostap-daemon_0.5.1.bb +++ b/packages/hostap/hostap-daemon_0.5.1.bb @@ -1,3 +1,5 @@ require hostap-daemon.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 77a94fcb3c7df953ae60f0d972550299825b823f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 29 Mar 2007 13:06:27 +0000 Subject: picocom: fix building - close #1972 --- packages/picocom/picocom_1.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/picocom/picocom_1.4.bb b/packages/picocom/picocom_1.4.bb index 8bc3b89e8c..c13bdabcc3 100644 --- a/packages/picocom/picocom_1.4.bb +++ b/packages/picocom/picocom_1.4.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Lightweight and minimal (~20K) dumb-terminal emulation program." SECTION = "console/utils" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz \ + file://nolock.patch;patch=1 \ file://gcc4.patch;patch=1" -CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR' +CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\"' do_install () { install -d ${D}${bindir} -- cgit v1.2.3 From dd582206fe052dbdabdb617ea803f0c47ea2fdea Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:07:27 +0000 Subject: starling: fixed dependencies - close #2055 --- packages/starling/starling_0.1.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb index 2dc8da8bc1..fab79342ac 100644 --- a/packages/starling/starling_0.1.bb +++ b/packages/starling/starling_0.1.bb @@ -6,19 +6,16 @@ PR = "r1" inherit gpe autotools DESCRIPTION = "Starling audio player for GPE" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ gst-plugin-audioconvert \ - gst-plugin-audiofile \ gst-plugin-esd \ gst-plugin-typefindfunctions \ gst-plugin-decodebin \ gst-plugin-volume" RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit \ + gst-plugin-modplug \ gst-plugin-ivorbis \ gst-plugin-tcp" -- cgit v1.2.3 From 422076569aeb070ddd92af6650231aeadf75b159 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:08:43 +0000 Subject: uucp: package /usr/spool/uucp/ (empty) for cu --- packages/uucp/uucp_1.07.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/uucp/uucp_1.07.bb b/packages/uucp/uucp_1.07.bb index 948f251e70..7247ecbabe 100644 --- a/packages/uucp/uucp_1.07.bb +++ b/packages/uucp/uucp_1.07.bb @@ -1,6 +1,7 @@ DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection." LICENSE = "GPLv2" SECTION = "console" +PR = "r1" inherit autotools @@ -11,6 +12,9 @@ do_configure() { oe_runconf } +do_install_append() { + fakeroot install -d -g uucp -o uucp ${D}/usr/spool/uucp +} PACKAGES =+ "cu" -FILES_cu = "${bindir}/cu" +FILES_cu = "${bindir}/cu /usr/spool" -- cgit v1.2.3 From 15617c12e48574db3a7c6bb9816c51d98d18ea3c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:47:39 +0000 Subject: gsmd: remove unneeded stty call from init script --- packages/gsm/files/gsmd | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 254fe0a451..4b8db5d5a5 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -48,7 +48,6 @@ start() { # if [ -e "${GSM_DEV}" ] then - stty -F ${GSM_DEV} crtscts gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & echo "success" else -- cgit v1.2.3 From bed68c5e384d4990dd53489e68e2f40a506355b5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:49:14 +0000 Subject: linux-handhelds-2.6: update hx4700 defconfig for 2.6.20 --- .../linux/linux-handhelds-2.6/hx4700/defconfig | 67 +++++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 8914f07dbb..3a0d50e096 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -153,6 +153,10 @@ CONFIG_HX4700_BLUETOOTH=y CONFIG_HX4700_PCMCIA=y CONFIG_HX4700_LCD=y CONFIG_HX4700_LEDS=y +CONFIG_HX4700_BATTERY=m +CONFIG_HX4700_POWER=y +CONFIG_HX4700_UDC=y +CONFIG_HX4700_SERIAL=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set @@ -166,17 +170,18 @@ CONFIG_HX4700_LEDS=y # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y CONFIG_IWMMXT=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set +CONFIG_PXA27x_VOLTAGE=m +CONFIG_PXA27x_VOLTAGE_MAX158xx=m # # Linux As Bootloader @@ -386,24 +391,12 @@ CONFIG_BRIDGE_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_SIP is not set # CONFIG_IP_NF_QUEUE is not set # @@ -567,6 +560,7 @@ CONFIG_MTD_PARTITIONS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -909,7 +903,7 @@ CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_GPIO_KEYS=y -# CONFIG_KEYBOARD_ASIC3 is not set +CONFIG_KEYBOARD_ASIC3=y # CONFIG_KEYBOARD_PXA27x is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set @@ -954,6 +948,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y @@ -1052,7 +1047,22 @@ CONFIG_I2C_PXA=m # # Dallas's 1-wire bus # -# CONFIG_W1 is not set +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_DS1WM is not set + +# +# 1-wire Slaves +# +# CONFIG_W1_SLAVE_THERM is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2433 is not set +CONFIG_W1_DS2760=m # # Hardware Monitoring support @@ -1097,12 +1107,18 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set +# +# Hardware Monitoring - Battery +# CONFIG_BATTERY_MONITOR=y +CONFIG_DS2760_BATTERY=m +CONFIG_ADC_BATTERY=m +CONFIG_APM_POWER=y # # L3 serial bus support # -CONFIG_L3=m +# CONFIG_L3 is not set # # SoC drivers @@ -1115,6 +1131,7 @@ CONFIG_L3=m # CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +CONFIG_HTC_ASIC3_DS1WM=y # CONFIG_SOC_TSC2101 is not set # CONFIG_SOC_TSC2200 is not set @@ -1126,7 +1143,8 @@ CONFIG_HTC_ASIC3=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set -# CONFIG_ADC_ADS7846_SSP is not set +CONFIG_ADC_ADS7846_SSP=y +# CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set # @@ -1145,7 +1163,7 @@ CONFIG_LEDS_ASIC3=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y @@ -1316,6 +1334,11 @@ CONFIG_SND_AK4641=m # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +CONFIG_HID=y + # # USB support # @@ -1475,6 +1498,7 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set @@ -1620,7 +1644,6 @@ CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y -- cgit v1.2.3 From b190552075365aec7aa70f007355f80a0d7ffe00 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:50:13 +0000 Subject: linux-handhelds-2.6: update magician defconfig for 2.6.20 --- .../linux/linux-handhelds-2.6/magician/defconfig | 83 +++++++++++++++------- 1 file changed, 57 insertions(+), 26 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 112a49f206..55ce78a331 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-hh7 -# Tue Jan 9 15:26:27 2007 +# Linux kernel version: 2.6.20-hh3 +# Sun Mar 25 13:00:41 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -11,6 +11,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y @@ -40,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -79,7 +82,9 @@ CONFIG_KMOD=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 @@ -113,6 +118,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set @@ -153,28 +159,27 @@ CONFIG_MAGICIAN_PM=y CONFIG_MAGICIAN_TS=m CONFIG_MAGICIAN_LCD=y CONFIG_MAGICIAN_CPLD=y -CONFIG_MAGICIAN_DS1WM=m +CONFIG_MAGICIAN_DS1WM=y CONFIG_MAGICIAN_PHONE=m CONFIG_MAGICIAN_FLASH=m # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y -CONFIG_IWMMXT=y CONFIG_PXA_SSP=m CONFIG_PXA_SUSPEND_SAVE_EXTRA_REGS=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -198,13 +203,10 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y CONFIG_XSCALE_PMU=y # CONFIG_KEXEC is not set -# -# Compaq/iPAQ Platforms -# - # # Compaq/iPAQ Drivers # @@ -279,6 +281,7 @@ CONFIG_BINFMT_ELF=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set +# CONFIG_DPM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_APM=y @@ -321,6 +324,7 @@ CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set @@ -447,7 +451,8 @@ CONFIG_FW_LOADER=y # # Connector - unified userspace <-> kernelspace linker # -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y # # Memory Technology Devices (MTD) @@ -464,6 +469,7 @@ CONFIG_MTD_PARTITIONS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set @@ -690,6 +696,9 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=m +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -719,7 +728,9 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_PXA=y # CONFIG_SERIAL_PXA_CONSOLE is not set CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y +# CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -737,10 +748,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# # CONFIG_RAW_DRIVER is not set # @@ -797,7 +804,7 @@ CONFIG_I2C_PXA=y # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y CONFIG_W1_CON=y # @@ -805,7 +812,7 @@ CONFIG_W1_CON=y # # CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set -CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_DS1WM=y # # 1-wire Slaves @@ -813,7 +820,7 @@ CONFIG_W1_MASTER_DS1WM=m # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set # CONFIG_W1_SLAVE_DS2433 is not set -CONFIG_W1_DS2760=m +CONFIG_W1_DS2760=y # # Hardware Monitoring support @@ -847,6 +854,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set @@ -854,6 +862,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83791D is not set # CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set @@ -863,7 +872,10 @@ CONFIG_HWMON=y # Hardware Monitoring - Battery # CONFIG_BATTERY_MONITOR=y -CONFIG_MAGICIAN_BATTERY=m +CONFIG_MAGICIAN_BATTERY=y +CONFIG_DS2760_BATTERY=y +# CONFIG_ADC_BATTERY is not set +CONFIG_APM_POWER=y # # L3 serial bus support @@ -893,7 +905,8 @@ CONFIG_MAGICIAN_BATTERY=m # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set -# CONFIG_ADC_ADS7846_SSP is not set +CONFIG_ADC_ADS7846_SSP=m +# CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set # @@ -912,6 +925,7 @@ CONFIG_LEDS_MAGICIAN=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m +# CONFIG_LEDS_TRIGGER_HWTIMER is not set CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_SHARED is not set @@ -988,8 +1002,10 @@ CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y @@ -1007,8 +1023,8 @@ CONFIG_SND_VERBOSE_PROCFS=y # # ALSA ARM devices # -# CONFIG_SND_HTCMAGICIAN is not set # CONFIG_SND_PXA2XX_AC97 is not set +# CONFIG_SND_RECON is not set # # USB devices @@ -1032,6 +1048,7 @@ CONFIG_SND_PXA2xx_SOC_I2S=m CONFIG_SND_PXA2xx_SOC_SSP=m CONFIG_SND_PXA2xx_SOC_MAGICIAN=m # CONFIG_SND_PXA2xx_SOC_BLUEANGEL is not set +# CONFIG_SND_PXA2xx_SOC_H5000 is not set # # SoC Audio for the Atmel AT91 @@ -1057,6 +1074,7 @@ CONFIG_SND_PXA2xx_SOC_MAGICIAN=m # CONFIG_SND_SOC_WM8772 is not set # CONFIG_SND_SOC_WM8971 is not set # CONFIG_SND_SOC_WM8956 is not set +# CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8976 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8980 is not set @@ -1070,6 +1088,11 @@ CONFIG_SND_SOC_UDA1380=m # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +CONFIG_HID=y + # # USB support # @@ -1327,7 +1350,6 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set @@ -1424,6 +1446,11 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -1437,6 +1464,8 @@ CONFIG_OPROFILE=m CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y @@ -1453,15 +1482,12 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y -# CONFIG_HEADERS_CHECK is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set @@ -1481,6 +1507,7 @@ CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -1489,8 +1516,10 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -1515,6 +1544,7 @@ CONFIG_CRYPTO_TEST=m # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y @@ -1522,3 +1552,4 @@ CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y -- cgit v1.2.3 From 80d223793ae8656412c94857336538b1b255ed33 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:51:18 +0000 Subject: puzzles: add libxt dependency --- packages/puzzles/puzzles_r6915.bb | 47 --------------------------------------- packages/puzzles/puzzles_r7387.bb | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 packages/puzzles/puzzles_r6915.bb create mode 100644 packages/puzzles/puzzles_r7387.bb (limited to 'packages') diff --git a/packages/puzzles/puzzles_r6915.bb b/packages/puzzles/puzzles_r6915.bb deleted file mode 100644 index 4349a4154b..0000000000 --- a/packages/puzzles/puzzles_r6915.bb +++ /dev/null @@ -1,47 +0,0 @@ - -DEPENDS = "gtk+" -PR = "r2" - -SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ - file://game.png" - -do_compile_prepend = " \ - export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ - export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " - -FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" -FILES_${PN}-dbg += "${prefix}/games/.debug" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - install -d ${D}/${prefix}/ - install -d ${D}/${prefix}/games/ - oe_runmake install - - install -d ${D}/${datadir}/ - install -d ${D}/${datadir}/applications/ - install -d ${D}/${datadir}/pixmaps/ - - install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ - - cd ${D}/${prefix}/games - for prog in *; do - if [ -x $prog ]; then - echo "making ${D}/${datadir}/applications/$prog.desktop" - cat < ${D}/${datadir}/applications/$prog.desktop -[Desktop Entry] -Encoding=UTF-8 -Name=$prog -Exec=${prefix}/games/$prog -Icon=game.png -Terminal=false -Type=Application -Categories=Game -StartupNotify=true -SingleInstance=true -STOP - fi - done -} diff --git a/packages/puzzles/puzzles_r7387.bb b/packages/puzzles/puzzles_r7387.bb new file mode 100644 index 0000000000..9b3b3842c7 --- /dev/null +++ b/packages/puzzles/puzzles_r7387.bb @@ -0,0 +1,47 @@ + +DEPENDS = "gtk+ libxt" +PR = "r2" + +SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ + file://game.png" + +do_compile_prepend = " \ + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " + +FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" +FILES_${PN}-dbg += "${prefix}/games/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + install -d ${D}/${prefix}/ + install -d ${D}/${prefix}/games/ + oe_runmake install + + install -d ${D}/${datadir}/ + install -d ${D}/${datadir}/applications/ + install -d ${D}/${datadir}/pixmaps/ + + install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ + + cd ${D}/${prefix}/games + for prog in *; do + if [ -x $prog ]; then + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat < ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Encoding=UTF-8 +Name=$prog +Exec=${prefix}/games/$prog +Icon=game.png +Terminal=false +Type=Application +Categories=Game +StartupNotify=true +SingleInstance=true +STOP + fi + done +} -- cgit v1.2.3 From c8bf57cbfc56f4d5de1f5ff4e448824a657ba1dd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:59:24 +0000 Subject: gimp: fix debug packaging --- packages/gimp/gimp_2.3.10.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index eec0be6fd8..a1e875be89 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -11,6 +11,9 @@ SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ inherit autotools pkgconfig +FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \ + ${libdir}/gimp/2.0/plug-ins/.debug" + #Don't laugh, this just builds a threaded gimp EXTRA_OECONF = " --disable-gtktest \ --disable-print \ -- cgit v1.2.3 From 48bb4a727af559b6174c090ab89a958bff80cb42 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:03:53 +0000 Subject: libgsmd: add TI/HTC GSM chipset support and ldisc switching support for magician - this is a temporary measure and will be reverted once machine plugin support is in place --- packages/gsm/files/magician/ldisc.patch | 66 +++++ packages/gsm/files/magician/vendor-tihtc.patch | 325 +++++++++++++++++++++++++ packages/gsm/libgsmd_svn.bb | 3 + 3 files changed, 394 insertions(+) create mode 100644 packages/gsm/files/magician/ldisc.patch create mode 100644 packages/gsm/files/magician/vendor-tihtc.patch (limited to 'packages') diff --git a/packages/gsm/files/magician/ldisc.patch b/packages/gsm/files/magician/ldisc.patch new file mode 100644 index 0000000000..30d4a8812a --- /dev/null +++ b/packages/gsm/files/magician/ldisc.patch @@ -0,0 +1,66 @@ +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-29 15:29:31.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-29 15:33:07.000000000 +0200 +@@ -32,6 +32,7 @@ + #define _GNU_SOURCE + #include + ++#include + #include + #include + +@@ -150,6 +151,7 @@ + { "speed", 1, NULL, 's' }, + { "logfile", 1, NULL, 'l' }, + { "hwflow", 0, NULL, 'F' }, ++ { "ldisc", 1, NULL, 'D' }, + { "leak-report", 0, NULL, 'L' }, + { 0, 0, 0, 0 } + }; +@@ -165,6 +167,7 @@ + "\t-p dev\t--device dev\tSpecify serial device to be used\n" + "\t-s spd\t--speed spd\tSpecify speed in bps (9600,38400,115200,...)\n" + "\t-F\t--hwflow\tHardware Flow Control (RTS/CTS)\n" ++ "\t-D\t--ldisc num\tSet line discipline (0=N_TTY,...)\n" + "\t-L\t--leak-report\tLeak Report of talloc memory allocator\n" + "\t-l file\t--logfile file\tSpecify a logfile to log to\n" + ); +@@ -191,6 +194,7 @@ + int daemonize = 0; + int bps = 115200; + int hwflow = 0; ++ int ldisc = 0; + char *device = "/dev/ttyUSB0"; + char *logfile = "syslog"; + +@@ -202,7 +206,7 @@ + gsmd_tallocs = talloc_named_const(NULL, 1, "GSMD"); + + /*FIXME: parse commandline, set daemonize, device, ... */ +- while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:", opts, NULL)) != -1) { ++ while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:D:", opts, NULL)) != -1) { + switch (argch) { + case 'V': + /* FIXME */ +@@ -232,6 +236,8 @@ + fprintf(stderr, "can't open logfile `%s'\n", optarg); + exit(2); + } ++ case 'D': ++ ldisc = atoi(optarg); + break; + } + } +@@ -249,6 +255,11 @@ + exit(1); + } + ++ if (ldisc && ioctl(fd, TIOCSETD, &ldisc) < 0) { ++ fprintf(stderr, "can't set line discipline\n"); ++ exit(1); ++ } ++ + if (gsmd_initialize(&g) < 0) { + fprintf(stderr, "internal error\n"); + exit(1); diff --git a/packages/gsm/files/magician/vendor-tihtc.patch b/packages/gsm/files/magician/vendor-tihtc.patch new file mode 100644 index 0000000000..a2f22ffbea --- /dev/null +++ b/packages/gsm/files/magician/vendor-tihtc.patch @@ -0,0 +1,325 @@ +Index: gsm/src/gsmd/vendor_tihtc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/vendor_tihtc.c 2007-03-27 13:12:05.000000000 +0200 +@@ -0,0 +1,294 @@ ++/* TI [Calypso] with HTC firmware gsmd plugin ++ * ++ * Written by Philipp Zabel ++ * based on vendor_ti.c ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#if 0 ++#include "vendorplugin.h" ++ ++static int ++ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen) ++{ ++ switch (optname) { ++ case GSMD_OPT_CIPHER_IND: ++ /* FIXME: send AT%CPRI=? */ ++ break; ++ default: ++ return -EINVAL; ++ } ++} ++ ++static int ++ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen) ++{ ++ switch (optname) { ++ case GSMD_OPT_CIPHER_IND: ++ /* FIXME: send AT%CPRI= */ ++ break; ++ default: ++ return -EINVAL; ++ } ++} ++ ++#endif ++ ++ ++static int htccsq_parse(char *buf, int len, const char *param, ++ struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, ++ sizeof(*aux)); ++ ++ DEBUGP("entering htccsq_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ /* FIXME: contains values 1-5, should be mapped to 0-31 somehow? */ ++ /* 2 --> 11 */ ++ aux->u.signal.sigq.rssi = atoi(buf); ++ aux->u.signal.sigq.ber = 99; ++ ++ DEBUGP("sending EVT_SIGNAL\n"); ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); ++ ++ return 0; ++ ++out_free_io: ++ free(ucmd); ++ return -EIO; ++} ++ ++static int cpri_parse(char *buf, int len, const char *param, struct gsmd *gsmd) ++{ ++ char *tok1, *tok2; ++ ++ tok1 = strtok(buf, ","); ++ if (!tok1) ++ return -EIO; ++ ++ tok2 = strtok(NULL, ","); ++ if (!tok2) { ++ switch (atoi(tok1)) { ++ case 0: ++ gsmd->dev_state.ciph_ind.flags &= ~GSMD_CIPHIND_ACTIVE; ++ break; ++ case 1: ++ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_ACTIVE; ++ break; ++ case 2: ++ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_DISABLED_SIM; ++ break; ++ } ++ } else { ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, ++ GSMD_EVT_CIPHER, ++ sizeof(*aux)); ++ if (!ucmd) ++ return -ENOMEM; ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ aux->u.cipher.net_state_gsm = atoi(tok1); ++ aux->u.cipher.net_state_gsm = atoi(tok2); ++ ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_CIPHER); ++ } ++ ++ return 0; ++} ++ ++/* Call Progress Information */ ++static int cpi_parse(char *buf, int len, const char *param, struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, ++ GSMD_EVT_OUT_STATUS, ++ sizeof(*aux)); ++ ++ DEBUGP("entering cpi_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ /* Format: cId, msgType, ibt, tch, dir,[mode],[number],[type],[alpha],[cause],line */ ++ ++ /* call ID */ ++ tok = strtok(buf, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ /* message type (layer 3) */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ aux->u.call_status.prog = atoi(tok); ++ ++ /* in-band tones */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ if (*tok == '1') ++ aux->u.call_status.ibt = 1; ++ else ++ aux->u.call_status.ibt = 0; ++ ++ /* TCH allocated */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ if (*tok == '1') ++ aux->u.call_status.tch = 1; ++ else ++ aux->u.call_status.tch = 0; ++ ++ /* direction */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_send; ++ ++ switch (*tok) { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ aux->u.call_status.dir = (*tok - '0'); ++ break; ++ default: ++ break; ++ } ++ ++ /* mode */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_send; ++ ++out_send: ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_OUT_STATUS); ++ ++ return 0; ++ ++out_free_io: ++ talloc_free(ucmd); ++ return -EIO; ++} ++ ++static const struct gsmd_unsolicit tihtc_unsolicit[] = { ++ { "%HTCCSQ", &htccsq_parse }, /* Signal Quality */ ++ { "%CPRI", &cpri_parse }, /* Ciphering Indication */ ++ { "%CPI", &cpi_parse }, /* Call Progress Information */ ++ ++ /* FIXME: parse the below and generate the respective events */ ++ ++ /* %CGREG: reports extended information about GPRS registration state */ ++}; ++ ++static int cpi_detect_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) ++{ ++ struct gsmd *g = ctx; ++ struct gsm_extrsp *er; ++ ++ if (strncmp(resp, "%CPI: ", 6)) ++ return -EINVAL; ++ resp += 6; ++ ++ er = extrsp_parse(cmd, resp); ++ if (!er) ++ return -EINVAL; ++ ++ if (extrsp_supports(er, 0, 3)) ++ return gsmd_simplecmd(g, "AT%CPI=3"); ++ else if (extrsp_supports(er, 0, 2)) ++ return gsmd_simplecmd(g, "AT%CPI=2"); ++ else ++ DEBUGP("Call Progress Indication mode 2 or 3 not supported!!\n"); ++ ++ talloc_free(er); ++ return 0; ++} ++ ++static int tihtc_detect(struct gsmd *g) ++{ ++ /* FIXME: do actual detection of vendor if we have multiple vendors */ ++ /* open /proc/cpuinfo and check for HTC Magician or HTC Blueangel? */ ++ /* check for N_TIHTC ldisc? or set it ourselves? */ ++ return 1; ++} ++ ++static int tihtc_initsettings(struct gsmd *g) ++{ ++ int rc; ++ struct gsmd_atcmd *cmd; ++ ++ /* use %CGREG */ ++ //rc |= gsmd_simplecmd(g, "AT%CGREG=3"); ++ /* enable %CPRI: ciphering indications */ ++ rc |= gsmd_simplecmd(g, "AT%CPRI=1"); ++ /* enable %HTCCSQ: signal quality reports */ ++ rc |= gsmd_simplecmd(g, "AT%HTCCSQ=1"); ++ /* send unsolicited commands at any time */ ++ rc |= gsmd_simplecmd(g, "AT%CUNS=0"); ++ ++ /* enable %CPI: call progress indication */ ++ cmd = atcmd_fill("AT%CPI=?", 9, &cpi_detect_cb, g, 0); ++ if (cmd) ++ atcmd_submit(g, cmd); ++ ++ return rc; ++} ++ ++static struct gsmd_vendor_plugin plugin_tihtc = { ++ .name = "TI Calypso / HTC firmware", ++ .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit), ++ .unsolicit = tihtc_unsolicit, ++ .detect = &tihtc_detect, ++ .initsettings = &tihtc_initsettings, ++}; ++ ++/* FIXME: this will be _init() when we make this a plugin */ ++int tihtc_init(void) ++{ ++ return gsmd_vendor_plugin_register(&plugin_tihtc); ++} +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-27 13:07:59.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-27 13:08:08.000000000 +0200 +@@ -276,7 +276,7 @@ + } + + /* FIXME: do this dynamically */ +- ticalypso_init(); ++ tihtc_init(); + + gsmd_vendor_plugin_find(&g); + +Index: gsm/src/gsmd/Makefile.am +=================================================================== +--- gsm.orig/src/gsmd/Makefile.am 2007-03-27 13:09:11.000000000 +0200 ++++ gsm/src/gsmd/Makefile.am 2007-03-27 13:09:20.000000000 +0200 +@@ -4,7 +4,7 @@ + sbin_PROGRAMS = gsmd + + gsmd_SOURCES = gsmd.c atcmd.c select.c vendor.c usock.c unsolicited.c log.c \ +- vendor_ti.c talloc.c operator_cache.c ext_response.c ++ vendor_ti.c vendor_tihtc.c talloc.c operator_cache.c ext_response.c + #gsmd_LDADD = ../libgsmd/libgsmd.la + #gsmd_LDFLAGS = -dynamic + diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 734624b3ff..d84d363f1a 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -11,6 +11,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://default" S = "${WORKDIR}/gsm" +SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ + file://ldisc.patch;patch=1" + inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "gsmd" -- cgit v1.2.3 From 0b25d92b900c10d66740b5cd37d000d2fcafc356 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 14:16:00 +0000 Subject: sapwood: fixed packaging, recreated patch --- packages/sapwood/sapwood/sockets.patch | 75 +++++++--------------------------- packages/sapwood/sapwood_svn.bb | 7 ++-- 2 files changed, 18 insertions(+), 64 deletions(-) (limited to 'packages') diff --git a/packages/sapwood/sapwood/sockets.patch b/packages/sapwood/sapwood/sockets.patch index 1568206e2a..4e3a8e2d41 100644 --- a/packages/sapwood/sapwood/sockets.patch +++ b/packages/sapwood/sapwood/sockets.patch @@ -1,9 +1,12 @@ ---- configure.in.old 2005-06-10 17:04:52.000000000 +0200 -+++ configure.in 2005-06-10 17:20:47.000000000 +0200 -@@ -13,61 +13,61 @@ +Index: sapwood/configure.in +=================================================================== +--- sapwood.orig/configure.in 2007-03-29 16:04:12.000000000 +0200 ++++ sapwood/configure.in 2007-03-29 16:04:15.000000000 +0200 +@@ -13,63 +13,6 @@ + AC_PROG_INSTALL AC_PROG_MAKE_SET - dnl abstract sockets namespace checks, from dbus +-dnl abstract sockets namespace checks, from dbus -AC_ARG_ENABLE(abstract-sockets, - [AC_HELP_STRING([--enable-abstract-sockets], - [use abstract socket namespace (linux only)])], @@ -13,21 +16,12 @@ -AC_MSG_CHECKING(abstract socket namespace) -AC_RUN_IFELSE([AC_LANG_PROGRAM( -[[ -+#AC_ARG_ENABLE(abstract-sockets, -+# [AC_HELP_STRING([--enable-abstract-sockets], -+# [use abstract socket namespace (linux only)])], -+# [enable_abstract_sockets=$enableval], -+# [enable_abstract_sockets=no]) -+# -+#AC_MSG_CHECKING(abstract socket namespace) -+#AC_RUN_IFELSE([AC_LANG_PROGRAM( -+#[[ - #include - #include - #include - #include - #include - #include +-#include +-#include +-#include +-#include +-#include +-#include -]], -[[ - int listen_fd; @@ -68,46 +62,7 @@ -if test x$enable_abstract_sockets = xno; then - have_abstract_sockets=no -fi -+#]], -+#[[ -+# int listen_fd; -+# struct sockaddr_un addr; -+# -+# listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -+ -+# if (listen_fd < 0) -+# { -+# fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -+# exit (1); -+# } -+# -+# memset (&addr, '\0', sizeof (addr)); -+# addr.sun_family = AF_UNIX; -+# strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test"); -+# addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -+# -+# if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -+# { -+# fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -+# strerror (errno)); -+# exit (1); -+# } -+# else -+# exit (0); -+#]])], -+# [have_abstract_sockets=no], -+# [have_abstract_sockets=no]) -+#AC_MSG_RESULT($have_abstract_sockets) -+ -+#if test x$enable_abstract_sockets = xyes; then -+# if test x$have_abstract_sockets = xno; then -+# AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) -+# fi -+#fi -+ -+#if test x$enable_abstract_sockets = xno; then -+have_abstract_sockets=no -+#fi - +- if test x$have_abstract_sockets = xyes; then AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) + fi diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb index 9651ff3916..39ccacb6f6 100644 --- a/packages/sapwood/sapwood_svn.bb +++ b/packages/sapwood/sapwood_svn.bb @@ -1,9 +1,8 @@ DESCRIPTION = "GTK theme engine Sapwood" LICENSE = "LGPL" - DEPENDS = "gtk+" - PV = "2.43+svn${SRCDATE}" +PR = "r1" SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \ file://sockets.patch;patch=1 \ @@ -20,5 +19,5 @@ do_install_append () { install -m755 ${S}/debian/sapwood-server.sh ${D}${sysconfdir}/osso-af-init/sapwood-server.sh } -FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/engines/" - +FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libsapwood.so" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug/libsapwood.so" -- cgit v1.2.3 From eb367035f82d95592a20b7c6c2aa73cbfd40394f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:17:12 +0000 Subject: magician: add N_TIHTC to handhelds-linux-2.6 defconfig and machine.conf --- packages/linux/linux-handhelds-2.6/magician/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 55ce78a331..d542ccef14 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -748,6 +748,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set +CONFIG_TIHTC=m # CONFIG_RAW_DRIVER is not set # -- cgit v1.2.3 From effaa4e341e06db4d82ad45c999a20d895b63cdd Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 14:50:11 +0000 Subject: libgpewidget: Add 0.115 --- packages/libgpewidget/libgpewidget_0.115.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/libgpewidget/libgpewidget_0.115.bb (limited to 'packages') diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb new file mode 100644 index 0000000000..f679296c71 --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.115.bb @@ -0,0 +1,22 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools + +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" + +PACKAGES =+ "libgpewidget-bin" +FILES_libgpewidget-bin = "${bindir}/*" + +EXTRA_OECONF = "--enable-cairo" + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From 677e68b5c84389537e803c035b658dd18e845c45 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 14:58:04 +0000 Subject: php: dropped 4.3.6/4.3.10 --- packages/php/php-native_4.3.10.bb | 5 ----- packages/php/php-native_4.3.6.bb | 5 ----- packages/php/php_4.3.10.bb | 1 - packages/php/php_4.3.6.bb | 1 - 4 files changed, 12 deletions(-) delete mode 100644 packages/php/php-native_4.3.10.bb delete mode 100644 packages/php/php-native_4.3.6.bb delete mode 100644 packages/php/php_4.3.10.bb delete mode 100644 packages/php/php_4.3.6.bb (limited to 'packages') diff --git a/packages/php/php-native_4.3.10.bb b/packages/php/php-native_4.3.10.bb deleted file mode 100644 index c90aa83c01..0000000000 --- a/packages/php/php-native_4.3.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit native -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native" diff --git a/packages/php/php-native_4.3.6.bb b/packages/php/php-native_4.3.6.bb deleted file mode 100644 index c90aa83c01..0000000000 --- a/packages/php/php-native_4.3.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit native -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native" diff --git a/packages/php/php_4.3.10.bb b/packages/php/php_4.3.10.bb deleted file mode 100644 index c15a9ee486..0000000000 --- a/packages/php/php_4.3.10.bb +++ /dev/null @@ -1 +0,0 @@ -require php.inc diff --git a/packages/php/php_4.3.6.bb b/packages/php/php_4.3.6.bb deleted file mode 100644 index c15a9ee486..0000000000 --- a/packages/php/php_4.3.6.bb +++ /dev/null @@ -1 +0,0 @@ -require php.inc -- cgit v1.2.3 From 036c369555a1f576bb9ebf4bbe960427221bb563 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 15:33:02 +0000 Subject: libgsmd: gsmd/magician: add patch to wait for the interpreter to be ready before sending --- .../gsm/files/magician/interpreter-ready.patch | 47 ++++++++++++++++++++++ packages/gsm/libgsmd_svn.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 packages/gsm/files/magician/interpreter-ready.patch (limited to 'packages') diff --git a/packages/gsm/files/magician/interpreter-ready.patch b/packages/gsm/files/magician/interpreter-ready.patch new file mode 100644 index 0000000000..cc6b9c6e2b --- /dev/null +++ b/packages/gsm/files/magician/interpreter-ready.patch @@ -0,0 +1,47 @@ +Index: gsm/include/gsmd/gsmd.h +=================================================================== +--- gsm.orig/include/gsmd/gsmd.h 2007-03-29 17:07:10.000000000 +0200 ++++ gsm/include/gsmd/gsmd.h 2007-03-29 17:07:43.000000000 +0200 +@@ -58,6 +58,7 @@ + + struct gsmd { + unsigned int flags; ++ int interpreter_ready; + struct gsmd_fd gfd_uart; + struct gsmd_fd gfd_sock; + struct llparser llp; +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-03-29 17:06:01.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-03-29 17:08:27.000000000 +0200 +@@ -183,6 +183,7 @@ + * an empty string or that 'ready' string, we need to init the modem */ + if (strlen(buf) == 0 || + !strcmp(buf, "AT-Command Interpreter ready")) { ++ g->interpreter_ready = 1; + gsmd_initsettings(g); + return 0; + } +@@ -372,7 +373,7 @@ + } + + /* write pending commands to UART */ +- if (what & GSMD_FD_WRITE) { ++ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { + struct gsmd_atcmd *pos, *pos2; + llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { + len = strlen(pos->buf); +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-29 17:06:04.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-29 17:08:59.000000000 +0200 +@@ -291,7 +291,8 @@ + + gsmd_vendor_plugin_find(&g); + +- gsmd_initsettings(&g); ++ if (g.interpreter_ready) ++ gsmd_initsettings(&g); + + gsmd_opname_init(&g); + diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index d84d363f1a..910fa26d4d 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -12,6 +12,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ + file://interpreter-ready.patch;patch=1 \ file://ldisc.patch;patch=1" inherit autotools pkgconfig update-rc.d -- cgit v1.2.3 From dda4b24a56b3eb979d3bd473044d5277a7296461 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 17:07:21 +0000 Subject: libx11-1.1.1: fix packaging --- packages/xorg-lib/libx11_1.1.1.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 07e0286a13..45f524df58 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,5 +1,6 @@ require xorg-lib-common.inc PE = "1" +PR = "r1" DESCRIPTION = "Base X libs." @@ -10,8 +11,11 @@ RPROVIDES = "virtual/libx11" XORG_PN = "libX11" +PACKAGES =+ "libx11-xcb" + FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" +FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*" do_compile() { ( -- cgit v1.2.3 From 3e7a625b0563f0163a9b41969764b35ac68e88b3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 18:09:55 +0000 Subject: xserver-kdrive-1.2.0: missing optional-xkb.patch --- .../xserver-kdrive-1.2.0/optional-xkb.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch new file mode 100644 index 0000000000..a580b500b7 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch @@ -0,0 +1,58 @@ +Index: xorg-server-1.2.0/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200 +@@ -30,6 +30,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -46,7 +50,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200 +@@ -428,6 +428,7 @@ + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -754,12 +755,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) -- cgit v1.2.3 From 22e75d829f89c309957e96fe2e61ddb8f7b977f4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 18:16:05 +0000 Subject: kdrive 1.2: rediff optional-xkb.patch --- .../xserver-kdrive-1.2.0/optional-xkb.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch new file mode 100644 index 0000000000..7efc70820f --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch @@ -0,0 +1,54 @@ +--- /tmp/bar/Makefile.am 2007-03-29 20:12:38.000000000 +0200 ++++ xorg-server-1.2.0/Makefile.am 2007-03-29 20:12:49.325251000 +0200 +@@ -30,6 +30,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -46,7 +50,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +--- /tmp/bar/configure.ac 2007-03-29 20:12:38.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-29 20:12:49.325251000 +0200 +@@ -428,6 +428,7 @@ + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -754,12 +755,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) -- cgit v1.2.3 From c9fb0e6b677050e621003e6d1b47d5e44b7ef5ba Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 18:24:58 +0000 Subject: disapproval of revision '3747999334cad4bb22159396976a802d18c50703' --- .../xserver-kdrive-1.2.0/optional-xkb.patch | 54 ---------------------- 1 file changed, 54 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch deleted file mode 100644 index 7efc70820f..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- /tmp/bar/Makefile.am 2007-03-29 20:12:38.000000000 +0200 -+++ xorg-server-1.2.0/Makefile.am 2007-03-29 20:12:49.325251000 +0200 -@@ -30,6 +30,10 @@ - XINPUT_DIR=Xi - endif - -+if XKB -+XKB_DIR=xkb -+endif -+ - if DBE - DBE_DIR=dbe - endif -@@ -46,7 +50,7 @@ - randr \ - render \ - $(XINPUT_DIR) \ -- xkb \ -+ $(XKB_DIR) \ - $(DBE_DIR) \ - $(MFB_DIR) \ - $(AFB_DIR) \ ---- /tmp/bar/configure.ac 2007-03-29 20:12:38.000000000 +0200 -+++ xorg-server-1.2.0/configure.ac 2007-03-29 20:12:49.325251000 +0200 -@@ -428,6 +428,7 @@ - AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) - AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) - AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) - - dnl DDXes. - AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -@@ -754,12 +755,15 @@ - - AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) - --AC_DEFINE(XKB, 1, [Build XKB]) --AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) --AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) --REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" --XKB_LIB='$(top_builddir)/xkb/libxkb.la' --XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) -+if test "x$XKB" = xyes; then -+ AC_DEFINE(XKB, 1, [Build XKB]) -+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) -+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" -+ XKB_LIB='$(top_builddir)/xkb/libxkb.la' -+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+fi - - AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, - [Do not have `strcasecmp'.])) -- cgit v1.2.3 From 77140a739890f8d17d2b3b762c71f69fcf3baeae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 18:53:10 +0000 Subject: gpe-sessionscripts: remove PV in depends --- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 3596e4e6cd..4d68bc11a0 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -4,14 +4,14 @@ DESCRIPTION = "GPE session startup scripts" LICENSE = "GPL" SECTION = "gpe" PRIORITY = "optional" -RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" +RDEPENDS_${PN} = "matchbox-panel matchbox-desktop matchbox-common gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" # more rdepends: keylaunch apmd blueprobe DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r7" +PR = "r8" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" -- cgit v1.2.3 From 51800bbfd42a890cb2f1d974aa5904c50ca497e0 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 19:23:07 +0000 Subject: task-sdk: Update various bits to current names. --- packages/tasks/task-sdk.bb | 49 +++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index a9814d51a1..cbd1ab72f1 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r5" +PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -21,73 +21,67 @@ RDEPENDS_task-sdk-base := "\ glibc-dev \ libgcc1 \ alsa-dev \ - audiofile-dev \ - bluez-libs-dev \ + libaudiofile-dev \ + libbluetooth-dev \ dbus-dev \ expat-dev \ fontconfig-dev \ freetype-dev \ - glib-2.0-dev \ + libglib-2.0-dev \ gstreamer-dev \ libice-dev \ ipkg-dev \ - jpeg-dev \ + libjpeg-dev \ libapm-dev \ - libasound \ + libasound2 \ libdisplaymigration-dev \ libetpan-dev \ libgcrypt-dev \ - libglade-dev \ - gnutls-dev \ + libglade-2.0-dev \ + libgnutls-dev \ libgpg-error-dev \ - libidl-dev \ + libidl-2-dev \ libiw-dev \ - libmimedir-dev \ + libmimedir-0.4-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libschedule-dev \ libsm-dev \ libsoundgen-dev \ - libsoup-dev \ + libsoup-2.2-dev \ libsvg-dev \ libtododb-dev \ libts-dev \ libxml2-dev \ ncurses-dev \ - openobex-dev \ - popt-dev \ - readline-dev \ - sqlite-dev \ + libopenobex-dev \ + libpopt-dev \ + libreadline-dev \ + libsqlite-dev \ zlib-dev \ libxmu-dev" RDEPENDS_task-sdk-x11 := "\ - atk-dev \ - cairo-dev \ + libatk-1.0-dev \ + libcairo-dev \ gconf-dbus-dev \ gtk+-dev \ gtk-engines-dev \ libsvg-cairo-dev \ - libmatchbox-dev \ + libmb-dev \ matchbox-desktop-dev \ pango-dev \ - startup-notification-dev" + libstartup-notification-1-dev" RDEPENDS_task-sdk-x11-ext := "\ - compositeext-dev \ - damageext-dev \ - fixesext-dev \ libxcursor-dev \ libxdmcp-dev \ - libxfixes-dev \ libxft-dev \ libxrandr-dev \ libxrender-dev \ libxsettings-client-dev \ randrext-dev \ - recordext-dev \ - renderext-dev \ resourceext-dev \ libx11-dev \ libxau-dev \ @@ -103,14 +97,15 @@ RDEPENDS_task-sdk-x11-ext := "\ libxt-dev \ xtrans-dev \ libxtst-dev" -# libxss-dev \ + RDEPENDS_task-sdk-gpe := "\ libcontactsdb-dev \ - esound-dev \ + libesd-dev \ libeventdb-dev \ libgpepimc-dev \ libgpevtype-dev \ libgpelaunch-dev \ libgpewidget-dev \ libhandoff-dev" + -- cgit v1.2.3 From d0f8d7d128418e126277a516e614066f089adfac Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 19:35:16 +0000 Subject: meta-sdk-sbox: Start of a scratchbox based SDK. Currently creates a rootstrap which can be used after importing the crosscompiler. Compiling seems to work but running applications doesn't. --- packages/meta/meta-sdk-sbox.bb | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 packages/meta/meta-sdk-sbox.bb (limited to 'packages') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb new file mode 100644 index 0000000000..4e3151805e --- /dev/null +++ b/packages/meta/meta-sdk-sbox.bb @@ -0,0 +1,115 @@ +DESCRIPTION = "Meta package for a Scratchbox SDK" +LICENSE = "MIT" +PR = "r0" + +PACKAGES = "" +PACKAGES = "" + +inherit sdk debian + +SDK_DIR = "${WORKDIR}/sdk" +SDK_OUTPUT = "${SDK_DIR}/image" +SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +prefix = "/" +exec_prefix = "${prefix}" +base_prefix = "${exec_prefix}" +FILES_${PN} = "${prefix}" + +TARGET_INSTALL = "\ + task-sdk-base \ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe" + +DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +RDEPENDS = "${TARGET_INSTALL}" +BUILD_ALL_DEPS = "1" + + +IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" + +ipk_do_indexes () { + set -x + + ipkgarchs="${PACKAGE_ARCHS}" + + if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + touch ${DEPLOY_DIR_IPK}/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + fi + + for arch in $ipkgarchs; do + if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then + touch ${DEPLOY_DIR_IPK}/$arch/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ + fi + fi + done +} + +do_populate_sdk() { + ipk_do_indexes + + rm -rf ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + cat <${SDK_DIR}/ipkg-target.conf +src oe file:${DEPLOY_DIR_IPK} +EOF + ipkgarchs="${PACKAGE_ARCHS}" + priority=1 + for arch in $ipkgarchs; do + echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf + priority=$(expr $priority + 5) + if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then + echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf + fi + done + + rm -r ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + ${IPKG_TARGET} update + ${IPKG_TARGET} install ${TARGET_INSTALL} + + mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include + #cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + #rm -rf ${SDK_OUTPUT}/${prefix}/usr/ + + #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib + #rm -rf ${SDK_OUTPUT}/${prefix}/lib/* + + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ + chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ + find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x + + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so + # remove unwanted housekeeping files + mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -rf ${SDK_OUTPUT}${libdir}/ipkg + + # remove unwanted executables + rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc + + # remove broken .la files + #rm ${SDK_OUTPUT}/${prefix}/lib/*.la + + # fix pkgconfig data files + cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig + #for f in *.pc ; do + # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + #done + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/%g' "$f" + done + + mkdir -p ${SDK_DEPLOY} + cd ${SDK_OUTPUT} + fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz . +} + +do_populate_sdk[nostamp] = "1" +addtask populate_sdk before do_build after do_install -- cgit v1.2.3 From a5ab4c711b23d99dd9d252d5c08fa60dd76c493d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 19:54:51 +0000 Subject: meta-sdk-sbox: remove hardcodes references, reuse functions instead of copy-pasting them, and we have an SCM, so no need to comment stuff --- packages/meta/meta-sdk-sbox.bb | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 4e3151805e..cf399644e3 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,15 +1,14 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r0" +PR = "r1" -PACKAGES = "" PACKAGES = "" -inherit sdk debian +inherit rootfs_ipk sdk debian SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +SDK_DEPLOY = "${DEPLOY_DIR}/sdk" prefix = "/" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" @@ -28,28 +27,11 @@ BUILD_ALL_DEPS = "1" IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" -ipk_do_indexes () { - set -x - - ipkgarchs="${PACKAGE_ARCHS}" - - if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - touch ${DEPLOY_DIR_IPK}/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} - fi - - for arch in $ipkgarchs; do - if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then - touch ${DEPLOY_DIR_IPK}/$arch/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ - fi - fi - done -} - do_populate_sdk() { - ipk_do_indexes + + set -ex + rootfs_ipk_do_indexes + set +ex rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} @@ -99,9 +81,6 @@ EOF # fix pkgconfig data files cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig - #for f in *.pc ; do - # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" - #done for f in *.pc ; do sed -i 's%${STAGING_DIR}%/usr/%g' "$f" done -- cgit v1.2.3 From fd34cf512cbfa200fe7ed435536f3995c999e665 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 01:39:53 +0000 Subject: altboot: Add symlink for /sbin/altboot --- packages/altboot/README.txt | 2 +- packages/altboot/altboot_svn.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/altboot/README.txt b/packages/altboot/README.txt index 07a41bef3d..ed71b03957 100644 --- a/packages/altboot/README.txt +++ b/packages/altboot/README.txt @@ -2,4 +2,4 @@ altboot_1.0.5.bb - Last known-working version for clamshell Zauruses running kernel 2.4 altboot_1.0.8.bb - Last known-working version for all Zauruses altboot_1.1.1+wip-20061123.bb - Last known-working version for neo1973 -altboot_wip.bb +altboot_svn.bb - Altboot developer snapshot - avoid ;) diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index baf5116d70..d31c5160a2 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -65,6 +65,8 @@ do_install() { install -m 0644 ${S}/altbootctl.conf ${D}/etc install -m 0755 ${S}/init.altboot ${D}/sbin install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu -- cgit v1.2.3 From 1d7bceff6270b94c59ffd445d98261ac36e58315 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 30 Mar 2007 03:54:05 +0000 Subject: qpf-unismall: hardwire SRC_URI for .jp sourceforge mirror. Seems to be necessary. --- packages/qpf-fonts/qpf-unismall_1.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb index 9c5600cb9d..20f47f9665 100644 --- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb +++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/" RPROVIDES = "virtual/japanese-font" -PR = "r1" +PR = "r2" -SRC_URI = "http://prdownloads.sourceforge.jp/zaurus-ja/773/unismall-1.0.0.tar.gz" +SRC_URI = "http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-${PV}.tar.gz" S = "${WORKDIR}" -- cgit v1.2.3 From 476146d7e71bef9a34eb1109be195f4824719974 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 30 Mar 2007 08:59:06 +0000 Subject: xournal_0.3.3.bb : add new version and add .desktop file so it shows up as an icon on desktop. remove old versions --- packages/xournal/files/no-printing.diff | 178 -------------------------------- packages/xournal/files/xournal.desktop | 9 ++ packages/xournal/xournal_0.2.bb | 11 -- packages/xournal/xournal_0.3.1.bb | 11 -- packages/xournal/xournal_0.3.3.bb | 17 +++ 5 files changed, 26 insertions(+), 200 deletions(-) delete mode 100644 packages/xournal/files/no-printing.diff create mode 100644 packages/xournal/files/xournal.desktop delete mode 100644 packages/xournal/xournal_0.2.bb delete mode 100644 packages/xournal/xournal_0.3.1.bb create mode 100644 packages/xournal/xournal_0.3.3.bb (limited to 'packages') diff --git a/packages/xournal/files/no-printing.diff b/packages/xournal/files/no-printing.diff deleted file mode 100644 index 7a4724e696..0000000000 --- a/packages/xournal/files/no-printing.diff +++ /dev/null @@ -1,178 +0,0 @@ -diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in ---- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000 -+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000 -@@ -10,11 +10,16 @@ - AM_PROG_CC_STDC - AC_HEADER_STDC - --pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0" -+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0" - PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) - AC_SUBST(PACKAGE_CFLAGS) - AC_SUBST(PACKAGE_LIBS) - -+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0 -+#AC_SUBST(GNOMEPRINT_CFLAGS) -+#AC_SUBST(GNOMEPRINT_LIBS) -+AM_CONDITIONAL(ENABLE_PRINTING, false) -+ - AC_OUTPUT([ - Makefile - src/Makefile -diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c ---- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000 -+++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000 -@@ -28,7 +28,9 @@ - - void hide_unimplemented(void) - { -+#if ENABLE_PRINTING - gtk_widget_hide(GET_COMPONENT("filePrintOptions")); -+#endif - gtk_widget_hide(GET_COMPONENT("journalFlatten")); - gtk_widget_hide(GET_COMPONENT("papercolorOther")); - gtk_widget_hide(GET_COMPONENT("journalApplyAllPages")); -diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am ---- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000 -+++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000 -@@ -7,12 +7,16 @@ - - bin_PROGRAMS = xournal - -+if ENABLE_PRINTING -+PRINT_SOURCE = xo-print.c xo-print.h -+endif -+ - xournal_SOURCES = \ - main.c xournal.h \ - xo-misc.c xo-misc.h \ - xo-file.c xo-file.h \ - xo-paint.c xo-paint.h \ -- xo-print.c xo-print.h \ -+ $(PRINT_SOURCE) \ - xo-support.c xo-support.h \ - xo-interface.c xo-interface.h \ - xo-callbacks.c xo-callbacks.h -diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c ---- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000 -+++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000 -@@ -7,7 +7,9 @@ - #include - #include - #include -+#if ENABLE_PRINTING - #include -+#endif - #include - - #include "xournal.h" -@@ -17,7 +19,9 @@ - #include "xo-misc.h" - #include "xo-file.h" - #include "xo-paint.h" -+#if ENABLE_PRINTING - #include "xo-print.h" -+#endif - - void - on_fileNew_activate (GtkMenuItem *menuitem, -@@ -261,7 +265,7 @@ - - } - -- -+#if ENABLE_PRINTING - void - on_filePrint_activate (GtkMenuItem *menuitem, - gpointer user_data) -@@ -407,7 +411,7 @@ - - g_free(filename); - } -- -+#endif - - void - on_fileQuit_activate (GtkMenuItem *menuitem, -diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h ---- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000 -+++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000 -@@ -24,6 +24,7 @@ - on_filePrintOptions_activate (GtkMenuItem *menuitem, - gpointer user_data); - -+#if ENABLE_PRINTING - void - on_filePrint_activate (GtkMenuItem *menuitem, - gpointer user_data); -@@ -32,6 +33,8 @@ - on_filePrintPDF_activate (GtkMenuItem *menuitem, - gpointer user_data); - -+#endif -+ - void - on_fileQuit_activate (GtkMenuItem *menuitem, - gpointer user_data); -diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c ---- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000 -+++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000 -@@ -41,10 +41,12 @@ - GtkWidget *fileSave; - GtkWidget *fileSaveAs; - GtkWidget *separator1; -+#if ENABLE_PRINTING - GtkWidget *filePrintOptions; - GtkWidget *image501; - GtkWidget *filePrint; - GtkWidget *filePrintPDF; -+#endif - GtkWidget *separator2; - GtkWidget *fileQuit; - GtkWidget *menuEdit; -@@ -327,6 +329,7 @@ - gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1); - gtk_widget_set_sensitive (separator1, FALSE); - -+#if ENABLE_PRINTING - filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options"); - gtk_widget_show (filePrintOptions); - gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions); -@@ -347,6 +350,7 @@ - gtk_widget_show (separator2); - gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2); - gtk_widget_set_sensitive (separator2, FALSE); -+#endif - - fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group); - gtk_widget_show (fileQuit); -@@ -1522,6 +1526,7 @@ - g_signal_connect ((gpointer) fileSaveAs, "activate", - G_CALLBACK (on_fileSaveAs_activate), - NULL); -+#if ENABLE_PRINTING - g_signal_connect ((gpointer) filePrintOptions, "activate", - G_CALLBACK (on_filePrintOptions_activate), - NULL); -@@ -1531,6 +1536,7 @@ - g_signal_connect ((gpointer) filePrintPDF, "activate", - G_CALLBACK (on_filePrintPDF_activate), - NULL); -+#endif - g_signal_connect ((gpointer) fileQuit, "activate", - G_CALLBACK (on_fileQuit_activate), - NULL); -@@ -1941,11 +1947,13 @@ - GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave"); - GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs"); - GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1"); -+#if ENABLE_PRINTING - GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions"); - GLADE_HOOKUP_OBJECT (winMain, image501, "image501"); - GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint"); - GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF"); - GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2"); -+#endif - GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit"); - GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit"); - GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu"); diff --git a/packages/xournal/files/xournal.desktop b/packages/xournal/files/xournal.desktop new file mode 100644 index 0000000000..52dde1e47c --- /dev/null +++ b/packages/xournal/files/xournal.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=0.3.3 +Type=Application +Name=Xournal +Comment=Notetaking tool +Exec=/usr/bin/xournal +Icon=/usr/share/xournal/pixmaps/xournal.png +Terminal=false + diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb deleted file mode 100644 index 6a4b6839b4..0000000000 --- a/packages/xournal/xournal_0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -HOMEPAGE = "http://xournal.sf.net/" -DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." -DEPENDS = "gtk+ libgnomecanvas" -SECTION = "x11" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://xournal.sourceforge.net/xournal-0.2.tar.gz \ - file://no-printing.diff;patch=1" - -inherit autotools pkgconfig diff --git a/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb deleted file mode 100644 index 077036b686..0000000000 --- a/packages/xournal/xournal_0.3.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -HOMEPAGE = "http://xournal.sf.net/" -DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." -DEPENDS = "gtk+ libgnomecanvas" -SECTION = "x11" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://xournal.sourceforge.net/xournal-0.3.1.tar.gz \ - " - -inherit autotools pkgconfig diff --git a/packages/xournal/xournal_0.3.3.bb b/packages/xournal/xournal_0.3.3.bb new file mode 100644 index 0000000000..5a8a1b74b7 --- /dev/null +++ b/packages/xournal/xournal_0.3.3.bb @@ -0,0 +1,17 @@ +HOMEPAGE = "http://xournal.sf.net/" +DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." +DEPENDS = "gtk+ libgnomecanvas libgnomeprintui" +SECTION = "x11" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \ + file://xournal.desktop" + +inherit autotools pkgconfig + +do_install_append () { + install -d ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/xournal.desktop ${D}${datadir}/applications/ +} + -- cgit v1.2.3 From b0ee85f4869abd55db07bebedcb7dd0d7798b06f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 30 Mar 2007 09:32:30 +0000 Subject: libxcompoisite: Depends on libxext --- packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb index 4cab60a531..70d0917887 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/libx11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" -- cgit v1.2.3 From b061f54b368d934627c98dcc0021c2bd4fde2957 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 09:37:10 +0000 Subject: xserver-kdrive-1.2.0: fix enable-xcalibrate.patch --- .../xserver-kdrive-1.2.0/enable-xcalibrate.patch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch index aec94a3a6d..c82aa943d2 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -1,7 +1,7 @@ Index: xorg-server-1.2.0/mi/miinitext.c =================================================================== ---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 -+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-30 11:28:44.000000000 +0200 @@ -372,6 +372,9 @@ #ifdef DMXEXT extern void DMXExtensionInit(INITARGS); @@ -22,3 +22,17 @@ Index: xorg-server-1.2.0/mi/miinitext.c } void +Index: xorg-server-1.2.0/include/kdrive-config.h.in +=================================================================== +--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-03-30 11:31:07.000000000 +0200 ++++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-30 11:34:09.000000000 +0200 +@@ -22,6 +22,9 @@ + /* Support tslib touchscreen abstraction library */ + #undef TSLIB + ++/* Build XCalibrate extension */ ++#undef XCALIBRATE ++ + /* Verbose debugging output hilarity */ + #undef DEBUG + -- cgit v1.2.3 From 7359e2a43c49bd48dc5eb662015e5d08bfe46528 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 10:04:35 +0000 Subject: kdrive 1.2.0: bump PR due to patch changes --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index d4c01f240a..b64bfe8ff9 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r2" +PR = "r3" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ -- cgit v1.2.3 From de4e23ce0df2866e7896544a2a8dc0a2d54c2798 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 30 Mar 2007 10:06:43 +0000 Subject: linux-hackndev: Update palmtx config --- packages/linux/linux-hackndev-2.6/palmtx/defconfig | 572 ++++++++++++--------- packages/linux/linux-hackndev-2.6_svn.bb | 2 +- 2 files changed, 334 insertions(+), 240 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig index 536133f6aa..68dcca286d 100644 --- a/packages/linux/linux-hackndev-2.6/palmtx/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig @@ -1,53 +1,68 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-hnd0 -# Thu Dec 14 14:24:35 2006 +# Linux kernel version: 2.6.20-hnd0 +# Wed Mar 28 10:35:44 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_IPC_NS is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set -# CONFIG_MINIMAL_OOPS is not set +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -CONFIG_UID16=y +CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_EMBEDDED is not set +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y +# CONFIG_ELF_CORE is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -60,19 +75,22 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set +CONFIG_KMOD=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 # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set @@ -83,18 +101,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -102,12 +130,6 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # Intel PXA2xx Implementations @@ -116,12 +138,14 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set # CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set -# CONFIG_ARCH_H3900 is not set +# CONFIG_MACH_H3900 is not set # CONFIG_MACH_H4000 is not set # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set @@ -133,27 +157,32 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set -# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_HW6900 is not set # CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_XSCALE_PALMTREO650 is not set +# CONFIG_MACH_XSCALE_TREO680 is not set +# CONFIG_MACH_T700WX is not set # CONFIG_MACH_TUNGE2 is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_MACH_XSCALE_PALMTT5 is not set CONFIG_MACH_XSCALE_PALMTX=y -CONFIG_PALMTX_AC97=m -CONFIG_PALMTX_LCD=m # CONFIG_PALMTX_PCMCIA is not set # CONFIG_PALMTX_DEBUG is not set +CONFIG_PALMTX_BATTERY=m +CONFIG_PALMTX_PM=y # CONFIG_MACH_PALMZ72 is not set # CONFIG_MACH_OMAP_PALMTC is not set +# CONFIG_MACH_ZIRE31 is not set +CONFIG_GPIOED=m +CONFIG_GPIOEDNG=m # CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y -CONFIG_PXA_RTC_EPOCH=1970 -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -169,19 +198,19 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y # CONFIG_ARMBOOT_PROC is not set CONFIG_XSCALE_PMU=y # CONFIG_KEXEC is not set -# -# Compaq/iPAQ Platforms -# - # # Compaq/iPAQ Drivers # @@ -189,7 +218,6 @@ CONFIG_XSCALE_PMU=y # # Compaq/HP iPAQ Drivers # -# CONFIG_IPAQ_HAMCOP is not set # # Bus support @@ -203,9 +231,11 @@ CONFIG_XSCALE_PMU=y # # Kernel Features # -# CONFIG_PREEMPT is not set -CONFIG_NO_IDLE_HZ=y +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -215,6 +245,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -247,13 +278,16 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options # -# CONFIG_PM is not set -# CONFIG_APM is not set +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_DPM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=y # # Networking @@ -264,12 +298,13 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=y +CONFIG_PACKET=m # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set -CONFIG_NET_KEY=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set @@ -284,13 +319,19 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # @@ -316,7 +357,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -330,22 +370,22 @@ CONFIG_TCP_CONG_BIC=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=m +CONFIG_IRDA=y # # IrDA protocols # -CONFIG_IRLAN=m -CONFIG_IRNET=m +# CONFIG_IRLAN is not set +# CONFIG_IRNET is not set CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y +# CONFIG_IRDA_ULTRA is not set # # IrDA options # # CONFIG_IRDA_CACHE_LAST_LSAP is not set # CONFIG_IRDA_FAST_RR is not set -CONFIG_IRDA_DEBUG=y +# CONFIG_IRDA_DEBUG is not set # # Infrared-port device drivers @@ -354,29 +394,43 @@ CONFIG_IRDA_DEBUG=y # # SIR device drivers # -CONFIG_IRTTY_SIR=m +# CONFIG_IRTTY_SIR is not set # # Dongle support # -# CONFIG_DONGLE is not set # # Old SIR device drivers # -CONFIG_IRPORT_SIR=m +# CONFIG_IRPORT_SIR is not set # # Old Serial dongle support # -# CONFIG_DONGLE_OLD is not set # # FIR device drivers # -CONFIG_PXA_FICP=m -# CONFIG_BT is not set -# CONFIG_IEEE80211 is not set +CONFIG_PXA_FICP=y +CONFIG_BT=m +# CONFIG_BT_L2CAP is not set +# CONFIG_BT_SCO is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -387,7 +441,8 @@ CONFIG_PXA_FICP=m # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -414,10 +469,11 @@ CONFIG_FW_LOADER=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -432,6 +488,12 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set # # Multi-device support (RAID and LVM) @@ -463,11 +525,16 @@ CONFIG_NETDEVICES=y # # PHY device support # +# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # -# CONFIG_NET_ETHERNET is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) @@ -490,7 +557,7 @@ CONFIG_NETDEVICES=y # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=m +CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set # CONFIG_PPP_ASYNC is not set @@ -500,6 +567,7 @@ CONFIG_PPP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=y # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -514,17 +582,17 @@ CONFIG_PPP=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=480 +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -537,8 +605,9 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_KEYBOARD_PXA27x=m -CONFIG_KEYBOARD_PALMIR=m +# CONFIG_GPIO_KEYS is not set +CONFIG_KEYBOARD_PXA27x=y +# CONFIG_KEYBOARD_PALMWK is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -547,20 +616,25 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set -CONFIG_TOUCHSCREEN_WM97XX=m +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_TOUCHSCREEN_WM97XX=y # CONFIG_TOUCHSCREEN_WM9705 is not set CONFIG_TOUCHSCREEN_WM9712=y # CONFIG_TOUCHSCREEN_WM9713 is not set -CONFIG_TOUCHSCREEN_WM97XX_PXA=y -CONFIG_TOUCHSCREEN_WM97XX_ACC=y -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_UINPUT is not set +# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set +# CONFIG_INPUT_MISC is not set # # Hardware I/O ports # -CONFIG_SERIO=m -CONFIG_SERIO_SERPORT=m +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set @@ -570,6 +644,7 @@ CONFIG_SERIO_SERPORT=m CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -583,63 +658,13 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y - -# -# I2C Algorithms -# -# CONFIG_I2C_ALGOBIT is not set -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set -CONFIG_I2C_ALGOPXA=y - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ELV is not set -CONFIG_I2C_PXA=y -CONFIG_I2C_PXA_SLAVE=y -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_I2C_ADCM2650 is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCA9535 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# L3 serial bus support -# -# CONFIG_L3 is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set - # # IPMI # @@ -649,21 +674,22 @@ CONFIG_I2C_PXA_SLAVE=y # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_NVRAM=m +CONFIG_HW_RANDOM=m +# CONFIG_NVRAM is not set CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# # CONFIG_RAW_DRIVER is not set # # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set # # SPI support @@ -689,42 +715,19 @@ CONFIG_SPI_PXA2XX=y # # Hardware Monitoring support # -CONFIG_HWMON=m +# CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=y +# CONFIG_ADC_BATTERY is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set # # SoC drivers @@ -733,23 +736,31 @@ CONFIG_HWMON=m # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_TSC2200 is not set # # Misc devices # -CONFIG_BATTERY_MONITOR=m +# CONFIG_BATTCHARGE_MONITOR is not set # # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_AD7877 is not set +# CONFIG_TIFM_CORE is not set # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # # LED drivers @@ -758,13 +769,38 @@ CONFIG_BATTERY_MONITOR=m # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_MMC_CARD=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_SHARED is not set # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +CONFIG_VIDEO_ADV_DEBUG=y +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_PXA_CAMERA is not set + +# +# Radio Adapters +# + # # Digital Video Broadcasting Devices # @@ -773,19 +809,22 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # +CONFIG_FIRMWARE_EDID=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set -CONFIG_FB_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -# CONFIG_FB_PXA_PARAMETERS is not set +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -794,43 +833,48 @@ CONFIG_FB_PXA=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set # # Logo configuration # CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y +# CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_PXAPWM=y # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_SEQUENCER=m -# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set @@ -840,10 +884,8 @@ CONFIG_SND_SEQUENCER_OSS=y # # Generic devices # -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_AC97_BUS=m +CONFIG_SND_AC97_CODEC=y # CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -851,22 +893,25 @@ CONFIG_SND_AC97_BUS=m # # ALSA ARM devices # -# CONFIG_SND_A716 is not set -# CONFIG_SND_H1910 is not set -# CONFIG_SND_H2200 is not set -# CONFIG_SND_H4000 is not set -# CONFIG_SND_HTCMAGICIAN is not set -# CONFIG_SND_HX4700 is not set -# CONFIG_SND_HTCUNIVERSAL is not set -# CONFIG_SND_H5XXX_AK4535 is not set -CONFIG_SND_PXA2xx_I2SOUND=m -CONFIG_SND_PXA2XX_PCM=m -CONFIG_SND_PXA2XX_AC97=m +# CONFIG_SND_PXA2xx_I2SOUND is not set +CONFIG_SND_PXA2XX_PCM=y +CONFIG_SND_PXA2XX_AC97=y + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set # # Open Sound System # # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y + +# +# HID Devices +# +CONFIG_HID=y # # USB support @@ -883,17 +928,18 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # USB Gadget Support # -CONFIG_USB_GADGET=m +CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_PXA27X=m +CONFIG_USB_PXA27X=y # CONFIG_USB_PXA27X_DMA is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set @@ -901,11 +947,11 @@ CONFIG_USB_PXA27X=m # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_CHAR=m +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set # # MMC/SD Card support @@ -914,16 +960,16 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_PXA=y +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set -# CONFIG_MMC_ASIC3 is not set -# CONFIG_MMC_WBSD_PALMT3 is not set # # Real Time Clock # CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=m +CONFIG_RTC_EPOCH=1970 # # RTC interfaces @@ -931,17 +977,19 @@ CONFIG_RTC_CLASS=m CONFIG_RTC_INTF_SYSFS=m CONFIG_RTC_INTF_PROC=m CONFIG_RTC_INTF_DEV=m +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # # RTC drivers # -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=m # CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -950,18 +998,20 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -CONFIG_MINIX_FS=m +# CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -CONFIG_INOTIFY=y +# CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y # CONFIG_FUSE_FS is not set # @@ -984,8 +1034,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -994,23 +1046,24 @@ CONFIG_RAMFS=y # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m +# CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_SQUASHFS_VMALLOC=y +# CONFIG_SQUASHFS_VMALLOC is not set +# CONFIG_SQUASHFS_LZMA is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -CONFIG_UNION_FS=m +# CONFIG_UNION_FS is not set # # Network File Systems @@ -1025,8 +1078,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1057,7 +1109,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set +CONFIG_NLS_CODEPAGE_866=y # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set @@ -1069,7 +1121,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set +CONFIG_NLS_ISO8859_2=y # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set @@ -1079,10 +1131,15 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set +CONFIG_NLS_KOI8_R=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -1092,14 +1149,16 @@ CONFIG_NLS_UTF8=y # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set # CONFIG_SMALLOOPS is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set # CONFIG_DEBUG_USER is not set # @@ -1111,7 +1170,39 @@ CONFIG_FRAME_POINTER=y # # Cryptographic options # -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices @@ -1120,8 +1211,11 @@ CONFIG_FRAME_POINTER=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y -CONFIG_CRC16=m +# CONFIG_CRC16 is not set CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index 3eee7171c0..552356e23a 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r3" +PR = "r4" COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72)" -- cgit v1.2.3 From e034d2dc97af3615a02b7c4bf5f24ef7b36a0325 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Mar 2007 10:49:22 +0000 Subject: openmoko-libs: split to have libmokoui and libmokojournal packages --- packages/openmoko-base/openmoko-libs_svn.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index 3ac18438b1..e7b711e627 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/libs" LICENSE = "LGPL" DEPENDS += "gtk+" PV = "0.0.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko @@ -17,3 +17,8 @@ do_stage() { autotools_stage_all } +PACKAGES =+ "libmokojournal libmokojournal-dev libmokojournal-dbg" + +FILES_libmokojournal = "${libdir}/libmokojournal.so.*" +FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal" +FILES_libmokojournal-dbg = "${libdir}/.debug/libmokojournal.so.*" -- cgit v1.2.3 From 0c8eace2c9c704059d9296a518dbf3c0b2f241f7 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 11:05:28 +0000 Subject: xserver-kdrive-1.2.0: add library order fix for xcalibrate --- .../xserver-kdrive-1.2.0/enable-xcalibrate.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch index c82aa943d2..11931f83d6 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -36,3 +36,16 @@ Index: xorg-server-1.2.0/include/kdrive-config.h.in /* Verbose debugging output hilarity */ #undef DEBUG +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-30 12:47:25.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-30 12:39:01.000000000 +0200 +@@ -1540,7 +1540,7 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) -- cgit v1.2.3 From ab2e41a69b24e268c5b68b1df99cd40a314e5538 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:16:02 +0000 Subject: kdrive 1.2: bump PR due to patch changes --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index b64bfe8ff9..e6cd3b2f30 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r3" +PR = "r4" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ -- cgit v1.2.3 From 6f13dc66f80d2aa264f58e88c905e63cc65158d1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:29:23 +0000 Subject: sysvinit: merge psplash reboot handling from poky --- packages/sysvinit/sysvinit/angstrom/rc | 54 ++++++++++++++++------------------ packages/sysvinit/sysvinit_2.86.bb | 2 +- 2 files changed, 27 insertions(+), 29 deletions(-) (limited to 'packages') diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc index e43ddec14b..30b69ad516 100755 --- a/packages/sysvinit/sysvinit/angstrom/rc +++ b/packages/sysvinit/sysvinit/angstrom/rc @@ -1,5 +1,4 @@ #!/bin/sh - # # rc This file is responsible for starting/stopping # services when the runlevel changes. @@ -21,13 +20,12 @@ export VERBOSE startup_progress() { step=$(($step + $step_change)) - - if [ $(($num_steps + $first_step)) -lt 1 ]; then - num_steps="1" - first_step="0" + if [ "$num_steps" != "0" ]; then + progress=$((($step * $progress_size / $num_steps) + $first_step)) + else + progress=$progress_size fi - - progress=$(($step * $progress_size / $num_steps + $first_step)) + #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" if type psplash-write >/dev/null 2>&1; then TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true fi @@ -93,10 +91,10 @@ startup() { case "$runlevel" in 0|6) - # Count down from 0 to -100 and use the entire bar - first_step=0 + # Count down from -100 to 0 and use the entire bar + first_step=-100 progress_size=100 - step_change=-1 + step_change=1 ;; S) # Begin where the initramfs left off and use 2/3 @@ -113,6 +111,17 @@ startup() { ;; esac + num_steps=0 + for s in /etc/rc$runlevel.d/[SK]*; do + case "${s##/etc/rc$runlevel.d/S??}" in + gdm|xdm|kdm|reboot|halt) + break + ;; + esac + num_steps=$(($num_steps + 1)) + done + step=0 + # First, run the KILL scripts. if [ $previous != N ] then @@ -126,18 +135,6 @@ startup() { done fi - num_steps=0 - for s in /etc/rc$runlevel.d/[SK]*; do - case "${s##/etc/rc$runlevel.d/S??}" in - gdm|xdm|kdm|reboot|halt) - break - ;; - esac - num_steps=$(($num_steps + 1)) - done - - step=0 - # Now run the START scripts for this runlevel. for i in /etc/rc$runlevel.d/S* do @@ -170,9 +167,10 @@ startup() { done fi -if [ "x$runlevel" != "xS" ]; then - if type psplash-write >/dev/null 2>&1; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - umount /mnt/.psplash - fi -fi +#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch +#if [ "x$runlevel" != "xS" ]; then +# if type psplash-write >/dev/null 2>&1; then +# TMPDIR=/mnt/.psplash psplash-write "QUIT" || true +# umount /mnt/.psplash +# fi +#fi diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index a4c4ff8381..c8ce5ba191 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r33" +PR = "r34" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. -- cgit v1.2.3 From f5c1c72a24ccd65421665de22dce70089d1cf30c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:36:06 +0000 Subject: openmoko-libs: add eds-dbus dep --- packages/openmoko-base/openmoko-libs_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index e7b711e627..b478ca2604 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications" SECTION = "openmoko/libs" LICENSE = "LGPL" -DEPENDS += "gtk+" +DEPENDS += "gtk+ eds-dbus" PV = "0.0.1+svn${SRCDATE}" PR = "r2" -- cgit v1.2.3 From a9784bef976a1bee8cb58f2422fc6e9055ff8090 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 11:42:33 +0000 Subject: matchbox-panel-2: don't replace matchbox-panel, not ready yet. --- packages/matchbox2/matchbox-panel-2_svn.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index 5022afa41a..d166e78a3a 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,11 +3,10 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" PV = "0.1+svn${SRCDATE}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 582c7a75d0b25062783b087ffcc6cd4a3cd86f4c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Mar 2007 13:27:13 +0000 Subject: (openmoko-)dates: fix Rconflicts/Rreplaces: they do not replace each other but conflict and only PN --- packages/openmoko-pim/openmoko-dates_svn.bb | 5 ++--- packages/pimlico/dates.inc | 3 +-- packages/pimlico/dates_0.3.1.bb | 2 +- packages/pimlico/dates_svn.bb | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index cc5978f546..af927ddc47 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,10 +3,9 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -RCONFLICTS = "dates" -RREPLACES = "dates" +RCONFLICTS_${PN} = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r7" +PR = "r8" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 641ff60aea..4f92b2c767 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -3,8 +3,7 @@ LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" -RCONFLICTS = "openmoko-dates" -RREPLACES = "openmoko-dates" +RCONFLICTS_${PN} = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 731ca31289..176d2b9077 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 956eb3dc64..cac0eb4fae 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,6 +1,6 @@ require dates.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 72841378a42ae082ec6790f3debb66433fc495bc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 13:37:40 +0000 Subject: libopie2 cvs: Deactivate patches applied upstream. --- packages/libopie/libopie2_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 1979f5e95e..4a3d3c28c5 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -6,9 +6,10 @@ PR = "r6" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ - file://exports.patch;patch=1 \ file://include.pro" +# Patches merged upstream, keep for reference (for 1.2.2) # file://ipaq-lcd-rotate-cleanup.patch;patch=1 \ +# file://exports.patch;patch=1 \ SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 29aa31acd126ef0a347c120e8cdd3349417adbb4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 13:58:41 +0000 Subject: gsmd: add line discipline switch for magician --- packages/gsm/files/magician/default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default index fb19d46fd5..a9c3b94b1d 100644 --- a/packages/gsm/files/magician/default +++ b/packages/gsm/files/magician/default @@ -1,7 +1,7 @@ # gsmd This shell script configures for the gsmd init script. -# If you must specify special options, uncomment and modify the next line -GSMD_OPTS="-s 115200 -F" +# Set line Discipline 17 (N_TIHTC), needs ldisc.patch-ed gsmd +GSMD_OPTS="-s 115200 -F -D 17" # If your GSM device needs to be powered up, uncomment and modify the next line #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" -- cgit v1.2.3 From d6ac2d47a758269528711ece6c5a6f64878e5a1d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 14:01:53 +0000 Subject: gsmd: don't fail if GSM_POW is not set --- packages/gsm/files/gsmd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 4b8db5d5a5..5c78e8178a 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -16,21 +16,21 @@ RETVAL=0 prog="gsmd" start() { - # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on - # Power on GSM device - # Hack for broken uboot and/or kernel on the neo1973 dmesg -n1 - if [ -e "${GSM_POW}" ] + if [ -n "${GSM_POW}" ] then - echo -n "Powering up GSM device..." - echo "1" > ${GSM_POW} - sleep 1 - echo "done" - else - echo "GSM device not found. Aborting startup" - return false + if [ -e "${GSM_POW}" ] + then + echo -n "Powering up GSM device..." + echo "1" > ${GSM_POW} + sleep 1 + echo "done" + else + echo "GSM device not found. Aborting startup" + return false + fi fi # Start daemons. echo -n "Starting $prog: " -- cgit v1.2.3 From cb09656337463d35f4788874f0b3ab540cf1d40d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 14:02:09 +0000 Subject: gsmd: bump PR --- packages/gsm/libgsmd_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 910fa26d4d..0b3a29e931 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r7" +PR = "r8" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 7ef937bdbcf17970532f161b2429f086b28ccb40 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 14:22:16 +0000 Subject: avahi: fix postinst scripts so that they don't break when installing avahi-autoipd before avahi-daemon --- packages/avahi/avahi.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index fb71361a1d..72583cb7e9 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" -PR="r1" +PR="r2" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" @@ -55,8 +55,8 @@ pkg_postinst_avahi-daemon () { if [ "x$D" != "x" ]; then exit 1 fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + grep "^avahi:" /etc/group > /dev/null || addgroup avahi + grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi DBUSPID=`pidof dbus-daemon` @@ -70,8 +70,8 @@ pkg_postinst_avahi-autoipd () { if [ "x$D" != "x" ]; then exit 1 fi - grep avahi-autoipd /etc/group || addgroup avahi-autoipd - grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" + grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd + grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" } pkg_postrm_avahi-daemon () { -- cgit v1.2.3 From c5747068f49e45234934ba5ab067e0a4ee589c2a Mon Sep 17 00:00:00 2001 From: Manuel Teira Date: Fri, 30 Mar 2007 15:35:12 +0000 Subject: liboil: upgrade to .11 to avoid sigill on arm, closes #2067 --- packages/liboil/liboil_0.3.11.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/liboil/liboil_0.3.11.bb (limited to 'packages') diff --git a/packages/liboil/liboil_0.3.11.bb b/packages/liboil/liboil_0.3.11.bb new file mode 100644 index 0000000000..94471a26fc --- /dev/null +++ b/packages/liboil/liboil_0.3.11.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." +HOMEPAGE = "http://liboil.freedesktop.org/" +LICENSE = "various" + +SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From a31229ef8c96e6ad6dbe5c7b9c78639354b73ec0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 15:39:06 +0000 Subject: opie-taskbar: Split startup and general configuration files into own package, opie-init. --- packages/opie-init/.mtn2git_empty | 0 packages/opie-init/opie-init.inc | 43 ++++++++++ packages/opie-init/opie-init/.mtn2git_empty | 0 packages/opie-init/opie-init/akita/.mtn2git_empty | 0 packages/opie-init/opie-init/akita/qpe.conf | 22 +++++ packages/opie-init/opie-init/c7x0/.mtn2git_empty | 0 packages/opie-init/opie-init/c7x0/opie | 85 ++++++++++++++++++++ .../opie-init/opie-init/c7x0/qpe-suspend-resume | 33 ++++++++ packages/opie-init/opie-init/c7x0/qpe.conf | 22 +++++ .../opie-init/htcuniversal/.mtn2git_empty | 0 packages/opie-init/opie-init/htcuniversal/qpe.conf | 22 +++++ packages/opie-init/opie-init/locale.conf | 0 packages/opie-init/opie-init/mnci/.mtn2git_empty | 0 packages/opie-init/opie-init/mnci/opie | 79 ++++++++++++++++++ packages/opie-init/opie-init/mnci/qpe.conf | 25 ++++++ packages/opie-init/opie-init/opie | 90 +++++++++++++++++++++ packages/opie-init/opie-init/opie-reorgfiles | 93 ++++++++++++++++++++++ packages/opie-init/opie-init/opie_defaults | 15 ++++ packages/opie-init/opie-init/qpe.conf | 18 +++++ packages/opie-init/opie-init/simpad/.mtn2git_empty | 0 packages/opie-init/opie-init/simpad/qpe.conf | 18 +++++ packages/opie-init/opie-init/spitz/.mtn2git_empty | 0 packages/opie-init/opie-init/spitz/qpe.conf | 22 +++++ packages/opie-init/opie-init/tosa/.mtn2git_empty | 0 packages/opie-init/opie-init/tosa/qpe.conf | 22 +++++ packages/opie-init/opie-init_cvs.bb | 11 +++ packages/opie-taskbar/opie-taskbar.inc | 35 +------- .../opie-taskbar/opie-taskbar/akita/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/akita/qpe.conf | 22 ----- .../opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/c7x0/opie | 85 -------------------- .../opie-taskbar/c7x0/qpe-suspend-resume | 33 -------- packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf | 22 ----- .../opie-taskbar/htcuniversal/.mtn2git_empty | 0 .../opie-taskbar/htcuniversal/qpe.conf | 22 ----- packages/opie-taskbar/opie-taskbar/locale.conf | 0 .../opie-taskbar/opie-taskbar/mnci/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/mnci/opie | 79 ------------------ packages/opie-taskbar/opie-taskbar/mnci/qpe.conf | 25 ------ packages/opie-taskbar/opie-taskbar/opie | 90 --------------------- packages/opie-taskbar/opie-taskbar/opie-reorgfiles | 93 ---------------------- packages/opie-taskbar/opie-taskbar/opie_defaults | 15 ---- packages/opie-taskbar/opie-taskbar/qpe.conf | 18 ----- .../opie-taskbar/simpad/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/simpad/qpe.conf | 18 ----- .../opie-taskbar/opie-taskbar/spitz/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/spitz/qpe.conf | 22 ----- .../opie-taskbar/opie-taskbar/tosa/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/tosa/qpe.conf | 22 ----- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 10 +-- packages/opie-taskbar/opie-taskbar_cvs.bb | 10 +-- 51 files changed, 626 insertions(+), 615 deletions(-) create mode 100644 packages/opie-init/.mtn2git_empty create mode 100644 packages/opie-init/opie-init.inc create mode 100644 packages/opie-init/opie-init/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/akita/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/akita/qpe.conf create mode 100644 packages/opie-init/opie-init/c7x0/.mtn2git_empty create mode 100755 packages/opie-init/opie-init/c7x0/opie create mode 100644 packages/opie-init/opie-init/c7x0/qpe-suspend-resume create mode 100644 packages/opie-init/opie-init/c7x0/qpe.conf create mode 100644 packages/opie-init/opie-init/htcuniversal/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/htcuniversal/qpe.conf create mode 100644 packages/opie-init/opie-init/locale.conf create mode 100644 packages/opie-init/opie-init/mnci/.mtn2git_empty create mode 100755 packages/opie-init/opie-init/mnci/opie create mode 100644 packages/opie-init/opie-init/mnci/qpe.conf create mode 100755 packages/opie-init/opie-init/opie create mode 100755 packages/opie-init/opie-init/opie-reorgfiles create mode 100644 packages/opie-init/opie-init/opie_defaults create mode 100644 packages/opie-init/opie-init/qpe.conf create mode 100644 packages/opie-init/opie-init/simpad/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/simpad/qpe.conf create mode 100644 packages/opie-init/opie-init/spitz/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/spitz/qpe.conf create mode 100644 packages/opie-init/opie-init/tosa/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/tosa/qpe.conf create mode 100644 packages/opie-init/opie-init_cvs.bb delete mode 100644 packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/akita/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty delete mode 100755 packages/opie-taskbar/opie-taskbar/c7x0/opie delete mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume delete mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/locale.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty delete mode 100755 packages/opie-taskbar/opie-taskbar/mnci/opie delete mode 100644 packages/opie-taskbar/opie-taskbar/mnci/qpe.conf delete mode 100755 packages/opie-taskbar/opie-taskbar/opie delete mode 100755 packages/opie-taskbar/opie-taskbar/opie-reorgfiles delete mode 100644 packages/opie-taskbar/opie-taskbar/opie_defaults delete mode 100644 packages/opie-taskbar/opie-taskbar/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/simpad/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/spitz/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/tosa/qpe.conf (limited to 'packages') diff --git a/packages/opie-init/.mtn2git_empty b/packages/opie-init/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc new file mode 100644 index 0000000000..d8003925f6 --- /dev/null +++ b/packages/opie-init/opie-init.inc @@ -0,0 +1,43 @@ +DESCRIPTION = "Opie Startup scripts and config" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +#APPNAME = "qpe" + +#S = "${WORKDIR}/launcher" + +#inherit opie +inherit update-rc.d + +INITSCRIPT_NAME = "opie" +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}${palmtopdir}/etc/skel + + install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie + install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ + + install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ + + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ + fi + + case ${MACHINE} in + c7x0) + install -d ${D}${sysconfdir}/apm/event.d/ + install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh + ;; + *) + ;; + esac +} + +FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-init/opie-init/.mtn2git_empty b/packages/opie-init/opie-init/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/akita/.mtn2git_empty b/packages/opie-init/opie-init/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/akita/qpe.conf b/packages/opie-init/opie-init/akita/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/akita/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/c7x0/.mtn2git_empty b/packages/opie-init/opie-init/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie new file mode 100755 index 0000000000..84f3b3e673 --- /dev/null +++ b/packages/opie-init/opie-init/c7x0/opie @@ -0,0 +1,85 @@ +#!/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/c7x0/qpe-suspend-resume b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume new file mode 100644 index 0000000000..be37519512 --- /dev/null +++ b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume @@ -0,0 +1,33 @@ +#!/bin/sh + +QTDIR=/opt/QtPalmtop +LD_LIBRARY_PATH=$QTDIR +export LD_LIBRARY_PATH QTDIR +LOGGING=0 +log() { + if [ $LOGGING -eq 1 ]; then + echo "$(date +%y/%m/%d-%H:%m:%S): $@" >> /var/log/qte.log + fi +} + +retcode=1 +tries=3 + +if [ "$1" = suspend ]; then + while [ $retcode -ne 0 -a $tries -gt 0 ]; do + log "-> $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'" + $QTDIR/bin/qcop QPE/System 'aboutToSuspend()' + retcode=$? + tries=`expr $tries - 1` + log "<- Result $retcode" + done +elif [ "$1" = resume ]; then + while [ $retcode -ne 0 -a $tries -gt 0 ]; do + log "-> $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'" + $QTDIR/bin/qcop QPE/System 'returnFromSuspend()' + retcode=$? + tries=`expr $tries - 1` + log "<- Result $retcode" + done +fi + diff --git a/packages/opie-init/opie-init/c7x0/qpe.conf b/packages/opie-init/opie-init/c7x0/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/c7x0/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty b/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/htcuniversal/qpe.conf b/packages/opie-init/opie-init/htcuniversal/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/htcuniversal/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/locale.conf b/packages/opie-init/opie-init/locale.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/mnci/.mtn2git_empty b/packages/opie-init/opie-init/mnci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/mnci/opie b/packages/opie-init/opie-init/mnci/opie new file mode 100755 index 0000000000..d5e2955b10 --- /dev/null +++ b/packages/opie-init/opie-init/mnci/opie @@ -0,0 +1,79 @@ +#!/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/mnci/qpe.conf b/packages/opie-init/opie-init/mnci/qpe.conf new file mode 100644 index 0000000000..8efe771ad0 --- /dev/null +++ b/packages/opie-init/opie-init/mnci/qpe.conf @@ -0,0 +1,25 @@ +[Appearance] +Decoration = libflat.so +FontFamily = vera +FontSize = 10 +FontStyle = Regular +LeftHand = 0 +Style = libflatstyle.so +rotatedir = 0 +[Battery] +[Date] +ClockApplet = 0 +LongOrder = 273 +Separator = . +ShortOrder = 273 +[InputMethod] +current = Multikey +[Keyboard] +[Startup] +FirstUse = 0 +[Time] +AMPM = 0 +MONDAY = 1 +[Volume] +[Wireless] +UpdateFrequency = 2 diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie new file mode 100755 index 0000000000..3fe4d0cdf8 --- /dev/null +++ b/packages/opie-init/opie-init/opie @@ -0,0 +1,90 @@ +#!/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 + +if [ ! -x "$OPIEDIR/bin/qpe" ] ; then + echo Opie not installed + exit 0 +fi + +. /etc/profile + +if [ ! -e $TSLIB_TSDEVICE ]; then + export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice +fi + +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 + + # Turn off psplash if any - sleep is required for anti-race + if [ -e /mnt/.psplash ]; then + TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + sleep 1 + fi + + if [ -x "$OPIEDIR/bin/opie-login" ]; then + echo Starting Opie-login.... + $OPIEDIR/bin/opie-login -terminal 3 + 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 3 + 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/opie-reorgfiles b/packages/opie-init/opie-init/opie-reorgfiles new file mode 100755 index 0000000000..96b3e29da4 --- /dev/null +++ b/packages/opie-init/opie-init/opie-reorgfiles @@ -0,0 +1,93 @@ +#!/bin/sh + +APPS=$HOME/Applications +DOCS=$HOME/Documents + +if [ -d $APPS -a "$1" != "-f" ] +then + echo "You seem to already have a $APPS directory." + echo "Assuming it is the Opie Applications directory. Exiting." + exit 0 +fi + +if [ -d $HOME/Apps ] +then + mv $HOME/Apps $APPS +else + mkdir $APPS +fi + +if [ -f $DOCS/addressbook.xml ] +then + if [ -f $APPS/addressbook/addressbook.xml ] + then + echo "$DOCS/addressbook.xml conflicts with $APPS/addressbook/addressbook.xml" + echo "Moving $DOCS/addressbook.xml to $HOME" + mv $DOCS/addressbook.xml $HOME + else + mkdir $APPS/addressbook + mv $DOCS/addressbook.xml $APPS/addressbook + fi +fi + +if [ -f $DOCS/datebooksettings.xml ] +then + echo "$DOCS/datebooksettings.xml is obsolete" + echo "Please re-set your datebook preferences" + rm $DOCS/datebooksettings.xml +fi + +if [ -f $DOCS/datebook.xml ] +then + mkdir $APPS/databook + mv $DOCS/datebook.xml $APPS/databook +fi + +if [ -d $DOCS/qtmail ] +then + mv $DOCS/qtmail $APPS/ +fi + +if [ -f $DOCS/todo.xml ] +then + if [ -f $APPS/todolist/todolist.xml ] + then + mv $DOCS/todo.xml $HOME + echo "$DOCS/todo.xml is superceded by $APPS/todolist/todolist.xml" + echo "$DOCS/todo.xml has been moved to $HOME" + else + echo "NOTE: $DOCS/todo.xml is obsolete. It will move to $APPS/todolist/todolist.xml" + echo "when next you run the latest ToDo application." + fi +fi + +if [ ! -d $APPS/qimpen ] +then + mkdir $APPS/qimpen +fi + +if [ -f $DOCS/asciilower.qpt ] +then + mv $DOCS/asciilower.qpt $APPS/qimpen +fi + +if [ -f $DOCS/asciiupper.qpt ] +then + mv $DOCS/asciiupper.qpt $APPS/qimpen +fi + +if [ -f $DOCS/numeric.qpt ] +then + mv $DOCS/numeric.qpt $APPS/qimpen +fi + +if [ -d "$HOME/.qpe" ] +then + if [ -d "$HOME/Settings" ] + then + mv $HOME/.qpe/* "$HOME/Settings" + rmdir "$HOME/.qpe" + else + mv $HOME/.qpe "$HOME/Settings" + fi +fi diff --git a/packages/opie-init/opie-init/opie_defaults b/packages/opie-init/opie-init/opie_defaults new file mode 100644 index 0000000000..7de76e4276 --- /dev/null +++ b/packages/opie-init/opie-init/opie_defaults @@ -0,0 +1,15 @@ +#!/bin/sh + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`" +KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`" + +case "$MACHINE" in +*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;; +esac + +export QTDIR="/opt/QtPalmtop" +export OPIEDIR="$QTDIR" +export QPEDIR="$QTDIR" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib" +export PATH="$PATH:$OPIEDIR/bin" + diff --git a/packages/opie-init/opie-init/qpe.conf b/packages/opie-init/opie-init/qpe.conf new file mode 100644 index 0000000000..59bb20c762 --- /dev/null +++ b/packages/opie-init/opie-init/qpe.conf @@ -0,0 +1,18 @@ +[Appearance] +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 9 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 9 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/simpad/.mtn2git_empty b/packages/opie-init/opie-init/simpad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/simpad/qpe.conf b/packages/opie-init/opie-init/simpad/qpe.conf new file mode 100644 index 0000000000..b10d90b94e --- /dev/null +++ b/packages/opie-init/opie-init/simpad/qpe.conf @@ -0,0 +1,18 @@ +[Appearance] +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 12 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 12 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/spitz/.mtn2git_empty b/packages/opie-init/opie-init/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/spitz/qpe.conf b/packages/opie-init/opie-init/spitz/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/spitz/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/tosa/.mtn2git_empty b/packages/opie-init/opie-init/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/tosa/qpe.conf b/packages/opie-init/opie-init/tosa/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/tosa/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_cvs.bb new file mode 100644 index 0000000000..b45baeb5ae --- /dev/null +++ b/packages/opie-init/opie-init_cvs.bb @@ -0,0 +1,11 @@ +require ${PN}.inc +PV = "${OPIE_CVS_PV}" +PR = "r0" + +SRC_URI = "file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults" + +SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 4c357f54b6..8dae3b2484 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -27,10 +27,7 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -inherit opie update-rc.d - -INITSCRIPT_NAME = "opie" -INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." +inherit opie do_configure_prepend() { ln -s ${WORKDIR}/calibrate ${S}/calibrate @@ -56,16 +53,13 @@ do_install() { install -d ${D}${palmtopdir}/pics/launcher install -d ${D}${palmtopdir}/pics/logo install -d ${D}${palmtopdir}/pics/RoH/star/ - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/profile.d install -d ${D}${palmtopdir}/etc/colors install -d ${D}${palmtopdir}/etc/skel + install -d ${D}${sysconfdir} install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe - install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/ - install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ for p in ${PICS} do @@ -80,33 +74,8 @@ do_install() { install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/ install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/ - install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie - install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ - - if [ -s ${WORKDIR}/locale.conf ]; then - install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ - fi - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/ - - case ${MACHINE} in - c7x0) - install -d ${D}${sysconfdir}/apm/event.d/ - install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh - ;; - *) - ;; - esac -} - -updatercd_postinst_mnci() { -if test "x$D" != "x"; then - D="-r $D" -else - D="" # do not autostart at installation time -fi -update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} } FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics" diff --git a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie deleted file mode 100755 index 84f3b3e673..0000000000 --- a/packages/opie-taskbar/opie-taskbar/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-taskbar/opie-taskbar/c7x0/qpe-suspend-resume b/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume deleted file mode 100644 index be37519512..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -QTDIR=/opt/QtPalmtop -LD_LIBRARY_PATH=$QTDIR -export LD_LIBRARY_PATH QTDIR -LOGGING=0 -log() { - if [ $LOGGING -eq 1 ]; then - echo "$(date +%y/%m/%d-%H:%m:%S): $@" >> /var/log/qte.log - fi -} - -retcode=1 -tries=3 - -if [ "$1" = suspend ]; then - while [ $retcode -ne 0 -a $tries -gt 0 ]; do - log "-> $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'" - $QTDIR/bin/qcop QPE/System 'aboutToSuspend()' - retcode=$? - tries=`expr $tries - 1` - log "<- Result $retcode" - done -elif [ "$1" = resume ]; then - while [ $retcode -ne 0 -a $tries -gt 0 ]; do - log "-> $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'" - $QTDIR/bin/qcop QPE/System 'returnFromSuspend()' - retcode=$? - tries=`expr $tries - 1` - log "<- Result $retcode" - done -fi - diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf b/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/locale.conf b/packages/opie-taskbar/opie-taskbar/locale.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/mnci/opie b/packages/opie-taskbar/opie-taskbar/mnci/opie deleted file mode 100755 index d5e2955b10..0000000000 --- a/packages/opie-taskbar/opie-taskbar/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-taskbar/opie-taskbar/mnci/qpe.conf b/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf deleted file mode 100644 index 8efe771ad0..0000000000 --- a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf +++ /dev/null @@ -1,25 +0,0 @@ -[Appearance] -Decoration = libflat.so -FontFamily = vera -FontSize = 10 -FontStyle = Regular -LeftHand = 0 -Style = libflatstyle.so -rotatedir = 0 -[Battery] -[Date] -ClockApplet = 0 -LongOrder = 273 -Separator = . -ShortOrder = 273 -[InputMethod] -current = Multikey -[Keyboard] -[Startup] -FirstUse = 0 -[Time] -AMPM = 0 -MONDAY = 1 -[Volume] -[Wireless] -UpdateFrequency = 2 diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie deleted file mode 100755 index 3fe4d0cdf8..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie +++ /dev/null @@ -1,90 +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 - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -if [ ! -e $TSLIB_TSDEVICE ]; then - export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice -fi - -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 - - # Turn off psplash if any - sleep is required for anti-race - if [ -e /mnt/.psplash ]; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - sleep 1 - fi - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 3 - 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 3 - 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-taskbar/opie-taskbar/opie-reorgfiles b/packages/opie-taskbar/opie-taskbar/opie-reorgfiles deleted file mode 100755 index 96b3e29da4..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -APPS=$HOME/Applications -DOCS=$HOME/Documents - -if [ -d $APPS -a "$1" != "-f" ] -then - echo "You seem to already have a $APPS directory." - echo "Assuming it is the Opie Applications directory. Exiting." - exit 0 -fi - -if [ -d $HOME/Apps ] -then - mv $HOME/Apps $APPS -else - mkdir $APPS -fi - -if [ -f $DOCS/addressbook.xml ] -then - if [ -f $APPS/addressbook/addressbook.xml ] - then - echo "$DOCS/addressbook.xml conflicts with $APPS/addressbook/addressbook.xml" - echo "Moving $DOCS/addressbook.xml to $HOME" - mv $DOCS/addressbook.xml $HOME - else - mkdir $APPS/addressbook - mv $DOCS/addressbook.xml $APPS/addressbook - fi -fi - -if [ -f $DOCS/datebooksettings.xml ] -then - echo "$DOCS/datebooksettings.xml is obsolete" - echo "Please re-set your datebook preferences" - rm $DOCS/datebooksettings.xml -fi - -if [ -f $DOCS/datebook.xml ] -then - mkdir $APPS/databook - mv $DOCS/datebook.xml $APPS/databook -fi - -if [ -d $DOCS/qtmail ] -then - mv $DOCS/qtmail $APPS/ -fi - -if [ -f $DOCS/todo.xml ] -then - if [ -f $APPS/todolist/todolist.xml ] - then - mv $DOCS/todo.xml $HOME - echo "$DOCS/todo.xml is superceded by $APPS/todolist/todolist.xml" - echo "$DOCS/todo.xml has been moved to $HOME" - else - echo "NOTE: $DOCS/todo.xml is obsolete. It will move to $APPS/todolist/todolist.xml" - echo "when next you run the latest ToDo application." - fi -fi - -if [ ! -d $APPS/qimpen ] -then - mkdir $APPS/qimpen -fi - -if [ -f $DOCS/asciilower.qpt ] -then - mv $DOCS/asciilower.qpt $APPS/qimpen -fi - -if [ -f $DOCS/asciiupper.qpt ] -then - mv $DOCS/asciiupper.qpt $APPS/qimpen -fi - -if [ -f $DOCS/numeric.qpt ] -then - mv $DOCS/numeric.qpt $APPS/qimpen -fi - -if [ -d "$HOME/.qpe" ] -then - if [ -d "$HOME/Settings" ] - then - mv $HOME/.qpe/* "$HOME/Settings" - rmdir "$HOME/.qpe" - else - mv $HOME/.qpe "$HOME/Settings" - fi -fi diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-taskbar/opie-taskbar/opie_defaults deleted file mode 100644 index 7de76e4276..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie_defaults +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`" -KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`" - -case "$MACHINE" in -*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;; -esac - -export QTDIR="/opt/QtPalmtop" -export OPIEDIR="$QTDIR" -export QPEDIR="$QTDIR" -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib" -export PATH="$PATH:$OPIEDIR/bin" - diff --git a/packages/opie-taskbar/opie-taskbar/qpe.conf b/packages/opie-taskbar/opie-taskbar/qpe.conf deleted file mode 100644 index 59bb20c762..0000000000 --- a/packages/opie-taskbar/opie-taskbar/qpe.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Appearance] -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 9 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 9 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = libphasestyle.so -Text = #000000 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf b/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf deleted file mode 100644 index b10d90b94e..0000000000 --- a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Appearance] -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 12 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 12 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = libphasestyle.so -Text = #000000 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index c6151d2327..497bff0953 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ @@ -10,10 +10,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 41119484c1..6ff5a5ef66 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 = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -11,10 +11,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " -- cgit v1.2.3 From f6833e0713ac54ca7dd9017ce012fc12e37d6409 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 15:51:21 +0000 Subject: task-opie: Include opie-init in task-opie-base. --- packages/tasks/task-opie.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 616968ea36..c4f493b80d 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r5" +PR = "r6" PACKAGES = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -27,7 +27,7 @@ PACKAGES += "task-opie-everything" # # Dependencies to get the launcher up and running # -RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ +RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ opie-pics opie-sounds opie-freetype ttf-dejavu-sans \ ttf-dejavu-sans-mono" -- cgit v1.2.3 From 5a2b19f3c9fbb5621696b4f20a04e39f251e7df9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Mar 2007 16:00:24 +0000 Subject: gammu: updated to 1.10.0 --- packages/gammu/files/.mtn2git_empty | 0 packages/gammu/files/ldflags-again.patch | 13 ++++++ packages/gammu/gammu_1.07.00.bb | 75 ------------------------------- packages/gammu/gammu_1.10.0.bb | 77 ++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 75 deletions(-) create mode 100644 packages/gammu/files/.mtn2git_empty create mode 100644 packages/gammu/files/ldflags-again.patch delete mode 100644 packages/gammu/gammu_1.07.00.bb create mode 100644 packages/gammu/gammu_1.10.0.bb (limited to 'packages') diff --git a/packages/gammu/files/.mtn2git_empty b/packages/gammu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gammu/files/ldflags-again.patch b/packages/gammu/files/ldflags-again.patch new file mode 100644 index 0000000000..90311e5f39 --- /dev/null +++ b/packages/gammu/files/ldflags-again.patch @@ -0,0 +1,13 @@ +Index: gammu-1.10.0/cfg/Makefile.glo +=================================================================== +--- gammu-1.10.0.orig/cfg/Makefile.glo 2007-03-30 17:55:18.000000000 +0200 ++++ gammu-1.10.0/cfg/Makefile.glo 2007-03-30 17:55:46.000000000 +0200 +@@ -152,7 +152,7 @@ + + $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) + @echo Linking gammu-shared +- @$(CC) -L$(TOPDIR)/common -lGammu $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared ++ @$(CC) -L$(TOPDIR)/common -lGammu $(LDLIBS) $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared + + shared: $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(TOPDIR)/common/$(LIBGAMMU_STATIC) $(TOPDIR)/gammu/gammu-shared + diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb deleted file mode 100644 index 49a2f21399..0000000000 --- a/packages/gammu/gammu_1.07.00.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRIPTION = "GNU All Mobile Managment Utilities" -SECTION = "console/network" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html" -AUTHOR = "Marcin Wiacek " - -SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz " - -EXTRA_OECONF = "--disable-mysql" - -inherit autotools - -do_compile () { - oe_runmake shared -} - -do_stage() { - install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ - ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ - ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \ - ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ - ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ - ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ - ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \ - ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \ - ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \ - ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \ - ${STAGING_INCDIR}/gammu/protocol/alcatel - - oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} - - install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ - install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc - install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding - install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone - install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at - install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex - install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia - install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku - install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian - install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel - install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service - install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms - install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup - install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device - install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda - install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth - install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial - install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol - install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at - install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex - install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia - install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian - install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel -} - -do_install () { - oe_runmake 'DESTDIR=${D}' installshared -} - -PACKAGES =+ "libgammu" - -FILES_${PN} = "${bindir}/gammu" -FILES_libgammu = "${libdir}/libGammu.so*" - -PACKAGES_DYNAMIC = "gammu-locale-*" - -python populate_packages_prepend () { - help_dir = bb.data.expand('${datadir}/gammu/', d) - - do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') -} diff --git a/packages/gammu/gammu_1.10.0.bb b/packages/gammu/gammu_1.10.0.bb new file mode 100644 index 0000000000..9e3f611697 --- /dev/null +++ b/packages/gammu/gammu_1.10.0.bb @@ -0,0 +1,77 @@ +DESCRIPTION = "GNU All Mobile Managment Utilities" +SECTION = "console/network" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +HOMEPAGE = "http://www.gammu.org/" + +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ + file://ldflags-again.patch;patch=1" + +EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}" + +EXTRA_LDFLAGS = "-lbluetooth2" + +inherit autotools + +do_compile () { + oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth' +} + +do_stage() { + install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ + ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ + ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ + ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \ + ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ + ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ + ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ + ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \ + ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \ + ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \ + ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \ + ${STAGING_INCDIR}/gammu/protocol/alcatel + + oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} + + install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ + install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc + install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding + install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone + install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at + install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex + install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia + install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 + install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 + install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian + install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel + install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service + install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms + install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup + install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device + install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda + install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth + install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial + install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol + install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at + install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex + install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia + install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian + install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel +} + +do_install () { + oe_runmake 'DESTDIR=${D}' installshared +} + +PACKAGES =+ "libgammu" + +FILES_${PN} = "${bindir}/gammu" +FILES_libgammu = "${libdir}/libGammu.so*" + +PACKAGES_DYNAMIC = "gammu-locale-*" + +python populate_packages_prepend () { + help_dir = bb.data.expand('${datadir}/gammu/', d) + + do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') +} -- cgit v1.2.3 From 19b86e3f9cbfeb02d41ab676689a88ba5749eba8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:03:45 +0000 Subject: foonas-init: Remove --- packages/foonas-init/files/initscripts/fixfstab | 91 ---------------------- .../foonas-init/files/initscripts/loadmodules.sh | 11 --- packages/foonas-init/files/initscripts/rmrecovery | 4 - .../foonas-init/files/initscripts/sysconfsetup | 46 ----------- .../foonas-init/files/initscripts/syslog.buffer | 23 ------ packages/foonas-init/files/initscripts/syslog.file | 23 ------ .../foonas-init/files/initscripts/syslog.network | 28 ------- .../foonas-init/files/initscripts/umountinitrd.sh | 34 -------- 8 files changed, 260 deletions(-) delete mode 100644 packages/foonas-init/files/initscripts/fixfstab delete mode 100644 packages/foonas-init/files/initscripts/loadmodules.sh delete mode 100644 packages/foonas-init/files/initscripts/rmrecovery delete mode 100644 packages/foonas-init/files/initscripts/sysconfsetup delete mode 100644 packages/foonas-init/files/initscripts/syslog.buffer delete mode 100644 packages/foonas-init/files/initscripts/syslog.file delete mode 100644 packages/foonas-init/files/initscripts/syslog.network delete mode 100644 packages/foonas-init/files/initscripts/umountinitrd.sh (limited to 'packages') diff --git a/packages/foonas-init/files/initscripts/fixfstab b/packages/foonas-init/files/initscripts/fixfstab deleted file mode 100644 index 67116a12fd..0000000000 --- a/packages/foonas-init/files/initscripts/fixfstab +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# validate /etc/fstab against the current UUID list in -# /etc/uuid_by_partition -# -. /etc/default/functions -pfile=/etc/uuid_by_partition - -# -# use debug to find out what is going on -test "$1" = start -o "$1" = debug || exit 0 - -# -# obtain the current list of parititions with UUIDs -newlist="$(uuid_by_partition)" - -if test -r "$pfile" -then - # read the old list - oldlist="$(cat "$pfile")" - # - # if it hasn't changed nothing need be done - test "$newlist" = "$oldlist" && exit 0 - # - # it has changed, but this only matters if - # a previously existing uuid has moved, build - # a list of old device vs new device for every - # uuid which has moved - changedlist="$( - { echo "$oldlist" - echo "$newlist" - } | awk 'device[$2] == ""{device[$2] = $1} - device[$2] != $1{print device[$2], $1}')" - - if test -n "$changedlist" - then - # at least one partition has moved, scan the - # current fstab to see if it has a reference - # to this partition - changedfstab="$( - { echo "$changedlist" - echo '#fstab' - cat /etc/fstab - } | awk 'BEGIN{list=1} - list==1 && $0=="#fstab"{list=0; continue} - list==1{new[$1] = $2; continue} - new[$1] != ""{print $1, new[$1]}')" - - # if this list is not empty edit the fstab - if test -n "$changedfstab" - then - rm -f /tmp/fstab.$$ - # if the edit fails then do not overwrite the old - # partition list - just exit with an error - { echo "$changedlist" - echo '#fstab' - cat /etc/fstab - } | awk 'BEGIN{list=1} - list==1 && $0=="#fstab"{list=0; continue} - list==1{new[$1] = $2; continue} - new[$1] != ""{$1 = new[$1]} - {print}' >/tmp/fstab.$$ || { - if test "$1" = start - then - logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: awk failed" - else - echo "debug: awk script failed with:" >&2 - echo "$changedlist" >&2 - echo "output in /tmp/fstab.$$" >&2 - fi - exit 1 - } - - if test "$1" = start - then - mv /tmp/fstab.$$ /etc/fstab || { - logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: update failed" - exit 1 - } - else - echo "debug: fstab changed:" - diff -u /etc/fstab /tmp/fstab.$$ - fi - fi - fi -fi - -# write the new list to the file, only if we -# are doing something... -test "$1" = start && echo "$newlist" >"$pfile" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/loadmodules.sh b/packages/foonas-init/files/initscripts/loadmodules.sh deleted file mode 100644 index c5d44d1067..0000000000 --- a/packages/foonas-init/files/initscripts/loadmodules.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. /etc/default/modulefunctions # Load module loading logic - -loadnetmods - -loaddiskmods - -loadmiscmods - -exit 0 diff --git a/packages/foonas-init/files/initscripts/rmrecovery b/packages/foonas-init/files/initscripts/rmrecovery deleted file mode 100644 index eec822b154..0000000000 --- a/packages/foonas-init/files/initscripts/rmrecovery +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Run to remove /.recovery if the boot seems to have succeeded -test -e /.recovery && rm -f /.recovery -exit 0 diff --git a/packages/foonas-init/files/initscripts/sysconfsetup b/packages/foonas-init/files/initscripts/sysconfsetup deleted file mode 100644 index a4f9074d9c..0000000000 --- a/packages/foonas-init/files/initscripts/sysconfsetup +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# This script is run once when the system first boots. Its sole -# purpose is to create /etc/default/sysconf (the overall system -# configuration file) and other files derived from this. -# -# The script runs immediately after S10checkroot.sh - this is the -# point at which the rootfs will be mounted rw even if the kernel -# booted with it ro. -# -# rm or mv the file (/etc/default/sysconf) to recreate it, run this -# script with the reload option to overwrite the system files. The -# configuration files described in sysconf_reload (in -# /sbin/sysconf) will be overwritten on reload. -# -# start: standard startup, do a complete (auto) restore if necessary -# reinit: always do a complete auto restore -# reload: just reload sysconf (no config files!) -# -# /etc/default/functions contains useful utility functions - it's -# in a separate file so that it can be loaded by any script -. /etc/default/functions -load_functions sysconf || exit 1 -# -case "$1" in -start) test -s /etc/default/sysconf || { - if sysconf_read - then - if sysconf_valid - then - sysconf_restore auto - else - sysconf_reload - fi - else - sysconf_default - sysconf_reload - fi - };; - -reload) test -s /etc/default/sysconf || sysconf_read || sysconf_default - sysconf_reload;; - -reinit) sysconf_restore auto;; - -*) ;; -esac diff --git a/packages/foonas-init/files/initscripts/syslog.buffer b/packages/foonas-init/files/initscripts/syslog.buffer deleted file mode 100644 index 9285c02946..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.buffer +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses (only) 'buffer' as the DESTINATION -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= - -for d in $DESTINATION -do - case "$d" in - buffer) doit=1;; - file) exit 0;; - remote) exit 0;; - *) echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -test -n "$doit" -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/syslog.file b/packages/foonas-init/files/initscripts/syslog.file deleted file mode 100644 index 80ee5f0174..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.file +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses 'file' (and, optionally, buffer) as the DESTINATION -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= - -for d in $DESTINATION -do - case "$d" in - buffer) :;; - file) doit=1;; - remote) exit 0;; - *) echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -test -n "$doit" -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/syslog.network b/packages/foonas-init/files/initscripts/syslog.network deleted file mode 100644 index 3d7f4ab8e6..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.network +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses 'remote', or doesn't use 'buffer' or 'file' -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= -doneit= - -for d in $DESTINATION -do - case "$d" in - buffer) doneit=1;; - file) doneit=1;; - remote) doit=1;; - *) doit=1 - echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -# One of doneit or doit is set unless the DESTINATION value -# is empty (which is probably an error), let syslog handle -# the error. -test \( -n "$doit" -o -z "$doneit" \) -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/umountinitrd.sh b/packages/foonas-init/files/initscripts/umountinitrd.sh deleted file mode 100644 index b590ae68b5..0000000000 --- a/packages/foonas-init/files/initscripts/umountinitrd.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# umount /mnt, which is where the initrd ends up mounted -# if the directory /initrd is not present, if this fails -# then the /initrd is mounted and we want to remount that -# ro - this works round the shutdown -r hang problem -. /etc/default/functions -# -# if we are turnup'ed to disk, then just unmount the initrd all together -# -if [ -e /initrd/dev/.devfsd ]; then - [ "$VERBOSE" = "very" ] && echo "Unmounting initrd..." - umount /initrd/dev - umount /initrd - exit 0 -fi - -while read device directory remainder -do - case "$directory" in - /mnt) echo "InitRD: unmount initrd on /mnt" >&2 - umount /mnt;; - /initrd)# need the device for a remount - ffspart=Flashdisk - ffsdev="$(mtblockdev $ffspart)" - echo "InitRD: remount $ffdev read-only on /initrd" >&2 - if test -n "$ffsdev" -a -b "$ffsdev" - then - mount -o remount,ro "$ffsdev" /initrd - else - echo "Flashdisk: $ffsdev: flash device not found" >&2 - fi;; - esac -done Date: Fri, 30 Mar 2007 16:04:23 +0000 Subject: foonas-image: Remove --- packages/images/foonas-image.bb | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 packages/images/foonas-image.bb (limited to 'packages') diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb deleted file mode 100644 index 8dc2370b5e..0000000000 --- a/packages/images/foonas-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Foonas image" -LICENSE = "GPL" -PR = "r0" - -inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image - -DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" - -EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" -IMAGE_LINGUAS = "" - -RDEPENDS = " \ - base-files base-passwd netbase \ - busybox initscripts foonas-init \ - update-modules sysvinit tinylogin \ - module-init-tools-depmod modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - libgcc1 diffutils cpio findutils\ - dropbear e2fsprogs-blkid \ - mdadm hdparm mtd-utils udev \ - ${FOONAS_SUPPORT} \ - ${FOONAS_KERNEL} " - -PACKAGE_INSTALL = "${RDEPENDS}" - -- cgit v1.2.3 From 58116a9c2ff841a75490b61eca4065fca3dfed93 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:06:35 +0000 Subject: task-base: Add COMBINED_FEATURES uboot and redboot, DISTRO_FEATURES raid (empty right now) --- packages/tasks/task-base.bb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4d16501d6b..17fc9a30f5 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 = "r21" +PR = "r20" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -38,9 +38,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # irda # pci # pcmcia +# redboot +# uboot # usbgadget # usbhost + DISTRO_CORE_PACKAGE ?= "task-base-core-default" # @@ -62,9 +65,12 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" @@ -247,6 +253,12 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " +task-base-uboot-rdepends = "\ + uboot-utils" + +task-base-redboot-rdepends = "\ + fis" + task-distro-ppp-rdepends = "\ ppp \ ppp-dialin" @@ -293,6 +305,8 @@ task-distro-nfs-rrecommends = "\ kernel-module-lockd \ kernel-module-sunrpc" +task-distro-raid-rdepends = "\ + " # Tosort # kernel-module-ipv6 -- cgit v1.2.3 From e88fcc32fd9d0fbf9088f92fc48e14660fe05902 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 16:20:32 +0000 Subject: util-macros: update -native to 1.1.5, needed for R7.2 --- packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb (limited to 'packages') diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb new file mode 100644 index 0000000000..64e0550571 --- /dev/null +++ b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" + +SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ + file://unbreak_cross_compile.patch;patch=1 " + +S = "${WORKDIR}/util-macros-1.1.5" + +inherit native autotools pkgconfig + -- cgit v1.2.3 From 71dc066d7015b1b544f64cd4e47b8af483ccbb2b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:27:55 +0000 Subject: uboot-utils: Update and move to uboot/ --- .../uboot-utils/files/turbostation/fw_env.config | 15 -------- packages/uboot/uboot-utils_1.1.2.bb | 43 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) delete mode 100644 packages/uboot-utils/files/turbostation/fw_env.config create mode 100644 packages/uboot/uboot-utils_1.1.2.bb (limited to 'packages') diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config deleted file mode 100644 index 97ce8a87d4..0000000000 --- a/packages/uboot-utils/files/turbostation/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/saveenv) utility. -# Up to two entries are valid, in this case the redundand -# environment sector is assumed present. - -# MTD device name Device offset Env. size Flash sector size - -# Primary U-Boot environment. You shouldn't need to touch this. If you touch this, -# you should be *very* sure about what you're doing if you don't have a serial -# cable attached! -# /dev/mtd4 0x00000 0x20000 0x20000 - -# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily -# render your turbostation unbootable! - -/dev/mtd5 0x00000 0x20000 0x20000 \ No newline at end of file diff --git a/packages/uboot/uboot-utils_1.1.2.bb b/packages/uboot/uboot-utils_1.1.2.bb new file mode 100644 index 0000000000..8a5d7dce3c --- /dev/null +++ b/packages/uboot/uboot-utils_1.1.2.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "mtd-utils" +PR = "r5" + +SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ + file://fw_env.c.patch;patch=1 \ + file://tools-Makefile.patch;patch=1 \ + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" + +S = "${WORKDIR}/u-boot-${PV}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +UBOOT_MACHINE ?= "${MACHINE}_config" + +inherit base + +do_configure() { + : +} + +do_compile () { + oe_runmake Sandpoint8240_config + oe_runmake tools +} + +# install mkimage for the kernel makefile +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + install -d ${D}/sbin + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv +} -- cgit v1.2.3 From 2bc2878dccee1da654d411b66c5a59972194f8dc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 16:28:25 +0000 Subject: opie-init: Drop reference to OPIE_CVS_PV, use explicit version, these are anyway not in OPIE CVS. --- packages/opie-init/opie-init_1.2.2.bb | 10 ++++++++++ packages/opie-init/opie-init_cvs.bb | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 packages/opie-init/opie-init_1.2.2.bb delete mode 100644 packages/opie-init/opie-init_cvs.bb (limited to 'packages') diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb new file mode 100644 index 0000000000..271ff62e51 --- /dev/null +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -0,0 +1,10 @@ +require ${PN}.inc +PR = "r0" + +SRC_URI = "file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults" + +SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_cvs.bb deleted file mode 100644 index b45baeb5ae..0000000000 --- a/packages/opie-init/opie-init_cvs.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc -PV = "${OPIE_CVS_PV}" -PR = "r0" - -SRC_URI = "file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" -- cgit v1.2.3 From 1650a1f5030b5206eb259c1c7a879cdfb86d2e2d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 16:37:45 +0000 Subject: drm: remove in favour of libdrm --- packages/dri/drm_cvs.bb | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 packages/dri/drm_cvs.bb (limited to 'packages') diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb deleted file mode 100644 index 8e219880d0..0000000000 --- a/packages/dri/drm_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/base" -LICENSE = "MIT" -SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver" - -PV = "0.0+cvs${SRCDATE}" -PR = "r3" - -S = "${WORKDIR}/drm" - -inherit autotools pkgconfig - -do_compile() { - oe_runmake -C libdrm -} - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From 26ee96a31a0e213fba9543171b048ba9066065ae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 16:39:46 +0000 Subject: xorg-xserver-common.inc: drm -> libdrm --- packages/xorg-xserver/xorg-xserver-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index fcfec6d4f7..634d6eb835 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -8,7 +8,7 @@ PROVIDES = "virtual/xserver" MESA_VER ?= "6.5" DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ -xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ +xf86driproto libdrm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ -- cgit v1.2.3 From 5c15ba55b0f04c46103fe564bb9b732b783578b9 Mon Sep 17 00:00:00 2001 From: Manuel Teira Date: Fri, 30 Mar 2007 16:49:21 +0000 Subject: starling: add SVN version - close #2063 --- packages/starling/starling_svn.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/starling/starling_svn.bb (limited to 'packages') diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb new file mode 100644 index 0000000000..25d445f6ee --- /dev/null +++ b/packages/starling/starling_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Starling audio player for GPE" +SECTION = "gpe/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" +RDEPENDS = "esd \ + gst-plugin-audioconvert \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-modplug \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +PV = "0.1+svn${SRCDATE}" + + +inherit gpe autotools + +SRC_URI = "${GPE_EXTRA_SVN}" + +S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 5dcc8301f347b05837c88eb7a0d73acbd0900992 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:51:41 +0000 Subject: linux-linkstationppc: Update defconfig --- packages/linux/linux-linkstationppc/defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-linkstationppc/defconfig b/packages/linux/linux-linkstationppc/defconfig index b47010f1c7..385f7826f0 100644 --- a/packages/linux/linux-linkstationppc/defconfig +++ b/packages/linux/linux-linkstationppc/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-rc1 -# Wed Feb 21 22:29:14 2007 +# Linux kernel version: 2.6.21-rc4 +# Sun Mar 25 15:52:14 2007 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y # CONFIG_GENERIC_TBSYNC is not set CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_BUG=y -# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_DEFAULT_UIMAGE=y # # Processor support @@ -73,6 +73,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -700,7 +701,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -1574,6 +1574,7 @@ CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1639,7 +1640,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set CONFIG_RTC_DRV_RS5C372=y # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_TEST is not set -- cgit v1.2.3 From 84b73c36e73e10b7fb44c762baebf00763a734a2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 17:45:20 +0000 Subject: mplayer: add powerpc support --- packages/mplayer/files/powerpc-is-ppc.diff | 11 +++++++++++ packages/mplayer/mplayer_0.0+1.0rc1.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/mplayer/files/powerpc-is-ppc.diff (limited to 'packages') diff --git a/packages/mplayer/files/powerpc-is-ppc.diff b/packages/mplayer/files/powerpc-is-ppc.diff new file mode 100644 index 0000000000..f8143c460e --- /dev/null +++ b/packages/mplayer/files/powerpc-is-ppc.diff @@ -0,0 +1,11 @@ +--- /tmp/configure 2007-03-30 19:40:34.000000000 +0200 ++++ MPlayer-1.0rc1/configure 2007-03-30 19:40:58.795251000 +0200 +@@ -1213,7 +1213,7 @@ + _optimizing='' + ;; + +- ppc) ++ ppc|powerpc) + _def_arch='#define ARCH_POWERPC 1' + _def_dcbzl='#define NO_DCBZL 1' + _target_arch='TARGET_ARCH_POWERPC = yes' diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 3a388d21e3..2910cbd0a4 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://makefile-nostrip.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1 \ + file://powerpc-is-ppc.diff;patch=1 \ file://pxa_configure.patch;patch=1 \ file://pxa-video_out.patch;patch=1 " @@ -33,7 +34,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r11" +PR = "r12" PARALLEL_MAKE = "" -- cgit v1.2.3 From d94cd14b70790a834f87ad0f72c7e9e6020b8da9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 17:52:49 +0000 Subject: libopie2: Fix packaging of dev/dbg. --- packages/libopie/libopie2.inc | 18 +++++++++--------- packages/libopie/libopie2_1.2.2.bb | 2 +- packages/libopie/libopie2_cvs.bb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 1e0d4f1b9a..17cc4be40d 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -78,22 +78,22 @@ do_install() { done } -PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2" +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 = "${palmtopdir}/lib/libopiecore2.so.*" DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library" -FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*" +FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*" DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library" -FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*" +FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*" DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library" -FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*" +FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*" DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library" -FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*" +FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*" DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library" -FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*" +FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*" DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library" -FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*" +FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*" DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library" -FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so*" +FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*" diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 1bef43c329..8409e4c523 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 4a3d3c28c5..39376a84fc 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 = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 7b297dc027dab0a74b755934e00a697abaf9b6ad Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Mar 2007 18:04:53 +0000 Subject: slugos-init: Add support for handing boot control over to altboot. --- packages/slugos-init/files/turnup | 13 ++++++++++++- packages/slugos-init/slugos-init_0.10.bb | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 556d942e26..119d84f2c8 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -372,6 +372,8 @@ boot_rootfs() { nfs) shift 2;; flash) ;; ram) ;; + altboot) + ;; *) echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2 return 1;; esac @@ -405,6 +407,11 @@ boot_rootfs() { echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2 return 1 };; + altboot) + ln -s "boot/altboot" "$ffs"/linuxrc.new || { + echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2 + return 1 + };; *) { echo '#!/bin/sh' # echo 'modprobe ehci-hcd' # echo 'modprobe ohci-hcd' @@ -572,7 +579,7 @@ boot_reset() { local ffs typ status case "$1" in - flash|ram)type="$1" + flash|ram|altboot)type="$1" shift;; *) echo "turnup: boot_reset($1): invalid type" >&2 return 1;; @@ -799,6 +806,8 @@ nfs) shift nfs "$@";; flash) boot_reset flash;; ram) boot_reset ram;; +altboot) + boot_reset altboot;; preserve) shift sysconf save "$@";; @@ -841,6 +850,8 @@ usage: turnup command [options] ram Boot (once) into a ramdisk, subsequent boots will be to the flash file system. + altboot + Hand over boot control to the altboot utility. preserve Save the system configuration to the SysConf partition, you will need to create the SysConf partition from the boot loader diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 56f3c7242a..90ad6f4cee 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r80" +PR = "r81" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -102,6 +102,9 @@ do_install() { install -m 0755 boot/$p ${D}/boot done + # Support for altboot + ln -s /sbin/init.altboot ${D}/boot/altboot + # Configuration files install -m 0644 conffiles ${D}${sysconfdir}/default -- cgit v1.2.3 From 49464dcea63bcd4fc2599216b71e78617912f16e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Mar 2007 18:25:11 +0000 Subject: slugos-init: Remove special altboot support - turnup flash is all that is required. --- packages/slugos-init/files/turnup | 13 +------------ packages/slugos-init/slugos-init_0.10.bb | 5 +---- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 119d84f2c8..556d942e26 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -372,8 +372,6 @@ boot_rootfs() { nfs) shift 2;; flash) ;; ram) ;; - altboot) - ;; *) echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2 return 1;; esac @@ -407,11 +405,6 @@ boot_rootfs() { echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2 return 1 };; - altboot) - ln -s "boot/altboot" "$ffs"/linuxrc.new || { - echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2 - return 1 - };; *) { echo '#!/bin/sh' # echo 'modprobe ehci-hcd' # echo 'modprobe ohci-hcd' @@ -579,7 +572,7 @@ boot_reset() { local ffs typ status case "$1" in - flash|ram|altboot)type="$1" + flash|ram)type="$1" shift;; *) echo "turnup: boot_reset($1): invalid type" >&2 return 1;; @@ -806,8 +799,6 @@ nfs) shift nfs "$@";; flash) boot_reset flash;; ram) boot_reset ram;; -altboot) - boot_reset altboot;; preserve) shift sysconf save "$@";; @@ -850,8 +841,6 @@ usage: turnup command [options] ram Boot (once) into a ramdisk, subsequent boots will be to the flash file system. - altboot - Hand over boot control to the altboot utility. preserve Save the system configuration to the SysConf partition, you will need to create the SysConf partition from the boot loader diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 90ad6f4cee..8f8c68d7b7 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r81" +PR = "r82" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -102,9 +102,6 @@ do_install() { install -m 0755 boot/$p ${D}/boot done - # Support for altboot - ln -s /sbin/init.altboot ${D}/boot/altboot - # Configuration files install -m 0644 conffiles ${D}${sysconfdir}/default -- cgit v1.2.3 From 5ed24bd44de3235edcb3ef2704d70de610fc1878 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 18:30:00 +0000 Subject: task-openmoko: remove some more matchbox-panel-1 stuff --- packages/tasks/task-openmoko.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ece303d62a..7f8b03ce33 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r32" +PR = "r33" PACKAGES = "\ task-openmoko-linux \ @@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ - matchbox-panel-hacks \ matchbox-themes-extra \ matchbox-themes-gtk \ - matchbox-applet-inputmanager \ - matchbox-applet-startup-monitor \ openmoko-panel-battery \ openmoko-panel-clock \ openmoko-panel-demo \ -- cgit v1.2.3 From 9388d01bc7e5d1eea87480df05d35c10018b0886 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 22:07:58 +0000 Subject: altboot_wip.bb: Drop altboot_wip.bb --- packages/altboot/altboot_wip.bb | 99 ----------------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 packages/altboot/altboot_wip.bb (limited to 'packages') diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb deleted file mode 100644 index 37a8b5f9dd..0000000000 --- a/packages/altboot/altboot_wip.bb +++ /dev/null @@ -1,99 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -WIP_DATE = "20070323" - -PV = "1.1.1+wip-${WIP_DATE}" -PR = "r0" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "all" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" - -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" - -S = "${WORKDIR}/${TAG}/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - install -d ${D}/etc/skel/altboot - - if test -d ${S}/${MACHINE} - then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${S}/altboot.func ${D}/etc - install -m 0644 ${S}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc -} - -###################################################################################### - -do_configure() { - cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ - mv ${S}/init.altboot_ ${S}/init.altboot -} - -###################################################################################### - -pkg_postinst_${PN}() { - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - update-alternatives --remove init /sbin/init.altboot -} - -- cgit v1.2.3 From 39886a956b7f240f604b2f71cfaea294276f40b9 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 22:41:18 +0000 Subject: altboot: Add first installable version for nslu2 --- packages/altboot/altboot_1.1.1+wip-20070331.bb | 121 +++++++++++++++++++++++++ packages/altboot/altboot_svn.bb | 37 ++++++-- 2 files changed, 151 insertions(+), 7 deletions(-) create mode 100644 packages/altboot/altboot_1.1.1+wip-20070331.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-20070331.bb b/packages/altboot/altboot_1.1.1+wip-20070331.bb new file mode 100644 index 0000000000..e9754b8dbe --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-20070331.bb @@ -0,0 +1,121 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SRCDATE="20070331" +PV = "1.1.1+wip-${SRCDATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot + + if test -d ${S}/${MACHINE}/altboot-menu + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE}/altboot.rc + then + install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + + update-alternatives --remove init /sbin/init.altboot +} + diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index d31c5160a2..d753273fdf 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -30,7 +30,7 @@ PR = "r0" PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN} = "${MACHINE}" PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" @@ -51,7 +51,6 @@ do_install() { install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - install -d ${D}/etc/skel/altboot if test -d ${S}/${MACHINE} then @@ -62,18 +61,38 @@ do_install() { install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc install -m 0644 ${S}/altbootctl.conf ${D}/etc install -m 0755 ${S}/init.altboot ${D}/sbin install -m 0755 ${S}/altbootctl ${D}/sbin ln -s /sbin/init.altboot ${D}/sbin/altboot - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + if test -d ${S}/${MACHINE}/altboot-menu + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE}/altboot.rc + then + install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi } ###################################################################################### @@ -86,12 +105,16 @@ do_configure() { ###################################################################################### pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + update-alternatives --install /sbin/init init /sbin/init.altboot 55 } ###################################################################################### pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + update-alternatives --remove init /sbin/init.altboot } -- cgit v1.2.3 From d872ea5d2c9ed96e72f7cd833e80eaeb599a6cf6 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 23:28:35 +0000 Subject: altboot: Do no use SRCDATE for snapshots, use SVN revision instead --- packages/altboot/altboot_1.1.1+wip-20070331.bb | 121 ------------------------- packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 120 ++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 121 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-20070331.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR25.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-20070331.bb b/packages/altboot/altboot_1.1.1+wip-20070331.bb deleted file mode 100644 index e9754b8dbe..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-20070331.bb +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -SRCDATE="20070331" -PV = "1.1.1+wip-${SRCDATE}" -PR = "r0" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "${MACHINE}" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" - -S = "${WORKDIR}/trunk/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE} - then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${S}/altboot.func ${D}/etc - install -m 0644 ${S}/altboot.sbin ${D}/etc - install -m 0644 ${S}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - ln -s /sbin/init.altboot ${D}/sbin/altboot - - if test -d ${S}/${MACHINE}/altboot-menu - then - install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/${MACHINE}/altboot-menu/Advanced - then - install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - else - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/altboot-menu/Advanced - then - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - fi - - if test -d ${S}/${MACHINE}/altboot.rc - then - install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc - else - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc - fi -} - -###################################################################################### - -do_configure() { - cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ - mv ${S}/init.altboot_ ${S}/init.altboot -} - -###################################################################################### - -pkg_postinst_${PN}() { - test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 - - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot - - update-alternatives --remove init /sbin/init.altboot -} - diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb new file mode 100644 index 0000000000..af15f64508 --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb @@ -0,0 +1,120 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SVN_REV = "25" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot + + if test -d ${S}/${MACHINE}/altboot-menu + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE}/altboot.rc + then + install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + + update-alternatives --remove init /sbin/init.altboot +} + -- cgit v1.2.3 From ff824b1d9d5d2aa031188263d2098b2e35f86189 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 31 Mar 2007 00:31:32 +0000 Subject: glibc 2.5: Fix common case of GNU arrogance, make ldd work on posix shell. * Not bumping PR, to save people trouble. Leaving for decision to OE maintainers. --- packages/glibc/glibc-2.4/ldd-unbash.patch | 11 +++++++++++ packages/glibc/glibc_2.5.bb | 1 + 2 files changed, 12 insertions(+) create mode 100644 packages/glibc/glibc-2.4/ldd-unbash.patch (limited to 'packages') diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch new file mode 100644 index 0000000000..2fb8854b49 --- /dev/null +++ b/packages/glibc/glibc-2.4/ldd-unbash.patch @@ -0,0 +1,11 @@ +--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000 ++++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000 +@@ -110,7 +110,7 @@ + # environments where the executed program might not have permissions + # to write to the console/tty. But only bash 3.x supports the pipefail + # option, and we don't bother to handle the case for older bash versions. +-if set -o pipefail 2> /dev/null; then ++if false; then + try_trace() { + eval $add_env '"$@"' | cat + } diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index ee137541bb..8cd4c2ecd1 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ # file://glibc-2.4-openat-3.patch;patch=1 \ # file://fixup-aeabi-syscalls.patch;patch=1 \ file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ file://generic-bits_select.h \ file://generic-bits_types.h \ file://generic-bits_typesizes.h \ -- cgit v1.2.3 From 2f521a7ff7daacc63bfe2b477e09888dbd544311 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Mar 2007 23:29:22 +0000 Subject: altboot: Allow for multiple machines using the same source config directories. --- packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 23 +++++++++++++---------- packages/altboot/altboot_svn.bb | 23 +++++++++++++---------- 2 files changed, 26 insertions(+), 20 deletions(-) (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb index af15f64508..e806604616 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### SVN_REV = "25" -PR = "r0" +PR = "r1" ###################################################################################### @@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg" ###################################################################################### +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -52,9 +55,9 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - if test -d ${S}/${MACHINE} + if test -d ${S}/${MACHINE_DIR} then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ else install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi @@ -68,13 +71,13 @@ do_install() { ln -s /sbin/init.altboot ${D}/sbin/altboot - if test -d ${S}/${MACHINE}/altboot-menu + if test -d ${S}/${MACHINE_DIR}/altboot-menu then - install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - if test -d ${S}/${MACHINE}/altboot-menu/Advanced + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced then - install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced fi else install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu @@ -85,10 +88,10 @@ do_install() { fi fi - if test -d ${S}/${MACHINE}/altboot.rc + if test -d ${S}/${MACHINE_DIR}/altboot.rc then - install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc else install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index d753273fdf..18f73dd6ae 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### PV = "1.1.1+wip-${SRCDATE}" -PR = "r0" +PR = "r1" ###################################################################################### @@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg" ###################################################################################### +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -52,9 +55,9 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - if test -d ${S}/${MACHINE} + if test -d ${S}/${MACHINE_DIR} then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ else install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi @@ -68,13 +71,13 @@ do_install() { ln -s /sbin/init.altboot ${D}/sbin/altboot - if test -d ${S}/${MACHINE}/altboot-menu + if test -d ${S}/${MACHINE_DIR}/altboot-menu then - install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - if test -d ${S}/${MACHINE}/altboot-menu/Advanced + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced then - install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced fi else install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu @@ -85,10 +88,10 @@ do_install() { fi fi - if test -d ${S}/${MACHINE}/altboot.rc + if test -d ${S}/${MACHINE_DIR}/altboot.rc then - install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc else install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc -- cgit v1.2.3 From 2c6b0e8608bfcfc1f97f9c6aee5b4c88296c20b2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 31 Mar 2007 14:53:21 +0000 Subject: xproto-native: add 7.0.10 (X11R7.2) --- packages/xorg-proto/xproto-native_7.0.10.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/xorg-proto/xproto-native_7.0.10.bb (limited to 'packages') diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb new file mode 100644 index 0000000000..12a58b5a0a --- /dev/null +++ b/packages/xorg-proto/xproto-native_7.0.10.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +PE = "1" + +SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2" +S = "${WORKDIR}/xproto-${PV}" + +inherit native autotools pkgconfig -- cgit v1.2.3 From 0a9ddb4c6b3f4fe6a13cb01a92f0abf152ad5919 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 31 Mar 2007 14:56:54 +0000 Subject: xdpyinfo: add 1.0.2 (X11R7.2) --- packages/xorg-app/xdpyinfo_1.0.2.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/xorg-app/xdpyinfo_1.0.2.bb (limited to 'packages') diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb new file mode 100644 index 0000000000..62825e5a0f --- /dev/null +++ b/packages/xorg-app/xdpyinfo_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display information utility" +LICENSE = "MIT" + +DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" -- cgit v1.2.3 From d00c789a09ab7637ecabaa43006efefbb29c093b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 31 Mar 2007 16:13:41 +0000 Subject: edje-native: make sure to use the right edje-config --- packages/efl/edje-native_0.5.0.037.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index 2b8c43644a..4e878ab204 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -1,5 +1,5 @@ require edje_${PV}.bb -PR = "r3" +PR = "r4" inherit native @@ -13,7 +13,7 @@ do_configure_prepend() { } do_install_append() { - edje_data_dir=`edje-config --datadir` + edje_data_dir=`${S}/edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include install -m 0644 data/include/edje.inc $edje_data_dir/include -- cgit v1.2.3 From 44d3c2e660e3c450399f9e41ca5b84b0062cfd16 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 31 Mar 2007 19:08:14 +0000 Subject: linux-handhelds-2.6: hx4700 defconfig update - compile in common battery drivers instead of hx4700_power - use common touchscreen drivers instead of hx4700_ts --- .../linux/linux-handhelds-2.6/hx4700/defconfig | 38 +++++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 3a0d50e096..49111f9b48 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -148,15 +148,14 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_H4700=y CONFIG_HX4700_NAVPOINT=y CONFIG_HX4700_CORE=y -CONFIG_HX4700_TS=y +# CONFIG_HX4700_TS is not set CONFIG_HX4700_BLUETOOTH=y CONFIG_HX4700_PCMCIA=y CONFIG_HX4700_LCD=y CONFIG_HX4700_LEDS=y -CONFIG_HX4700_BATTERY=m -CONFIG_HX4700_POWER=y +CONFIG_HX4700_BATTERY=y +# CONFIG_HX4700_POWER is not set CONFIG_HX4700_UDC=y -CONFIG_HX4700_SERIAL=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set @@ -167,6 +166,7 @@ CONFIG_HX4700_SERIAL=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set @@ -911,7 +911,20 @@ CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_NAVPOINT=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -951,6 +964,7 @@ CONFIG_SERIAL_PXA_COUNT=4 # CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_RS232_SERIAL=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -1047,14 +1061,14 @@ CONFIG_I2C_PXA=m # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y # # 1-wire Bus Masters # # CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set -# CONFIG_W1_DS1WM is not set +CONFIG_W1_DS1WM=y # # 1-wire Slaves @@ -1062,7 +1076,7 @@ CONFIG_W1=m # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set # CONFIG_W1_SLAVE_DS2433 is not set -CONFIG_W1_DS2760=m +CONFIG_W1_DS2760=y # # Hardware Monitoring support @@ -1111,8 +1125,8 @@ CONFIG_HWMON=y # Hardware Monitoring - Battery # CONFIG_BATTERY_MONITOR=y -CONFIG_DS2760_BATTERY=m -CONFIG_ADC_BATTERY=m +CONFIG_DS2760_BATTERY=y +CONFIG_ADC_BATTERY=y CONFIG_APM_POWER=y # @@ -1143,6 +1157,7 @@ CONFIG_HTC_ASIC3_DS1WM=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +CONFIG_ADC=y CONFIG_ADC_ADS7846_SSP=y # CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set @@ -1163,7 +1178,7 @@ CONFIG_LEDS_ASIC3=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_HWTIMER=y # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y @@ -1398,7 +1413,6 @@ CONFIG_USB_STORAGE=m # USB Input Devices # CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y -- cgit v1.2.3 From 55ca5fa3f37ec2fd4c39a6eb8b51618896e45b8e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sat, 31 Mar 2007 23:11:49 +0000 Subject: gpe-aerial: add 0.3.0 --- packages/gpe-aerial/gpe-aerial_0.3.0.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/gpe-aerial/gpe-aerial_0.3.0.bb (limited to 'packages') diff --git a/packages/gpe-aerial/gpe-aerial_0.3.0.bb b/packages/gpe-aerial/gpe-aerial_0.3.0.bb new file mode 100644 index 0000000000..9158305a80 --- /dev/null +++ b/packages/gpe-aerial/gpe-aerial_0.3.0.bb @@ -0,0 +1,11 @@ +inherit gpe autotools + +PR = "r0" +DESCRIPTION = "GPE wireless LAN communication applet" +DEPENDS = "gtk+ libgpewidget prismstumbler" +RDEPENDS = "prismstumbler" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + +GPE_TARBALL_SUFFIX = "bz2" -- cgit v1.2.3 From be56d1922f1877037f1376870074360d8b5ea3d6 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sat, 31 Mar 2007 23:12:47 +0000 Subject: prismstumbler: add 0.7.4pre1 --- packages/prismstumbler/prismstumbler_0.7.4pre1.bb | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/prismstumbler/prismstumbler_0.7.4pre1.bb (limited to 'packages') diff --git a/packages/prismstumbler/prismstumbler_0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.4pre1.bb new file mode 100644 index 0000000000..1cff5d90c6 --- /dev/null +++ b/packages/prismstumbler/prismstumbler_0.7.4pre1.bb @@ -0,0 +1,38 @@ +SECTION = "x11/network" +PR = "r0" + +PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" +DESCRIPTION = "Prismstumbler wireless LAN scanner" +DESCRIPTION_prismstumbler-frontend = "Prismstumbler wireless LAN scanner GTK frontend" +LICENSE = "GPL" +DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd" +RDEPENDS = "wireless-tools" +RRECOMMENDS = "gpsd" + +SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --with-libgps=${STAGING_DIR}/${HOST_SYS} \ + --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-sqlite-includes=${STAGING_INCDIR} \ + --with-sqlite-libs=${STAGING_LIBDIR} \ + --without-athena --enable-dbus" + +CFLAGS =+ "-I${S}/include" +LDFLAGS += "-lz" + +FILES_${PN} = "${bindir}/prismstumbler" + +FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ + ${datadir}/applications \ + ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \ + ${sysconfdir}" +RDEPENDS_prismstumbler-frontend = "${PN}" + + +do_install_append() { + chmod a+s ${D}${bindir}/prismstumbler +} -- cgit v1.2.3 From 67a237498058d3265957ae84f60c18de7e9e1076 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 31 Mar 2007 09:41:11 +0000 Subject: openmoko-messages: add patch from Marcin to make it build again (OM bug #333) --- packages/openmoko-apps/files/.mtn2git_empty | 0 .../openmoko-apps/files/unbreak-messages.patch | 29 ++++++++++++++++++++++ packages/openmoko-apps/openmoko-messages_svn.bb | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-apps/files/.mtn2git_empty create mode 100644 packages/openmoko-apps/files/unbreak-messages.patch (limited to 'packages') diff --git a/packages/openmoko-apps/files/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-apps/files/unbreak-messages.patch b/packages/openmoko-apps/files/unbreak-messages.patch new file mode 100644 index 0000000000..c8d3413c0b --- /dev/null +++ b/packages/openmoko-apps/files/unbreak-messages.patch @@ -0,0 +1,29 @@ +Index: sms-membership-window.c +=================================================================== +--- sms-membership-window.c (wersja 1565) ++++ openmoko-messages/src/sms-membership-window.c (kopia robocza) +@@ -36,9 +36,6 @@ + #define SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_MEMBERSHIP_WINDOW, SmsMembershipWindowPrivate)) + + typedef struct _SmsMembershipWindowPrivate SmsMembershipWindowPrivate; +-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); + + struct _SmsMembershipWindowPrivate + { +Index: main.c +=================================================================== +--- main.c (wersja 1565) ++++ openmoko-messages/src/main.c (kopia robocza) +@@ -41,10 +41,6 @@ + + #include + +-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); +- + gboolean init_dbus (MessengerData* d) + { + DBusError error; diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index 4411b860a1..1547c49d9a 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" PV = "0.0.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko +SRC_URI += "file://unbreak-messages.patch;patch=1" -- cgit v1.2.3 From b4a61530aa20a81020170c73936fe2c6b19df5b0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 31 Mar 2007 11:39:16 +0000 Subject: libsexy: add bugfix release 0.1.11 --- packages/libsexy/libsexy_0.1.11.bb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 packages/libsexy/libsexy_0.1.11.bb (limited to 'packages') diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb new file mode 100644 index 0000000000..042ea757e9 --- /dev/null +++ b/packages/libsexy/libsexy_0.1.11.bb @@ -0,0 +1,2 @@ +require libsexy.inc +PR = "r0" -- cgit v1.2.3 From 304a829de08ce20c274f5a8e8038bd513f934dda Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 31 Mar 2007 11:56:55 +0000 Subject: gnupg: drop 1.4.0 directory, drop gnupg2 1.9.15 (too old) --- packages/gnupg/gnupg-1.4.0/.mtn2git_empty | 0 packages/gnupg/gnupg-1.4.0/15_free_caps.patch | 93 - packages/gnupg/gnupg-1.4.0/16_min_privileges.patch | 68 - packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch | 6430 -------------------- .../gnupg/gnupg-1.4.0/21_strgutil_update.patch | 200 - packages/gnupg/gnupg2.inc | 77 - packages/gnupg/gnupg2_1.9.15.bb | 3 - 7 files changed, 6871 deletions(-) delete mode 100644 packages/gnupg/gnupg-1.4.0/.mtn2git_empty delete mode 100644 packages/gnupg/gnupg-1.4.0/15_free_caps.patch delete mode 100644 packages/gnupg/gnupg-1.4.0/16_min_privileges.patch delete mode 100644 packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch delete mode 100644 packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch delete mode 100644 packages/gnupg/gnupg2.inc delete mode 100644 packages/gnupg/gnupg2_1.9.15.bb (limited to 'packages') diff --git a/packages/gnupg/gnupg-1.4.0/.mtn2git_empty b/packages/gnupg/gnupg-1.4.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnupg/gnupg-1.4.0/15_free_caps.patch b/packages/gnupg/gnupg-1.4.0/15_free_caps.patch deleted file mode 100644 index 20949a7d49..0000000000 --- a/packages/gnupg/gnupg-1.4.0/15_free_caps.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c 2004-07-21 09:59:45.000000000 +0200 -+++ gnupg-1.2.5/g10/status.c 2004-08-01 20:07:42.071690680 +0200 -@@ -346,6 +346,9 @@ - { - char buf[100]; - struct shmid_ds shmds; -+#ifdef USE_CAPABILITIES -+ cap_t caps; -+#endif - - #ifndef IPC_RMID_DEFERRED_RELEASE - atexit( remove_shmid ); -@@ -371,7 +374,9 @@ - (unsigned)shm_size/1024, shm_area, shm_id ); - if( lock_mem ) { - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - /* (need the cast for Solaris with Sun's workshop compilers) */ - if ( mlock ( (char*)shm_area, shm_size) ) -@@ -380,7 +385,9 @@ - else - shm_is_locked = 1; - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - } - -@@ -407,7 +414,9 @@ - - if( lock_mem ) { - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - #ifdef IPC_HAVE_SHM_LOCK - if ( shmctl (shm_id, SHM_LOCK, 0) ) -@@ -419,7 +428,9 @@ - log_info("Locking shared memory %d failed: No way to do it\n", shm_id ); - #endif - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - } - ---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c 2004-02-24 17:06:58.000000000 +0100 -+++ gnupg-1.2.5/util/secmem.c 2004-08-01 20:08:10.873412378 +0200 -@@ -97,12 +97,18 @@ - { - #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK) - int err; -+ cap_t caps; -+ -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); - err = mlock( p, n ); - if( err && errno ) - err = errno; -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - - if( err ) { - if( errno != EPERM -@@ -301,8 +307,12 @@ - if( !n ) { - #ifndef __riscos__ - #ifdef USE_CAPABILITIES -+ cap_t caps; -+ - /* drop all capabilities */ -- cap_set_proc( cap_from_text("all-eip") ); -+ caps = cap_from_text("all-eip"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - - #elif !defined(HAVE_DOSISH_SYSTEM) - uid_t uid; diff --git a/packages/gnupg/gnupg-1.4.0/16_min_privileges.patch b/packages/gnupg/gnupg-1.4.0/16_min_privileges.patch deleted file mode 100644 index b29233b33b..0000000000 --- a/packages/gnupg/gnupg-1.4.0/16_min_privileges.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- gnupg-1.4.0/g10/g10.c 2004-12-16 09:47:36.000000000 +0000 -+++ /tmp/dpep.O5S02c/gnupg-1.4.0/g10/g10.c 2005-02-03 23:31:40.645873299 +0000 -@@ -69,6 +69,11 @@ - #endif - - -+#ifdef USE_CAPABILITIES -+#include -+#include -+#endif -+ - enum cmd_and_opt_values - { - aNull = 0, -@@ -1618,6 +1623,10 @@ - #ifdef USE_SHM_COPROCESSING - ulong requested_shm_size=0; - #endif -+#ifdef USE_CAPABILITIES -+ uid_t curr_uid; -+ cap_t caps; -+#endif - - #ifdef __riscos__ - opt.lock_once = 1; -@@ -1629,6 +1638,33 @@ - * when adding any stuff between here and the call to - * secmem_init() somewhere after the option parsing - */ -+ -+ /* if we use capabilities and run as root, we can immediately setuid back -+ * to the normal user and only keep CAP_IPC_LOCK until the shared memory is -+ * set up. -+ */ -+#ifdef USE_CAPABILITIES -+ curr_uid = getuid(); -+ if( curr_uid && !geteuid() ) { /* we are setuid root */ -+ if( prctl( PR_SET_KEEPCAPS, 1, 0, 0, 0 ) ) { -+ perror( "main(): could not keep capabilities" ); -+ return -100; -+ } -+ -+ if( setuid( curr_uid ) ) { -+ perror( "main(): could not set user id" ); -+ return -100; -+ } -+ -+ caps = cap_from_text( "cap_ipc_lock=p" ); -+ if( cap_set_proc( caps ) ) { -+ perror( "main(): could not install capabilities" ); -+ return -100; -+ } -+ cap_free( caps ); -+ } -+#endif -+ - log_set_name("gpg"); - secure_random_alloc(); /* put random number into secure memory */ - may_coredump = disable_core_dumps(); -@@ -1747,7 +1783,7 @@ - } - #endif - /* initialize the secure memory. */ -- got_secmem=secmem_init( 32768 ); -+ got_secmem=secmem_init( 32768 ); /* this will drop all remaining privileges */ - maybe_setuid = 0; - /* Okay, we are now working under our real uid */ - diff --git a/packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch b/packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch deleted file mode 100644 index cb7d46b087..0000000000 --- a/packages/gnupg/gnupg-1.4.0/18_ca_po_update.patch +++ /dev/null @@ -1,6430 +0,0 @@ ---- gnupg-1.4.0/po/ca.po 2004-12-16 09:57:09.000000000 +0000 -+++ /tmp/dpep.nbDh2k/gnupg-1.4.0/po/ca.po 2005-02-05 00:49:28.000000000 +0000 -@@ -1,44 +1,44 @@ --# Missatges de gnupg en catal�. --# Copyright � 2001, 2002, 2003 Free Software Foundation, Inc. --# Carles Sadurn� Anguita , 2001. --# Jordi Mallach , 2001, 2002, 2003. -+# Missatges de gnupg en català. -+# Copyright © 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# Carles Sadurní Anguita , 2001. -+# Jordi Mallach , 2001, 2002, 2003, 2005. - # - # Coses (jm): --# ID d'usuari �s mascul�? Hi ha una mescla... --# (ivb: ID == identificador -> mascul�) -+# ID d'usuari és masculí? Hi ha una mescla... -+# (ivb: ID == identificador -> masculí) - # Canviar ID -> ID d'usuari - # Xifratge vs. Xifrat --# (ivb: xifratge -> acci�, xifrat -> adjectiu) -+# (ivb: xifratge -> acció, xifrat -> adjectiu) - # + coses (ivb): --# - Algunes frases incompletes �x desconegut� -> �x �s desconegut�. --# - �algoritme� o �algorisme�? (ambd�s s�n correctes) -+# - Algunes frases incompletes «x desconegut» -> «x és desconegut». -+# - «algoritme» o «algorisme»? (ambdós són correctes) - # - digest -> resum --# - �anell� o �clauer�? (key ring -> clauer) -+# - «anell» o «clauer»? (key ring -> clauer) - # - bug -> error? (del recull) --# - Crec q uses m�s �signatura� q �firma�; unifique. --# - Usar maj�scules x ressaltar (com original)? -+# - Crec q uses més «signatura» q «firma»; unifique. -+# - Usar majúscules x ressaltar (com original)? - # - Hi ha cert desordre en les cometes ;) --# - Frases �ndies completades. --# - Algunes incoher�ncies: error {en la lectura,en llegir,mentre es llegia} -+# - Frases índies completades. -+# - Algunes incoherències: error {en la lectura,en llegir,mentre es llegia} - # - Probablement he clavat la pota en tots els Photo ID :P --# - Nom�s es maneja amb les mans. --# - sapigueu -> sapieu? (x coher�ncia) -+# - Només es maneja amb les mans. -+# - sapigueu -> sapieu? (x coherència) - msgid "" - msgstr "" --"Project-Id-Version: gnupg 1.2.4rc\n" -+"Project-Id-Version: gnupg 1.4.0\n" - "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" - "POT-Creation-Date: 2004-12-16 10:56+0100\n" --"PO-Revision-Date: 2003-12-05 19:15+0100\n" -+"PO-Revision-Date: 2005-02-04 02:04+0100\n" - "Last-Translator: Jordi Mallach \n" - "Language-Team: Catalan \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=ISO-8859-1\n" -+"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - - #: cipher/primegen.c:120 --#, fuzzy, c-format -+#, c-format - msgid "can't gen prime with pbits=%u qbits=%u\n" --msgstr "no s'ha pogut generar un prim amb menys de %d bits\n" -+msgstr "no s'ha pogut generar un prim amb pbits=%u qbits=%u\n" - - #: cipher/primegen.c:311 - #, c-format -@@ -47,7 +47,7 @@ - - #: cipher/random.c:163 - msgid "no entropy gathering module detected\n" --msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n" -+msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n" - - #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 - #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -@@ -58,32 +58,31 @@ - #: g10/tdbio.c:600 - #, c-format - msgid "can't open `%s': %s\n" --msgstr "no s'ha pogut obrir �%s�: %s\n" -+msgstr "no s'ha pogut obrir «%s»: %s\n" - - #: cipher/random.c:391 - #, c-format - msgid "can't stat `%s': %s\n" --msgstr "no es pot fer stat de �%s�: %s\n" -+msgstr "no es pot fer stat de «%s»: %s\n" - --# Descartar, deixar passar... ignorar �s un anglicisme. ivb -+# Descartar, deixar passar... ignorar és un anglicisme. ivb - #: cipher/random.c:396 - #, c-format - msgid "`%s' is not a regular file - ignored\n" --msgstr "�%s� no �s un fitxer regular: es descarta\n" -+msgstr "«%s» no és un fitxer regular: es descarta\n" - - #: cipher/random.c:401 - msgid "note: random_seed file is empty\n" --msgstr "nota: el fitxer random_seed �s buit\n" -+msgstr "nota: el fitxer random_seed és buit\n" - - #: cipher/random.c:407 - msgid "WARNING: invalid size of random_seed file - not used\n" --msgstr "" --"AV�S: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n" -+msgstr "AVÃS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n" - - #: cipher/random.c:415 - #, c-format - msgid "can't read `%s': %s\n" --msgstr "no s'ha pogut llegir �%s�: %s\n" -+msgstr "no s'ha pogut llegir «%s»: %s\n" - - #: cipher/random.c:453 - msgid "note: random_seed file not updated\n" -@@ -94,22 +93,22 @@ - #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 - #, c-format - msgid "can't create `%s': %s\n" --msgstr "no s'ha pogut crear �%s�: %s\n" -+msgstr "no s'ha pogut crear «%s»: %s\n" - - #: cipher/random.c:480 - #, c-format - msgid "can't write `%s': %s\n" --msgstr "no s'ha pogut escriure �%s�: %s\n" -+msgstr "no s'ha pogut escriure «%s»: %s\n" - - # No em passe! ;) ivb - #: cipher/random.c:483 - #, c-format - msgid "can't close `%s': %s\n" --msgstr "no s'ha pogut tancar �%s�: %s\n" -+msgstr "no s'ha pogut tancar «%s»: %s\n" - - #: cipher/random.c:728 - msgid "WARNING: using insecure random number generator!!\n" --msgstr "AV�S: esteu usant un generador de nombres aleatoris insegur!!\n" -+msgstr "AVÃS: esteu usant un generador de nombres aleatoris insegur!!\n" - - #: cipher/random.c:729 - msgid "" -@@ -119,8 +118,8 @@ - "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" - "\n" - msgstr "" --"El generador de nombres aleatoris �s nom�s un peda�\n" --"per a que funcioni - de cap manera �s un GNA fort!\n" -+"El generador de nombres aleatoris és només un pedaç\n" -+"per a que funcioni - de cap manera és un GNA fort!\n" - "\n" - "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n" - "\n" -@@ -132,7 +131,7 @@ - "of the entropy.\n" - msgstr "" - "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n" --"vos ajuda no avorrir-vos, ja que ajudar� a la qualitat de la entropia.\n" -+"vos ajuda no avorrir-vos, ja que ajudarà a la qualitat de la entropia.\n" - - #: cipher/rndlinux.c:134 - #, c-format -@@ -143,18 +142,17 @@ - msgstr "" - "\n" - "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n" --"sistema tinga oportunitat de recollir m�s entropia. (Calen %d bytes " --"m�s)\n" -+"sistema tinga oportunitat de recollir més entropia. (Calen %d bytes més)\n" - - #: g10/app-openpgp.c:539 --#, fuzzy, c-format -+#, c-format - msgid "failed to store the fingerprint: %s\n" --msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -+msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n" - - #: g10/app-openpgp.c:552 - #, fuzzy, c-format - msgid "failed to store the creation date: %s\n" --msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n" -+msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n" - - #: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 - #, c-format -@@ -204,22 +202,22 @@ - #: g10/app-openpgp.c:1025 - #, fuzzy, c-format - msgid "error getting new PIN: %s\n" --msgstr "error en la creaci� de la contrasenya: %s\n" -+msgstr "error en crear «%s»: %s\n" - - #: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 - #, fuzzy - msgid "error reading application data\n" --msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n" -+msgstr "s'ha produït un error en llegir el bloc de claus: %s\n" - - #: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 - #, fuzzy - msgid "error reading fingerprint DO\n" --msgstr "%s: error en llegir el registre lliure: %s\n" -+msgstr "error: l'empremta digital és invàlida\n" - - #: g10/app-openpgp.c:1107 - #, fuzzy - msgid "key already exists\n" --msgstr "�%s� ja est� comprimida\n" -+msgstr "«%s» ja està comprimida\n" - - #: g10/app-openpgp.c:1111 - msgid "existing key will be replaced\n" -@@ -237,12 +235,12 @@ - #: g10/app-openpgp.c:1138 - #, fuzzy - msgid "generating key failed\n" --msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" -+msgstr "La generació de claus ha fallat: %s\n" - - #: g10/app-openpgp.c:1141 - #, fuzzy, c-format - msgid "key generation completed (%d seconds)\n" --msgstr "La generaci� de claus ha fallat: %s\n" -+msgstr "La generació de claus ha fallat: %s\n" - - #: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 - msgid "response does not contain the public key data\n" -@@ -271,19 +269,19 @@ - msgstr "" - - #: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 --#, fuzzy, c-format -+#, c-format - msgid "can't access %s - invalid OpenPGP card?\n" --msgstr "no s'han trobat dades OpenPGP v�lides.\n" -+msgstr "" - - #: g10/app-openpgp.c:1734 - #, fuzzy, c-format - msgid "error getting serial number: %s\n" --msgstr "error en la creaci� de la contrasenya: %s\n" -+msgstr "error en la creació de la contrasenya: %s\n" - - #: g10/app-openpgp.c:1829 - #, fuzzy, c-format - msgid "failed to store the key: %s\n" --msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n" - - #: g10/app-openpgp.c:1871 - #, fuzzy -@@ -297,18 +295,18 @@ - - #: g10/armor.c:346 - msgid "invalid armor header: " --msgstr "la cap�alera d'armadura �s inv�lida: " -+msgstr "la capçalera d'armadura és invàlida: " - - #: g10/armor.c:353 - msgid "armor header: " --msgstr "cap�alera d'armadura: " -+msgstr "capçalera d'armadura: " - - #: g10/armor.c:364 - msgid "invalid clearsig header\n" --msgstr "la cap�alera de signatura clara �s inv�lida\n" -+msgstr "la capçalera de signatura clara és invàlida\n" - --# �s un missatge d'error? ivb --# �Anidada� �s un castellanisme. Niuades? Imbricades (SC)?? ivb -+# És un missatge d'error? ivb -+# «Anidada» és un castellanisme. Niuades? Imbricades (SC)?? ivb - #: g10/armor.c:416 - msgid "nested clear text signatures\n" - msgstr "signatures en text pla imbricades\n" -@@ -321,12 +319,12 @@ - - #: g10/armor.c:563 - msgid "invalid dash escaped line: " --msgstr "la l�nia escapada amb gui� �s inv�lida: " -+msgstr "la línia escapada amb guió és invàlida: " - - #: g10/armor.c:715 g10/armor.c:1300 - #, fuzzy, c-format - msgid "invalid radix64 character %02X skipped\n" --msgstr "el car�cter radix64 %02x inv�lid s'ha om�s\n" -+msgstr "el caràcter radix64 %02x invàlid s'ha omés\n" - - #: g10/armor.c:758 - msgid "premature eof (no CRC)\n" -@@ -348,84 +346,79 @@ - #: g10/armor.c:824 - #, fuzzy - msgid "premature eof (in trailer)\n" --msgstr "f� de fitxer prematur (al final)\n" -+msgstr "fí de fitxer prematur (al final)\n" - - #: g10/armor.c:828 - msgid "error in trailer line\n" --msgstr "error en l'�ltima l�nia\n" -+msgstr "error en l'última línia\n" - - #: g10/armor.c:1115 - msgid "no valid OpenPGP data found.\n" --msgstr "no s'han trobat dades OpenPGP v�lides.\n" -+msgstr "no s'han trobat dades OpenPGP vàlides.\n" - - #: g10/armor.c:1120 - #, c-format - msgid "invalid armor: line longer than %d characters\n" --msgstr "" --"l'armadura �s inv�lida: la l�nia �s m�s llarga que %d car�cters\n" -+msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n" - - #: g10/armor.c:1124 - msgid "" - "quoted printable character in armor - probably a buggy MTA has been used\n" - msgstr "" --"hi ha un car�cter �quoted printable� en l'armadura - probablement s'ha " -+"hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha " - "utilitzat un MTA amb errors\n" - - #: g10/card-util.c:58 g10/card-util.c:282 - #, fuzzy, c-format - msgid "OpenPGP card not available: %s\n" --msgstr "la clau secreta no est� disponible" -+msgstr "la clau secreta no està disponible" - - #: g10/card-util.c:63 - #, c-format - msgid "OpenPGP card no. %s detected\n" - msgstr "" - --# Dest�s? ivb --# Desat�s, s�. jm -+# Destès? ivb -+# Desatès, sí. jm - #: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 - #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 - #, fuzzy - msgid "can't do this in batch mode\n" --msgstr "no es pot fet aix� en mode desat�s\n" -+msgstr "no es pot fet això en mode desatès\n" - - #: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 - #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 - #: g10/keygen.c:1363 - msgid "Your selection? " --msgstr "Seleccioneu: " -+msgstr "La vostra selecció? " - - #: g10/card-util.c:194 g10/card-util.c:244 - msgid "[not set]" --msgstr "" -+msgstr "[no establert]" - - #: g10/card-util.c:378 --#, fuzzy - msgid "male" --msgstr "enable" -+msgstr "home" - - #: g10/card-util.c:379 --#, fuzzy - msgid "female" --msgstr "enable" -+msgstr "dóna" - - #: g10/card-util.c:379 --#, fuzzy - msgid "unspecified" --msgstr "No s'ha especificat cap ra�" -+msgstr "no especificat" - --# G�nere? Nombre? Passat, futur? ivb --# Probablement �s una clau, femen�. jm -+# Gènere? Nombre? Passat, futur? ivb -+# Probablement és una clau, femení. jm - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: g10/card-util.c:406 --#, fuzzy - msgid "not forced" --msgstr "no processat" -+msgstr "no forçat" - - #: g10/card-util.c:406 - msgid "forced" --msgstr "" -+msgstr "forçat" - - #: g10/card-util.c:458 - msgid "Error: Only plain ASCII is currently allowed.\n" -@@ -455,7 +448,7 @@ - #: g10/card-util.c:521 - #, fuzzy - msgid "URL to retrieve public key: " --msgstr "no hi ha cap clau p�blica corresponent: %s\n" -+msgstr "no hi ha cap clau pública corresponent: %s\n" - - #: g10/card-util.c:529 - #, c-format -@@ -465,7 +458,7 @@ - #: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 - #, c-format - msgid "error reading `%s': %s\n" --msgstr "error en la lectura de �%s�: %s\n" -+msgstr "error en la lectura de «%s»: %s\n" - - #: g10/card-util.c:630 - msgid "Login data (account name): " -@@ -488,17 +481,17 @@ - #: g10/card-util.c:729 - #, fuzzy - msgid "Language preferences: " --msgstr "prefer�ncies actualitzades" -+msgstr "preferències actualitzades" - - #: g10/card-util.c:737 - #, fuzzy - msgid "Error: invalid length of preference string.\n" --msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n" -+msgstr "hi ha un caràcter invàlid en la cadena de preferència\n" - - #: g10/card-util.c:746 - #, fuzzy - msgid "Error: invalid characters in preference string.\n" --msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n" -+msgstr "hi ha un caràcter invàlid en la cadena de preferència\n" - - #: g10/card-util.c:767 - msgid "Sex ((M)ale, (F)emale or space): " -@@ -507,7 +500,7 @@ - #: g10/card-util.c:781 - #, fuzzy - msgid "Error: invalid response.\n" --msgstr "error: l'empremta digital �s inv�lida\n" -+msgstr "error: l'empremta digital és invàlida\n" - - #: g10/card-util.c:802 - #, fuzzy -@@ -517,23 +510,22 @@ - #: g10/card-util.c:825 - #, fuzzy - msgid "Error: invalid formatted fingerprint.\n" --msgstr "error: l'empremta digital �s inv�lida\n" -+msgstr "error: l'empremta digital és invàlida\n" - - #: g10/card-util.c:873 - #, fuzzy, c-format - msgid "key operation not possible: %s\n" --msgstr "La generaci� de claus ha fallat: %s\n" -+msgstr "La generació de claus ha fallat: %s\n" - - #: g10/card-util.c:874 - #, fuzzy - msgid "not an OpenPGP card" --msgstr "no s'han trobat dades OpenPGP v�lides.\n" -+msgstr "no s'han trobat dades OpenPGP vàlides.\n" - - #: g10/card-util.c:883 - #, fuzzy, c-format - msgid "error getting current key info: %s\n" --msgstr "" --"s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n" -+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n" - - #: g10/card-util.c:966 - msgid "Replace existing key? (y/N) " -@@ -561,14 +553,13 @@ - msgstr "Seleccioneu quin tipus de clau voleu:\n" - - #: g10/card-util.c:1058 g10/card-util.c:1138 --#, fuzzy - msgid " (1) Signature key\n" --msgstr "Aquesta signatura va caducar el %s\n" -+msgstr "" - - #: g10/card-util.c:1059 g10/card-util.c:1140 - #, fuzzy - msgid " (2) Encryption key\n" --msgstr " (%d) RSA (nom�s xifrar)\n" -+msgstr " (%d) RSA (només xifrar)\n" - - #: g10/card-util.c:1060 g10/card-util.c:1142 - msgid " (3) Authentication key\n" -@@ -577,39 +568,39 @@ - #: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 - #: g10/keygen.c:1402 g10/revoke.c:642 - msgid "Invalid selection.\n" --msgstr "La selecci� �s inv�lida.\n" -+msgstr "La selecció és invàlida.\n" - - #: g10/card-util.c:1135 - #, fuzzy - msgid "Please select where to store the key:\n" --msgstr "Seleccioneu la ra� de la revocaci�:\n" -+msgstr "Seleccioneu la raó de la revocació:\n" - - #: g10/card-util.c:1170 - #, fuzzy - msgid "unknown key protection algorithm\n" --msgstr "l'algorisme de protecci� �s desconegut\n" -+msgstr "l'algorisme de protecció és desconegut\n" - - #: g10/card-util.c:1175 - #, fuzzy - msgid "secret parts of key are not available\n" --msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n" -+msgstr "Les parts secretes de la clau primària no estan disponibles.\n" - - #: g10/card-util.c:1180 - #, fuzzy - msgid "secret key already stored on a card\n" --msgstr "es descarta: la clau secreta ja �s present\n" -+msgstr "es descarta: la clau secreta ja és present\n" - - #: g10/card-util.c:1250 g10/keyedit.c:1285 - msgid "quit this menu" --msgstr "ix del men�" -+msgstr "ix del menú" - - #: g10/card-util.c:1252 - #, fuzzy - msgid "show admin commands" - msgstr "les ordres entren en conflicte\n" - --# �pantalla� o �ajuda�? ivb --# �ajuda�, evidentment. jm -+# «pantalla» o «ajuda»? ivb -+# «ajuda», evidentment. jm - #: g10/card-util.c:1253 g10/keyedit.c:1288 - msgid "show this help" - msgstr "mostra aquesta ajuda" -@@ -617,7 +608,7 @@ - #: g10/card-util.c:1255 - #, fuzzy - msgid "list all available data" --msgstr "La clau �s disponible en: " -+msgstr "La clau és disponible en: " - - #: g10/card-util.c:1258 - msgid "change card holder's name" -@@ -639,7 +630,7 @@ - #: g10/card-util.c:1262 - #, fuzzy - msgid "change the language preferences" --msgstr "canvia la confian�a" -+msgstr "canvia la confiança" - - #: g10/card-util.c:1263 - msgid "change card holder's sex" -@@ -673,18 +664,16 @@ - msgstr "les ordres entren en conflicte\n" - - #: g10/card-util.c:1384 --#, fuzzy - msgid "Admin commands are allowed\n" --msgstr "les ordres entren en conflicte\n" -+msgstr "" - - #: g10/card-util.c:1386 --#, fuzzy - msgid "Admin commands are not allowed\n" --msgstr "s'est� escrivint la clau secreta a �%s�\n" -+msgstr "" - - #: g10/card-util.c:1455 g10/keyedit.c:1928 - msgid "Invalid command (try \"help\")\n" --msgstr "L'ordre no �s v�lida (proveu �help�)\n" -+msgstr "L'ordre no és vàlida (proveu «help»)\n" - - #: g10/cardglue.c:287 - msgid "Please insert the card and hit return or enter 'c' to cancel: " -@@ -704,12 +693,12 @@ - #: g10/cardglue.c:687 - #, fuzzy - msgid "Enter New Admin PIN: " --msgstr "Introdu�u el nom d'usuari: " -+msgstr "Introduïu el nom d'usuari: " - - #: g10/cardglue.c:688 - #, fuzzy - msgid "Enter New PIN: " --msgstr "Introdu�u el nom d'usuari: " -+msgstr "Introduïu el nom d'usuari: " - - #: g10/cardglue.c:689 - msgid "Enter Admin PIN: " -@@ -718,7 +707,7 @@ - #: g10/cardglue.c:690 - #, fuzzy - msgid "Enter PIN: " --msgstr "Introdu�u el nom d'usuari: " -+msgstr "Introduïu el nom d'usuari: " - - #: g10/cardglue.c:704 - #, fuzzy -@@ -734,7 +723,7 @@ - #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 - #, c-format - msgid "can't open `%s'\n" --msgstr "no s'ha pogut obrir �%s�\n" -+msgstr "no s'ha pogut obrir «%s»\n" - - #: g10/decrypt.c:104 g10/encode.c:859 - msgid "--output doesn't work for this command\n" -@@ -744,24 +733,24 @@ - #: g10/revoke.c:226 - #, fuzzy, c-format - msgid "key \"%s\" not found: %s\n" --msgstr "no s'ha trobat la clau �%s�: %s\n" -+msgstr "no s'ha trobat la clau «%s»: %s\n" - - #: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 - #: g10/revoke.c:439 - #, c-format - msgid "error reading keyblock: %s\n" --msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n" -+msgstr "s'ha produït un error en llegir el bloc de claus: %s\n" - - #: g10/delkey.c:121 g10/delkey.c:128 - msgid "(unless you specify the key by fingerprint)\n" - msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n" - --# Ah�! Abans �batch� est� tal qual. Cal unificar. ivb -+# Ahà! Abans «batch» està tal qual. Cal unificar. ivb - # Fet. jm - #: g10/delkey.c:127 - #, fuzzy - msgid "can't do this in batch mode without \"--yes\"\n" --msgstr "no es pot fer aix� en el mode desat�s sense �--yes�\n" -+msgstr "no es pot fer això en el mode desatès sense «--yes»\n" - - #: g10/delkey.c:139 - #, fuzzy -@@ -771,7 +760,7 @@ - #: g10/delkey.c:147 - #, fuzzy - msgid "This is a secret key! - really delete? (y/N) " --msgstr "�s una clau secreta! Voleu esborrar-la? " -+msgstr "És una clau secreta! Voleu esborrar-la? " - - #: g10/delkey.c:157 - #, c-format -@@ -780,51 +769,50 @@ - - #: g10/delkey.c:167 - msgid "ownertrust information cleared\n" --msgstr "s'ha netejat la informaci� de la confian�a\n" -+msgstr "s'ha netejat la informació de la confiança\n" - - #: g10/delkey.c:195 - #, c-format - msgid "there is a secret key for public key \"%s\"!\n" --msgstr "hi ha una clau secreta per a la clau p�blica �%s�!\n" -+msgstr "hi ha una clau secreta per a la clau pública «%s»!\n" - - #: g10/delkey.c:197 - msgid "use option \"--delete-secret-keys\" to delete it first.\n" --msgstr "" --"utilitzeu l'opci� �--delete-secret-keys� per a eliminar-la primer.\n" -+msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n" - - #: g10/encode.c:210 g10/sign.c:1186 - #, c-format - msgid "error creating passphrase: %s\n" --msgstr "error en la creaci� de la contrasenya: %s\n" -+msgstr "error en la creació de la contrasenya: %s\n" - - #: g10/encode.c:215 - msgid "can't use a symmetric ESK packet due to the S2K mode\n" --msgstr "no es pot usar un paquet asim�tric ESK al estar en mode S2K\n" -+msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n" - - #: g10/encode.c:228 - #, fuzzy, c-format - msgid "using cipher %s\n" --msgstr "Ha fallat el proc�s de signatura: %s\n" -+msgstr "Ha fallat el procés de signatura: %s\n" - - #: g10/encode.c:238 g10/encode.c:558 - #, c-format - msgid "`%s' already compressed\n" --msgstr "�%s� ja est� comprimida\n" -+msgstr "«%s» ja està comprimida\n" - - #: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 - #, c-format - msgid "WARNING: `%s' is an empty file\n" --msgstr "AV�S: �%s� �s un fitxer buit\n" -+msgstr "AVÃS: «%s» és un fitxer buit\n" - - #: g10/encode.c:472 - msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" - msgstr "" --"nom�s podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n" -+"només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n" - - #: g10/encode.c:494 - #, c-format - msgid "reading from `%s'\n" --msgstr "s'est� llegint des de �%s�\n" -+msgstr "s'està llegint des de «%s»\n" - - #: g10/encode.c:530 - msgid "" -@@ -838,8 +826,7 @@ - msgid "" - "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" - msgstr "" --"for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del " --"destinatari\n" -+"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n" - - #: g10/encode.c:648 g10/sign.c:877 - #, fuzzy, c-format -@@ -847,15 +834,14 @@ - "WARNING: forcing compression algorithm %s (%d) violates recipient " - "preferences\n" - msgstr "" --"for�ar l'algoritme de compressi� %s (%d) viola les prefer�ncies del " -+"forçar l'algoritme de compressió %s (%d) viola les preferències del " - "destinatari\n" - - #: g10/encode.c:735 - #, c-format - msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" - msgstr "" --"for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del " --"destinatari\n" -+"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n" - - #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757 - #, c-format -@@ -865,7 +851,7 @@ - #: g10/encode.c:832 - #, c-format - msgid "%s/%s encrypted for: \"%s\"\n" --msgstr "%s/%s xifrat per a: �%s�\n" -+msgstr "%s/%s xifrat per a: «%s»\n" - - #: g10/encr-data.c:66 g10/mainproc.c:301 - #, c-format -@@ -877,28 +863,28 @@ - msgid "encrypted with unknown algorithm %d\n" - msgstr "xifrat amb l'algoritme %d (desconegut)\n" - --# �s no-wrap? ivb -+# És no-wrap? ivb - # Com? jm - #: g10/encr-data.c:92 - msgid "" - "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" - msgstr "" --"ATENCI�: el missatge s'ha xifrat amb una clau feble durant el xifratge\n" --"sim�tric.\n" -+"ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n" -+"simètric.\n" - - #: g10/encr-data.c:103 - msgid "problem handling encrypted packet\n" - msgstr "problema en tractar amb un paquet xifrat\n" - --# Execuci� de programes remots, o execuci� remota de programes? jm -+# Execució de programes remots, o execució remota de programes? jm - #: g10/exec.c:48 - msgid "no remote program execution supported\n" --msgstr "no hi ha suport per a l'execuci� remota de programes\n" -+msgstr "no hi ha suport per a l'execució remota de programes\n" - - #: g10/exec.c:184 g10/openfile.c:406 - #, c-format - msgid "can't create directory `%s': %s\n" --msgstr "no es pot crear el directori �%s�: %s\n" -+msgstr "no es pot crear el directori «%s»: %s\n" - - #: g10/exec.c:325 - msgid "" -@@ -917,21 +903,21 @@ - #: g10/exec.c:433 - #, fuzzy, c-format - msgid "unable to execute program `%s': %s\n" --msgstr "no s'ha pogut executar %s �%s�: %s\n" -+msgstr "no s'ha pogut executar %s «%s»: %s\n" - - #: g10/exec.c:436 - #, fuzzy, c-format - msgid "unable to execute shell `%s': %s\n" --msgstr "no s'ha pogut executar %s �%s�: %s\n" -+msgstr "no s'ha pogut executar %s «%s»: %s\n" - - #: g10/exec.c:521 - #, c-format - msgid "system error while calling external program: %s\n" --msgstr "s'ha produ�t un error del sistema en cridar el programa extern: %s\n" -+msgstr "s'ha produït un error del sistema en cridar el programa extern: %s\n" - - #: g10/exec.c:532 g10/exec.c:598 - msgid "unnatural exit of external program\n" --msgstr "s'ha produ�t una eixida no natural del programa extern\n" -+msgstr "s'ha produït una eixida no natural del programa extern\n" - - #: g10/exec.c:547 - msgid "unable to execute external program\n" -@@ -945,22 +931,22 @@ - #: g10/exec.c:609 g10/exec.c:616 - #, c-format - msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" --msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n" -+msgstr "AVÃS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n" - - #: g10/exec.c:621 - #, c-format - msgid "WARNING: unable to remove temp directory `%s': %s\n" --msgstr "AV�S: no s'ha pogut eliminar el directori temporal �%s�: %s\n" -+msgstr "AVÃS: no s'ha pogut eliminar el directori temporal «%s»: %s\n" - - #: g10/export.c:182 - #, fuzzy - msgid "exporting secret keys not allowed\n" --msgstr "s'est� escrivint la clau secreta a �%s�\n" -+msgstr "s'està escrivint la clau secreta a «%s»\n" - - #: g10/export.c:211 - #, fuzzy, c-format - msgid "key %s: not protected - skipped\n" --msgstr "clau %08lX: no est� protegida - es descarta\n" -+msgstr "clau %08lX: no està protegida - es descarta\n" - - #: g10/export.c:219 - #, fuzzy, c-format -@@ -970,12 +956,11 @@ - #: g10/export.c:384 - #, fuzzy, c-format - msgid "WARNING: secret key %s does not have a simple SK checksum\n" --msgstr "" --"AV�S: la clau secreta %08lX no te una simple suma de comprovaci� SK\n" -+msgstr "AVÃS: la clau secreta %08lX no te una simple suma de comprovació SK\n" - - #: g10/export.c:416 - msgid "WARNING: nothing exported\n" --msgstr "AV�S: no s'ha exportat res\n" -+msgstr "AVÃS: no s'ha exportat res\n" - - #: g10/g10.c:358 - msgid "" -@@ -1003,7 +988,7 @@ - - #: g10/g10.c:365 - msgid "encryption only with symmetric cipher" --msgstr "xifra nom�s amb xifratge sim�tric" -+msgstr "xifra només amb xifratge simètric" - - #: g10/g10.c:367 - msgid "decrypt data (default)" -@@ -1021,13 +1006,13 @@ - msgid "list keys and signatures" - msgstr "llista claus i signatures" - --# �de les claus� o �de la clau�? ivb -+# «de les claus» o «de la clau»? ivb - #: g10/g10.c:374 - #, fuzzy - msgid "list and check key signatures" - msgstr "comprova les signatures de la claus" - --# �dactilars� o �digitals�? ivb -+# «dactilars» o «digitals»? ivb - #: g10/g10.c:375 - msgid "list keys and fingerprints" - msgstr "llista claus i empremtes digitals" -@@ -1042,7 +1027,7 @@ - - #: g10/g10.c:378 - msgid "remove keys from the public keyring" --msgstr "elimina claus de l'anell p�blic" -+msgstr "elimina claus de l'anell públic" - - #: g10/g10.c:380 - msgid "remove keys from the secret keyring" -@@ -1062,7 +1047,7 @@ - - #: g10/g10.c:384 - msgid "generate a revocation certificate" --msgstr "genera un certificat de revocaci�" -+msgstr "genera un certificat de revocació" - - #: g10/g10.c:386 - msgid "export keys" -@@ -1102,7 +1087,7 @@ - - #: g10/g10.c:408 - msgid "update the trust database" --msgstr "actualitza la base de dades de confian�a" -+msgstr "actualitza la base de dades de confiança" - - #: g10/g10.c:415 - msgid "|algo [files]|print message digests" -@@ -1132,17 +1117,17 @@ - - #: g10/g10.c:435 - msgid "|N|set compress level N (0 disables)" --msgstr "|N|nivell de compressi� N (0 no comprimeix)" -+msgstr "|N|nivell de compressió N (0 no comprimeix)" - - #: g10/g10.c:440 - msgid "use canonical text mode" --msgstr "usa el mode de text can�nic" -+msgstr "usa el mode de text canònic" - - #: g10/g10.c:450 - msgid "use as output file" - msgstr "fitxer d'eixida" - --# Un dels dos �s en la llista d'opcions amb --help. Urgh. jm -+# Un dels dos és en la llista d'opcions amb --help. Urgh. jm - #: g10/g10.c:452 g10/gpgv.c:67 - msgid "verbose" - msgstr "detall" -@@ -1169,11 +1154,11 @@ - "(See the man page for a complete listing of all commands and options)\n" - msgstr "" - "@\n" --"(En la p�gina del man hi ha una llista completa d'ordres i d'opcions)\n" -+"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n" - --# Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman -+# Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman - # en el manual original de PGP. A, B, C... ivb --# En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm -+# En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm - #: g10/g10.c:535 - msgid "" - "@\n" -@@ -1200,7 +1185,7 @@ - - #: g10/g10.c:733 - msgid "Usage: gpg [options] [files] (-h for help)" --msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)" -+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)" - - #: g10/g10.c:736 - msgid "" -@@ -1210,12 +1195,12 @@ - msgstr "" - "Sintaxi: gpg [opcions] [fitxers]\n" - "signa, comprova, xifra o desxifra\n" --"l'operaci� predeterminada dep�n de les dades introdu�des\n" -+"l'operació predeterminada depén de les dades introduïdes\n" - - # Suportats? ivb --# A Softcatal� diuen molt �implementat?. jm --# Precissament acabem de parlar d'�implementat a la llista del GNOME --# i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives -+# A Softcatalà diuen molt «implementat». jm -+# Precissament acabem de parlar d'«implementat a la llista del GNOME -+# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives - # encara no m'agraden massa... jm - #: g10/g10.c:747 - msgid "" -@@ -1227,7 +1212,7 @@ - - #: g10/g10.c:750 - msgid "Pubkey: " --msgstr "Clau p�blica: " -+msgstr "Clau pública: " - - #: g10/g10.c:756 g10/keyedit.c:1965 - msgid "Cipher: " -@@ -1235,191 +1220,183 @@ - - #: g10/g10.c:762 - msgid "Hash: " --msgstr "Dispersi�: " -+msgstr "Dispersió: " - - #: g10/g10.c:768 g10/keyedit.c:2011 - msgid "Compression: " --msgstr "Compressi�: " -+msgstr "Compressió: " - - #: g10/g10.c:851 - msgid "usage: gpg [options] " --msgstr "forma d'�s: gpg [opcions] " -+msgstr "forma d'ús: gpg [opcions] " - - #: g10/g10.c:999 - msgid "conflicting commands\n" - msgstr "les ordres entren en conflicte\n" - - #: g10/g10.c:1017 --#, fuzzy, c-format -+#, c-format - msgid "no = sign found in group definition `%s'\n" --msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n" -+msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n" - - # Indi. ivb - #: g10/g10.c:1214 - #, fuzzy, c-format - msgid "WARNING: unsafe ownership on homedir `%s'\n" --msgstr "AV�S: el propietari �s insegur en %s �%s�\n" -+msgstr "AVÃS: el propietari és insegur en %s «%s»\n" - - # Indi. ivb - #: g10/g10.c:1217 - #, fuzzy, c-format - msgid "WARNING: unsafe ownership on configuration file `%s'\n" --msgstr "AV�S: el propietari �s insegur en %s �%s�\n" -+msgstr "AVÃS: el propietari és insegur en %s «%s»\n" - - # Indi. ivb - #: g10/g10.c:1220 - #, fuzzy, c-format - msgid "WARNING: unsafe ownership on extension `%s'\n" --msgstr "AV�S: el propietari �s insegur en %s �%s�\n" -+msgstr "AVÃS: el propietari és insegur en %s «%s»\n" - - #: g10/g10.c:1226 - #, fuzzy, c-format - msgid "WARNING: unsafe permissions on homedir `%s'\n" --msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n" -+msgstr "AVÃS: els permissos són insegurs en %s «%s»\n" - - #: g10/g10.c:1229 - #, fuzzy, c-format - msgid "WARNING: unsafe permissions on configuration file `%s'\n" --msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n" -+msgstr "AVÃS: els permissos són insegurs en %s «%s»\n" - - #: g10/g10.c:1232 - #, fuzzy, c-format - msgid "WARNING: unsafe permissions on extension `%s'\n" --msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n" -+msgstr "AVÃS: els permissos són insegurs en %s «%s»\n" - - #: g10/g10.c:1238 - #, fuzzy, c-format - msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" --msgstr "" --"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n" -+msgstr "AVÃS: el propietari del directori envoltant és insegur en %s «%s»\n" - - #: g10/g10.c:1241 - #, fuzzy, c-format - msgid "" - "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" --msgstr "" --"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n" -+msgstr "AVÃS: el propietari del directori envoltant és insegur en %s «%s»\n" - - #: g10/g10.c:1244 - #, fuzzy, c-format - msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" --msgstr "" --"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n" -+msgstr "AVÃS: el propietari del directori envoltant és insegur en %s «%s»\n" - - #: g10/g10.c:1250 - #, fuzzy, c-format - msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" --msgstr "" --"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n" -+msgstr "AVÃS: els permissos del directori envoltant són insegurs en %s «%s»\n" - - #: g10/g10.c:1253 - #, fuzzy, c-format - msgid "" - "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" --msgstr "" --"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n" -+msgstr "AVÃS: els permissos del directori envoltant són insegurs en %s «%s»\n" - - #: g10/g10.c:1256 - #, fuzzy, c-format - msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" --msgstr "" --"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n" -+msgstr "AVÃS: els permissos del directori envoltant són insegurs en %s «%s»\n" - - #: g10/g10.c:1397 - #, fuzzy, c-format - msgid "unknown configuration item `%s'\n" --msgstr "s'ha creat el nou fitxer d'opcions �%s�\n" -+msgstr "s'ha creat el nou fitxer d'opcions «%s»\n" - - #: g10/g10.c:1798 - #, c-format - msgid "NOTE: old default options file `%s' ignored\n" --msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n" -+msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n" - - #: g10/g10.c:1840 - #, c-format - msgid "NOTE: no default option file `%s'\n" --msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n" -+msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n" - - #: g10/g10.c:1844 - #, c-format - msgid "option file `%s': %s\n" --msgstr "fitxer d'opcions �%s�: %s\n" -+msgstr "fitxer d'opcions «%s»: %s\n" - - #: g10/g10.c:1851 - #, c-format - msgid "reading options from `%s'\n" --msgstr "s'estan llegint opcions de �%s�\n" -+msgstr "s'estan llegint opcions de «%s»\n" - - #: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 - #, c-format - msgid "NOTE: %s is not for normal use!\n" --msgstr "NOTA: %s no �s per a �s normal!\n" -+msgstr "NOTA: %s no és per a ús normal!\n" - - #: g10/g10.c:2078 - #, fuzzy, c-format - msgid "cipher extension `%s' not loaded due to unsafe permissions\n" - msgstr "" --"la extensi� de xifrat �%s� no s'ha carregat per tindre permissos " --"insegurs\n" -+"la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n" - - #: g10/g10.c:2292 - #, fuzzy, c-format - msgid "`%s' is not a valid character set\n" --msgstr "%s no �s un joc de car�cters v�lid\n" -+msgstr "%s no és un joc de caràcters vàlid\n" - - #: g10/g10.c:2311 g10/keyedit.c:3498 - #, fuzzy - msgid "could not parse keyserver URL\n" --msgstr "" --"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -+msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n" - - #: g10/g10.c:2317 - #, fuzzy, c-format - msgid "%s:%d: invalid keyserver options\n" --msgstr "%s:%d opcions d'exportaci� no v�lides\n" -+msgstr "%s:%d opcions d'exportació no vàlides\n" - - #: g10/g10.c:2320 - #, fuzzy - msgid "invalid keyserver options\n" --msgstr "opcions d'exportaci� no v�lides\n" -+msgstr "opcions d'exportació no vàlides\n" - - #: g10/g10.c:2327 - #, c-format - msgid "%s:%d: invalid import options\n" --msgstr "%s:%d: opcions d'importanci� no v�lides\n" -+msgstr "%s:%d: opcions d'importanció no vàlides\n" - - #: g10/g10.c:2330 - msgid "invalid import options\n" --msgstr "opcions d'importaci� no v�lides\n" -+msgstr "opcions d'importació no vàlides\n" - - #: g10/g10.c:2337 - #, c-format - msgid "%s:%d: invalid export options\n" --msgstr "%s:%d opcions d'exportaci� no v�lides\n" -+msgstr "%s:%d opcions d'exportació no vàlides\n" - - #: g10/g10.c:2340 - msgid "invalid export options\n" --msgstr "opcions d'exportaci� no v�lides\n" -+msgstr "opcions d'exportació no vàlides\n" - - #: g10/g10.c:2347 - #, fuzzy, c-format - msgid "%s:%d: invalid list options\n" --msgstr "%s:%d: opcions d'importanci� no v�lides\n" -+msgstr "%s:%d: opcions d'importanció no vàlides\n" - - #: g10/g10.c:2350 - #, fuzzy - msgid "invalid list options\n" --msgstr "opcions d'importaci� no v�lides\n" -+msgstr "opcions d'importació no vàlides\n" - - #: g10/g10.c:2372 - #, fuzzy, c-format - msgid "%s:%d: invalid verify options\n" --msgstr "%s:%d opcions d'exportaci� no v�lides\n" -+msgstr "%s:%d opcions d'exportació no vàlides\n" - - #: g10/g10.c:2375 - #, fuzzy - msgid "invalid verify options\n" --msgstr "opcions d'exportaci� no v�lides\n" -+msgstr "opcions d'exportació no vàlides\n" - - #: g10/g10.c:2382 - #, c-format -@@ -1428,24 +1405,24 @@ - - #: g10/g10.c:2572 - msgid "WARNING: program may create a core file!\n" --msgstr "AV�S: el programa podria crear un fitxer core!\n" -+msgstr "AVÃS: el programa podria crear un fitxer core!\n" - --# FIXME: prefer�ncia? jm --# Ho discut�rem en la llista, segur. Deu ser als arxius. ivb -+# FIXME: preferència? jm -+# Ho discutírem en la llista, segur. Deu ser als arxius. ivb - #: g10/g10.c:2576 - #, c-format - msgid "WARNING: %s overrides %s\n" --msgstr "AV�S: %s t� prefer�ncia sobre %s\n" -+msgstr "AVÃS: %s té preferència sobre %s\n" - - #: g10/g10.c:2585 - #, c-format - msgid "%s not allowed with %s!\n" --msgstr "%s no �s perm�s amb %s!\n" -+msgstr "%s no és permés amb %s!\n" - - #: g10/g10.c:2588 - #, c-format - msgid "%s makes no sense with %s!\n" --msgstr "%s no t� sentit amb %s!\n" -+msgstr "%s no té sentit amb %s!\n" - - #: g10/g10.c:2602 - #, c-format -@@ -1455,7 +1432,7 @@ - # clares -> en clar? ivb - #: g10/g10.c:2616 - msgid "you can only make detached or clear signatures while in --pgp2 mode\n" --msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n" -+msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n" - - #: g10/g10.c:2622 - msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" -@@ -1473,20 +1450,20 @@ - - #: g10/g10.c:2711 g10/g10.c:2735 - msgid "selected cipher algorithm is invalid\n" --msgstr "l'algorisme de xifratge triat no �s v�lid\n" -+msgstr "l'algorisme de xifratge triat no és vàlid\n" - - #: g10/g10.c:2717 g10/g10.c:2741 - msgid "selected digest algorithm is invalid\n" --msgstr "l'algorisme de resum seleccionat no �s v�lid\n" -+msgstr "l'algorisme de resum seleccionat no és vàlid\n" - - #: g10/g10.c:2723 - #, fuzzy - msgid "selected compression algorithm is invalid\n" --msgstr "l'algorisme de xifratge triat no �s v�lid\n" -+msgstr "l'algorisme de xifratge triat no és vàlid\n" - - #: g10/g10.c:2729 - msgid "selected certification digest algorithm is invalid\n" --msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n" -+msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n" - - #: g10/g10.c:2744 - msgid "completes-needed must be greater than 0\n" -@@ -1504,36 +1481,36 @@ - #: g10/g10.c:2750 - #, fuzzy - msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" --msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -+msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n" - - #: g10/g10.c:2752 - #, fuzzy - msgid "invalid min-cert-level; must be 1, 2, or 3\n" --msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -+msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n" - - #: g10/g10.c:2755 - msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" --msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n" -+msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n" - - #: g10/g10.c:2759 - msgid "invalid S2K mode; must be 0, 1 or 3\n" --msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n" -+msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n" - - #: g10/g10.c:2766 - msgid "invalid default preferences\n" --msgstr "les prefer�ncies per defecte s�n inv�lides\n" -+msgstr "les preferències per defecte són invàlides\n" - - #: g10/g10.c:2775 - msgid "invalid personal cipher preferences\n" --msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n" -+msgstr "les preferències personals de xifrat són invàlides\n" - - #: g10/g10.c:2779 - msgid "invalid personal digest preferences\n" --msgstr "les prefer�ncies personals de digest s�n inv�lides\n" -+msgstr "les preferències personals de digest són invàlides\n" - - #: g10/g10.c:2783 - msgid "invalid personal compress preferences\n" --msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n" -+msgstr "les preferències personals de compressió són invàlides\n" - - #: g10/g10.c:2816 - #, c-format -@@ -1543,8 +1520,7 @@ - #: g10/g10.c:2863 - #, fuzzy, c-format - msgid "you may not use cipher algorithm `%s' while in %s mode\n" --msgstr "" --"no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n" -+msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n" - - #: g10/g10.c:2868 - #, fuzzy, c-format -@@ -1554,17 +1530,17 @@ - #: g10/g10.c:2873 - #, fuzzy, c-format - msgid "you may not use compression algorithm `%s' while in %s mode\n" --msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n" -+msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n" - - #: g10/g10.c:2969 - #, c-format - msgid "failed to initialize the TrustDB: %s\n" --msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n" - - #: g10/g10.c:2980 - msgid "WARNING: recipients (-r) given without using public key encryption\n" - msgstr "" --"AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n" -+"AVÃS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n" - - #: g10/g10.c:2991 - msgid "--store [filename]" -@@ -1655,12 +1631,12 @@ - #: g10/g10.c:3276 - #, c-format - msgid "keyserver receive failed: %s\n" --msgstr "la recepci� des del servidor de claus ha fallat: %s\n" -+msgstr "la recepció des del servidor de claus ha fallat: %s\n" - - #: g10/g10.c:3278 - #, c-format - msgid "key export failed: %s\n" --msgstr "l'exportaci� de la clau ha fallat: %s\n" -+msgstr "l'exportació de la clau ha fallat: %s\n" - - #: g10/g10.c:3289 - #, c-format -@@ -1685,7 +1661,7 @@ - #: g10/g10.c:3435 - #, c-format - msgid "invalid hash algorithm `%s'\n" --msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n" -+msgstr "l'algoritme de dispersió és invàlid «%s»\n" - - #: g10/g10.c:3558 - msgid "[filename]" -@@ -1700,34 +1676,34 @@ - "a notation name must have only printable characters or spaces, and end with " - "an '='\n" - msgstr "" --"un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i " --"acabar amb el signe �=�\n" -+"un nom de notació només pot tenir caràcters imprimibles o espais i acabar " -+"amb el signe «=»\n" - - #: g10/g10.c:3860 - msgid "a user notation name must contain the '@' character\n" --msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n" -+msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n" - - #: g10/g10.c:3870 - msgid "a notation value must not use any control characters\n" --msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n" -+msgstr "un valor de notació no pot utilitzar cap caràcter de control\n" - - #: g10/g10.c:3904 - msgid "the given certification policy URL is invalid\n" --msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n" -+msgstr "la URL de política de certificació donada no és vàlida\n" - - #: g10/g10.c:3906 - msgid "the given signature policy URL is invalid\n" --msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" -+msgstr "la URL de política de signatura donada no és vàlida\n" - - #: g10/g10.c:3939 - #, fuzzy - msgid "the given preferred keyserver URL is invalid\n" --msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" -+msgstr "la URL de política de signatura donada no és vàlida\n" - - #: g10/getkey.c:150 - msgid "too many entries in pk cache - disabled\n" - msgstr "" --"hi ha massa entrades en la mem�ria cau de claus p�bliques - desactivada\n" -+"hi ha massa entrades en la memòria cau de claus públiques - desactivada\n" - - #: g10/getkey.c:186 g10/getkey.c:2711 - #, fuzzy -@@ -1738,27 +1714,27 @@ - #, fuzzy, c-format - msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" - msgstr "" --"La clau inv�lida %08lX s'ha fet v�lida amb --allow-non-selfsigned-uid\n" -+"La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n" - - #: g10/getkey.c:2189 - #, fuzzy, c-format - msgid "no secret subkey for public subkey %s - ignoring\n" - msgstr "" --"no hi ha una clau secreta per a la subclau p�blica %08lX - es descarta\n" -+"no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n" - - #: g10/getkey.c:2420 - #, fuzzy, c-format - msgid "using secondary key %s instead of primary key %s\n" --msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n" -+msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n" - - #: g10/getkey.c:2467 - #, fuzzy, c-format - msgid "key %s: secret key without public key - skipped\n" --msgstr "clau %08lX: clau secreta sense clau p�blica - es descarta\n" -+msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n" - - #: g10/gpgv.c:68 - msgid "be somewhat more quiet" --msgstr "una mica m�s silenci�s" -+msgstr "una mica més silenciós" - - #: g10/gpgv.c:69 - msgid "take the keys from this keyring" -@@ -1766,24 +1742,24 @@ - - #: g10/gpgv.c:71 - msgid "make timestamp conflicts only a warning" --msgstr "fes els conflictes de marques de temps nom�s un av�s" -+msgstr "fes els conflictes de marques de temps només un avís" - - #: g10/gpgv.c:72 - msgid "|FD|write status info to this FD" --msgstr "|FD|escriu informaci� d'estat en aquest FD" -+msgstr "|FD|escriu informació d'estat en aquest FD" - - #: g10/gpgv.c:96 - msgid "Usage: gpgv [options] [files] (-h for help)" --msgstr "Forma d'�s: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)" -+msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)" - --# Werner FIXME: should it use �Usage�? -+# Werner FIXME: should it use «Usage»? - #: g10/gpgv.c:99 - msgid "" - "Syntax: gpg [options] [files]\n" - "Check signatures against known trusted keys\n" - msgstr "" - "Sintaxi: gpg [opcions] [fitxers]\n" --"Comprova signatures amb claus conegudes amb confian�a\n" -+"Comprova signatures amb claus conegudes amb confiança\n" - - #: g10/helptext.c:48 - msgid "" -@@ -1791,11 +1767,9 @@ - "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" - "to do with the (implicitly created) web-of-certificates." - msgstr "" --"L'assignaci� d'un valor ac� �s cosa vostra; aquest valor mai " --"s'exportar�\n" --"a cap tercer. Ho necessitem per a implementar la xarxa de confian�a; no " --"t�\n" --"res a veure amb la xarxa de certificats (creada impl�citament)." -+"L'assignació d'un valor ací és cosa vostra; aquest valor mai s'exportarà\n" -+"a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no té\n" -+"res a veure amb la xarxa de certificats (creada implícitament)." - - #: g10/helptext.c:54 - msgid "" -@@ -1804,26 +1778,22 @@ - "access to the secret key. Answer \"yes\" to set this key to\n" - "ultimately trusted\n" - msgstr "" --"Per a construir la xarxa de confian�a, GnuPG necessita saber quines claus\n" --"tenen confian�a absoluta - aquestes s�n normalment les claus per a les " --"que\n" --"teniu acc�s a la clau secreta. Contesteu �s�� per a donar a aquesta " --"clau\n" --"confian�a absoluta\n" -+"Per a construir la xarxa de confiança, GnuPG necessita saber quines claus\n" -+"tenen confiança absoluta - aquestes són normalment les claus per a les que\n" -+"teniu accés a la clau secreta. Contesteu «sí» per a donar a aquesta clau\n" -+"confiança absoluta\n" - - # "clau no confiable"? jm --# No fiable, no de confian�a, no de fiar... ivb -+# No fiable, no de confiança, no de fiar... ivb - #: g10/helptext.c:61 - msgid "If you want to use this untrusted key anyway, answer \"yes\"." - msgstr "" --"Si voleu utilitzar aquesta clau no de confian�a de totes maneres, dieu " --"�s��." -+"Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»." - - #: g10/helptext.c:65 - msgid "" - "Enter the user ID of the addressee to whom you want to send the message." --msgstr "" --"Introdu�u l'ID d'usuari de la persona a qui voleu enviar el missatge." -+msgstr "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge." - - #: g10/helptext.c:69 - msgid "" -@@ -1845,18 +1815,18 @@ - "encryption. This algorithm should only be used in certain domains.\n" - "Please consult your security expert first." - msgstr "" --"En general no �s bona idea utilitzar la mateixa clau per a signar i\n" --"xifrar. Aquest algoritme nom�s s'hauria d'usar en tasques concretes.\n" -+"En general no és bona idea utilitzar la mateixa clau per a signar i\n" -+"xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n" - "Si us plau, consulteu al vostre expert en seguretat primer." - - #: g10/helptext.c:90 - msgid "Enter the size of the key" --msgstr "Introdu�u la grand�ria de la clau" -+msgstr "Introduïu la grandària de la clau" - - #: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143 - #: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181 - msgid "Answer \"yes\" or \"no\"" --msgstr "Contesteu �s�� o �no�" -+msgstr "Contesteu «sí» o «no»" - - #: g10/helptext.c:104 - msgid "" -@@ -1865,22 +1835,22 @@ - "get a good error response - instead the system tries to interpret\n" - "the given value as an interval." - msgstr "" --"Introdu�u el valor requerit tal i com es mostra en l'indicatiu.\n" --"�s possible introduir una data ISO (AAAA-MM-DD) per� no rebreu\n" --"una bona resposta d'error - en canvi, el sistema tractar� d'interpretar\n" -+"Introduïu el valor requerit tal i com es mostra en l'indicatiu.\n" -+"És possible introduir una data ISO (AAAA-MM-DD) però no rebreu\n" -+"una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n" - "el valor donat com un interval." - - #: g10/helptext.c:116 - msgid "Enter the name of the key holder" --msgstr "Introdu�u el nom del propietari de la clau" -+msgstr "Introduïu el nom del propietari de la clau" - - #: g10/helptext.c:121 - msgid "please enter an optional but highly suggested email address" --msgstr "introdu�u una adre�a de correu (opcional per� molt recomanable)" -+msgstr "introduïu una adreça de correu (opcional però molt recomanable)" - - #: g10/helptext.c:125 - msgid "Please enter an optional comment" --msgstr "Introdu�u un comentari opcional" -+msgstr "Introduïu un comentari opcional" - - #: g10/helptext.c:130 - msgid "" -@@ -1892,14 +1862,13 @@ - msgstr "" - "N canvia el nom.\n" - "C canvia el comentari.\n" --"E canvia l'adre�a de correu electr�nic.\n" --"O continua la generaci� de les claus.\n" -+"E canvia l'adreça de correu electrònic.\n" -+"O continua la generació de les claus.\n" - "Q ix." - - #: g10/helptext.c:139 - msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." --msgstr "" --"Contesteu �s�� (o nom�s �s�) si �s correcte generar la subclau." -+msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau." - - #: g10/helptext.c:147 - msgid "" -@@ -1941,66 +1910,61 @@ - "\n" - "If you don't know what the right answer is, answer \"0\"." - msgstr "" --"Quan signeu un ID d'usuari d'una clau, primer haur?eu de verificar que la " -+"Quan signeu un ID d'usuari d'una clau, primer hauríeu de verificar que la " - "clau\n" --"pertany a la persona esmentada en l'ID d'usuari. �s �til per a altres " -+"pertany a la persona esmentada en l'ID d'usuari. És útil per a altres " - "saber\n" --"amb quanta cura heu verificat a��.\n" -+"amb quanta cura heu verificat açò.\n" - "\n" --"�0� significa que no feu cap declaraci� de amb quanta cura heu " --"verificat\n" -+"«0» significa que no feu cap declaració de amb quanta cura heu verificat\n" - " la clau.\n" - "\n" --"�1� significa que creieu que la clau �s de la persona que diu que �s " --"la\n" --" propiet�ria, per� no heu pogut, o no heu verificat la clau de cap " -+"«1» significa que creieu que la clau és de la persona que diu que és la\n" -+" propietària, però no heu pogut, o no heu verificat la clau de cap " - "manera.\n" --" A�� �s �til per a la verificaci� d'un �rol�, quan signeu " --"la clau d'un\n" --" usuari amb pseud�nim.\n" -+" Açò és útil per a la verificació d'un «rol», quan signeu la clau d'un\n" -+" usuari amb pseudònim.\n" - "\n" --"�2� significa que heu fet algunes comprovacions de la clau. Per exemple, " --"a��\n" -+"«2» significa que heu fet algunes comprovacions de la clau. Per exemple, " -+"açò\n" - " pot significar que heu verificat la emprenta digital de la clau i " - "verificat\n" - " l'ID d'usuari en la clau amb el photo ID.\n" - "\n" --"�3� significa que heu fet una verificaci� exhaustiva de la clau. Per " -+"«3» significa que heu fet una verificació exhaustiva de la clau. Per " - "exemple,\n" --" a�� pot significar que heu verificat la emprenta digital amb el " -+" açò pot significar que heu verificat la emprenta digital amb el " - "propietari\n" --" de la clau en persona, i que heu comprovat, mitjan�ant un document " --"dif�cil\n" -+" de la clau en persona, i que heu comprovat, mitjançant un document " -+"difícil\n" - " de falsificar amb photo ID (com un passaport) que el nom del propietari\n" - " coincideix amb el nom de l'ID d'usuari en la clau, i finalment que heu\n" --" verificat (per intercanvi de correu) que l'adre�a de correu en la " --"clau\n" -+" verificat (per intercanvi de correu) que l'adreça de correu en la clau\n" - " pertany al propietari de la clau.\n" - "\n" - "Teniu en compte que els exemples donats anteriorment per als nivels 2 i 3 " --"s�n\n" --"*nom�s* exemples. Al final, �s cosa vostra decidir qu� significa " --"�alguna� i\n" --"�exhaustiva� per a vosaltres quan voleu signar altres claus.\n" -+"són\n" -+"*només* exemples. Al final, és cosa vostra decidir què significa «alguna» i\n" -+"«exhaustiva» per a vosaltres quan voleu signar altres claus.\n" - "\n" --"Si no sabeu quina �s la resposta correcta, contesteu �0�." -+"Si no sabeu quina és la resposta correcta, contesteu «0»." - - #: g10/helptext.c:185 - #, fuzzy - msgid "Answer \"yes\" if you want to sign ALL the user IDs" --msgstr "Contesteu �s�� si voleu signar TOTS els ID d'usuari" -+msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari" - - #: g10/helptext.c:189 - msgid "" - "Answer \"yes\" if you really want to delete this user ID.\n" - "All certificates are then also lost!" - msgstr "" --"Contesteu �s�� si realment voleu eliminar aquest ID d'usuari.\n" --"Tots els certificats tamb� es perdran!" -+"Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n" -+"Tots els certificats també es perdran!" - - #: g10/helptext.c:194 - msgid "Answer \"yes\" if it is okay to delete the subkey" --msgstr "Contesteu �s�� si �s correcte eliminar la subclau" -+msgstr "Contesteu «sí» si és correcte eliminar la subclau" - - #: g10/helptext.c:199 - msgid "" -@@ -2008,9 +1972,9 @@ - "to delete this signature because it may be important to establish a\n" - "trust connection to the key or another key certified by this key." - msgstr "" --"Aquesta �s una signatura v�lida en la clau; normalment no voldreu\n" --"eliminar aquesta signatura perqu� pot ser important per a establir\n" --"una connexi� de confian�a a la clau o a un altra clau certificada\n" -+"Aquesta és una signatura vàlida en la clau; normalment no voldreu\n" -+"eliminar aquesta signatura perquè pot ser important per a establir\n" -+"una connexió de confiança a la clau o a un altra clau certificada\n" - "per aquesta clau." - - #: g10/helptext.c:204 -@@ -2020,11 +1984,10 @@ - "know which key was used because this signing key might establish\n" - "a trust connection through another already certified key." - msgstr "" --"Aquesta signatura no es pot comprovar perqu� no teniu la clau\n" --"corresponent. Haur�eu de posposar la seua eliminaci� fins que\n" -+"Aquesta signatura no es pot comprovar perquè no teniu la clau\n" -+"corresponent. Hauríeu de posposar la seua eliminació fins que\n" - "sapieu quina clau es va utilitzar ja que aquesta clau de signatura\n" --"podria establir una connexi� de confian�a a trav�s d'una altra clau " --"ja\n" -+"podria establir una connexió de confiança a través d'una altra clau ja\n" - "certificada." - - #: g10/helptext.c:210 -@@ -2032,7 +1995,7 @@ - "The signature is not valid. It does make sense to remove it from\n" - "your keyring." - msgstr "" --"La signatura no �s v�lida. T� sentit que l'elimineu de l'anell\n" -+"La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n" - "de claus." - - #: g10/helptext.c:214 -@@ -2043,11 +2006,10 @@ - "only if this self-signature is for some reason not valid and\n" - "a second one is available." - msgstr "" --"Aquesta �s una signatura que enlla�a l'ID de l'usuari amb la clau.\n" --"Normalment no �s una bona idea eliminar una signatura com aquesta.\n" --"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, aix�\n" --"que feu a�� nom�s si l'autosignatura no �s v�lida per alguna ra� " --"i\n" -+"Aquesta és una signatura que enllaça l'ID de l'usuari amb la clau.\n" -+"Normalment no és una bona idea eliminar una signatura com aquesta.\n" -+"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, així\n" -+"que feu açò només si l'autosignatura no és vàlida per alguna raó i\n" - "hi ha una segona disponible." - - #: g10/helptext.c:222 -@@ -2056,18 +2018,18 @@ - "to the current list of preferences. The timestamp of all affected\n" - "self-signatures will be advanced by one second.\n" - msgstr "" --"Canvia les prefer�ncies de tots els ID d'usuari (o nom�s els dels " -+"Canvia les preferències de tots els ID d'usuari (o només els dels " - "seleccionats)\n" --"a la llista actual de prefer�ncies. Les marques de temps de totes les\n" --"autosignatures afectades s'avan�aran un segon.\n" -+"a la llista actual de preferències. Les marques de temps de totes les\n" -+"autosignatures afectades s'avançaran un segon.\n" - - #: g10/helptext.c:229 - msgid "Please enter the passhrase; this is a secret sentence \n" --msgstr "Introdu�u la contrasenya; aquesta ha de ser una frase secreta \n" -+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n" - - #: g10/helptext.c:235 - msgid "Please repeat the last passphrase, so you are sure what you typed in." --msgstr "Per favor, repetiu l'�ltima contrasenya per confirmar-la." -+msgstr "Per favor, repetiu l'última contrasenya per confirmar-la." - - #: g10/helptext.c:239 - msgid "Give the name of the file to which the signature applies" -@@ -2075,15 +2037,15 @@ - - #: g10/helptext.c:244 - msgid "Answer \"yes\" if it is okay to overwrite the file" --msgstr "Contesteu �s�� si �s correcte sobreescriure el fitxer" -+msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer" - - #: g10/helptext.c:249 - msgid "" - "Please enter a new filename. If you just hit RETURN the default\n" - "file (which is shown in brackets) will be used." - msgstr "" --"Introdu�u un nom de fitxer. Si premeu RETORN s'hi usar� el fitxer\n" --"predeterminat (apareix entre claud�tors)." -+"Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n" -+"predeterminat (apareix entre claudàtors)." - - #: g10/helptext.c:255 - msgid "" -@@ -2100,21 +2062,19 @@ - " Use this to state that the user ID should not longer be used;\n" - " this is normally used to mark an email address invalid.\n" - msgstr "" --"Haur�eu d'especificar una ra� per a la certificaci�. Depenent del\n" -+"Hauríeu d'especificar una raó per a la certificació. Depenent del\n" - "context teniu l'habilitat de triar d'aquesta llista:\n" --" �La clau ha estat compromesa�\n" --" Utilitzeu a�� si teniu alguna ra� per creure que persones no\n" --" autoritzades han tingut acc�s a la vostra clau secreta.\n" --" �La clau ha estat reempla�ada�\n" --" Utilitzeu a�� si heu reempla�at aquesta clau amb una m�s " --"nova.\n" --" �La clau ja no est� en �s�\n" --" Utilitzeu a�� si heu retirat aquesta clau.\n" --" �L'ID de l'usuari ja no �s v�lid�\n" --" Utilitzeu a�� per a constatar que l'ID de l'usuari no s'hauria\n" --" d'utilitzar m�s; a�� s'utilitza normalment per a marcar una " --"adre�a\n" --" de correu com a inv�lida.\n" -+" «La clau ha estat compromesa»\n" -+" Utilitzeu açò si teniu alguna raó per creure que persones no\n" -+" autoritzades han tingut accés a la vostra clau secreta.\n" -+" «La clau ha estat reemplaçada»\n" -+" Utilitzeu açò si heu reemplaçat aquesta clau amb una més nova.\n" -+" «La clau ja no està en ús»\n" -+" Utilitzeu açò si heu retirat aquesta clau.\n" -+" «L'ID de l'usuari ja no és vàlid»\n" -+" Utilitzeu açò per a constatar que l'ID de l'usuari no s'hauria\n" -+" d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n" -+" de correu com a invàlida.\n" - - #: g10/helptext.c:271 - msgid "" -@@ -2122,9 +2082,9 @@ - "revocation certificate. Please keep this text concise.\n" - "An empty line ends the text.\n" - msgstr "" --"Si voleu podeu introduir un text que descriga per qu� expediu aquest\n" --"certificat de revocaci�. Per favor, sigueu concisos.\n" --"Una l�nia buida indica el final del text.\n" -+"Si voleu podeu introduir un text que descriga per què expediu aquest\n" -+"certificat de revocació. Per favor, sigueu concisos.\n" -+"Una línia buida indica el final del text.\n" - - #: g10/helptext.c:286 - msgid "No help available" -@@ -2218,7 +2178,7 @@ - #: g10/import.c:547 - #, fuzzy - msgid "algorithms on these user IDs:\n" --msgstr "Heu signat els seg�ents ID d'usuari:\n" -+msgstr "Heu signat els següents ID d'usuari:\n" - - #: g10/import.c:584 - #, c-format -@@ -2256,26 +2216,26 @@ - #: g10/import.c:715 - #, fuzzy, c-format - msgid "key %s: PKS subkey corruption repaired\n" --msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n" -+msgstr "clau %08lX: corrupció de la subclau HKP reparada\n" - - #: g10/import.c:730 - #, fuzzy, c-format - msgid "key %s: accepted non self-signed user ID \"%s\"\n" --msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n" -+msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n" - - #: g10/import.c:736 - #, fuzzy, c-format - msgid "key %s: no valid user IDs\n" --msgstr "clau %08lX: l'ID no �s v�lid\n" -+msgstr "clau %08lX: l'ID no és vàlid\n" - - #: g10/import.c:738 - msgid "this may be caused by a missing self-signature\n" --msgstr "a�� pot ser causat per l'abs�ncia d'autosignatura\n" -+msgstr "açò pot ser causat per l'absència d'autosignatura\n" - - #: g10/import.c:748 g10/import.c:1170 - #, fuzzy, c-format - msgid "key %s: public key not found: %s\n" --msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n" -+msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n" - - #: g10/import.c:754 - #, fuzzy, c-format -@@ -2290,22 +2250,22 @@ - #: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 - #, c-format - msgid "writing to `%s'\n" --msgstr "s'est� escrivint en �%s�\n" -+msgstr "s'està escrivint en «%s»\n" - - #: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 - #, c-format - msgid "error writing keyring `%s': %s\n" --msgstr "error mentre s'escrivia l'anell �%s�: %s\n" -+msgstr "error mentre s'escrivia l'anell «%s»: %s\n" - - #: g10/import.c:793 - #, fuzzy, c-format - msgid "key %s: public key \"%s\" imported\n" --msgstr "clau %08lX: s'ha importat la clau p�blica �%s�\n" -+msgstr "clau %08lX: s'ha importat la clau pública «%s»\n" - - #: g10/import.c:817 - #, fuzzy, c-format - msgid "key %s: doesn't match our copy\n" --msgstr "clau %08lX: no correspon a la nostra c�pia\n" -+msgstr "clau %08lX: no correspon a la nostra còpia\n" - - #: g10/import.c:834 g10/import.c:1188 - #, fuzzy, c-format -@@ -2320,47 +2280,47 @@ - #: g10/import.c:874 - #, fuzzy, c-format - msgid "key %s: \"%s\" 1 new user ID\n" --msgstr "clau %08lX: �%s� 1 ID d'usuari nou\n" -+msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n" - - #: g10/import.c:877 - #, fuzzy, c-format - msgid "key %s: \"%s\" %d new user IDs\n" --msgstr "clau %08lX: �%s� %d ID d'usuari nous\n" -+msgstr "clau %08lX: «%s» %d ID d'usuari nous\n" - - #: g10/import.c:880 - #, fuzzy, c-format - msgid "key %s: \"%s\" 1 new signature\n" --msgstr "clau %08lX: �%s� 1 signatura nova\n" -+msgstr "clau %08lX: «%s» 1 signatura nova\n" - - #: g10/import.c:883 - #, fuzzy, c-format - msgid "key %s: \"%s\" %d new signatures\n" --msgstr "clau %08lX: �%s� %d signatures noves\n" -+msgstr "clau %08lX: «%s» %d signatures noves\n" - - #: g10/import.c:886 - #, fuzzy, c-format - msgid "key %s: \"%s\" 1 new subkey\n" --msgstr "clau %08lX: �%s� 1 subclau nova\n" -+msgstr "clau %08lX: «%s» 1 subclau nova\n" - - #: g10/import.c:889 - #, fuzzy, c-format - msgid "key %s: \"%s\" %d new subkeys\n" --msgstr "clau %08lX: �%s� %d subclaus noves\n" -+msgstr "clau %08lX: «%s» %d subclaus noves\n" - - #: g10/import.c:910 - #, fuzzy, c-format - msgid "key %s: \"%s\" not changed\n" --msgstr "clau %08lX: �%s� no ha estat modificada\n" -+msgstr "clau %08lX: «%s» no ha estat modificada\n" - - #: g10/import.c:1055 - #, fuzzy, c-format - msgid "key %s: secret key with invalid cipher %d - skipped\n" --msgstr "clau %08lX: clau secreta amb xifrat %d no v�lid - es descarta\n" -+msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n" - - #: g10/import.c:1066 - #, fuzzy - msgid "importing secret keys not allowed\n" --msgstr "s'est� escrivint la clau secreta a �%s�\n" -+msgstr "s'està escrivint la clau secreta a «%s»\n" - - #: g10/import.c:1083 - #, c-format -@@ -2386,22 +2346,21 @@ - #, fuzzy, c-format - msgid "key %s: no public key - can't apply revocation certificate\n" - msgstr "" --"clau %08lX: falta la clau p�blica: no es pot aplicar el certificat\n" --"de revocaci�\n" -+"clau %08lX: falta la clau pública: no es pot aplicar el certificat\n" -+"de revocació\n" - --# O �rebutjara�? ivb --# Per tots els canvis d'anglicisme �ignorat� -> �es descarta�, --# �es rebutja� est� b�. jm -+# O «rebutjara»? ivb -+# Per tots els canvis d'anglicisme «ignorat» -> «es descarta», -+# «es rebutja» està bé. jm - #: g10/import.c:1206 - #, fuzzy, c-format - msgid "key %s: invalid revocation certificate: %s - rejected\n" --msgstr "" --"clau %08lX: el certificat de revocaci� �s inv�lid: %s: es rebutja\n" -+msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n" - - #: g10/import.c:1238 - #, fuzzy, c-format - msgid "key %s: \"%s\" revocation certificate imported\n" --msgstr "clau %08lX: s'ha importat el certificat de revocaci� �%s�\n" -+msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n" - - #: g10/import.c:1303 - #, fuzzy, c-format -@@ -2412,50 +2371,49 @@ - #, fuzzy, c-format - msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" - msgstr "" --"clau %08lX: l'algoritme de clau p�blica no es suporta sobre l'id d'usuari " --"�%s�\n" -+"clau %08lX: l'algoritme de clau pública no es suporta sobre l'id d'usuari «%" -+"s»\n" - "\n" - - #: g10/import.c:1320 - #, fuzzy, c-format - msgid "key %s: invalid self-signature on user ID \"%s\"\n" --msgstr "" --"clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n" -+msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n" - - #: g10/import.c:1338 - #, fuzzy, c-format - msgid "key %s: no subkey for key binding\n" --msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n" -+msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n" - - #: g10/import.c:1349 g10/import.c:1399 - #, fuzzy, c-format - msgid "key %s: unsupported public key algorithm\n" --msgstr "clau %08lX: l'algoritme de clau p�blica no �s suportat\n" -+msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n" - - #: g10/import.c:1351 - #, fuzzy, c-format - msgid "key %s: invalid subkey binding\n" --msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n" -+msgstr "clau %08lX: l'enllaç de subclau és invàlid\n" - - #: g10/import.c:1366 - #, fuzzy, c-format - msgid "key %s: removed multiple subkey binding\n" --msgstr "clau %08lX: s'ha eliminat un enlla� de subclau m�ltiple\n" -+msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n" - - #: g10/import.c:1388 - #, fuzzy, c-format - msgid "key %s: no subkey for key revocation\n" --msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci�\n" -+msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n" - - #: g10/import.c:1401 - #, fuzzy, c-format - msgid "key %s: invalid subkey revocation\n" --msgstr "clau %08lX: Subclau de revocaci� no v�lida\n" -+msgstr "clau %08lX: Subclau de revocació no vàlida\n" - - #: g10/import.c:1416 - #, fuzzy, c-format - msgid "key %s: removed multiple subkey revocation\n" --msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n" -+msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n" - - #: g10/import.c:1458 - #, fuzzy, c-format -@@ -2470,34 +2428,32 @@ - #: g10/import.c:1506 - #, fuzzy, c-format - msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" --msgstr "" --"clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n" -+msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n" - - #: g10/import.c:1516 - #, fuzzy, c-format - msgid "key %s: revocation certificate at wrong place - skipped\n" - msgstr "" --"clau %08lX: el certificat de revocaci� �s en el lloc equivocat - es " -+"clau %08lX: el certificat de revocació és en el lloc equivocat - es " - "descarta\n" - - #: g10/import.c:1533 - #, fuzzy, c-format - msgid "key %s: invalid revocation certificate: %s - skipped\n" --msgstr "" --"clau %08lX: el certificat de revocaci� �s inv�lid: %s - es descarta\n" -+msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n" - - #: g10/import.c:1547 - #, fuzzy, c-format - msgid "key %s: subkey signature in wrong place - skipped\n" - msgstr "" --"clau %08lX: la signatura de la subclau �s en el lloc equivocat - es " -+"clau %08lX: la signatura de la subclau és en el lloc equivocat - es " - "descarta\n" - - #: g10/import.c:1555 - #, fuzzy, c-format - msgid "key %s: unexpected signature class (0x%02X) - skipped\n" - msgstr "" --"clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n" -+"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n" - - #: g10/import.c:1655 - #, fuzzy, c-format -@@ -2508,20 +2464,20 @@ - #, fuzzy, c-format - msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" - msgstr "" --"AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� " --"%08lX\n" -+"AVÃS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %" -+"08lX\n" - - #: g10/import.c:1731 - #, fuzzy, c-format - msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" - msgstr "" --"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no " --"est� present.\n" -+"AVÃS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està " -+"present.\n" - - #: g10/import.c:1790 - #, fuzzy, c-format - msgid "key %s: \"%s\" revocation certificate added\n" --msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n" -+msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n" - - #: g10/import.c:1824 - #, fuzzy, c-format -@@ -2531,21 +2487,21 @@ - #: g10/keydb.c:167 - #, c-format - msgid "error creating keyring `%s': %s\n" --msgstr "error en crear l'anell �%s�: %s\n" -+msgstr "error en crear l'anell «%s»: %s\n" - - #: g10/keydb.c:174 - #, c-format - msgid "keyring `%s' created\n" --msgstr "s'ha creat l'anell �%s?\n" -+msgstr "s'ha creat l'anell «%s»\n" - - #: g10/keydb.c:685 - #, c-format - msgid "failed to rebuild keyring cache: %s\n" --msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n" -+msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n" - - #: g10/keyedit.c:253 - msgid "[revocation]" --msgstr "[revocaci�]" -+msgstr "[revocació]" - - #: g10/keyedit.c:254 - msgid "[self-signature]" -@@ -2553,12 +2509,12 @@ - - #: g10/keyedit.c:332 g10/keylist.c:342 - msgid "1 bad signature\n" --msgstr "1 signatura err�nia\n" -+msgstr "1 signatura errònia\n" - - #: g10/keyedit.c:334 g10/keylist.c:344 - #, c-format - msgid "%d bad signatures\n" --msgstr "%d signatures err�nies\n" -+msgstr "%d signatures errònies\n" - - #: g10/keyedit.c:336 g10/keylist.c:346 - msgid "1 signature not checked due to a missing key\n" -@@ -2580,12 +2536,12 @@ - - #: g10/keyedit.c:344 - msgid "1 user ID without valid self-signature detected\n" --msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n" -+msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n" - - #: g10/keyedit.c:346 - #, c-format - msgid "%d user IDs without valid self-signatures detected\n" --msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n" -+msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n" - - #: g10/keyedit.c:402 g10/pkclist.c:262 - #, fuzzy -@@ -2623,7 +2579,7 @@ - #: g10/keyedit.c:584 - #, c-format - msgid "User ID \"%s\" is revoked." --msgstr "L'ID d'usuari �%s� est� revocat." -+msgstr "L'ID d'usuari «%s» està revocat." - - #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 - #: g10/keyedit.c:857 g10/keyedit.c:1543 -@@ -2640,12 +2596,12 @@ - #: g10/keyedit.c:610 - #, c-format - msgid "User ID \"%s\" is expired." --msgstr "L'ID d'usuari �%s� ha caducat." -+msgstr "L'ID d'usuari «%s» ha caducat." - - #: g10/keyedit.c:636 - #, c-format - msgid "User ID \"%s\" is not self-signed." --msgstr "L'ID d'usuari �%s� no est� autosignat." -+msgstr "L'ID d'usuari «%s» no està autosignat." - - #: g10/keyedit.c:675 - #, c-format -@@ -2653,8 +2609,8 @@ - "The self-signature on \"%s\"\n" - "is a PGP 2.x-style signature.\n" - msgstr "" --"La vostra signatura en �%s�\n" --"�s una signatura d'estil PGP 2.x.\n" -+"La vostra signatura en «%s»\n" -+"és una signatura d'estil PGP 2.x.\n" - - #: g10/keyedit.c:684 - msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " -@@ -2666,12 +2622,12 @@ - "Your current signature on \"%s\"\n" - "has expired.\n" - msgstr "" --"La vostra signatura actual en �%s�\n" -+"La vostra signatura actual en «%s»\n" - "ha caducat.\n" - - #: g10/keyedit.c:702 - msgid "Do you want to issue a new signature to replace the expired one? (y/N) " --msgstr "Voleu crear una nova signatura per a reempla�ar la caducada? (s/N) " -+msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) " - - #: g10/keyedit.c:723 - #, c-format -@@ -2679,8 +2635,8 @@ - "Your current signature on \"%s\"\n" - "is a local signature.\n" - msgstr "" --"La vostra signatura en �%s�\n" --"�s una signatura local.\n" -+"La vostra signatura en «%s»\n" -+"és una signatura local.\n" - - #: g10/keyedit.c:727 - msgid "Do you want to promote it to a full exportable signature? (y/N) " -@@ -2689,12 +2645,12 @@ - #: g10/keyedit.c:748 - #, fuzzy, c-format - msgid "\"%s\" was already locally signed by key %s\n" --msgstr "�%s� ja estava signada localment amb la clau %08lX\n" -+msgstr "«%s» ja estava signada localment amb la clau %08lX\n" - - #: g10/keyedit.c:751 - #, fuzzy, c-format - msgid "\"%s\" was already signed by key %s\n" --msgstr "�%s� ja estava signada amb la clau %08lX\n" -+msgstr "«%s» ja estava signada amb la clau %08lX\n" - - #: g10/keyedit.c:756 - msgid "Do you want to sign it again anyway? (y/N) " -@@ -2712,7 +2668,7 @@ - #: g10/keyedit.c:813 - #, c-format - msgid "This key is due to expire on %s.\n" --msgstr "Aquesta clau caducar� el %s.\n" -+msgstr "Aquesta clau caducarà el %s.\n" - - #: g10/keyedit.c:817 - msgid "Do you want your signature to expire at the same time? (Y/n) " -@@ -2727,7 +2683,7 @@ - - #: g10/keyedit.c:852 - msgid "This would make the key unusable in PGP 2.x.\n" --msgstr "A�� inutilitzaria la clau en PGP 2.x.\n" -+msgstr "Açò inutilitzaria la clau en PGP 2.x.\n" - - #: g10/keyedit.c:877 - msgid "" -@@ -2736,8 +2692,8 @@ - "to the person named above? If you don't know what to answer, enter \"0\".\n" - msgstr "" - "Amb quanta cura heu verificat que la clau que esteu a punt de signar \n" --"pertany realment a la persona esmentada anteriorment? Si no sabeu qu� \n" --"contestar, entreu �0�.\n" -+"pertany realment a la persona esmentada anteriorment? Si no sabeu què \n" -+"contestar, entreu «0».\n" - - #: g10/keyedit.c:882 - #, c-format -@@ -2762,9 +2718,7 @@ - #: g10/keyedit.c:894 - #, fuzzy - msgid "Your selection? (enter `?' for more information): " --msgstr "" --"Seleccioneu una opci� (introdu�u �?� per obtindre m�s " --"informaci�):" -+msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):" - - #: g10/keyedit.c:918 - #, fuzzy, c-format -@@ -2780,35 +2734,35 @@ - msgid "This will be a self-signature.\n" - msgstr "" - "\n" --"A�� ser� una autosignatura.\n" -+"Açò serà una autosignatura.\n" - - #: g10/keyedit.c:931 - #, fuzzy - msgid "WARNING: the signature will not be marked as non-exportable.\n" - msgstr "" - "\n" --"AV�S: la signatura no es marcar� com a inexportable.\n" -+"AVÃS: la signatura no es marcarà com a inexportable.\n" - - #: g10/keyedit.c:939 - #, fuzzy - msgid "WARNING: the signature will not be marked as non-revocable.\n" - msgstr "" - "\n" --"AV�S: la signatura no es marcar� com a irrevocable.\n" -+"AVÃS: la signatura no es marcarà com a irrevocable.\n" - - #: g10/keyedit.c:949 - #, fuzzy - msgid "The signature will be marked as non-exportable.\n" - msgstr "" - "\n" --"La signatura es marcar� com a inexportable.\n" -+"La signatura es marcarà com a inexportable.\n" - - #: g10/keyedit.c:956 - #, fuzzy - msgid "The signature will be marked as non-revocable.\n" - msgstr "" - "\n" --"La signatura es marcar� com a irrevocable.\n" -+"La signatura es marcarà com a irrevocable.\n" - - #: g10/keyedit.c:963 - #, fuzzy -@@ -2840,19 +2794,19 @@ - #: g10/sign.c:369 - #, c-format - msgid "signing failed: %s\n" --msgstr "Ha fallat el proc�s de signatura: %s\n" -+msgstr "Ha fallat el procés de signatura: %s\n" - - #: g10/keyedit.c:1084 - msgid "This key is not protected.\n" --msgstr "Aquesta clau no est� protegida.\n" -+msgstr "Aquesta clau no està protegida.\n" - - #: g10/keyedit.c:1088 - msgid "Secret parts of primary key are not available.\n" --msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n" -+msgstr "Les parts secretes de la clau primària no estan disponibles.\n" - - #: g10/keyedit.c:1092 - msgid "Key is protected.\n" --msgstr "La clau est� protegida.\n" -+msgstr "La clau està protegida.\n" - - #: g10/keyedit.c:1112 - #, c-format -@@ -2864,7 +2818,7 @@ - "Enter the new passphrase for this secret key.\n" - "\n" - msgstr "" --"Introdu�u la nova contrasenya per a la clau secreta.\n" -+"Introduïu la nova contrasenya per a la clau secreta.\n" - "\n" - - #: g10/keyedit.c:1127 g10/keygen.c:1818 -@@ -2876,18 +2830,18 @@ - "You don't want a passphrase - this is probably a *bad* idea!\n" - "\n" - msgstr "" --"No voleu contrasenya: a�� �s probablement una *mala* idea!\n" -+"No voleu contrasenya: açò és probablement una *mala* idea!\n" - "\n" - - # No abusis dels pronoms! (Rowan Atkinson @ Llei i Desordre) ivb - #: g10/keyedit.c:1135 - #, fuzzy - msgid "Do you really want to do this? (y/N) " --msgstr "Esteu segur de voler fer a��? " -+msgstr "Esteu segur de voler fer açò? " - - #: g10/keyedit.c:1201 - msgid "moving a key signature to the correct place\n" --msgstr "s'est� posant la signatura al lloc correcte\n" -+msgstr "s'està posant la signatura al lloc correcte\n" - - #: g10/keyedit.c:1287 - msgid "save and quit" -@@ -2902,14 +2856,14 @@ - msgstr "llista claus i ID" - - # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb --# Yeah, els vaig corregir abans de que enviares la teua correcci�. jm -+# Yeah, els vaig corregir abans de que enviares la teua correcció. jm - #: g10/keyedit.c:1293 - msgid "select user ID N" - msgstr "tria l'ID d'usuari N" - - #: g10/keyedit.c:1294 - msgid "select secondary key N" --msgstr "tria la clau secund�ria N" -+msgstr "tria la clau secundària N" - - #: g10/keyedit.c:1295 - msgid "list signatures" -@@ -2928,9 +2882,9 @@ - msgstr "afegeix un ID d'usuari" - - # Com estava escrit abans. ivb --# Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot --# el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids --# i no hem unificat en catal�. Potser li ho dir� a Werner. jm. -+# Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot -+# el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids -+# i no hem unificat en català. Potser li ho diré a Werner. jm. - #: g10/keyedit.c:1304 - msgid "add a photo ID" - msgstr "afegeix un photo ID" -@@ -2941,7 +2895,7 @@ - - #: g10/keyedit.c:1308 - msgid "add a secondary key" --msgstr "afegeix una clau secund�ria" -+msgstr "afegeix una clau secundària" - - #: g10/keyedit.c:1310 - msgid "add a key to a smartcard" -@@ -2953,11 +2907,11 @@ - - #: g10/keyedit.c:1313 - msgid "delete a secondary key" --msgstr "esborra una clau secund�ria" -+msgstr "esborra una clau secundària" - - #: g10/keyedit.c:1314 - msgid "add a revocation key" --msgstr "afegeix una clau de revocaci�" -+msgstr "afegeix una clau de revocació" - - #: g10/keyedit.c:1315 - msgid "delete signatures" -@@ -2973,29 +2927,28 @@ - - #: g10/keyedit.c:1318 - msgid "toggle between secret and public key listing" --msgstr "canvia entre el llistat de claus secretes i p�bliques" -+msgstr "canvia entre el llistat de claus secretes i públiques" - - #: g10/keyedit.c:1320 - msgid "list preferences (expert)" --msgstr "llista les prefer�ncies (expert)" -+msgstr "llista les preferències (expert)" - - #: g10/keyedit.c:1321 - msgid "list preferences (verbose)" --msgstr "llista les prefer�ncies (detallat)" -+msgstr "llista les preferències (detallat)" - - #: g10/keyedit.c:1322 - msgid "set preference list" --msgstr "estableix la llista de prefer�ncies" -+msgstr "estableix la llista de preferències" - - #: g10/keyedit.c:1323 - msgid "updated preferences" --msgstr "prefer�ncies actualitzades" -+msgstr "preferències actualitzades" - - #: g10/keyedit.c:1324 - #, fuzzy - msgid "set preferred keyserver URL" --msgstr "" --"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -+msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n" - - #: g10/keyedit.c:1325 - msgid "change the passphrase" -@@ -3003,7 +2956,7 @@ - - #: g10/keyedit.c:1326 - msgid "change the ownertrust" --msgstr "canvia la confian�a" -+msgstr "canvia la confiança" - - #: g10/keyedit.c:1327 - msgid "revoke signatures" -@@ -3015,7 +2968,7 @@ - - #: g10/keyedit.c:1329 - msgid "revoke a secondary key" --msgstr "revoca una clau secund�ria" -+msgstr "revoca una clau secundària" - - #: g10/keyedit.c:1330 - msgid "disable a key" -@@ -3034,23 +2987,23 @@ - #: g10/keyedit.c:1386 - #, fuzzy, c-format - msgid "error reading secret keyblock \"%s\": %s\n" --msgstr "error en llegir el bloc de claus secretes �%s�: %s\n" -+msgstr "error en llegir el bloc de claus secretes «%s»: %s\n" - - #: g10/keyedit.c:1404 - msgid "Secret key is available.\n" --msgstr "La clau secreta est� disponible.\n" -+msgstr "La clau secreta està disponible.\n" - - #: g10/keyedit.c:1481 - msgid "Need the secret key to do this.\n" --msgstr "Cal la clau secreta per a fer a��.\n" -+msgstr "Cal la clau secreta per a fer açò.\n" - - #: g10/keyedit.c:1489 - msgid "Please use the command \"toggle\" first.\n" --msgstr "Useu l'ordre �toggle� abans.\n" -+msgstr "Useu l'ordre «toggle» abans.\n" - - #: g10/keyedit.c:1537 - msgid "Key is revoked." --msgstr "La clau est� revocada." -+msgstr "La clau està revocada." - - #: g10/keyedit.c:1557 - #, fuzzy -@@ -3064,12 +3017,12 @@ - #: g10/keyedit.c:1568 - #, fuzzy, c-format - msgid "Unknown signature type `%s'\n" --msgstr "la classe de signatura �s desconeguda" -+msgstr "la classe de signatura és desconeguda" - - #: g10/keyedit.c:1591 - #, c-format - msgid "This command is not allowed while in %s mode.\n" --msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n" -+msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n" - - #: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 - msgid "You must select at least one user ID.\n" -@@ -3077,7 +3030,7 @@ - - #: g10/keyedit.c:1615 - msgid "You can't delete the last user ID!\n" --msgstr "No podeu esborrar l'�ltim ID d'usuari!\n" -+msgstr "No podeu esborrar l'últim ID d'usuari!\n" - - #: g10/keyedit.c:1617 - #, fuzzy -@@ -3092,16 +3045,16 @@ - #: g10/keyedit.c:1668 - #, fuzzy - msgid "Really move the primary key? (y/N) " --msgstr "Realment voleu eliminar aquest ID d'usuari? " -+msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)" - - #: g10/keyedit.c:1680 - #, fuzzy - msgid "You must select exactly one key.\n" --msgstr "Heu de seleccionar, si m�s no, una clau.\n" -+msgstr "Heu de seleccionar, si més no, una clau.\n" - - #: g10/keyedit.c:1700 g10/keyedit.c:1755 - msgid "You must select at least one key.\n" --msgstr "Heu de seleccionar, si m�s no, una clau.\n" -+msgstr "Heu de seleccionar, si més no, una clau.\n" - - #: g10/keyedit.c:1703 - #, fuzzy -@@ -3141,18 +3094,18 @@ - #: g10/keyedit.c:1831 - #, fuzzy - msgid "Set preference list to:\n" --msgstr "estableix la llista de prefer�ncies" -+msgstr "estableix la llista de preferències" - - #: g10/keyedit.c:1837 - #, fuzzy - msgid "Really update the preferences for the selected user IDs? (y/N) " - msgstr "" --"Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?" -+"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?" - - #: g10/keyedit.c:1839 - #, fuzzy - msgid "Really update the preferences? (y/N) " --msgstr "Realment voleu actualitzar les prefer�ncies? " -+msgstr "Realment voleu actualitzar les preferències? " - - #: g10/keyedit.c:1889 - #, fuzzy -@@ -3167,16 +3120,16 @@ - #: g10/keyedit.c:1902 - #, c-format - msgid "update failed: %s\n" --msgstr "ha fallat l'actualitzaci�: %s\n" -+msgstr "ha fallat l'actualització: %s\n" - - #: g10/keyedit.c:1909 - #, c-format - msgid "update secret failed: %s\n" --msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n" -+msgstr "ha fallat l'actualització de la clau secreta: %s\n" - - #: g10/keyedit.c:1916 - msgid "Key not changed so no update needed.\n" --msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n" -+msgstr "La clau no ha canviat, per tant no cal actualització.\n" - - #: g10/keyedit.c:1988 - msgid "Digest: " -@@ -3194,8 +3147,8 @@ - msgid "Preferred keyserver: " - msgstr "" - --# Potser %s haja d'anar darrere de �clau�. ivb --# �s cert. Nova funcionalitat de 1.2.0, IIRC. jm -+# Potser %s haja d'anar darrere de «clau». ivb -+# És cert. Nova funcionalitat de 1.2.0, IIRC. jm - #: g10/keyedit.c:2309 - #, fuzzy, c-format - msgid "This key may be revoked by %s key %s" -@@ -3230,14 +3183,14 @@ - msgstr " [caduca: %s]" - - #: g10/keyedit.c:2340 --#, fuzzy, c-format -+#, c-format - msgid "usage: %s" --msgstr " confian�a: %c/%c" -+msgstr "" - - #: g10/keyedit.c:2355 - #, fuzzy, c-format - msgid "trust: %s" --msgstr " confian�a: %c/%c" -+msgstr " confiança: %c/%c" - - #: g10/keyedit.c:2359 - #, c-format -@@ -3254,15 +3207,14 @@ - - #: g10/keyedit.c:2461 - msgid "There are no preferences on a PGP 2.x-style user ID.\n" --msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n" -+msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n" - - #: g10/keyedit.c:2469 - msgid "" - "Please note that the shown key validity is not necessarily correct\n" - "unless you restart the program.\n" - msgstr "" --"Teniu en compte que la validesa de la clau mostrada no �s " --"necess�riament\n" -+"Teniu en compte que la validesa de la clau mostrada no és necessàriament\n" - "correcta a no ser que torneu a executar el programa.\n" - - #: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 -@@ -3282,8 +3234,8 @@ - "WARNING: no user ID has been marked as primary. This command may\n" - " cause a different user ID to become the assumed primary.\n" - msgstr "" --"AV�S: no s'ha marcat cap ID d'usuari com prim�ria. Aquesta ordre pot\n" --" causar que una ID d'usuari diferent esdevinga en la prim�ria " -+"AVÃS: no s'ha marcat cap ID d'usuari com primària. Aquesta ordre pot\n" -+" causar que una ID d'usuari diferent esdevinga en la primària " - "assumida.\n" - - # Photo ID com abans. ivb -@@ -3293,7 +3245,7 @@ - "versions\n" - " of PGP to reject this key.\n" - msgstr "" --"AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que " -+"AVÃS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que " - "algunes versions de PGP rebutgen aquesta clau.\n" - - #: g10/keyedit.c:2665 g10/keyedit.c:2943 -@@ -3304,15 +3256,15 @@ - msgid "You may not add a photo ID to a PGP2-style key.\n" - msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n" - --# Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)? ivb --# Hmm. S�... (s/N/x) jm -+# Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)? ivb -+# Hmm. Sí... (s/N/x) jm - #: g10/keyedit.c:2811 - msgid "Delete this good signature? (y/N/q)" - msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" - - #: g10/keyedit.c:2821 - msgid "Delete this invalid signature? (y/N/q)" --msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)" -+msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)" - - #: g10/keyedit.c:2825 - msgid "Delete this unknown signature? (y/N/q)" -@@ -3344,8 +3296,7 @@ - "cause\n" - " some versions of PGP to reject this key.\n" - msgstr "" --"AV�S: Aquesta �s una clau d'estil PGP 2.x. Afegir un revocador designat " --"pot\n" -+"AVÃS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n" - "fer que algunes versions de PGP rebutjen aquesta clau.\n" - - #: g10/keyedit.c:2949 -@@ -3354,7 +3305,7 @@ - - #: g10/keyedit.c:2969 - msgid "Enter the user ID of the designated revoker: " --msgstr "Introdu�u l'ID d'usuari del revocador designat: " -+msgstr "Introduïu l'ID d'usuari del revocador designat: " - - #: g10/keyedit.c:2992 - msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" -@@ -3368,13 +3319,12 @@ - #: g10/keyedit.c:3029 - #, fuzzy - msgid "this key has already been designated as a revoker\n" --msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" -+msgstr "no podeu nominar una clau com el seu propi revocador designat\n" - - #: g10/keyedit.c:3048 - msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" - msgstr "" --"AV�S: no es pot desfer la nominaci� d'una clau com a revocador " --"designat!\n" -+"AVÃS: no es pot desfer la nominació d'una clau com a revocador designat!\n" - - #: g10/keyedit.c:3054 - #, fuzzy -@@ -3389,15 +3339,15 @@ - - #: g10/keyedit.c:3121 - msgid "Please select at most one secondary key.\n" --msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n" -+msgstr "Per favor, seleccioneu com a molt una clau secundària.\n" - - #: g10/keyedit.c:3125 - msgid "Changing expiration time for a secondary key.\n" --msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n" -+msgstr "S'està canviant la data de caducitat per a una clau secundària.\n" - - #: g10/keyedit.c:3128 - msgid "Changing expiration time for the primary key.\n" --msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n" -+msgstr "S'està canviant la data de caducitat per a una clau primària.\n" - - #: g10/keyedit.c:3174 - msgid "You can't change the expiration date of a v3 key\n" -@@ -3414,7 +3364,7 @@ - #: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 - #, fuzzy, c-format - msgid "skipping v3 self-signature on user ID \"%s\"\n" --msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n" -+msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n" - - #: g10/keyedit.c:3480 - msgid "Enter your preferred keyserver URL: " -@@ -3433,22 +3383,24 @@ - #: g10/keyedit.c:3622 - #, c-format - msgid "No user ID with index %d\n" --msgstr "No hi ha cap ID amb l'�ndex %d\n" -+msgstr "No hi ha cap ID amb l'índex %d\n" - - #: g10/keyedit.c:3668 - #, c-format - msgid "No secondary key with index %d\n" --msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n" -+msgstr "No hi ha cap clau secundària amb l'índex %d\n" - - #: g10/keyedit.c:3785 - #, fuzzy, c-format - msgid "user ID: \"%s\"\n" --msgstr "ID d'usuari: �" -+msgstr "ID d'usuari: «" - - #: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 - #, fuzzy, c-format - msgid "signed by your key %s on %s%s%s\n" --msgstr " signat per %08lX el %s%s%s\n" -+msgstr "" -+"»\n" -+"signat amb la vostra clau %08lX el %s\n" - - #: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 - msgid " (non-exportable)" -@@ -3467,13 +3419,12 @@ - # S! jm - #: g10/keyedit.c:3802 - msgid "Create a revocation certificate for this signature? (y/N) " --msgstr "" --"Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) " -+msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) " - - #: g10/keyedit.c:3829 - #, fuzzy, c-format - msgid "You have signed these user IDs on key %s:\n" --msgstr "Heu signat els seg�ents ID d'usuari:\n" -+msgstr "Heu signat els següents ID d'usuari:\n" - - #: g10/keyedit.c:3855 - #, fuzzy -@@ -3492,7 +3443,7 @@ - # (s/N)? ivb - #: g10/keyedit.c:3904 - msgid "Really create the revocation certificates? (y/N) " --msgstr "Realment voleu crear els certificats de revocaci�? (s/N) " -+msgstr "Realment voleu crear els certificats de revocació? (s/N) " - - #: g10/keyedit.c:3934 - msgid "no secret key\n" -@@ -3501,61 +3452,60 @@ - #: g10/keyedit.c:4004 - #, c-format - msgid "user ID \"%s\" is already revoked\n" --msgstr "l'ID d'usuari �%s� ja est� revocat\n" -+msgstr "l'ID d'usuari «%s» ja està revocat\n" - - #: g10/keyedit.c:4021 - #, c-format - msgid "WARNING: a user ID signature is dated %d seconds in the future\n" --msgstr "" --"AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n" -+msgstr "AVÃS: una signatura d'ID d'usuari està datada %d segons en el futur\n" - - #: g10/keyedit.c:4190 - #, fuzzy, c-format - msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" - msgstr "" --"S'est� mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n" -+"S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n" - - #: g10/keygen.c:293 - #, fuzzy, c-format - msgid "preference `%s' duplicated\n" --msgstr "la prefer�ncia %c%lu �s duplicada\n" -+msgstr "la preferència %c%lu és duplicada\n" - - #: g10/keygen.c:300 - #, fuzzy - msgid "too many cipher preferences\n" --msgstr "hi ha massa prefer�ncies �%c�\n" -+msgstr "hi ha massa preferències «%c»\n" - - #: g10/keygen.c:302 - #, fuzzy - msgid "too many digest preferences\n" --msgstr "hi ha massa prefer�ncies �%c�\n" -+msgstr "hi ha massa preferències «%c»\n" - - #: g10/keygen.c:304 - #, fuzzy - msgid "too many compression preferences\n" --msgstr "hi ha massa prefer�ncies �%c�\n" -+msgstr "hi ha massa preferències «%c»\n" - - #: g10/keygen.c:401 - #, fuzzy, c-format - msgid "invalid item `%s' in preference string\n" --msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n" -+msgstr "hi ha un caràcter invàlid en la cadena de preferència\n" - - #: g10/keygen.c:827 - msgid "writing direct signature\n" --msgstr "s'est� escrivint una signatura directa\n" -+msgstr "s'està escrivint una signatura directa\n" - - #: g10/keygen.c:866 - msgid "writing self signature\n" --msgstr "s'est� escrivint l'autosignatura\n" -+msgstr "s'està escrivint l'autosignatura\n" - - #: g10/keygen.c:912 - msgid "writing key binding signature\n" --msgstr "s'est� escrivint la signatura de comprovaci� de la clau\n" -+msgstr "s'està escrivint la signatura de comprovació de la clau\n" - - #: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 - #, c-format - msgid "keysize invalid; using %u bits\n" --msgstr "la mida de la clau �s inv�lida; s'hi usaran %u bits\n" -+msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n" - - #: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 - #, c-format -@@ -3595,9 +3545,9 @@ - msgstr "" - - #: g10/keygen.c:1288 --#, fuzzy, c-format -+#, c-format - msgid " (%c) Toggle the encrypt capability\n" --msgstr " (%d) ElGamal (nom�s xifrar)\n" -+msgstr "" - - #: g10/keygen.c:1291 - #, c-format -@@ -3621,32 +3571,32 @@ - #: g10/keygen.c:1351 - #, c-format - msgid " (%d) DSA (sign only)\n" --msgstr " (%d) DSA (nom�s signar)\n" -+msgstr " (%d) DSA (només signar)\n" - - #: g10/keygen.c:1353 - #, fuzzy, c-format - msgid " (%d) DSA (set your own capabilities)\n" --msgstr " (%d) RSA (nom�s xifrar)\n" -+msgstr " (%d) DSA (només signar)\n" - - #: g10/keygen.c:1355 - #, fuzzy, c-format - msgid " (%d) Elgamal (encrypt only)\n" --msgstr " (%d) ElGamal (nom�s xifrar)\n" -+msgstr " (%d) ElGamal (només xifrar)\n" - - #: g10/keygen.c:1356 - #, c-format - msgid " (%d) RSA (sign only)\n" --msgstr " (%d) RSA (nom�s signar)\n" -+msgstr " (%d) RSA (només signar)\n" - - #: g10/keygen.c:1358 - #, c-format - msgid " (%d) RSA (encrypt only)\n" --msgstr " (%d) RSA (nom�s xifrar)\n" -+msgstr " (%d) RSA (només xifrar)\n" - - #: g10/keygen.c:1360 - #, fuzzy, c-format - msgid " (%d) RSA (set your own capabilities)\n" --msgstr " (%d) RSA (nom�s xifrar)\n" -+msgstr " (%d) RSA (només xifrar)\n" - - #: g10/keygen.c:1429 g10/keygen.c:2502 - #, fuzzy, c-format -@@ -3661,7 +3611,7 @@ - #: g10/keygen.c:1446 - #, fuzzy, c-format - msgid "What keysize do you want? (%u) " --msgstr "Quina grand�ria voleu? (1024) " -+msgstr "Quina grandària voleu? (1024) " - - #: g10/keygen.c:1460 - #, c-format -@@ -3671,7 +3621,7 @@ - #: g10/keygen.c:1466 - #, c-format - msgid "Requested keysize is %u bits\n" --msgstr "La grand�ria sol�licitada �s %u bits\n" -+msgstr "La grandària sol·licitada és %u bits\n" - - #: g10/keygen.c:1471 g10/keygen.c:1476 - #, c-format -@@ -3720,7 +3670,7 @@ - - #: g10/keygen.c:1566 - msgid "invalid value\n" --msgstr "el valor no �s v�lid\n" -+msgstr "el valor no és vàlid\n" - - #: g10/keygen.c:1571 - #, c-format -@@ -3732,20 +3682,20 @@ - msgid "%s expires at %s\n" - msgstr "%s caduca el %s\n" - --# Amb �it� es refereix a les dates? ivb --# Aix� vaig entendre jo. jm -+# Amb «it» es refereix a les dates? ivb -+# Això vaig entendre jo. jm - #: g10/keygen.c:1584 - msgid "" - "Your system can't display dates beyond 2038.\n" - "However, it will be correctly handled up to 2106.\n" - msgstr "" - "El vostre sistema no pot representar dates posteriors a l'any 2038.\n" --"Tanmateix, les tractar� b� fins l'any 2106.\n" -+"Tanmateix, les tractarà bé fins l'any 2106.\n" - - #: g10/keygen.c:1589 - #, fuzzy - msgid "Is this correct? (y/N) " --msgstr "�s correcte? (s/n)" -+msgstr "És correcte? (s/n)" - - #: g10/keygen.c:1632 - #, fuzzy -@@ -3759,7 +3709,7 @@ - msgstr "" - "\n" - "Necessiteu un ID d'usuari per a identificar la vostra clau; el programa\n" --"construeix l'id de l'usuari amb el Nom, Comentari i Adre�a electr�nica\n" -+"construeix l'id de l'usuari amb el Nom, Comentari i Adreça electrònica\n" - "d'aquesta forma:\n" - " \"Heinrich Heine (Der Dichter) \"\n" - "\n" -@@ -3770,23 +3720,23 @@ - - #: g10/keygen.c:1652 - msgid "Invalid character in name\n" --msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n" -+msgstr "Hi ha un caràcter invàlid en el camp *nom*\n" - - #: g10/keygen.c:1654 - msgid "Name may not start with a digit\n" --msgstr "El nom no pot comen�ar amb un d�git\n" -+msgstr "El nom no pot començar amb un dígit\n" - - #: g10/keygen.c:1656 - msgid "Name must be at least 5 characters long\n" --msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n" -+msgstr "El nom ha de tenir, si més no, 5 caràcters\n" - - #: g10/keygen.c:1664 - msgid "Email address: " --msgstr "Adre�a electr�nica: " -+msgstr "Adreça electrònica: " - - #: g10/keygen.c:1675 - msgid "Not a valid email address\n" --msgstr "No �s una adre�a v�lida\n" -+msgstr "No és una adreça vàlida\n" - - #: g10/keygen.c:1683 - msgid "Comment: " -@@ -3794,12 +3744,12 @@ - - #: g10/keygen.c:1689 - msgid "Invalid character in comment\n" --msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n" -+msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n" - - #: g10/keygen.c:1712 - #, c-format - msgid "You are using the `%s' character set.\n" --msgstr "Esteu usant el joc de car�cters `%s'.\n" -+msgstr "Esteu usant el joc de caràcters `%s'.\n" - - #: g10/keygen.c:1718 - #, c-format -@@ -3814,11 +3764,10 @@ - - #: g10/keygen.c:1723 - msgid "Please don't put the email address into the real name or the comment\n" --msgstr "" --"No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n" -+msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n" - - # xX? ivb --# Hmm... s�. jm -+# Hmm... sí. jm - #: g10/keygen.c:1739 - msgid "NnCcEeOoQq" - msgstr "NnCcEeOoXx" -@@ -3855,9 +3804,9 @@ - "using this program with the option \"--edit-key\".\n" - "\n" - msgstr "" --"No voleu contrasenya: �s una mala idea!\n" --"B�. Si voleu canviar-la m�s endavant,\n" --"useu aquest programa amb l'opci� \"--edit-key\".\n" -+"No voleu contrasenya: és una mala idea!\n" -+"Bé. Si voleu canviar-la més endavant,\n" -+"useu aquest programa amb l'opció \"--edit-key\".\n" - "\n" - - #: g10/keygen.c:1847 -@@ -3867,36 +3816,35 @@ - "disks) during the prime generation; this gives the random number\n" - "generator a better chance to gain enough entropy.\n" - msgstr "" --"Cal generar molts bits aleat?riament. �s bona idea fer alguna altra cosa\n" --"(teclejar, moure el ratol�, usar els discos) durant la generaci� de\n" --"nombres primers; a�� d�na oportunitat al generador de nombres " --"aleatoris\n" -+"Cal generar molts bits aleatòriament. És bona idea fer alguna altra cosa\n" -+"(teclejar, moure el ratolí, usar els discos) durant la generació de\n" -+"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n" - "d'aconseguir prou entropia.\n" - - #: g10/keygen.c:2571 - msgid "Key generation canceled.\n" --msgstr "La generaci� de claus ha estat cancel�lada.\n" -+msgstr "La generació de claus ha estat cancel·lada.\n" - - #: g10/keygen.c:2759 g10/keygen.c:2896 - #, c-format - msgid "writing public key to `%s'\n" --msgstr "s'est� escrivint la clau p�blica a �%s�\n" -+msgstr "s'està escrivint la clau pública a «%s»\n" - - #: g10/keygen.c:2761 g10/keygen.c:2899 - #, fuzzy, c-format - msgid "writing secret key stub to `%s'\n" --msgstr "s'est� escrivint la clau secreta a �%s�\n" -+msgstr "s'està escrivint la clau secreta a «%s»\n" - - #: g10/keygen.c:2764 g10/keygen.c:2902 - #, c-format - msgid "writing secret key to `%s'\n" --msgstr "s'est� escrivint la clau secreta a �%s�\n" -+msgstr "s'està escrivint la clau secreta a «%s»\n" - - # Potser no hi haja cap anell! ivb - #: g10/keygen.c:2885 - #, c-format - msgid "no writable public keyring found: %s\n" --msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n" -+msgstr "no s'ha trobat cap anell públic escrivible: %s\n" - - #: g10/keygen.c:2891 - #, c-format -@@ -3908,18 +3856,16 @@ - #: g10/keygen.c:2909 - #, c-format - msgid "error writing public keyring `%s': %s\n" --msgstr "" --"s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n" -+msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n" - - #: g10/keygen.c:2916 - #, c-format - msgid "error writing secret keyring `%s': %s\n" --msgstr "" --"s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n" -+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n" - - #: g10/keygen.c:2939 - msgid "public and secret key created and signed.\n" --msgstr "s'han creat i signat les claus p�blica i secreta.\n" -+msgstr "s'han creat i signat les claus pública i secreta.\n" - - #: g10/keygen.c:2950 - msgid "" -@@ -3927,12 +3873,12 @@ - "the command \"--edit-key\" to generate a secondary key for this purpose.\n" - msgstr "" - "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n" --"\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n" -+"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n" - - #: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 - #, c-format - msgid "Key generation failed: %s\n" --msgstr "La generaci� de claus ha fallat: %s\n" -+msgstr "La generació de claus ha fallat: %s\n" - - # Werner FIXME: Use ngettext. jm - #: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 -@@ -3954,7 +3900,7 @@ - - #: g10/keygen.c:3024 g10/keygen.c:3141 - msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" --msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n" -+msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n" - - #: g10/keygen.c:3052 g10/keygen.c:3174 - #, fuzzy -@@ -3969,12 +3915,12 @@ - #: g10/keygen.c:3374 - #, fuzzy, c-format - msgid "can't create backup file `%s': %s\n" --msgstr "no s'ha pogut crear �%s�: %s\n" -+msgstr "no s'ha pogut crear «%s»: %s\n" - - #: g10/keygen.c:3397 --#, fuzzy, c-format -+#, c-format - msgid "NOTE: backup of card key saved to `%s'\n" --msgstr "NOTA: la clau secreta %08lX caduca el %s\n" -+msgstr "" - - #: g10/keygen.c:3464 - #, c-format -@@ -3996,11 +3942,11 @@ - - #: g10/keylist.c:201 - msgid "Critical signature policy: " --msgstr "Pol�tica de signatura cr�tica: " -+msgstr "Política de signatura crítica: " - - #: g10/keylist.c:203 - msgid "Signature policy: " --msgstr "Pol�tica de signatura: " -+msgstr "Política de signatura: " - - #: g10/keylist.c:242 - msgid "Critical preferred keyserver: " -@@ -4008,15 +3954,15 @@ - - #: g10/keylist.c:291 g10/keylist.c:335 - msgid "WARNING: invalid notation data found\n" --msgstr "AV�S: s'hi han trobat dades de notaci� inv�lides\n" -+msgstr "AVÃS: s'hi han trobat dades de notació invàlides\n" - - #: g10/keylist.c:309 - msgid "Critical signature notation: " --msgstr "Notaci� de signatura cr�tica: " -+msgstr "Notació de signatura crítica: " - - #: g10/keylist.c:311 - msgid "Signature notation: " --msgstr "Notaci� de signatura: " -+msgstr "Notació de signatura: " - - #: g10/keylist.c:322 - msgid "not human readable" -@@ -4033,7 +3979,7 @@ - - #: g10/keylist.c:1425 - msgid "Primary key fingerprint:" --msgstr "Empremtes digital de la clau prim�ria:" -+msgstr "Empremtes digital de la clau primària:" - - #: g10/keylist.c:1427 - msgid " Subkey fingerprint:" -@@ -4041,7 +3987,7 @@ - - #: g10/keylist.c:1434 - msgid " Primary key fingerprint:" --msgstr " Empremta digital de la clau prim�ria:" -+msgstr " Empremta digital de la clau primària:" - - #: g10/keylist.c:1436 - msgid " Subkey fingerprint:" -@@ -4063,17 +4009,17 @@ - - #: g10/keyring.c:1251 - msgid "WARNING: 2 files with confidential information exists.\n" --msgstr "AV�S: hi ha 2 fitxers amb informaci� confidencial.\n" -+msgstr "AVÃS: hi ha 2 fitxers amb informació confidencial.\n" - - #: g10/keyring.c:1253 - #, c-format - msgid "%s is the unchanged one\n" --msgstr "%s �s el que no ha canviat\n" -+msgstr "%s és el que no ha canviat\n" - - #: g10/keyring.c:1254 - #, c-format - msgid "%s is the new one\n" --msgstr "%s �s el nou\n" -+msgstr "%s és el nou\n" - - #: g10/keyring.c:1255 - msgid "Please fix this possible security flaw\n" -@@ -4082,7 +4028,7 @@ - #: g10/keyring.c:1375 - #, fuzzy, c-format - msgid "caching keyring `%s'\n" --msgstr "s'est� comprovant l'anell �%s�\n" -+msgstr "s'està comprovant l'anell «%s»\n" - - #: g10/keyring.c:1421 - #, fuzzy, c-format -@@ -4105,8 +4051,7 @@ - #, fuzzy, c-format - msgid "WARNING: keyserver option `%s' is not used on this platform\n" - msgstr "" --"AV�S: les opcions en �%s� encara no estan actives durant aquesta " --"execuci�\n" -+"AVÃS: les opcions en «%s» encara no estan actives durant aquesta execució\n" - - #: g10/keyserver.c:378 - #, fuzzy -@@ -4118,56 +4063,55 @@ - msgstr "" - - #: g10/keyserver.c:662 g10/keyserver.c:1147 --#, fuzzy, c-format -+#, c-format - msgid "invalid keyserver protocol (us %d!=handler %d)\n" --msgstr "opcions d'exportaci� no v�lides\n" -+msgstr "" - - #: g10/keyserver.c:752 - #, fuzzy, c-format - msgid "key \"%s\" not found on keyserver\n" --msgstr "no s'ha trobat la clau �%s�: %s\n" -+msgstr "no s'ha trobat la clau «%s»: %s\n" - - #: g10/keyserver.c:754 - #, fuzzy - msgid "key not found on keyserver\n" --msgstr "no s'ha trobat la clau �%s�: %s\n" -+msgstr "no s'ha trobat la clau «%s»: %s\n" - - #: g10/keyserver.c:901 - #, fuzzy, c-format - msgid "requesting key %s from %s server %s\n" --msgstr "s'est� sol�licitant la clau %08lX de %s\n" -+msgstr "s'està sol·licitant la clau %08lX de %s\n" - - #: g10/keyserver.c:905 - #, fuzzy, c-format - msgid "requesting key %s from %s\n" --msgstr "s'est� sol�licitant la clau %08lX de %s\n" -+msgstr "s'està sol·licitant la clau %08lX de %s\n" - - #: g10/keyserver.c:1050 - #, fuzzy, c-format - msgid "sending key %s to %s server %s\n" --msgstr "s'est� cercant �%s� al servidor HKP %s\n" -+msgstr "s'està cercant «%s» al servidor HKP %s\n" - - #: g10/keyserver.c:1054 - #, fuzzy, c-format - msgid "sending key %s to %s\n" --msgstr "" --"�\n" --"signat amb la vostra clau %08lX el %s\n" -+msgstr "s'està sol·licitant la clau %08lX de %s\n" - - #: g10/keyserver.c:1097 - #, fuzzy, c-format - msgid "searching for \"%s\" from %s server %s\n" --msgstr "s'est� cercant �%s� al servidor HKP %s\n" -+msgstr "s'està cercant «%s» al servidor HKP %s\n" - - #: g10/keyserver.c:1100 - #, fuzzy, c-format - msgid "searching for \"%s\" from %s\n" --msgstr "s'est� cercant �%s� al servidor HKP %s\n" -+msgstr "s'està cercant «%s» al servidor HKP %s\n" - -+# «del servidor», «en el servidor»? ivb - #: g10/keyserver.c:1107 g10/keyserver.c:1202 - #, fuzzy - msgid "no keyserver action!\n" --msgstr "opcions d'exportaci� no v�lides\n" -+msgstr "error de servidor de claus" - - #: g10/keyserver.c:1155 - #, c-format -@@ -4180,7 +4124,7 @@ - - #: g10/keyserver.c:1223 - msgid "no keyserver known (use option --keyserver)\n" --msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n" -+msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n" - - #: g10/keyserver.c:1229 - msgid "external keyserver calls are not supported in this build\n" -@@ -4201,13 +4145,13 @@ - msgid "gpgkeys_%s does not support handler version %d\n" - msgstr "" - --# �del servidor�, �en el servidor�? ivb -+# «del servidor», «en el servidor»? ivb - #: g10/keyserver.c:1261 - #, fuzzy - msgid "keyserver timed out\n" - msgstr "error de servidor de claus" - --# �del servidor�, �en el servidor�? ivb -+# «del servidor», «en el servidor»? ivb - #: g10/keyserver.c:1266 - #, fuzzy - msgid "keyserver internal error\n" -@@ -4216,44 +4160,43 @@ - #: g10/keyserver.c:1275 - #, fuzzy, c-format - msgid "keyserver communications error: %s\n" --msgstr "la recepci� des del servidor de claus ha fallat: %s\n" -+msgstr "la recepció des del servidor de claus ha fallat: %s\n" - - #: g10/keyserver.c:1300 g10/keyserver.c:1334 - #, fuzzy, c-format - msgid "\"%s\" not a key ID: skipping\n" --msgstr "%s: no �s un ID v�lid\n" -+msgstr "%s: no és un ID vàlid\n" - - #: g10/keyserver.c:1585 - #, fuzzy, c-format - msgid "WARNING: unable to refresh key %s via %s: %s\n" --msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n" -+msgstr "AVÃS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n" - - #: g10/keyserver.c:1607 - #, fuzzy, c-format - msgid "refreshing 1 key from %s\n" --msgstr "s'est� sol�licitant la clau %08lX de %s\n" -+msgstr "s'està sol·licitant la clau %08lX de %s\n" - - #: g10/keyserver.c:1609 - #, fuzzy, c-format - msgid "refreshing %d keys from %s\n" --msgstr "s'est� sol�licitant la clau %08lX de %s\n" -+msgstr "s'està sol·licitant la clau %08lX de %s\n" - - #: g10/mainproc.c:248 - #, c-format - msgid "weird size for an encrypted session key (%d)\n" --msgstr "mida extranya per a una clau de sessi� xifrada (%d)\n" -+msgstr "mida extranya per a una clau de sessió xifrada (%d)\n" - - #: g10/mainproc.c:262 - #, c-format - msgid "bad passphrase or unknown cipher algorithm (%d)\n" - msgstr "" --"la contrasenya �s incorrecta o l'algoritme de xifratge (%d) �s " --"desconegut\n" -+"la contrasenya és incorrecta o l'algoritme de xifratge (%d) és desconegut\n" - - #: g10/mainproc.c:299 - #, c-format - msgid "%s encrypted session key\n" --msgstr "clau de sessi� xifrada amb %s\n" -+msgstr "clau de sessió xifrada amb %s\n" - - #: g10/mainproc.c:309 - #, fuzzy, c-format -@@ -4263,11 +4206,11 @@ - #: g10/mainproc.c:373 - #, fuzzy, c-format - msgid "public key is %s\n" --msgstr "la clau p�blica �s %08lX\n" -+msgstr "la clau pública és %08lX\n" - - #: g10/mainproc.c:428 - msgid "public key encrypted data: good DEK\n" --msgstr "dades xifrades amb clau p�blica: bona clau de xifratge (DEK)\n" -+msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n" - - #: g10/mainproc.c:461 - #, fuzzy, c-format -@@ -4275,9 +4218,9 @@ - msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n" - - #: g10/mainproc.c:465 g10/pkclist.c:218 --#, fuzzy, c-format -+#, c-format - msgid " \"%s\"\n" --msgstr " alias \"" -+msgstr "" - - #: g10/mainproc.c:469 - #, fuzzy, c-format -@@ -4287,7 +4230,7 @@ - #: g10/mainproc.c:483 - #, c-format - msgid "public key decryption failed: %s\n" --msgstr "ha fallat el desxifratge amb la clau p�blica: %s\n" -+msgstr "ha fallat el desxifratge amb la clau pública: %s\n" - - #: g10/mainproc.c:497 - #, c-format -@@ -4299,20 +4242,20 @@ - msgid "encrypted with 1 passphrase\n" - msgstr "xifrat amb 1 contrasenya\n" - --# I no ser� �dades xifrades amb %s�? ivb --# Sembla que s�, ho marque per a mirar-ho m�s endavant. jm -+# I no serà «dades xifrades amb %s»? ivb -+# Sembla que sí, ho marque per a mirar-ho més endavant. jm - #: g10/mainproc.c:527 g10/mainproc.c:549 - #, c-format - msgid "assuming %s encrypted data\n" - msgstr "s'assumeixen dades xifrades amb %s\n" - --# L'optim�stic �s aquell que t� una Fe Cega en que Tot Anir� B�! ivb -+# L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé! ivb - #: g10/mainproc.c:535 - #, c-format - msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" - msgstr "" --"El xifratge IDEA no est� disponible, s'intentar� utilitzar optimistament " --"%s en el seu lloc\n" -+"El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s " -+"en el seu lloc\n" - - #: g10/mainproc.c:567 - msgid "decryption okay\n" -@@ -4320,11 +4263,11 @@ - - #: g10/mainproc.c:571 - msgid "WARNING: message was not integrity protected\n" --msgstr "AV�S: el missatge no tenia protecci� d'integritat\n" -+msgstr "AVÃS: el missatge no tenia protecció d'integritat\n" - - #: g10/mainproc.c:584 - msgid "WARNING: encrypted message has been manipulated!\n" --msgstr "AV�S: el missatge xifrat ha estat manipulat!\n" -+msgstr "AVÃS: el missatge xifrat ha estat manipulat!\n" - - #: g10/mainproc.c:590 - #, c-format -@@ -4333,7 +4276,7 @@ - - #: g10/mainproc.c:610 - msgid "NOTE: sender requested \"for-your-eyes-only\"\n" --msgstr "NOTA: el remitent ha sol�licitat \"alt secret\"\n" -+msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n" - - #: g10/mainproc.c:612 - #, c-format -@@ -4342,15 +4285,15 @@ - - #: g10/mainproc.c:784 - msgid "standalone revocation - use \"gpg --import\" to apply\n" --msgstr "revocaci� aut�noma: useu \"gpg --import\" per a aplicar-la\n" -+msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n" - - #: g10/mainproc.c:1288 - msgid "signature verification suppressed\n" --msgstr "s'ha eliminat la verificaci� de signatura\n" -+msgstr "s'ha eliminat la verificació de signatura\n" - - #: g10/mainproc.c:1330 g10/mainproc.c:1340 - msgid "can't handle these multiple signatures\n" --msgstr "no es poden tractar aquestes signatures m�ltiples\n" -+msgstr "no es poden tractar aquestes signatures múltiples\n" - - #: g10/mainproc.c:1350 - #, fuzzy, c-format -@@ -4362,7 +4305,7 @@ - msgid " using %s key %s\n" - msgstr " alias \"" - --# �%.*s� no ser� una data? Caldr� �el� al davant. ivb -+# «%.*s» no serà una data? Caldrà «el» al davant. ivb - #: g10/mainproc.c:1355 - #, fuzzy, c-format - msgid "Signature made %s using %s key ID %s\n" -@@ -4370,7 +4313,7 @@ - - #: g10/mainproc.c:1375 - msgid "Key available at: " --msgstr "La clau �s disponible en: " -+msgstr "La clau és disponible en: " - - #: g10/mainproc.c:1480 g10/mainproc.c:1528 - #, fuzzy, c-format -@@ -4430,19 +4373,18 @@ - - #: g10/mainproc.c:1760 g10/mainproc.c:1776 g10/mainproc.c:1862 - msgid "not a detached signature\n" --msgstr "no �s una signatura separada\n" -+msgstr "no és una signatura separada\n" - - #: g10/mainproc.c:1803 - msgid "" - "WARNING: multiple signatures detected. Only the first will be checked.\n" - msgstr "" --"AV�S: s'han detectat m�ltiples signatures. Nom�s es comprovar� la " --"primera.\n" -+"AVÃS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n" - - #: g10/mainproc.c:1811 - #, c-format - msgid "standalone signature of class 0x%02x\n" --msgstr "signatura aut�noma de classe 0x%02x\n" -+msgstr "signatura autònoma de classe 0x%02x\n" - - #: g10/mainproc.c:1868 - msgid "old style (PGP 2.x) signature\n" -@@ -4450,33 +4392,33 @@ - - #: g10/mainproc.c:1878 - msgid "invalid root packet detected in proc_tree()\n" --msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n" -+msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n" - --# bolcats de mem�ria? ivb -+# bolcats de memòria? ivb - #: g10/misc.c:105 - #, c-format - msgid "can't disable core dumps: %s\n" --msgstr "no s'han pogut desactivar els bolcats de mem�ria: %s\n" -+msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n" - - #: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 - #, fuzzy, c-format - msgid "fstat of `%s' failed in %s: %s\n" --msgstr "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n" -+msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n" - - #: g10/misc.c:190 - #, fuzzy, c-format - msgid "fstat(%d) failed in %s: %s\n" --msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n" -+msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n" - - #: g10/misc.c:299 - #, fuzzy, c-format - msgid "WARNING: using experimental public key algorithm %s\n" --msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n" -+msgstr "no es pot treballar amb l'algoritme de clau pública %d\n" - - #: g10/misc.c:314 - #, fuzzy, c-format - msgid "WARNING: using experimental cipher algorithm %s\n" --msgstr "l'algoritme de xifratge no �s implementat" -+msgstr "l'algoritme de xifratge no és implementat" - - #: g10/misc.c:329 - #, fuzzy, c-format -@@ -4486,43 +4428,40 @@ - #: g10/misc.c:334 - #, fuzzy, c-format - msgid "WARNING: digest algorithm %s is deprecated\n" --msgstr "" --"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del " --"destinatari\n" -+msgstr "AVÃS: %s és una opció desaconsellada.\n" - - #: g10/misc.c:430 - msgid "the IDEA cipher plugin is not present\n" --msgstr "el m�dul de xifratge IDEA no est� present\n" -+msgstr "el mòdul de xifratge IDEA no està present\n" - - #: g10/misc.c:431 - msgid "" - "please see http://www.gnupg.org/why-not-idea.html for more information\n" --msgstr "" --"vegeu http://www.gnupg.org/why-not-idea.html per a m�s informaci�\n" -+msgstr "vegeu http://www.gnupg.org/why-not-idea.html per a més informació\n" - - #: g10/misc.c:664 - #, c-format - msgid "%s:%d: deprecated option \"%s\"\n" --msgstr "%s:%d: l'opci� �%s� est� desaconsellada.\n" -+msgstr "%s:%d: l'opció «%s» està desaconsellada.\n" - - #: g10/misc.c:668 - #, c-format - msgid "WARNING: \"%s\" is a deprecated option\n" --msgstr "AV�S: %s �s una opci� desaconsellada.\n" -+msgstr "AVÃS: %s és una opció desaconsellada.\n" - - #: g10/misc.c:670 - #, c-format - msgid "please use \"%s%s\" instead\n" --msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n" -+msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n" - --# G�nere? Nombre? Passat, futur? ivb -+# Gènere? Nombre? Passat, futur? ivb - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: g10/misc.c:681 - msgid "Uncompressed" - msgstr "No comprimit" - --# G�nere? Nombre? Passat, futur? ivb -+# Gènere? Nombre? Passat, futur? ivb - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: g10/misc.c:706 -@@ -4538,17 +4477,17 @@ - #: g10/misc.c:973 - #, fuzzy, c-format - msgid "ambiguous option `%s'\n" --msgstr "s'estan llegint opcions de �%s�\n" -+msgstr "s'estan llegint opcions de «%s»\n" - - #: g10/misc.c:998 - #, fuzzy, c-format - msgid "unknown option `%s'\n" --msgstr "el destinatari predeterminat �s desconegut �%s�\n" -+msgstr "el destinatari predeterminat és desconegut «%s»\n" - - #: g10/openfile.c:84 - #, c-format - msgid "File `%s' exists. " --msgstr "El fitxer �%s� existeix. " -+msgstr "El fitxer «%s» existeix. " - - #: g10/openfile.c:86 - #, fuzzy -@@ -4558,33 +4497,32 @@ - #: g10/openfile.c:119 - #, c-format - msgid "%s: unknown suffix\n" --msgstr "%s: el sufix �s desconegut\n" -+msgstr "%s: el sufix és desconegut\n" - - #: g10/openfile.c:141 - msgid "Enter new filename" --msgstr "Introdu�u el nou nom del fitxer" -+msgstr "Introduïu el nou nom del fitxer" - - # Indi? ivb - #: g10/openfile.c:184 - msgid "writing to stdout\n" --msgstr "s'est� escrivint en stdout\n" -+msgstr "s'està escrivint en stdout\n" - - #: g10/openfile.c:296 - #, c-format - msgid "assuming signed data in `%s'\n" --msgstr "s'asumeix que hi ha dades signades en �%s�\n" -+msgstr "s'asumeix que hi ha dades signades en «%s»\n" - - #: g10/openfile.c:375 - #, c-format - msgid "new configuration file `%s' created\n" --msgstr "s'ha creat el nou fitxer d'opcions �%s�\n" -+msgstr "s'ha creat el nou fitxer d'opcions «%s»\n" - - #: g10/openfile.c:377 - #, c-format - msgid "WARNING: options in `%s' are not yet active during this run\n" - msgstr "" --"AV�S: les opcions en �%s� encara no estan actives durant aquesta " --"execuci�\n" -+"AVÃS: les opcions en «%s» encara no estan actives durant aquesta execució\n" - - #: g10/openfile.c:409 - #, fuzzy, c-format -@@ -4594,22 +4532,21 @@ - #: g10/parse-packet.c:119 - #, c-format - msgid "can't handle public key algorithm %d\n" --msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n" -+msgstr "no es pot treballar amb l'algoritme de clau pública %d\n" - - #: g10/parse-packet.c:688 - msgid "WARNING: potentially insecure symmetrically encrypted session key\n" - msgstr "" --"AV�S: la clau de sessi� pot estar xifrada sim�tricament de forma " --"insegura\n" -+"AVÃS: la clau de sessió pot estar xifrada simètricament de forma insegura\n" - - #: g10/parse-packet.c:1112 - #, c-format - msgid "subpacket of type %d has critical bit set\n" --msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n" -+msgstr "el subpaquet de tipus %d té el bit crític activat\n" - - #: g10/passphrase.c:478 g10/passphrase.c:525 - msgid "gpg-agent is not available in this session\n" --msgstr "gpg-agent no est� disponible en aquesta sessi�\n" -+msgstr "gpg-agent no està disponible en aquesta sessió\n" - - #: g10/passphrase.c:486 - msgid "can't set client pid for the agent\n" -@@ -4626,25 +4563,25 @@ - - #: g10/passphrase.c:534 - msgid "malformed GPG_AGENT_INFO environment variable\n" --msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n" -+msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n" - - #: g10/passphrase.c:547 - #, c-format - msgid "gpg-agent protocol version %d is not supported\n" --msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n" -+msgstr "la versió %d del protocol de gpg-agent no està suportada\n" - - #: g10/passphrase.c:568 - #, c-format - msgid "can't connect to `%s': %s\n" --msgstr "no s'ha pogut connectar amb �%s�: %s\n" -+msgstr "no s'ha pogut connectar amb «%s»: %s\n" - - #: g10/passphrase.c:590 - msgid "communication problem with gpg-agent\n" --msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n" -+msgstr "hi ha un problema de comunicació amb el gpg-agent\n" - - #: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 - msgid "problem with the agent - disabling agent use\n" --msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n" -+msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n" - - #: g10/passphrase.c:700 g10/passphrase.c:1205 - #, fuzzy, c-format -@@ -4654,14 +4591,14 @@ - # Com es canvia l'ordre dels arguments? jm - # Ah, bingo! jm - # Uh, ara torna a donar error. FIXME --# La idea �s ficar: -+# La idea és ficar: - # "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n" --# "�%1$.*s�\n" -+# "«%1$.*s»\n" - # "clau %3$s de %2$u bits, ID %4$08lX, creada en %5$s%6$s\n" - # jm --# Se't passava l'argument �*�. printf(3), hieroglyph(7). ivb -+# Se't passava l'argument «*». printf(3), hieroglyph(7). ivb - # Ah! Prova-ho, no casque alguna cosa :P ivb --# Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm -+# Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm - #: g10/passphrase.c:714 - #, fuzzy, c-format - msgid "" -@@ -4670,7 +4607,7 @@ - "%u-bit %s key, ID %s, created %s%s\n" - msgstr "" - "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n" --"�%2$.*1$s�\n" -+"«%2$.*1$s»\n" - "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n" - - #: g10/passphrase.c:739 -@@ -4679,19 +4616,19 @@ - - #: g10/passphrase.c:741 - msgid "Enter passphrase\n" --msgstr "Introdu�u la contrasenya\n" -+msgstr "Introduïu la contrasenya\n" - - #: g10/passphrase.c:779 - msgid "passphrase too long\n" --msgstr "la contrasenya �s massa llarga\n" -+msgstr "la contrasenya és massa llarga\n" - - #: g10/passphrase.c:792 - msgid "invalid response from agent\n" --msgstr "la resposta de l'agent �s inv�lida\n" -+msgstr "la resposta de l'agent és invàlida\n" - - #: g10/passphrase.c:807 g10/passphrase.c:926 - msgid "cancelled by user\n" --msgstr "s'ha cancel�lat per l'usuari\n" -+msgstr "s'ha cancel·lat per l'usuari\n" - - #: g10/passphrase.c:812 g10/passphrase.c:1015 - #, c-format -@@ -4701,11 +4638,11 @@ - #: g10/passphrase.c:1096 g10/passphrase.c:1258 - #, fuzzy - msgid "can't query passphrase in batch mode\n" --msgstr "no es pot demanar la contrasenya en mode desat�s\n" -+msgstr "no es pot demanar la contrasenya en mode desatès\n" - - #: g10/passphrase.c:1103 g10/passphrase.c:1263 - msgid "Enter passphrase: " --msgstr "Introdu�u la contrasenya: " -+msgstr "Introduïu la contrasenya: " - - #: g10/passphrase.c:1186 - #, fuzzy, c-format -@@ -4742,19 +4679,18 @@ - "\n" - "Seleccioneu una imatge per a utilitzarla en el vostre photo ID. La imatge\n" - "ha de ser un fitxer JPEG. Recordeu que la imatge es desa dins de la vostra\n" --"clau p�blica. Si utilitzeu una foto molt gran, la vostra clau tamb� es " --"far�\n" -+"clau pública. Si utilitzeu una foto molt gran, la vostra clau també es farà\n" - "molt gran!\n" - "Es recomana una imatge amb una mida aproximada de 240x288.\n" - - #: g10/photoid.c:80 - msgid "Enter JPEG filename for photo ID: " --msgstr "Introdu�u el nom del fitxer JPEG per al photo ID: " -+msgstr "Introduïu el nom del fitxer JPEG per al photo ID: " - - #: g10/photoid.c:94 - #, fuzzy, c-format - msgid "unable to open JPEG file `%s': %s\n" --msgstr "no es pot obrir el fitxer: %s\n" -+msgstr "No s'ha pogut obrir la foto «%s»: %s\n" - - #: g10/photoid.c:102 - #, c-format -@@ -4769,11 +4705,11 @@ - #: g10/photoid.c:119 - #, fuzzy, c-format - msgid "`%s' is not a JPEG file\n" --msgstr "�%s� no �s un fitxer JPEG\n" -+msgstr "«%s» no és un fitxer JPEG\n" - - #: g10/photoid.c:136 - msgid "Is this photo correct (y/N/q)? " --msgstr "�s aquesta foto correcta (s/N/x)? " -+msgstr "És aquesta foto correcta (s/N/x)? " - - #: g10/photoid.c:338 - msgid "unable to display photo ID!\n" -@@ -4781,11 +4717,11 @@ - - #: g10/pkclist.c:61 g10/revoke.c:580 - msgid "No reason specified" --msgstr "No s'ha especificat cap ra�" -+msgstr "No s'ha especificat cap raó" - - #: g10/pkclist.c:63 g10/revoke.c:582 - msgid "Key is superseded" --msgstr "La clau ha estat substitu�da" -+msgstr "La clau ha estat substituïda" - - #: g10/pkclist.c:65 g10/revoke.c:581 - msgid "Key has been compromised" -@@ -4797,15 +4733,15 @@ - - #: g10/pkclist.c:69 g10/revoke.c:584 - msgid "User ID is no longer valid" --msgstr "L'ID d'usuari ja no �s v�lid" -+msgstr "L'ID d'usuari ja no és vàlid" - - #: g10/pkclist.c:73 - msgid "reason for revocation: " --msgstr "ra� de la revocaci�: " -+msgstr "raó de la revocació: " - - #: g10/pkclist.c:90 - msgid "revocation comment: " --msgstr "comentari de la revocaci�: " -+msgstr "comentari de la revocació: " - - #: g10/pkclist.c:205 - msgid "iImMqQsS" -@@ -4815,24 +4751,25 @@ - #, fuzzy - msgid "No trust value assigned to:\n" - msgstr "" --"No hi ha cap valor de confian�a assignat a:\n" -+"No hi ha cap valor de confiança assignat a:\n" - "%4u%c/%08lX %s \"" - - #: g10/pkclist.c:245 --#, fuzzy, c-format -+#, c-format - msgid " aka \"%s\"\n" --msgstr " alias \"" -+msgstr "" - - #: g10/pkclist.c:255 - #, fuzzy - msgid "" - "How much do you trust that this key actually belongs to the named user?\n" --msgstr "Aquesta clau pertany probablement al seu propietari\n" -+msgstr "" -+"%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n" - - #: g10/pkclist.c:270 - #, fuzzy, c-format - msgid " %d = I don't know or won't say\n" --msgstr " %d = No ho s�\n" -+msgstr " %d = No ho sé\n" - - #: g10/pkclist.c:272 - #, fuzzy, c-format -@@ -4847,7 +4784,7 @@ - #: g10/pkclist.c:284 - #, fuzzy - msgid " m = back to the main menu\n" --msgstr " m = torna al men� principal\n" -+msgstr " m = torna al menú principal\n" - - #: g10/pkclist.c:287 - #, fuzzy -@@ -4868,16 +4805,16 @@ - - #: g10/pkclist.c:298 g10/revoke.c:609 - msgid "Your decision? " --msgstr "La vostra decisi�? " -+msgstr "La vostra decisió? " - - #: g10/pkclist.c:319 - #, fuzzy - msgid "Do you really want to set this key to ultimate trust? (y/N) " --msgstr "Realment voleu assignar confian�a absoluta a aquesta clau? " -+msgstr "Realment voleu assignar confiança absoluta a aquesta clau? " - - #: g10/pkclist.c:333 - msgid "Certificates leading to an ultimately trusted key:\n" --msgstr "Certificats que duen a una clau de confian�a absoluta:\n" -+msgstr "Certificats que duen a una clau de confiança absoluta:\n" - - #: g10/pkclist.c:418 - #, fuzzy, c-format -@@ -4898,7 +4835,7 @@ - - #: g10/pkclist.c:434 - msgid "This key belongs to us\n" --msgstr "Aquesta clau �s nostra\n" -+msgstr "Aquesta clau és nostra\n" - - #: g10/pkclist.c:460 - #, fuzzy -@@ -4907,9 +4844,9 @@ - "in the user ID. If you *really* know what you are doing,\n" - "you may answer the next question with yes.\n" - msgstr "" --"NO �s segur que la clau pertanya a la persona esmentada en\n" --"l'ID d'usuari. Si *realment* sabeu qu� feu, podeu respondre\n" --"�s�� a la seg�ent pregunta\n" -+"NO és segur que la clau pertanya a la persona esmentada en\n" -+"l'ID d'usuari. Si *realment* sabeu què feu, podeu respondre\n" -+"«sí» a la següent pregunta\n" - "\n" - - #: g10/pkclist.c:467 -@@ -4919,32 +4856,32 @@ - - #: g10/pkclist.c:501 - msgid "WARNING: Using untrusted key!\n" --msgstr "AV�S: S'est� usant una clau no fiable!\n" -+msgstr "AVÃS: S'està usant una clau no fiable!\n" - - #: g10/pkclist.c:508 - #, fuzzy - msgid "WARNING: this key might be revoked (revocation key not present)\n" - msgstr "" --"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no " --"est� present.\n" -+"AVÃS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està " -+"present.\n" - - #: g10/pkclist.c:517 - #, fuzzy - msgid "WARNING: This key has been revoked by its designated revoker!\n" --msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" -+msgstr "AVÃS: Aquesta clau ha estat revocada pel propietari!\n" - - #: g10/pkclist.c:520 - msgid "WARNING: This key has been revoked by its owner!\n" --msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" -+msgstr "AVÃS: Aquesta clau ha estat revocada pel propietari!\n" - - #: g10/pkclist.c:521 - #, fuzzy - msgid " This could mean that the signature is forged.\n" --msgstr " A�� podria significar que la signatura �s falsificada.\n" -+msgstr " Açò podria significar que la signatura és falsificada.\n" - - #: g10/pkclist.c:527 - msgid "WARNING: This subkey has been revoked by its owner!\n" --msgstr "AV�S: Aquesta subclau ha estat revocada pel propietari!\n" -+msgstr "AVÃS: Aquesta subclau ha estat revocada pel propietari!\n" - - #: g10/pkclist.c:532 - msgid "Note: This key has been disabled.\n" -@@ -4956,8 +4893,7 @@ - - #: g10/pkclist.c:548 - msgid "WARNING: This key is not certified with a trusted signature!\n" --msgstr "" --"AV�S: Aquesta clau no ve certificada per una signatura de confian�a!\n" -+msgstr "AVÃS: Aquesta clau no ve certificada per una signatura de confiança!\n" - - #: g10/pkclist.c:550 - msgid "" -@@ -4967,20 +4903,20 @@ - - #: g10/pkclist.c:558 - msgid "WARNING: We do NOT trust this key!\n" --msgstr "AV�S: La clau NO �s de confian�a!\n" -+msgstr "AVÃS: La clau NO és de confiança!\n" - - #: g10/pkclist.c:559 - msgid " The signature is probably a FORGERY.\n" --msgstr " Probablement la signatura �s FALSA.\n" -+msgstr " Probablement la signatura és FALSA.\n" - - #: g10/pkclist.c:567 - msgid "" - "WARNING: This key is not certified with sufficiently trusted signatures!\n" --msgstr "AV�S: Aquesta clau no ve certificada per signatures prou fiables!\n" -+msgstr "AVÃS: Aquesta clau no ve certificada per signatures prou fiables!\n" - - #: g10/pkclist.c:569 - msgid " It is not certain that the signature belongs to the owner.\n" --msgstr "No �s segur que la signatura pertanya al seu propietari.\n" -+msgstr "No és segur que la signatura pertanya al seu propietari.\n" - - #: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996 - #, c-format -@@ -4990,11 +4926,11 @@ - #: g10/pkclist.c:744 g10/pkclist.c:968 - #, c-format - msgid "%s: skipped: public key already present\n" --msgstr "%s: es descarta: la clau p�blica ja est� present\n" -+msgstr "%s: es descarta: la clau pública ja està present\n" - - #: g10/pkclist.c:786 - msgid "You did not specify a user ID. (you may use \"-r\")\n" --msgstr "No heu especificat un ID d'usuari. (podeu usar �-r�)\n" -+msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n" - - #: g10/pkclist.c:802 - msgid "Current recipients:\n" -@@ -5006,7 +4942,7 @@ - "Enter the user ID. End with an empty line: " - msgstr "" - "\n" --"Introdu�u l'ID d'usuari. Finalitzeu amb una l�nia en blanc: " -+"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: " - - #: g10/pkclist.c:844 - msgid "No such user ID.\n" -@@ -5014,38 +4950,38 @@ - - #: g10/pkclist.c:849 g10/pkclist.c:911 - msgid "skipped: public key already set as default recipient\n" --msgstr "es descarta: la clau p�blica ja s'ha especificat com a destinatari\n" -+msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n" - - #: g10/pkclist.c:867 - msgid "Public key is disabled.\n" --msgstr "La clau p�blica est� desactivada.\n" -+msgstr "La clau pública està desactivada.\n" - - #: g10/pkclist.c:874 - msgid "skipped: public key already set\n" --msgstr "es descarta: la clau p�blica ja est� establida\n" -+msgstr "es descarta: la clau pública ja està establida\n" - - #: g10/pkclist.c:903 - #, fuzzy, c-format - msgid "unknown default recipient \"%s\"\n" --msgstr "el destinatari predeterminat �s desconegut �%s�\n" -+msgstr "el destinatari predeterminat és desconegut «%s»\n" - - #: g10/pkclist.c:948 - #, c-format - msgid "%s: skipped: public key is disabled\n" --msgstr "%s: es descarta: la clau p�blica est� desactivada\n" -+msgstr "%s: es descarta: la clau pública està desactivada\n" - - #: g10/pkclist.c:1003 - msgid "no valid addressees\n" --msgstr "no hi ha adreces v�lides\n" -+msgstr "no hi ha adreces vàlides\n" - - #: g10/plaintext.c:90 - msgid "data not saved; use option \"--output\" to save it\n" --msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n" -+msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n" - - #: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 - #, c-format - msgid "error creating `%s': %s\n" --msgstr "error en crear �%s�: %s\n" -+msgstr "error en crear «%s»: %s\n" - - # Indi? ivb - # Em pense que no. jm -@@ -5055,11 +4991,11 @@ - - #: g10/plaintext.c:450 - msgid "Please enter name of data file: " --msgstr "Introdu�u el nom del fitxer de dades: " -+msgstr "Introduïu el nom del fitxer de dades: " - - #: g10/plaintext.c:478 - msgid "reading stdin ...\n" --msgstr "s'est� llegint d'stdin...\n" -+msgstr "s'està llegint d'stdin...\n" - - #: g10/plaintext.c:512 - msgid "no signed data\n" -@@ -5075,26 +5011,25 @@ - #: g10/pubkey-enc.c:103 - #, fuzzy, c-format - msgid "anonymous recipient; trying secret key %s ...\n" --msgstr "el destinatari �s an�nim; es provar� la clau secreta %08lX ...\n" -+msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n" - - #: g10/pubkey-enc.c:119 - msgid "okay, we are the anonymous recipient.\n" --msgstr "d'acord, som el destinatari an�nim.\n" -+msgstr "d'acord, som el destinatari anònim.\n" - - #: g10/pubkey-enc.c:207 - msgid "old encoding of the DEK is not supported\n" --msgstr "la codificaci� antiga del DEK no est� suportada\n" -+msgstr "la codificació antiga del DEK no està suportada\n" - - #: g10/pubkey-enc.c:228 - #, c-format - msgid "cipher algorithm %d%s is unknown or disabled\n" --msgstr "l'algoritme de xifratge %d%s �s desconegut o est� desactivat\n" -+msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n" - - #: g10/pubkey-enc.c:266 - #, fuzzy, c-format - msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" --msgstr "" --"NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n" -+msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n" - - #: g10/pubkey-enc.c:286 - #, fuzzy, c-format -@@ -5122,16 +5057,16 @@ - - #: g10/revoke.c:276 - msgid "(This is a sensitive revocation key)\n" --msgstr "(Aquesta �s una clau de revocaci� sensible)\n" -+msgstr "(Aquesta és una clau de revocació sensible)\n" - - #: g10/revoke.c:280 - #, fuzzy - msgid "Create a designated revocation certificate for this key? (y/N) " --msgstr "Voleu crear un certificat de revocaci� per a aquesta clau? " -+msgstr "Voleu crear un certificat de revocació per a aquesta clau? " - - #: g10/revoke.c:293 g10/revoke.c:511 - msgid "ASCII armored output forced.\n" --msgstr "s'ha for�at l'eixida d'armadura ASCII.\n" -+msgstr "s'ha forçat l'eixida d'armadura ASCII.\n" - - #: g10/revoke.c:307 g10/revoke.c:525 - #, c-format -@@ -5140,39 +5075,39 @@ - - #: g10/revoke.c:370 - msgid "Revocation certificate created.\n" --msgstr "S'ha creat el certificat de revocaci�.\n" -+msgstr "S'ha creat el certificat de revocació.\n" - - #: g10/revoke.c:376 - #, fuzzy, c-format - msgid "no revocation keys found for \"%s\"\n" --msgstr "no s'han ttrobat claus de revocaci� per a �%s�\n" -+msgstr "no s'han ttrobat claus de revocació per a «%s»\n" - - #: g10/revoke.c:432 - #, fuzzy, c-format - msgid "secret key \"%s\" not found: %s\n" --msgstr "no s'ha trobat la clau secreta �%s�: %s\n" -+msgstr "no s'ha trobat la clau secreta «%s»: %s\n" - - #: g10/revoke.c:461 - #, c-format - msgid "no corresponding public key: %s\n" --msgstr "no hi ha cap clau p�blica corresponent: %s\n" -+msgstr "no hi ha cap clau pública corresponent: %s\n" - - #: g10/revoke.c:472 - msgid "public key does not match secret key!\n" --msgstr "la clau p�blica no coincideix amb la clau secreta!\n" -+msgstr "la clau pública no coincideix amb la clau secreta!\n" - - #: g10/revoke.c:479 - #, fuzzy - msgid "Create a revocation certificate for this key? (y/N) " --msgstr "Voleu crear un certificat de revocaci� per a aquesta clau? " -+msgstr "Voleu crear un certificat de revocació per a aquesta clau? " - - #: g10/revoke.c:496 - msgid "unknown protection algorithm\n" --msgstr "l'algorisme de protecci� �s desconegut\n" -+msgstr "l'algorisme de protecció és desconegut\n" - - #: g10/revoke.c:500 - msgid "NOTE: This key is not protected!\n" --msgstr "NOTA: Aquesta clau no est� protegida!\n" -+msgstr "NOTA: Aquesta clau no està protegida!\n" - - #: g10/revoke.c:551 - msgid "" -@@ -5184,47 +5119,46 @@ - "your media become unreadable. But have some caution: The print system of\n" - "your machine might store the data and make it available to others!\n" - msgstr "" --"S'ha creat un certificat de revocaci�.\n" -+"S'ha creat un certificat de revocació.\n" - "\n" - "Si us plau, mogueu-lo a un medi que pugueu amagar; si Mallory aconsegueix\n" --"acc�s a aquest certificat pot utilitzar-lo per a fer la vostra clau\n" --"inservible. �s intel�ligent imprimir aquest certificat i amagar-lo, per\n" --"si el vostre medi es torna illegible. Per� aneu amb compte: el sistema\n" --"d'impressi� de la vostra m�quina podria emmagatzemar les dades i fer-" --"les\n" -+"accés a aquest certificat pot utilitzar-lo per a fer la vostra clau\n" -+"inservible. És intel·ligent imprimir aquest certificat i amagar-lo, per\n" -+"si el vostre medi es torna illegible. Però aneu amb compte: el sistema\n" -+"d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n" - "disponibles a altres!\n" - - #: g10/revoke.c:592 - msgid "Please select the reason for the revocation:\n" --msgstr "Seleccioneu la ra� de la revocaci�:\n" -+msgstr "Seleccioneu la raó de la revocació:\n" - - #: g10/revoke.c:602 - msgid "Cancel" --msgstr "Cancel�la" -+msgstr "Cancel·la" - - #: g10/revoke.c:604 - #, c-format - msgid "(Probably you want to select %d here)\n" --msgstr "(Segurament voleu seleccionar %d ac�)\n" -+msgstr "(Segurament voleu seleccionar %d ací)\n" - - #: g10/revoke.c:645 - msgid "Enter an optional description; end it with an empty line:\n" - msgstr "" --"Introdu�u una descripci� opcional; finalitzeu amb una l�nia en blanc:\n" -+"Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n" - - #: g10/revoke.c:673 - #, c-format - msgid "Reason for revocation: %s\n" --msgstr "Ra� de la revocaci�: %s\n" -+msgstr "Raó de la revocació: %s\n" - - #: g10/revoke.c:675 - msgid "(No description given)\n" --msgstr "(No es va donar una descripci�)\n" -+msgstr "(No es va donar una descripció)\n" - - #: g10/revoke.c:680 - #, fuzzy - msgid "Is this okay? (y/N) " --msgstr "�s a�� correcte? " -+msgstr "És açò correcte? " - - # Parts? Peces? ivb - #: g10/seckey-cert.c:54 -@@ -5234,16 +5168,16 @@ - #: g10/seckey-cert.c:60 - #, c-format - msgid "protection algorithm %d%s is not supported\n" --msgstr "l'algoritme de protecci� %d%s no est� suportat\n" -+msgstr "l'algoritme de protecció %d%s no està suportat\n" - - #: g10/seckey-cert.c:71 - #, fuzzy, c-format - msgid "protection digest %d is not supported\n" --msgstr "l'algoritme de protecci� %d%s no est� suportat\n" -+msgstr "l'algoritme de protecció %d%s no està suportat\n" - - #: g10/seckey-cert.c:250 - msgid "Invalid passphrase; please try again" --msgstr "La contrasenya no �s v�lida; torneu a intentar-ho" -+msgstr "La contrasenya no és vàlida; torneu a intentar-ho" - - #: g10/seckey-cert.c:251 - #, c-format -@@ -5252,33 +5186,33 @@ - - #: g10/seckey-cert.c:311 - msgid "WARNING: Weak key detected - please change passphrase again.\n" --msgstr "AV�S: la clau �s feble; per favor, canvieu la contrasenya.\n" -+msgstr "AVÃS: la clau és feble; per favor, canvieu la contrasenya.\n" - - #: g10/seckey-cert.c:349 - msgid "generating the deprecated 16-bit checksum for secret key protection\n" - msgstr "" --"s'est� generant la suma de comprovaci� desaconsellada de 16-bits per a " --"la protecci� de la clau secreta\n" -+"s'està generant la suma de comprovació desaconsellada de 16-bits per a la " -+"protecció de la clau secreta\n" - - #: g10/seskey.c:52 - msgid "weak key created - retrying\n" - msgstr "s'hi ha creat una clau feble - reintent\n" - --# �s no-wrap? ivb -+# És no-wrap? ivb - #: g10/seskey.c:57 - #, c-format - msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" - msgstr "" --"no s'ha pogut evitar una clau feble per a xifratge sim�tric;\n" -+"no s'ha pogut evitar una clau feble per a xifratge simètric;\n" - "hi ha hagut %d intents!\n" - - #: g10/seskey.c:213 - msgid "DSA requires the use of a 160 bit hash algorithm\n" --msgstr "DSA requereix l'�s d'un algoritme de dispersi� de 160 bits\n" -+msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n" - - #: g10/sig-check.c:75 - msgid "WARNING: signature digest conflict in message\n" --msgstr "AV�S: conflicte de signatures digest en el missatge\n" -+msgstr "AVÃS: conflicte de signatures digest en el missatge\n" - - #: g10/sig-check.c:99 - #, c-format -@@ -5289,18 +5223,17 @@ - #, fuzzy, c-format - msgid "WARNING: signing subkey %s has an invalid cross-certification\n" - msgstr "" --"AV�S: no es pot desfer la nominaci� d'una clau com a revocador " --"designat!\n" -+"AVÃS: no es pot desfer la nominació d'una clau com a revocador designat!\n" - - #: g10/sig-check.c:168 - #, fuzzy, c-format - msgid "public key %s is %lu second newer than the signature\n" --msgstr "la clau p�blica %08lX �s %lu segons anterior a la signatura\n" -+msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n" - - #: g10/sig-check.c:169 - #, fuzzy, c-format - msgid "public key %s is %lu seconds newer than the signature\n" --msgstr "la clau p�blica %08lX �s %lu segons anterior a la signatura\n" -+msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n" - - # Werner FIXME: Use ngettext. jm - #: g10/sig-check.c:180 -@@ -5329,58 +5262,58 @@ - #, fuzzy, c-format - msgid "assuming bad signature from key %s due to an unknown critical bit\n" - msgstr "" --"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit " --"cr�tic desconegut\n" -+"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític " -+"desconegut\n" - - #: g10/sig-check.c:532 - #, fuzzy, c-format - msgid "key %s: no subkey for subkey revocation signature\n" - msgstr "" --"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocaci�\n" -+"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n" - - #: g10/sig-check.c:558 - #, fuzzy, c-format - msgid "key %s: no subkey for subkey binding signature\n" - msgstr "" --"clau %08lX: no hi ha una subclau per a la signatura de l'enlla� de la " -+"clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la " - "subclau\n" - - #: g10/sign.c:85 - msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" - msgstr "" --"no es poden ficar dades de notaci� dins de signatures v3 (estil PGP 2.x)\n" -+"no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n" - - #: g10/sign.c:93 - msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" - msgstr "" --"no es poden ficar dades de notaci� dins de signatures de clau v3 (estil " --"PGP 2.x)\n" -+"no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP " -+"2.x)\n" - - #: g10/sign.c:112 - #, c-format - msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" - msgstr "" --"AV�S: no s'ha pogut %%-expandir la notaci� (massa gran). S'utilitza no " -+"AVÃS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no " - "expandida.\n" - - #: g10/sign.c:138 - msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" - msgstr "" --"no es pot ficar una URL de pol�tica dins de signatures v3 (estil PGP 2.x)\n" -+"no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n" - - #: g10/sign.c:146 - msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" - msgstr "" --"no es pot ficar una URL de pol�tica dins de signatures de clau v3 (estil " --"PGP 2.x)\n" -+"no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP " -+"2.x)\n" - - #: g10/sign.c:159 - #, fuzzy, c-format - msgid "" - "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" - msgstr "" --"AV�S: no s'ha pogut %%-expandir l'url de pol�tica (massa gran). " --"S'utilitza no expandida.\n" -+"AVÃS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza " -+"no expandida.\n" - - #: g10/sign.c:187 - #, fuzzy, c-format -@@ -5388,8 +5321,8 @@ - "WARNING: unable to %%-expand preferred keyserver URL (too large). Using " - "unexpanded.\n" - msgstr "" --"AV�S: no s'ha pogut %%-expandir l'url de pol�tica (massa gran). " --"S'utilitza no expandida.\n" -+"AVÃS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza " -+"no expandida.\n" - - #: g10/sign.c:364 - #, c-format -@@ -5399,21 +5332,20 @@ - #: g10/sign.c:373 - #, fuzzy, c-format - msgid "%s/%s signature from: \"%s\"\n" --msgstr "%s signatura de: �%s�\n" -+msgstr "%s signatura de: «%s»\n" - - #: g10/sign.c:741 - msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" - msgstr "" --"nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre " --"esteu en mode --pgp2\n" -+"només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu " -+"en mode --pgp2\n" - - #: g10/sign.c:808 - #, fuzzy, c-format - msgid "" - "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" - msgstr "" --"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del " --"destinatari\n" -+"forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n" - - #: g10/sign.c:900 - msgid "signing:" -@@ -5422,44 +5354,44 @@ - #: g10/sign.c:1007 - msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" - msgstr "" --"nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n" -+"només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n" - - #: g10/sign.c:1180 - #, c-format - msgid "%s encryption will be used\n" --msgstr "s'utilitzar� xifratge %s\n" -+msgstr "s'utilitzarà xifratge %s\n" - - #: g10/skclist.c:126 g10/skclist.c:190 - msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" - msgstr "" --"la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA " -+"la clau no està marcada com a insegura - no es pot utilitzar amb el GNA " - "fals!\n" - - #: g10/skclist.c:157 - #, fuzzy, c-format - msgid "skipped \"%s\": duplicated\n" --msgstr "es descarta �%s�: duplicat\n" -+msgstr "es descarta «%s»: duplicat\n" - - #: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 - #, fuzzy, c-format - msgid "skipped \"%s\": %s\n" --msgstr "es descarta �%s�: %s\n" -+msgstr "es descarta «%s»: %s\n" - - #: g10/skclist.c:170 - msgid "skipped: secret key already present\n" --msgstr "es descarta: la clau secreta ja �s present\n" -+msgstr "es descarta: la clau secreta ja és present\n" - - #: g10/skclist.c:185 - #, fuzzy - msgid "this is a PGP generated Elgamal key which is not secure for signatures!" - msgstr "" --"es descarta �%s�: �s una clau ElGamal generada per PGP que no �s " --"segura per a signatures!\n" -+"es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per " -+"a signatures!\n" - - #: g10/tdbdump.c:59 g10/trustdb.c:365 - #, c-format - msgid "trust record %lu, type %d: write failed: %s\n" --msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n" -+msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n" - - #: g10/tdbdump.c:104 - #, c-format -@@ -5467,18 +5399,18 @@ - "# List of assigned trustvalues, created %s\n" - "# (Use \"gpg --import-ownertrust\" to restore them)\n" - msgstr "" --"# Llista de valors de confian�a assignats, creat el %s\n" --"# (Utilitzeu �gpg --import-ownertrust� per a restaurar-les)\n" -+"# Llista de valors de confiança assignats, creat el %s\n" -+"# (Utilitzeu «gpg --import-ownertrust» per a restaurar-les)\n" - - #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177 - #, fuzzy, c-format - msgid "error in `%s': %s\n" --msgstr "error en la lectura de �%s�: %s\n" -+msgstr "error en la lectura de «%s»: %s\n" - - #: g10/tdbdump.c:159 - #, fuzzy - msgid "line too long" --msgstr "la l�nia �s massa llarga\n" -+msgstr "la línia és massa llarga\n" - - #: g10/tdbdump.c:167 - msgid "colon missing" -@@ -5487,17 +5419,17 @@ - #: g10/tdbdump.c:173 - #, fuzzy - msgid "invalid fingerprint" --msgstr "error: l'empremta digital �s inv�lida\n" -+msgstr "error: l'empremta digital és invàlida\n" - - #: g10/tdbdump.c:178 - #, fuzzy - msgid "ownertrust value missing" --msgstr "importa els valors de confian�a" -+msgstr "importa els valors de confiança" - - #: g10/tdbdump.c:214 - #, fuzzy, c-format - msgid "error finding trust record in `%s': %s\n" --msgstr "error en trobar el registre de confian�a: %s\n" -+msgstr "error en trobar el registre de confiança: %s\n" - - #: g10/tdbdump.c:218 - #, fuzzy, c-format -@@ -5507,29 +5439,29 @@ - #: g10/tdbdump.c:227 g10/trustdb.c:380 - #, c-format - msgid "trustdb: sync failed: %s\n" --msgstr "base de dades de confian�a: no s'ha pogut sincronitzar: %s\n" -+msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n" - - #: g10/tdbio.c:128 g10/tdbio.c:1440 - #, c-format - msgid "trustdb rec %lu: lseek failed: %s\n" --msgstr "reg de la base de dades de confian�a %lu: ha fallat lseek: %s\n" -+msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n" - - #: g10/tdbio.c:134 g10/tdbio.c:1447 - #, c-format - msgid "trustdb rec %lu: write failed (n=%d): %s\n" - msgstr "" --"reg de la base de dades de confian�a %lu: ha fallat la escriptura (n=%d): %" -+"reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): %" - "s\n" - - #: g10/tdbio.c:244 - msgid "trustdb transaction too large\n" --msgstr "la transacci� de la base de dades de confian�a �s massa gran\n" -+msgstr "la transacció de la base de dades de confiança és massa gran\n" - - # No em passe! ;) ivb - #: g10/tdbio.c:497 - #, fuzzy, c-format - msgid "can't access `%s': %s\n" --msgstr "no s'ha pogut tancar �%s�: %s\n" -+msgstr "no s'ha pogut tancar «%s»: %s\n" - - #: g10/tdbio.c:512 - #, c-format -@@ -5539,82 +5471,82 @@ - #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588 - #, fuzzy, c-format - msgid "can't create lock for `%s'\n" --msgstr "no s'ha pogut crear �%s�: %s\n" -+msgstr "no es pot crear el directori «%s»: %s\n" - - #: g10/tdbio.c:524 g10/tdbio.c:591 - #, fuzzy, c-format - msgid "can't lock `%s'\n" --msgstr "no s'ha pogut obrir �%s�\n" -+msgstr "no s'ha pogut obrir «%s»\n" - - #: g10/tdbio.c:550 - #, c-format - msgid "%s: failed to create version record: %s" --msgstr "%s: no s'ha pogut crear un registre de versi�: %s" -+msgstr "%s: no s'ha pogut crear un registre de versió: %s" - - #: g10/tdbio.c:554 - #, c-format - msgid "%s: invalid trustdb created\n" --msgstr "%s: s'ha creat una base de dades de confian�a inv�lida\n" -+msgstr "%s: s'ha creat una base de dades de confiança invàlida\n" - - #: g10/tdbio.c:557 - #, c-format - msgid "%s: trustdb created\n" --msgstr "%s: s'ha creat la base de dades de confian�a\n" -+msgstr "%s: s'ha creat la base de dades de confiança\n" - - #: g10/tdbio.c:597 - msgid "NOTE: trustdb not writable\n" --msgstr "NOTA: no es pot escriure en la base de dades de confian�a\n" -+msgstr "NOTA: no es pot escriure en la base de dades de confiança\n" - - #: g10/tdbio.c:614 - #, c-format - msgid "%s: invalid trustdb\n" --msgstr "%s: la base de dades de confian�a �s inv�lida\n" -+msgstr "%s: la base de dades de confiança és invàlida\n" - - #: g10/tdbio.c:646 - #, c-format - msgid "%s: failed to create hashtable: %s\n" --msgstr "%s: no s'ha pogut crear la taula de dispersi�: %s\n" -+msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n" - - #: g10/tdbio.c:654 - #, c-format - msgid "%s: error updating version record: %s\n" --msgstr "%s: error en actualitzar el registre de la versi�: %s\n" -+msgstr "%s: error en actualitzar el registre de la versió: %s\n" - - #: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721 - #: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400 - #, c-format - msgid "%s: error reading version record: %s\n" --msgstr "%s: error en llegir el registre de la versi�: %s\n" -+msgstr "%s: error en llegir el registre de la versió: %s\n" - - #: g10/tdbio.c:730 - #, c-format - msgid "%s: error writing version record: %s\n" --msgstr "%s: error en escriure el registre de la versi?: %s\n" -+msgstr "%s: error en escriure el registre de la versió: %s\n" - - #: g10/tdbio.c:1169 - #, c-format - msgid "trustdb: lseek failed: %s\n" --msgstr "base de dades de confian�a: ha fallat lseek: %s\n" -+msgstr "base de dades de confiança: ha fallat lseek: %s\n" - - #: g10/tdbio.c:1177 - #, c-format - msgid "trustdb: read failed (n=%d): %s\n" --msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n" -+msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n" - - #: g10/tdbio.c:1198 - #, c-format - msgid "%s: not a trustdb file\n" --msgstr "%s no �s un fitxer de base de dades de confian�a\n" -+msgstr "%s no és un fitxer de base de dades de confiança\n" - - #: g10/tdbio.c:1216 - #, c-format - msgid "%s: version record with recnum %lu\n" --msgstr "%s: registre de versi� amb n�mero de registre %lu\n" -+msgstr "%s: registre de versió amb número de registre %lu\n" - - #: g10/tdbio.c:1221 - #, c-format - msgid "%s: invalid file version %d\n" --msgstr "%s: la versi� de fitxer %d �s inv�lida\n" -+msgstr "%s: la versió de fitxer %d és invàlida\n" - - #: g10/tdbio.c:1406 - #, c-format -@@ -5639,23 +5571,23 @@ - #: g10/tdbio.c:1499 - msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" - msgstr "" --"la base de dades de confian�a est� corrompuda; per favor, executeu " --"�gpg --fix-trustdb�.\n" -+"la base de dades de confiança està corrompuda; per favor, executeu «gpg --" -+"fix-trustdb».\n" - - #: g10/textfilter.c:142 - #, c-format - msgid "can't handle text lines longer than %d characters\n" --msgstr "no es poden tractar l�nies m�s llargues de %d car�cters\n" -+msgstr "no es poden tractar línies més llargues de %d caràcters\n" - - #: g10/textfilter.c:239 - #, c-format - msgid "input line longer than %d characters\n" --msgstr "la l�nia d'entrada �s superior a %d car�cters\n" -+msgstr "la línia d'entrada és superior a %d caràcters\n" - - #: g10/trustdb.c:226 - #, c-format - msgid "`%s' is not a valid long keyID\n" --msgstr "�%s� no �s un ID de clau llarg v�lid\n" -+msgstr "«%s» no és un ID de clau llarg vàlid\n" - - #: g10/trustdb.c:257 - #, fuzzy, c-format -@@ -5666,28 +5598,28 @@ - #, fuzzy, c-format - msgid "key %s occurs more than once in the trustdb\n" - msgstr "" --"la clau %08lX apareix m�s d'una vegada en la base de dades de confian�a\n" -+"la clau %08lX apareix més d'una vegada en la base de dades de confiança\n" - - #: g10/trustdb.c:310 - #, fuzzy, c-format - msgid "key %s: no public key for trusted key - skipped\n" - msgstr "" --"clau %08lX: no hi ha una clau p�blica per a la clau fiable - es descarta\n" -+"clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n" - - #: g10/trustdb.c:320 - #, fuzzy, c-format - msgid "key %s marked as ultimately trusted\n" --msgstr "s'ha marcat la clau com a de confian�a absoluta.\n" -+msgstr "s'ha marcat la clau com a de confiança absoluta.\n" - - #: g10/trustdb.c:344 - #, c-format - msgid "trust record %lu, req type %d: read failed: %s\n" --msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut llegir: %s\n" -+msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n" - - #: g10/trustdb.c:350 - #, c-format - msgid "trust record %lu is not of requested type %d\n" --msgstr "el registre de confian�a %lu no �s del tipus demanat %d\n" -+msgstr "el registre de confiança %lu no és del tipus demanat %d\n" - - #: g10/trustdb.c:446 - #, c-format -@@ -5758,33 +5690,32 @@ - #: g10/trustdb.c:576 - msgid "no need for a trustdb check\n" - msgstr "" --"no �s necess�ria una comprovaci� de la base de dades de confian�a\n" -+"no és necessària una comprovació de la base de dades de confiança\n" - "\n" - - #: g10/trustdb.c:582 g10/trustdb.c:2143 - #, c-format - msgid "next trustdb check due at %s\n" --msgstr "" --"la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n" -+msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n" - - #: g10/trustdb.c:591 - #, fuzzy, c-format - msgid "no need for a trustdb check with `%s' trust model\n" - msgstr "" --"no �s necess�ria una comprovaci� de la base de dades de confian�a\n" -+"no és necessària una comprovació de la base de dades de confiança\n" - "\n" - - #: g10/trustdb.c:606 - #, fuzzy, c-format - msgid "no need for a trustdb update with `%s' trust model\n" - msgstr "" --"no �s necess�ria una comprovaci� de la base de dades de confian�a\n" -+"no és necessària una comprovació de la base de dades de confiança\n" - "\n" - - #: g10/trustdb.c:824 g10/trustdb.c:1262 - #, fuzzy, c-format - msgid "public key %s not found: %s\n" --msgstr "no s'ha trobat la clau p�blica %08lX: %s\n" -+msgstr "no s'ha trobat la clau pública %08lX: %s\n" - - #: g10/trustdb.c:1019 - msgid "please do a --check-trustdb\n" -@@ -5792,7 +5723,7 @@ - - #: g10/trustdb.c:1023 - msgid "checking the trustdb\n" --msgstr "s'est� comprovant la base de dades de confian�a\n" -+msgstr "s'està comprovant la base de dades de confiança\n" - - #: g10/trustdb.c:1887 - #, c-format -@@ -5801,13 +5732,13 @@ - - #: g10/trustdb.c:1951 - msgid "no ultimately trusted keys found\n" --msgstr "no s'han trobat claus amb confian�a absoluta\n" -+msgstr "no s'han trobat claus amb confiança absoluta\n" - - #: g10/trustdb.c:1965 - #, fuzzy, c-format - msgid "public key of ultimately trusted key %s not found\n" - msgstr "" --"no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n" -+"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n" - - #: g10/trustdb.c:1988 - #, c-format -@@ -5823,7 +5754,7 @@ - #: g10/trustdb.c:2149 - #, fuzzy, c-format - msgid "unable to update trustdb version record: write failed: %s\n" --msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n" -+msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n" - - #: g10/verify.c:116 - msgid "" -@@ -5833,14 +5764,13 @@ - msgstr "" - "no s'ha pogut verificar la signatura.\n" - "Recordeu que el fitxer de signatura (.sig o .asc)\n" --"ha de ser el primer que figure en la l�nia d'ordres.\n" -+"ha de ser el primer que figure en la línia d'ordres.\n" - --# LF -> fi de l�nia? ivb -+# LF -> fi de línia? ivb - #: g10/verify.c:189 - #, c-format - msgid "input line %u too long or missing LF\n" --msgstr "" --"la l�nia d'entrada %u �s massa llarga o hi falta un f� de l�nia\n" -+msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n" - - #: util/errors.c:54 - msgid "general error" -@@ -5848,47 +5778,47 @@ - - #: util/errors.c:55 - msgid "unknown packet type" --msgstr "el tipus de paquet �s desconegut" -+msgstr "el tipus de paquet és desconegut" - - #: util/errors.c:56 - msgid "unknown version" --msgstr "la versi� �s desconeguda" -+msgstr "la versió és desconeguda" - - #: util/errors.c:57 - msgid "unknown pubkey algorithm" --msgstr "l'algoritme de clau p�blica �s desconegut" -+msgstr "l'algoritme de clau pública és desconegut" - - #: util/errors.c:58 - msgid "unknown digest algorithm" --msgstr "l'algoritme de resum �s desconegut" -+msgstr "l'algoritme de resum és desconegut" - - #: util/errors.c:59 - msgid "bad public key" --msgstr "la clau p�blica �s err�nia" -+msgstr "la clau pública és errònia" - - #: util/errors.c:60 - msgid "bad secret key" --msgstr "la clau secreta �s err�nia" -+msgstr "la clau secreta és errònia" - - #: util/errors.c:61 - msgid "bad signature" --msgstr "la signatura �s err�nia" -+msgstr "la signatura és errònia" - - #: util/errors.c:62 - msgid "checksum error" --msgstr "la suma de control �s err�nia" -+msgstr "la suma de control és errònia" - - #: util/errors.c:63 - msgid "bad passphrase" --msgstr "la contrasenya �s err�nia" -+msgstr "la contrasenya és errònia" - - #: util/errors.c:64 - msgid "public key not found" --msgstr "no s'ha trobat la clau p�blica" -+msgstr "no s'ha trobat la clau pública" - - #: util/errors.c:65 - msgid "unknown cipher algorithm" --msgstr "l'algoritme de xifratge �s desconegut" -+msgstr "l'algoritme de xifratge és desconegut" - - #: util/errors.c:66 - msgid "can't open the keyring" -@@ -5896,11 +5826,11 @@ - - #: util/errors.c:67 - msgid "invalid packet" --msgstr "el paquet �s inv�lid" -+msgstr "el paquet és invàlid" - - #: util/errors.c:68 - msgid "invalid armor" --msgstr "l'armadura �s inv�lida" -+msgstr "l'armadura és invàlida" - - #: util/errors.c:69 - msgid "no such user id" -@@ -5908,22 +5838,22 @@ - - #: util/errors.c:70 - msgid "secret key not available" --msgstr "la clau secreta no est� disponible" -+msgstr "la clau secreta no està disponible" - - #: util/errors.c:71 - msgid "wrong secret key used" - msgstr "s'ha utilitzat una clau secreta incorrecta" - --# G�nere? Nombre? ivb -+# Gènere? Nombre? ivb - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: util/errors.c:72 - msgid "not supported" --msgstr "no �s suportat" -+msgstr "no és suportat" - - #: util/errors.c:73 - msgid "bad key" --msgstr "la clau �s incorrecta" -+msgstr "la clau és incorrecta" - - #: util/errors.c:74 - msgid "file read error" -@@ -5935,7 +5865,7 @@ - - #: util/errors.c:76 - msgid "unknown compress algorithm" --msgstr "l'algoritme de compressi� �s desconegut" -+msgstr "l'algoritme de compressió és desconegut" - - #: util/errors.c:77 - msgid "file open error" -@@ -5943,47 +5873,47 @@ - - #: util/errors.c:78 - msgid "file create error" --msgstr "error en la creaci� del fitxer" -+msgstr "error en la creació del fitxer" - - #: util/errors.c:79 - msgid "invalid passphrase" --msgstr "la contrasenya �s inv�lida" -+msgstr "la contrasenya és invàlida" - - #: util/errors.c:80 - msgid "unimplemented pubkey algorithm" --msgstr "l'algoritme de clau p�blica no �s implementat" -+msgstr "l'algoritme de clau pública no és implementat" - - #: util/errors.c:81 - msgid "unimplemented cipher algorithm" --msgstr "l'algoritme de xifratge no �s implementat" -+msgstr "l'algoritme de xifratge no és implementat" - - #: util/errors.c:82 - msgid "unknown signature class" --msgstr "la classe de signatura �s desconeguda" -+msgstr "la classe de signatura és desconeguda" - - #: util/errors.c:83 - msgid "trust database error" --msgstr "error de la base de dades de confian�a" -+msgstr "error de la base de dades de confiança" - - #: util/errors.c:84 - msgid "bad MPI" --msgstr "l'MPI �s erroni" -+msgstr "l'MPI és erroni" - - #: util/errors.c:85 - msgid "resource limit" --msgstr "l�mit de recursos" -+msgstr "límit de recursos" - - #: util/errors.c:86 - msgid "invalid keyring" --msgstr "l'anell no �s v�lid" -+msgstr "l'anell no és vàlid" - - #: util/errors.c:87 - msgid "bad certificate" --msgstr "el certificat �s incorrecte" -+msgstr "el certificat és incorrecte" - - #: util/errors.c:88 - msgid "malformed user id" --msgstr "l'id d'usuari �s malformat" -+msgstr "l'id d'usuari és malformat" - - #: util/errors.c:89 - msgid "file close error" -@@ -5995,7 +5925,7 @@ - - #: util/errors.c:91 - msgid "file delete error" --msgstr "error en l'eliminaci� del fitxer" -+msgstr "error en l'eliminació del fitxer" - - #: util/errors.c:92 - msgid "unexpected data" -@@ -6005,47 +5935,47 @@ - msgid "timestamp conflict" - msgstr "conflicte de data" - --# Ac� veus pq jo pose �no �s v�lid� en comptes de ��s inv�lid�. ivb -+# Ací veus pq jo pose «no és vàlid» en comptes de «és invàlid». ivb - #: util/errors.c:94 - msgid "unusable pubkey algorithm" --msgstr "l'algoritme de clau p�blica �s inusable" -+msgstr "l'algoritme de clau pública és inusable" - - #: util/errors.c:95 - msgid "file exists" - msgstr "el fitxer existeix" - --# Segons context: la clau �s feble? ivb -+# Segons context: la clau és feble? ivb - #: util/errors.c:96 - msgid "weak key" - msgstr "clau feble" - - #: util/errors.c:97 - msgid "invalid argument" --msgstr "l'argument �s inv�lid" -+msgstr "l'argument és invàlid" - --# La �U� �s masculina o femenina? ivb -+# La «U» és masculina o femenina? ivb - #: util/errors.c:98 - msgid "bad URI" --msgstr "l'URI �s err�nia" -+msgstr "l'URI és errònia" - --# �dem. ivb -+# Ãdem. ivb - #: util/errors.c:99 - msgid "unsupported URI" --msgstr "l'URI no �s suportada" -+msgstr "l'URI no és suportada" - - #: util/errors.c:100 - msgid "network error" - msgstr "error de la xarxa" - --# G�nere? Nombre? ivb -+# Gènere? Nombre? ivb - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: util/errors.c:102 - msgid "not encrypted" --msgstr "no �s xifrat" -+msgstr "no és xifrat" - --# G�nere? Nombre? Passat, futur? ivb --# Probablement �s una clau, femen�. jm -+# Gènere? Nombre? Passat, futur? ivb -+# Probablement és una clau, femení. jm - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: util/errors.c:103 -@@ -6054,13 +5984,13 @@ - - #: util/errors.c:105 - msgid "unusable public key" --msgstr "ls clau p�blica �s inusable" -+msgstr "ls clau pública és inusable" - - #: util/errors.c:106 - msgid "unusable secret key" --msgstr "la clau secreta �s inusable" -+msgstr "la clau secreta és inusable" - --# �del servidor�, �en el servidor�? ivb -+# «del servidor», «en el servidor»? ivb - #: util/errors.c:107 - msgid "keyserver error" - msgstr "error de servidor de claus" -@@ -6068,15 +5998,15 @@ - #: util/errors.c:108 - #, fuzzy - msgid "canceled" --msgstr "Cancel�la" -+msgstr "Cancel·la" - --# G�nere? Nombre? ivb -+# Gènere? Nombre? ivb - # Werner FIXME: please add translator comment saying *what* is - # uncompressed so we know the gender. jm - #: util/errors.c:109 - #, fuzzy - msgid "no card" --msgstr "no �s xifrat" -+msgstr "no és xifrat" - - #: util/logger.c:157 - msgid "ERROR: " -@@ -6089,7 +6019,7 @@ - #: util/logger.c:223 - #, c-format - msgid "... this is a bug (%s:%d:%s)\n" --msgstr "... a�� �s un bug (%s:%d:%s)\n" -+msgstr "... açò és un bug (%s:%d:%s)\n" - - #: util/logger.c:229 - #, c-format -@@ -6098,7 +6028,7 @@ - - #: util/miscutil.c:307 util/miscutil.c:344 - msgid "yes" --msgstr "s�|si" -+msgstr "sí|si" - - #: util/miscutil.c:308 util/miscutil.c:349 - msgid "yY" -@@ -6116,7 +6046,7 @@ - msgid "quit" - msgstr "ix" - --# �xX�? ivb -+# «xX»? ivb - #: util/miscutil.c:351 - msgid "qQ" - msgstr "xX" -@@ -6140,409 +6070,36 @@ - - #: util/secmem.c:90 - msgid "WARNING: using insecure memory!\n" --msgstr "AV�S: esteu usant mem�ria insegura!\n" -+msgstr "AVÃS: esteu usant memòria insegura!\n" - - #: util/secmem.c:91 - msgid "please see http://www.gnupg.org/faq.html for more information\n" - msgstr "" --"si us plau, visiteu http://www.gnupg.org/faq.html per a m�s informaci�\n" -+"si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n" - --# �ltimament pense si �iniciar� no ser� millor que �inicialitzar�? ivb --# Segons SC, hi ha difer�ncia. jm -+# Últimament pense si «iniciar» no serà millor que «inicialitzar»? ivb -+# Segons SC, hi ha diferència. jm - #: util/secmem.c:343 - msgid "operation is not possible without initialized secure memory\n" --msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n" -+msgstr "l'operació no és possible sense memòria segura inicialitzada\n" - - #: util/secmem.c:344 - msgid "(you may have used the wrong program for this task)\n" - msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n" - --#~ msgid "--nrsign-key user-id" --#~ msgstr "--nrsign-key user-id" -- --#~ msgid "--nrlsign-key user-id" --#~ msgstr "--nrlsign-key user-id" -- --#, fuzzy --#~ msgid "make a trust signature" --#~ msgstr "crea una signatura separada" -- --#~ msgid "sign the key non-revocably" --#~ msgstr "signa la clau irrevocablement" -- --#~ msgid "sign the key locally and non-revocably" --#~ msgstr "signa la clau localment i irrevocablement" -- --#~ msgid "q" --#~ msgstr "q" -- --#~ msgid "help" --#~ msgstr "ajuda" -- --#~ msgid "list" --#~ msgstr "llista" -- --#~ msgid "l" --#~ msgstr "l" -- --#~ msgid "debug" --#~ msgstr "depura" -- --#, fuzzy --#~ msgid "name" --#~ msgstr "enable" -- --#, fuzzy --#~ msgid "login" --#~ msgstr "lsign" -- --#, fuzzy --#~ msgid "cafpr" --#~ msgstr "fpr" -- --#, fuzzy --#~ msgid "forcesig" --#~ msgstr "revsig" -- --#, fuzzy --#~ msgid "generate" --#~ msgstr "error general" -- --#~ msgid "passwd" --#~ msgstr "passwd" -- --#~ msgid "save" --#~ msgstr "desa" -- --#~ msgid "fpr" --#~ msgstr "fpr" -- --#~ msgid "uid" --#~ msgstr "uid" -- --#~ msgid "key" --#~ msgstr "clau" -- --#~ msgid "check" --#~ msgstr "comprova" -- --#~ msgid "c" --#~ msgstr "c" -- --#~ msgid "sign" --#~ msgstr "sign" -- --#~ msgid "s" --#~ msgstr "s" -- --#, fuzzy --#~ msgid "tsign" --#~ msgstr "sign" -- --#~ msgid "lsign" --#~ msgstr "lsign" -- --#~ msgid "nrsign" --#~ msgstr "nrsign" -- --#~ msgid "nrlsign" --#~ msgstr "nrlsign" -- --#~ msgid "adduid" --#~ msgstr "adduid" -- --#~ msgid "addphoto" --#~ msgstr "addphoto" -- --#~ msgid "deluid" --#~ msgstr "deluid" -- --#~ msgid "delphoto" --#~ msgstr "delphoto" -- --#~ msgid "addkey" --#~ msgstr "addkey" -- --#, fuzzy --#~ msgid "addcardkey" --#~ msgstr "addkey" -- --#~ msgid "delkey" --#~ msgstr "delkey" -- --#~ msgid "addrevoker" --#~ msgstr "addrevoker" -- --#~ msgid "delsig" --#~ msgstr "delsig" -- --#~ msgid "expire" --#~ msgstr "expire" -- --#~ msgid "primary" --#~ msgstr "primari" -- --#~ msgid "toggle" --#~ msgstr "toggle" -- --#~ msgid "t" --#~ msgstr "t" -- --#~ msgid "pref" --#~ msgstr "pref" -- --#~ msgid "showpref" --#~ msgstr "showpref" -- --#~ msgid "setpref" --#~ msgstr "setpref" -- --#~ msgid "updpref" --#~ msgstr "updpref" -- --# �del servidor�, �en el servidor�? ivb --#, fuzzy --#~ msgid "keyserver" --#~ msgstr "error de servidor de claus" -- --#~ msgid "trust" --#~ msgstr "trust" -- --#~ msgid "revsig" --#~ msgstr "revsig" -- --#~ msgid "revuid" --#~ msgstr "revuid" -- --#~ msgid "revkey" --#~ msgstr "revkey" -- --#~ msgid "disable" --#~ msgstr "disable" -- --#~ msgid "enable" --#~ msgstr "enable" -- --#~ msgid "showphoto" --#~ msgstr "showphoto" -- - #~ msgid "digest algorithm `%s' is read-only in this release\n" --#~ msgstr "" --#~ "l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n" -- --#~ msgid "" --#~ "About to generate a new %s keypair.\n" --#~ " minimum keysize is 768 bits\n" --#~ " default keysize is 1024 bits\n" --#~ " highest suggested keysize is 2048 bits\n" --#~ msgstr "" --#~ "Preparat per a generar un nou parell de claus %s.\n" --#~ " grand�ria m�nima: 768 bits\n" --#~ " grand�ria predeterminada: 1024 bits\n" --#~ " grand�ria m�xima aconsellada: 2048 bits\n" -- --#~ msgid "DSA only allows keysizes from 512 to 1024\n" --#~ msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n" -- --#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" --#~ msgstr "" --#~ "la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus " --#~ "RSA.\n" -- --#~ msgid "keysize too small; 768 is smallest value allowed.\n" --#~ msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n" -- --# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons. ivb --#~ msgid "keysize too large; %d is largest value allowed.\n" --#~ msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n" -- --#~ msgid "" --#~ "Keysizes larger than 2048 are not suggested because\n" --#~ "computations take REALLY long!\n" --#~ msgstr "" --#~ "No es recomanen claus m�s llargues de 2048 bits perqu�\n" --#~ "els c�lculs s�n VERITABLEMENT llargs!\n" -- --#, fuzzy --#~ msgid "Are you sure that you want this keysize? (y/N) " --#~ msgstr "Segur que voleu aquesta grand�ria? " -- --#~ msgid "" --#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " --#~ "very vulnerable to attacks!\n" --#~ msgstr "" --#~ "D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� " --#~ "son molt vulnerables als atacs!\n" -- --#~ msgid "Experimental algorithms should not be used!\n" --#~ msgstr "No haur�eu d'usar algoritmes experimentals!\n" -- --#~ msgid "" --#~ "this cipher algorithm is deprecated; please use a more standard one!\n" --#~ msgstr "" --#~ "aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s " --#~ "est�ndard!\n" -- --#, fuzzy --#~ msgid "writing to file `%s'\n" --#~ msgstr "s'est� escrivint en �%s�\n" -- --#~ msgid "sorry, can't do this in batch mode\n" --#~ msgstr "no es pot fet aix� en mode desat�s\n" -- --#~ msgid "key `%s' not found: %s\n" --#~ msgstr "no s'ha trobat la clau �%s�: %s\n" -- --#, fuzzy --#~ msgid "can't create file `%s': %s\n" --#~ msgstr "no s'ha pogut crear �%s�: %s\n" -- --#, fuzzy --#~ msgid "can't open file `%s': %s\n" --#~ msgstr "no es pot obrir el fitxer: %s\n" -- --#, fuzzy --#~ msgid " \"" --#~ msgstr " alias \"" -- --#~ msgid " i = please show me more information\n" --#~ msgstr " i = mostra m�s informaci�\n" -- --#~ msgid "key %08lX: key has been revoked!\n" --#~ msgstr "clau %08lX: aquesta clau ha estat revocada!\n" -- --#~ msgid "key %08lX: subkey has been revoked!\n" --#~ msgstr "clau %08lX: aquesta subclau ha estat revocada!\n" -- --#~ msgid "%08lX: key has expired\n" --#~ msgstr "%08lX: la clau ha caducat\n" -- --#~ msgid "%08lX: We do NOT trust this key\n" --#~ msgstr "%08lX: La clau NO �s de confian�a\n" -- --#~ msgid " (%d) RSA (sign and encrypt)\n" --#~ msgstr " (%d) RSA (signar i xifrar)\n" -- --#, fuzzy --#~ msgid " (%d) RSA (auth only)\n" --#~ msgstr " (%d) RSA (nom�s signar)\n" -- --#, fuzzy --#~ msgid " (%d) RSA (sign and auth)\n" --#~ msgstr " (%d) RSA (signar i xifrar)\n" -- --#, fuzzy --#~ msgid " (%d) RSA (encrypt and auth)\n" --#~ msgstr " (%d) RSA (nom�s xifrar)\n" -- --#, fuzzy --#~ msgid " (%d) RSA (sign, encrypt and auth)\n" --#~ msgstr " (%d) RSA (signar i xifrar)\n" -- --#~ msgid "%s: can't open: %s\n" --#~ msgstr "%s: no s'ha pogut obrir: %s\n" -- --#~ msgid "%s: WARNING: empty file\n" --#~ msgstr "%s: AV�S: el fitxer �s buit\n" -- --#~ msgid "can't open %s: %s\n" --#~ msgstr "no s'ha pogut obrir %s: %s\n" -- --#, fuzzy --#~ msgid " (%d) I trust marginally\n" --#~ msgstr " %d = Hi confie marginalment\n" -- --#, fuzzy --#~ msgid " (%d) I trust fully\n" --#~ msgstr " %d = Hi confie plenament\n" -- --#, fuzzy --#~ msgid "expires" --#~ msgstr "expire" -- --#, fuzzy --#~ msgid "" --#~ "\"\n" --#~ "locally signed with your key %s at %s\n" --#~ msgstr "" --#~ "�\n" --#~ "signat localment amb la vostra clau %08lX el %s\n" -- --#, fuzzy --#~ msgid " signed by %s on %s%s\n" --#~ msgstr " signat per %08lX el %s%s\n" -- --#~ msgid "%s: can't access: %s\n" --#~ msgstr "%s: no s'ha pogut accedir: %s\n" -- --# blocatge? ivb --# yep. jm --#~ msgid "%s: can't create lock\n" --#~ msgstr "%s: no s'ha pogut crear el blocatge\n" -- --#~ msgid "%s: can't make lock\n" --#~ msgstr "%s: no s'ha pogut crear el blocatge\n" -- --#~ msgid "%s: can't create: %s\n" --#~ msgstr "%s: no s'ha pogut crear: %s\n" -- --#~ msgid "%s: can't create directory: %s\n" --#~ msgstr "%s: no s'ha pogut crear el directori: %s\n" -- --#~ msgid "If you want to use this revoked key anyway, answer \"yes\"." --#~ msgstr "" --#~ "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu " --#~ "�s��." -- --#~ msgid "Unable to open photo \"%s\": %s\n" --#~ msgstr "No s'ha pogut obrir la foto �%s�: %s\n" -- --#~ msgid "can't open file: %s\n" --#~ msgstr "no es pot obrir el fitxer: %s\n" -- --#~ msgid "error: missing colon\n" --#~ msgstr "error: falten dos punts\n" -- --#~ msgid "error: no ownertrust value\n" --#~ msgstr "error: no hi ha cap valor de confian�a\n" -- --#~ msgid " (main key ID %08lX)" --#~ msgstr " (ID de la clau principal %08lX)" -- --#~ msgid "rev! subkey has been revoked: %s\n" --#~ msgstr "rev! la subclau ha estat revocada: %s\n" -- --#~ msgid "rev- faked revocation found\n" --#~ msgstr "rev- s'ha trobat una revocaci� falsa\n" -- --#~ msgid "rev? problem checking revocation: %s\n" --#~ msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n" -- --#, fuzzy --#~ msgid " [expired: %s]" --#~ msgstr " [caduca: %s]" -- --#~ msgid " [expires: %s]" --#~ msgstr " [caduca: %s]" -- --#, fuzzy --#~ msgid " [revoked: %s]" --#~ msgstr "[revocada]" -- --#~ msgid "can't create %s: %s\n" --#~ msgstr "no s'ha pogut creat %s: %s\n" -+#~ msgstr "l'algorisme de resum «%s» es de només lectura en aquesta versió\n" - - #~ msgid "" - #~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" - #~ msgstr "" --#~ "AV�S: el resum �%s� no �s part d'OpenPGP. Utilitzeu-lo assumint " --#~ "el risc!\n" -+#~ "AVÃS: el resum «%s» no és part d'OpenPGP. Utilitzeu-lo assumint el risc!\n" - - #~ msgid "|[files]|encrypt files" - #~ msgstr "|[fitxers]|xifra fitxers" - - #~ msgid "store only" --#~ msgstr "nom�s emmagatzema" -+#~ msgstr "només emmagatzema" - - #~ msgid "|[files]|decrypt files" - #~ msgstr "|[fitxers]|desxifra fitxers" -@@ -6550,21 +6107,21 @@ - #~ msgid "sign a key non-revocably" - #~ msgstr "signa una clau irrevocablement" - --# D'altres formes o no queda clar o �s massa literari :P ivb -+# D'altres formes o no queda clar o és massa literari :P ivb - #~ msgid "sign a key locally and non-revocably" - #~ msgstr "signa una clau de forma local i irrevocable" - - #~ msgid "list only the sequence of packets" --#~ msgstr "llista nom�s la seq��ncia de paquets" -+#~ msgstr "llista només la seqüència de paquets" - - #~ msgid "export the ownertrust values" --#~ msgstr "exporta els valors de confian�a" -+#~ msgstr "exporta els valors de confiança" - - #~ msgid "unattended trust database update" --#~ msgstr "actualitzaci� no atesa de la base de dades de confian�a" -+#~ msgstr "actualització no atesa de la base de dades de confiança" - - #~ msgid "fix a corrupted trust database" --#~ msgstr "arregla una base de dades de confian�a corrompuda" -+#~ msgstr "arregla una base de dades de confiança corrompuda" - - #~ msgid "De-Armor a file or stdin" - #~ msgstr "lleva l'armadura a un fitxer o a stdin" -@@ -6582,16 +6139,16 @@ - #~ msgstr "no usa el terminal en absolut" - - #~ msgid "force v3 signatures" --#~ msgstr "for�a signatures v3" -+#~ msgstr "força signatures v3" - - #~ msgid "do not force v3 signatures" --#~ msgstr "no for�a signatures v3" -+#~ msgstr "no força signatures v3" - - #~ msgid "force v4 key signatures" --#~ msgstr "for�a signatures de clau v4" -+#~ msgstr "força signatures de clau v4" - - #~ msgid "do not force v4 key signatures" --#~ msgstr "no for�a signatures de clau v4" -+#~ msgstr "no força signatures de clau v4" - - #~ msgid "always use a MDC for encryption" - #~ msgstr "sempre utilitza un MDC per a xifrar" -@@ -6602,15 +6159,15 @@ - #~ msgid "use the gpg-agent" - #~ msgstr "utilitza el gpg-agent" - --# Mode desat�s (SC) ivb -+# Mode desatès (SC) ivb - #~ msgid "batch mode: never ask" --#~ msgstr "mode desat�s: no pregunta mai" -+#~ msgstr "mode desatès: no pregunta mai" - - #~ msgid "assume yes on most questions" --#~ msgstr "suposa �s�� en la majoria de les preguntes" -+#~ msgstr "suposa «sí» en la majoria de les preguntes" - - #~ msgid "assume no on most questions" --#~ msgstr "suposa �no� en la majoria de les preguntes" -+#~ msgstr "suposa «no» en la majoria de les preguntes" - - #~ msgid "add this keyring to the list of keyrings" - #~ msgstr "afegeix aquest anell a la llista" -@@ -6619,7 +6176,7 @@ - #~ msgstr "afegeix aquest anell secret a la llista" - - #~ msgid "show which keyring a listed key is on" --#~ msgstr "mostra en quin anell de claus est� una clau llistada" -+#~ msgstr "mostra en quin anell de claus està una clau llistada" - - #~ msgid "|NAME|use NAME as default secret key" - #~ msgstr "|NOM|usa NOM com a clau secreta predeterminada" -@@ -6628,19 +6185,19 @@ - #~ msgstr "|HOST|usa aquest servidor per a cercar claus" - - #~ msgid "|NAME|set terminal charset to NAME" --#~ msgstr "|NOM|el joc de car�cters ser� NOM" -+#~ msgstr "|NOM|el joc de caràcters serà NOM" - - #~ msgid "read options from file" - #~ msgstr "llig opcions del fitxer" - - #~ msgid "|[file]|write status info to file" --#~ msgstr "|fitxer|escriu informaci� d'estat en un fitxer" -+#~ msgstr "|fitxer|escriu informació d'estat en un fitxer" - - #~ msgid "|KEYID|ultimately trust this key" - #~ msgstr "|IDCLAU|confia absolutament en aquesta clau" - - #~ msgid "|FILE|load extension module FILE" --#~ msgstr "|FITXER|carrega el m�dul d'extensi� especificat" -+#~ msgstr "|FITXER|carrega el mòdul d'extensió especificat" - - #~ msgid "emulate the mode described in RFC1991" - #~ msgstr "emula el mode descrit en RFC1991" -@@ -6672,7 +6229,7 @@ - #~ msgstr "|NOM|usa l'algoritme de resum de missatges NOM" - - #~ msgid "|N|use compress algorithm N" --#~ msgstr "|N|usa l'algoritme de compressi� N" -+#~ msgstr "|N|usa l'algoritme de compressió N" - - # elimina o descarta? jm - #~ msgid "throw keyid field of encrypted packets" -@@ -6692,54 +6249,270 @@ - - #~ msgid "compress algorithm `%s' is read-only in this release\n" - #~ msgstr "" --#~ "l'algorisme de compressi� �%s� es de nom�s lectura en aquesta " --#~ "versi�\n" -+#~ "l'algorisme de compressió «%s» es de només lectura en aquesta versió\n" - - #~ msgid "compress algorithm must be in range %d..%d\n" --#~ msgstr "l'algoritme de compressi� ha d'estar en l'interval %d..%d\n" -+#~ msgstr "l'algoritme de compressió ha d'estar en l'interval %d..%d\n" -+ -+#~ msgid "--nrsign-key user-id" -+#~ msgstr "--nrsign-key user-id" -+ -+#~ msgid "--nrlsign-key user-id" -+#~ msgstr "--nrlsign-key user-id" -+ -+#~ msgid "can't open %s: %s\n" -+#~ msgstr "no s'ha pogut obrir %s: %s\n" -+ -+#~ msgid " i = please show me more information\n" -+#~ msgstr " i = mostra més informació\n" -+ -+#~ msgid "key %08lX: key has been revoked!\n" -+#~ msgstr "clau %08lX: aquesta clau ha estat revocada!\n" -+ -+#~ msgid "key %08lX: subkey has been revoked!\n" -+#~ msgstr "clau %08lX: aquesta subclau ha estat revocada!\n" -+ -+#~ msgid "%08lX: key has expired\n" -+#~ msgstr "%08lX: la clau ha caducat\n" -+ -+#~ msgid "%08lX: We do NOT trust this key\n" -+#~ msgstr "%08lX: La clau NO és de confiança\n" - - #~ msgid "" - #~ "%08lX: It is not sure that this key really belongs to the owner\n" - #~ "but it is accepted anyway\n" - #~ msgstr "" - #~ "%08lX: No hi ha garanties que aquesta clau pertanya realment al seu\n" --#~ "propietari per� s'accepta de tota manera\n" -+#~ "propietari però s'accepta de tota manera\n" - - #~ msgid "preference %c%lu is not valid\n" --#~ msgstr "la prefer�ncia %c%lu no �s v�lida\n" -+#~ msgstr "la preferència %c%lu no és vàlida\n" -+ -+#~ msgid " (%d) RSA (sign and encrypt)\n" -+#~ msgstr " (%d) RSA (signar i xifrar)\n" -+ -+#~ msgid "" -+#~ "About to generate a new %s keypair.\n" -+#~ " minimum keysize is 768 bits\n" -+#~ " default keysize is 1024 bits\n" -+#~ " highest suggested keysize is 2048 bits\n" -+#~ msgstr "" -+#~ "Preparat per a generar un nou parell de claus %s.\n" -+#~ " grandària mínima: 768 bits\n" -+#~ " grandària predeterminada: 1024 bits\n" -+#~ " grandària màxima aconsellada: 2048 bits\n" -+ -+#~ msgid "DSA only allows keysizes from 512 to 1024\n" -+#~ msgstr "DSA només permet claus entre 512 i 1024 bits\n" -+ -+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -+#~ msgstr "" -+#~ "la clau és massa petita; 1024 bits és el mínim permés per a claus RSA.\n" -+ -+#~ msgid "keysize too small; 768 is smallest value allowed.\n" -+#~ msgstr "la clau és massa petita; 768 bits és el mínim permés.\n" -+ -+# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons. ivb -+#~ msgid "keysize too large; %d is largest value allowed.\n" -+#~ msgstr "la clau és massa llarga; %d és el màxim permés.\n" -+ -+#~ msgid "" -+#~ "Keysizes larger than 2048 are not suggested because\n" -+#~ "computations take REALLY long!\n" -+#~ msgstr "" -+#~ "No es recomanen claus més llargues de 2048 bits perquè\n" -+#~ "els càlculs són VERITABLEMENT llargs!\n" -+ -+#~ msgid "Are you sure that you want this keysize? " -+#~ msgstr "Segur que voleu aquesta grandària? " -+ -+#~ msgid "" -+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " -+#~ "very vulnerable to attacks!\n" -+#~ msgstr "" -+#~ "D'acord, però sapieu que la radiació del monitor i del teclat també son " -+#~ "molt vulnerables als atacs!\n" -+ -+#~ msgid "%s: can't open: %s\n" -+#~ msgstr "%s: no s'ha pogut obrir: %s\n" -+ -+#~ msgid "%s: WARNING: empty file\n" -+#~ msgstr "%s: AVÃS: el fitxer és buit\n" - - #~ msgid "key %08lX: not a rfc2440 key - skipped\n" --#~ msgstr "clau %08lX: no �s una clau rfc2440 - es descarta\n" -+#~ msgstr "clau %08lX: no és una clau rfc2440 - es descarta\n" - - #~ msgid "" - #~ "NOTE: Elgamal primary key detected - this may take some time to import\n" - #~ msgstr "" --#~ "NOTA: s'ha detectat una clau prim�ria Elgamal - a�� pot trigar un " --#~ "temps en importar-se\n" -+#~ "NOTA: s'ha detectat una clau primària Elgamal - açò pot trigar un temps " -+#~ "en importar-se\n" - - #~ msgid " (default)" - #~ msgstr " (predeterminat)" - -+#~ msgid "q" -+#~ msgstr "q" -+ -+#~ msgid "save" -+#~ msgstr "desa" -+ -+#~ msgid "help" -+#~ msgstr "ajuda" -+ -+#~ msgid "fpr" -+#~ msgstr "fpr" -+ -+#~ msgid "list" -+#~ msgstr "llista" -+ -+#~ msgid "l" -+#~ msgstr "l" -+ -+#~ msgid "uid" -+#~ msgstr "uid" -+ -+#~ msgid "key" -+#~ msgstr "clau" -+ -+#~ msgid "check" -+#~ msgstr "comprova" -+ -+#~ msgid "s" -+#~ msgstr "s" -+ -+#~ msgid "lsign" -+#~ msgstr "lsign" -+ -+#~ msgid "nrsign" -+#~ msgstr "nrsign" -+ -+#~ msgid "sign the key non-revocably" -+#~ msgstr "signa la clau irrevocablement" -+ -+#~ msgid "nrlsign" -+#~ msgstr "nrlsign" -+ -+#~ msgid "sign the key locally and non-revocably" -+#~ msgstr "signa la clau localment i irrevocablement" -+ -+#~ msgid "debug" -+#~ msgstr "depura" -+ -+#~ msgid "adduid" -+#~ msgstr "adduid" -+ -+#~ msgid "addphoto" -+#~ msgstr "addphoto" -+ -+#~ msgid "deluid" -+#~ msgstr "deluid" -+ -+#~ msgid "delphoto" -+#~ msgstr "delphoto" -+ -+#~ msgid "addkey" -+#~ msgstr "addkey" -+ -+#~ msgid "delkey" -+#~ msgstr "delkey" -+ -+#~ msgid "addrevoker" -+#~ msgstr "addrevoker" -+ -+#~ msgid "delsig" -+#~ msgstr "delsig" -+ -+#~ msgid "primary" -+#~ msgstr "primari" -+ -+#~ msgid "toggle" -+#~ msgstr "toggle" -+ -+#~ msgid "t" -+#~ msgstr "t" -+ -+#~ msgid "pref" -+#~ msgstr "pref" -+ -+#~ msgid "showpref" -+#~ msgstr "showpref" -+ -+#~ msgid "setpref" -+#~ msgstr "setpref" -+ -+#~ msgid "updpref" -+#~ msgstr "updpref" -+ -+#~ msgid "passwd" -+#~ msgstr "passwd" -+ -+#~ msgid "trust" -+#~ msgstr "trust" -+ -+#~ msgid "revsig" -+#~ msgstr "revsig" -+ -+#~ msgid "revuid" -+#~ msgstr "revuid" -+ -+#~ msgid "revkey" -+#~ msgstr "revkey" -+ -+#~ msgid "showphoto" -+#~ msgstr "showphoto" -+ - #~ msgid "%s%c %4u%c/%08lX created: %s expires: %s" - #~ msgstr "%s%c %4u%c/%08lX creada: %s caduca: %s" - -+#~ msgid "rev! subkey has been revoked: %s\n" -+#~ msgstr "rev! la subclau ha estat revocada: %s\n" -+ -+#~ msgid "rev- faked revocation found\n" -+#~ msgstr "rev- s'ha trobat una revocació falsa\n" -+ -+#~ msgid "rev? problem checking revocation: %s\n" -+#~ msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n" -+ -+#~ msgid "" -+#~ "\"\n" -+#~ "locally signed with your key %08lX at %s\n" -+#~ msgstr "" -+#~ "»\n" -+#~ "signat localment amb la vostra clau %08lX el %s\n" -+ -+#~ msgid " signed by %08lX at %s%s%s\n" -+#~ msgstr " signat per %08lX el %s%s%s\n" -+ -+#~ msgid " signed by %08lX at %s%s\n" -+#~ msgstr " signat per %08lX el %s%s\n" -+ - #~ msgid "Notation: " --#~ msgstr "Notaci�: " -+#~ msgstr "Notació: " - - #~ msgid "Policy: " --#~ msgstr "Pol�tica: " -+#~ msgstr "Política: " -+ -+#~ msgid "Experimental algorithms should not be used!\n" -+#~ msgstr "No hauríeu d'usar algoritmes experimentals!\n" -+ -+#~ msgid "" -+#~ "this cipher algorithm is deprecated; please use a more standard one!\n" -+#~ msgstr "" -+#~ "aquest algoritme de xifratge està desaconsellat; useu-ne un de més " -+#~ "estàndard!\n" - - #~ msgid "can't get key from keyserver: %s\n" - #~ msgstr "no s'ha pogut obtenir del servidor la clau: %s\n" - - #~ msgid "error sending to `%s': %s\n" --#~ msgstr "error mentre s'enviava a �%s�: %s\n" -+#~ msgstr "error mentre s'enviava a «%s»: %s\n" - - #~ msgid "success sending to `%s' (status=%u)\n" --#~ msgstr "l'enviament a �%s� ha tingut �xit (status=%u)\n" -+#~ msgstr "l'enviament a «%s» ha tingut èxit (status=%u)\n" - - #~ msgid "failed sending to `%s': status=%u\n" --#~ msgstr "l'enviament a �%s� ha fallat: status=%u\n" -+#~ msgstr "l'enviament a «%s» ha fallat: status=%u\n" - - #~ msgid "this keyserver does not support --search-keys\n" - #~ msgstr "aquest servidor de claus no suporta --search-keys\n" -@@ -6752,7 +6525,7 @@ - #~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " - #~ "signatures!\n" - #~ msgstr "" --#~ "clau %08lX: aquesta �s una clau ElGamal que NO �s segura per a " -+#~ "clau %08lX: aquesta és una clau ElGamal que NO és segura per a " - #~ "signatures!\n" - - #~ msgid "" -@@ -6771,6 +6544,20 @@ - #~ "problemes\n" - #~ "amb el rellotge)\n" - -+#~ msgid "%s: can't access: %s\n" -+#~ msgstr "%s: no s'ha pogut accedir: %s\n" -+ -+# blocatge? ivb -+# yep. jm -+#~ msgid "%s: can't create lock\n" -+#~ msgstr "%s: no s'ha pogut crear el blocatge\n" -+ -+#~ msgid "%s: can't make lock\n" -+#~ msgstr "%s: no s'ha pogut crear el blocatge\n" -+ -+#~ msgid "%s: can't create: %s\n" -+#~ msgstr "%s: no s'ha pogut crear: %s\n" -+ - #~ msgid "key %08lX marked as ultimately trusted\n" - #~ msgstr "s'ha marcat la clau %08lX com confiada absolutament\n" - -@@ -6782,8 +6569,15 @@ - - #~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" - #~ msgstr "" --#~ "s'est� comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%" --#~ "d/%d/%d\n" -+#~ "s'està comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/" -+#~ "%d/%d\n" -+ -+#~ msgid "%s: can't create directory: %s\n" -+#~ msgstr "%s: no s'ha pogut crear el directori: %s\n" -+ -+#~ msgid "If you want to use this revoked key anyway, answer \"yes\"." -+#~ msgstr "" -+#~ "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu «sí»." - - #~ msgid "" - #~ "Select the algorithm to use.\n" -@@ -6810,30 +6604,27 @@ - #~ msgstr "" - #~ "Seleccioneu l'algoritme a utilitzar.\n" - #~ "\n" --#~ "DSA (tamb� conegut com a DSS) �s el algorisme de signatura digital " --#~ "que nom�s\n" --#~ "pot ser utilitzat per a signatures. Aquest �s el algoritme suggerit " --#~ "perqu�\n" --#~ "la comprovaci� de signatures DSA �s molt m�s r�pida que les " --#~ "d'ElGamal.\n" -+#~ "DSA (també conegut com a DSS) és el algorisme de signatura digital que " -+#~ "només\n" -+#~ "pot ser utilitzat per a signatures. Aquest és el algoritme suggerit " -+#~ "perquè\n" -+#~ "la comprovació de signatures DSA és molt més ràpida que les d'ElGamal.\n" - #~ "\n" --#~ "ElGamal �s un algorisme que es pot utilitzar per a signatures i " -+#~ "ElGamal és un algorisme que es pot utilitzar per a signatures i " - #~ "xifratge.\n" --#~ "OpenPGP distingueix entre 2 variants d'aquest algorisme: una de nom�s " -+#~ "OpenPGP distingueix entre 2 variants d'aquest algorisme: una de només " - #~ "xifratge\n" --#~ "i una de signatura+xifratge; en veritat �s el mateix, per� alguns " --#~ "par�metres\n" --#~ "han de seleccionar-se d'una manera especial per a crear claus m�s " -+#~ "i una de signatura+xifratge; en veritat és el mateix, però alguns " -+#~ "paràmetres\n" -+#~ "han de seleccionar-se d'una manera especial per a crear claus més " - #~ "segures\n" --#~ "per a signatures: aquest programa fa a��, per� altres " --#~ "implementacions\n" -+#~ "per a signatures: aquest programa fa açò, però altres implementacions\n" - #~ "d'OpenPGP no estan obligades a entendre la variant signatura+xifratge.\n" - #~ "\n" --#~ "La primera clau (prim�ria) ha de ser sempre una clau que siga capa� " --#~ "de signar;\n" --#~ "aquesta �s la ra� per la qual la clau de nom�s xifratge ElGamal no " --#~ "est�\n" --#~ "disponible en aquest men�." -+#~ "La primera clau (primària) ha de ser sempre una clau que siga capaç de " -+#~ "signar;\n" -+#~ "aquesta és la raó per la qual la clau de només xifratge ElGamal no està\n" -+#~ "disponible en aquest menú." - - #~ msgid "" - #~ "Although these keys are defined in RFC2440 they are not suggested\n" -@@ -6841,8 +6632,8 @@ - #~ "with them are quite large and very slow to verify." - #~ msgstr "" - #~ "Encara que aquestes claus estan definides en RFC2440, no es recomanen\n" --#~ "perqu� no tots els programes hi poden treballar i perqu� les\n" --#~ "signatures que generen s�n molt llargues i lentes de verificar." -+#~ "perquè no tots els programes hi poden treballar i perquè les\n" -+#~ "signatures que generen són molt llargues i lentes de verificar." - - #~ msgid "%lu keys so far checked (%lu signatures)\n" - #~ msgstr "fins ara s'han comprovat %lu claus (%lu signature)\n" -@@ -6851,7 +6642,19 @@ - #~ msgstr "clau incompleta\n" - - #~ msgid "key %08lX incomplete\n" --#~ msgstr "la clau %08lX �s incompleta\n" -+#~ msgstr "la clau %08lX és incompleta\n" -+ -+#~ msgid "sorry, can't do this in batch mode\n" -+#~ msgstr "no es pot fet això en mode desatès\n" -+ -+#~ msgid "can't open file: %s\n" -+#~ msgstr "no es pot obrir el fitxer: %s\n" -+ -+#~ msgid "error: missing colon\n" -+#~ msgstr "error: falten dos punts\n" -+ -+#~ msgid "error: no ownertrust value\n" -+#~ msgstr "error: no hi ha cap valor de confiança\n" - - #~ msgid " (%d) ElGamal (sign and encrypt)\n" - #~ msgstr " (%d) ElGamal (signar i xifrar)\n" -@@ -6862,46 +6665,44 @@ - #~ "also\n" - #~ "very slow, and may not be as secure as the other choices.\n" - #~ msgstr "" --#~ "L'�s d'aquest algorisme nom�s est� suportat per GnuPG. No podreu " -+#~ "L'ús d'aquest algorisme només està suportat per GnuPG. No podreu " - #~ "utilitzar aquesta clau per a comunicar-vos amb usuaris de PGP. Aquest " --#~ "algorisme tamb� �s molt lent, i potser no �s tan segur com les " --#~ "altres alternatives.\n" -+#~ "algorisme també és molt lent, i potser no és tan segur com les altres " -+#~ "alternatives.\n" - - #~ msgid "Create anyway? " - #~ msgstr "Voleu crear la clau de tota manera? " - - #~ msgid "invalid symkey algorithm detected (%d)\n" --#~ msgstr "algoritme de clau sim�tric inv�lid detectat (%d)\n" -+#~ msgstr "algoritme de clau simètric invàlid detectat (%d)\n" - - #~ msgid "this keyserver is not fully HKP compatible\n" --#~ msgstr "aquest servidor de clau no �s completament compatible amb HKP\n" -+#~ msgstr "aquest servidor de clau no és completament compatible amb HKP\n" - - #~ msgid "The use of this algorithm is deprecated - create anyway? " - #~ msgstr "" --#~ "L'�s d'aquest algoritme est� desaconsellat - el voleu crear " --#~ "igualment? " -+#~ "L'ús d'aquest algoritme està desaconsellat - el voleu crear igualment? " - - #~ msgid "|NAME=VALUE|use this notation data" --#~ msgstr "|NOM=VALOR|usa aquesta notaci� de dades" -+#~ msgstr "|NOM=VALOR|usa aquesta notació de dades" - - #~ msgid "" - #~ "the first character of a notation name must be a letter or an underscore\n" - #~ msgstr "" --#~ "el primer car�cter de la notaci� ha de ser una lletra o un " --#~ "subratllat\n" -+#~ "el primer caràcter de la notació ha de ser una lletra o un subratllat\n" - - #~ msgid "dots in a notation name must be surrounded by other characters\n" --#~ msgstr "els punts han d'estar envoltats per altres car�cters\n" -+#~ msgstr "els punts han d'estar envoltats per altres caràcters\n" - - #~ msgid "" - #~ "WARNING: This key already has a photo ID.\n" - #~ " Adding another photo ID may confuse some versions of PGP.\n" - #~ msgstr "" --#~ "AV�S: Aquesta clau ja te un photo ID.\n" -+#~ "AVÃS: Aquesta clau ja te un photo ID.\n" - #~ " Afegir un altre photo ID pot confondre algunes versions de PGP.\n" - - #~ msgid "You may only have one photo ID on a key.\n" --#~ msgstr "Nom�s podeu tenir un photo ID en una clau.\n" -+#~ msgstr "Només podeu tenir un photo ID en una clau.\n" - - #~ msgid " Fingerprint:" - #~ msgstr " Empremta digital:" -@@ -6911,13 +6712,13 @@ - #~ "heu d'executar GnuPG de nou per que puga llegir el nou fitxer d'opcions\n" - - #~ msgid "changing permission of `%s' failed: %s\n" --#~ msgstr "no s'han pogut canviar els permissos de �%s�: %s\n" -+#~ msgstr "no s'han pogut canviar els permissos de «%s»: %s\n" - - #~ msgid "too many random bits requested; the limit is %d\n" --#~ msgstr "massa bits aleatoris sol�licitats; el l�mit �s %d\n" -+#~ msgstr "massa bits aleatoris sol·licitats; el límit és %d\n" - - #~ msgid "|[NAMES]|check the trust database" --#~ msgstr "|[NOMS]|comprova la base de dades de confian�a" -+#~ msgstr "|[NOMS]|comprova la base de dades de confiança" - - #~ msgid "--delete-secret-key user-id" - #~ msgstr "--delete-secret-key user-id" -@@ -6929,7 +6730,7 @@ - #~ msgstr "--delete-secret-and-public-key user-id" - - #~ msgid "For info see http://www.gnupg.org" --#~ msgstr "Si voleu m�s informaci� vegeu http://www.gnupg.org" -+#~ msgstr "Si voleu més informació vegeu http://www.gnupg.org" - - #~ msgid "sSmMqQ" - #~ msgstr "sSmMqQ" -@@ -6939,43 +6740,40 @@ - #~ "can assign some missing owner trust values.\n" - #~ "\n" - #~ msgstr "" --#~ "No s'ha trobat un cam� de confian�a v�lid a la clau. Vegem si " --#~ "podem\n" --#~ "assignar valors de confian�a no assignats.\n" -+#~ "No s'ha trobat un camí de confiança vàlid a la clau. Vegem si podem\n" -+#~ "assignar valors de confiança no assignats.\n" - #~ "\n" - - #~ msgid "" - #~ "No path leading to one of our keys found.\n" - #~ "\n" - #~ msgstr "" --#~ "No s'ha trobat un cam� que condueixe a una de les nostres claus.\n" -+#~ "No s'ha trobat un camí que condueixe a una de les nostres claus.\n" - #~ "\n" - - #~ msgid "" - #~ "No certificates with undefined trust found.\n" - #~ "\n" - #~ msgstr "" --#~ "No s'han trobat certificats amb confian�a no definida.\n" -+#~ "No s'han trobat certificats amb confiança no definida.\n" - #~ "\n" - - #~ msgid "" - #~ "No trust values changed.\n" - #~ "\n" - #~ msgstr "" --#~ "No s'ha canviat cap valor de confian�a.\n" -+#~ "No s'ha canviat cap valor de confiança.\n" - #~ "\n" - - #~ msgid "%08lX: no info to calculate a trust probability\n" - #~ msgstr "" --#~ "%08lX: no hi ha informaci� per a calcular una probabilitat de " --#~ "confian�a\n" -+#~ "%08lX: no hi ha informació per a calcular una probabilitat de confiança\n" - - #~ msgid "skipped: public key already set with --encrypt-to\n" --#~ msgstr "" --#~ "es descarta: la clau p�blica ja s'ha especificat amb --encrypt-to\n" -+#~ msgstr "es descarta: la clau pública ja s'ha especificat amb --encrypt-to\n" - - #~ msgid "%s: error checking key: %s\n" --#~ msgstr "%s: error en la comprovaci� de la clau: %s\n" -+#~ msgstr "%s: error en la comprovació de la clau: %s\n" - - #~ msgid "Do you really want to create a sign and encrypt key? " - #~ msgstr "Segur que voleu crear una clau de signatura i xifratge? " -@@ -6991,19 +6789,19 @@ - - #~ msgid "too many entries in unk cache - disabled\n" - #~ msgstr "" --#~ "massa entrades en la mem�ria cau de claus desconegudes - desactivada\n" -+#~ "massa entrades en la memòria cau de claus desconegudes - desactivada\n" - - #~ msgid "secret key %08lX not imported (use %s to allow for it)\n" - #~ msgstr "clau secreta %08lX no importada (utilitzeu %s per a permitir-ho)\n" - - #~ msgid "key %08lX: our copy has no self-signature\n" --#~ msgstr "clau %08lX: la nostra c�pia no t� autosignatura\n" -+#~ msgstr "clau %08lX: la nostra còpia no té autosignatura\n" - - #~ msgid "%s: user not found\n" - #~ msgstr "%s: no s'ha trobat l'usuari\n" - - #~ msgid "assuming bad MDC due to an unknown critical bit\n" --#~ msgstr "es suposa MDC erroni a causa d'un bit cr�tic desconegut\n" -+#~ msgstr "es suposa MDC erroni a causa d'un bit crític desconegut\n" - - #~ msgid "error reading dir record for LID %lu: %s\n" - #~ msgstr "error al llegir el registre de directori per al LID %lu: %s\n" -@@ -7012,63 +6810,63 @@ - #~ msgstr "lid %lu: s'esperava registre de directori, s'ha obtingut %d\n" - - #~ msgid "no primary key for LID %lu\n" --#~ msgstr "no hi ha una clau prim�ria per al LID %lu\n" -+#~ msgstr "no hi ha una clau primària per al LID %lu\n" - - #~ msgid "error reading primary key for LID %lu: %s\n" --#~ msgstr "error al llegir clau prim�ria per al LID %lu: %s\n" -+#~ msgstr "error al llegir clau primària per al LID %lu: %s\n" - - #~ msgid "key %08lX: query record failed\n" - #~ msgstr "clau %08lX: la consulta del registre ha fallat\n" - - #~ msgid "key %08lX: already in trusted key table\n" --#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian�a\n" -+#~ msgstr "clau %08lX: ja es troba en la taula de claus de confiança\n" - - #~ msgid "NOTE: secret key %08lX is NOT protected.\n" --#~ msgstr "NOTE: la clau secreta %08lX no est� protegida.\n" -+#~ msgstr "NOTE: la clau secreta %08lX no està protegida.\n" - - #~ msgid "key %08lX: secret and public key don't match\n" --#~ msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n" -+#~ msgstr "clau %08lX: les claus pública i secreta no coincideixen\n" - - #~ msgid "key %08lX.%lu: Good subkey binding\n" --#~ msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n" -+#~ msgstr "clau %08lX.%lu: Enllaç de subclau correcta\n" - - #~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n" --#~ msgstr "clau %08lX.%lu: Enlla� de subclau inv�lid: %s\n" -+#~ msgstr "clau %08lX.%lu: Enllaç de subclau invàlid: %s\n" - - #~ msgid "key %08lX.%lu: Valid key revocation\n" --#~ msgstr "clau %08lX.%lu: Revocaci� de clau v�lida\n" -+#~ msgstr "clau %08lX.%lu: Revocació de clau vàlida\n" - - #~ msgid "key %08lX.%lu: Invalid key revocation: %s\n" --#~ msgstr "clau %08lX.%lu: Revocaci� de clau inv�lida: %s\n" -+#~ msgstr "clau %08lX.%lu: Revocació de clau invàlida: %s\n" - - #~ msgid "Good self-signature" - #~ msgstr "Auto-signatura correcta" - - #~ msgid "Invalid self-signature" --#~ msgstr "Auto-signatura inv�lida" -+#~ msgstr "Auto-signatura invàlida" - - #~ msgid "Valid user ID revocation skipped due to a newer self signature" - #~ msgstr "" --#~ "Es descarta una revocaci� d'ID d'usuari v�lida degut a una " --#~ "autosignatura m�s recent" -+#~ "Es descarta una revocació d'ID d'usuari vàlida degut a una autosignatura " -+#~ "més recent" - - #~ msgid "Valid user ID revocation" --#~ msgstr "Revocaci� d'ID d'usuari v�lida" -+#~ msgstr "Revocació d'ID d'usuari vàlida" - - #~ msgid "Invalid user ID revocation" --#~ msgstr "Revocaci� d'ID d'usuari inv�lida" -+#~ msgstr "Revocació d'ID d'usuari invàlida" - - #~ msgid "Valid certificate revocation" --#~ msgstr "Certificat de revocaci� v�lid" -+#~ msgstr "Certificat de revocació vàlid" - - #~ msgid "Good certificate" - #~ msgstr "Certificat correcte" - - #~ msgid "Invalid certificate revocation" --#~ msgstr "Certificat de revocaci� inv�lid" -+#~ msgstr "Certificat de revocació invàlid" - - #~ msgid "Invalid certificate" --#~ msgstr "Certificat inv�lid" -+#~ msgstr "Certificat invàlid" - - #~ msgid "sig record %lu[%d] points to wrong record.\n" - #~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n" -@@ -7080,10 +6878,10 @@ - #~ msgstr "tdbio_search_dir ha fallat: %s\n" - - #~ msgid "lid ?: insert failed: %s\n" --#~ msgstr "lid ?: la inserci� ha fallat: %s\n" -+#~ msgstr "lid ?: la inserció ha fallat: %s\n" - - #~ msgid "lid %lu: insert failed: %s\n" --#~ msgstr "lid %lu: la inserci� ha fallat: %s\n" -+#~ msgstr "lid %lu: la inserció ha fallat: %s\n" - - #~ msgid "lid %lu: inserted\n" - #~ msgstr "lid %lu: inserit\n" -@@ -7098,7 +6896,7 @@ - #~ msgstr "lid %lu: registre de directori sense clau - es descarta\n" - - #~ msgid "\t%lu due to new pubkeys\n" --#~ msgstr "\\t%lu degut a noves claus p�bliques\n" -+#~ msgstr "\\t%lu degut a noves claus públiques\n" - - #~ msgid "\t%lu keys skipped\n" - #~ msgstr "\t%lu claus es descarta\n" -@@ -7117,11 +6915,10 @@ - - #~ msgid "key %08lX: insert trust record failed: %s\n" - #~ msgstr "" --#~ "clau %08lX: ha fallat la inserci� en la base de dades de confian�a: %" --#~ "s\n" -+#~ "clau %08lX: ha fallat la inserció en la base de dades de confiança: %s\n" - - #~ msgid "key %08lX.%lu: inserted into trustdb\n" --#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian�a\n" -+#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confiança\n" - - #~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" - #~ msgstr "" -@@ -7132,30 +6929,26 @@ - #~ msgstr "clau %08lX.%lu: caducada el %s\n" - - #~ msgid "key %08lX.%lu: trust check failed: %s\n" --#~ msgstr "clau %08lX.%lu: ha fallat la verificaci� de confian�a: %s\n" -+#~ msgstr "clau %08lX.%lu: ha fallat la verificació de confiança: %s\n" - - #~ msgid "problem finding '%s' in trustdb: %s\n" --#~ msgstr "" --#~ "problema al cercar �%s� en la base de dades de confian�a: %s\n" -+#~ msgstr "problema al cercar «%s» en la base de dades de confiança: %s\n" - - #~ msgid "user '%s' not in trustdb - inserting\n" - #~ msgstr "" --#~ "l'usuari �%s� no est� en la base de dades de confian�a - inserint-" --#~ "lo\n" -+#~ "l'usuari «%s» no està en la base de dades de confiança - inserint-lo\n" - - #~ msgid "failed to put '%s' into trustdb: %s\n" --#~ msgstr "" --#~ "no s'ha pogut posar �%s� en la base de dades de confian�a - %s\n" -+#~ msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n" - - #~ msgid "WARNING: can't yet handle long pref records\n" --#~ msgstr "" --#~ "AV�S: encara no es poden manejar registres de pref�ncies llargs\n" -+#~ msgstr "AVÃS: encara no es poden manejar registres de prefències llargs\n" - - #~ msgid "%s: can't create keyring: %s\n" - #~ msgstr "%s: no s'ha creat l'anell: %s\n" - - #~ msgid "RSA key cannot be used in this version\n" --#~ msgstr "No es poden usar claus RSA en aquesta versi�\n" -+#~ msgstr "No es poden usar claus RSA en aquesta versió\n" - - #~ msgid "No key for user ID\n" - #~ msgstr "No hi ha clau per a l'usuari\n" -@@ -7164,7 +6957,7 @@ - #~ msgstr "No hi ha usuari per a la clau\n" - - #~ msgid "invalid" --#~ msgstr "inv�lida" -+#~ msgstr "invàlida" - - #~ msgid "no secret key for decryption available\n" - #~ msgstr "no hi ha clau secreta disponible per al desxifratge\n" diff --git a/packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch b/packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch deleted file mode 100644 index 8343fc0281..0000000000 --- a/packages/gnupg/gnupg-1.4.0/21_strgutil_update.patch +++ /dev/null @@ -1,200 +0,0 @@ ---- gnupg-1.4.0/util/strgutil.c 2004-11-17 15:50:58.000000000 +0000 -+++ /tmp/dpep.GtChya/gnupg-1.4.0/util/strgutil.c 2005-02-05 00:53:22.921264222 +0000 -@@ -1,6 +1,6 @@ - /* strgutil.c - string utilities - * Copyright (C) 1994, 1998, 1999, 2000, 2001, -- * 2003 Free Software Foundation, Inc. -+ * 2003, 2004, 2005 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * -@@ -144,6 +144,8 @@ - { - log_info (_("error loading `%s': %s\n"), - "iconv.dll", dlerror ()); -+ log_info(_("please see http://www.gnupg.org/download/iconv.html " -+ "for more information\n")); - iconv_open = NULL; - iconv = NULL; - iconv_close = NULL; -@@ -451,10 +453,33 @@ - handle_iconv_error (const char *to, const char *from, int use_fallback) - { - if (errno == EINVAL) -- log_error (_("conversion from `%s' to `%s' not available\n"), -- from, to); -+ { -+ static int shown1, shown2; -+ int x; -+ -+ if (to && !strcmp (to, "utf-8")) -+ { -+ x = shown1; -+ shown1 = 1; -+ } -+ else -+ { -+ x = shown2; -+ shown2 = 1; -+ } -+ -+ if (!x) -+ log_info (_("conversion from `%s' to `%s' not available\n"), -+ from, to); -+ } - else -- log_error (_("iconv_open failed: %s\n"), strerror (errno)); -+ { -+ static int shown; -+ -+ if (!shown) -+ log_info (_("iconv_open failed: %s\n"), strerror (errno)); -+ shown = 1; -+ } - - if (use_fallback) - { -@@ -479,28 +504,78 @@ - if (!newset) { - #ifdef _WIN32 - static char codepage[30]; -+ unsigned int cpno; -+ const char *aliases; - - /* We are a console program thus we need to use the -- GetConsoleOutputCP fucntion and not the the GetACP which -+ GetConsoleOutputCP function and not the the GetACP which - would give the codepage for a GUI program. Note this is - not a bulletproof detection because GetConsoleCP might -- retrun a different one for console input. Not sure how to -- cope with that. */ -- sprintf (codepage, "CP%u", (unsigned int)GetConsoleOutputCP ()); -- /* If it is the Windows name for Latin-1 we use the standard -- name instead to avoid loading of iconv.dll. Unfortunately -- it is often CP850 and we don't have a custom translation -- for it. */ -- if (!strcmp (codepage, "CP1252")) -- newset = "iso-8859-1"; -- else -- newset = codepage; -+ return a different one for console input. Not sure how to -+ cope with that. If the console Code page is not known we -+ fall back to the system code page. */ -+ cpno = GetConsoleOutputCP (); -+ if (!cpno) -+ cpno = GetACP (); -+ sprintf (codepage, "CP%u", cpno ); -+ /* Resolve alias. We use a long string string and not the -+ usual array to optimize if the code is taken to a DSO. -+ Taken from libiconv 1.9.2. */ -+ newset = codepage; -+ for (aliases = ("CP936" "\0" "GBK" "\0" -+ "CP1361" "\0" "JOHAB" "\0" -+ "CP20127" "\0" "ASCII" "\0" -+ "CP20866" "\0" "KOI8-R" "\0" -+ "CP21866" "\0" "KOI8-RU" "\0" -+ "CP28591" "\0" "ISO-8859-1" "\0" -+ "CP28592" "\0" "ISO-8859-2" "\0" -+ "CP28593" "\0" "ISO-8859-3" "\0" -+ "CP28594" "\0" "ISO-8859-4" "\0" -+ "CP28595" "\0" "ISO-8859-5" "\0" -+ "CP28596" "\0" "ISO-8859-6" "\0" -+ "CP28597" "\0" "ISO-8859-7" "\0" -+ "CP28598" "\0" "ISO-8859-8" "\0" -+ "CP28599" "\0" "ISO-8859-9" "\0" -+ "CP28605" "\0" "ISO-8859-15" "\0"); -+ *aliases; -+ aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) -+ { -+ if (!strcmp (codepage, aliases) ||(*aliases == '*' && !aliases[1])) -+ { -+ newset = aliases + strlen (aliases) + 1; -+ break; -+ } -+ } -+ - #else - #ifdef HAVE_LANGINFO_CODESET - newset = nl_langinfo (CODESET); --#else -- newset = "iso-8859-1"; --#endif -+#else /* !HAVE_LANGINFO_CODESET */ -+ /* Try to get the used charset from environment variables. */ -+ static char codepage[30]; -+ const char *lc, *dot, *mod; -+ -+ strcpy (codepage, "iso-8859-1"); -+ lc = getenv ("LC_ALL"); -+ if (!lc || !*lc) { -+ lc = getenv ("LC_CTYPE"); -+ if (!lc || !*lc) -+ lc = getenv ("LANG"); -+ } -+ if (lc && *lc) { -+ dot = strchr (lc, '.'); -+ if (dot) { -+ mod = strchr (++dot, '@'); -+ if (!mod) -+ mod = dot + strlen (dot); -+ if (mod - dot < sizeof codepage && dot != mod) { -+ memcpy (codepage, dot, mod - dot); -+ codepage [mod - dot] = 0; -+ } -+ } -+ } -+ newset = codepage; -+#endif /* !HAVE_LANGINFO_CODESET */ - #endif - } - -@@ -511,9 +586,18 @@ - newset++; - } - -+ /* Note that we silently assume that plain ASCII is actually meant -+ as Latin-1. This makes sense because many Unix system don't -+ have their locale set up properly and thus would get annoying -+ error messages and we have to handle all the "bug" -+ reports. Latin-1 has always been the character set used for 8 -+ bit characters on Unix systems. */ - if( !*newset - || !ascii_strcasecmp (newset, "8859-1" ) -- || !ascii_strcasecmp (newset, "8859-15" ) ) { -+ || !ascii_strcasecmp (newset, "646" ) -+ || !ascii_strcasecmp (newset, "ASCII" ) -+ || !ascii_strcasecmp (newset, "ANSI_X3.4-1968" ) -+ ) { - active_charset_name = "iso-8859-1"; - no_translation = 0; - active_charset = NULL; -@@ -645,8 +729,12 @@ - if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes, - &outptr, &outbytes) == (size_t)-1) - { -- log_error (_("conversion from `%s' to `%s' failed: %s\n"), -- active_charset_name, "utf-8", strerror (errno)); -+ static int shown; -+ -+ if (!shown) -+ log_info (_("conversion from `%s' to `%s' failed: %s\n"), -+ active_charset_name, "utf-8", strerror (errno)); -+ shown = 1; - /* We don't do any conversion at all but use the strings as is. */ - strcpy (buffer, string); - } -@@ -919,8 +1007,12 @@ - outbuf = outptr = m_alloc (outbytes); - if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes, - &outptr, &outbytes) == (size_t)-1) { -- log_error (_("conversion from `%s' to `%s' failed: %s\n"), -- "utf-8", active_charset_name, strerror (errno)); -+ static int shown; -+ -+ if (!shown) -+ log_info (_("conversion from `%s' to `%s' failed: %s\n"), -+ "utf-8", active_charset_name, strerror (errno)); -+ shown = 1; - /* Didn't worked out. Temporary disable the use of - * iconv and fall back to our old code. */ - m_free (buffer); diff --git a/packages/gnupg/gnupg2.inc b/packages/gnupg/gnupg2.inc deleted file mode 100644 index d362981f3c..0000000000 --- a/packages/gnupg/gnupg2.inc +++ /dev/null @@ -1,77 +0,0 @@ -SECTION = "console/utils" -DESCRIPTION = "gnupg - GNU privacy guard - development version" -HOMEPAGE = "http://www.gnupg.org/" -LICENSE = "GPLv2" -# DEPENDS = "zlib libgpg-error libgcrypt libassuan ksba opensc" -DEPENDS = "zlib libgpg-error libgcrypt libassuan" - -inherit autotools gettext - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-${PV}.tar.bz2" -S = "${WORKDIR}/gnupg-${PV}" -libexecdir := "${libexecdir}/gnupg2" -FILES_${PN} += "${datadir}/gnupg" - -# NOTE: gpgsm and scdaemon binaries aren't buildable if you dont have libksba. -CL -# --with-ksba-prefix=${STAGING_LIBDIR}/.. - -# NOTE: opensc is needed by the scdaemon binary. if you don't have opensc, it can -# only build a limited scdaemon. -CL -# --with-opensc-prefix=${STAGING_LIBDIR}/.. - -# NOTE: given those facts, the current build will disable scdaemon and gpgsm. -# Threads are disabled currently to avoid the pth dependency. -CL - -EXTRA_OECONF = "--disable-ldap \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --disable-threads \ - --disable-gpgsm \ - --disable-scdaemon" - -# Bypass the tests -EXTRA_OEMAKE += "'TESTS_ENVIRONMENT=/bin/true'" - -# --disable-gpg do not build the gpg program -# --disable-gpgsm do not build the gpgsm program -# --disable-agent do not build the agent program -# --disable-scdaemon do not build the scdaemon program -# --enable-agent-only build only the gpg-agent -# --disable-exec disable all external program execution -# --disable-photo-viewers disable photo ID viewers -# --disable-keyserver-helpers disable all external keyserver support -# --disable-ldap disable LDAP keyserver interface -# --disable-hkp disable HKP keyserver interface -# --disable-mailto disable email keyserver interface -# --disable-keyserver-path disable the exec-path option for keyserver helpers -# --disable-largefile omit support for large files -# --disable-threads allow building without Pth support -# --disable-dns-srv disable the use of DNS SRV in HKP -# --disable-nls do not use Native Language Support -# --disable-rpath do not hardcode runtime library paths -# --disable-regex do not handle regular expressions in trust sigs -# --with-agent-pgm=PATH Use PATH as the default for the agent) -# --with-pinentry-pgm=PATH Use PATH as the default for the pinentry) -# --with-scdaemon-pgm=PATH Use PATH as the default for the scdaemon) -# --with-dirmngr-pgm=PATH Use PATH as the default for the dirmngr) -# --with-protect-tool-pgm=PATH Use PATH as the default for the protect-tool) -# --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer -# --with-capabilities use linux capabilities default=no -# --with-gpg-error-prefix=PFX -# prefix where GPG Error is installed (optional) -# --with-libgcrypt-prefix=PFX -# prefix where LIBGCRYPT is installed (optional) -# --with-libassuan-prefix=PFX -# prefix where LIBASSUAN is installed (optional) -# --with-ksba-prefix=PFX prefix where KSBA is installed (optional) -# --with-opensc-prefix=PFX -# prefix where OpenSC is installed (optional) -# --with-pth-prefix=PFX prefix where GNU Pth is installed (optional) -# --with-mailprog=NAME use "NAME -t" for mail transport -# --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -# --without-libiconv-prefix don't search for libiconv in includedir and libdir -# --with-included-gettext use the GNU gettext library included here -# --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib -# --without-libintl-prefix don't search for libintl in includedir and libdir -# --with-included-regex use the included GNU regex library -# --with-zlib=DIR use libz in DIR -# --with-pkits-tests run the PKITS based tests diff --git a/packages/gnupg/gnupg2_1.9.15.bb b/packages/gnupg/gnupg2_1.9.15.bb deleted file mode 100644 index 39de9c6d51..0000000000 --- a/packages/gnupg/gnupg2_1.9.15.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gnupg2.inc - -PR = "r3" -- cgit v1.2.3 From 36bb6e7a294f1643dd10fe4df91282d2e781c027 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 31 Mar 2007 12:43:16 +0000 Subject: perl: Add support for armeb-linux-gnueabi (trivial addition) - now configures and compiles, but still doesn't install. --- packages/perl/perl_5.8.7.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 2f37e6ccbe..b9a62e79c9 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -44,6 +44,7 @@ do_configure() { cp ${WORKDIR}/config.sh-sh4-linux . #perl insists on an extra config.sh for arm EABI cp config.sh-arm-linux config.sh-arm-linux-gnueabi + cp config.sh-armeb-linux config.sh-armeb-linux-gnueabi # nslu2 LE uclibc builds do not work with the default config.sh if test "${MACHINE}" = nslu2 then -- cgit v1.2.3 From 7ad28a62e2fb024ce6a94fa3a6ac0f219c1558dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 07:48:15 +0000 Subject: initscripts: fix checkroot and remove angstrom specific checkroot --- .../initscripts-1.0/angstrom/.mtn2git_empty | 0 .../initscripts-1.0/angstrom/checkroot.sh | 201 --------------------- packages/initscripts/initscripts-1.0/checkroot.sh | 2 +- packages/initscripts/initscripts_1.0.bb | 2 +- 4 files changed, 2 insertions(+), 203 deletions(-) delete mode 100644 packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty delete mode 100755 packages/initscripts/initscripts-1.0/angstrom/checkroot.sh (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty b/packages/initscripts/initscripts-1.0/angstrom/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh b/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh deleted file mode 100755 index e5fc6ed8b5..0000000000 --- a/packages/initscripts/initscripts-1.0/angstrom/checkroot.sh +++ /dev/null @@ -1,201 +0,0 @@ -# -# checkroot.sh Check to root filesystem. -# -# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl -# - -. /etc/default/rcS - -# -# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned -# from this script *before anything else* with a timeout, like SCO does. -# -test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE - -# -# Ensure that bdflush (update) is running before any major I/O is -# performed (the following fsck is a good example of such activity :). -# -test -x /sbin/update && update - -# -# Read /etc/fstab. -# -exec 9>&0 &9 9>&- - -# -# Activate the swap device(s) in /etc/fstab. This needs to be done -# before fsck, since fsck can be quite memory-hungry. -# -doswap=no -test -d /proc/1 || mount -n /proc -case "`uname -r`" in - 2.[0123].*) - if test $swap_on_md = yes && grep -qs resync /proc/mdstat - then - test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" - else - doswap=yes - fi - ;; - *) - doswap=yes - ;; -esac -if test $doswap = yes -then - test "$VERBOSE" != no && echo "Activating swap" - swapon -a 2> /dev/null -fi - -# -# Check the root filesystem. -# -if test -f /fastboot || test $rootcheck = no -then - test $rootcheck = yes && echo "Fast boot, no filesystem check" -else - # - # Ensure that root is quiescent and read-only before fsck'ing. - # - mount -n -o remount,ro / - if test $? = 0 - then - if test -f /forcefsck - then - force="-f" - else - force="" - fi - if test "$FSCKFIX" = yes - then - fix="-y" - else - fix="-a" - fi - spinner="-C" - case "$TERM" in - dumb|network|unknown|"") spinner="" ;; - esac - test `uname -m` = s390 && spinner="" # This should go away - test "$VERBOSE" != no && echo "Checking root filesystem..." - fsck $spinner $force $fix / - # - # If there was a failure, drop into single-user mode. - # - # NOTE: "failure" is defined as exiting with a return code of - # 2 or larger. A return code of 1 indicates that filesystem - # errors were corrected but that the boot may proceed. - # - if test "$?" -gt 1 - then - # Surprise! Re-directing from a HERE document (as in - # "cat << EOF") won't work, because the root is read-only. - echo - echo "fsck failed. Please repair manually and reboot. Please note" - echo "that the root filesystem is currently mounted read-only. To" - echo "remount it read-write:" - echo - echo " # mount -n -o remount,rw /" - echo - echo "CONTROL-D will exit from this shell and REBOOT the system." - echo - # Start a single user shell on the console - /sbin/sulogin $CONSOLE - reboot -f - fi - else - echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" - echo - fi -fi - -# -# If the root filesystem was not marked as read-only in /etc/fstab, -# remount the rootfs rw but do not try to change mtab because it -# is on a ro fs until the remount succeeded. Then clean up old mtabs -# and finally write the new mtab. -# This part is only needed if the rootfs was mounted ro. -# - -if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then - exit 0 -fi - - -echo "Remounting root file system..." -mount -n -o remount,$rootmode / -if test "$rootmode" = rw -then - if test ! -L /etc/mtab - then - rm -f /etc/mtab~ /etc/nologin - : > /etc/mtab - fi - mount -f -o remount / - mount -f /proc - test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" -fi - -: exit 0 diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index 8a02aa7b58..f3b8a0cd45 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -193,7 +193,7 @@ ROOTFSDEV="/dev/root" if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then ROOTFSDEV="rootfs" fi -if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then +if [ x$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = "xrw" ]; then echo "Root filesystem already read-write, not remounting" exit 0 fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 33cbf9ca03..83c753d3da 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r87" +PR = "r88" SRC_URI = "file://halt \ file://ramdisk \ -- cgit v1.2.3 From a766c449f0c96073657a3eadb7c47a4fef7bfa79 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 07:48:47 +0000 Subject: gpsd: disable python bindings --- packages/gpsd/gpsd.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 1f48fe0052..ffd314d2e8 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -6,7 +6,8 @@ DEPENDS = "dbus-glib ncurses" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --enable-dbus" + --enable-dbus \ + --disable-python " SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gpsd" -- cgit v1.2.3 From 3129c86f276aa902644bd711c001ccfb444fb8e3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 08:04:29 +0000 Subject: prismstumbler: fix PV --- .../prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb | 40 ++++++++++++++++++++++ packages/prismstumbler/prismstumbler_0.7.4pre1.bb | 38 -------------------- 2 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb delete mode 100644 packages/prismstumbler/prismstumbler_0.7.4pre1.bb (limited to 'packages') diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb new file mode 100644 index 0000000000..44401df7dd --- /dev/null +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -0,0 +1,40 @@ +SECTION = "x11/network" +PR = "r0" + +PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" +DESCRIPTION = "Prismstumbler wireless LAN scanner" +DESCRIPTION_prismstumbler-frontend = "Prismstumbler wireless LAN scanner GTK frontend" +LICENSE = "GPL" +DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd" +RDEPENDS = "wireless-tools" +RRECOMMENDS = "gpsd" + +SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz" + +S = "${WORKDIR}/${PN}-0.7.4pre1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --with-libgps=${STAGING_DIR}/${HOST_SYS} \ + --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-sqlite-includes=${STAGING_INCDIR} \ + --with-sqlite-libs=${STAGING_LIBDIR} \ + --without-athena --enable-dbus" + +CFLAGS =+ "-I${S}/include" +LDFLAGS += "-lz" + +FILES_${PN} = "${bindir}/prismstumbler" + +FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ + ${datadir}/applications \ + ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \ + ${sysconfdir}" +RDEPENDS_prismstumbler-frontend = "${PN}" + + +do_install_append() { + chmod a+s ${D}${bindir}/prismstumbler +} diff --git a/packages/prismstumbler/prismstumbler_0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.4pre1.bb deleted file mode 100644 index 1cff5d90c6..0000000000 --- a/packages/prismstumbler/prismstumbler_0.7.4pre1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SECTION = "x11/network" -PR = "r0" - -PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" -DESCRIPTION = "Prismstumbler wireless LAN scanner" -DESCRIPTION_prismstumbler-frontend = "Prismstumbler wireless LAN scanner GTK frontend" -LICENSE = "GPL" -DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd" -RDEPENDS = "wireless-tools" -RRECOMMENDS = "gpsd" - -SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-${PV}.tar.gz" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --with-libgps=${STAGING_DIR}/${HOST_SYS} \ - --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ - --with-sqlite-includes=${STAGING_INCDIR} \ - --with-sqlite-libs=${STAGING_LIBDIR} \ - --without-athena --enable-dbus" - -CFLAGS =+ "-I${S}/include" -LDFLAGS += "-lz" - -FILES_${PN} = "${bindir}/prismstumbler" - -FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ - ${datadir}/applications \ - ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \ - ${sysconfdir}" -RDEPENDS_prismstumbler-frontend = "${PN}" - - -do_install_append() { - chmod a+s ${D}${bindir}/prismstumbler -} -- cgit v1.2.3 From 247c43566ded9527eac5d1a6e3c9f2afcf02e5f1 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 1 Apr 2007 08:37:27 +0000 Subject: libgsmd: add interpreter-ready.patch for universal --- packages/gsm/files/interpreter-ready.patch | 47 ++++++++++++++++++++++ .../gsm/files/magician/interpreter-ready.patch | 47 ---------------------- packages/gsm/libgsmd_svn.bb | 1 + 3 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 packages/gsm/files/interpreter-ready.patch delete mode 100644 packages/gsm/files/magician/interpreter-ready.patch (limited to 'packages') diff --git a/packages/gsm/files/interpreter-ready.patch b/packages/gsm/files/interpreter-ready.patch new file mode 100644 index 0000000000..cc6b9c6e2b --- /dev/null +++ b/packages/gsm/files/interpreter-ready.patch @@ -0,0 +1,47 @@ +Index: gsm/include/gsmd/gsmd.h +=================================================================== +--- gsm.orig/include/gsmd/gsmd.h 2007-03-29 17:07:10.000000000 +0200 ++++ gsm/include/gsmd/gsmd.h 2007-03-29 17:07:43.000000000 +0200 +@@ -58,6 +58,7 @@ + + struct gsmd { + unsigned int flags; ++ int interpreter_ready; + struct gsmd_fd gfd_uart; + struct gsmd_fd gfd_sock; + struct llparser llp; +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-03-29 17:06:01.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-03-29 17:08:27.000000000 +0200 +@@ -183,6 +183,7 @@ + * an empty string or that 'ready' string, we need to init the modem */ + if (strlen(buf) == 0 || + !strcmp(buf, "AT-Command Interpreter ready")) { ++ g->interpreter_ready = 1; + gsmd_initsettings(g); + return 0; + } +@@ -372,7 +373,7 @@ + } + + /* write pending commands to UART */ +- if (what & GSMD_FD_WRITE) { ++ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { + struct gsmd_atcmd *pos, *pos2; + llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { + len = strlen(pos->buf); +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-29 17:06:04.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-29 17:08:59.000000000 +0200 +@@ -291,7 +291,8 @@ + + gsmd_vendor_plugin_find(&g); + +- gsmd_initsettings(&g); ++ if (g.interpreter_ready) ++ gsmd_initsettings(&g); + + gsmd_opname_init(&g); + diff --git a/packages/gsm/files/magician/interpreter-ready.patch b/packages/gsm/files/magician/interpreter-ready.patch deleted file mode 100644 index cc6b9c6e2b..0000000000 --- a/packages/gsm/files/magician/interpreter-ready.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: gsm/include/gsmd/gsmd.h -=================================================================== ---- gsm.orig/include/gsmd/gsmd.h 2007-03-29 17:07:10.000000000 +0200 -+++ gsm/include/gsmd/gsmd.h 2007-03-29 17:07:43.000000000 +0200 -@@ -58,6 +58,7 @@ - - struct gsmd { - unsigned int flags; -+ int interpreter_ready; - struct gsmd_fd gfd_uart; - struct gsmd_fd gfd_sock; - struct llparser llp; -Index: gsm/src/gsmd/atcmd.c -=================================================================== ---- gsm.orig/src/gsmd/atcmd.c 2007-03-29 17:06:01.000000000 +0200 -+++ gsm/src/gsmd/atcmd.c 2007-03-29 17:08:27.000000000 +0200 -@@ -183,6 +183,7 @@ - * an empty string or that 'ready' string, we need to init the modem */ - if (strlen(buf) == 0 || - !strcmp(buf, "AT-Command Interpreter ready")) { -+ g->interpreter_ready = 1; - gsmd_initsettings(g); - return 0; - } -@@ -372,7 +373,7 @@ - } - - /* write pending commands to UART */ -- if (what & GSMD_FD_WRITE) { -+ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { - struct gsmd_atcmd *pos, *pos2; - llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { - len = strlen(pos->buf); -Index: gsm/src/gsmd/gsmd.c -=================================================================== ---- gsm.orig/src/gsmd/gsmd.c 2007-03-29 17:06:04.000000000 +0200 -+++ gsm/src/gsmd/gsmd.c 2007-03-29 17:08:59.000000000 +0200 -@@ -291,7 +291,8 @@ - - gsmd_vendor_plugin_find(&g); - -- gsmd_initsettings(&g); -+ if (g.interpreter_ready) -+ gsmd_initsettings(&g); - - gsmd_opname_init(&g); - diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 0b3a29e931..2019185b33 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -11,6 +11,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://default" S = "${WORKDIR}/gsm" +SRC_URI_append_htcuniversal = " file://interpreter-ready.patch;patch=1" SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ file://interpreter-ready.patch;patch=1 \ file://ldisc.patch;patch=1" -- cgit v1.2.3 From 7148110563e09899732ccec1449834f49e2c0d3b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 31 Mar 2007 15:54:11 +0000 Subject: task-slugos: Add altboot --- packages/tasks/task-slugos.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 99b9ea44ae..50e47c8202 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r6" +PR = "r7" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -106,7 +106,7 @@ DEPENDS += "${DISTRO_EXTRA_DEPENDS}" RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ - busybox initscripts-slugos slugos-init \ + busybox initscripts-slugos slugos-init altboot \ update-modules sysvinit tinylogin \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ -- cgit v1.2.3 From 554ee092557dba7a5aee717c161795d1bc004b4f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 09:20:32 +0000 Subject: xserver-kdrive: re-add w100 support --- packages/xorg-xserver/xserver-kdrive-common.inc | 3 ++- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 72c2a87b32..8674a55e21 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -21,7 +21,8 @@ PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-smi \ xserver-kdrive-vesa \ xserver-kdrive-via \ - " + xserver-kdrive-w100 \ + " SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index e6cd3b2f30..cb58eee8a3 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,12 +3,16 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r4" +PR = "r5" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://enable-xcalibrate.patch;patch=1 \ + file://w100.patch;patch=1 \ " - + S = "${WORKDIR}/xorg-server-${PV}" +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + -- cgit v1.2.3 From 0c26aba1747c6ab2b52020baa8a82c6de095ecb0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 09:46:24 +0000 Subject: gpe-login: use xtscal instead of a non-existant script to recalibrate --- packages/gpe-login/files/use-xtscal.patch | 11 +++++++++++ packages/gpe-login/gpe-login_0.88.bb | 18 ++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 packages/gpe-login/files/use-xtscal.patch (limited to 'packages') diff --git a/packages/gpe-login/files/use-xtscal.patch b/packages/gpe-login/files/use-xtscal.patch new file mode 100644 index 0000000000..dca1163505 --- /dev/null +++ b/packages/gpe-login/files/use-xtscal.patch @@ -0,0 +1,11 @@ +--- /tmp/gpe-login.c 2007-04-01 11:40:29.000000000 +0200 ++++ gpe-login-0.88/gpe-login.c 2007-04-01 11:40:58.205251000 +0200 +@@ -59,7 +59,7 @@ + #define GPE_OWNERINFO_DONTSHOW_FILE "/etc/gpe/gpe-ownerinfo.dontshow" + /* Number of milliseconds to hold the stylus down before recalibration is called */ + #define RECALIBRATION_TIMEOUT 5000 +-#define XTSCAL_PATH "/usr/bin/gpe-xcalibrate.sh" ++#define XTSCAL_PATH "/usr/bin/xtscal" + #ifndef DEBUG + #define DEBUG 0 + #endif diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb index ea1723d52d..f42aa4c6a3 100644 --- a/packages/gpe-login/gpe-login_0.88.bb +++ b/packages/gpe-login/gpe-login_0.88.bb @@ -1,13 +1,15 @@ -LICENSE = "GPL" -inherit gpe - DESCRIPTION = "GPE user login screen" SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" -RDEPENDS = "xkbd" -RPROVIDES = "gpe-session-starter" -PR = "r0" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r1" + +inherit gpe SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " +SRC_URI += " file://use-xtscal.patch;patch=1 " + -- cgit v1.2.3 From 3cb20b35af93a7b0df80cd0ae87704c73a8c57dc Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Sun, 1 Apr 2007 10:50:27 +0000 Subject: packages/perl/perl_5.8.7.bb: A set of patches to make perl usable on powerpc targets. Thanks to Jamie Lenahan for the help --- packages/perl/perl-5.8.7/config.sh-powerpc-linux | 68 ++++++++++++------------ packages/perl/perl.inc | 8 +++ packages/perl/perl_5.8.7.bb | 4 +- 3 files changed, 45 insertions(+), 35 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl-5.8.7/config.sh-powerpc-linux b/packages/perl/perl-5.8.7/config.sh-powerpc-linux index 6d41d29e9f..67f7aa3166 100644 --- a/packages/perl/perl-5.8.7/config.sh-powerpc-linux +++ b/packages/perl/perl-5.8.7/config.sh-powerpc-linux @@ -53,10 +53,10 @@ byteorder='4321' c='\c' castflags='0' cat='cat' -cc='cc' +cc='gcc' cccdlflags='-fpic' -ccdlflags='-Wl,-E,-Wl,-rpath,/usr/lib/perl5/5.8.7/powerpc-linux/CORE' -ccflags='-fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.7/powerpc-linux/CORE' +ccflags=''-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='gcc' ccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 system=linux system=posix system=unix' @@ -77,12 +77,12 @@ cpio='' cpp='cpp' cpp_stuff='42' cppccsymbols='linux=1 unix=1' -cppflags='-fno-strict-aliasing -pipe' +cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe' cpplast='-' cppminus='-' -cpprun='cc -E' -cppstdin='cc -E' -cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=4 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200112 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1' +cpprun='gcc -E' +cppstdin='gcc -E' +cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=5 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200112 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1' crypt_r_proto='0' cryptlib='' csh='csh' @@ -131,7 +131,7 @@ d_const='define' d_copysignl='define' d_crypt='define' d_crypt_r='undef' -d_csh='undef' +d_csh='define' d_ctermid_r='undef' d_ctime_r='undef' d_cuserid='define' @@ -147,7 +147,7 @@ d_dosuid='undef' d_drand48_r='undef' d_drand48proto='define' d_dup2='define' -d_eaccess='define' +d_eaccess='undef' d_endgrent='define' d_endgrent_r='undef' d_endhent='define' @@ -162,7 +162,7 @@ d_endsent='define' d_endservent_r='undef' d_eofnblk='define' d_eunice='undef' -d_faststdio='undef' +d_faststdio='define' d_fchdir='define' d_fchmod='define' d_fchown='define' @@ -170,7 +170,7 @@ d_fcntl='define' d_fcntl_can_lock='define' d_fd_macros='define' d_fd_set='define' -d_fds_bits='undef' +d_fds_bits='define' d_fgetpos='define' d_finite='define' d_finitel='define' @@ -293,7 +293,7 @@ d_mktime='define' d_mmap='define' d_modfl='define' d_modfl_pow32_bug='undef' -d_modflproto='define' +d_modflproto='undef' d_mprotect='define' d_msg='define' d_msg_ctrunc='define' @@ -312,7 +312,7 @@ d_mymalloc='undef' d_nice='define' d_nl_langinfo='define' d_nv_preserves_uv='define' -d_off64_t='undef' +d_off64_t='define' d_old_pthread_create_joinable='undef' d_oldpthreads='undef' d_oldsock='undef' @@ -325,9 +325,9 @@ d_pipe='define' d_poll='define' d_portable='define' d_procselfexe='define' -d_pthread_atfork='undef' +d_pthread_atfork='define' d_pthread_attr_setscope='define' -d_pthread_yield='undef' +d_pthread_yield='define' d_pwage='undef' d_pwchange='undef' d_pwclass='undef' @@ -359,7 +359,7 @@ d_seekdir='define' d_select='define' d_sem='define' d_semctl='define' -d_semctl_semid_ds='undef' +d_semctl_semid_ds='define' d_semctl_semun='define' d_semget='define' d_semop='define' @@ -422,12 +422,12 @@ d_statfs_f_flags='undef' d_statfs_s='define' d_statvfs='define' d_stdio_cnt_lval='undef' -d_stdio_ptr_lval='undef' +d_stdio_ptr_lval='define' d_stdio_ptr_lval_nochange_cnt='undef' -d_stdio_ptr_lval_sets_cnt='undef' +d_stdio_ptr_lval_sets_cnt='define' d_stdio_stream_array='undef' -d_stdiobase='undef' -d_stdstdio='undef' +d_stdiobase='define' +d_stdstdio='define' d_strchr='define' d_strcoll='define' d_strctcpy='define' @@ -521,7 +521,7 @@ exe_ext='' expr='expr' extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno' extras='' -fflushNULL='undef' +fflushNULL='define' fflushall='undef' find='' firstmakefile='makefile' @@ -667,7 +667,7 @@ i_varargs='undef' i_varhdr='stdarg.h' i_vfork='undef' ignore_versioned_solibs='y' -inc_version_list=' ' +inc_version_list='' inc_version_list_init='0' incpath='' inews='' @@ -706,7 +706,7 @@ ivsize='4' ivtype='long' known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' ksh='' -ld='cc' +ld='gcc' lddlflags='-shared' ldflags='' ldflags_uselargefiles='' @@ -716,9 +716,9 @@ lib_ext='.a' libc='/lib/libc-2.5.so' libperl='libperl.so' libpth='/lib /usr/lib' -libs='-lnsl -ldl -lm -lcrypt -lutil -lc' +libs='-lresolv -lnsl -ldl -lm -lpthread -lcrypt -lutil -lc' libsdirs='' -libsfiles='' +libsfiles=' libresolv.so libnsl.so libdl.so libm.so libpthread.so libcrypt.so libutil.so libc.so' libsfound='' libspath=' /lib /usr/lib' libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' @@ -764,15 +764,15 @@ myarchname='powerpc-linux' mydomain='.nonet' myhostname='brokenslug' myuname='linux brokenslug 2.6.12.6 #1 tue oct 24 01:06:22 pdt 2006 ppc unknown unknown gnulinux ' -n='' -need_va_copy='define' +n='-n' +need_va_copy='undef' netdb_hlen_type='size_t' netdb_host_type='const void *' netdb_name_type='const char *' netdb_net_type='in_addr_t' nm='nm' nm_opt='' -nm_so_opt='' +nm_so_opt='--dynamic' nonxs_ext='Errno' nroff='nroff' nvEUformat='"E"' @@ -787,8 +787,8 @@ nvtype='double' o_nonblock='O_NONBLOCK' obj_ext='.o' old_pthread_create_joinable='' -optimize='-Os' -orderlib='true' +optimize='-O2' +orderlib='false' osname='linux' osvers='2.6.12.6' otherlibdirs=' ' @@ -801,7 +801,7 @@ perl5='hostperl' perl='' perl_patchlevel='' perladmin='root@brokenslug.nonet' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +perllibs='-lresolv -lnsl -ldl -lm -lpthread -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -958,7 +958,7 @@ use64bitint='undef' usecrosscompile='undef' usedl='define' usefaststdio='define' -useithreads='undef' +useithreads='define' uselargefiles='define' uselongdouble='undef' usemallocwrap='define' @@ -971,10 +971,10 @@ useperlio='define' useposix='true' usereentrant='undef' usesfio='false' -useshrplib='false' +useshrplib='true' usesitecustomize='undef' usesocks='undef' -usethreads='undef' +usethreads='define' usevendorprefix='undef' usevfork='false' usrinc='/usr/include' diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 4f42d78ded..f063d0e403 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -46,6 +46,14 @@ do_compile() { if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" fi + + # You must use gcc to link on powerpc also + OPTIONS="" + if test ${TARGET_ARCH} = "powerpc" ; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi + + oe_runmake perl $OPTIONS } diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index b9a62e79c9..12aec88a02 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -21,10 +21,12 @@ SRC_URI_append_sh4 += "file://override-generate-sh.patch;patch=1" SRC_URI_append_sh4 += "file://makefile-usegcc-to-link.patch;patch=1" SRC_URI_append_sh3 += "file://override-generate-sh.patch;patch=1" SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1" +SRC_URI_append_powerpc += "file://override-generate-sh.patch;patch=1" +SRC_URI_append_powerpc += "file://makefile-usegcc-to-link.patch;patch=1" PARALLEL_MAKE = "" -PR = "r21" +PR = "r22" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl -- cgit v1.2.3 From 87cd0be3f2d3ff27e2375cf8677988df57e71934 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 11:24:11 +0000 Subject: gpe: adjust some SVN PVs --- packages/gpe-calendar/gpe-calendar_svn.bb | 2 +- packages/libgpevtype/libgpevtype_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpe-calendar/gpe-calendar_svn.bb b/packages/gpe-calendar/gpe-calendar_svn.bb index d6a232b225..d83ee3a151 100644 --- a/packages/gpe-calendar/gpe-calendar_svn.bb +++ b/packages/gpe-calendar/gpe-calendar_svn.bb @@ -10,7 +10,7 @@ RDEPENDS = "gpe-icons" inherit autotools gpe -PV = "0.72+svn${SRCDATE}" +PV = "0.90+svn${SRCDATE}" PR = "r0" SRC_URI = "${GPE_SVN}" diff --git a/packages/libgpevtype/libgpevtype_svn.bb b/packages/libgpevtype/libgpevtype_svn.bb index 213c009d85..88e03c9b64 100644 --- a/packages/libgpevtype/libgpevtype_svn.bb +++ b/packages/libgpevtype/libgpevtype_svn.bb @@ -3,7 +3,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libmimedir libeventdb" -PV = "0.17+svn${SRCDATE}" +PV = "0.50+svn${SRCDATE}" PR = "r1" inherit pkgconfig gpe autotools -- cgit v1.2.3 From 1cb8d8aed5fefa4ef8ba125d4add52025e0bb584 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 12:45:27 +0000 Subject: perl-native: bump PR --- packages/perl/perl-native_5.8.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb index eeef2a2bc4..ffbdc4ec32 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SECTION = "libs" inherit native -- cgit v1.2.3 From cd13dba87cbb1a14651c02f493a02f28e137efbf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 15:43:05 +0000 Subject: monotone: add 0.34 --- packages/monotone/monotone-6_0.34.bb | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 packages/monotone/monotone-6_0.34.bb (limited to 'packages') diff --git a/packages/monotone/monotone-6_0.34.bb b/packages/monotone/monotone-6_0.34.bb new file mode 100644 index 0000000000..0442e0232e --- /dev/null +++ b/packages/monotone/monotone-6_0.34.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Monotone is a distributed Source Control System" +HOMEPAGE = "http://www.monotone.ca/" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "MIT" +DEPENDS = "boost" + +PROVIDES = "monotone" +RPROVIDES = "monotone" + +S = "${WORKDIR}/monotone-${PV}" +# no cross compile support - it tries to run the test program even with +# --enable_ipv6=yes +EXTRA_OECONF = "--disable-ipv6 \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-nls \ + --with-gnu-ld \ + --with-bundled-lua --with-bundled-sqlite" + +inherit autotools + +# Release 0.22 reveals bugs in g++ for thumb (g++ generates +# relocations which the linker cannot represent) +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +PR = "r0" + +SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \ + file://txt2c-cross-post-0.22.patch;patch=1 \ + file://uclibc.database.hh.stdarg.patch;patch=1 \ + file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \ + " +do_compile_append() { + touch testsuite +} + +# This makes the testsuite as a package and renames the monotone executable +# to include the netsync suffix. +do_install_append() { + install -d ${D}${tsd} + install -c -m 755 testsuite ${D}${tsd}/testsuite + cp -pPR tests ${D}${tsd}/tests + rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary +} + +PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" +tsd = "/home/monotone/${PN}" +FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" +RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch perl perl-modules" + -- cgit v1.2.3 From 29c7d957499e8c2fcbb92799fadd82c2fa2f52d5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 16:02:50 +0000 Subject: pulse: remove rprovides, since OE changes them to libesd0, thus breaking esd using apps --- packages/pulseaudio/pulseaudio_0.9.5.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb index 54ebb76cd9..35fd9a8342 100644 --- a/packages/pulseaudio/pulseaudio_0.9.5.bb +++ b/packages/pulseaudio/pulseaudio_0.9.5.bb @@ -8,9 +8,8 @@ DEPENDS = "liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib" -RPROVIDES = "esound esd" -PR = "r6" +PR = "r7" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" -- cgit v1.2.3 From f707160d5303105725733ef6b9be5147511321e0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 16:27:51 +0000 Subject: gpe-conf: bump PR --- packages/gpe-conf/gpe-conf_0.2.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb index 6cbddeedd0..6bd96204eb 100644 --- a/packages/gpe-conf/gpe-conf_0.2.5.bb +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -10,7 +10,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf" RPROVIDES_${PN} += " bl" RCONFLICTS_${PN} = "bl" -PR = "r2" +PR = "r3" GPE_TARBALL_SUFFIX = "bz2" -- cgit v1.2.3 From a8c813a615b0a96214b90862a1c582cbfdc78cee Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 17:42:15 +0000 Subject: gpe-dm: add 0.50 and clean up files --- packages/gpe-dm/files/.mtn2git_empty | 0 packages/gpe-dm/files/Xserver-cxk.patch | 11 --------- packages/gpe-dm/files/collie-suspend-hack.patch | 19 --------------- packages/gpe-dm/files/mnci.patch | 27 ---------------------- packages/gpe-dm/files/remove-X-scripts.patch | 14 ----------- .../gpe-dm/files/source-xsession-scripts.patch | 27 ---------------------- 6 files changed, 98 deletions(-) delete mode 100644 packages/gpe-dm/files/.mtn2git_empty delete mode 100644 packages/gpe-dm/files/Xserver-cxk.patch delete mode 100644 packages/gpe-dm/files/collie-suspend-hack.patch delete mode 100644 packages/gpe-dm/files/mnci.patch delete mode 100644 packages/gpe-dm/files/remove-X-scripts.patch delete mode 100644 packages/gpe-dm/files/source-xsession-scripts.patch (limited to 'packages') diff --git a/packages/gpe-dm/files/.mtn2git_empty b/packages/gpe-dm/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-dm/files/Xserver-cxk.patch b/packages/gpe-dm/files/Xserver-cxk.patch deleted file mode 100644 index 89187a0e31..0000000000 --- a/packages/gpe-dm/files/Xserver-cxk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpe-dm-0.47/Xserver~ 2005-07-29 11:58:59.000000000 -0700 -+++ gpe-dm-0.47/Xserver 2005-08-01 11:20:42.000000000 -0700 -@@ -62,6 +62,8 @@ - ;; - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -rgba rgb" ;; -+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") -+ ARGS="$ARGS -rgba rgb -screen 640x480@270" ;; - "Simpad") - ARGS="$ARGS -rgba rgb" ;; - "Generic OMAP1510/1610/1710") diff --git a/packages/gpe-dm/files/collie-suspend-hack.patch b/packages/gpe-dm/files/collie-suspend-hack.patch deleted file mode 100644 index 94fc287f4e..0000000000 --- a/packages/gpe-dm/files/collie-suspend-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urNd ../gpe-dm-0.44-r1/gpe-dm-0.44/Xserver gpe-dm-0.44/Xserver ---- ../gpe-dm-0.44-r1/gpe-dm-0.44/Xserver 2005-02-20 17:39:31 +00:00 -+++ gpe-dm-0.44/Xserver 2005-04-01 21:47:12 +01:00 -@@ -45,8 +45,14 @@ - "HP iPAQ H5400" | "HP iPAQ H2200") - ARGS="$ARGS -rgba rgb" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported -- *Collie | *Poodle) -+ *Poodle) - ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;; -+ *Collie) -+ ARGS="$ARGS -screen 320x240@270 -rgba vrgb" -+ # Horrible hack required to enable resuming after suspend -+ rm -f /dev/apm_bios -+ killall -9 apmd -+ ;; - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -rgba rgb" ;; - "Simpad") diff --git a/packages/gpe-dm/files/mnci.patch b/packages/gpe-dm/files/mnci.patch deleted file mode 100644 index 8cd7358f36..0000000000 --- a/packages/gpe-dm/files/mnci.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- gpe-dm-0.44/gpe-dm.init~ramses -+++ gpe-dm-0.44/gpe-dm.init -@@ -19,7 +19,7 @@ - stop) - echo "Stopping GPE display manager: gpe-dm" - killproc /usr/bin/gpe-dm -- dd if=/dev/zero of=/dev/fb0 2>/dev/null -+ dd if=/dev/zero of=/dev/fb0 2>/dev/null || dd if=/dev/zero of=/dev/fb/0 2>/dev/null - ;; - - *) ---- gpe-dm-0.44/Xserver~ramses -+++ gpe-dm-0.44/Xserver -@@ -44,6 +44,8 @@ - ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;; - "HP iPAQ H5400" | "HP iPAQ H2200") - ARGS="$ARGS -rgba rgb" ;; -+ "Ramses") -+ ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported - *Poodle) - ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;; diff --git a/packages/gpe-dm/files/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch deleted file mode 100644 index b3c85be788..0000000000 --- a/packages/gpe-dm/files/remove-X-scripts.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile ---- gpe-dm-0.47~/Makefile 2005-08-19 18:27:54.000000000 -0700 -+++ gpe-dm-0.47/Makefile 2005-08-19 18:28:37.000000000 -0700 -@@ -31,10 +31,6 @@ - install -d $(DESTDIR)/etc/init.d - install -d $(DESTDIR)/etc/rc2.d - install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm -- install -d $(DESTDIR)/etc/X11 -- install Xsession $(DESTDIR)/etc/X11/Xsession -- install Xinit $(DESTDIR)/etc/X11/Xinit -- install Xserver $(DESTDIR)/etc/X11/Xserver - - clean: clean-po - rm -f gpe-dm gpe-dm.o diff --git a/packages/gpe-dm/files/source-xsession-scripts.patch b/packages/gpe-dm/files/source-xsession-scripts.patch deleted file mode 100644 index c92f230618..0000000000 --- a/packages/gpe-dm/files/source-xsession-scripts.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- gpe-dm-0.43/Xsession.old 2005-02-23 11:39:23.000000000 +0000 -+++ gpe-dm-0.43/Xsession 2005-02-23 12:21:28.011314968 +0000 -@@ -25,4 +25,23 @@ - SYSSESSIONDIR=/etc/X11/Xsession.d - fi - --exec run-parts $SYSSESSIONDIR -+# Use run-parts to source every file in the session directory; we source -+# instead of executing so that the variables and functions defined above -+# are available to the scripts, and so that they can pass variables to each -+# other. -+ -+# Can't use run-parts like this, busybox doesn't support it. Use ls instead -+#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR) -+ -+SESSIONFILES=`ls -X $SYSSESSIONDIR` -+if [ -n "$SESSIONFILES" ]; then -+ for SESSIONFILE in $SESSIONFILES; do -+ # Test if script is executable first before sourcing it -+ if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then -+ . $SYSSESSIONDIR/$SESSIONFILE -+ fi -+ done -+fi -+ -+exit 0 -+ -- cgit v1.2.3 From aef53677057db73813c7164ee9f07ebd379bc28f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 17:44:50 +0000 Subject: gpe-edit: add 0.40 --- packages/gpe-edit/gpe-edit_0.40.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/gpe-edit/gpe-edit_0.40.bb (limited to 'packages') diff --git a/packages/gpe-edit/gpe-edit_0.40.bb b/packages/gpe-edit/gpe-edit_0.40.bb new file mode 100644 index 0000000000..a3e9a8b71a --- /dev/null +++ b/packages/gpe-edit/gpe-edit_0.40.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Editor for the GPE Palmtop Environment" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" + +GPE_TARBALL_SUFFIX ?= "bz2" + +inherit gpe autotools -- cgit v1.2.3 From e762cc421306ddca4b75dc284dc25dc514da97a2 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 17:49:59 +0000 Subject: packages/libmrss: Apply my patches to libmrss (will be send upstream) -Make sure pubDate is always set for ATOM feeds from planets -Bump the library version to 0.17 -Format Atom dates RFC822 compliant --- packages/libmrss/files/.mtn2git_empty | 0 packages/libmrss/files/atom-changes.patch | 17 +++ packages/libmrss/files/bump-version.patch | 16 +++ packages/libmrss/files/fix_atom_date_locale.patch | 122 ++++++++++++++++++++++ packages/libmrss/libmrss_0.17.bb | 5 +- 5 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 packages/libmrss/files/.mtn2git_empty create mode 100644 packages/libmrss/files/atom-changes.patch create mode 100644 packages/libmrss/files/bump-version.patch create mode 100644 packages/libmrss/files/fix_atom_date_locale.patch (limited to 'packages') diff --git a/packages/libmrss/files/.mtn2git_empty b/packages/libmrss/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libmrss/files/atom-changes.patch b/packages/libmrss/files/atom-changes.patch new file mode 100644 index 0000000000..42f74d00f2 --- /dev/null +++ b/packages/libmrss/files/atom-changes.patch @@ -0,0 +1,17 @@ +Make sure to always set a pubDate + +Index: libmrss-0.17/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.orig/src/mrss_parser.c 2007-03-22 19:40:54.000000000 +0100 ++++ libmrss-0.17/src/mrss_parser.c 2007-03-22 19:44:15.000000000 +0100 +@@ -270,6 +270,10 @@ + && data->version == MRSS_VERSION_ATOM_1_0) + item->pubDate = + __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); ++ else if (!strcmp(cur->value, "updated" ) && !item->pubDate ++ && data->version == MRSS_VERSION_ATOM_1_0) ++ item->pubDate = ++ __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); + + /* issued -> pubDate (Atom 0.3) */ + else if (!strcmp (cur->value, "issued") && !item->pubDate) diff --git a/packages/libmrss/files/bump-version.patch b/packages/libmrss/files/bump-version.patch new file mode 100644 index 0000000000..2eeb6931c8 --- /dev/null +++ b/packages/libmrss/files/bump-version.patch @@ -0,0 +1,16 @@ +Bump the version info, specially as I changed the struct in a binary +incompatible way. + +Index: libmrss-0.17/src/Makefile.am +=================================================================== +--- libmrss-0.17.orig/src/Makefile.am 2007-04-01 16:43:58.000000000 +0200 ++++ libmrss-0.17/src/Makefile.am 2007-04-01 16:44:10.000000000 +0200 +@@ -10,7 +10,7 @@ + mrss_options.c \ + mrss_search.c + +-libmrss_la_LDFLAGS = -version-info 0:16:0 ++libmrss_la_LDFLAGS = -version-info 0:17:0 + + EXTRA_DIST = mrss.h mrss_internal.h + diff --git a/packages/libmrss/files/fix_atom_date_locale.patch b/packages/libmrss/files/fix_atom_date_locale.patch new file mode 100644 index 0000000000..4d46033d10 --- /dev/null +++ b/packages/libmrss/files/fix_atom_date_locale.patch @@ -0,0 +1,122 @@ +The Atom date formating code tries to create a RFC822 date. This date +requires to use the C locale for the date (for weekday-names and month-names). + +This patch uses new POSIX functionality to create a C locale and strftime_l +to create a right RFC822 date. + +Index: libmrss-0.17/src/mrss.h +=================================================================== +--- libmrss-0.17.orig/src/mrss.h 2007-04-01 00:29:06.000000000 +0200 ++++ libmrss-0.17/src/mrss.h 2007-04-01 01:22:25.000000000 +0200 +@@ -364,6 +364,9 @@ + mrss_element_t element; + int allocated; + ++ /** For internal use only: */ ++ void* c_locale; ++ + /* Data: */ + + char *file; +Index: libmrss-0.17/src/mrss_free.c +=================================================================== +--- libmrss-0.17.orig/src/mrss_free.c 2007-04-01 00:32:56.000000000 +0200 ++++ libmrss-0.17/src/mrss_free.c 2007-04-01 15:45:44.000000000 +0200 +@@ -22,9 +22,14 @@ + # error Use configure; make; make install + #endif + ++#define _GNU_SOURCE ++ + #include "mrss.h" + #include "mrss_internal.h" + ++#include ++ ++ + static void __mrss_free_channel (mrss_t * mrss); + static void __mrss_free_category (mrss_category_t * category); + static void __mrss_free_hour (mrss_hour_t * hour); +@@ -202,6 +207,9 @@ + __mrss_free_item ((mrss_item_t *) old); + } + ++ if (mrss->c_locale) ++ freelocale (mrss->c_locale); ++ + if (mrss->allocated) + free (mrss); + } +Index: libmrss-0.17/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.orig/src/mrss_parser.c 2007-03-30 01:07:56.000000000 +0200 ++++ libmrss-0.17/src/mrss_parser.c 2007-04-01 16:40:57.000000000 +0200 +@@ -22,9 +22,13 @@ + # error Use configure; make; make install + #endif + ++#define _GNU_SOURCE ++ + #include "mrss.h" + #include "mrss_internal.h" + ++#include ++ + static void + __mrss_parse_tag_insert (mrss_tag_t ** where, mrss_tag_t * what) + { +@@ -133,7 +137,7 @@ + } + + static char * +-__mrss_atom_prepare_date (char *datestr) ++__mrss_atom_prepare_date (mrss_t *data, char *datestr) + { + char *ret = NULL; + if (datestr) +@@ -150,8 +154,14 @@ + stm.tm_year -= 1900; + char datebuf[256]; + free (datestr); +- strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z", +- &stm); ++ ++ if (!data->c_locale) { ++ printf( "Creating the locale\n" ); ++ data->c_locale = newlocale(LC_ALL_MASK,"C",NULL); ++ } ++ ++ strftime_l (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z", ++ &stm, data->c_locale); + ret = strdup (datebuf); + } + } +@@ -269,16 +279,16 @@ + else if (!strcmp (cur->value, "published") && !item->pubDate + && data->version == MRSS_VERSION_ATOM_1_0) + item->pubDate = +- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); ++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); + else if (!strcmp(cur->value, "updated" ) && !item->pubDate + && data->version == MRSS_VERSION_ATOM_1_0) + item->pubDate = +- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); ++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); + + /* issued -> pubDate (Atom 0.3) */ + else if (!strcmp (cur->value, "issued") && !item->pubDate) + item->pubDate = +- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); ++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); + + /* id -> guid */ + else if (!strcmp (cur->value, "id") && !item->guid +@@ -701,7 +711,7 @@ + /* updated -> lastBuildDate */ + else if (!strcmp (cur->value, "updated")) + data->lastBuildDate = +- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); ++ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); + + /* author -> managingeditor */ + else if (!strcmp (cur->value, "author")) diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb index c2170fa09a..9871dbebdc 100644 --- a/packages/libmrss/libmrss_0.17.bb +++ b/packages/libmrss/libmrss_0.17.bb @@ -6,7 +6,10 @@ DEPENDS = "libnxml curl" inherit autotools pkgconfig -SRC_URI = "http://www2.autistici.org/bakunin//libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3" +SRC_URI = "http://www2.autistici.org/bakunin//libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3 \ + file://atom-changes.patch;patch=1 \ + file://fix_atom_date_locale.patch;patch=1 \ + file://bump-version.patch;patch=1 " do_stage() { autotools_stage_all -- cgit v1.2.3 From 6ebd165cf5bdf838081b251d03d5e84205c1d0aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 17:54:00 +0000 Subject: gpe-dm: really add 0.50 --- packages/gpe-dm/files/.mtn2git_empty | 0 packages/gpe-dm/gpe-dm_0.50.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/gpe-dm/files/.mtn2git_empty create mode 100644 packages/gpe-dm/gpe-dm_0.50.bb (limited to 'packages') diff --git a/packages/gpe-dm/files/.mtn2git_empty b/packages/gpe-dm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-dm/gpe-dm_0.50.bb b/packages/gpe-dm/gpe-dm_0.50.bb new file mode 100644 index 0000000000..d9ac68c257 --- /dev/null +++ b/packages/gpe-dm/gpe-dm_0.50.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "GPE Display Manager" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "glib-2.0 xserver-common" +RDEPENDS_${PN} += "procps xserver-common" + +GPE_TARBALL_SUFFIX ?= "bz2" + +inherit gpe autotools update-rc.d + +INITSCRIPT_NAME = "gpe-dm" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -- cgit v1.2.3 From 6d8ed2616edd8de6ece78cc31985ca9d9bd3a361 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 17:54:42 +0000 Subject: packages/{libmrss|libnxml}: Make koen happy and replace '//' with '/' --- packages/libmrss/libmrss_0.17.bb | 8 ++++---- packages/libnxml/libnxml_0.16.bb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb index 9871dbebdc..7255b8b389 100644 --- a/packages/libmrss/libmrss_0.17.bb +++ b/packages/libmrss/libmrss_0.17.bb @@ -1,14 +1,14 @@ DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams" LICENSE = "LGPL" -HOMEPAGE = "http://www2.autistici.org/bakunin//codes.php" +HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" DEPENDS = "libnxml curl" inherit autotools pkgconfig -SRC_URI = "http://www2.autistici.org/bakunin//libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3 \ - file://atom-changes.patch;patch=1 \ - file://fix_atom_date_locale.patch;patch=1 \ +SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3 \ + file://atom-changes.patch;patch=1 \ + file://fix_atom_date_locale.patch;patch=1 \ file://bump-version.patch;patch=1 " do_stage() { diff --git a/packages/libnxml/libnxml_0.16.bb b/packages/libnxml/libnxml_0.16.bb index c798ff3405..48f64904ef 100644 --- a/packages/libnxml/libnxml_0.16.bb +++ b/packages/libnxml/libnxml_0.16.bb @@ -1,4 +1,4 @@ -HOMEPAGE = "http://www2.autistici.org/bakunin//codes.php" +HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)" LICENSE = "LGPL" @@ -6,7 +6,7 @@ DEPENDS = "curl" inherit autotools pkgconfig -SRC_URI = "http://www2.autistici.org/bakunin//libnxml/libnxml-${PV}.tar.gz;md5sum=85b6a42a9e17a23c01b2f2ed0ece0563" +SRC_URI = "http://www2.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz;md5sum=85b6a42a9e17a23c01b2f2ed0ece0563" do_stage() { -- cgit v1.2.3 From ed04b33fd238b6cdae27bcba812adf4a296b4da0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 17:56:33 +0000 Subject: libmimedir: switch to svn, remove SRCDATE from sane-srcdates.inc --- packages/libmimedir/libmimedir_svn.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/libmimedir/libmimedir_svn.bb (limited to 'packages') diff --git a/packages/libmimedir/libmimedir_svn.bb b/packages/libmimedir/libmimedir_svn.bb new file mode 100644 index 0000000000..c640f13e8f --- /dev/null +++ b/packages/libmimedir/libmimedir_svn.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native" + +DEFAULT_PREFERENCE = "-1" + +PV = "0.4.1+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/libmimedir" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + +PACKAGES += "libmimedir-utils" + +FILES_libmimedir-utils = "${bindir}" + -- cgit v1.2.3 From afc1acb3dba12c57813ce66d73ade56c993a0b18 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 18:00:25 +0000 Subject: pckages/{libmrss|libnxml}: Remove the md5sum and add md5sum/shasum to the config file --- packages/libmrss/libmrss_0.17.bb | 6 +++--- packages/libnxml/libnxml_0.16.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb index 7255b8b389..4d03985f9e 100644 --- a/packages/libmrss/libmrss_0.17.bb +++ b/packages/libmrss/libmrss_0.17.bb @@ -6,9 +6,9 @@ DEPENDS = "libnxml curl" inherit autotools pkgconfig -SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3 \ - file://atom-changes.patch;patch=1 \ - file://fix_atom_date_locale.patch;patch=1 \ +SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ + file://atom-changes.patch;patch=1 \ + file://fix_atom_date_locale.patch;patch=1 \ file://bump-version.patch;patch=1 " do_stage() { diff --git a/packages/libnxml/libnxml_0.16.bb b/packages/libnxml/libnxml_0.16.bb index 48f64904ef..6f836d226d 100644 --- a/packages/libnxml/libnxml_0.16.bb +++ b/packages/libnxml/libnxml_0.16.bb @@ -6,7 +6,7 @@ DEPENDS = "curl" inherit autotools pkgconfig -SRC_URI = "http://www2.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz;md5sum=85b6a42a9e17a23c01b2f2ed0ece0563" +SRC_URI = "http://www2.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz" do_stage() { -- cgit v1.2.3 From 470744264bf335b0acdc5e9db2b35f1bda73b72d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 18:41:38 +0000 Subject: packages/libmrss: Remove the printf from the patch --- packages/libmrss/files/fix_atom_date_locale.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/libmrss/files/fix_atom_date_locale.patch b/packages/libmrss/files/fix_atom_date_locale.patch index 4d46033d10..111a4859cd 100644 --- a/packages/libmrss/files/fix_atom_date_locale.patch +++ b/packages/libmrss/files/fix_atom_date_locale.patch @@ -6,8 +6,8 @@ to create a right RFC822 date. Index: libmrss-0.17/src/mrss.h =================================================================== ---- libmrss-0.17.orig/src/mrss.h 2007-04-01 00:29:06.000000000 +0200 -+++ libmrss-0.17/src/mrss.h 2007-04-01 01:22:25.000000000 +0200 +--- libmrss-0.17.orig/src/mrss.h 2007-02-02 12:23:49.000000000 +0100 ++++ libmrss-0.17/src/mrss.h 2007-04-01 19:46:41.000000000 +0200 @@ -364,6 +364,9 @@ mrss_element_t element; int allocated; @@ -20,8 +20,8 @@ Index: libmrss-0.17/src/mrss.h char *file; Index: libmrss-0.17/src/mrss_free.c =================================================================== ---- libmrss-0.17.orig/src/mrss_free.c 2007-04-01 00:32:56.000000000 +0200 -+++ libmrss-0.17/src/mrss_free.c 2007-04-01 15:45:44.000000000 +0200 +--- libmrss-0.17.orig/src/mrss_free.c 2007-02-02 12:47:46.000000000 +0100 ++++ libmrss-0.17/src/mrss_free.c 2007-04-01 19:46:41.000000000 +0200 @@ -22,9 +22,14 @@ # error Use configure; make; make install #endif @@ -49,8 +49,8 @@ Index: libmrss-0.17/src/mrss_free.c } Index: libmrss-0.17/src/mrss_parser.c =================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-03-30 01:07:56.000000000 +0200 -+++ libmrss-0.17/src/mrss_parser.c 2007-04-01 16:40:57.000000000 +0200 +--- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 19:46:41.000000000 +0200 ++++ libmrss-0.17/src/mrss_parser.c 2007-04-01 20:38:06.000000000 +0200 @@ -22,9 +22,13 @@ # error Use configure; make; make install #endif @@ -74,7 +74,7 @@ Index: libmrss-0.17/src/mrss_parser.c { char *ret = NULL; if (datestr) -@@ -150,8 +154,14 @@ +@@ -150,8 +154,13 @@ stm.tm_year -= 1900; char datebuf[256]; free (datestr); @@ -82,7 +82,6 @@ Index: libmrss-0.17/src/mrss_parser.c - &stm); + + if (!data->c_locale) { -+ printf( "Creating the locale\n" ); + data->c_locale = newlocale(LC_ALL_MASK,"C",NULL); + } + @@ -91,7 +90,7 @@ Index: libmrss-0.17/src/mrss_parser.c ret = strdup (datebuf); } } -@@ -269,16 +279,16 @@ +@@ -269,16 +278,16 @@ else if (!strcmp (cur->value, "published") && !item->pubDate && data->version == MRSS_VERSION_ATOM_1_0) item->pubDate = @@ -111,7 +110,7 @@ Index: libmrss-0.17/src/mrss_parser.c /* id -> guid */ else if (!strcmp (cur->value, "id") && !item->guid -@@ -701,7 +711,7 @@ +@@ -701,7 +710,7 @@ /* updated -> lastBuildDate */ else if (!strcmp (cur->value, "updated")) data->lastBuildDate = -- cgit v1.2.3 From 7feebc96df1b509f63cfa846a4aa68d3c958e1e8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 20:20:31 +0000 Subject: openmoko-session: depend on mb-panel-2 and mb-wm instead of 'matchbox' --- packages/openmoko-base/openmoko-session_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index c352cb7d91..6daacb2842 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" -RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" +RDEPENDS = "matchbox-panel-2 matchbox-wm gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r8" +PR = "r9" inherit openmoko-base -- cgit v1.2.3 From a668b728f034349c1204be9be1b363b1cb3aefa2 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 20:51:47 +0000 Subject: packages/libmrss: Add a memory leak patch and bump the PR --- packages/libmrss/files/fix-memleaks.patch | 17 +++++++++++++++++ packages/libmrss/libmrss_0.17.bb | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 packages/libmrss/files/fix-memleaks.patch (limited to 'packages') diff --git a/packages/libmrss/files/fix-memleaks.patch b/packages/libmrss/files/fix-memleaks.patch new file mode 100644 index 0000000000..c88570c72e --- /dev/null +++ b/packages/libmrss/files/fix-memleaks.patch @@ -0,0 +1,17 @@ +Index: libmrss-0.17/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 22:23:22.000000000 +0200 ++++ libmrss-0.17/src/mrss_parser.c 2007-04-01 22:23:42.000000000 +0200 +@@ -186,10 +186,10 @@ + cat->allocated = 1; + cat->category = c; + +- if (!(c = nxmle_find_attribute (cur, "scheme", NULL))) ++ if (c = nxmle_find_attribute (cur, "scheme", NULL)) + cat->domain = c; + +- if (!(c = nxmle_find_attribute (cur, "label", NULL))) ++ if (c = nxmle_find_attribute (cur, "label", NULL)) + cat->label = c; + + if (!*category) diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb index 4d03985f9e..0d23a2b54f 100644 --- a/packages/libmrss/libmrss_0.17.bb +++ b/packages/libmrss/libmrss_0.17.bb @@ -3,12 +3,14 @@ LICENSE = "LGPL" HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" DEPENDS = "libnxml curl" +PR = "r1" inherit autotools pkgconfig SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ file://atom-changes.patch;patch=1 \ file://fix_atom_date_locale.patch;patch=1 \ + file://fix-memleaks.patch;patch=1 \ file://bump-version.patch;patch=1 " do_stage() { -- cgit v1.2.3 From 4037db271b9b183d88e10c675ee0efde0d73f93d Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sun, 1 Apr 2007 22:05:02 +0000 Subject: packages/gtk-webcore/osb-nrcore_svn * Update svn build information because of major changes * added patch to correct build and silence gtk-webcore console output * packages/gtk-webcore/files/build_silence.patch --- packages/gtk-webcore/files/build_silence.patch | 32 ++++++++++++++++++++++++++ packages/gtk-webcore/osb-nrcore_svn.bb | 3 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/gtk-webcore/files/build_silence.patch (limited to 'packages') diff --git a/packages/gtk-webcore/files/build_silence.patch b/packages/gtk-webcore/files/build_silence.patch new file mode 100644 index 0000000000..bcef3954ee --- /dev/null +++ b/packages/gtk-webcore/files/build_silence.patch @@ -0,0 +1,32 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 46) ++++ configure.in (working copy) +@@ -134,9 +134,9 @@ + AC_SUBST(LIBCURL_LIBS) #needed by the osb-nrcore.pc.in + + +-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++" ++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -DLOG_DISABLED" + +-CPPFLAGS="$CPPFLAGS -include \"\$(top_srcdir)/WebCorePrefix.h\" $PACKAGE_CFLAGS $X_CFLAGS $JSCORE_CFLAGS $DEFINES" ++CPPFLAGS="$CPPFLAGS -include \"\$(top_srcdir)/WebCorePrefix.h\" $PACKAGE_CFLAGS $X_CFLAGS $JSCORE_CFLAGS $DEFINES -DLOG_DISABLED" + LDFLAGS="$LDFLAGS $PACKAGE_LIBS $X_LIBS $JSCORE_LIBS \ + -nodefaultlibs -lgcc -lc" + +Index: kwiq/KWQEvent.cpp +=================================================================== +--- kwiq/KWQEvent.cpp (revision 46) ++++ kwiq/KWQEvent.cpp (working copy) +@@ -759,10 +759,10 @@ + #if 0 + if (state & GDK_MOD1_MASK) + qstate |= Qt::AltButton; +-#endif + + if (state & GDK_META_MASK) + qstate |= Qt::MetaButton; ++#endif + + if (isKeypadEvent(event)) + qstate |= Qt::Keypad; diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index fefb4e8283..b7f9d069f1 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -6,7 +6,8 @@ PV = "0.5.0+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ - file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1" + file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \ + file://build_silence.patch;patch=0" S = "${WORKDIR}/NRCore" -- cgit v1.2.3 From c889bd54b9d24ffb14c7d552401e9666364b7e15 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 1 Apr 2007 23:22:50 +0000 Subject: task-slugos: Remove altboot --- packages/tasks/task-slugos.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 50e47c8202..0c23cb905f 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r7" +PR = "r8" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -106,7 +106,7 @@ DEPENDS += "${DISTRO_EXTRA_DEPENDS}" RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ - busybox initscripts-slugos slugos-init altboot \ + busybox initscripts-slugos slugos-init \ update-modules sysvinit tinylogin \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ -- cgit v1.2.3 From c161e0d76b19f819b87ac99f1c9bf107c9e9f3f6 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Mon, 2 Apr 2007 17:26:37 +0000 Subject: packages/openmoko-inputmethods/openmoko-keyboard_svn.bb * correct the svn source url --- packages/openmoko-inputmethods/openmoko-keyboard_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb index 077105a349..58f25ab0b6 100644 --- a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb +++ b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb @@ -7,7 +7,7 @@ PR = "r1" inherit openmoko autotools pkgconfig gettext -SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http" +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/inputmethods;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 865302bba116b9f67fc33869dc50624c8f2455a7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 19:42:50 +0000 Subject: llvm: add cvs version of llvm-native, this adds ARM support to the 1.9 version --- packages/llvm/llvm-native_cvs.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/llvm/llvm-native_cvs.bb (limited to 'packages') diff --git a/packages/llvm/llvm-native_cvs.bb b/packages/llvm/llvm-native_cvs.bb new file mode 100644 index 0000000000..b3dfdebb2c --- /dev/null +++ b/packages/llvm/llvm-native_cvs.bb @@ -0,0 +1,13 @@ +require llvm.inc + +inherit native + +PV = "1.9+cvs${SRCDATE}" + +SRC_URI = "cvs://anon@llvm.org/var/cvs/llvm;module=llvm" + +S = "${WORKDIR}/llvm" + +do_stage() { + install -m 755 ${S}/Debug/bin/* ${STAGING_BINDIR_NATIVE}/ +} -- cgit v1.2.3 From 745c67ffc5c79fe08cd5460ded6317d17517799a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 2 Apr 2007 20:42:15 +0000 Subject: classes/base.bbclass: place shasum-native as the first package to build classes/base.bbclass: Make sure shasum-native does not depend on quilt classes/sanity.bbclass: No need to require sha256sum as we use oe_sha256sum packages/shasum: Change the name, make the -native version not have any deps --- packages/shasum/shasum-native.bb | 6 +++++- packages/shasum/shasum.inc | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/shasum/shasum-native.bb b/packages/shasum/shasum-native.bb index 9a4b42c64a..75b25d3123 100644 --- a/packages/shasum/shasum-native.bb +++ b/packages/shasum/shasum-native.bb @@ -2,6 +2,10 @@ require shasum.inc inherit native +INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_PATCH_TOOL = "1" + +do_fetch[depends] = "" do_populate_staging() { - install ${S}/sha256sum ${STAGING_BINDIR} + install ${S}/oe_sha256sum ${STAGING_BINDIR} } diff --git a/packages/shasum/shasum.inc b/packages/shasum/shasum.inc index 1ff6e83767..343a2d288e 100644 --- a/packages/shasum/shasum.inc +++ b/packages/shasum/shasum.inc @@ -1,6 +1,8 @@ SUMMARY = "A simple tool to create sha256 hashes from a file" LICENSE = "LGPL" +PR = "r1" + S = "${WORKDIR}" @@ -14,5 +16,5 @@ do_configure() { } do_compile() { - $CC $CFLAGS $CPPFLAGS -o sha256sum main.c sha256.c + $CC $CFLAGS $CPPFLAGS -o oe_sha256sum main.c sha256.c } -- cgit v1.2.3 From cdb8fa1b9180443a7d9a78f6229e565f502fee35 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 06:22:46 +0000 Subject: matchbox-panel-2: solve all the madness by making it parallel installable with matchbox-panel-1 --- packages/matchbox2/matchbox-panel-2_svn.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index d166e78a3a..be2e7f39cf 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,10 +3,8 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RCONFLICTS_${PN} = "matchbox-panel" - PV = "0.1+svn${SRCDATE}" -PR = "r5" +PR = "r6" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" @@ -15,6 +13,11 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-startup-notification --disable-libnotify" +# matchbox--2 aims to replace their -1 counterpart, but at this point in time it's unfinished and unusable, so make it parallel installable +do_install_append() { + mv ${D}${bindir}/matchbox-panel ${D}${bindir}/matchbox-panel-2 +} + do_stage() { autotools_stage_all } -- cgit v1.2.3 From 5f3be1ce7bc4b2ecbc6f157fa1fc0700a2ab5da7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 06:24:24 +0000 Subject: matchbox-panel: bump PR --- packages/matchbox-panel/matchbox-panel_0.9.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb index bed04323a7..c6b0ee305e 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb @@ -1,4 +1,4 @@ require matchbox-panel.inc -PR="r2" +PR="r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://mb-applet-battery-repaint-093.patch;patch=1" -- cgit v1.2.3 From d3f5a294a19f46ecd57f204a748ae7a8f2ccc4af Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 06:28:47 +0000 Subject: openmoko-session: use matchbox-panel-2 instead of matchbox-panel --- packages/openmoko-base/files/session | 2 +- packages/openmoko-base/openmoko-session_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 6f4fe6356e..d93225d624 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -8,7 +8,7 @@ matchbox-desktop --icon-size 96 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel --start-applets=openmoko-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & +matchbox-panel-2 --start-applets=openmoko-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & #start some old-style panel plugins to get a keyboard and battery status mbinputmgr & diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 6daacb2842..a359e539d3 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r9" +PR = "r8" inherit openmoko-base -- cgit v1.2.3 From 8749d371be6c0c1ec77e846d235cd3dae0646fd9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 06:32:23 +0000 Subject: matchbox: bump PR --- packages/matchbox-common/matchbox_0.9.1.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/matchbox-common/matchbox_0.9.1.bb b/packages/matchbox-common/matchbox_0.9.1.bb index 203c705267..cda90dfb50 100644 --- a/packages/matchbox-common/matchbox_0.9.1.bb +++ b/packages/matchbox-common/matchbox_0.9.1.bb @@ -3,5 +3,6 @@ LICENSE = "GPL" RDEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop" SECTION = "x11/wm" PACKAGES = "${PN}" +PR = "r1" ALLOW_EMPTY = "1" -- cgit v1.2.3 From 11744c0faab0580080ee840e52b56028f6649367 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 06:32:55 +0000 Subject: gpe-sesssion-scripts: bump PR --- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 4d68bc11a0..2c17d99bb8 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputm SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r8" +PR = "r9" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" -- cgit v1.2.3 From 2f8dc919dea77f4b321f4f76a2c8059a6f94fba7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 07:27:26 +0000 Subject: esound: bump PR --- packages/esound/esound_0.2.36.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/esound/esound_0.2.36.bb b/packages/esound/esound_0.2.36.bb index a260882bae..1cf99ac90a 100644 --- a/packages/esound/esound_0.2.36.bb +++ b/packages/esound/esound_0.2.36.bb @@ -3,6 +3,8 @@ SECTION = "gpe/base" LICENSE = "GPL" DEPENDS = "audiofile" +PR = "r1" + inherit gnome binconfig SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2" -- cgit v1.2.3 From e38a18db6365267bcf816b0fcf68a7f0d0890423 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 2 Apr 2007 09:33:47 +0000 Subject: openmoko-messages: remove patch that was applied upstream --- packages/openmoko-apps/openmoko-messages_svn.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index 1547c49d9a..948560bd52 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -5,5 +5,3 @@ PV = "0.0.1+svn${SRCDATE}" PR = "r2" inherit openmoko - -SRC_URI += "file://unbreak-messages.patch;patch=1" -- cgit v1.2.3 From d87a9afac7ab32ceae125d1359872c0f75a0a530 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 2 Apr 2007 09:57:41 +0000 Subject: coreutils: added 6.0 (DEF_PREF=-1) --- packages/coreutils/coreutils-6.0/.mtn2git_empty | 0 packages/coreutils/coreutils-6.0/man.patch | 42 +++++++++++ .../coreutils/coreutils-6.0/oe-old-tools.patch | 26 +++++++ packages/coreutils/coreutils-6.0/onceonly.m4 | 63 ++++++++++++++++ .../coreutils/coreutils-6.0/uptime-pow-lib.patch | 11 +++ packages/coreutils/coreutils-native_6.0.bb | 7 ++ packages/coreutils/coreutils_6.0.bb | 85 ++++++++++++++++++++++ 7 files changed, 234 insertions(+) create mode 100644 packages/coreutils/coreutils-6.0/.mtn2git_empty create mode 100644 packages/coreutils/coreutils-6.0/man.patch create mode 100644 packages/coreutils/coreutils-6.0/oe-old-tools.patch create mode 100644 packages/coreutils/coreutils-6.0/onceonly.m4 create mode 100644 packages/coreutils/coreutils-6.0/uptime-pow-lib.patch create mode 100644 packages/coreutils/coreutils-native_6.0.bb create mode 100644 packages/coreutils/coreutils_6.0.bb (limited to 'packages') diff --git a/packages/coreutils/coreutils-6.0/.mtn2git_empty b/packages/coreutils/coreutils-6.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/coreutils/coreutils-6.0/man.patch b/packages/coreutils/coreutils-6.0/man.patch new file mode 100644 index 0000000000..5060e4fdff --- /dev/null +++ b/packages/coreutils/coreutils-6.0/man.patch @@ -0,0 +1,42 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- coreutils-5.3.0/configure.ac~man ++++ coreutils-5.3.0/configure.ac +@@ -237,6 +237,20 @@ + AM_GNU_GETTEXT([external], [need-ngettext]) + AM_GNU_GETTEXT_VERSION(0.13.1) + ++AC_MSG_CHECKING([whether to build man pages]) ++AC_ARG_WITH(manpages, ++ AS_HELP_STRING([--with-manpages], ++ [Enable building of manpages (default=yes)]), ++ [cu_cv_build_manpages=$enableval], ++ [cu_cv_build_manpages=yes]) ++# help2man doesn't work when crosscompiling, as it needs to run the ++# binary that was built. ++if test x"$cross_compiling" = x"yes"; then ++ cu_cv_build_manpages=no ++fi ++AC_MSG_RESULT($cu_cv_build_manpages) ++AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes") ++ + AC_CONFIG_FILES( + Makefile + doc/Makefile +--- coreutils-5.3.0/Makefile.am~man ++++ coreutils-5.3.0/Makefile.am +@@ -1,6 +1,11 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + ++if ENABLE_MANPAGES + SUBDIRS = lib src doc man po tests ++else ++SUBDIRS = lib src doc po tests ++endif ++ + EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \ + .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \ + .x-sc_space_tab .x-sc_sun_os_names \ diff --git a/packages/coreutils/coreutils-6.0/oe-old-tools.patch b/packages/coreutils/coreutils-6.0/oe-old-tools.patch new file mode 100644 index 0000000000..495da36cf7 --- /dev/null +++ b/packages/coreutils/coreutils-6.0/oe-old-tools.patch @@ -0,0 +1,26 @@ +Index: coreutils-6.0/configure.ac +=================================================================== +--- coreutils-6.0.orig/configure.ac 2007-04-02 11:21:27.000000000 +0200 ++++ coreutils-6.0/configure.ac 2007-04-02 11:21:36.000000000 +0200 +@@ -26,7 +26,7 @@ + AC_CONFIG_HEADERS([config.h:config.hin]) + + AB_INIT() +-AM_INIT_AUTOMAKE([1.9.6 gnits dist-bzip2]) ++AM_INIT_AUTOMAKE([1.9.3 gnits dist-bzip2]) + + gl_DEFAULT_POSIX2_VERSION + gl_USE_SYSTEM_EXTENSIONS +Index: coreutils-6.0/m4/jm-macros.m4 +=================================================================== +--- coreutils-6.0.orig/m4/jm-macros.m4 2007-04-02 11:21:54.000000000 +0200 ++++ coreutils-6.0/m4/jm-macros.m4 2007-04-02 11:22:02.000000000 +0200 +@@ -23,7 +23,7 @@ + + AC_DEFUN([gl_MACROS], + [ +- AC_PREREQ(2.60) ++ AC_PREREQ(2.59) + + GNU_PACKAGE="GNU $PACKAGE" + AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE", diff --git a/packages/coreutils/coreutils-6.0/onceonly.m4 b/packages/coreutils/coreutils-6.0/onceonly.m4 new file mode 100644 index 0000000000..f6fec37cbf --- /dev/null +++ b/packages/coreutils/coreutils-6.0/onceonly.m4 @@ -0,0 +1,63 @@ +# onceonly.m4 serial 3 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl This file defines some "once only" variants of standard autoconf macros. +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC +dnl The advantage is that the check for each of the headers/functions/decls +dnl will be put only once into the 'configure' file. It keeps the size of +dnl the 'configure' file down, and avoids redundant output when 'configure' +dnl is run. +dnl The drawback is that the checks cannot be conditionalized. If you write +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to +dnl empty, and the check will be inserted before the body of the AC_DEFUNed +dnl function. + +dnl Autoconf version 2.57 or newer is recommended. +AC_PREREQ(2.54) + +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ + : + AC_FOREACH([gl_HEADER_NAME], [$1], [ + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]), + [-./], [___])), [ + AC_CHECK_HEADERS(gl_HEADER_NAME) + ]) + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, + [-./], [___]))) + ]) +]) + +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ + : + AC_FOREACH([gl_FUNC_NAME], [$1], [ + AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [ + AC_CHECK_FUNCS(defn([gl_FUNC_NAME])) + ]) + AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME])) + ]) +]) + +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of +# AC_CHECK_DECLS(DECL1, DECL2, ...). +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ + : + AC_FOREACH([gl_DECL_NAME], [$1], [ + AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [ + AC_CHECK_DECLS(defn([gl_DECL_NAME])) + ]) + AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME])) + ]) +]) diff --git a/packages/coreutils/coreutils-6.0/uptime-pow-lib.patch b/packages/coreutils/coreutils-6.0/uptime-pow-lib.patch new file mode 100644 index 0000000000..5eb3fca676 --- /dev/null +++ b/packages/coreutils/coreutils-6.0/uptime-pow-lib.patch @@ -0,0 +1,11 @@ +--- coreutils-5.3.0/src/Makefile.am.orig 2005-09-27 22:34:35.659272058 -0700 ++++ coreutils-5.3.0/src/Makefile.am 2005-09-27 22:34:39.403507668 -0700 +@@ -74,7 +74,7 @@ + sleep_LDADD = $(nanosec_libs) + tail_LDADD = $(nanosec_libs) + +-uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) ++uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS) + + su_LDADD = $(LDADD) $(LIB_CRYPT) + diff --git a/packages/coreutils/coreutils-native_6.0.bb b/packages/coreutils/coreutils-native_6.0.bb new file mode 100644 index 0000000000..ee90981895 --- /dev/null +++ b/packages/coreutils/coreutils-native_6.0.bb @@ -0,0 +1,7 @@ +SECTION = "base" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" +S = "${WORKDIR}/coreutils-${PV}" + +require coreutils_${PV}.bb +inherit native diff --git a/packages/coreutils/coreutils_6.0.bb b/packages/coreutils/coreutils_6.0.bb new file mode 100644 index 0000000000..59afd67bfb --- /dev/null +++ b/packages/coreutils/coreutils_6.0.bb @@ -0,0 +1,85 @@ +require coreutils.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ + file://man.patch;patch=1 \ + file://oe-old-tools.patch;patch=1 \ + file://onceonly.m4" + +# [ gets a special treatment and is not included in this +bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ + env expand expr factor fmt fold groups head hostid id install \ + join link logname md5sum mkfifo nice nl nohup od paste pathchk \ + pinky pr printenv printf ptx readlink seq sha1sum shred sort \ + split stat sum tac tail tee test tr tsort tty unexpand uniq \ + unlink users vdir wc who whoami yes \ + " + +# hostname gets a special treatment and is not included in this +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ + ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ + true uname \ + " + +sbindir_progs= "chroot" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 +} + +do_install () { + autotools_do_install + + # Renaming the utilities that should go in /usr/bin + for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /bin (FHS) + install -d ${D}${base_bindir} + for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /usr/sbin (FHS) + install -d ${D}${sbindir} + for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done + + # [ requires special handling because [.coreutils will cause the sed stuff + # in update-alternatives to fail, therefore use lbracket - the name used + # for the actual source file. + mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} + # hostname and uptime separated. busybox's versions are preferred + mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + +} + +pkg_postinst_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done + + # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. + update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 + update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 + update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 +} + +pkg_prerm_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The special cases + update-alternatives --remove hostname hostname.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove '[' 'lbracket.${PN}' +} -- cgit v1.2.3 From 335ea31f4d6d37a42e4fcca9011b24a80799bf13 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 2 Apr 2007 10:30:00 +0000 Subject: fis: Update fis util to one that doesn't require boost/libstdc++. Looks like it's working, but needs testing --- packages/fis/files/.mtn2git_empty | 0 packages/fis/files/fis.cc | 372 -------------------------------------- packages/fis/fis_1.0.bb | 8 +- 3 files changed, 3 insertions(+), 377 deletions(-) delete mode 100644 packages/fis/files/.mtn2git_empty delete mode 100644 packages/fis/files/fis.cc (limited to 'packages') diff --git a/packages/fis/files/.mtn2git_empty b/packages/fis/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fis/files/fis.cc b/packages/fis/files/fis.cc deleted file mode 100644 index 8c43eca811..0000000000 --- a/packages/fis/files/fis.cc +++ /dev/null @@ -1,372 +0,0 @@ -// fis.cc -// see http://svn.chezphil.org/utils -// (C) 2007 Philip Endecott - -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -#include -#include -#include - -#include -#include - -#include "Exception.hh" -#include "FileDescriptor.hh" -#include "utils.hh" -#include "endian.hh" - -#include - -using namespace std; -using namespace boost; -using namespace pbe; - - -static void check_dev(string device) -{ - if (device=="") { - throw "You must specify a device using -d"; - } -} - - -// This is taken from drivers/mtd/redboot.c in the Linux source -struct fis_image_desc { - char name[16]; // Null terminated name - uint32_t flash_base; // Address within FLASH of image - uint32_t mem_base; // Address in memory where it executes - uint32_t size; // Length of image - uint32_t entry_point; // Execution entry point - uint32_t data_length; // Length of actual data - uint32_t skips[53]; - uint32_t desc_cksum; // Checksum over image descriptor - uint32_t file_cksum; // Checksum over image data -}; - -ostream& operator<<(ostream& strm, const fis_image_desc& d) -{ - strm << format("%16s: addr = 0x%08x, size = 0x%08x\n") - % (d.name) % (d.flash_base) % (d.size); - for (unsigned int i=0; i<(sizeof(d.skips)/4); ++i) { - if (d.skips[i]==0x736b6970 || d.skips[i]==0x70696b73) { // "skip" - uint32_t offset = d.skips[i+1]; - uint32_t length = d.skips[i+2]; - strm << format(" skip: %08x + %08x\n") - % (offset) % (length); - i+=2; - } - } - return strm; -} - - -void check_checksum(const fis_image_desc& d) -{ - // This isn't checked by the kernel mtd driver, which has this - // comment: "RedBoot doesn't actually write the desc_cksum field yet - // AFAICT". I don't know what checksum is supposed to be used here. -} - -void compute_checksum(fis_image_desc& d) -{ - // ditto -} - - -typedef map dir_t; - - -static void swap_entry_endianness(fis_image_desc& d) -{ - d.flash_base = swap_end_32(d.flash_base); - d.mem_base = swap_end_32(d.mem_base); - d.size = swap_end_32(d.size); - d.entry_point = swap_end_32(d.entry_point); - d.data_length = swap_end_32(d.data_length); - for (unsigned int i=0; i<(sizeof(d.skips)/4); ++i) { - d.skips[i] = swap_end_32(d.skips[i]); - } -} - - -static void load_dir(FileDescriptor& fd, int offset, int size, bool swap_endianness, - dir_t& dir) -{ - fd.seek(offset); - int num_entries = size/sizeof(fis_image_desc); - for (int i=0; i(); - if (d.name[0]!=static_cast(0xff)) { - check_checksum(d); - if (swap_endianness) { - swap_entry_endianness(d); - } - dir[d.flash_base] = d; - } - } -} - - -static void write_blank_entries(FileDescriptor& fd, int n) -{ - char dummy[sizeof(fis_image_desc)]; - for (unsigned int i=0; isecond; - compute_checksum(d); - if (swap_endianness) { - swap_entry_endianness(d); - } - fd.binwrite(d); - } - write_blank_entries(fd,num_entries-dir.size()); -} - - -static void fis_list(string device, int offset, int size, bool swap_endianness) -{ - FileDescriptor fd(device,FileDescriptor::read_only); - dir_t dir; - load_dir(fd,offset,size,swap_endianness,dir); - for (dir_t::const_iterator i = dir.begin(); - i != dir.end(); ++i) { - cout << i->second; - } -} - - -static void fis_init(string device, int offset, int size) -{ - FileDescriptor fd(device,FileDescriptor::create); - fd.seek(offset); - int num_entries = size/sizeof(fis_image_desc); - write_blank_entries(fd,num_entries); -} - - -static void check_overlap(const dir_t& dir, uint32_t addr, uint32_t size) -{ - uint32_t end_addr = addr+size; - for (dir_t::const_iterator i = dir.begin(); - i != dir.end(); ++i) { - if (addr<(i->second.flash_base+i->second.size) - && end_addr>i->second.flash_base) { - throw "New partition overlaps existing partitions"; - } - } -} - - -static void fis_create(string device, int offset, int size, bool swap_endianness, - int argc, char* argv[]) -{ - fis_image_desc d; - d.mem_base = 0; - d.entry_point = 0; - d.data_length = 0; - for (unsigned int i=0; i<(sizeof(d.skips)/4); ++i) { - d.skips[i] = 0; - } - d.desc_cksum = 0; - d.file_cksum = 0; - - for (int i=0; i=16) { - throw "name too long, max 16 chars including terminating null"; - } - for (int j=0; j<16; j++) { - char c = name.c_str()[j]; - d.name[j] = c; - if (!c) { - for (; j<16; ++j) { - d.name[j]=0; - } - break; - } - } - } else { - cerr << "Unrecognised option '" << arg << "'\n"; - exit(1); - } - } - - FileDescriptor fd(device,FileDescriptor::read_write); - dir_t dir; - load_dir(fd,offset,size,swap_endianness,dir); - check_overlap(dir,d.flash_base,d.size); - dir[d.flash_base] = d; - save_dir(fd,offset,size,swap_endianness,dir); -} - - -static void fis_delete(string device, int offset, int size, bool swap_endianness, - string name) -{ - FileDescriptor fd(device,FileDescriptor::read_write); - dir_t dir; - load_dir(fd,offset,size,swap_endianness,dir); - - for (dir_t::iterator i = dir.begin(); - i != dir.end(); ++i) { - string this_name(i->second.name); - if (this_name == name) { - dir.erase(i); - save_dir(fd,offset,size,swap_endianness,dir); - return; - } - } - - throw "No partition found with specified name"; -} - - -static void usage() -{ - cerr << "Usage:\n" - << " fis [options] list\n" - << " fis [options] init\n" - << " fis [options] create -f address -l size -n name\n" - << " fis [options] delete name\n" - << "Options:\n" - << " -d device specify /dev/mtd* device containing directory\n" - << " -o offset specify offset into device of start of directory\n" - << " (in decimal; prefix with 0x for hex)\n" - << " -s size specify size of directory in bytes\n" - << " -e swap endianness\n"; -} - - -int main(int argc, char* argv[]) -{ - try { try { - - if (argc==1) { - usage(); - exit(1); - } - - string device=""; - int offset=0; - int size=0; - bool swap_endianness=false; - - for (int i=1; i Date: Mon, 2 Apr 2007 10:53:19 +0000 Subject: redboot-utils: move package fis to redboot-utils, add package fconfig --- packages/fis/.mtn2git_empty | 0 packages/fis/fis_1.0.bb | 16 ---------------- packages/redboot-utils/.mtn2git_empty | 0 packages/redboot-utils/fconfig_20060419.bb | 9 +++++++++ packages/redboot-utils/fis_1.0.bb | 16 ++++++++++++++++ 5 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 packages/fis/.mtn2git_empty delete mode 100644 packages/fis/fis_1.0.bb create mode 100644 packages/redboot-utils/.mtn2git_empty create mode 100644 packages/redboot-utils/fconfig_20060419.bb create mode 100644 packages/redboot-utils/fis_1.0.bb (limited to 'packages') diff --git a/packages/fis/.mtn2git_empty b/packages/fis/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fis/fis_1.0.bb b/packages/fis/fis_1.0.bb deleted file mode 100644 index d1170b6ba8..0000000000 --- a/packages/fis/fis_1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace" -PR = "r2" - -SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \ - svn://svn.chezphil.org/;module=libpbe;proto=http" - -do_compile() { - ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c -} - -do_install() { - ${STRIP} ${WORKDIR}/fis-${PV}/fis - - install -d ${D}/${sbindir} - install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} -} diff --git a/packages/redboot-utils/.mtn2git_empty b/packages/redboot-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/redboot-utils/fconfig_20060419.bb b/packages/redboot-utils/fconfig_20060419.bb new file mode 100644 index 0000000000..d34d053aee --- /dev/null +++ b/packages/redboot-utils/fconfig_20060419.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Tool to edit the Redboot config from userspace" +PR = "r0" + +SRC_URI = "http://andrzejekiert.ovh.org/software/fconfig/fconfig-20060419.tar.gz" + +S = ${WORKDIR}/fconfig +do_compile() { + ${MAKE} +} \ No newline at end of file diff --git a/packages/redboot-utils/fis_1.0.bb b/packages/redboot-utils/fis_1.0.bb new file mode 100644 index 0000000000..d1170b6ba8 --- /dev/null +++ b/packages/redboot-utils/fis_1.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace" +PR = "r2" + +SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \ + svn://svn.chezphil.org/;module=libpbe;proto=http" + +do_compile() { + ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c +} + +do_install() { + ${STRIP} ${WORKDIR}/fis-${PV}/fis + + install -d ${D}/${sbindir} + install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} +} -- cgit v1.2.3 From 9dddf742c0ee774ef08ae9eec0c46efc8f7cdf56 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 2 Apr 2007 13:50:18 +0000 Subject: osb-jscore_svn.bb, osb-nrcit_svn.bb, osb-nrcore_svn.bb : update the PV to reflect svn updates, some small changes to fix building. --- packages/gtk-webcore/osb-jscore_svn.bb | 2 +- packages/gtk-webcore/osb-nrcit_svn.bb | 2 +- packages/gtk-webcore/osb-nrcore_svn.bb | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index a7f6201aa2..eb65a9b2fc 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEFAULT_PREFERENCE = "-1" -PV = "0.5.0+svn${SRCDATE}" +PV = "0.5.2+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index c72714dc7f..8a11d61996 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -4,7 +4,7 @@ LICENSE = "nokia" PRIORITY = "optional" SECTION = "gpe" -PV = "0.5.0+svn${SRCDATE}" +PV = "0.5.2+svn${SRCDATE}" PR = "r0" DEPENDS = "curl librsvg osb-nrcore" diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index b7f9d069f1..de89ef78be 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -2,12 +2,13 @@ require osb-nrcore.inc DEFAULT_PREFERENCE = "-1" -PV = "0.5.0+svn${SRCDATE}" +PV = "0.5.2+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ + svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \ - file://build_silence.patch;patch=0" + file://build_silence.patch;patch=0;maxdate=20070401" S = "${WORKDIR}/NRCore" -- cgit v1.2.3 From c49aefc1a3e67251c0e75209d8760f289b25bc9c Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 2 Apr 2007 14:27:10 +0000 Subject: fconfig: Actually install binary, so it gets packaged --- packages/redboot-utils/fconfig_20060419.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/redboot-utils/fconfig_20060419.bb b/packages/redboot-utils/fconfig_20060419.bb index d34d053aee..561718f9b2 100644 --- a/packages/redboot-utils/fconfig_20060419.bb +++ b/packages/redboot-utils/fconfig_20060419.bb @@ -1,9 +1,14 @@ DESCRIPTION = "Tool to edit the Redboot config from userspace" -PR = "r0" +PR = "r1" SRC_URI = "http://andrzejekiert.ovh.org/software/fconfig/fconfig-20060419.tar.gz" S = ${WORKDIR}/fconfig do_compile() { ${MAKE} -} \ No newline at end of file +} + +do_install() { + install -d ${D}/${sbindir} + install -m 755 ${S}/fconfig ${D}/${sbindir} +} -- cgit v1.2.3 From eabea6461b3f76b9f47275f463072567a2c006d7 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 2 Apr 2007 14:28:49 +0000 Subject: kazehakase_0.4.5.bb : interesting gtk-webore based browser, currently requires svn versions of osb-nr* and osb-jscore stuff. --- packages/kazehakase/.mtn2git_empty | 0 packages/kazehakase/kazehakase_0.4.5.bb | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 packages/kazehakase/.mtn2git_empty create mode 100644 packages/kazehakase/kazehakase_0.4.5.bb (limited to 'packages') diff --git a/packages/kazehakase/.mtn2git_empty b/packages/kazehakase/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/kazehakase/kazehakase_0.4.5.bb b/packages/kazehakase/kazehakase_0.4.5.bb new file mode 100644 index 0000000000..494e19bad9 --- /dev/null +++ b/packages/kazehakase/kazehakase_0.4.5.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A gtk-webcore based browser" +HOMEPAGE = "http://kazehakase.sourceforge.jp/" +SECTION = "x11/network" +LICENSE = "GPLv2" +DEPENDS = "osb-nrcit glib-2.0" +SRC_URI = "http://osdn.dl.sourceforge.jp/kazehakase/24791/kazehakase-${PV}.tar.gz" + +inherit autotools pkgconfig + +DEFAULT_PREFERENCE = "-1" + -- cgit v1.2.3 From 0107cec1246dc6fecc2a855bd64a95d1290b1099 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 2 Apr 2007 14:33:21 +0000 Subject: ipkg: remove a couple of outdated ones, update is_processing patch courtesy OpenMoko, Inc. --- packages/ipkg/files/is-processing.patch | 60 ++++++++++++++++++++-- packages/ipkg/ipkg-0.99.153/.mtn2git_empty | 0 packages/ipkg/ipkg-0.99.153/fix-bug1393.patch | 19 ------- packages/ipkg/ipkg-0.99.155/.mtn2git_empty | 0 .../ipkg-0.99.155/upgrade-message-garbage.patch | 14 ----- packages/ipkg/ipkg-native_0.99.152.bb | 3 -- packages/ipkg/ipkg-native_0.99.153.bb | 3 -- packages/ipkg/ipkg-native_0.99.154.bb | 3 -- packages/ipkg/ipkg-native_0.99.159.bb | 3 -- packages/ipkg/ipkg_0.99.152.bb | 2 - packages/ipkg/ipkg_0.99.153.bb | 8 --- packages/ipkg/ipkg_0.99.154.bb | 2 - packages/ipkg/ipkg_0.99.155.bb | 3 -- packages/ipkg/ipkg_0.99.159.bb | 2 - packages/ipkg/ipkg_0.99.163.bb | 2 +- 15 files changed, 57 insertions(+), 67 deletions(-) delete mode 100644 packages/ipkg/ipkg-0.99.153/.mtn2git_empty delete mode 100644 packages/ipkg/ipkg-0.99.153/fix-bug1393.patch delete mode 100644 packages/ipkg/ipkg-0.99.155/.mtn2git_empty delete mode 100644 packages/ipkg/ipkg-0.99.155/upgrade-message-garbage.patch delete mode 100644 packages/ipkg/ipkg-native_0.99.152.bb delete mode 100644 packages/ipkg/ipkg-native_0.99.153.bb delete mode 100644 packages/ipkg/ipkg-native_0.99.154.bb delete mode 100644 packages/ipkg/ipkg-native_0.99.159.bb delete mode 100644 packages/ipkg/ipkg_0.99.152.bb delete mode 100644 packages/ipkg/ipkg_0.99.153.bb delete mode 100644 packages/ipkg/ipkg_0.99.154.bb delete mode 100644 packages/ipkg/ipkg_0.99.155.bb delete mode 100644 packages/ipkg/ipkg_0.99.159.bb (limited to 'packages') diff --git a/packages/ipkg/files/is-processing.patch b/packages/ipkg/files/is-processing.patch index 779933ba1c..45ede41668 100644 --- a/packages/ipkg/files/is-processing.patch +++ b/packages/ipkg/files/is-processing.patch @@ -1,6 +1,6 @@ diff -Nur ipkg-0.99.163.orig/ipkg_install.c ipkg-0.99.163/ipkg_install.c --- ipkg-0.99.163.orig/ipkg_install.c 2006-03-30 21:50:24.000000000 +0800 -+++ ipkg-0.99.163/ipkg_install.c 2006-08-10 09:30:40.000000000 +0800 ++++ ipkg-0.99.163/ipkg_install.c 2007-03-15 08:01:20.000000000 +0800 @@ -211,6 +211,7 @@ anyone ever wants to make a nice libipkg. */ @@ -9,9 +9,35 @@ diff -Nur ipkg-0.99.163.orig/ipkg_install.c ipkg-0.99.163/ipkg_install.c return ipkg_install_pkg(conf, new,0); } +diff -Nur ipkg-0.99.163.orig/libbb/unzip.c ipkg-0.99.163/libbb/unzip.c +--- ipkg-0.99.163.orig/libbb/unzip.c 2006-02-06 16:13:02.000000000 +0800 ++++ ipkg-0.99.163/libbb/unzip.c 2007-03-15 08:03:45.000000000 +0800 +@@ -1028,13 +1028,15 @@ + */ + extern void gz_close(int gunzip_pid) + { +- if (kill(gunzip_pid, SIGTERM) == -1) { +- error_msg_and_die("*** Couldnt kill old gunzip process *** aborting"); +- } ++ if (kill(gunzip_pid, 0) == 0) { ++ if (kill(gunzip_pid, SIGTERM) == -1) { ++ error_msg_and_die("*** Couldnt kill old gunzip process *** aborting"); ++ } + +- if (waitpid(gunzip_pid, NULL, 0) == -1) { +- printf("Couldnt wait ?"); ++ if (waitpid(gunzip_pid, NULL, 0) == -1) { ++ printf("Couldnt wait ?"); ++ } + } +- free(window); +- free(crc_table); ++ free(window); ++ free(crc_table); + } diff -Nur ipkg-0.99.163.orig/pkg.c ipkg-0.99.163/pkg.c --- ipkg-0.99.163.orig/pkg.c 2006-04-21 04:29:28.000000000 +0800 -+++ ipkg-0.99.163/pkg.c 2006-08-10 09:35:06.000000000 +0800 ++++ ipkg-0.99.163/pkg.c 2007-03-20 15:11:32.845064480 +0800 @@ -33,6 +33,7 @@ #include "xsystem.h" #include "ipkg_conf.h" @@ -98,7 +124,32 @@ diff -Nur ipkg-0.99.163.orig/pkg.c ipkg-0.99.163/pkg.c } } else if (strcasecmp(field, "MD5sum") == 0) { /* MD5sum */ -@@ -1016,6 +1049,12 @@ +@@ -871,6 +904,24 @@ + } + temp[0]='\0'; + snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n", pkg->size); ++ } else { ++ if ( pkg->local_filename ) { ++ struct stat buf; ++ memset(&buf, 0, sizeof(struct stat)); ++ ++ if ( stat(pkg->local_filename, &buf) == 0 ) { ++ ++ sprintf_alloc(&pkg->size, "%d", buf.st_size); ++ temp = (char *)realloc(temp, strlen(pkg->size)+8); ++ if ( temp == NULL ){ ++ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); ++ return NULL; ++ } ++ temp[0]='\0'; ++ snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n", pkg->size); ++ } ++ } ++ + } + } else if (strcasecmp(field, "Source") == 0) { + /* Source */ +@@ -1016,6 +1067,12 @@ pkg_print_field(pkg, file, "Essential"); /* @@@@ should be removed in future release. */ pkg_print_field(pkg, file, "Architecture"); pkg_print_field(pkg, file, "Conffiles"); @@ -113,7 +164,7 @@ diff -Nur ipkg-0.99.163.orig/pkg.c ipkg-0.99.163/pkg.c } diff -Nur ipkg-0.99.163.orig/pkg.h ipkg-0.99.163/pkg.h --- ipkg-0.99.163.orig/pkg.h 2006-05-30 16:31:08.000000000 +0800 -+++ ipkg-0.99.163/pkg.h 2006-08-10 09:19:14.000000000 +0800 ++++ ipkg-0.99.163/pkg.h 2007-03-15 08:01:20.000000000 +0800 @@ -176,6 +176,10 @@ int arch_priority; /* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */ @@ -125,3 +176,4 @@ diff -Nur ipkg-0.99.163.orig/pkg.h ipkg-0.99.163/pkg.h }; pkg_t *pkg_new(void); + diff --git a/packages/ipkg/ipkg-0.99.153/.mtn2git_empty b/packages/ipkg/ipkg-0.99.153/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg/ipkg-0.99.153/fix-bug1393.patch b/packages/ipkg/ipkg-0.99.153/fix-bug1393.patch deleted file mode 100644 index 86af6b1d8e..0000000000 --- a/packages/ipkg/ipkg-0.99.153/fix-bug1393.patch +++ /dev/null @@ -1,19 +0,0 @@ -patch added into upstream bugzilla: -http://handhelds.org/~bugzilla/show_bug.cgi?id=1393 -Index: pkg_hash.c -=================================================================== -RCS file: /cvs/familiar/dist/ipkg/C/pkg_hash.c,v -retrieving revision 1.71 -diff -u -r1.71 pkg_hash.c ---- C/pkg_hash.c 29 Jul 2005 20:19:39 -0000 1.71 -+++ C/pkg_hash.c 2 Sep 2005 13:23:08 -0000 -@@ -216,7 +216,8 @@ - pkg_t *maybe = vec->pkgs[i]; - ipkg_message(conf, IPKG_DEBUG, " %s arch=%s arch_priority=%d \n", - maybe->name, maybe->architecture, maybe->arch_priority); -- if (maybe->arch_priority > 0) { -+ if ((maybe->arch_priority > 0) -+ && ((constraint_fcn == NULL) || constraint_fcn(maybe, cdata))) { - max_count++; - abstract_pkg_vec_insert(matching_apkgs, maybe->parent); - pkg_vec_insert(matching_pkgs, maybe); diff --git a/packages/ipkg/ipkg-0.99.155/.mtn2git_empty b/packages/ipkg/ipkg-0.99.155/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg/ipkg-0.99.155/upgrade-message-garbage.patch b/packages/ipkg/ipkg-0.99.155/upgrade-message-garbage.patch deleted file mode 100644 index 6e79f79341..0000000000 --- a/packages/ipkg/ipkg-0.99.155/upgrade-message-garbage.patch +++ /dev/null @@ -1,14 +0,0 @@ -Prevent the output of spurious extra characters from -the stack. This patch is in the manner of the rest of -the code, there is no good reason for this. - ---- C/ipkg_install.c 1970-01-01 00:00:00.000000000 +0000 -+++ C/ipkg_install.c 1970-01-01 00:00:00.000000000 +0000 -@@ -723,6 +723,7 @@ static int ipkg_install_check_downgrade( - return rc; - } else { - char message_out[15] ; -+ memset(message_out,'\x0',15); - if ( message ) - strncpy( message_out,"Upgrading ",strlen("Upgrading ") ); - else diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb deleted file mode 100644 index f2deb33fba..0000000000 --- a/packages/ipkg/ipkg-native_0.99.152.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ipkg_${PV}.bb -require ipkg-native.inc -PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.153.bb b/packages/ipkg/ipkg-native_0.99.153.bb deleted file mode 100644 index f2deb33fba..0000000000 --- a/packages/ipkg/ipkg-native_0.99.153.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ipkg_${PV}.bb -require ipkg-native.inc -PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb deleted file mode 100644 index f2deb33fba..0000000000 --- a/packages/ipkg/ipkg-native_0.99.154.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ipkg_${PV}.bb -require ipkg-native.inc -PR = "r1" diff --git a/packages/ipkg/ipkg-native_0.99.159.bb b/packages/ipkg/ipkg-native_0.99.159.bb deleted file mode 100644 index f2deb33fba..0000000000 --- a/packages/ipkg/ipkg-native_0.99.159.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ipkg_${PV}.bb -require ipkg-native.inc -PR = "r1" diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb deleted file mode 100644 index 0d10a29c3f..0000000000 --- a/packages/ipkg/ipkg_0.99.152.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ipkg.inc -PR = "r3" diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb deleted file mode 100644 index 5852b6afc4..0000000000 --- a/packages/ipkg/ipkg_0.99.153.bb +++ /dev/null @@ -1,8 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require ipkg.inc - -PR = "r4" - -SRC_URI += "file://fix-bug1393.patch;patch=1" - diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb deleted file mode 100644 index 20a1996658..0000000000 --- a/packages/ipkg/ipkg_0.99.154.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ipkg.inc -PR = "r4" diff --git a/packages/ipkg/ipkg_0.99.155.bb b/packages/ipkg/ipkg_0.99.155.bb deleted file mode 100644 index e5ff6dc4c2..0000000000 --- a/packages/ipkg/ipkg_0.99.155.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ipkg.inc -PR = "r2" -SRC_URI += "file://upgrade-message-garbage.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb deleted file mode 100644 index 8455050622..0000000000 --- a/packages/ipkg/ipkg_0.99.159.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ipkg.inc -PR = "r1" diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb index de3562d603..627a1fbdfe 100644 --- a/packages/ipkg/ipkg_0.99.163.bb +++ b/packages/ipkg/ipkg_0.99.163.bb @@ -1,5 +1,5 @@ include ipkg.inc -PR = "r2" +PR = "r3" S = "${WORKDIR}/ipkg-${PV}" -- cgit v1.2.3 From 3f58d1ac54a1e780c9533e4611a1b664d37103be Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 14:41:09 +0000 Subject: gpe-applauncher: Remove obsolete patch. --- packages/gpephone/gpe-applauncher_0.7.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb index 349330047b..866dad14e4 100644 --- a/packages/gpephone/gpe-applauncher_0.7.bb +++ b/packages/gpephone/gpe-applauncher_0.7.bb @@ -9,8 +9,6 @@ DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-cli GPE_TARBALL_SUFFIX= "gz" inherit gpephone autotools -SRC_URI += " file://default-icon.patch;patch=1;pnum=0" - #EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} += '${datadir}/themes' -- cgit v1.2.3 From dc0585951bdd2a11d2cc48bf54fbfd447216a06f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 14:41:46 +0000 Subject: gpe-applauncher: remove patch file --- .../gpephone/gpe-applauncher-0.7/default-icon.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 packages/gpephone/gpe-applauncher-0.7/default-icon.patch (limited to 'packages') diff --git a/packages/gpephone/gpe-applauncher-0.7/default-icon.patch b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch deleted file mode 100644 index e1ec24f141..0000000000 --- a/packages/gpephone/gpe-applauncher-0.7/default-icon.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: applications.c -=================================================================== ---- applications.c (Revision 598) -+++ applications.c (Arbeitskopie) -@@ -463,8 +463,13 @@ - applauncher_settings.themename ? applauncher_settings.themename : "default", - THEMEFOLDER, ICON_LOADING, NULL); - } -- -- g_print ("\nloading icon: %s\n", file); -+ -+ if (!g_file_test (file, G_FILE_TEST_EXISTS)) -+ { -+ g_free (file); -+ file = g_build_filename (LOCAL_THEMEDIR, "default", -+ THEMEFOLDER, ICON_LOADING, NULL); -+ } - - nc_window = gtk_app_notification_new(); - gtk_widget_set_size_request(GTK_WIDGET(nc_window), -1, 70); -- cgit v1.2.3 From e7e153b6e9e35a376f1418a4239ad52a4716c40e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 2 Apr 2007 14:59:56 +0000 Subject: openmoko-theme-qvga: don't package the vga theme and label as qvga, use the qvga theme instead --- packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb index 0c19db77ac..44c296f258 100644 --- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -8,7 +8,7 @@ inherit openmoko-base SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http" S = "${WORKDIR}" -dirs = "themes/openmoko-standard" +dirs = "themes/openmoko-standard-qvga" do_install() { find ${WORKDIR} -name ".svn" | xargs rm -rf -- cgit v1.2.3 From aa34d129b1ff396d8f2c16b74bbbb50e9101f313 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 2 Apr 2007 15:56:27 +0000 Subject: openmoko-keyboard: catch up with changes in OM svn --- packages/openmoko-apps/openmoko-keyboard_svn.bb | 19 ------------------- packages/openmoko-inputmethods/.mtn2git_empty | 0 .../openmoko-inputmethods/openmoko-keyboard_svn.bb | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 packages/openmoko-apps/openmoko-keyboard_svn.bb create mode 100644 packages/openmoko-inputmethods/.mtn2git_empty create mode 100644 packages/openmoko-inputmethods/openmoko-keyboard_svn.bb (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-keyboard_svn.bb b/packages/openmoko-apps/openmoko-keyboard_svn.bb deleted file mode 100644 index 5bf5bbdd6a..0000000000 --- a/packages/openmoko-apps/openmoko-keyboard_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" -LICENSE = "GPL" -DEPENDS = "libfakekey expat libxft" -SECTION = "openmoko/input-methods" -PV = "0.0+svn${SRCDATE}" - -inherit openmoko autotools pkgconfig gettext - -SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http" - -S = "${WORKDIR}/${PN}" - -EXTRA_OECONF = "--disable-cairo" - -FILES_${PN} = "${bindir}/* \ - ${datadir}/applications \ - ${datadir}/pixmaps \ - ${datadir}/openmoko-keyboard" - diff --git a/packages/openmoko-inputmethods/.mtn2git_empty b/packages/openmoko-inputmethods/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb new file mode 100644 index 0000000000..077105a349 --- /dev/null +++ b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" +LICENSE = "GPL" +DEPENDS = "libfakekey expat libxft" +SECTION = "openmoko/inputmethods" +PV = "0.0+svn${SRCDATE}" +PR = "r1" + +inherit openmoko autotools pkgconfig gettext + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = "--disable-cairo" + +FILES_${PN} = "${bindir}/* \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/openmoko-keyboard" + -- cgit v1.2.3 From 40896f4a8f30bc6459fd7147aa43f4ccb4cb2146 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 2 Apr 2007 15:59:35 +0000 Subject: packages/shasum: Add a sha256sum utility with little dependencies To avoid weird requirements add a sha256sum tool to OpenEmbedded directly. This will be part of the OE manifest and be guarded by the monotone OE trust chain. --- packages/shasum/.mtn2git_empty | 0 packages/shasum/files/.mtn2git_empty | 0 packages/shasum/files/main.c | 60 +++++++ packages/shasum/files/mhash_sha256.h | 64 +++++++ packages/shasum/files/sha256.c | 322 +++++++++++++++++++++++++++++++++++ packages/shasum/shasum-native.bb | 7 + packages/shasum/shasum.inc | 18 ++ 7 files changed, 471 insertions(+) create mode 100644 packages/shasum/.mtn2git_empty create mode 100644 packages/shasum/files/.mtn2git_empty create mode 100644 packages/shasum/files/main.c create mode 100644 packages/shasum/files/mhash_sha256.h create mode 100644 packages/shasum/files/sha256.c create mode 100644 packages/shasum/shasum-native.bb create mode 100644 packages/shasum/shasum.inc (limited to 'packages') diff --git a/packages/shasum/.mtn2git_empty b/packages/shasum/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/shasum/files/.mtn2git_empty b/packages/shasum/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/shasum/files/main.c b/packages/shasum/files/main.c new file mode 100644 index 0000000000..0748a94f3a --- /dev/null +++ b/packages/shasum/files/main.c @@ -0,0 +1,60 @@ +#include +#include + +#include "mhash_sha256.h" + +/* + * from driver.c of mhash + */ +static const char hexconvtab[] = "0123456789abcdef"; + +static char * +bin2hex(const unsigned char *old, const size_t oldlen, size_t * newlen) +{ + unsigned char *new = NULL; + int i, j; + + new = (char *) malloc(oldlen * 2 * sizeof(char) + 1); + if (!new) + return (new); + + for (i = j = 0; i < oldlen; i++) { + new[j++] = hexconvtab[old[i] >> 4]; + new[j++] = hexconvtab[old[i] & 15]; + } + new[j] = '\0'; + + if (newlen) + *newlen = oldlen * 2 * sizeof(char); + + return (new); +} + + +int main(int argc, char** argv) +{ + FILE *file; + size_t n; + SHA256_CTX ctx; + unsigned char buf[1024]; + byte output[33]; + + if ( argc <= 1 ) { + return EXIT_FAILURE; + } + + if ( (file=fopen(argv[1], "rb")) == NULL ) { + return EXIT_FAILURE; + } + + sha256_init(&ctx); + + while ( (n=fread( buf, 1, sizeof(buf), file)) > 0 ) + sha256_update(&ctx, buf, n ); + + sha256_final(&ctx); + sha256_digest(&ctx, output); + + printf("%s ?%s\n", bin2hex(output, 32, &n), argv[1]); + return EXIT_SUCCESS; +} diff --git a/packages/shasum/files/mhash_sha256.h b/packages/shasum/files/mhash_sha256.h new file mode 100644 index 0000000000..46090c5f3e --- /dev/null +++ b/packages/shasum/files/mhash_sha256.h @@ -0,0 +1,64 @@ +/* sha.h + * + * The sha1 and sha256 hash functions. + */ + +/* nettle, low-level cryptographics library + * + * Copyright (C) 2001 Niels Möller + * + * The nettle library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * The nettle library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the nettle library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + +#ifndef NETTLE_SHA_H_INCLUDED +#define NETTLE_SHA_H_INCLUDED + +#include + +typedef uint32_t word32; +typedef unsigned char byte; + + +/* SHA256 */ + +#define SHA256_DIGEST_SIZE 32 +#define SHA256_DATA_SIZE 64 + +/* Digest is kept internally as 8 32-bit words. */ +#define _SHA256_DIGEST_LENGTH 8 + +typedef struct sha256_ctx +{ + word32 state[_SHA256_DIGEST_LENGTH]; /* State variables */ + word32 count_low, count_high; /* 64-bit block count */ + byte block[SHA256_DATA_SIZE]; /* SHA256 data buffer */ + unsigned int index; /* index into buffer */ +} SHA256_CTX; + +void +sha256_init(struct sha256_ctx *ctx); + +void +sha256_update(struct sha256_ctx *ctx, const byte *data, unsigned length); + +void +sha256_final(struct sha256_ctx *ctx); + +void +sha256_digest(const struct sha256_ctx *ctx, byte *digest); + + +#endif /* NETTLE_SHA_H_INCLUDED */ diff --git a/packages/shasum/files/sha256.c b/packages/shasum/files/sha256.c new file mode 100644 index 0000000000..e2ee2c6b4e --- /dev/null +++ b/packages/shasum/files/sha256.c @@ -0,0 +1,322 @@ +/* sha256.h + * + * The sha256 hash function. + */ + +/* nettle, low-level cryptographics library + * + * Copyright (C) 2001 Niels Möller + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * The nettle library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the nettle library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + +/* Modelled after the sha1.c code by Peter Gutmann. */ + +#include "mhash_sha256.h" +#include +#include + + +#ifndef EXTRACT_UCHAR +#define EXTRACT_UCHAR(p) (*(unsigned char *)(p)) +#endif + +#define STRING2INT(s) ((((((EXTRACT_UCHAR(s) << 8) \ + | EXTRACT_UCHAR(s+1)) << 8) \ + | EXTRACT_UCHAR(s+2)) << 8) \ + | EXTRACT_UCHAR(s+3)) + +/* This has been modified in order to fit in mhash. + * --nmav. + */ + +/* A block, treated as a sequence of 32-bit words. */ +#define SHA256_DATA_LENGTH 16 + +#define ROTR(n,x) ((x)>>(n) | ((x)<<(32-(n)))) +#define SHR(n,x) ((x)>>(n)) + +/* The SHA256 functions. The Choice function is the same as the SHA1 + function f1, and the majority function is the same as the SHA1 f3 + function. They can be optimized to save one boolean operation each + - thanks to Rich Schroeppel, rcs@cs.arizona.edu for discovering + this */ + +/* #define Choice(x,y,z) ( ( (x) & (y) ) | ( ~(x) & (z) ) ) */ +#define Choice(x,y,z) ( (z) ^ ( (x) & ( (y) ^ (z) ) ) ) +/* #define Majority(x,y,z) ( ((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)) ) */ +#define Majority(x,y,z) ( ((x) & (y)) ^ ((z) & ((x) ^ (y))) ) + +#define S0(x) (ROTR(2,(x)) ^ ROTR(13,(x)) ^ ROTR(22,(x))) +#define S1(x) (ROTR(6,(x)) ^ ROTR(11,(x)) ^ ROTR(25,(x))) + +#define s0(x) (ROTR(7,(x)) ^ ROTR(18,(x)) ^ SHR(3,(x))) +#define s1(x) (ROTR(17,(x)) ^ ROTR(19,(x)) ^ SHR(10,(x))) + +/* Generated by the shadata program. */ +static const word32 K[64] = { + 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, + 0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, + 0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL, + 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL, + 0xe49b69c1UL, 0xefbe4786UL, 0xfc19dc6UL, 0x240ca1ccUL, + 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, + 0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, + 0xc6e00bf3UL, 0xd5a79147UL, 0x6ca6351UL, 0x14292967UL, + 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL, + 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, + 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, + 0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, + 0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL, + 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL, + 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, + 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL, +}; + +/* The initial expanding function. The hash function is defined over an + 64-word expanded input array W, where the first 16 are copies of the input + data, and the remaining 64 are defined by + + W[ t ] = s1(W[t-2] + W[t-7] + s0(W[i-15] + W[i-16] + + This implementation generates these values on the fly in a circular + buffer - thanks to Colin Plumb, colin@nyx10.cs.du.edu for this + optimization. +*/ + +#define EXPAND(W,i) \ +( W[(i) & 15 ] += (s1(W[((i)-2) & 15]) + W[((i)-7) & 15] + s0(W[((i)-15) & 15])) ) + +/* The prototype SHA sub-round. The fundamental sub-round is: + + T1 = h + S1(e) + Choice(e,f,g) + K[t] + W[t] + T2 = S0(a) + Majority(a,b,c) + a' = T1+T2 + b' = a + c' = b + d' = c + e' = d + T1 + f' = e + g' = f + h' = g + + but this is implemented by unrolling the loop 8 times and renaming + the variables + ( h, a, b, c, d, e, f, g ) = ( a, b, c, d, e, f, g, h ) each + iteration. This code is then replicated 8, using the next 8 values + from the W[] array each time */ + +/* FIXME: We can probably reorder this to optimize away at least one + * of T1 and T2. It's crucial that DATA is only used once, as that + * argument will have side effects. */ +#define ROUND(a,b,c,d,e,f,g,h,k,data) do { \ + word32 T1 = h + S1(e) + Choice(e,f,g) + k + data; \ + word32 T2 = S0(a) + Majority(a,b,c); \ + d += T1; \ + h = T1 + T2; \ +} while (0) + +/* Initialize the SHA values */ + +void sha256_init(struct sha256_ctx *ctx) +{ + /* Initial values, also generated by the shadata program. */ + static const word32 H0[_SHA256_DIGEST_LENGTH] = { + 0x6a09e667UL, 0xbb67ae85UL, 0x3c6ef372UL, 0xa54ff53aUL, + 0x510e527fUL, 0x9b05688cUL, 0x1f83d9abUL, 0x5be0cd19UL, + }; + + memcpy(ctx->state, H0, sizeof(H0)); + + /* Initialize bit count */ + ctx->count_low = ctx->count_high = 0; + + /* Initialize buffer */ + ctx->index = 0; +} + +/* Perform the SHA transformation. Note that this code, like MD5, seems to + break some optimizing compilers due to the complexity of the expressions + and the size of the basic block. It may be necessary to split it into + sections, e.g. based on the four subrounds + + Note that this function destroys the data area */ + +static void sha256_transform(word32 * state, word32 * data) +{ + word32 A, B, C, D, E, F, G, H; /* Local vars */ + unsigned i; + const word32 *k; + word32 *d; + + /* Set up first buffer and local data buffer */ + A = state[0]; + B = state[1]; + C = state[2]; + D = state[3]; + E = state[4]; + F = state[5]; + G = state[6]; + H = state[7]; + + /* Heavy mangling */ + /* First 16 subrounds that act on the original data */ + + for (i = 0, k = K, d = data; i < 16; i += 8, k += 8, d += 8) { + ROUND(A, B, C, D, E, F, G, H, k[0], d[0]); + ROUND(H, A, B, C, D, E, F, G, k[1], d[1]); + ROUND(G, H, A, B, C, D, E, F, k[2], d[2]); + ROUND(F, G, H, A, B, C, D, E, k[3], d[3]); + ROUND(E, F, G, H, A, B, C, D, k[4], d[4]); + ROUND(D, E, F, G, H, A, B, C, k[5], d[5]); + ROUND(C, D, E, F, G, H, A, B, k[6], d[6]); + ROUND(B, C, D, E, F, G, H, A, k[7], d[7]); + } + + for (; i < 64; i += 16, k += 16) { + ROUND(A, B, C, D, E, F, G, H, k[0], EXPAND(data, 0)); + ROUND(H, A, B, C, D, E, F, G, k[1], EXPAND(data, 1)); + ROUND(G, H, A, B, C, D, E, F, k[2], EXPAND(data, 2)); + ROUND(F, G, H, A, B, C, D, E, k[3], EXPAND(data, 3)); + ROUND(E, F, G, H, A, B, C, D, k[4], EXPAND(data, 4)); + ROUND(D, E, F, G, H, A, B, C, k[5], EXPAND(data, 5)); + ROUND(C, D, E, F, G, H, A, B, k[6], EXPAND(data, 6)); + ROUND(B, C, D, E, F, G, H, A, k[7], EXPAND(data, 7)); + ROUND(A, B, C, D, E, F, G, H, k[8], EXPAND(data, 8)); + ROUND(H, A, B, C, D, E, F, G, k[9], EXPAND(data, 9)); + ROUND(G, H, A, B, C, D, E, F, k[10], EXPAND(data, 10)); + ROUND(F, G, H, A, B, C, D, E, k[11], EXPAND(data, 11)); + ROUND(E, F, G, H, A, B, C, D, k[12], EXPAND(data, 12)); + ROUND(D, E, F, G, H, A, B, C, k[13], EXPAND(data, 13)); + ROUND(C, D, E, F, G, H, A, B, k[14], EXPAND(data, 14)); + ROUND(B, C, D, E, F, G, H, A, k[15], EXPAND(data, 15)); + } + + /* Update state */ + state[0] += A; + state[1] += B; + state[2] += C; + state[3] += D; + state[4] += E; + state[5] += F; + state[6] += G; + state[7] += H; +} + +static void sha256_block(struct sha256_ctx *ctx, const byte * block) +{ + word32 data[SHA256_DATA_LENGTH]; + int i; + + /* Update block count */ + if (!++ctx->count_low) + ++ctx->count_high; + + /* Endian independent conversion */ + for (i = 0; i < SHA256_DATA_LENGTH; i++, block += 4) + data[i] = STRING2INT(block); + + sha256_transform(ctx->state, data); +} + +void +sha256_update(struct sha256_ctx *ctx, const byte * buffer, unsigned length) +{ + if (ctx->index) { /* Try to fill partial block */ + unsigned left = SHA256_DATA_SIZE - ctx->index; + if (length < left) { + memcpy(ctx->block + ctx->index, buffer, length); + ctx->index += length; + return; /* Finished */ + } else { + memcpy(ctx->block + ctx->index, buffer, left); + sha256_block(ctx, ctx->block); + buffer += left; + length -= left; + } + } + while (length >= SHA256_DATA_SIZE) { + sha256_block(ctx, buffer); + buffer += SHA256_DATA_SIZE; + length -= SHA256_DATA_SIZE; + } + /* Buffer leftovers */ + /* NOTE: The corresponding sha1 code checks for the special case length == 0. + * That seems supoptimal, as I suspect it increases the number of branches. */ + + memcpy(ctx->block, buffer, length); + ctx->index = length; +} + +/* Final wrapup - pad to SHA1_DATA_SIZE-byte boundary with the bit pattern + 1 0* (64-bit count of bits processed, MSB-first) */ + +void sha256_final(struct sha256_ctx *ctx) +{ + word32 data[SHA256_DATA_LENGTH]; + int i; + int words; + + i = ctx->index; + + /* Set the first char of padding to 0x80. This is safe since there is + always at least one byte free */ + +/* assert(i < SHA256_DATA_SIZE); + */ + ctx->block[i++] = 0x80; + + /* Fill rest of word */ + for (; i & 3; i++) + ctx->block[i] = 0; + + /* i is now a multiple of the word size 4 */ + words = i >> 2; + for (i = 0; i < words; i++) + data[i] = STRING2INT(ctx->block + 4 * i); + + if (words > (SHA256_DATA_LENGTH - 2)) { /* No room for length in this block. Process it and + * pad with another one */ + for (i = words; i < SHA256_DATA_LENGTH; i++) + data[i] = 0; + sha256_transform(ctx->state, data); + for (i = 0; i < (SHA256_DATA_LENGTH - 2); i++) + data[i] = 0; + } else + for (i = words; i < SHA256_DATA_LENGTH - 2; i++) + data[i] = 0; + + /* There are 512 = 2^9 bits in one block */ + data[SHA256_DATA_LENGTH - 2] = + (ctx->count_high << 9) | (ctx->count_low >> 23); + data[SHA256_DATA_LENGTH - 1] = + (ctx->count_low << 9) | (ctx->index << 3); + sha256_transform(ctx->state, data); +} + +void sha256_digest(const struct sha256_ctx *ctx, byte * s) +{ + int i; + + if (s!=NULL) + for (i = 0; i < _SHA256_DIGEST_LENGTH; i++) { + *s++ = ctx->state[i] >> 24; + *s++ = 0xff & (ctx->state[i] >> 16); + *s++ = 0xff & (ctx->state[i] >> 8); + *s++ = 0xff & ctx->state[i]; + } +} + diff --git a/packages/shasum/shasum-native.bb b/packages/shasum/shasum-native.bb new file mode 100644 index 0000000000..9a4b42c64a --- /dev/null +++ b/packages/shasum/shasum-native.bb @@ -0,0 +1,7 @@ +require shasum.inc + +inherit native + +do_populate_staging() { + install ${S}/sha256sum ${STAGING_BINDIR} +} diff --git a/packages/shasum/shasum.inc b/packages/shasum/shasum.inc new file mode 100644 index 0000000000..1ff6e83767 --- /dev/null +++ b/packages/shasum/shasum.inc @@ -0,0 +1,18 @@ +SUMMARY = "A simple tool to create sha256 hashes from a file" +LICENSE = "LGPL" + +S = "${WORKDIR}" + + +SRC_URI = "file://main.c \ + file://mhash_sha256.h \ + file://sha256.c " + + +do_configure() { + : +} + +do_compile() { + $CC $CFLAGS $CPPFLAGS -o sha256sum main.c sha256.c +} -- cgit v1.2.3 From 87eb2f7775fafc5ecfd7d803f73faca8d284787f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 16:50:29 +0000 Subject: disapproval of revision 'e93b10cfd979b1f989c686de6d2f75006362d34e' --- packages/gpephone/gpe-applauncher_0.7.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb index 866dad14e4..349330047b 100644 --- a/packages/gpephone/gpe-applauncher_0.7.bb +++ b/packages/gpephone/gpe-applauncher_0.7.bb @@ -9,6 +9,8 @@ DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-cli GPE_TARBALL_SUFFIX= "gz" inherit gpephone autotools +SRC_URI += " file://default-icon.patch;patch=1;pnum=0" + #EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} += '${datadir}/themes' -- cgit v1.2.3 From d4f2a045d658aa7fd88b9ccc86a1bf6a3a52ac3d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 16:50:49 +0000 Subject: disapproval of revision 'aff69a14340dd1655bfe774109fde80cc509eed6' --- .../gpephone/gpe-applauncher-0.7/default-icon.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/gpephone/gpe-applauncher-0.7/default-icon.patch (limited to 'packages') diff --git a/packages/gpephone/gpe-applauncher-0.7/default-icon.patch b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch new file mode 100644 index 0000000000..e1ec24f141 --- /dev/null +++ b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch @@ -0,0 +1,20 @@ +Index: applications.c +=================================================================== +--- applications.c (Revision 598) ++++ applications.c (Arbeitskopie) +@@ -463,8 +463,13 @@ + applauncher_settings.themename ? applauncher_settings.themename : "default", + THEMEFOLDER, ICON_LOADING, NULL); + } +- +- g_print ("\nloading icon: %s\n", file); ++ ++ if (!g_file_test (file, G_FILE_TEST_EXISTS)) ++ { ++ g_free (file); ++ file = g_build_filename (LOCAL_THEMEDIR, "default", ++ THEMEFOLDER, ICON_LOADING, NULL); ++ } + + nc_window = gtk_app_notification_new(); + gtk_widget_set_size_request(GTK_WIDGET(nc_window), -1, 70); -- cgit v1.2.3 From 319561f86193c01a3cc1a24697113aa8c098c397 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 18:25:35 +0000 Subject: task-sdk-gpephone: New --- packages/tasks/task-sdk-gpephone.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/tasks/task-sdk-gpephone.bb (limited to 'packages') diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb new file mode 100644 index 0000000000..f647c77a38 --- /dev/null +++ b/packages/tasks/task-sdk-gpephone.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "SDK task for GPE Phone Edition" +PR = "r0" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS := "\ + libidn-dev \ + libim-dev \ + libgloox-dev \ + libabenabler-dev \ + libcalenebler-dev \ + libchenabler-dev \ + libgemwidget-dev \ + libiac-dev \ + liblips_im-dev \ + liblipsevent-dev \ + libmsgenabler-dev \ + librecord-dev \ + libvocenabler-dev \ + liblinphone-dev \ + " + -- cgit v1.2.3 From 6d495f10470afe96e3759e6e793666221961e4c6 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 18:27:06 +0000 Subject: meta-sdk-sbox: Add G(PE)^2 dependencies as well. --- packages/meta/meta-sdk-sbox.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index cf399644e3..0642d49e0e 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r1" +PR = "r2" PACKAGES = "" @@ -18,7 +18,8 @@ TARGET_INSTALL = "\ task-sdk-base \ task-sdk-x11 \ task-sdk-x11-ext \ - task-sdk-gpe" + task-sdk-gpe \ + task-sdk-gpephone" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" -- cgit v1.2.3 From 2101a73213e474cef3e4d17ef6759e713c3c903f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 2 Apr 2007 22:13:27 +0000 Subject: altboot: Add SNVR28 NSLU2: Remove /sbin/altboot error message on virgin systems NSLU2: Failsafe fallthrough to the flash-based rootfs should work now on all die() and mdie() calls. --- packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 123 --------------------------- packages/altboot/altboot_1.1.1+wip-SVNR28.bb | 123 +++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR25.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR28.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb deleted file mode 100644 index e806604616..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb +++ /dev/null @@ -1,123 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -SVN_REV = "25" -PR = "r1" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "${MACHINE}" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" - -S = "${WORKDIR}/trunk/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -MACHINE_DIR = "${MACHINE}" -MACHINE_DIR_nslu2be = "nslu2le" - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE_DIR} - then - install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${S}/altboot.func ${D}/etc - install -m 0644 ${S}/altboot.sbin ${D}/etc - install -m 0644 ${S}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - ln -s /sbin/init.altboot ${D}/sbin/altboot - - if test -d ${S}/${MACHINE_DIR}/altboot-menu - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - else - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/altboot-menu/Advanced - then - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - fi - - if test -d ${S}/${MACHINE_DIR}/altboot.rc - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc - else - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc - fi -} - -###################################################################################### - -do_configure() { - cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ - mv ${S}/init.altboot_ ${S}/init.altboot -} - -###################################################################################### - -pkg_postinst_${PN}() { - test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 - - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot - - update-alternatives --remove init /sbin/init.altboot -} - diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR28.bb b/packages/altboot/altboot_1.1.1+wip-SVNR28.bb new file mode 100644 index 0000000000..4c14aef7b5 --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-SVNR28.bb @@ -0,0 +1,123 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SVN_REV = "28" +PR = "r1" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE_DIR} + then + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot + + if test -d ${S}/${MACHINE_DIR}/altboot-menu + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE_DIR}/altboot.rc + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + + update-alternatives --remove init /sbin/init.altboot +} + -- cgit v1.2.3 From 583e67fbf167c75d9ebefb4c40a8f8298f3508e4 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 2 Apr 2007 23:04:32 +0000 Subject: gpsd: export BUILD_SYS and HOST_SYS as setup.py expects them to be set --- packages/gpsd/gpsd.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages') diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index ffd314d2e8..b4601fedd5 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -19,6 +19,11 @@ INITSCRIPT_PARAMS = "defaults 35" export LDFLAGS = "-L${STAGING_LIBDIR} -lm" +do_compile_prepend() { + export BUILD_SYS="${BUILD_SYS}" + export HOST_SYS="${HOST_SYS}" +} + do_stage() { oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR} install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR} -- cgit v1.2.3 From b88d329c6442e6a68edae9f3c094ae9ca5b51c52 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 2 Apr 2007 23:15:05 +0000 Subject: gpsd: export BUILD_SYS and HOST_SYS as setup.py expects them to be set, add python to DEPENDS --- packages/gpsd/gpsd.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index b4601fedd5..f7c1de2362 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -2,7 +2,7 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices" SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "dbus-glib ncurses" +DEPENDS = "dbus-glib ncurses python" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -24,6 +24,11 @@ do_compile_prepend() { export HOST_SYS="${HOST_SYS}" } +do_install_prepend() { + export BUILD_SYS="${BUILD_SYS}" + export HOST_SYS="${HOST_SYS}" +} + do_stage() { oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR} install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR} -- cgit v1.2.3 From 464dab74c58df1b0670cff89e842a998d554f355 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 3 Apr 2007 02:21:19 +0000 Subject: : ttyrec: Add ttyrec, a tty recorder --- packages/ttyrec/.mtn2git_empty | 0 packages/ttyrec/files/.mtn2git_empty | 0 packages/ttyrec/files/Makefile.patch | 8 +++++++ packages/ttyrec/ttyrec_1.0.8.bb | 42 ++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 packages/ttyrec/.mtn2git_empty create mode 100644 packages/ttyrec/files/.mtn2git_empty create mode 100644 packages/ttyrec/files/Makefile.patch create mode 100644 packages/ttyrec/ttyrec_1.0.8.bb (limited to 'packages') diff --git a/packages/ttyrec/.mtn2git_empty b/packages/ttyrec/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ttyrec/files/.mtn2git_empty b/packages/ttyrec/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ttyrec/files/Makefile.patch b/packages/ttyrec/files/Makefile.patch new file mode 100644 index 0000000000..4c2f5774af --- /dev/null +++ b/packages/ttyrec/files/Makefile.patch @@ -0,0 +1,8 @@ +--- ttyrec-1.0.8/Makefile.orig 2007-04-03 02:08:25.000000000 +0000 ++++ ttyrec-1.0.8/Makefile 2007-04-03 02:08:42.000000000 +0000 +@@ -1,5 +1,3 @@ +-CC = gcc +-CFLAGS = -O2 + VERSION = 1.0.8 + + TARGET = ttyrec ttyplay ttytime diff --git a/packages/ttyrec/ttyrec_1.0.8.bb b/packages/ttyrec/ttyrec_1.0.8.bb new file mode 100644 index 0000000000..324751b4ba --- /dev/null +++ b/packages/ttyrec/ttyrec_1.0.8.bb @@ -0,0 +1,42 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: ttyrec_1.0.8.bb +# Date: 20070403 (YMD) + +DESCRIPTION = "ttyrec is a tty recorder. Recorded data can be played back with the included ttyplay command." +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://0xcc.net/ttyrec/index.html.en" + +###################################################################################### + +PR = "r0" + +###################################################################################### + +SRC_URI = "http://0xcc.net/ttyrec/${PN}-${PV}.tar.gz \ + file://Makefile.patch;patch=1" + +###################################################################################### + +inherit autotools + +###################################################################################### + +S = "${WORKDIR}/${PN}-${PV}" + +###################################################################################### + +do_install() { + install -d ${D}/usr/bin + install -d ${D}/usr/share/man/man1 + + for binary in ttyrec ttyplay ttytime + do + install -m 0755 ${S}/${binary} ${D}/usr/bin/ + install -m 0644 ${S}/${binary}.1 ${D}/usr/share/man/man1 + done +} -- cgit v1.2.3 From 3a9793e23c465a603fddfb8201c617aa7d5eefab Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 3 Apr 2007 05:47:24 +0000 Subject: slugos-init: change find option -mount to -xdev in turnup (so that turnup can work with either busybox find or with the full find utility). --- packages/slugos-init/files/turnup | 2 +- packages/slugos-init/slugos-init_0.10.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 556d942e26..c852f911c8 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -153,7 +153,7 @@ copy_rootfs() { # /var/* echo "turnup: copying root file system" >&2 ( cd "$1" - find . -mount -print | + find . -xdev -print | sed '\@^./dev/@d;\@^./boot/@d;\@^./boot$@d;\@^./linuxrc@d;\@^./var/@d' | cpio -p -d -m -u "$2" ) || { diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 8f8c68d7b7..ac6f6c3ac0 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r82" +PR = "r83" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 8bb7a1c49260ee5e137d7c6dd591ac89da16f6b2 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 3 Apr 2007 05:48:00 +0000 Subject: task-slugos: add kernel-module-loop to the rootfs (altboot support) --- packages/tasks/task-slugos.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 0c23cb905f..9d38763c41 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r8" +PR = "r9" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -56,6 +56,7 @@ SLUGOS_STANDARD_RRECOMMENDS += "lrzsz" # NOTE: removing kernel-module-nfs from this list will prevent NFS # boot (however you can do a simple flash file system boot - no # attached disk - and install the nfs modules from ssh.) +# The altboot mechanism requires kernel-module-loop. SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-ext2 \ kernel-module-jbd \ @@ -64,6 +65,7 @@ kernel-module-vfat \ kernel-module-isofs \ kernel-module-udf \ kernel-module-nfs \ +kernel-module-loop \ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " -- cgit v1.2.3 From 359b57a9207b94e57ea62feb56793d50061f92cc Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 3 Apr 2007 05:52:56 +0000 Subject: busybox: SlugOS defconfig - enable mount/umount (for altboot), disable ext2/3 utilities (not necessary), enable dos2unix and unix2dos applets. --- packages/busybox/busybox-1.2.1/slugos/defconfig | 65 ++++++++++++++++++------- 1 file changed, 47 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig index c35b4f7f70..c76954e711 100644 --- a/packages/busybox/busybox-1.2.1/slugos/defconfig +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -37,7 +37,7 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CROSS_COMPILER_PREFIX="armeb-linux-" CONFIG_BUILD_AT_ONCE=y # @@ -133,8 +133,8 @@ CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_DIR=y # CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y CONFIG_DU=y CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y @@ -287,12 +287,24 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # # CONFIG_FIND is not set -CONFIG_FEATURE_FIND_EXEC=y +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y # CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set # # Init Utilities @@ -331,10 +343,10 @@ CONFIG_FEATURE_UTMP=y # Linux Ext2 FS Progs # CONFIG_CHATTR=y -CONFIG_E2FSCK=y -CONFIG_FSCK=y +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set # CONFIG_LSATTR is not set -CONFIG_MKE2FS=y +# CONFIG_MKE2FS is not set # CONFIG_TUNE2FS is not set # CONFIG_E2LABEL is not set # CONFIG_FINDFS is not set @@ -343,16 +355,19 @@ CONFIG_MKE2FS=y # Linux Module Utilities # # CONFIG_INSMOD is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set # CONFIG_RMMOD is not set # CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set # CONFIG_MODPROBE is not set - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_2_6_MODULES is not set # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set # @@ -360,6 +375,8 @@ CONFIG_FEATURE_2_6_MODULES=y # CONFIG_DMESG=y # CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set CONFIG_FDISK=y @@ -373,6 +390,7 @@ CONFIG_FEATURE_OSF_LABEL=y # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set # CONFIG_GETOPT is not set CONFIG_HEXDUMP=y CONFIG_HWCLOCK=y @@ -388,16 +406,22 @@ CONFIG_MKSWAP=y # CONFIG_FEATURE_MKSWAP_V0 is not set CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y -# CONFIG_MOUNT is not set -# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set # CONFIG_SWITCH_ROOT is not set -# CONFIG_UMOUNT is not set -# CONFIG_FEATURE_UMOUNT_ALL is not set +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set # # Miscellaneous Utilities @@ -486,6 +510,11 @@ CONFIG_FEATURE_IFUPDOWN_IPV6=y # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set # CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set @@ -523,7 +552,7 @@ CONFIG_TRACEROUTE=y # # CONFIG_APP_UDHCPD is not set CONFIG_APP_UDHCPC=y -CONFIG_APP_DUMPLEASES=y +# CONFIG_APP_DUMPLEASES is not set CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set # CONFIG_VCONFIG is not set -- cgit v1.2.3 From debf7fe692a5edc9930e6c844949304da8422058 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 3 Apr 2007 05:57:11 +0000 Subject: busybox: update to 1.5.0 (preference set to -1 so as not to disturb until this possibly-unstable release is more thoroughly tested). --- packages/busybox/busybox-1.5.0/.mtn2git_empty | 0 .../busybox/busybox-1.5.0/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/angstrom/defconfig | 647 +++++++++++++++++++ packages/busybox/busybox-1.5.0/busybox-mdev.sh | 69 +++ packages/busybox/busybox-1.5.0/defconfig | 647 +++++++++++++++++++ packages/busybox/busybox-1.5.0/df_rootfs.patch | 44 ++ packages/busybox/busybox-1.5.0/dhcp-hostname.patch | 20 + .../busybox-1.5.0/dhcp-increase-retries.patch | 11 + .../busybox-1.5.0/ifupdown-spurious-environ.patch | 16 + packages/busybox/busybox-1.5.0/mnci/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/mnci/defconfig | 643 +++++++++++++++++++ .../busybox/busybox-1.5.0/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/nylon/defconfig | 568 +++++++++++++++++ .../busybox/busybox-1.5.0/openmn/.mtn2git_empty | 0 .../busybox/busybox-1.5.0/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/slugos/defconfig | 686 +++++++++++++++++++++ .../busybox/busybox-1.5.0/slugos/udhcpscript.patch | 133 ++++ .../busybox/busybox-1.5.0/sparc/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/udhcpscript.patch | 17 + .../busybox/busybox-1.5.0/wrt54/.mtn2git_empty | 0 .../busybox/busybox-1.5.0/xargs-double-size.patch | 13 + packages/busybox/busybox_1.5.0.bb | 104 ++++ 22 files changed, 3618 insertions(+) create mode 100644 packages/busybox/busybox-1.5.0/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/angstrom/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/angstrom/defconfig create mode 100755 packages/busybox/busybox-1.5.0/busybox-mdev.sh create mode 100644 packages/busybox/busybox-1.5.0/defconfig create mode 100644 packages/busybox/busybox-1.5.0/df_rootfs.patch create mode 100644 packages/busybox/busybox-1.5.0/dhcp-hostname.patch create mode 100644 packages/busybox/busybox-1.5.0/dhcp-increase-retries.patch create mode 100644 packages/busybox/busybox-1.5.0/ifupdown-spurious-environ.patch create mode 100644 packages/busybox/busybox-1.5.0/mnci/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/mnci/defconfig create mode 100644 packages/busybox/busybox-1.5.0/nylon/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/nylon/defconfig create mode 100644 packages/busybox/busybox-1.5.0/openmn/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/slugos/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/slugos/defconfig create mode 100644 packages/busybox/busybox-1.5.0/slugos/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.5.0/sparc/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.5.0/wrt54/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.5.0/xargs-double-size.patch create mode 100644 packages/busybox/busybox_1.5.0.bb (limited to 'packages') diff --git a/packages/busybox/busybox-1.5.0/.mtn2git_empty b/packages/busybox/busybox-1.5.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/angstrom/.mtn2git_empty b/packages/busybox/busybox-1.5.0/angstrom/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/angstrom/defconfig b/packages/busybox/busybox-1.5.0/angstrom/defconfig new file mode 100644 index 0000000000..7308eead76 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/angstrom/defconfig @@ -0,0 +1,647 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=63 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.5.0/busybox-mdev.sh b/packages/busybox/busybox-1.5.0/busybox-mdev.sh new file mode 100755 index 0000000000..9744322fa9 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/busybox-mdev.sh @@ -0,0 +1,69 @@ +#!/bin/sh +MDEV=/sbin/mdev +DESC="Busybox mdev setup" + +# Complain if thing's aren't right +if [ ! -e /proc/filesystems ]; then + echo "mdev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "mdev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "mdev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "mdev requires hotplug support, not started." + exit 1 +fi + +# We need to unmount /dev/pts/ and remount it later over the tmpfs +if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ +fi + +if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ +fi + +# Create tmpfs for /dev +echo "Creating tmpfs at /dev" +mount -t tmpfs tmpfs /dev -o size=800k + +# Register mdev as hotplug event helper +echo "$MDEV" > /proc/sys/kernel/hotplug + +# Populate /dev from /sys info +echo "Populating /dev using mdev" +$MDEV -s + +# Touch .udev to inform scripts that /dev needs no further setup +touch /dev/.udev + +# Mount devpts +TTYGRP=5 +TTYMODE=620 +mkdir -m 755 -p /dev/pts +if [ ! -e /dev/ptmx ]; then + mknod -m 666 /dev/ptmx c 5 2 +fi +mount -t devpts devpts /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE + +# Make shm directory +mkdir -m 755 -p /dev/shm + +# Make extraneous links +ln -sf /proc/self/fd /dev/fd +ln -sf /proc/self/fd/0 /dev/stdin +ln -sf /proc/self/fd/1 /dev/stdout +ln -sf /proc/self/fd/2 /dev/stderr +ln -sf /proc/kcore /dev/core +ln -sf /proc/asound/oss/sndstat /dev/sndstat + +exit 0 diff --git a/packages/busybox/busybox-1.5.0/defconfig b/packages/busybox/busybox-1.5.0/defconfig new file mode 100644 index 0000000000..7308eead76 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/defconfig @@ -0,0 +1,647 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=63 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.5.0/df_rootfs.patch b/packages/busybox/busybox-1.5.0/df_rootfs.patch new file mode 100644 index 0000000000..3819b59106 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/df_rootfs.patch @@ -0,0 +1,44 @@ +--- busybox-1.3.1.orig/coreutils/df.c 2006-12-26 22:54:50.000000000 -0600 ++++ busybox-1.3.1/coreutils/df.c 2006-12-30 00:45:10.000000000 -0600 +@@ -47,6 +47,7 @@ + struct statfs s; + static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + const char *disp_units_hdr = hdr_1k; ++ int root_done = 0; + + #ifdef CONFIG_FEATURE_HUMAN_READABLE + opt_complementary = "h-km:k-hm:m-hk"; +@@ -77,7 +78,7 @@ + + do { + const char *device; +- const char *mount_point; ++ char *mount_point; + + if (mount_table) { + mount_entry = getmntent(mount_table); +@@ -116,17 +117,20 @@ + ) / (blocks_used + s.f_bavail); + } + +- if (strcmp(device, "rootfs") == 0) { +- continue; +- } else if (strcmp(device, "/dev/root") == 0) { ++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ +- device = find_block_device("/"); ++ device = find_block_device(mount_point); + if (!device) { + goto SET_ERROR; + } + } + ++ if (strcmp(mount_point, "/") == 0) { ++ if (root_done) continue; ++ root_done = 1; ++ } ++ + #ifdef CONFIG_FEATURE_HUMAN_READABLE + printf("%-20s %9s ", device, + make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/packages/busybox/busybox-1.5.0/dhcp-hostname.patch b/packages/busybox/busybox-1.5.0/dhcp-hostname.patch new file mode 100644 index 0000000000..8e7e68a4c9 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/dhcp-hostname.patch @@ -0,0 +1,20 @@ +--- busybox-1.5.0/networking/udhcp/dhcpc.c~ 2007-03-22 15:21:23.000000000 -0500 ++++ busybox-1.5.0/networking/udhcp/dhcpc.c 2007-04-01 08:42:41.000000000 -0500 +@@ -136,6 +136,7 @@ + int retval; + int len; + int no_clientid = 0; ++ char hostbuf[256]; /* (default hostname patch) */ + fd_set rfds; + struct timeval tv; + struct dhcpMessage packet; +@@ -214,6 +215,9 @@ + client_config.background_if_no_lease = 1; + if (opt & OPT_h) + client_config.hostname = alloc_dhcp_option(DHCP_HOST_NAME, str_h, 0); ++ else /* (default hostname patch) default hostname is our hostname as set */ ++ if (gethostname(hostbuf, sizeof(hostbuf)) == 0) ++ client_config.hostname = alloc_dhcp_option(DHCP_HOST_NAME, hostbuf, 0); + if (opt & OPT_F) { + client_config.fqdn = alloc_dhcp_option(DHCP_FQDN, str_F, 3); + /* Flags: 0000NEOS diff --git a/packages/busybox/busybox-1.5.0/dhcp-increase-retries.patch b/packages/busybox/busybox-1.5.0/dhcp-increase-retries.patch new file mode 100644 index 0000000000..f49aa16580 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/dhcp-increase-retries.patch @@ -0,0 +1,11 @@ +--- busybox-1.5.0/networking/udhcp/dhcpc.c~ 2007-04-01 08:42:41.000000000 -0500 ++++ busybox-1.5.0/networking/udhcp/dhcpc.c 2007-04-01 21:03:42.000000000 -0500 +@@ -188,7 +188,7 @@ + /* Default options. */ + client_config.interface = "eth0"; + client_config.script = DEFAULT_SCRIPT; +- client_config.retries = 3; ++ client_config.retries = 5; + client_config.timeout = 3; + + /* Parse command line */ diff --git a/packages/busybox/busybox-1.5.0/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.5.0/ifupdown-spurious-environ.patch new file mode 100644 index 0000000000..812a0b3ee8 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/ifupdown-spurious-environ.patch @@ -0,0 +1,16 @@ +--- busybox-1.5.0/networking/ifupdown.c~ 2007-03-22 15:21:23.000000000 -0500 ++++ busybox-1.5.0/networking/ifupdown.c 2007-04-01 08:52:25.000000000 -0500 +@@ -83,6 +83,13 @@ + struct mapping_defn_t *mappings; + }; + ++/* XXX - ifupdown-spurious-environ.patch -- appears to be long obsolete, ++ * but is carried forward because it doesn't seem to hurt anything and ++ * it's non-obvious how to remove the patch from OE without breaking ++ * old builds. MJW ++ */ ++#define environ local_environ ++ + #define OPTION_STR "anvf" USE_FEATURE_IFUPDOWN_MAPPING("m") "i:" + enum { + OPT_do_all = 0x1, diff --git a/packages/busybox/busybox-1.5.0/mnci/.mtn2git_empty b/packages/busybox/busybox-1.5.0/mnci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/mnci/defconfig b/packages/busybox/busybox-1.5.0/mnci/defconfig new file mode 100644 index 0000000000..6a04803f18 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/mnci/defconfig @@ -0,0 +1,643 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +# CONFIG_SHOW_USAGE is not set +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +# CONFIG_LFS is not set +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-linux-" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +CONFIG_CMP=y +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +# CONFIG_FEATURE_LS_FILETYPES is not set +# CONFIG_FEATURE_LS_FOLLOWLINKS is not set +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +# CONFIG_FEATURE_FANCY_TAIL is not set +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WATCH is not set +CONFIG_WC=y +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +# CONFIG_PATCH is not set +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_ADDGROUP=y +CONFIG_DELGROUP=y +CONFIG_ADDUSER=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +CONFIG_LOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_SU=y +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +# CONFIG_LOSETUP is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +CONFIG_ADJTIMEX=y +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +# CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +# CONFIG_APP_UDHCPD is not set +CONFIG_APP_UDHCPC=y +# CONFIG_APP_DUMPLEASES is not set +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_ZCIP=y + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +# CONFIG_UPTIME is not set + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=15 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.5.0/nylon/.mtn2git_empty b/packages/busybox/busybox-1.5.0/nylon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/nylon/defconfig b/packages/busybox/busybox-1.5.0/nylon/defconfig new file mode 100644 index 0000000000..67c5408ada --- /dev/null +++ b/packages/busybox/busybox-1.5.0/nylon/defconfig @@ -0,0 +1,568 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_NITPICK is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_LFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Archival Utilities +# +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +# CONFIG_FEATURE_TAR_BZIP2 is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +CONFIG_FEATURE_TAR_COMPRESS=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_UNCOMPRESS=y +# CONFIG_UNLZMA is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Common options for dpkg and dpkg_deb +# +CONFIG_FEATURE_DEB_TAR_GZ=y +CONFIG_FEATURE_DEB_TAR_BZ2=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAL=y +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_BINARY is not set +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_COMM is not set +# CONFIG_CKSUM is not set +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_CMP=y +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_DF=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +# CONFIG_TEST is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls and more +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +CONFIG_DUMPKMAP=y +CONFIG_GETKEY=y +# CONFIG_LOADFONT is not set +CONFIG_LOADKMAP=y +# CONFIG_OPENVT is not set +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=n + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +# CONFIG_VI is not set +#CONFIG_FEATURE_VI_COLON=y +#CONFIG_FEATURE_VI_YANKMARK=y +#CONFIG_FEATURE_VI_SEARCH=y +#CONFIG_FEATURE_VI_USE_SIGNALS=y +#CONFIG_FEATURE_VI_DOT_CMD=y +#CONFIG_FEATURE_VI_READONLY=y +#CONFIG_FEATURE_VI_SETOPTS=y +#CONFIG_FEATURE_VI_SET=y +#CONFIG_FEATURE_VI_WIN_RESIZE=y +#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_U_W_TMP=y +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +CONFIG_CROND=y +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +CONFIG_WATCHDOG=y + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set +# CONFIG_RMMOD is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_WITHOUT_INETD=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +CONFIG_NAMEIF=y +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_ZCIP=y + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y +CONFIG_SYSCTL=y + +# +# Another Bourne-like Shell +# +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_ASH is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HWCLOCK is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +# CONFIG_MORE is not set +CONFIG_PIVOT_ROOT=y +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_MOUNT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_MOUNT_FORCE=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +CONFIG_DEBUG_YANK_SUSv2=y diff --git a/packages/busybox/busybox-1.5.0/openmn/.mtn2git_empty b/packages/busybox/busybox-1.5.0/openmn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/slugos/.mtn2git_empty b/packages/busybox/busybox-1.5.0/slugos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/slugos/defconfig b/packages/busybox/busybox-1.5.0/slugos/defconfig new file mode 100644 index 0000000000..8c61fedfdb --- /dev/null +++ b/packages/busybox/busybox-1.5.0/slugos/defconfig @@ -0,0 +1,686 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.5.0 +# Mon Apr 2 17:38:36 2007 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_DESKTOP is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_EXEC_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_WERROR is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_INCLUDE_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_FANCY_KEYS=y +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +CONFIG_CMP=y +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +CONFIG_RESET=y +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set +# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_2_6_MODULES is not set +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +# CONFIG_LOSETUP is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_NMETER is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_RULE is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPRULE is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_APP_UDHCPD is not set +# CONFIG_APP_DHCPRELAY is not set +# CONFIG_APP_DUMPLEASES is not set +CONFIG_APP_UDHCPC=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set diff --git a/packages/busybox/busybox-1.5.0/slugos/udhcpscript.patch b/packages/busybox/busybox-1.5.0/slugos/udhcpscript.patch new file mode 100644 index 0000000000..dec6c18994 --- /dev/null +++ b/packages/busybox/busybox-1.5.0/slugos/udhcpscript.patch @@ -0,0 +1,133 @@ +--- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700 ++++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700 +@@ -1,40 +1,101 @@ + #!/bin/sh ++# openslug UDHCP client script ++# this must set the HW address (MAC) on the interface ++# ++. /etc/default/functions + +-# udhcpc script edited by Tim Riker + +-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 ++echodns(){ ++ local dns ++ if test $# -gt 0 ++ then ++ for dns in "$@" ++ do ++ echo "nameserver $dns" ++ done ++ fi ++} ++ ++# Output the correct contents for resolv.conf ++mkresolv() { ++ test -n "$domain" && echo "search $domain" ++ echodns $dns ++} ++ ++# checksum of a file (or stdin if -) ++md5strm() { ++ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' ++} ++ ++bind() { ++ local B N metric i olddomain ++ B= ++ test -n "$broadcast" && B="broadcast $broadcast" ++ N= ++ test -n "$subnet" && N="netmask $subnet" ++ ifconfig "$interface" "$ip" $B $N up ++ ++ # If given router information delete the old information and ++ # enter new stuff, routers get metrics incremented by 1 ++ # between each (this is somewhat arbitrary) ++ if test -n "$router" ++ then ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ++ do ++ : ++ done + +-RESOLV_CONF="/etc/resolv.conf" +-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +-[ -n "$subnet" ] && NETMASK="netmask $subnet" ++ metric=0 ++ for i in $router ++ do ++ route add default gw "$i" dev "$interface" metric $((metric++)) ++ done ++ fi ++ ++ olddomain= ++ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" ++ if test -n "$domain" -a "$domain" != "$olddomain" ++ then ++ echo "$domain" >/etc/defaultdomain ++ # and update the kernel view too ++ echo "$domain" >/proc/sys/kernel/domainname ++ fi ++ ++ # Update /etc/resolv.conf to reflect domain and dns information, ++ # this always clears resolv.conf if none is given ++ md5old="$(md5strm /etc/resolv.conf)" ++ md5new="$(mkresolv | md5strm -)" ++ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf ++} + + case "$1" in +- deconfig) +- /sbin/ifconfig $interface 0.0.0.0 +- ;; +- +- renew|bound) +- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK +- +- if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do +- : +- done +- +- metric=0 +- for i in $router ; do +- route add default gw $i dev $interface metric $((metric++)) +- done ++deconfig) ++ # Bring the interface up (without inet at this point) ++ ifconfig "$interface" 0.0.0.0;; ++ ++renew|bound) ++ bind;; ++ ++leasefail) ++ # Pull the values from the config data if (only only if) this ++ # is the config interface ++ if test "$interface" = "$(config iface)" ++ then ++ ip="$(config ip)" ++ if test -n "$ip" ++ then ++ router="$(config gateway)" ++ subnet="$(config netmask)" ++ broadcast="$(config broadcast)" ++ domain="$(config domain)" ++ dns="$(config dns)" ++ ++ bind + fi ++ fi;; + +- echo -n > $RESOLV_CONF +- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF +- for i in $dns ; do +- echo adding dns $i +- echo nameserver $i >> $RESOLV_CONF +- done +- ;; ++*) echo "udhcpc: $*: unknown command" >&2 ++ exit 1;; + esac + + exit 0 diff --git a/packages/busybox/busybox-1.5.0/sparc/.mtn2git_empty b/packages/busybox/busybox-1.5.0/sparc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/udhcpscript.patch b/packages/busybox/busybox-1.5.0/udhcpscript.patch new file mode 100644 index 0000000000..fc21d440cd --- /dev/null +++ b/packages/busybox/busybox-1.5.0/udhcpscript.patch @@ -0,0 +1,17 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript ++++ busybox-1.00-rc3/examples/udhcp/simple.script +@@ -17,8 +17,7 @@ + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + + if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + diff --git a/packages/busybox/busybox-1.5.0/wrt54/.mtn2git_empty b/packages/busybox/busybox-1.5.0/wrt54/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.5.0/xargs-double-size.patch b/packages/busybox/busybox-1.5.0/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/packages/busybox/busybox-1.5.0/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/packages/busybox/busybox_1.5.0.bb b/packages/busybox/busybox_1.5.0.bb new file mode 100644 index 0000000000..a8678602e7 --- /dev/null +++ b/packages/busybox/busybox_1.5.0.bb @@ -0,0 +1,104 @@ +require busybox.inc + +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://dhcp-increase-retries.patch;patch=1 \ + file://df_rootfs.patch;patch=1 \ + file://defconfig" + +EXTRA_OEMAKE_append = " V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" + +do_configure () { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + cml1_do_configure +} + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + base_do_compile +} + +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + install -d ${D}${sysconfdir}/init.d + oe_runmake "PREFIX=${D}" install + cp -pPR ${S}/_install/* ${D}/ + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + ls ${D} -R + + cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ + if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www + fi + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} +} + +pkg_prerm_${PN} () { + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done Date: Tue, 3 Apr 2007 07:53:31 +0000 Subject: linux-smdk2443_2.6.20+git.bb : add a kernel for the smdk2443 board from samsung. --- packages/linux/linux-smdk2443/.mtn2git_empty | 0 .../0020-Add-ASoC-S3C24xx-platform-support.patch | 1077 ++++++++++++++ .../0021-Add-Neo1973-ASoC-support.patch | 763 ++++++++++ .../0022-Add-initial-ASoC-SMDK2440-support.patch | 373 +++++ ...dd-ASoC-SMDK2440-support-for-WM8956-codec.patch | 391 ++++++ ...are.h-is-no-longer-allowed-to-be-directly.patch | 41 + .../linux-smdk2443/0034-Export-ac97_dai.patch | 39 + .../linux-smdk2443/0035-Fix-power-and-PLL.patch | 63 + ...036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch | 48 + ...-dma_size-parameter-and-fix-buffdone-oops.patch | 104 ++ ...-smdk2443-s3c2443-ac97-and-wm9710-support.patch | 724 ++++++++++ packages/linux/linux-smdk2443/asoc-mainline.patch | 142 ++ packages/linux/linux-smdk2443/defconfig-smdk2443 | 1480 ++++++++++++++++++++ packages/linux/linux-smdk2443_2.6.20+git.bb | 52 + 14 files changed, 5297 insertions(+) create mode 100644 packages/linux/linux-smdk2443/.mtn2git_empty create mode 100644 packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch create mode 100644 packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch create mode 100644 packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch create mode 100644 packages/linux/linux-smdk2443/0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch create mode 100644 packages/linux/linux-smdk2443/0033-arch-hardware.h-is-no-longer-allowed-to-be-directly.patch create mode 100644 packages/linux/linux-smdk2443/0034-Export-ac97_dai.patch create mode 100644 packages/linux/linux-smdk2443/0035-Fix-power-and-PLL.patch create mode 100644 packages/linux/linux-smdk2443/0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch create mode 100644 packages/linux/linux-smdk2443/0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch create mode 100644 packages/linux/linux-smdk2443/0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch create mode 100644 packages/linux/linux-smdk2443/asoc-mainline.patch create mode 100644 packages/linux/linux-smdk2443/defconfig-smdk2443 create mode 100644 packages/linux/linux-smdk2443_2.6.20+git.bb (limited to 'packages') diff --git a/packages/linux/linux-smdk2443/.mtn2git_empty b/packages/linux/linux-smdk2443/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch b/packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch new file mode 100644 index 0000000000..3c79c17422 --- /dev/null +++ b/packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch @@ -0,0 +1,1077 @@ +From a958d8bfdf4fd043471012560a7e9a089d81390e Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 16:56:28 +0000 +Subject: [PATCH] Add ASoC S3C24xx platform support. + +Signed-off-by: Ben Dooks +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 2 +- + sound/soc/s3c24xx/Kconfig | 16 ++ + sound/soc/s3c24xx/Makefile | 7 + + sound/soc/s3c24xx/s3c24xx-i2s.c | 439 +++++++++++++++++++++++++++++++++++++ + sound/soc/s3c24xx/s3c24xx-i2s.h | 35 +++ + sound/soc/s3c24xx/s3c24xx-pcm.c | 462 +++++++++++++++++++++++++++++++++++++++ + sound/soc/s3c24xx/s3c24xx-pcm.h | 32 +++ + 8 files changed, 993 insertions(+), 1 deletions(-) + create mode 100644 sound/soc/s3c24xx/Kconfig + create mode 100644 sound/soc/s3c24xx/Makefile + create mode 100644 sound/soc/s3c24xx/s3c24xx-i2s.c + create mode 100644 sound/soc/s3c24xx/s3c24xx-i2s.h + create mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.c + create mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.h + +diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig +index ec821a5..74a5f5f 100644 +--- a/sound/soc/Kconfig ++++ b/sound/soc/Kconfig +@@ -24,6 +24,7 @@ menu "SoC Platforms" + depends on SND_SOC + source "sound/soc/at91/Kconfig" + source "sound/soc/pxa/Kconfig" ++source "sound/soc/s3c24xx/Kconfig" + endmenu + + # Supported codecs +diff --git a/sound/soc/Makefile b/sound/soc/Makefile +index 98e6f49..0ae2e49 100644 +--- a/sound/soc/Makefile ++++ b/sound/soc/Makefile +@@ -1,4 +1,4 @@ + snd-soc-core-objs := soc-core.o soc-dapm.o + + obj-$(CONFIG_SND_SOC) += snd-soc-core.o +-obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ ++obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ s3c24xx/ +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +new file mode 100644 +index 0000000..433da9f +--- /dev/null ++++ b/sound/soc/s3c24xx/Kconfig +@@ -0,0 +1,16 @@ ++menu "SoC Audio for the Samsung S3C24XX" ++ ++config SND_S3C24XX_SOC ++ tristate "SoC Audio for the Samsung S3C24XX chips" ++ depends on ARCH_S3C2410 && SND ++ select SND_PCM ++ help ++ Say Y or M if you want to add support for codecs attached to ++ the S3C24XX AC97, I2S or SSP interface. You will also need ++ to select the audio interfaces to support below. ++ ++config SND_S3C24XX_SOC_I2S ++ tristate ++ ++endmenu ++ +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +new file mode 100644 +index 0000000..56200d7 +--- /dev/null ++++ b/sound/soc/s3c24xx/Makefile +@@ -0,0 +1,7 @@ ++# S3c24XX Platform Support ++snd-soc-s3c24xx-objs := s3c24xx-pcm.o ++snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o ++ ++obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o ++obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o ++ +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c +new file mode 100644 +index 0000000..df655a5 +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.c +@@ -0,0 +1,439 @@ ++/* ++ * s3c24xx-i2s.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * ++ * Revision history ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define S3C24XX_I2S_DEBUG 0 ++#if S3C24XX_I2S_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++static struct s3c2410_dma_client s3c24xx_dma_client_out = { ++ .name = "I2S PCM Stereo out" ++}; ++ ++static struct s3c2410_dma_client s3c24xx_dma_client_in = { ++ .name = "I2S PCM Stereo in" ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { ++ .client = &s3c24xx_dma_client_out, ++ .channel = DMACH_I2S_OUT, ++ .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { ++ .client = &s3c24xx_dma_client_in, ++ .channel = DMACH_I2S_IN, ++ .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO ++}; ++ ++struct s3c24xx_i2s_info { ++ void __iomem *regs; ++ struct clk *iis_clk; ++}; ++static struct s3c24xx_i2s_info s3c24xx_i2s; ++ ++static void s3c24xx_snd_txctrl(int on) ++{ ++ u32 iisfcon; ++ u32 iiscon; ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); ++ iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ ++ DBG("r: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++ ++ if (on) { ++ iisfcon |= S3C2410_IISFCON_TXDMA | S3C2410_IISFCON_TXENABLE; ++ iiscon |= S3C2410_IISCON_TXDMAEN | S3C2410_IISCON_IISEN; ++ iiscon &= ~S3C2410_IISCON_TXIDLE; ++ iismod |= S3C2410_IISMOD_TXMODE; ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ } else { ++ /* note, we have to disable the FIFOs otherwise bad things ++ * seem to happen when the DMA stops. According to the ++ * Samsung supplied kernel, this should allow the DMA ++ * engine and FIFOs to reset. If this isn't allowed, the ++ * DMA engine will simply freeze randomly. ++ */ ++ ++ iisfcon &= ~S3C2410_IISFCON_TXENABLE; ++ iisfcon &= ~S3C2410_IISFCON_TXDMA; ++ iiscon |= S3C2410_IISCON_TXIDLE; ++ iiscon &= ~S3C2410_IISCON_TXDMAEN; ++ iismod &= ~S3C2410_IISMOD_TXMODE; ++ ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ } ++ ++ DBG("w: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++} ++ ++static void s3c24xx_snd_rxctrl(int on) ++{ ++ u32 iisfcon; ++ u32 iiscon; ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); ++ iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ ++ DBG("r: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++ ++ if (on) { ++ iisfcon |= S3C2410_IISFCON_RXDMA | S3C2410_IISFCON_RXENABLE; ++ iiscon |= S3C2410_IISCON_RXDMAEN | S3C2410_IISCON_IISEN; ++ iiscon &= ~S3C2410_IISCON_RXIDLE; ++ iismod |= S3C2410_IISMOD_RXMODE; ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ } else { ++ /* note, we have to disable the FIFOs otherwise bad things ++ * seem to happen when the DMA stops. According to the ++ * Samsung supplied kernel, this should allow the DMA ++ * engine and FIFOs to reset. If this isn't allowed, the ++ * DMA engine will simply freeze randomly. ++ */ ++ ++ iisfcon &= ~S3C2410_IISFCON_RXENABLE; ++ iisfcon &= ~S3C2410_IISFCON_RXDMA; ++ iiscon |= S3C2410_IISCON_RXIDLE; ++ iiscon &= ~S3C2410_IISCON_RXDMAEN; ++ iismod &= ~S3C2410_IISMOD_RXMODE; ++ ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ } ++ ++ DBG("w: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++} ++ ++/* ++ * Wait for the LR signal to allow synchronisation to the L/R clock ++ * from the codec. May only be needed for slave mode. ++ */ ++static int s3c24xx_snd_lrsync(void) ++{ ++ u32 iiscon; ++ unsigned long timeout = jiffies + msecs_to_jiffies(5); ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ while (1) { ++ iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ if (iiscon & S3C2410_IISCON_LRINDEX) ++ break; ++ ++ if (timeout < jiffies) ++ return -ETIMEDOUT; ++ } ++ ++ return 0; ++} ++ ++/* ++ * Check whether CPU is the master or slave ++ */ ++static inline int s3c24xx_snd_is_clkmaster(void) ++{ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ return (readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & S3C2410_IISMOD_SLAVE) ? 0:1; ++} ++ ++/* ++ * Set S3C24xx I2S DAI format ++ */ ++static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, ++ unsigned int fmt) ++{ ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params r: IISMOD: %lx \n", iismod); ++ ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBM_CFM: ++ iismod |= S3C2410_IISMOD_SLAVE; ++ break; ++ case SND_SOC_DAIFMT_CBS_CFS: ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_LEFT_J: ++ iismod |= S3C2410_IISMOD_MSB; ++ break; ++ case SND_SOC_DAIFMT_I2S: ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params w: IISMOD: %lx \n", iismod); ++ return 0; ++} ++ ++static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_out; ++ else ++ rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_in; ++ ++ /* Working copies of register */ ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params r: IISMOD: %lx\n", iismod); ++ ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S8: ++ break; ++ case SNDRV_PCM_FORMAT_S16_LE: ++ iismod |= S3C2410_IISMOD_16BIT; ++ break; ++ } ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params w: IISMOD: %lx\n", iismod); ++ return 0; ++} ++ ++static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (!s3c24xx_snd_is_clkmaster()) { ++ ret = s3c24xx_snd_lrsync(); ++ if (ret) ++ goto exit_err; ++ } ++ ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ s3c24xx_snd_rxctrl(1); ++ else ++ s3c24xx_snd_txctrl(1); ++ break; ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ s3c24xx_snd_rxctrl(0); ++ else ++ s3c24xx_snd_txctrl(0); ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++exit_err: ++ return ret; ++} ++ ++/* ++ * Set S3C24xx Clock source ++ */ ++static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, ++ int clk_id, unsigned int freq, int dir) ++{ ++ u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iismod &= ~S3C2440_IISMOD_MPLL; ++ ++ switch (clk_id) { ++ case S3C24XX_CLKSRC_PCLK: ++ break; ++ case S3C24XX_CLKSRC_MPLL: ++ iismod |= S3C2440_IISMOD_MPLL; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ return 0; ++} ++ ++/* ++ * Set S3C24xx Clock dividers ++ */ ++static int s3c24xx_i2s_set_clkdiv(struct snd_soc_cpu_dai *cpu_dai, ++ int div_id, int div) ++{ ++ u32 reg; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ switch (div_id) { ++ case S3C24XX_DIV_MCLK: ++ reg = readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & ~S3C2410_IISMOD_FS_MASK; ++ writel(reg | div, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ break; ++ case S3C24XX_DIV_BCLK: ++ reg = readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & ~(S3C2410_IISMOD_384FS); ++ writel(reg | div, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ break; ++ case S3C24XX_DIV_PRESCALER: ++ writel(div, s3c24xx_i2s.regs + S3C2410_IISPSR); ++ reg = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(reg | S3C2410_IISCON_PSCEN, s3c24xx_i2s.regs + S3C2410_IISCON); ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++/* ++ * To avoid duplicating clock code, allow machine driver to ++ * get the clockrate from here. ++ */ ++u32 s3c24xx_i2s_get_clockrate(void) ++{ ++ return clk_get_rate(s3c24xx_i2s.iis_clk); ++} ++EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate); ++ ++static int s3c24xx_i2s_probe(struct platform_device *pdev) ++{ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ s3c24xx_i2s.regs = ioremap(S3C2410_PA_IIS, 0x100); ++ if (s3c24xx_i2s.regs == NULL) ++ return -ENXIO; ++ ++ s3c24xx_i2s.iis_clk=clk_get(&pdev->dev, "iis"); ++ if (s3c24xx_i2s.iis_clk == NULL) { ++ DBG("failed to get iis_clock\n"); ++ return -ENODEV; ++ } ++ clk_enable(s3c24xx_i2s.iis_clk); ++ ++ /* Configure the I2S pins in correct mode */ ++ s3c2410_gpio_cfgpin(S3C2410_GPE0, S3C2410_GPE0_I2SLRCK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE1, S3C2410_GPE1_I2SSCLK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE2, S3C2410_GPE2_CDCLK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE3, S3C2410_GPE3_I2SSDI); ++ s3c2410_gpio_cfgpin(S3C2410_GPE4, S3C2410_GPE4_I2SSDO); ++ ++ writel(S3C2410_IISCON_IISEN, s3c24xx_i2s.regs + S3C2410_IISCON); ++ ++ s3c24xx_snd_txctrl(0); ++ s3c24xx_snd_rxctrl(0); ++ ++ return 0; ++} ++ ++#define S3C24XX_I2S_RATES \ ++ (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \ ++ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ ++ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) ++ ++struct snd_soc_cpu_dai s3c24xx_i2s_dai = { ++ .name = "s3c24xx-i2s", ++ .id = 0, ++ .type = SND_SOC_DAI_I2S, ++ .probe = s3c24xx_i2s_probe, ++ .playback = { ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = S3C24XX_I2S_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,}, ++ .capture = { ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = S3C24XX_I2S_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,}, ++ .ops = { ++ .trigger = s3c24xx_i2s_trigger, ++ .hw_params = s3c24xx_i2s_hw_params,}, ++ .dai_ops = { ++ .set_fmt = s3c24xx_i2s_set_fmt, ++ .set_clkdiv = s3c24xx_i2s_set_clkdiv, ++ .set_sysclk = s3c24xx_i2s_set_sysclk, ++ }, ++}; ++EXPORT_SYMBOL_GPL(s3c24xx_i2s_dai); ++ ++/* Module information */ ++MODULE_AUTHOR("Ben Dooks, "); ++MODULE_DESCRIPTION("s3c24xx I2S SoC Interface"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.h b/sound/soc/s3c24xx/s3c24xx-i2s.h +new file mode 100644 +index 0000000..f9ca04e +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.h +@@ -0,0 +1,35 @@ ++/* ++ * s3c24xx-i2s.c -- ALSA Soc Audio Layer ++ * ++ * Copyright 2005 Wolfson Microelectronics PLC. ++ * Author: Graeme Gregory ++ * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#ifndef S3C24XXI2S_H_ ++#define S3C24XXI2S_H_ ++ ++/* clock sources */ ++#define S3C24XX_CLKSRC_PCLK 0 ++#define S3C24XX_CLKSRC_MPLL 1 ++ ++/* Clock dividers */ ++#define S3C24XX_DIV_MCLK 0 ++#define S3C24XX_DIV_BCLK 1 ++#define S3C24XX_DIV_PRESCALER 2 ++ ++/* prescaler */ ++#define S3C24XX_PRESCALE(a,b) \ ++ (((a - 1) << S3C2410_IISPSR_INTSHIFT) | ((b - 1) << S3C2410_IISPSR_EXTSHFIT)) ++ ++u32 s3c24xx_i2s_get_clockrate(void); ++ ++#endif /*S3C24XXI2S_H_*/ +diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c +new file mode 100644 +index 0000000..867f1b3 +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-pcm.c +@@ -0,0 +1,462 @@ ++/* ++ * s3c24xx-pcm.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "s3c24xx-pcm.h" ++ ++#define S3C24XX_PCM_DEBUG 0 ++#if S3C24XX_PCM_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++static const struct snd_pcm_hardware s3c24xx_pcm_hardware = { ++ .info = SNDRV_PCM_INFO_INTERLEAVED | ++ SNDRV_PCM_INFO_BLOCK_TRANSFER | ++ SNDRV_PCM_INFO_MMAP | ++ SNDRV_PCM_INFO_MMAP_VALID, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_U16_LE | ++ SNDRV_PCM_FMTBIT_U8 | ++ SNDRV_PCM_FMTBIT_S8, ++ .channels_min = 2, ++ .channels_max = 2, ++ .buffer_bytes_max = 128*1024, ++ .period_bytes_min = PAGE_SIZE, ++ .period_bytes_max = PAGE_SIZE*2, ++ .periods_min = 2, ++ .periods_max = 128, ++ .fifo_size = 32, ++}; ++ ++struct s3c24xx_runtime_data { ++ spinlock_t lock; ++ int state; ++ unsigned int dma_loaded; ++ unsigned int dma_limit; ++ unsigned int dma_period; ++ dma_addr_t dma_start; ++ dma_addr_t dma_pos; ++ dma_addr_t dma_end; ++ struct s3c24xx_pcm_dma_params *params; ++}; ++ ++/* s3c24xx_pcm_enqueue ++ * ++ * place a dma buffer onto the queue for the dma system ++ * to handle. ++*/ ++static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ dma_addr_t pos = prtd->dma_pos; ++ int ret; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ while (prtd->dma_loaded < prtd->dma_limit) { ++ unsigned long len = prtd->dma_period; ++ ++ DBG("dma_loaded: %d\n",prtd->dma_loaded); ++ ++ if ((pos + len) > prtd->dma_end) { ++ len = prtd->dma_end - pos; ++ DBG(KERN_DEBUG "%s: corrected dma len %ld\n", ++ __FUNCTION__, len); ++ } ++ ++ ret = s3c2410_dma_enqueue(prtd->params->channel, substream, pos, len); ++ ++ if (ret == 0) { ++ prtd->dma_loaded++; ++ pos += prtd->dma_period; ++ if (pos >= prtd->dma_end) ++ pos = prtd->dma_start; ++ } else ++ break; ++ } ++ ++ prtd->dma_pos = pos; ++} ++ ++static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, ++ void *dev_id, int size, ++ enum s3c2410_dma_buffresult result) ++{ ++ struct snd_pcm_substream *substream = dev_id; ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) ++ return; ++ ++ if (substream) ++ snd_pcm_period_elapsed(substream); ++ ++ spin_lock(&prtd->lock); ++ if (prtd->state & ST_RUNNING) { ++ prtd->dma_loaded--; ++ s3c24xx_pcm_enqueue(substream); ++ } ++ ++ spin_unlock(&prtd->lock); ++} ++ ++static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd = runtime->private_data; ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct s3c24xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data; ++ unsigned long totbytes = params_buffer_bytes(params); ++ int ret=0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ /* return if this is a bufferless transfer e.g. ++ * codec <--> BT codec or GSM modem -- lg FIXME */ ++ if (!dma) ++ return 0; ++ ++ /* prepare DMA */ ++ prtd->params = dma; ++ ++ DBG("params %p, client %p, channel %d\n", prtd->params, ++ prtd->params->client, prtd->params->channel); ++ ++ ret = s3c2410_dma_request(prtd->params->channel, ++ prtd->params->client, NULL); ++ ++ if (ret) { ++ DBG(KERN_ERR "failed to get dma channel\n"); ++ return ret; ++ } ++ ++ /* channel needs configuring for mem=>device, increment memory addr, ++ * sync to pclk, half-word transfers to the IIS-FIFO. */ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ s3c2410_dma_devconfig(prtd->params->channel, ++ S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC | ++ S3C2410_DISRCC_APB, prtd->params->dma_addr); ++ ++ s3c2410_dma_config(prtd->params->channel, ++ 2, S3C2410_DCON_SYNC_PCLK | S3C2410_DCON_HANDSHAKE); ++ } else { ++ s3c2410_dma_config(prtd->params->channel, ++ 2, S3C2410_DCON_HANDSHAKE | S3C2410_DCON_SYNC_PCLK); ++ ++ s3c2410_dma_devconfig(prtd->params->channel, ++ S3C2410_DMASRC_HW, 0x3, ++ prtd->params->dma_addr); ++ } ++ ++ s3c2410_dma_set_buffdone_fn(prtd->params->channel, ++ s3c24xx_audio_buffdone); ++ ++ snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); ++ ++ runtime->dma_bytes = totbytes; ++ ++ spin_lock_irq(&prtd->lock); ++ prtd->dma_loaded = 0; ++ prtd->dma_limit = runtime->hw.periods_min; ++ prtd->dma_period = params_period_bytes(params); ++ prtd->dma_start = runtime->dma_addr; ++ prtd->dma_pos = prtd->dma_start; ++ prtd->dma_end = prtd->dma_start + totbytes; ++ spin_unlock_irq(&prtd->lock); ++ ++ return 0; ++} ++ ++static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ /* TODO - do we need to ensure DMA flushed */ ++ snd_pcm_set_runtime_buffer(substream, NULL); ++ ++ if (prtd->params) { ++ s3c2410_dma_free(prtd->params->channel, prtd->params->client); ++ prtd->params = NULL; ++ } ++ ++ return 0; ++} ++ ++static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ /* return if this is a bufferless transfer e.g. ++ * codec <--> BT codec or GSM modem -- lg FIXME */ ++ if (!prtd->params) ++ return 0; ++ ++ /* flush the DMA channel */ ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); ++ prtd->dma_loaded = 0; ++ prtd->dma_pos = prtd->dma_start; ++ ++ /* enqueue dma buffers */ ++ s3c24xx_pcm_enqueue(substream); ++ ++ return ret; ++} ++ ++static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ spin_lock(&prtd->lock); ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ prtd->state |= ST_RUNNING; ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STARTED); ++ break; ++ ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ prtd->state &= ~ST_RUNNING; ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); ++ break; ++ ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ spin_unlock(&prtd->lock); ++ ++ return ret; ++} ++ ++static snd_pcm_uframes_t s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd = runtime->private_data; ++ unsigned long res; ++ dma_addr_t src, dst; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ spin_lock(&prtd->lock); ++ s3c2410_dma_getposition(prtd->params->channel, &src, &dst); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ res = dst - prtd->dma_start; ++ else ++ res = src - prtd->dma_start; ++ ++ spin_unlock(&prtd->lock); ++ ++ DBG("Pointer %x %x\n",src,dst); ++ ++ /* we seem to be getting the odd error from the pcm library due ++ * to out-of-bounds pointers. this is maybe due to the dma engine ++ * not having loaded the new values for the channel before being ++ * callled... (todo - fix ) ++ */ ++ ++ if (res >= snd_pcm_lib_buffer_bytes(substream)) { ++ if (res == snd_pcm_lib_buffer_bytes(substream)) ++ res = 0; ++ } ++ ++ return bytes_to_frames(substream->runtime, res); ++} ++ ++static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd; ++ ++ int ret; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); ++ ++ prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); ++ if (prtd == NULL) ++ return -ENOMEM; ++ ++ runtime->private_data = prtd; ++ return 0; ++} ++ ++static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd = runtime->private_data; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (prtd) ++ kfree(prtd); ++ else ++ DBG("s3c24xx_pcm_close called with prtd == NULL\n"); ++ ++ return 0; ++} ++ ++static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, ++ struct vm_area_struct *vma) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ return dma_mmap_writecombine(substream->pcm->card->dev, vma, ++ runtime->dma_area, ++ runtime->dma_addr, ++ runtime->dma_bytes); ++} ++ ++static struct snd_pcm_ops s3c24xx_pcm_ops = { ++ .open = s3c24xx_pcm_open, ++ .close = s3c24xx_pcm_close, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = s3c24xx_pcm_hw_params, ++ .hw_free = s3c24xx_pcm_hw_free, ++ .prepare = s3c24xx_pcm_prepare, ++ .trigger = s3c24xx_pcm_trigger, ++ .pointer = s3c24xx_pcm_pointer, ++ .mmap = s3c24xx_pcm_mmap, ++}; ++ ++static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) ++{ ++ struct snd_pcm_substream *substream = pcm->streams[stream].substream; ++ struct snd_dma_buffer *buf = &substream->dma_buffer; ++ size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ buf->dev.type = SNDRV_DMA_TYPE_DEV; ++ buf->dev.dev = pcm->card->dev; ++ buf->private_data = NULL; ++ buf->area = dma_alloc_writecombine(pcm->card->dev, size, ++ &buf->addr, GFP_KERNEL); ++ if (!buf->area) ++ return -ENOMEM; ++ buf->bytes = size; ++ return 0; ++} ++ ++static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) ++{ ++ struct snd_pcm_substream *substream; ++ struct snd_dma_buffer *buf; ++ int stream; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ for (stream = 0; stream < 2; stream++) { ++ substream = pcm->streams[stream].substream; ++ if (!substream) ++ continue; ++ ++ buf = &substream->dma_buffer; ++ if (!buf->area) ++ continue; ++ ++ dma_free_writecombine(pcm->card->dev, buf->bytes, ++ buf->area, buf->addr); ++ buf->area = NULL; ++ } ++} ++ ++static u64 s3c24xx_pcm_dmamask = DMA_32BIT_MASK; ++ ++static int s3c24xx_pcm_new(struct snd_card *card, struct snd_soc_codec_dai *dai, ++ struct snd_pcm *pcm) ++{ ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (!card->dev->dma_mask) ++ card->dev->dma_mask = &s3c24xx_pcm_dmamask; ++ if (!card->dev->coherent_dma_mask) ++ card->dev->coherent_dma_mask = 0xffffffff; ++ ++ if (dai->playback.channels_min) { ++ ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, ++ SNDRV_PCM_STREAM_PLAYBACK); ++ if (ret) ++ goto out; ++ } ++ ++ if (dai->capture.channels_min) { ++ ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, ++ SNDRV_PCM_STREAM_CAPTURE); ++ if (ret) ++ goto out; ++ } ++ out: ++ return ret; ++} ++ ++struct snd_soc_platform s3c24xx_soc_platform = { ++ .name = "s3c24xx-audio", ++ .pcm_ops = &s3c24xx_pcm_ops, ++ .pcm_new = s3c24xx_pcm_new, ++ .pcm_free = s3c24xx_pcm_free_dma_buffers, ++}; ++ ++EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); ++ ++MODULE_AUTHOR("Ben Dooks, "); ++MODULE_DESCRIPTION("Samsung S3C24XX PCM DMA module"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h +new file mode 100644 +index 0000000..5dced4a +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-pcm.h +@@ -0,0 +1,32 @@ ++/* ++ * s3c24xx-pcm.h -- ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * ALSA PCM interface for the Samsung S3C24xx CPU ++ */ ++ ++#ifndef _S3C24XX_PCM_H ++#define _S3C24XX_PCM_H ++ ++#define ST_RUNNING (1<<0) ++#define ST_OPENED (1<<1) ++ ++struct s3c24xx_pcm_dma_params { ++ struct s3c2410_dma_client *client; /* stream identifier */ ++ int channel; /* Channel ID */ ++ dma_addr_t dma_addr; ++}; ++ ++#define S3C24XX_DAI_I2S 0 ++ ++extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; ++ ++/* platform data */ ++extern struct snd_soc_platform s3c24xx_soc_platform; ++extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; ++ ++#endif +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch b/packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch new file mode 100644 index 0000000000..4b518241b8 --- /dev/null +++ b/packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch @@ -0,0 +1,763 @@ +From eb7cbe67158924a0de114664ce5251fcad418b12 Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 16:58:40 +0000 +Subject: [PATCH] Add Neo1973 ASoC support. + +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/s3c24xx/Kconfig | 9 + + sound/soc/s3c24xx/Makefile | 4 + + sound/soc/s3c24xx/lm4857.h | 15 + + sound/soc/s3c24xx/neo1973_wm8753.c | 686 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 714 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/s3c24xx/lm4857.h + create mode 100644 sound/soc/s3c24xx/neo1973_wm8753.c + +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +index 433da9f..c414886 100644 +--- a/sound/soc/s3c24xx/Kconfig ++++ b/sound/soc/s3c24xx/Kconfig +@@ -12,5 +12,14 @@ config SND_S3C24XX_SOC + config SND_S3C24XX_SOC_I2S + tristate + ++config SND_S3C24XX_SOC_NEO1973_WM8753 ++ tristate "SoC I2S Audio support for NEO1973 - WM8753" ++ depends on SND_S3C24XX_SOC && MACH_GTA01 ++ select SND_S3C24XX_SOC_I2S ++ select SND_SOC_WM8753 ++ help ++ Say Y if you want to add support for SoC audio on smdk2440 ++ with the WM8753. ++ + endmenu + +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +index 56200d7..7b5c6fe 100644 +--- a/sound/soc/s3c24xx/Makefile ++++ b/sound/soc/s3c24xx/Makefile +@@ -5,3 +5,7 @@ snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o + obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o + obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o + ++# S3C24XX Machine Support ++snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o ++ ++obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o +diff --git a/sound/soc/s3c24xx/lm4857.h b/sound/soc/s3c24xx/lm4857.h +new file mode 100644 +index 0000000..382d6c4 +--- /dev/null ++++ b/sound/soc/s3c24xx/lm4857.h +@@ -0,0 +1,15 @@ ++#ifndef LM4857_H_ ++#define LM4857_H_ ++ ++/* The register offsets in the cache array */ ++#define LM4857_MVOL 0 ++#define LM4857_LVOL 1 ++#define LM4857_RVOL 2 ++#define LM4857_CTRL 3 ++ ++/* the shifts required to set these bits */ ++#define LM4857_3D 5 ++#define LM4857_WAKEUP 5 ++#define LM4857_EPGAIN 4 ++ ++#endif /*LM4857_H_*/ +diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c +new file mode 100644 +index 0000000..46a70e3 +--- /dev/null ++++ b/sound/soc/s3c24xx/neo1973_wm8753.c +@@ -0,0 +1,686 @@ ++/* ++ * neo1973_wm8753.c -- SoC audio for Neo1973 ++ * ++ * Copyright 2007 Wolfson Microelectronics PLC. ++ * Author: Graeme Gregory ++ * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 20th Jan 2007 Initial version. ++ * 05th Feb 2007 Rename all to Neo1973 ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../codecs/wm8753.h" ++#include "lm4857.h" ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define NEO1973_DEBUG 0 ++#if NEO1973_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++/* define the scenarios */ ++#define NEO_AUDIO_OFF 0 ++#define NEO_GSM_CALL_AUDIO_HANDSET 1 ++#define NEO_GSM_CALL_AUDIO_HEADSET 2 ++#define NEO_GSM_CALL_AUDIO_BLUETOOTH 3 ++#define NEO_STEREO_TO_SPEAKERS 4 ++#define NEO_STEREO_TO_HEADPHONES 5 ++#define NEO_CAPTURE_HANDSET 6 ++#define NEO_CAPTURE_HEADSET 7 ++#define NEO_CAPTURE_BLUETOOTH 8 ++ ++static struct snd_soc_machine neo1973; ++static struct i2c_client *i2c; ++ ++static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ unsigned int pll_out = 0, bclk = 0; ++ int ret = 0; ++ unsigned long iis_clkrate; ++ ++ iis_clkrate = s3c24xx_i2s_get_clockrate(); ++ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ pll_out = 12288000; ++ break; ++ case 48000: ++ bclk = WM8753_BCLK_DIV_4; ++ pll_out = 12288000; ++ break; ++ case 96000: ++ bclk = WM8753_BCLK_DIV_2; ++ pll_out = 12288000; ++ break; ++ case 11025: ++ bclk = WM8753_BCLK_DIV_16; ++ pll_out = 11289600; ++ break; ++ case 22050: ++ bclk = WM8753_BCLK_DIV_8; ++ pll_out = 11289600; ++ break; ++ case 44100: ++ bclk = WM8753_BCLK_DIV_4; ++ pll_out = 11289600; ++ break; ++ case 88200: ++ bclk = WM8753_BCLK_DIV_2; ++ pll_out = 11289600; ++ break; ++ } ++ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) ++ return ret; ++ ++ /* set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) ++ return ret; ++ ++ /* set the codec system clock for DAC and ADC */ ++ ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_MCLK, pll_out, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) ++ return ret; ++ ++ /* set MCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK, ++ S3C2410_IISMOD_32FS ); ++ if (ret < 0) ++ return ret; ++ ++ /* set codec BCLK division for sample rate */ ++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_BCLKDIV, bclk); ++ if (ret < 0) ++ return ret; ++ ++ /* set prescaler division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER, ++ S3C24XX_PRESCALE(4,4)); ++ if (ret < 0) ++ return ret; ++ ++ /* codec PLL input is PCLK/4 */ ++ ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, iis_clkrate/4, ++ pll_out); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ ++ /* disable the PLL */ ++ return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, 0, 0); ++} ++ ++/* ++ * Neo1973 WM8753 HiFi DAI opserations. ++ */ ++static struct snd_soc_ops neo1973_hifi_ops = { ++ .hw_params = neo1973_hifi_hw_params, ++ .hw_free = neo1973_hifi_hw_free, ++}; ++ ++static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ unsigned int pcmdiv = 0; ++ int ret = 0; ++ unsigned long iis_clkrate; ++ ++ /* todo: gg where is sysclk coming from for voice ?? */ ++ iis_clkrate = s3c24xx_i2s_get_clockrate(); ++ ++ if (params_rate(params) != 8000) ++ return -EINVAL; ++ if(params_channels(params) != 1) ++ return -EINVAL; ++ ++ pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */ ++ ++ /* todo: gg check mode (DSP_B) against CSR datasheet */ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); ++ if (ret < 0) ++ return ret; ++ ++ /* set the codec system clock for DAC and ADC */ ++ ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_PCMCLK, 12288000, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) ++ return ret; ++ ++ /* set codec PCM division for sample rate */ ++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_PCMDIV, pcmdiv); ++ if (ret < 0) ++ return ret; ++ ++ /* configue and enable PLL for 12.288MHz output */ ++ ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, iis_clkrate/4, ++ 12288000); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static int neo1973_voice_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ ++ /* disable the PLL */ ++ return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, 0, 0); ++} ++ ++static struct snd_soc_ops neo1973_voice_ops = { ++ .hw_params = neo1973_voice_hw_params, ++ .hw_free = neo1973_voice_hw_free, ++}; ++ ++static int neo1973_scenario = 0; ++ ++static int neo1973_get_scenario(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ ucontrol->value.integer.value[0] = neo1973_scenario; ++ return 0; ++} ++ ++static int set_scenario_endpoints(struct snd_soc_codec *codec, int scenario) ++{ ++ switch(neo1973_scenario) { ++ case NEO_AUDIO_OFF: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_GSM_CALL_AUDIO_HANDSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 1); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 1); ++ break; ++ case NEO_GSM_CALL_AUDIO_HEADSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 1); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 1); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_GSM_CALL_AUDIO_BLUETOOTH: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 1); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_STEREO_TO_SPEAKERS: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_STEREO_TO_HEADPHONES: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_CAPTURE_HANDSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 1); ++ break; ++ case NEO_CAPTURE_HEADSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 1); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_CAPTURE_BLUETOOTH: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ default: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ ++ return 0; ++} ++ ++static int neo1973_set_scenario(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ ++ if (neo1973_scenario == ucontrol->value.integer.value[0]) ++ return 0; ++ ++ neo1973_scenario = ucontrol->value.integer.value[0]; ++ ++ set_scenario_endpoints(codec, neo1973_scenario); ++ ++ return 1; ++} ++ ++static u8 lm4857_regs[4] = {0x00, 0x40, 0x80, 0xC0}; ++ ++static void lm4857_write_regs( void ) ++{ ++ if( i2c_master_send(i2c, lm4857_regs, 4) != 4) ++ printk(KERN_WARNING "lm4857: i2c write failed\n"); ++} ++ ++static int lm4857_get_reg(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ int reg=kcontrol->private_value & 0xFF; ++ int shift = (kcontrol->private_value >> 8) & 0x0F; ++ int mask = (kcontrol->private_value >> 16) & 0xFF; ++ ++ ucontrol->value.integer.value[0] = (lm4857_regs[reg] >> shift) & mask; ++ ++ return 0; ++} ++ ++static int lm4857_set_reg(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ int reg = kcontrol->private_value & 0xFF; ++ int shift = (kcontrol->private_value >> 8) & 0x0F; ++ int mask = (kcontrol->private_value >> 16) & 0xFF; ++ ++ if (((lm4857_regs[reg] >> shift ) & mask) == ++ ucontrol->value.integer.value[0]) ++ return 0; ++ ++ lm4857_regs[reg] &= ~ (mask << shift); ++ lm4857_regs[reg] |= ucontrol->value.integer.value[0] << shift; ++ ++ lm4857_write_regs(); ++ return 1; ++} ++ ++static int lm4857_get_mode(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ u8 value = lm4857_regs[LM4857_CTRL] & 0x0F; ++ ++ if (value) ++ value -= 5; ++ ++ ucontrol->value.integer.value[0] = value; ++ return 0; ++} ++ ++static int lm4857_set_mode(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ u8 value = ucontrol->value.integer.value[0]; ++ ++ if (value) ++ value += 5; ++ ++ if ((lm4857_regs[LM4857_CTRL] & 0x0F) == value) ++ return 0; ++ ++ lm4857_regs[LM4857_CTRL] &= 0xF0; ++ lm4857_regs[LM4857_CTRL] |= value; ++ ++ lm4857_write_regs(); ++ return 1; ++} ++ ++static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = { ++ SND_SOC_DAPM_LINE("Audio Out", NULL), ++ SND_SOC_DAPM_LINE("GSM Line Out", NULL), ++ SND_SOC_DAPM_LINE("GSM Line In", NULL), ++ SND_SOC_DAPM_MIC("Headset Mic", NULL), ++ SND_SOC_DAPM_MIC("Call Mic", NULL), ++}; ++ ++ ++/* example machine audio_mapnections */ ++static const char* audio_map[][3] = { ++ ++ /* Connections to the lm4857 amp */ ++ {"Audio Out", NULL, "LOUT1"}, ++ {"Audio Out", NULL, "ROUT1"}, ++ ++ /* Connections to the GSM Module */ ++ {"GSM Line Out", NULL, "MONO1"}, ++ {"GSM Line Out", NULL, "MONO2"}, ++ {"RXP", NULL, "GSM Line In"}, ++ {"RXN", NULL, "GSM Line In"}, ++ ++ /* Connections to Headset */ ++ {"MIC1", NULL, "Mic Bias"}, ++ {"Mic Bias", NULL, "Headset Mic"}, ++ ++ /* Call Mic */ ++ {"MIC2", NULL, "Mic Bias"}, ++ {"MIC2N", NULL, "Mic Bias"}, ++ {"Mic Bias", NULL, "Call Mic"}, ++ ++ /* Connect the ALC pins */ ++ {"ACIN", NULL, "ACOP"}, ++ ++ {NULL, NULL, NULL}, ++}; ++ ++static const char *lm4857_mode[] = { ++ "Off", ++ "Call Speaker", ++ "Stereo Speakers", ++ "Stereo Speakers + Headphones", ++ "Headphones" ++}; ++ ++static const struct soc_enum lm4857_mode_enum[] = { ++ SOC_ENUM_SINGLE_EXT(5, lm4857_mode), ++}; ++ ++static const char *neo_scenarios[] = { ++ "Off", ++ "GSM Handset", ++ "GSM Headset", ++ "GSM Bluetooth", ++ "Speakers", ++ "Headphones", ++ "Capture Handset", ++ "Capture Headset", ++ "Capture Bluetooth" ++}; ++ ++static const struct soc_enum neo_scenario_enum[] = { ++ SOC_ENUM_SINGLE_EXT(9,neo_scenarios), ++}; ++ ++static const struct snd_kcontrol_new wm8753_neo1973_controls[] = { ++ SOC_SINGLE_EXT("Amp Left Playback Volume", LM4857_LVOL, 0, 31, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp Right Playback Volume", LM4857_RVOL, 0, 31, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp Mono Playback Volume", LM4857_MVOL, 0, 31, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_ENUM_EXT("Amp Mode", lm4857_mode_enum[0], ++ lm4857_get_mode, lm4857_set_mode), ++ SOC_ENUM_EXT("Neo Mode", neo_scenario_enum[0], ++ neo1973_get_scenario, neo1973_set_scenario), ++ SOC_SINGLE_EXT("Amp Spk 3D Playback Switch", LM4857_LVOL, 5, 1, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp HP 3d Playback Switch", LM4857_RVOL, 5, 1, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp Fast Wakeup Playback Switch", LM4857_CTRL, 5, 1, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp Earpiece 6dB Playback Switch", LM4857_CTRL, 4, 1, 0, ++ lm4857_get_reg, lm4857_set_reg), ++}; ++ ++/* ++ * This is an example machine initialisation for a wm8753 connected to a ++ * neo1973 II. It is missing logic to detect hp/mic insertions and logic ++ * to re-route the audio in such an event. ++ */ ++static int neo1973_wm8753_init(struct snd_soc_codec *codec) ++{ ++ int i, err; ++ ++ /* set up NC codec pins */ ++ snd_soc_dapm_set_endpoint(codec, "LOUT2", 0); ++ snd_soc_dapm_set_endpoint(codec, "ROUT2", 0); ++ snd_soc_dapm_set_endpoint(codec, "OUT3", 0); ++ snd_soc_dapm_set_endpoint(codec, "OUT4", 0); ++ snd_soc_dapm_set_endpoint(codec, "LINE1", 0); ++ snd_soc_dapm_set_endpoint(codec, "LINE2", 0); ++ ++ ++ /* set endpoints to default mode */ ++ set_scenario_endpoints(codec, NEO_AUDIO_OFF); ++ ++ /* Add neo1973 specific widgets */ ++ for(i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++) ++ snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]); ++ ++ /* add neo1973 specific controls */ ++ for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) { ++ if ((err = snd_ctl_add(codec->card, ++ snd_soc_cnew(&wm8753_neo1973_controls[i],codec, NULL))) < 0) ++ return err; ++ } ++ ++ /* set up neo1973 specific audio path audio_mapnects */ ++ for(i = 0; audio_map[i][0] != NULL; i++) { ++ snd_soc_dapm_connect_input(codec, audio_map[i][0], audio_map[i][1], ++ audio_map[i][2]); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ return 0; ++} ++ ++/* ++ * BT Codec DAI ++ */ ++static struct snd_soc_cpu_dai bt_dai = ++{ .name = "Bluetooth", ++ .id = 0, ++ .type = SND_SOC_DAI_PCM, ++ .playback = { ++ .channels_min = 1, ++ .channels_max = 1, ++ .rates = SNDRV_PCM_RATE_8000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE,}, ++ .capture = { ++ .channels_min = 1, ++ .channels_max = 1, ++ .rates = SNDRV_PCM_RATE_8000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE,}, ++}; ++ ++static struct snd_soc_dai_link neo1973_dai[] = { ++{ /* Hifi Playback - for similatious use with voice below */ ++ .name = "WM8753", ++ .stream_name = "WM8753 HiFi", ++ .cpu_dai = &s3c24xx_i2s_dai, ++ .codec_dai = &wm8753_dai[WM8753_DAI_HIFI], ++ .init = neo1973_wm8753_init, ++ .ops = &neo1973_hifi_ops, ++}, ++{ /* Voice via BT */ ++ .name = "Bluetooth", ++ .stream_name = "Voice", ++ .cpu_dai = &bt_dai, ++ .codec_dai = &wm8753_dai[WM8753_DAI_VOICE], ++ .ops = &neo1973_voice_ops, ++}, ++}; ++ ++static struct snd_soc_machine neo1973 = { ++ .name = "neo1973", ++ .dai_link = neo1973_dai, ++ .num_links = ARRAY_SIZE(neo1973_dai), ++}; ++ ++static struct wm8753_setup_data neo1973_wm8753_setup = { ++ .i2c_address = 0x1a, ++}; ++ ++static struct snd_soc_device neo1973_snd_devdata = { ++ .machine = &neo1973, ++ .platform = &s3c24xx_soc_platform, ++ .codec_dev = &soc_codec_dev_wm8753, ++ .codec_data = &neo1973_wm8753_setup, ++}; ++ ++static struct i2c_client client_template; ++ ++static unsigned short normal_i2c[] = { 0x7C, I2C_CLIENT_END }; ++ ++/* Magic definition of all other variables and things */ ++I2C_CLIENT_INSMOD; ++ ++static int lm4857_amp_probe(struct i2c_adapter *adap, int addr, int kind) ++{ ++ int ret; ++ ++ client_template.adapter = adap; ++ client_template.addr = addr; ++ ++ DBG("Entering %s\n", __FUNCTION__); ++ ++ i2c = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); ++ if (i2c == NULL){ ++ return -ENOMEM; ++ } ++ memcpy(i2c, &client_template, sizeof(struct i2c_client)); ++ ++ ret = i2c_attach_client(i2c); ++ if (ret < 0) { ++ DBG("failed to attach codec at addr %x\n", addr); ++ goto exit_err; ++ } ++ ++ lm4857_write_regs(); ++ ++ return ret; ++ ++exit_err: ++ kfree(i2c); ++ return ret; ++} ++ ++static int lm4857_i2c_detach(struct i2c_client *client) ++{ ++ i2c_detach_client(client); ++ kfree(client); ++ return 0; ++} ++ ++static int lm4857_i2c_attach(struct i2c_adapter *adap) ++{ ++ return i2c_probe(adap, &addr_data, lm4857_amp_probe); ++} ++ ++#define I2C_DRIVERID_LM4857 0xA5A5 /* liam - need a proper id */ ++ ++/* corgi i2c codec control layer */ ++static struct i2c_driver lm4857_i2c_driver = { ++ .driver = { ++ .name = "LM4857 I2C Amp", ++ .owner = THIS_MODULE, ++ }, ++ .id = I2C_DRIVERID_LM4857, ++ .attach_adapter = lm4857_i2c_attach, ++ .detach_client = lm4857_i2c_detach, ++ .command = NULL, ++}; ++ ++static struct i2c_client client_template = { ++ .name = "LM4857", ++ .driver = &lm4857_i2c_driver, ++}; ++ ++static struct platform_device *neo1973_snd_device; ++ ++static int __init neo1973_init(void) ++{ ++ int ret; ++ ++ neo1973_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!neo1973_snd_device) ++ return -ENOMEM; ++ ++ platform_set_drvdata(neo1973_snd_device, &neo1973_snd_devdata); ++ neo1973_snd_devdata.dev = &neo1973_snd_device->dev; ++ ret = platform_device_add(neo1973_snd_device); ++ ++ if (ret) ++ platform_device_put(neo1973_snd_device); ++ ++ ret = i2c_add_driver(&lm4857_i2c_driver); ++ if (ret != 0) ++ printk(KERN_ERR "can't add i2c driver"); ++ ++ return ret; ++} ++ ++static void __exit neo1973_exit(void) ++{ ++ platform_device_unregister(neo1973_snd_device); ++} ++ ++module_init(neo1973_init); ++module_exit(neo1973_exit); ++ ++/* Module information */ ++MODULE_AUTHOR("Graeme Gregory, graeme.gregory@wolfsonmicro.com, www.wolfsonmicro.com"); ++MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973"); ++MODULE_LICENSE("GPL"); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch b/packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch new file mode 100644 index 0000000000..01b51d925e --- /dev/null +++ b/packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch @@ -0,0 +1,373 @@ +From a6171bfad4671fe525ae2c8cddd4f6a7f739e346 Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 17:00:59 +0000 +Subject: [PATCH] Add initial ASoC SMDK2440 support. + +Signed-off-by: Ben Dooks +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/s3c24xx/Kconfig | 7 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/smdk2440.c | 320 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 329 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/s3c24xx/smdk2440.c + +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +index c414886..99fe902 100644 +--- a/sound/soc/s3c24xx/Kconfig ++++ b/sound/soc/s3c24xx/Kconfig +@@ -21,5 +21,12 @@ config SND_S3C24XX_SOC_NEO1973_WM8753 + Say Y if you want to add support for SoC audio on smdk2440 + with the WM8753. + ++config SND_S3C24XX_SOC_SMDK2440 ++ tristate "SoC I2S Audio support for SMDK2440" ++ depends on SND_S3C24XX_SOC && MACH_SMDK ++ select SND_S3C24XX_SOC_I2S ++ help ++ Say Y if you want to add support for SoC audio on SMDK2440 ++ + endmenu + +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +index 7b5c6fe..b991052 100644 +--- a/sound/soc/s3c24xx/Makefile ++++ b/sound/soc/s3c24xx/Makefile +@@ -7,5 +7,7 @@ obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o + + # S3C24XX Machine Support + snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o ++snd-soc-smdk2440-objs := smdk2440.o + + obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o ++obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2440) += snd-soc-smdk2440.o +diff --git a/sound/soc/s3c24xx/smdk2440.c b/sound/soc/s3c24xx/smdk2440.c +new file mode 100644 +index 0000000..9885a5e +--- /dev/null ++++ b/sound/soc/s3c24xx/smdk2440.c +@@ -0,0 +1,320 @@ ++/* ++ * smdk2440.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * This module is a modified version of the s3c24xx I2S driver supplied by ++ * Ben Dooks of Simtec and rejigged to the ASoC style at Wolfson Microelectronics ++ * ++ * Revision history ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../codecs/uda1380.h" ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define SMDK2440_DEBUG 0 ++#if SMDK2440_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++/* audio clock in Hz */ ++#define SMDK_CLOCK_SOURCE S3C24XX_CLKSRC_MPLL ++#define SMDK_CRYSTAL_CLOCK 16934400 ++ ++static int smdk2440_startup(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec *codec = rtd->socdev->codec; ++ ++ DBG("Entered smdk2440_startup\n"); ++ ++ return 0; ++} ++ ++static int smdk2440_shutdown(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec *codec = rtd->socdev->codec; ++ ++ DBG("Entered smdk2440_shutdown\n"); ++ ++ return 0; ++} ++ ++static int smdk2440_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ unsigned long iis_clkrate; ++ int div, div256, div384, diff256, diff384, bclk, mclk; ++ int ret; ++ unsigned int rate=params_rate(params); ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ iis_clkrate = s3c24xx_i2s_get_clockrate(); ++ ++ /* Using PCLK doesnt seem to suit audio particularly well on these cpu's ++ */ ++ ++ div256 = iis_clkrate / (rate * 256); ++ div384 = iis_clkrate / (rate * 384); ++ ++ if (((iis_clkrate / div256) - (rate * 256)) < ++ ((rate * 256) - (iis_clkrate / (div256 + 1)))) { ++ diff256 = (iis_clkrate / div256) - (rate * 256); ++ } else { ++ div256++; ++ diff256 = (iis_clkrate / div256) - (rate * 256); ++ } ++ ++ if (((iis_clkrate / div384) - (rate * 384)) < ++ ((rate * 384) - (iis_clkrate / (div384 + 1)))) { ++ diff384 = (iis_clkrate / div384) - (rate * 384); ++ } else { ++ div384++; ++ diff384 = (iis_clkrate / div384) - (rate * 384); ++ } ++ ++ DBG("diff256 %d, diff384 %d\n", diff256, diff384); ++ ++ if (diff256<=diff384) { ++ DBG("Selected 256FS\n"); ++ div = div256 - 1; ++ bclk = S3C2410_IISMOD_256FS; ++ } else { ++ DBG("Selected 384FS\n"); ++ div = div384 - 1; ++ bclk = S3C2410_IISMOD_384FS; ++ } ++ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); ++ if (ret < 0) ++ return ret; ++ ++ /* set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); ++ if (ret < 0) ++ return ret; ++ ++ /* set the audio system clock for DAC and ADC */ ++ ret = cpu_dai->dai_ops.set_sysclk(cpu_dai, S3C24XX_CLKSRC_PCLK, ++ rate, SND_SOC_CLOCK_OUT); ++ if (ret < 0) ++ return ret; ++ ++ /* set MCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK, S3C2410_IISMOD_32FS ); ++ if (ret < 0) ++ return ret; ++ ++ /* set BCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_BCLK, bclk); ++ if (ret < 0) ++ return ret; ++ ++ /* set prescaler division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER, ++ S3C24XX_PRESCALE(div,div)); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static struct snd_soc_ops smdk2440_ops = { ++ .startup = smdk2440_startup, ++ .shutdown = smdk2440_shutdown, ++ .hw_params = smdk2440_hw_params, ++}; ++ ++/* smdk2440 machine dapm widgets */ ++static const struct snd_soc_dapm_widget smdk2440_dapm_widgets[] = { ++SND_SOC_DAPM_HP("Headphone Jack", NULL), ++SND_SOC_DAPM_MIC("Mic Jack", NULL), ++SND_SOC_DAPM_LINE("Line Jack", NULL), ++}; ++ ++/* smdk2440 machine audio map (connections to the codec pins) */ ++static const char* audio_map[][3] = { ++ /* headphone connected to HPOUT */ ++ {"Headphone Jack", NULL, "HPOUT"}, ++ ++ /* mic is connected to MICIN (via right channel of headphone jack) */ ++ {"MICIN", NULL, "Mic Jack"}, ++ {"MICIN", NULL, "Line Jack"}, ++ ++ {NULL, NULL, NULL}, ++}; ++ ++/* ++ * Logic for a UDA1341 as attached to SMDK2440 ++ */ ++static int smdk2440_uda1341_init(struct snd_soc_codec *codec) ++{ ++ int i, err; ++ ++ DBG("Staring smdk2440 init\n"); ++ ++ /* Add smdk2440 specific widgets */ ++ for(i = 0; i < ARRAY_SIZE(smdk2440_dapm_widgets); i++) { ++ snd_soc_dapm_new_control(codec, &smdk2440_dapm_widgets[i]); ++ } ++ ++ /* Set up smdk2440 specific audio path audio_mapnects */ ++ for(i = 0; audio_map[i][0] != NULL; i++) { ++ snd_soc_dapm_connect_input(codec, audio_map[i][0], ++ audio_map[i][1], audio_map[i][2]); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ ++ DBG("Ending smdk2440 init\n"); ++ ++ return 0; ++} ++ ++/* s3c24xx digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link s3c24xx_dai = { ++ .name = "WM8731", ++ .stream_name = "WM8731", ++ .cpu_dai = &s3c24xx_i2s_dai, ++ .codec_dai = &uda1380_dai, ++ .init = smdk2440_uda1341_init, ++ .ops = &smdk2440_ops, ++}; ++ ++/* smdk2440 audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_smdk2440 = { ++ .name = "SMDK2440", ++ .dai_link = &s3c24xx_dai, ++ .num_links = 1, ++}; ++ ++static struct uda1380_setup_data smdk2440_uda1380_setup = { ++ .i2c_address = 0x00, ++}; ++ ++/* s3c24xx audio subsystem */ ++static struct snd_soc_device s3c24xx_snd_devdata = { ++ .machine = &snd_soc_machine_smdk2440, ++ .platform = &s3c24xx_soc_platform, ++ .codec_dev = &soc_codec_dev_uda1380, ++ .codec_data = &smdk2440_uda1380_setup, ++}; ++ ++static struct platform_device *s3c24xx_snd_device; ++ ++struct smdk2440_spi_device { ++ struct device *dev; ++}; ++ ++static struct smdk2440_spi_device smdk2440_spi_devdata = { ++}; ++ ++struct s3c2410_spigpio_info smdk2440_spi_devinfo = { ++ .pin_clk = S3C2410_GPF4, ++ .pin_mosi = S3C2410_GPF5, ++ .pin_miso = S3C2410_GPF6, ++ //.board_size, ++ //.board_info, ++ .chip_select=NULL, ++}; ++ ++static struct platform_device *smdk2440_spi_device; ++ ++static int __init smdk2440_init(void) ++{ ++ int ret; ++ ++ if (!machine_is_smdk2440() && !machine_is_s3c2440()) { ++ DBG("%d\n",machine_arch_type); ++ DBG("Not a SMDK2440\n"); ++ return -ENODEV; ++ } ++ ++ s3c24xx_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!s3c24xx_snd_device) { ++ DBG("platform_dev_alloc failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(s3c24xx_snd_device, &s3c24xx_snd_devdata); ++ s3c24xx_snd_devdata.dev = &s3c24xx_snd_device->dev; ++ ret = platform_device_add(s3c24xx_snd_device); ++ ++ if (ret) ++ platform_device_put(s3c24xx_snd_device); ++ ++ // Create a bitbanged SPI device ++ ++ smdk2440_spi_device = platform_device_alloc("s3c24xx-spi-gpio",-1); ++ if (!smdk2440_spi_device) { ++ DBG("smdk2440_spi_device : platform_dev_alloc failed\n"); ++ return -ENOMEM; ++ } ++ DBG("Return Code %d\n",ret); ++ ++ platform_set_drvdata(smdk2440_spi_device, &smdk2440_spi_devdata); ++ smdk2440_spi_devdata.dev = &smdk2440_spi_device->dev; ++ smdk2440_spi_devdata.dev->platform_data = &smdk2440_spi_devinfo; ++ ret = platform_device_add(smdk2440_spi_device); ++ ++ if (ret) ++ platform_device_put(smdk2440_spi_device); ++ ++ return ret; ++} ++ ++static void __exit smdk2440_exit(void) ++{ ++ platform_device_unregister(s3c24xx_snd_device); ++} ++ ++module_init(smdk2440_init); ++module_exit(smdk2440_exit); ++ ++/* Module information */ ++MODULE_AUTHOR("Ben Dooks, "); ++MODULE_DESCRIPTION("ALSA SoC SMDK2440"); ++MODULE_LICENSE("GPL"); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch b/packages/linux/linux-smdk2443/0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch new file mode 100644 index 0000000000..a1609ff6e6 --- /dev/null +++ b/packages/linux/linux-smdk2443/0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch @@ -0,0 +1,391 @@ +From 2799ad808892eff7367ebc3e329ab3e7d00ccdac Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 17:05:34 +0000 +Subject: [PATCH] Add ASoC SMDK2440 support for WM8956 codec. + +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/s3c24xx/Kconfig | 9 + + sound/soc/s3c24xx/Makefile | 3 + + sound/soc/s3c24xx/smdk2440_wm8956.c | 335 +++++++++++++++++++++++++++++++++++ + 3 files changed, 347 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/s3c24xx/smdk2440_wm8956.c + +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +index 99fe902..2b4bd21 100644 +--- a/sound/soc/s3c24xx/Kconfig ++++ b/sound/soc/s3c24xx/Kconfig +@@ -28,5 +28,14 @@ config SND_S3C24XX_SOC_SMDK2440 + help + Say Y if you want to add support for SoC audio on SMDK2440 + ++config SND_S3C24XX_SOC_SMDK2440_WM8956 ++ tristate "SoC I2S WM8956 Audio support for SMDK2440" ++ depends on SND_S3C24XX_SOC && MACH_SMDK ++ select SND_S3C24XX_SOC_I2S ++ select SND_SOC_WM8956 ++ help ++ Say Y if you want to add support for SoC audio on SMDK2440 ++ with WM8956. ++ + endmenu + +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +index b991052..2759e88 100644 +--- a/sound/soc/s3c24xx/Makefile ++++ b/sound/soc/s3c24xx/Makefile +@@ -8,6 +8,9 @@ obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o + # S3C24XX Machine Support + snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o + snd-soc-smdk2440-objs := smdk2440.o ++snd-soc-smdk2440-wm8956-objs := smdk2440-wm8956.o + + obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o + obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2440) += snd-soc-smdk2440.o ++obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2440_WM8956) += snd-soc-smdk2440-wm8956.o ++ +diff --git a/sound/soc/s3c24xx/smdk2440_wm8956.c b/sound/soc/s3c24xx/smdk2440_wm8956.c +new file mode 100644 +index 0000000..89960eb +--- /dev/null ++++ b/sound/soc/s3c24xx/smdk2440_wm8956.c +@@ -0,0 +1,335 @@ ++/* ++ * smdk2440.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * This module is a modified version of the s3c24xx I2S driver supplied by ++ * Ben Dooks of Simtec and rejigged to the ASoC style at Wolfson Microelectronics ++ * ++ * Revision history ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../codecs/wm8956.h" ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define SMDK2440_DEBUG 0 ++#if SMDK2440_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++/* audio clock in Hz */ ++#define SMDK_CLOCK_SOURCE S3C24XX_CLKSRC_MPLL ++#define SMDK_CRYSTAL_CLOCK 12000000 ++ ++static int smdk2440_startup(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec *codec = rtd->socdev->codec; ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ return 0; ++} ++ ++static int smdk2440_shutdown(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec *codec = rtd->socdev->codec; ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ return 0; ++} ++ ++static int smdk2440_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ int bclk, mclk; ++ int ret; ++ int pll; ++ int div=0,sysclkdiv=0; ++ unsigned int rate = params_rate(params); ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ /* Work out the pll dividers */ ++ switch(rate) ++ { ++ case 8000: ++ case 16000: ++ case 32000: ++ case 48000: ++ pll=12288000; ++ break; ++ case 96000: ++ pll=24576000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ pll=11289600; ++ break; ++ case 88200: ++ pll=22579200; ++ break; ++ default: ++ pll=12288000; ++ } ++ ++ /* Work out the DAV Div */ ++ switch(rate) ++ { ++ case 96000: ++ case 88200: ++ case 48000: ++ case 44100: ++ div=0; ++ break; ++ case 32000: ++ div=1; ++ break; ++ case 22050; ++ div=2; ++ break; ++ case 16000: ++ div=1; ++ sysclkdiv=2; ++ break; ++ case 11025: ++ div=4; ++ break; ++ case 8000: ++ div=6; ++ break; ++ } ++ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) ++ return ret; ++ ++ ret = codec_dai->dai_ops.set_pll(codec_dai, 0, SMDK_CRYSTAL_CLOCK, pll); ++ if (ret < 0) ++ return ret; ++ ++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8956_SYSCLKDIV, sysclkdiv); ++ if (ret < 0) ++ return ret; ++ ++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8956_DACDIV, div); ++ if (ret < 0) ++ return ret; ++ ++ /* set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) ++ return ret; ++ ++ /* set the audio system clock for DAC and ADC */ ++ /* 12Mhz crystal for this example */ ++ ret = cpu_dai->dai_ops.set_sysclk(cpu_dai, S3C24XX_CLKSRC_MPLL, ++ SMDK_CRYSTAL_CLOCK, SND_SOC_CLOCK_OUT); ++ if (ret < 0) ++ return ret; ++ ++ /* set MCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK, S3C2410_IISMOD_32FS ); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static struct snd_soc_ops smdk2440_ops = { ++ .startup = smdk2440_startup, ++ .shutdown = smdk2440_shutdown, ++ .hw_params = smdk2440_hw_params, ++}; ++ ++/* smdk2440 machine dapm widgets */ ++static const struct snd_soc_dapm_widget smdk2440_dapm_widgets[] = { ++SND_SOC_DAPM_HP("Headphone Jack", NULL), ++SND_SOC_DAPM_MIC("Mic Jack", NULL), ++SND_SOC_DAPM_LINE("Line Jack", NULL), ++}; ++ ++/* smdk2440 machine audio map (connections to the codec pins) */ ++static const char* audio_map[][3] = { ++ /* headphone connected to HPOUT */ ++ {"Headphone Jack", NULL, "HPOUT"}, ++ {"MICIN", NULL, "Mic Jack"}, ++ {"MICIN", NULL, "Line Jack"}, ++ ++ {NULL, NULL, NULL}, ++}; ++ ++/* ++ * Logic for a wm8956 as attached to SMDK2440 ++ */ ++static int smdk2440_wm8956_init(struct snd_soc_codec *codec) ++{ ++ int i, err; ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ ++ /* Add smdk2440 specific widgets */ ++ for(i = 0; i < ARRAY_SIZE(smdk2440_dapm_widgets); i++) { ++ snd_soc_dapm_new_control(codec, &smdk2440_dapm_widgets[i]); ++ } ++ ++ /* Set up smdk2440 specific audio path audio_mapnects */ ++ for(i = 0; audio_map[i][0] != NULL; i++) { ++ snd_soc_dapm_connect_input(codec, audio_map[i][0], ++ audio_map[i][1], audio_map[i][2]); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ ++ return 0; ++} ++ ++/* s3c24xx digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link s3c24xx_dai = { ++ .name = "WM8731", ++ .stream_name = "WM8731", ++ .cpu_dai = &s3c24xx_i2s_dai, ++ .codec_dai = &wm8956_dai, ++ .init = smdk2440_wm8956_init, ++ .ops = &smdk2440_ops, ++}; ++ ++/* smdk2440 audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_smdk2440 = { ++ .name = "SMDK2440", ++ .dai_link = &s3c24xx_dai, ++ .num_links = 1, ++}; ++ ++static struct wm8956_setup_data smdk2440_wm8956_setup = { ++ .i2c_address = 0x00, ++}; ++ ++/* s3c24xx audio subsystem */ ++static struct snd_soc_device s3c24xx_snd_devdata = { ++ .machine = &snd_soc_machine_smdk2440, ++ .platform = &s3c24xx_soc_platform, ++ .codec_dev = &soc_codec_dev_wm8956, ++ .codec_data = &smdk2440_wm8956_setup, ++}; ++ ++static struct platform_device *s3c24xx_snd_device; ++ ++struct smdk2440_spi_device { ++ struct device *dev; ++}; ++ ++static struct smdk2440_spi_device smdk2440_spi_devdata = { ++}; ++ ++struct s3c2410_spigpio_info smdk2440_spi_devinfo = { ++ .pin_clk = S3C2410_GPF4, ++ .pin_mosi = S3C2410_GPF5, ++ .pin_miso = S3C2410_GPF6, ++ //.board_size, ++ //.board_info, ++ .chip_select=NULL, ++}; ++ ++static struct platform_device *smdk2440_spi_device; ++ ++static int __init smdk2440_init(void) ++{ ++ int ret; ++ ++ if (!machine_is_smdk2440() && !machine_is_s3c2440()) { ++ DBG("%d\n",machine_arch_type); ++ DBG("Not a SMDK2440\n"); ++ return -ENODEV; ++ } ++ ++ s3c24xx_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!s3c24xx_snd_device) { ++ DBG("platform_dev_alloc failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(s3c24xx_snd_device, &s3c24xx_snd_devdata); ++ s3c24xx_snd_devdata.dev = &s3c24xx_snd_device->dev; ++ ret = platform_device_add(s3c24xx_snd_device); ++ ++ if (ret) ++ platform_device_put(s3c24xx_snd_device); ++ ++ // Create a bitbanged SPI device ++ ++ smdk2440_spi_device = platform_device_alloc("s3c24xx-spi-gpio",-1); ++ if (!smdk2440_spi_device) { ++ DBG("smdk2440_spi_device : platform_dev_alloc failed\n"); ++ return -ENOMEM; ++ } ++ DBG("Return Code %d\n",ret); ++ ++ platform_set_drvdata(smdk2440_spi_device, &smdk2440_spi_devdata); ++ smdk2440_spi_devdata.dev = &smdk2440_spi_device->dev; ++ smdk2440_spi_devdata.dev->platform_data = &smdk2440_spi_devinfo; ++ ret = platform_device_add(smdk2440_spi_device); ++ ++ if (ret) ++ platform_device_put(smdk2440_spi_device); ++ ++ return ret; ++} ++ ++static void __exit smdk2440_exit(void) ++{ ++ platform_device_unregister(s3c24xx_snd_device); ++} ++ ++module_init(smdk2440_init); ++module_exit(smdk2440_exit); ++ ++/* Module information */ ++MODULE_AUTHOR("Ben Dooks, "); ++MODULE_DESCRIPTION("ALSA SoC SMDK2440"); ++MODULE_LICENSE("GPL"); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0033-arch-hardware.h-is-no-longer-allowed-to-be-directly.patch b/packages/linux/linux-smdk2443/0033-arch-hardware.h-is-no-longer-allowed-to-be-directly.patch new file mode 100644 index 0000000000..2dc2a6ac41 --- /dev/null +++ b/packages/linux/linux-smdk2443/0033-arch-hardware.h-is-no-longer-allowed-to-be-directly.patch @@ -0,0 +1,41 @@ +From 3108e2dc553b3014294a6915471198c94c643657 Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Mon, 26 Mar 2007 14:19:43 +0100 +Subject: [PATCH] arch/hardware.h is no longer allowed to be directly included. So changed +to include hardware.h + +Signed-off-by: Graeme Gregory +--- + sound/soc/s3c24xx/neo1973_wm8753.c | 2 +- + sound/soc/s3c24xx/smdk2440.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c +index 46a70e3..34e03cd 100644 +--- a/sound/soc/s3c24xx/neo1973_wm8753.c ++++ b/sound/soc/s3c24xx/neo1973_wm8753.c +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/sound/soc/s3c24xx/smdk2440.c b/sound/soc/s3c24xx/smdk2440.c +index 9885a5e..5363fe1 100644 +--- a/sound/soc/s3c24xx/smdk2440.c ++++ b/sound/soc/s3c24xx/smdk2440.c +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0034-Export-ac97_dai.patch b/packages/linux/linux-smdk2443/0034-Export-ac97_dai.patch new file mode 100644 index 0000000000..d159d92ea3 --- /dev/null +++ b/packages/linux/linux-smdk2443/0034-Export-ac97_dai.patch @@ -0,0 +1,39 @@ +From 5927769216ec15b725f224e3e60ed9884c192704 Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Mon, 26 Mar 2007 15:18:27 +0100 +Subject: [PATCH] Export ac97_dai + +This is required so that machine drivers can use this codec. + +Signed-off-by: Graeme Gregory +--- + sound/soc/codecs/ac97.c | 1 + + sound/soc/codecs/ac97.h | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c +index 55bc55e..0cdef97 100644 +--- a/sound/soc/codecs/ac97.c ++++ b/sound/soc/codecs/ac97.c +@@ -60,6 +60,7 @@ static struct snd_soc_codec_dai ac97_dai = { + .ops = { + .prepare = ac97_prepare,}, + }; ++EXPORT_SYMBOL_GPL(ac97_dai); + + static unsigned int ac97_read(struct snd_soc_codec *codec, + unsigned int reg) +diff --git a/sound/soc/codecs/ac97.h b/sound/soc/codecs/ac97.h +index 930ddfc..2bf6d69 100644 +--- a/sound/soc/codecs/ac97.h ++++ b/sound/soc/codecs/ac97.h +@@ -14,5 +14,6 @@ + #define __LINUX_SND_SOC_AC97_H + + extern struct snd_soc_codec_device soc_codec_dev_ac97; ++extern struct snd_soc_codec_dai ac97_dai; + + #endif +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0035-Fix-power-and-PLL.patch b/packages/linux/linux-smdk2443/0035-Fix-power-and-PLL.patch new file mode 100644 index 0000000000..c498da69fe --- /dev/null +++ b/packages/linux/linux-smdk2443/0035-Fix-power-and-PLL.patch @@ -0,0 +1,63 @@ +From fc2b709436ef9069dac1e2b46a8acb94a7169e8d Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Mon, 26 Mar 2007 15:25:43 +0100 +Subject: [PATCH] Fix power and PLL + +bit 0 of POWER1 has oposite meaning to the rest of the bits so write this +to zero to enable chip. + +enable the fractional PLL by enabling the correct bit in register. + +Signed-off-by: Graeme Gregory +--- + sound/soc/codecs/wm8956.c | 4 ++-- + sound/soc/codecs/wm8960.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sound/soc/codecs/wm8956.c b/sound/soc/codecs/wm8956.c +index 6e1bbc9..d88f572 100644 +--- a/sound/soc/codecs/wm8956.c ++++ b/sound/soc/codecs/wm8956.c +@@ -314,7 +314,7 @@ static int wm8956_dapm_event(struct snd_soc_codec *codec, int event) + } + #endif + // tmp +- wm8956_write(codec, WM8956_POWER1, 0xffff); ++ wm8956_write(codec, WM8956_POWER1, 0xfffe); + wm8956_write(codec, WM8956_POWER2, 0xffff); + wm8956_write(codec, WM8956_POWER3, 0xffff); + codec->dapm_state = event; +@@ -388,7 +388,7 @@ static int wm8956_set_dai_pll(struct snd_soc_codec_dai *codec_dai, + return -EINVAL; + + reg = wm8956_read_reg_cache(codec, WM8956_PLLN) & 0x1e0; +- wm8956_write(codec, WM8956_PLLN, reg | (pll_div.pre_div << 4) ++ wm8956_write(codec, WM8956_PLLN, reg | (1<<5) | (pll_div.pre_div << 4) + | pll_div.n); + wm8956_write(codec, WM8956_PLLK1, pll_div.k >> 16 ); + wm8956_write(codec, WM8956_PLLK2, (pll_div.k >> 8) & 0xff); +diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c +index a754742..24cbb36 100644 +--- a/sound/soc/codecs/wm8960.c ++++ b/sound/soc/codecs/wm8960.c +@@ -356,7 +356,7 @@ static int wm8960_dapm_event(struct snd_soc_codec *codec, int event) + } + #endif + // tmp +- wm8960_write(codec, WM8960_POWER1, 0xffff); ++ wm8960_write(codec, WM8960_POWER1, 0xfffe); + wm8960_write(codec, WM8960_POWER2, 0xffff); + wm8960_write(codec, WM8960_POWER3, 0xffff); + codec->dapm_state = event; +@@ -430,7 +430,7 @@ static int wm8960_set_dai_pll(struct snd_soc_codec_dai *codec_dai, + return -EINVAL; + + reg = wm8960_read_reg_cache(codec, WM8960_PLLN) & 0x1e0; +- wm8960_write(codec, WM8960_PLLN, reg | (pll_div.pre_div << 4) ++ wm8960_write(codec, WM8960_PLLN, reg | (1<<5) | (pll_div.pre_div << 4) + | pll_div.n); + wm8960_write(codec, WM8960_PLLK1, pll_div.k >> 16 ); + wm8960_write(codec, WM8960_PLLK2, (pll_div.k >> 8) & 0xff); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch b/packages/linux/linux-smdk2443/0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch new file mode 100644 index 0000000000..3b013db336 --- /dev/null +++ b/packages/linux/linux-smdk2443/0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch @@ -0,0 +1,48 @@ +From 129287fa3ed3c4caf14e9d9f70bec2f3a42ea00d Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Mon, 26 Mar 2007 15:31:30 +0100 +Subject: [PATCH] Move s3c24xx_i2s_dai and add dma_size + +move s3c24xx_i2s_dai from pcm.h to i2s.h where it should be + +add a dma_size parameter to the dma params as I2S and AC97 use different +writing widths to the FIFO. + +Signed-off-by: Graeme Gregory +--- + sound/soc/s3c24xx/s3c24xx-i2s.h | 2 ++ + sound/soc/s3c24xx/s3c24xx-pcm.h | 3 +-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.h b/sound/soc/s3c24xx/s3c24xx-i2s.h +index f9ca04e..537b4ec 100644 +--- a/sound/soc/s3c24xx/s3c24xx-i2s.h ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.h +@@ -32,4 +32,6 @@ + + u32 s3c24xx_i2s_get_clockrate(void); + ++extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; ++ + #endif /*S3C24XXI2S_H_*/ +diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h +index 5dced4a..5619fdc 100644 +--- a/sound/soc/s3c24xx/s3c24xx-pcm.h ++++ b/sound/soc/s3c24xx/s3c24xx-pcm.h +@@ -19,12 +19,11 @@ struct s3c24xx_pcm_dma_params { + struct s3c2410_dma_client *client; /* stream identifier */ + int channel; /* Channel ID */ + dma_addr_t dma_addr; ++ int dma_size; /* Size of the DMA transfer */ + }; + + #define S3C24XX_DAI_I2S 0 + +-extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; +- + /* platform data */ + extern struct snd_soc_platform s3c24xx_soc_platform; + extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch b/packages/linux/linux-smdk2443/0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch new file mode 100644 index 0000000000..720f3b4868 --- /dev/null +++ b/packages/linux/linux-smdk2443/0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch @@ -0,0 +1,104 @@ +From b0679d107622f7480a6629d3e92af714d9ea78b4 Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Mon, 26 Mar 2007 15:34:29 +0100 +Subject: [PATCH] Use dma_size parameter and fix buffdone oops + +Make use of the dma_size parameter in i2s.c and pcm.c + +Move the access of prtd in buffdone until after we have checked for an +abort as flush may be called when prtd is no longer valid. + +Signed-off-by: Graeme Gregory +--- + sound/soc/s3c24xx/s3c24xx-i2s.c | 6 ++++-- + sound/soc/s3c24xx/s3c24xx-pcm.c | 16 +++++++++------- + 2 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c +index df655a5..8ca314d 100644 +--- a/sound/soc/s3c24xx/s3c24xx-i2s.c ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.c +@@ -61,13 +61,15 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { + static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { + .client = &s3c24xx_dma_client_out, + .channel = DMACH_I2S_OUT, +- .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO ++ .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, ++ .dma_size = 2, + }; + + static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { + .client = &s3c24xx_dma_client_in, + .channel = DMACH_I2S_IN, +- .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO ++ .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, ++ .dma_size = 2, + }; + + struct s3c24xx_i2s_info { +diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c +index 867f1b3..dc28bc6 100644 +--- a/sound/soc/s3c24xx/s3c24xx-pcm.c ++++ b/sound/soc/s3c24xx/s3c24xx-pcm.c +@@ -38,7 +38,7 @@ + + #include "s3c24xx-pcm.h" + +-#define S3C24XX_PCM_DEBUG 0 ++#define S3C24XX_PCM_DEBUG 1 + #if S3C24XX_PCM_DEBUG + #define DBG(x...) printk(KERN_DEBUG x) + #else +@@ -119,13 +119,15 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, + enum s3c2410_dma_buffresult result) + { + struct snd_pcm_substream *substream = dev_id; +- struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ struct s3c24xx_runtime_data *prtd; + + DBG("Entered %s\n", __FUNCTION__); + + if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) + return; + ++ prtd = substream->runtime->private_data; ++ + if (substream) + snd_pcm_period_elapsed(substream); + +@@ -177,10 +179,12 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, + S3C2410_DISRCC_APB, prtd->params->dma_addr); + + s3c2410_dma_config(prtd->params->channel, +- 2, S3C2410_DCON_SYNC_PCLK | S3C2410_DCON_HANDSHAKE); ++ prtd->params->dma_size, ++ S3C2410_DCON_SYNC_PCLK | S3C2410_DCON_HANDSHAKE); + } else { + s3c2410_dma_config(prtd->params->channel, +- 2, S3C2410_DCON_HANDSHAKE | S3C2410_DCON_SYNC_PCLK); ++ prtd->params->dma_size, ++ S3C2410_DCON_HANDSHAKE | S3C2410_DCON_SYNC_PCLK); + + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_HW, 0x3, +@@ -214,7 +218,7 @@ static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) + + /* TODO - do we need to ensure DMA flushed */ + snd_pcm_set_runtime_buffer(substream, NULL); +- ++ + if (prtd->params) { + s3c2410_dma_free(prtd->params->channel, prtd->params->client); + prtd->params = NULL; +@@ -321,8 +325,6 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd; + +- int ret; +- + DBG("Entered %s\n", __FUNCTION__); + + snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch b/packages/linux/linux-smdk2443/0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch new file mode 100644 index 0000000000..9fa7e557f0 --- /dev/null +++ b/packages/linux/linux-smdk2443/0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch @@ -0,0 +1,724 @@ +From e3a91813a659447bd20de014902fc5b1d95272aa Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Mon, 26 Mar 2007 15:47:09 +0100 +Subject: [PATCH] Add smdk2443 s3c2443-ac97 and wm9710 support + +This is the machine driver for smdk2443 with wm9710 + +Also the s3c2443-ac97 driver for use with the above machine driver. + +Signed-off-by: Graeme Gregory +--- + sound/soc/s3c24xx/Kconfig | 15 ++ + sound/soc/s3c24xx/Makefile | 5 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 438 +++++++++++++++++++++++++++++++++++ + sound/soc/s3c24xx/s3c24xx-ac97.h | 25 ++ + sound/soc/s3c24xx/smdk2443_wm9710.c | 162 +++++++++++++ + 5 files changed, 644 insertions(+), 1 deletions(-) + create mode 100644 sound/soc/s3c24xx/s3c2443-ac97.c + create mode 100644 sound/soc/s3c24xx/s3c24xx-ac97.h + create mode 100644 sound/soc/s3c24xx/smdk2443_wm9710.c + +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +index 2b4bd21..c41ac49 100644 +--- a/sound/soc/s3c24xx/Kconfig ++++ b/sound/soc/s3c24xx/Kconfig +@@ -12,6 +12,12 @@ config SND_S3C24XX_SOC + config SND_S3C24XX_SOC_I2S + tristate + ++config SND_S3C2443_SOC_AC97 ++ tristate ++ select AC97_BUS ++ select SND_AC97_CODEC ++ select SND_SOC_AC97_BUS ++ + config SND_S3C24XX_SOC_NEO1973_WM8753 + tristate "SoC I2S Audio support for NEO1973 - WM8753" + depends on SND_S3C24XX_SOC && MACH_GTA01 +@@ -37,5 +43,14 @@ config SND_S3C24XX_SOC_SMDK2440_WM8956 + Say Y if you want to add support for SoC audio on SMDK2440 + with WM8956. + ++config SND_S3C24XX_SOC_SMDK2443_WM9710 ++ tristate "SoC I2S Audio support for SMDK2443 - WM9710" ++ depends on SND_S3C24XX_SOC && MACH_SMDK2443 ++ select SND_S3C2443_SOC_AC97 ++ select SND_SOC_AC97_CODEC ++ help ++ Say Y if you want to add support for SoC audio on smdk2443 ++ with the WM9710. ++ + endmenu + +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +index 2759e88..3594155 100644 +--- a/sound/soc/s3c24xx/Makefile ++++ b/sound/soc/s3c24xx/Makefile +@@ -1,16 +1,19 @@ + # S3c24XX Platform Support + snd-soc-s3c24xx-objs := s3c24xx-pcm.o + snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o ++snd-soc-s3c2443-ac97-objs := s3c2443-ac97.o + + obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o + obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o ++obj-$(CONFIG_SND_S3C2443_SOC_AC97) += snd-soc-s3c2443-ac97.o + + # S3C24XX Machine Support + snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o + snd-soc-smdk2440-objs := smdk2440.o + snd-soc-smdk2440-wm8956-objs := smdk2440-wm8956.o ++snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o + + obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o + obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2440) += snd-soc-smdk2440.o + obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2440_WM8956) += snd-soc-smdk2440-wm8956.o +- ++obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o +diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c +new file mode 100644 +index 0000000..db5996b +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c2443-ac97.c +@@ -0,0 +1,438 @@ ++/* ++ * s3c24xx-i2s.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * Copyright (C) 2005, Sean Choi ++ * All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Revision history ++ * 21st Mar 2007 Initial Version ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-ac97.h" ++ ++#define S3C2443_I2S_DEBUG 1 ++#if S3C2443_I2S_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++struct s3c24xx_ac97_info { ++ void __iomem *regs; ++ struct clk *ac97_clk; ++}; ++static struct s3c24xx_ac97_info s3c24xx_ac97; ++ ++static struct completion CAR_completion; ++static u32 waitingForMask; ++static DECLARE_MUTEX(CAR_mutex); ++ ++static unsigned short s3c2443_ac97_read(struct snd_ac97 *ac97, ++ unsigned short reg) ++{ ++ u32 ac_glbctrl; ++ u32 ac_codec_cmd; ++ u32 stat, addr, data; ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ down(&CAR_mutex); ++ ++ // Initialise the completion used in ISR ++ init_completion(&CAR_completion); ++ ++ waitingForMask = S3C_AC97_GLBSTAT_CODECREADY; ++ ac_codec_cmd = readl(s3c24xx_ac97.regs + S3C_AC97_CODEC_CMD); ++ ac_codec_cmd = S3C_AC97_CODEC_CMD_READ | AC_CMD_ADDR(reg); ++ writel(ac_codec_cmd, s3c24xx_ac97.regs + S3C_AC97_CODEC_CMD); ++ ++ udelay(50); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl |= S3C_AC97_GLBCTRL_CODECREADYIE; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ++ wait_for_completion(&CAR_completion); ++ ++ stat = readl(s3c24xx_ac97.regs + S3C_AC97_STAT); ++ addr = (stat >> 16) & 0x7f; ++ data = (stat & 0xffff); ++ ++ DBG("AC97 Read %x %x\n", addr, data); ++ ++ if (addr != reg) { ++ printk("req addr = %02x, rep addr = %02x\n", reg, addr); ++ } ++ ++ up(&CAR_mutex); ++ ++ return (unsigned short)data; ++} ++ ++static void s3c2443_ac97_write(struct snd_ac97 *ac97, unsigned short reg, ++ unsigned short val) ++{ ++ u32 ac_glbctrl; ++ u32 ac_codec_cmd; ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ down(&CAR_mutex); ++ ++ DBG("AC97 Write %x:%x\n", reg,val); ++ ++ init_completion(&CAR_completion); ++ ++ waitingForMask = S3C_AC97_GLBSTAT_CODECREADY; ++ ac_codec_cmd = readl(s3c24xx_ac97.regs + S3C_AC97_CODEC_CMD); ++ ac_codec_cmd = AC_CMD_ADDR(reg) | AC_CMD_DATA(val); ++ writel(ac_codec_cmd, s3c24xx_ac97.regs + S3C_AC97_CODEC_CMD); ++ ++ udelay(50); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl |= S3C_AC97_GLBCTRL_CODECREADYIE; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ++ wait_for_completion(&CAR_completion); ++ ++ ac_codec_cmd = readl(s3c24xx_ac97.regs + S3C_AC97_CODEC_CMD); ++ ac_codec_cmd |= S3C_AC97_CODEC_CMD_READ; ++ writel(ac_codec_cmd, s3c24xx_ac97.regs + S3C_AC97_CODEC_CMD); ++ ++ up(&CAR_mutex); ++ ++} ++ ++static void s3c2443_ac97_warm_reset(struct snd_ac97 *ac97) ++{ ++ u32 ac_glbctrl; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl = S3C_AC97_GLBCTRL_WARMRESET; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl = 0; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++} ++ ++static void s3c2443_ac97_cold_reset(struct snd_ac97 *ac97) ++{ ++ u32 ac_glbctrl; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl = S3C_AC97_GLBCTRL_COLDRESET; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl = 0; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl = S3C_AC97_GLBCTRL_ACLINKON; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl |= S3C_AC97_GLBCTRL_PCMOUTTM_DMA | S3C_AC97_GLBCTRL_PCMINTM_DMA | ++ S3C_AC97_GLBCTRL_MICINTM_DMA; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ++} ++ ++static irqreturn_t s3c2443_ac97_irq(int irq, void *dev_id) ++{ ++ int gsr; ++ u32 ac_glbctrl; ++ ++ gsr = readl(s3c24xx_ac97.regs + S3C_AC97_GLBSTAT) & waitingForMask; ++ ++ if (gsr) { ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl &= ~S3C_AC97_GLBCTRL_CODECREADYIE; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ complete(&CAR_completion); ++ } ++ return IRQ_HANDLED; ++} ++ ++struct snd_ac97_bus_ops soc_ac97_ops = { ++ .read = s3c2443_ac97_read, ++ .write = s3c2443_ac97_write, ++ .warm_reset = s3c2443_ac97_warm_reset, ++ .reset = s3c2443_ac97_cold_reset, ++}; ++ ++static struct s3c2410_dma_client s3c2443_dma_client_out = { ++ .name = "AC97 PCM Stereo out" ++}; ++ ++static struct s3c2410_dma_client s3c2443_dma_client_in = { ++ .name = "AC97 PCM Stereo in" ++}; ++ ++static struct s3c2410_dma_client s3c2443_dma_client_micin = { ++ .name = "AC97 Mic Mono in" ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = { ++ .client = &s3c2443_dma_client_out, ++ .channel = DMACH_PCM_OUT, ++ .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, ++ .dma_size = 4, ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = { ++ .client = &s3c2443_dma_client_in, ++ .channel = DMACH_PCM_IN, ++ .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, ++ .dma_size = 4, ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { ++ .client = &s3c2443_dma_client_micin, ++ .channel = DMACH_MIC_IN, ++ .dma_addr = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA, ++ .dma_size = 4, ++}; ++ ++#ifdef CONFIG_PM ++static int s3c2443_ac97_suspend(struct platform_device *pdev, ++ struct snd_soc_cpu_dai *dai) ++{ ++ ++ return 0; ++} ++ ++static int s3c2443_ac97_resume(struct platform_device *pdev, ++ struct snd_soc_cpu_dai *dai) ++{ ++ return 0; ++} ++ ++#else ++#define s3c2443_ac97_suspend NULL ++#define s3c2443_ac97_resume NULL ++#endif ++ ++static int s3c2443_ac97_probe(struct platform_device *pdev) ++{ ++ int ret; ++ u32 ac_glbctrl; ++ ++ s3c24xx_ac97.regs = ioremap(S3C2440_PA_AC97, 0x100); ++ if (s3c24xx_ac97.regs == NULL) ++ return -ENXIO; ++ ++ s3c24xx_ac97.ac97_clk=clk_get(&pdev->dev, "ac97"); ++ if (s3c24xx_ac97.ac97_clk == NULL) { ++ DBG("failed to get ac97_clock\n"); ++ return -ENODEV; ++ } ++ clk_enable(s3c24xx_ac97.ac97_clk); ++ ++ s3c2410_gpio_cfgpin(S3C2410_GPE0, S3C2443_GPE0_AC_nRESET); ++ s3c2410_gpio_cfgpin(S3C2410_GPE1, S3C2443_GPE1_AC_SYNC); ++ s3c2410_gpio_cfgpin(S3C2410_GPE2, S3C2443_GPE2_AC_BITCLK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE3, S3C2443_GPE3_AC_SDI); ++ s3c2410_gpio_cfgpin(S3C2410_GPE4, S3C2443_GPE4_AC_SDO); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl = S3C_AC97_GLBCTRL_COLDRESET; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl = 0; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ac_glbctrl = S3C_AC97_GLBCTRL_ACLINKON; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ udelay(1000); ++ ++ ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE; ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ++ ret = request_irq(IRQ_S3C2443_AC97, s3c2443_ac97_irq, SA_INTERRUPT, "AC97", NULL); ++ if (ret) ++ printk("Interrupt request failed.\n"); ++ ++ return ret; ++} ++ ++static void s3c2443_ac97_remove(struct platform_device *pdev) ++{ ++ ++} ++ ++static int s3c2443_ac97_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ cpu_dai->dma_data = &s3c2443_ac97_pcm_stereo_out; ++ else ++ cpu_dai->dma_data = &s3c2443_ac97_pcm_stereo_in; ++ ++ return 0; ++} ++ ++static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ u32 ac_glbctrl; ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ switch(cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ ac_glbctrl |= S3C_AC97_GLBCTRL_PCMINTM_DMA; ++ else ++ ac_glbctrl |= S3C_AC97_GLBCTRL_PCMOUTTM_DMA; ++ break; ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ ac_glbctrl &= ~S3C_AC97_GLBCTRL_PCMINTM_MASK; ++ else ++ ac_glbctrl &= ~S3C_AC97_GLBCTRL_PCMOUTTM_MASK; ++ break; ++ } ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ++ return 0; ++} ++ ++static int s3c2443_ac97_hw_mic_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ return -ENODEV; ++ else ++ cpu_dai->dma_data = &s3c2443_ac97_mic_mono_in; ++ ++ return 0; ++} ++ ++static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ u32 ac_glbctrl; ++ ++ ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ switch(cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ ac_glbctrl |= S3C_AC97_GLBCTRL_PCMINTM_DMA; ++ break; ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ ac_glbctrl &= ~S3C_AC97_GLBCTRL_PCMINTM_MASK; ++ } ++ writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); ++ ++ return 0; ++} ++ ++#define s3c2443_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ ++ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ ++ SNDRV_PCM_RATE_48000) ++ ++struct snd_soc_cpu_dai s3c2443_ac97_dai[] = { ++{ ++ .name = "s3c2443-ac97", ++ .id = 0, ++ .type = SND_SOC_DAI_AC97, ++ .probe = s3c2443_ac97_probe, ++ .remove = s3c2443_ac97_remove, ++ .suspend = s3c2443_ac97_suspend, ++ .resume = s3c2443_ac97_resume, ++ .playback = { ++ .stream_name = "AC97 Playback", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = s3c2443_AC97_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE,}, ++ .capture = { ++ .stream_name = "AC97 Capture", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = s3c2443_AC97_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE,}, ++ .ops = { ++ .hw_params = s3c2443_ac97_hw_params, ++ .trigger = s3c2443_ac97_trigger}, ++}, ++{ ++ .name = "pxa2xx-ac97-mic", ++ .id = 1, ++ .type = SND_SOC_DAI_AC97, ++ .capture = { ++ .stream_name = "AC97 Mic Capture", ++ .channels_min = 1, ++ .channels_max = 1, ++ .rates = s3c2443_AC97_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE,}, ++ .ops = { ++ .hw_params = s3c2443_ac97_hw_mic_params, ++ .trigger = s3c2443_ac97_mic_trigger,}, ++}, ++}; ++ ++EXPORT_SYMBOL_GPL(s3c2443_ac97_dai); ++EXPORT_SYMBOL_GPL(soc_ac97_ops); ++ ++MODULE_AUTHOR("Graeme Gregory"); ++MODULE_DESCRIPTION("AC97 driver for the Samsung s3c2443 chip"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/s3c24xx/s3c24xx-ac97.h b/sound/soc/s3c24xx/s3c24xx-ac97.h +new file mode 100644 +index 0000000..afddff0 +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-ac97.h +@@ -0,0 +1,25 @@ ++/* ++ * s3c24xx-i2s.c -- ALSA Soc Audio Layer ++ * ++ * Copyright 2005 Wolfson Microelectronics PLC. ++ * Author: Graeme Gregory ++ * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#ifndef S3C24XXAC97_H_ ++#define S3C24XXAC97_H_ ++ ++#define AC_CMD_ADDR(x) (x<<16) ++#define AC_CMD_DATA(x) (x&0xffff) ++ ++extern struct snd_soc_cpu_dai s3c2443_ac97_dai[]; ++ ++#endif /*S3C24XXI2S_H_*/ +diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c +new file mode 100644 +index 0000000..66c13cf +--- /dev/null ++++ b/sound/soc/s3c24xx/smdk2443_wm9710.c +@@ -0,0 +1,162 @@ ++/* ++ * smdk2443_wm9710.c -- SoC audio for smdk2443 ++ * ++ * Copyright 2007 Wolfson Microelectronics PLC. ++ * Author: Graeme Gregory ++ * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 8th Mar 2007 Initial version. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../codecs/ac97.h" ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-ac97.h" ++ ++#define SMDK2443_DEBUG 1 ++#if SMDK2443_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++static struct snd_soc_machine smdk2443; ++ ++static int smdk2443_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ return 0; ++} ++ ++static int smdk2443_resume(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static int smdk2443_probe(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static int smdk2443_remove(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static const struct snd_soc_dapm_widget smdk2443_dapm_widgets[] = { ++ SND_SOC_DAPM_MIC("Mic (Internal)", NULL), ++}; ++ ++/* example machine interconnections */ ++static const char* intercon[][3] = { ++ ++ /* mic is connected to mic1 - with bias */ ++ {"MIC1", NULL, "Mic Bias"}, ++ {"Mic Bias", NULL, "Mic (Internal)"}, ++ ++ {NULL, NULL, NULL}, ++}; ++ ++static int smdk2443_wm9710_init(struct snd_soc_codec *codec) ++{ ++ int i; ++ ++ /* set up smdk2443 NC codec pins */ ++ snd_soc_dapm_set_endpoint(codec, "RXP", 0); ++ snd_soc_dapm_set_endpoint(codec, "RXN", 0); ++ ++ /* Add smdk2443 specific widgets */ ++ for(i = 0; i < ARRAY_SIZE(smdk2443_dapm_widgets); i++) { ++ snd_soc_dapm_new_control(codec, &smdk2443_dapm_widgets[i]); ++ } ++ ++ /* set up smdk2443 specific audio path interconnects */ ++ for(i = 0; intercon[i][0] != NULL; i++) { ++ snd_soc_dapm_connect_input(codec, intercon[i][0], intercon[i][1], intercon[i][2]); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ return 0; ++} ++ ++static struct snd_soc_dai_link smdk2443_dai[] = { ++{ ++ .name = "AC97", ++ .stream_name = "AC97 HiFi", ++ .cpu_dai = &s3c2443_ac97_dai[0], ++ .codec_dai = &ac97_dai, ++ .init = smdk2443_wm9710_init, ++}, ++}; ++ ++static struct snd_soc_machine smdk2443 = { ++ .name = "SMDK2443", ++ .probe = smdk2443_probe, ++ .remove = smdk2443_remove, ++ .suspend_pre = smdk2443_suspend, ++ .resume_post = smdk2443_resume, ++ .dai_link = smdk2443_dai, ++ .num_links = ARRAY_SIZE(smdk2443_dai), ++}; ++ ++static struct snd_soc_device smdk2443_snd_ac97_devdata = { ++ .machine = &smdk2443, ++ .platform = &s3c24xx_soc_platform, ++ .codec_dev = &soc_codec_dev_ac97, ++}; ++ ++static struct platform_device *smdk2443_snd_ac97_device; ++ ++static int __init smdk2443_init(void) ++{ ++ int ret; ++ ++ smdk2443_snd_ac97_device = platform_device_alloc("soc-audio", -1); ++ if (!smdk2443_snd_ac97_device) ++ return -ENOMEM; ++ ++ platform_set_drvdata(smdk2443_snd_ac97_device, &smdk2443_snd_ac97_devdata); ++ smdk2443_snd_ac97_devdata.dev = &smdk2443_snd_ac97_device->dev; ++ ++ if((ret = platform_device_add(smdk2443_snd_ac97_device)) != 0) ++ platform_device_put(smdk2443_snd_ac97_device); ++ ++ return ret; ++} ++ ++static void __exit smdk2443_exit(void) ++{ ++ platform_device_unregister(smdk2443_snd_ac97_device); ++} ++ ++module_init(smdk2443_init); ++module_exit(smdk2443_exit); ++ ++/* Module information */ ++MODULE_AUTHOR("Graeme Gregory, graeme.gregory@wolfsonmicro.com, www.wolfsonmicro.com"); ++MODULE_DESCRIPTION("ALSA SoC WM9710 SMDK2443"); ++MODULE_LICENSE("GPL"); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/asoc-mainline.patch b/packages/linux/linux-smdk2443/asoc-mainline.patch new file mode 100644 index 0000000000..82018af24f --- /dev/null +++ b/packages/linux/linux-smdk2443/asoc-mainline.patch @@ -0,0 +1,142 @@ +Index: git/arch/arm/mach-s3c2443/mach-smdk2443.c +=================================================================== +--- git.orig/arch/arm/mach-s3c2443/mach-smdk2443.c 2007-03-27 13:25:05.000000000 +0100 ++++ git/arch/arm/mach-s3c2443/mach-smdk2443.c 2007-03-27 13:44:19.000000000 +0100 +@@ -69,6 +69,11 @@ + .pfn = __phys_to_pfn(S3C2410_CS2 + (1<<24)), + .length = SZ_4M, + .type = MT_DEVICE, ++ }, { ++ .virtual = (u32)S3C2410_ADDR(0x02000000) , ++ .pfn = __phys_to_pfn(0x09000000), ++ .length = SZ_1M, ++ .type = MT_DEVICE, + } + }; + +Index: git/drivers/net/cs89x0.c +=================================================================== +--- git.orig/drivers/net/cs89x0.c 2007-03-27 13:25:08.000000000 +0100 ++++ git/drivers/net/cs89x0.c 2007-03-27 13:44:19.000000000 +0100 +@@ -187,6 +187,10 @@ + #include + static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; + static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; ++#elif defined(CONFIG_ARCH_S3C2440) ++static unsigned int netcard_portlist[] __initdata = {S3C2410_ADDR(0x02000000) + 0x300 , 0}; ++static unsigned int cs8900_irq_map[] = {IRQ_EINT13, 0, 0, 0}; ++static unsigned char cs8900_mac[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02}; + #elif defined(CONFIG_ARCH_PNX010X) + #include + #include +@@ -719,6 +723,14 @@ + + printk( "[Cirrus EEPROM] "); + } ++#if defined(CONFIG_ARCH_S3C2440) ++ else ++ { ++ for (i=0; i < ETH_ALEN; i++) { ++ dev->dev_addr[i] = cs8900_mac[i]; ++ } ++ } ++#endif + + printk("\n"); + +@@ -802,7 +814,7 @@ + } else { + i = lp->isa_config & INT_NO_MASK; + if (lp->chip_type == CS8900) { +-#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) ++#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) || defined(CONFIG_ARCH_S3C2410) + i = cs8900_irq_map[0]; + #else + /* Translate the IRQ using the IRQ mapping table. */ +@@ -1309,7 +1321,7 @@ + else + #endif + { +-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) ++#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_ARCH_S3C2410) + if (((1 << dev->irq) & lp->irq_map) == 0) { + printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", + dev->name, dev->irq, lp->irq_map); +@@ -1324,7 +1336,11 @@ + writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); + #endif + write_irq(dev, lp->chip_type, dev->irq); ++#if !defined(CONFIG_ARCH_S3C2440) + ret = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev); ++#else ++ ret = request_irq(dev->irq, &net_interrupt, IRQF_DISABLED | IRQF_TRIGGER_HIGH, dev->name, dev); ++#endif + if (ret) { + if (net_debug) + printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); +Index: git/include/asm-arm/arch-s3c2410/regs-ac97.h +=================================================================== +--- git.orig/include/asm-arm/arch-s3c2410/regs-ac97.h 2007-03-27 13:25:14.000000000 +0100 ++++ git/include/asm-arm/arch-s3c2410/regs-ac97.h 2007-03-27 13:44:19.000000000 +0100 +@@ -13,11 +13,55 @@ + #ifndef __ASM_ARCH_REGS_AC97_H + #define __ASM_ARCH_REGS_AC97_H __FILE__ + +-#define S3C_AC97_GLBCTRL (0x00) +-#define S3C_AC97_GLBSTAT (0x04) +-#define S3C_AC97_CODEC_CMD (0x08) +-#define S3C_AC97_PCM_ADDR (0x10) +-#define S3C_AC97_PCM_DATA (0x18) +-#define S3C_AC97_MIC_DATA (0x1C) ++#define S3C_AC97_GLBCTRL (0x00) ++ ++#define S3C_AC97_GLBCTRL_CODECREADYIE (1<<22) ++#define S3C_AC97_GLBCTRL_PCMOUTURIE (1<<21) ++#define S3C_AC97_GLBCTRL_PCMINORIE (1<<20) ++#define S3C_AC97_GLBCTRL_MICINORIE (1<<19) ++#define S3C_AC97_GLBCTRL_PCMOUTTIE (1<<18) ++#define S3C_AC97_GLBCTRL_PCMINTIE (1<<17) ++#define S3C_AC97_GLBCTRL_MICINTIE (1<<16) ++#define S3C_AC97_GLBCTRL_PCMOUTTM_OFF (0<<12) ++#define S3C_AC97_GLBCTRL_PCMOUTTM_PIO (1<<12) ++#define S3C_AC97_GLBCTRL_PCMOUTTM_DMA (2<<12) ++#define S3C_AC97_GLBCTRL_PCMOUTTM_MASK (3<<12) ++#define S3C_AC97_GLBCTRL_PCMINTM_OFF (0<<10) ++#define S3C_AC97_GLBCTRL_PCMINTM_PIO (1<<10) ++#define S3C_AC97_GLBCTRL_PCMINTM_DMA (2<<10) ++#define S3C_AC97_GLBCTRL_PCMINTM_MASK (3<<10) ++#define S3C_AC97_GLBCTRL_MICINTM_OFF (0<<8) ++#define S3C_AC97_GLBCTRL_MICINTM_PIO (1<<8) ++#define S3C_AC97_GLBCTRL_MICINTM_DMA (2<<8) ++#define S3C_AC97_GLBCTRL_MICINTM_MASK (3<<8) ++#define S3C_AC97_GLBCTRL_TRANSFERDATAENABLE (1<<3) ++#define S3C_AC97_GLBCTRL_ACLINKON (1<<2) ++#define S3C_AC97_GLBCTRL_WARMRESET (1<<1) ++#define S3C_AC97_GLBCTRL_COLDRESET (1<<0) ++ ++#define S3C_AC97_GLBSTAT (0x04) ++ ++#define S3C_AC97_GLBSTAT_CODECREADY (1<<22) ++#define S3C_AC97_GLBSTAT_PCMOUTUR (1<<21) ++#define S3C_AC97_GLBSTAT_PCMINORI (1<<20) ++#define S3C_AC97_GLBSTAT_MICINORI (1<<19) ++#define S3C_AC97_GLBSTAT_PCMOUTTI (1<<18) ++#define S3C_AC97_GLBSTAT_PCMINTI (1<<17) ++#define S3C_AC97_GLBSTAT_MICINTI (1<<16) ++#define S3C_AC97_GLBSTAT_MAINSTATE_IDLE (0<<0) ++#define S3C_AC97_GLBSTAT_MAINSTATE_INIT (1<<0) ++#define S3C_AC97_GLBSTAT_MAINSTATE_READY (2<<0) ++#define S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE (3<<0) ++#define S3C_AC97_GLBSTAT_MAINSTATE_LP (4<<0) ++#define S3C_AC97_GLBSTAT_MAINSTATE_WARM (5<<0) ++ ++#define S3C_AC97_CODEC_CMD (0x08) ++ ++#define S3C_AC97_CODEC_CMD_READ (1<<23) ++ ++#define S3C_AC97_STAT (0x0c) ++#define S3C_AC97_PCM_ADDR (0x10) ++#define S3C_AC97_PCM_DATA (0x18) ++#define S3C_AC97_MIC_DATA (0x1C) + + #endif /* __ASM_ARCH_REGS_AC97_H */ diff --git a/packages/linux/linux-smdk2443/defconfig-smdk2443 b/packages/linux/linux-smdk2443/defconfig-smdk2443 new file mode 100644 index 0000000000..e8aea8c586 --- /dev/null +++ b/packages/linux/linux-smdk2443/defconfig-smdk2443 @@ -0,0 +1,1480 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21-rc2 +# Tue Mar 13 10:50:46 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_NO_IOPORT=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=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 +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +CONFIG_ARCH_S3C2410=y +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +CONFIG_PLAT_S3C24XX=y +CONFIG_CPU_S3C244X=y +CONFIG_PM_SIMTEC=y +# CONFIG_S3C2410_BOOT_WATCHDOG is not set +# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C2410_PM_CHECK is not set +CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 +CONFIG_S3C2410_DMA=y +CONFIG_S3C2410_DMA_DEBUG=n +CONFIG_MACH_SMDK=y + +# +# S3C2400 Machines +# +CONFIG_CPU_S3C2410=y +CONFIG_CPU_S3C2410_DMA=y +CONFIG_S3C2410_PM=y +CONFIG_S3C2410_GPIO=y +CONFIG_S3C2410_CLOCK=y + +# +# S3C2410 Machines +# +CONFIG_ARCH_SMDK2410=y +CONFIG_ARCH_H1940=y +CONFIG_PM_H1940=y +CONFIG_MACH_N30=y +CONFIG_ARCH_BAST=y +CONFIG_MACH_OTOM=y +# CONFIG_MACH_AML_M5900 is not set +CONFIG_BAST_PC104_IRQ=y +CONFIG_MACH_VR1000=y +# CONFIG_MACH_QT2410 is not set +CONFIG_CPU_S3C2412=y +CONFIG_S3C2412_DMA=y +CONFIG_S3C2412_PM=y + +# +# S3C2412 Machines +# +CONFIG_MACH_SMDK2413=y +CONFIG_MACH_S3C2413=y +# CONFIG_MACH_VSTMS is not set +CONFIG_CPU_S3C2440=y +CONFIG_S3C2440_DMA=y + +# +# S3C2440 Machines +# +CONFIG_MACH_ANUBIS=y +CONFIG_MACH_OSIRIS=y +CONFIG_MACH_RX3715=y +CONFIG_ARCH_S3C2440=y +CONFIG_MACH_NEXCODER_2440=y +CONFIG_SMDK2440_CPU2440=y +CONFIG_CPU_S3C2442=y + +# +# S3C2442 Machines +# +CONFIG_SMDK2440_CPU2442=y +CONFIG_CPU_S3C2443=y +CONFIG_S3C2443_DMA=y + +# +# S3C2443 Machines +# +CONFIG_MACH_SMDK2443=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v4T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +CONFIG_ISA=y + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=200 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +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_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/nfs ip=auto cs89x0_media=rj45 rw console=ttySAC0,115200" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=y +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_APM_EMULATION is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +CONFIG_MTD_MAP_BANK_WIDTH_16=y +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_IMPA7 is not set +CONFIG_MTD_BAST=y +CONFIG_MTD_BAST_MAXSIZE=4 +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_S3C2410=y +# CONFIG_MTD_NAND_S3C2410_DEBUG is not set +# CONFIG_MTD_NAND_S3C2410_HWECC is not set +# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +CONFIG_PARPORT=y +# CONFIG_PARPORT_PC is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y + +# +# Plug and Play support +# +# CONFIG_PNP is not set +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDE_BAST=y +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +CONFIG_NET_PCI=y +# CONFIG_AC3200 is not set +# CONFIG_APRICOT is not set +CONFIG_CS89x0=y +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PLIP is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_INPORT is not set +# CONFIG_MOUSE_LOGIBM is not set +# CONFIG_MOUSE_PC110PAD is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PARKBD is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_MOXA_SMARTIO_NEW is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_N_HDLC is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +# CONFIG_SERIAL_8250_FOURPORT is not set +# CONFIG_SERIAL_8250_ACCENT is not set +# CONFIG_SERIAL_8250_BOCA is not set +# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_RSA is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_S3C2410=y +CONFIG_SERIAL_S3C2410_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=y +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=y +# CONFIG_TIPAR is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_S3C2410_WATCHDOG=y + +# +# ISA-based Watchdog Cards +# +# CONFIG_PCWATCHDOG is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_WDT is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ELEKTOR is not set +CONFIG_I2C_ISA=m +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_S3C2410=y +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +CONFIG_SENSORS_EEPROM=m +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_S3C24XX is not set +CONFIG_SPI_S3C24XX_GPIO=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +CONFIG_SENSORS_LM75=m +# CONFIG_SENSORS_LM77 is not set +CONFIG_SENSORS_LM78=m +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +CONFIG_SENSORS_LM85=m +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frambuffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_S3C2410=y +# CONFIG_FB_S3C2410_DEBUG is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +CONFIG_SND_DEBUG_DETECT=y +# CONFIG_SND_PCM_XRUN_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_MTS64 is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_PORTMAN2X4 is not set + +# +# ALSA ARM devices +# + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# SoC audio support +# +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC=m + +# +# SoC Platforms +# + +# +# SoC Audio for the Atmel AT91 +# + +# +# SoC Audio for the Intel PXA2xx +# + +# +# SoC Audio for the Samsung S3C24XX +# +CONFIG_SND_S3C24XX_SOC=m +CONFIG_SND_S3C2443_SOC_AC97=m +# CONFIG_SND_S3C24XX_SOC_SMDK2440 is not set +# CONFIG_SND_S3C24XX_SOC_SMDK2440_WM8956 is not set +CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m + +# +# SoC Audio for the Freescale i.MX +# +CONFIG_SND_SOC_AC97_CODEC=m + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set +CONFIG_DEBUG_S3C2410_PORT=y +CONFIG_DEBUG_S3C2410_UART=0 + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb new file mode 100644 index 0000000000..b97ebd7327 --- /dev/null +++ b/packages/linux/linux-smdk2443_2.6.20+git.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Linux Kernel for smdk2443 compatible machines" +SECTION = "kernel" +LICENSE = "GPL" +DEPENDS += "u-boot-mkimage-gta01-native" + +PR = "r1" + +GGSRC = "http://www.xora.org.uk/oe/patches/" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.21-rc5 \ + file://0020-Add-ASoC-S3C24xx-platform-support.patch;patch=1 \ + file://0021-Add-Neo1973-ASoC-support.patch;patch=1 \ + file://0022-Add-initial-ASoC-SMDK2440-support.patch;patch=1 \ + file://0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch;patch=1 \ + file://0034-Export-ac97_dai.patch;patch=1 \ + file://0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch;patch=1 \ + file://0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch;patch=1 \ + file://0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch;patch=1 \ + file://asoc-mainline.patch;patch=1 \ + file://defconfig-smdk2443" + +S = "${WORKDIR}/git" + +inherit kernel + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "smdk2443" +KERNEL_IMAGETYPE = "zImage" + +do_configure() { + install ${WORKDIR}/defconfig-smdk2443 ${S}/.config + oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "smdk2443 kernel" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin + rm -f linux.bin.gz +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_package after do_install + +KERNEL_RELEASE = "2.6.21-rc5" -- cgit v1.2.3 From d59fdcbd6feeff4972211cea0102243eeca988b0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Apr 2007 09:01:34 +0000 Subject: linux-libc-headers: add 2.6.20 from Poky --- .../linux-libc-headers-2.6.20/.mtn2git_empty | 0 .../linux-libc-headers-2.6.20/procinfo.h | 24 ++++++++ .../linux-libc-headers_2.6.20.bb | 71 ++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 packages/linux-libc-headers/linux-libc-headers-2.6.20/.mtn2git_empty create mode 100644 packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h create mode 100644 packages/linux-libc-headers/linux-libc-headers_2.6.20.bb (limited to 'packages') diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.20/.mtn2git_empty b/packages/linux-libc-headers/linux-libc-headers-2.6.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h b/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h new file mode 100644 index 0000000000..8cdf828af8 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h @@ -0,0 +1,24 @@ +/* + * linux/include/asm-arm/procinfo.h + * + * Copyright (C) 1996-1999 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_PROCINFO_H +#define __ASM_PROCINFO_H + +#define HWCAP_SWP 1 +#define HWCAP_HALF 2 +#define HWCAP_THUMB 4 +#define HWCAP_26BIT 8 /* Play it safe */ +#define HWCAP_FAST_MULT 16 +#define HWCAP_FPA 32 +#define HWCAP_VFP 64 +#define HWCAP_EDSP 128 +#define HWCAP_JAVA 256 +#define HWCAP_IWMMXT 512 +#define HWCAP_CRUNCH 1024 +#endif diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb new file mode 100644 index 0000000000..457f16c1f7 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb @@ -0,0 +1,71 @@ +require linux-libc-headers.inc + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "unifdef-native" +PR = "r6" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://procinfo.h" + +S = "${WORKDIR}/linux-${PV}" + +set_arch() { + case ${TARGET_ARCH} in + alpha*) ARCH=alpha ;; + arm*) ARCH=arm ;; + cris*) ARCH=cris ;; + hppa*) ARCH=parisc ;; + i*86*) ARCH=i386 ;; + ia64*) ARCH=ia64 ;; + mips*) ARCH=mips ;; + m68k*) ARCH=m68k ;; + powerpc*) ARCH=powerpc ;; + s390*) ARCH=s390 ;; + sh*) ARCH=sh ;; + sparc64*) ARCH=sparc64 ;; + sparc*) ARCH=sparc ;; + x86_64*) ARCH=x86_64 ;; + esac +} + +do_configure() { + set_arch + oe_runmake allnoconfig ARCH=$ARCH +} + +do_compile () { +} + +do_install() { + set_arch + oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH +} + +do_install_append_arm() { + cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/ +} + +STAGE_TEMP="${WORKDIR}/temp-staging" + +do_stage () { + set_arch + echo $ARCH + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH + if [ "$ARCH" = "arm" ]; then + cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/ + fi + install -d ${STAGING_INCDIR} + rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic + cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/ + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic + install -d ${CROSS_DIR}/${TARGET_SYS}/include + cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/ +} -- cgit v1.2.3 From dfe20fb3e1d2fe2427d181ec8f93e5b16ad5ffb2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Apr 2007 09:17:51 +0000 Subject: hal: add 0.5.9 and hal-info_git from poky * has a hack to work around autofoo >2.59 dep * requires linux-libc-headers >= 2.6.18 --- packages/hal/hal-info_git.bb | 16 ++++++++ packages/hal/hal_0.5.9.bb | 94 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 packages/hal/hal-info_git.bb create mode 100644 packages/hal/hal_0.5.9.bb (limited to 'packages') diff --git a/packages/hal/hal-info_git.bb b/packages/hal/hal-info_git.bb new file mode 100644 index 0000000000..fdbbae91fb --- /dev/null +++ b/packages/hal/hal-info_git.bb @@ -0,0 +1,16 @@ +PV = "${SRCDATE}+git" + +DESCRIPTION = "Hardware Abstraction Layer device information" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL AFL" + +SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-recall --disable-video" + +FILES_${PN} += "/usr/share/hal/" diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb new file mode 100644 index 0000000000..e021f03045 --- /dev/null +++ b/packages/hal/hal_0.5.9.bb @@ -0,0 +1,94 @@ +DESCRIPTION = "Hardware Abstraction Layer" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL LGPL AFL" + +DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb" +RDEPENDS += "udev hal-info" +#RDEPENDS_hal-device-manager = "python hal python-pygnome" +RRECOMMENDS = "udev-utils" + +PR = "r0" + +SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ + file://99_hal" + +S = "${WORKDIR}/hal-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ + --with-expat=${STAGING_LIBDIR}/.. \ + --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ + --with-hotplug=${sysconfdir}/hotplug.d \ + --disable-docbook-docs \ + --disable-policy-kit \ + --disable-acpi --disable-pmu --disable-pci \ + --disable-pci-ids --disable-pnp-ids \ + " + +# work around autoconf >2.59 deps... +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +do_install_append() { + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles +} + +do_stage() { + autotools_stage_all + install -d ${STAGING_LIBDIR} + install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so + install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so +} + +# At the time the postinst runs, dbus might not be setup so only restart if running +pkg_postinst_hal () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + + /etc/init.d/populate-volatile.sh update + + grep haldaemon /etc/group || addgroup haldaemon + grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL + + DBUSPID=`pidof dbus-daemon` + + if [ "x$DBUSPID" != "x" ]; then + /etc/init.d/dbus-1 force-reload + fi +} + +pkg_postrm_hal () { + deluser haldaemon || true + delgroup haldaemon || true +} + +#PACKAGES += "hal-device-manager" + +#FILES_hal-device-manager = " \ +# ${datadir}/hal/device-manager/ \ +# ${bindir}/hal-device-manager" + +FILES_${PN} = "${sysconfdir} \ + ${bindir}/lshal \ + ${bindir}/hal-find-by-capability \ + ${bindir}/hal-find-by-property \ + ${bindir}/hal-device \ + ${bindir}/hal-get-property \ + ${bindir}/hal-set-property \ + ${bindir}/hal-lock \ + ${bindir}/hal-is-caller-locked-out \ + ${sbindir} \ + ${libdir}/libhal.so.* \ + ${libdir}/libhal-storage.so.* \ + ${libdir}/hal \ + ${libexecdir} \ + ${datadir}/hal/fdi \ + ${datadir}/hal/scripts" -- cgit v1.2.3 From b06ef303433d7bb6a139a4a723d6485ac5ab4854 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 3 Apr 2007 10:24:24 +0000 Subject: task-base: Bump PR so people get wifi feature handling fixes. --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 17fc9a30f5..ea76027335 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 = "r20" +PR = "r21" PACKAGES = "task-base \ task-base-oh-minimal \ -- cgit v1.2.3 From 4efb36f97fd454f283fe8e2ff65f827d2e9c57f7 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 10:59:48 +0000 Subject: packages/gpe-aerial/gpe-aerial_svn.bb * add svn build for gpe-aerial --- packages/gpe-aerial/gpe-aerial_svn.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/gpe-aerial/gpe-aerial_svn.bb (limited to 'packages') diff --git a/packages/gpe-aerial/gpe-aerial_svn.bb b/packages/gpe-aerial/gpe-aerial_svn.bb new file mode 100644 index 0000000000..faa8b5c813 --- /dev/null +++ b/packages/gpe-aerial/gpe-aerial_svn.bb @@ -0,0 +1,16 @@ +inherit gpe autotools + +DESCRIPTION = "GPE wireless LAN communication applet" +DEPENDS = "gtk+ libgpewidget prismstumbler" +RDEPENDS = "prismstumbler" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" +PV = "0.3.0+svn${SRCDATE}" + +SRC_URI = "${GPE_EXTRA_SVN}" + +S = "${WORKDIR}/gpe-aerial" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From cf4d59a97856faf1e539ec3b48feb155d5cefb6f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 3 Apr 2007 11:14:00 +0000 Subject: aspell-native_0.60.5.bb, aspell6-en_6.0-0.bb, aspell_0.60.5.bb : some speeling cheecker (spelling checker) updates. Moved to latest version of aspell and dictionaries. --- packages/aspell/aspell-lang.inc | 15 ++++++--------- packages/aspell/aspell-native_0.60.5.bb | 6 ++++++ packages/aspell/aspell6-en_6.0-0.bb | 14 ++++++++++++++ packages/aspell/aspell_0.60.5.bb | 18 ++++++++++++++++++ 4 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 packages/aspell/aspell-native_0.60.5.bb create mode 100644 packages/aspell/aspell6-en_6.0-0.bb create mode 100644 packages/aspell/aspell_0.60.5.bb (limited to 'packages') diff --git a/packages/aspell/aspell-lang.inc b/packages/aspell/aspell-lang.inc index 709183b428..8c58136f0e 100644 --- a/packages/aspell/aspell-lang.inc +++ b/packages/aspell/aspell-lang.inc @@ -1,23 +1,20 @@ -FILES_${PN} = "/usr/lib/aspell/* /usr/share/aspell/*" +FILES_${PN} = "/usr/lib/aspell* /usr/share/aspell*" DEPENDS = "aspell-native" do_configure() { cd ${S} - export dictdir=/usr/lib/aspell/ - export datadir=/usr/share/aspell/ - DESTDIR=${D} ./configure + DESTDIR=${D} ./configure --vars ASPELL=${STAGING_BINDIR_NATIVE}/aspell } do_compile() { - export dictdir=/usr/lib/aspell/ - export datadir=/usr/share/aspell/ - dictdir=/usr/lib/aspell oe_runmake + sed -i -e "s|dictdir.*lib|dictdir = ${libdir}|" Makefile + sed -i -e "s|datadir.*lib|datadir = ${libdir}|" Makefile + oe_runmake } do_install() { - export dictdir=/usr/lib/aspell/ - export datadir=/usr/share/aspell/ + unset datadir oe_runmake install } diff --git a/packages/aspell/aspell-native_0.60.5.bb b/packages/aspell/aspell-native_0.60.5.bb new file mode 100644 index 0000000000..174821ce46 --- /dev/null +++ b/packages/aspell/aspell-native_0.60.5.bb @@ -0,0 +1,6 @@ +require aspell_${PV}.bb + +inherit native + +S = "${WORKDIR}/aspell-${PV}" + diff --git a/packages/aspell/aspell6-en_6.0-0.bb b/packages/aspell/aspell6-en_6.0-0.bb new file mode 100644 index 0000000000..6c013eb546 --- /dev/null +++ b/packages/aspell/aspell6-en_6.0-0.bb @@ -0,0 +1,14 @@ +LICENSE = "Copyright file" +SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-${PV}.tar.bz2" +PR="r1" + +require aspell-lang.inc + +FILES_${PN} += "${docdir}/Copyright" +FILES_${PN}-doc = "" + +do_install_append() { + install -d ${D}${docdir} + install ${S}/Copyright ${D}${docdir} +} + diff --git a/packages/aspell/aspell_0.60.5.bb b/packages/aspell/aspell_0.60.5.bb new file mode 100644 index 0000000000..6b6c867226 --- /dev/null +++ b/packages/aspell/aspell_0.60.5.bb @@ -0,0 +1,18 @@ +SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz" +DESCRIPTION = "GNU Aspell spell-checker" +SECTION = "console/utils" +LICENSE="LGPL" + +PACKAGES =+ "libaspell libpspell libpspell-dev aspell-utils" + +FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*" +FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*" +FILES_${PN} = "${bindir}/aspell" +FILES_libpspell = "${libdir}/libpspell.so.*" +FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" + +inherit autotools + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 80dbfc055527b9ab34f95f1c53496a5cd93fe71c Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 3 Apr 2007 11:15:58 +0000 Subject: enchant_1.3.0.bb : add newest version on enchant spelling checker interface. --- packages/enchant/enchant_1.3.0.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/enchant/enchant_1.3.0.bb (limited to 'packages') diff --git a/packages/enchant/enchant_1.3.0.bb b/packages/enchant/enchant_1.3.0.bb new file mode 100644 index 0000000000..f1544336af --- /dev/null +++ b/packages/enchant/enchant_1.3.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Enchant Spell checker API Library" +PRIORITY = "optional" +SECTION = "libs" +LICENSE = "LGPL" +DEPENDS = "aspell" +RDEPENDS = "aspell" + +inherit autotools pkgconfig + +PR = "r0" + +S = "${WORKDIR}/enchant-${PV}" + +SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz" + +EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} --enable-aspell --disable-binreloc" + +FILES_${PN} = "/usr/bin/* /usr/lib/enchant/*.so /usr/share/enchant /usr/lib/libenchant*.so.*" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 2d3b8c1c35800b52fcbd570f455321add113e3ae Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 3 Apr 2007 11:24:47 +0000 Subject: aspell-native_0.50.5.bb, aspell5-en_6.0-0.bb, aspell_0.50.5.bb : remove old versions --- packages/aspell/aspell-0.50.5/.mtn2git_empty | 0 packages/aspell/aspell-0.50.5/makefile.patch | 20 ------------------- packages/aspell/aspell-0.50.5/mk-dirs_h.py | 20 ------------------- packages/aspell/aspell-native_0.50.5.bb | 16 --------------- packages/aspell/aspell5-en_6.0-0.bb | 14 ------------- packages/aspell/aspell_0.50.5.bb | 30 ---------------------------- 6 files changed, 100 deletions(-) delete mode 100644 packages/aspell/aspell-0.50.5/.mtn2git_empty delete mode 100644 packages/aspell/aspell-0.50.5/makefile.patch delete mode 100755 packages/aspell/aspell-0.50.5/mk-dirs_h.py delete mode 100644 packages/aspell/aspell-native_0.50.5.bb delete mode 100644 packages/aspell/aspell5-en_6.0-0.bb delete mode 100644 packages/aspell/aspell_0.50.5.bb (limited to 'packages') diff --git a/packages/aspell/aspell-0.50.5/.mtn2git_empty b/packages/aspell/aspell-0.50.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/aspell/aspell-0.50.5/makefile.patch b/packages/aspell/aspell-0.50.5/makefile.patch deleted file mode 100644 index c16a32e3b9..0000000000 --- a/packages/aspell/aspell-0.50.5/makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- aspell-0.50.5/common/Makefile.am~ 2002-11-05 00:24:14.000000000 +0000 -+++ aspell-0.50.5/common/Makefile.am 2004-06-27 14:33:37.000000000 +0100 -@@ -4,7 +4,7 @@ - pkgdatadir = @pkgdatadir@ - pkglibdir = @pkglibdir@ - --noinst_PROGRAMS = mk-dirs_h -+#noinst_PROGRAMS = mk-dirs_h - - dirs.h: mk-dirs_h - echo '#define PREFIX "${prefix}"' > dirs.h -@@ -12,7 +12,7 @@ - ./mk-dirs_h ${prefix} DATA_DIR ${pkgdatadir} >> dirs.h - ./mk-dirs_h ${prefix} CONF_DIR ${sysconfdir} >> dirs.h - --mk_dirs_h_SOURCES = mk-dirs_h.cpp -+#mk_dirs_h_SOURCES = mk-dirs_h.cpp - - config.cpp: dirs.h - diff --git a/packages/aspell/aspell-0.50.5/mk-dirs_h.py b/packages/aspell/aspell-0.50.5/mk-dirs_h.py deleted file mode 100755 index a487751e81..0000000000 --- a/packages/aspell/aspell-0.50.5/mk-dirs_h.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -import sys - -prefix=sys.argv[1] -key=sys.argv[2] -value=sys.argv[3] - -while prefix[-1] == '/': - prefix = prefix[:-2] - -plen = len(prefix) - -if value[:plen] == prefix: - value = value[plen:] - while value[0] == '/': - value = value[1:] - print "#define " + key + " \"\"\n" -else: - print "#define " + key + " \"" + value + "\"\n" diff --git a/packages/aspell/aspell-native_0.50.5.bb b/packages/aspell/aspell-native_0.50.5.bb deleted file mode 100644 index e87c6c6fd5..0000000000 --- a/packages/aspell/aspell-native_0.50.5.bb +++ /dev/null @@ -1,16 +0,0 @@ -SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz \ - file://mk-dirs_h.py \ - file://makefile.patch;patch=1" -DESCRIPTION = "GNU Aspell spell-checker" -SECTION = "console/utils" -LICENSE="LGPL" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/aspell-${PV}" - -inherit autotools native - -S = "${WORKDIR}/aspell-${PV}" - -do_compile_prepend() { - install ${WORKDIR}/mk-dirs_h.py ${S}/common/mk-dirs_h -} - diff --git a/packages/aspell/aspell5-en_6.0-0.bb b/packages/aspell/aspell5-en_6.0-0.bb deleted file mode 100644 index 568e692ab9..0000000000 --- a/packages/aspell/aspell5-en_6.0-0.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "Copyright file" -SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell5-en-${PV}.tar.bz2" -PR="r1" - -require aspell-lang.inc - -FILES_${PN} += "${docdir}/Copyright" -FILES_${PN}-doc = "" - -do_install_append() { - install -d ${D}${docdir} - install ${S}/Copyright ${D}${docdir} -} - diff --git a/packages/aspell/aspell_0.50.5.bb b/packages/aspell/aspell_0.50.5.bb deleted file mode 100644 index f685133121..0000000000 --- a/packages/aspell/aspell_0.50.5.bb +++ /dev/null @@ -1,30 +0,0 @@ -SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz \ - file://mk-dirs_h.py \ - file://makefile.patch;patch=1" -DESCRIPTION = "GNU Aspell spell-checker" -SECTION = "console/utils" -LICENSE="LGPL" - -PACKAGES =+ "libaspell libpspell libpspell-dev aspell-utils" - -FILES_libaspell = "${libdir}/libaspell.so.* ${datadir}/aspell" -FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell" -FILES_${PN} = "${bindir}/aspell" -FILES_libpspell = "${libdir}/libpspell.so.*" -FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" - -inherit autotools - -export CXXFLAGS += "-lstdc++" - -do_compile_prepend() { - install ${WORKDIR}/mk-dirs_h.py ${S}/common/mk-dirs_h -} - -do_stage() { - oe_libinstall -C lib -so libaspell ${STAGING_LIBDIR} - install -m 0644 interfaces/cc/aspell.h ${STAGING_INCDIR} - oe_libinstall -C lib -so libpspell ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/pspell - install -m 0644 interfaces/cc/pspell.h ${STAGING_INCDIR}/pspell -} -- cgit v1.2.3 From ed0a770d0e851e49aa93c652e92aaba0732c8b8d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Apr 2007 11:44:12 +0000 Subject: hal-info: this isn't architecture specific --- packages/hal/hal-info_git.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/hal/hal-info_git.bb b/packages/hal/hal-info_git.bb index fdbbae91fb..597107fe2b 100644 --- a/packages/hal/hal-info_git.bb +++ b/packages/hal/hal-info_git.bb @@ -1,10 +1,12 @@ -PV = "${SRCDATE}+git" - DESCRIPTION = "Hardware Abstraction Layer device information" HOMEPAGE = "http://freedesktop.org/Software/hal" SECTION = "unknown" LICENSE = "GPL AFL" +PV = "${SRCDATE}+git" +PR = "r1" + + SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git" S = "${WORKDIR}/git" @@ -13,4 +15,6 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-recall --disable-video" + +PACKAGE_ARCH = "all" FILES_${PN} += "/usr/share/hal/" -- cgit v1.2.3 From 72e587c23b8a14c5098643e53c58d16949baedd2 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 3 Apr 2007 11:51:08 +0000 Subject: aspell6-pl_6.0-20061121-0.bb : .pl aspell dictionary --- packages/aspell/aspell6-pl_6.0-20061121-0.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/aspell/aspell6-pl_6.0-20061121-0.bb (limited to 'packages') diff --git a/packages/aspell/aspell6-pl_6.0-20061121-0.bb b/packages/aspell/aspell6-pl_6.0-20061121-0.bb new file mode 100644 index 0000000000..ef6802d2e8 --- /dev/null +++ b/packages/aspell/aspell6-pl_6.0-20061121-0.bb @@ -0,0 +1,17 @@ +LICENSE = "GPLv2" +SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2" +PR="r1" + +require aspell-lang.inc + +S = "${WORKDIR}/aspell6-pl-6.0_20061121-0" + +FILES_${PN} += "${docdir}/Copyright" +FILES_${PN}-doc = "" + +do_install_append() { + install -d ${D}${docdir} + install ${S}/Copyright ${D}${docdir} +} + + -- cgit v1.2.3 From 768872e9379a11d7c4c8c3fa3b1dc6a0a28ab0d2 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 12:00:02 +0000 Subject: packages/gpe-contacts/gpe-contacts_cvs.bb * dropped obsolete cvs package packages/libmimedir/libmimedir_0.4.0-20060804.bb * dropped obsolete cvs package packages/libmimedir/libmimedir_cvs.bb * dropped obsolete cvs package packages/gpe-contacts/gpe-contacts_svn.bb * added svn build recipe for gpe-contacts --- packages/gpe-contacts/gpe-contacts_cvs.bb | 19 ---------------- packages/gpe-contacts/gpe-contacts_svn.bb | 19 ++++++++++++++++ packages/libmimedir/libmimedir_0.4.0-20060804.bb | 28 ------------------------ packages/libmimedir/libmimedir_cvs.bb | 28 ------------------------ 4 files changed, 19 insertions(+), 75 deletions(-) delete mode 100644 packages/gpe-contacts/gpe-contacts_cvs.bb create mode 100644 packages/gpe-contacts/gpe-contacts_svn.bb delete mode 100644 packages/libmimedir/libmimedir_0.4.0-20060804.bb delete mode 100644 packages/libmimedir/libmimedir_cvs.bb (limited to 'packages') diff --git a/packages/gpe-contacts/gpe-contacts_cvs.bb b/packages/gpe-contacts/gpe-contacts_cvs.bb deleted file mode 100644 index d73b31ea3b..0000000000 --- a/packages/gpe-contacts/gpe-contacts_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -LICENSE = "GPL" -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/${PN}" -PV = "0.43+cvs${SRCDATE}" -PR = "r0" - -inherit autotools gpe - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" - - -DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" - - -FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" diff --git a/packages/gpe-contacts/gpe-contacts_svn.bb b/packages/gpe-contacts/gpe-contacts_svn.bb new file mode 100644 index 0000000000..b5a22ebad2 --- /dev/null +++ b/packages/gpe-contacts/gpe-contacts_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GPE contacts manager" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +RDEPENDS = "gpe-icons" +PV = "0.43+svn${SRCDATE}" +PR = "r0" + +inherit autotools gpe + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + + +FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" + +DEFAULT_PREFERENCE = "-1" + diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb deleted file mode 100644 index f2d29d4fc0..0000000000 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "LGPL" -DEPENDS = "intltool-native glib-2.0" -PR = "r4" -DEFAULT_PREFERENCE = "5" -SRCDATE = "20060804" -PV = "0.4.0+cvs${SRCDATE}" - -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ - file://mimedir-update.patch;patch=1 \ - file://mimedir-write-sequence.patch;patch=1;pnum=0 \ - file://gslist-fix.patch;patch=1;maxdate=20060814 \ - file://libmimedir-0.4.0-duration-wkst.patch" - -S = "${WORKDIR}/libmimedir" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gtk-doc" - -do_stage() { - autotools_stage_all -} - -PACKAGES =+ "libmimedir-utils" -FILES_libmimedir-utils = "${bindir}/*" diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb deleted file mode 100644 index f687245fcd..0000000000 --- a/packages/libmimedir/libmimedir_cvs.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "LGPL" -DEPENDS = "intltool-native" -PR = "r2" -#Remove the dash below when 0.3.1 changes in PV -PV = "0.3.1+cvs-${SRCDATE}" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ - file://mimedir-update.patch;patch=1" - -S = "${WORKDIR}/libmimedir" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gtk-doc" - -do_stage() { - autotools_stage_all -} - -PACKAGES += "libmimedir-utils" -FILES_libmimedir-utils = "${bindir}" -FILES_${PN} = "${libdir}" - -- cgit v1.2.3 From c74fd15b024b6b6ccdbf2bbda4a886541dc70108 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 12:05:13 +0000 Subject: libgemwidget: update dependencies --- packages/gpephone/libgemwidget_0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpephone/libgemwidget_0.1.bb b/packages/gpephone/libgemwidget_0.1.bb index 40264b9bb2..0cce92532f 100644 --- a/packages/gpephone/libgemwidget_0.1.bb +++ b/packages/gpephone/libgemwidget_0.1.bb @@ -2,7 +2,7 @@ LICENSE = "LiPS" DESCRIPTION = "Extended widget library for GPE phone environment." SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "gtk+ libiac" +DEPENDS = "gtk+ libiac libgpephone" PR = "r1" GPE_TARBALL_SUFFIX = "bz2" -- cgit v1.2.3 From 52ecc2a2b6e5eb7f1bfb22d1c1ad0b36d8a16830 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 14:21:20 +0000 Subject: task-sdk-gpephone: Fix some names --- packages/tasks/task-sdk-gpephone.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb index f647c77a38..10afccf477 100644 --- a/packages/tasks/task-sdk-gpephone.bb +++ b/packages/tasks/task-sdk-gpephone.bb @@ -6,17 +6,16 @@ ALLOW_EMPTY = "1" RDEPENDS := "\ libidn-dev \ libim-dev \ - libgloox-dev \ + gloox-dev \ libabenabler-dev \ - libcalenebler-dev \ + libcalenabler-dev \ libchenabler-dev \ libgemwidget-dev \ libiac-dev \ - liblips_im-dev \ + libim-dev \ liblipsevent-dev \ libmsgenabler-dev \ librecord-dev \ libvocenabler-dev \ - liblinphone-dev \ - " - + linphone-dev \ + " \ No newline at end of file -- cgit v1.2.3 From 47fd15ec14a2f5fe551a93693bd5da352c4fb655 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 14:22:16 +0000 Subject: task-sdk: Fix some names I guessed wrong to make it buildable. --- packages/tasks/task-sdk.bb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index cbd1ab72f1..7039077516 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -21,58 +21,58 @@ RDEPENDS_task-sdk-base := "\ glibc-dev \ libgcc1 \ alsa-dev \ - libaudiofile-dev \ - libbluetooth-dev \ + audiofile-dev \ + bluez-libs-dev \ dbus-dev \ expat-dev \ fontconfig-dev \ freetype-dev \ - libglib-2.0-dev \ + glib-2.0-dev \ gstreamer-dev \ libice-dev \ ipkg-dev \ - libjpeg-dev \ + jpeg-dev \ libapm-dev \ - libasound2 \ + alsa-lib-dev \ libdisplaymigration-dev \ libetpan-dev \ libgcrypt-dev \ - libglade-2.0-dev \ - libgnutls-dev \ + libglade-dev \ + gnutls-dev \ libgpg-error-dev \ - libidl-2-dev \ + libidl-dev \ libiw-dev \ - libmimedir-0.4-dev \ + libmimedir-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libschedule-dev \ libsm-dev \ libsoundgen-dev \ - libsoup-2.2-dev \ + libsoup-dev \ libsvg-dev \ libtododb-dev \ libts-dev \ libxml2-dev \ ncurses-dev \ - libopenobex-dev \ - libpopt-dev \ - libreadline-dev \ + openobex-dev \ + popt-dev \ + readline-dev \ libsqlite-dev \ zlib-dev \ libxmu-dev" RDEPENDS_task-sdk-x11 := "\ - libatk-1.0-dev \ - libcairo-dev \ + atk-dev \ + cairo-dev \ gconf-dbus-dev \ gtk+-dev \ gtk-engines-dev \ libsvg-cairo-dev \ - libmb-dev \ + libmatchbox-dev \ matchbox-desktop-dev \ pango-dev \ - libstartup-notification-1-dev" + startup-notification-dev" RDEPENDS_task-sdk-x11-ext := "\ libxcursor-dev \ @@ -101,7 +101,7 @@ RDEPENDS_task-sdk-x11-ext := "\ RDEPENDS_task-sdk-gpe := "\ libcontactsdb-dev \ - libesd-dev \ + esound-dev \ libeventdb-dev \ libgpepimc-dev \ libgpevtype-dev \ -- cgit v1.2.3 From 6322f61186df751b2717cccabad51588b1abc9ff Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 15:56:38 +0000 Subject: linux-netvista: remove old kernel --- .../linux/linux-netvista-2.4.27/netvista_defconfig | 1309 -------------------- packages/linux/linux-netvista_2.4.27.bb | 25 - 2 files changed, 1334 deletions(-) delete mode 100644 packages/linux/linux-netvista-2.4.27/netvista_defconfig delete mode 100644 packages/linux/linux-netvista_2.4.27.bb (limited to 'packages') diff --git a/packages/linux/linux-netvista-2.4.27/netvista_defconfig b/packages/linux/linux-netvista-2.4.27/netvista_defconfig deleted file mode 100644 index 1e7e5c25ba..0000000000 --- a/packages/linux/linux-netvista-2.4.27/netvista_defconfig +++ /dev/null @@ -1,1309 +0,0 @@ -# -# Automatically generated by make menuconfig: don't edit -# -CONFIG_X86=y -# CONFIG_SBUS is not set -CONFIG_UID16=y - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y - -# -# Loadable module support -# -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -CONFIG_KMOD=y - -# -# Processor type and features -# -# CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MELAN is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_X86_L1_CACHE_SHIFT=5 -CONFIG_X86_USE_STRING_486=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_PPRO_FENCE=y -# CONFIG_X86_F00F_WORKS_OK is not set -CONFIG_X86_MCE=y -# CONFIG_TOSHIBA is not set -# CONFIG_I8K is not set -CONFIG_MICROCODE=m -CONFIG_X86_MSR=m -# CONFIG_X86_CPUID is not set -# CONFIG_EDD is not set -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set -# CONFIG_HIGHMEM64G is not set -# CONFIG_HIGHMEM is not set -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -# CONFIG_SMP is not set -CONFIG_X86_UP_APIC=y -CONFIG_X86_UP_IOAPIC=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -# CONFIG_X86_TSC_DISABLE is not set - -# -# General setup -# -CONFIG_NET=y -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_ISA=y -CONFIG_PCI_NAMES=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -CONFIG_HOTPLUG=y - -# -# PCMCIA/CardBus support -# -# CONFIG_PCMCIA is not set - -# -# PCI Hotplug Support -# -# CONFIG_HOTPLUG_PCI is not set -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -# CONFIG_HOTPLUG_PCI_IBM is not set -# CONFIG_HOTPLUG_PCI_ACPI is not set -CONFIG_SYSVIPC=y -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y -CONFIG_KCORE_ELF=y -# CONFIG_KCORE_AOUT is not set -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=m -CONFIG_OOM_KILLER=y -CONFIG_PM=y -CONFIG_APM=y -# CONFIG_APM_IGNORE_USER_SUSPEND is not set -CONFIG_APM_DO_ENABLE=y -CONFIG_APM_CPU_IDLE=y -# CONFIG_APM_DISPLAY_BLANK is not set -CONFIG_APM_RTC_IS_GMT=y -# CONFIG_APM_ALLOW_INTS is not set -# CONFIG_APM_REAL_MODE_POWER_OFF is not set - -# -# ACPI Support -# -CONFIG_ACPI=y -CONFIG_ACPI_BOOT=y -CONFIG_ACPI_BUS=y -CONFIG_ACPI_INTERPRETER=y -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_PCI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_SYSTEM=y -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_FAN=y -CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_ASUS=y -# CONFIG_ACPI_TOSHIBA is not set -CONFIG_ACPI_DEBUG=y -# CONFIG_ACPI_RELAXED_AML is not set - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_PARTITIONS=m -# CONFIG_MTD_CONCAT is not set -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_CMDLINE_PARTS is not set -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -# CONFIG_NFTL is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -# CONFIG_MTD_CFI_STAA is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set -# CONFIG_MTD_AMDSTD is not set -# CONFIG_MTD_SHARP is not set -# CONFIG_MTD_JEDEC is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_PNC2000 is not set -# CONFIG_MTD_SC520CDP is not set -# CONFIG_MTD_NETSC520 is not set -# CONFIG_MTD_SBC_GXX is not set -# CONFIG_MTD_ELAN_104NC is not set -# CONFIG_MTD_DILNETPC is not set -# CONFIG_MTD_MIXMEM is not set -# CONFIG_MTD_OCTAGON is not set -# CONFIG_MTD_VMAX is not set -# CONFIG_MTD_SCx200_DOCFLASH is not set -# CONFIG_MTD_L440GX is not set -# CONFIG_MTD_AMD76XROM is not set -# CONFIG_MTD_ICH2ROM is not set -# CONFIG_MTD_NETtel is not set -# CONFIG_MTD_SCB2_FLASH is not set -# CONFIG_MTD_PCI is not set -# CONFIG_MTD_PCMCIA is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_MTDRAM is not set -CONFIG_MTD_BLKMTD=m -# CONFIG_MTD_DOC1000 is not set -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOCPROBE is not set - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -CONFIG_MTD_NAND_IDS=m - -# -# Parallel port support -# -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_PC_CML1=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_PC_PCMCIA is not set -# CONFIG_PARPORT_AMIGA is not set -# CONFIG_PARPORT_MFC3 is not set -# CONFIG_PARPORT_ATARI is not set -# CONFIG_PARPORT_GSC is not set -# CONFIG_PARPORT_SUNBPP is not set -# CONFIG_PARPORT_IP22 is not set -# CONFIG_PARPORT_OTHER is not set -CONFIG_PARPORT_1284=y - -# -# Plug and Play configuration -# -# CONFIG_PNP is not set -# CONFIG_ISAPNP is not set - -# -# Block devices -# -CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_CISS_SCSI_TAPE is not set -# CONFIG_CISS_MONITOR_THREAD is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_LOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_INITRD is not set -CONFIG_BLK_STATS=y - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set -# CONFIG_BLK_DEV_MD is not set -# CONFIG_MD_LINEAR is not set -# CONFIG_MD_RAID0 is not set -# CONFIG_MD_RAID1 is not set -# CONFIG_MD_RAID5 is not set -# CONFIG_MD_MULTIPATH is not set -# CONFIG_BLK_DEV_LVM is not set - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_NETLINK_DEV=m -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_FILTER=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_INET_ECN is not set -# CONFIG_SYN_COOKIES is not set - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_FTP=m -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_TFTP is not set -CONFIG_IP_NF_IRC=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_LIMIT=m -CONFIG_IP_NF_MATCH_MAC=m -CONFIG_IP_NF_MATCH_PKTTYPE=m -CONFIG_IP_NF_MATCH_MARK=m -CONFIG_IP_NF_MATCH_MULTIPORT=m -CONFIG_IP_NF_MATCH_TOS=m -# CONFIG_IP_NF_MATCH_RECENT is not set -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_DSCP=m -CONFIG_IP_NF_MATCH_AH_ESP=m -CONFIG_IP_NF_MATCH_LENGTH=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_TCPMSS=m -CONFIG_IP_NF_MATCH_HELPER=m -CONFIG_IP_NF_MATCH_STATE=m -CONFIG_IP_NF_MATCH_CONNTRACK=m -CONFIG_IP_NF_MATCH_UNCLEAN=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_MIRROR=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_NAT_LOCAL=y -CONFIG_IP_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_NAT_IRC=m -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_MARK=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -# CONFIG_IP_NF_ARP_MANGLE is not set -CONFIG_IP_NF_COMPAT_IPCHAINS=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_COMPAT_IPFWADM=m -CONFIG_IP_NF_NAT_NEEDED=y - -# -# IP: Virtual Server Configuration -# -# CONFIG_IP_VS is not set -CONFIG_IPV6=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_LIMIT=m -CONFIG_IP6_NF_MATCH_MAC=m -# CONFIG_IP6_NF_MATCH_RT is not set -# CONFIG_IP6_NF_MATCH_OPTS is not set -# CONFIG_IP6_NF_MATCH_FRAG is not set -# CONFIG_IP6_NF_MATCH_HL is not set -CONFIG_IP6_NF_MATCH_MULTIPORT=m -CONFIG_IP6_NF_MATCH_OWNER=m -CONFIG_IP6_NF_MATCH_MARK=m -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_MATCH_AHESP is not set -CONFIG_IP6_NF_MATCH_LENGTH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_MARK=m -# CONFIG_KHTTPD is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_VLAN_8021Q is not set -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -# CONFIG_ATALK is not set - -# -# Appletalk devices -# -# CONFIG_DEV_APPLETALK is not set -# CONFIG_DECNET is not set -CONFIG_BRIDGE=m -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_LLC is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_FASTROUTE is not set -# CONFIG_NET_HW_FLOWCONTROL is not set - -# -# QoS and/or fair queueing -# -# CONFIG_NET_SCHED is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set - -# -# Telephony Support -# -# CONFIG_PHONE is not set -# CONFIG_PHONE_IXJ is not set -# CONFIG_PHONE_IXJ_PCMCIA is not set - -# -# ATA/IDE/MFM/RLL support -# -CONFIG_IDE=y - -# -# IDE, ATA and ATAPI Block devices -# -CONFIG_BLK_DEV_IDE=y -# CONFIG_BLK_DEV_HD_IDE is not set -# CONFIG_BLK_DEV_HD is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -# CONFIG_IDEDISK_STROKE is not set -# CONFIG_BLK_DEV_IDECS is not set -CONFIG_BLK_DEV_IDECD=m -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -CONFIG_BLK_DEV_IDESCSI=m -# CONFIG_IDE_TASK_IOCTL is not set -# CONFIG_BLK_DEV_CMD640 is not set -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -# CONFIG_BLK_DEV_ISAPNP is not set -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_GENERIC is not set -CONFIG_IDEPCI_SHARE_IRQ=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_PCI_WIP is not set -# CONFIG_BLK_DEV_ADMA100 is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_WDC_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_AMD74XX_OVERRIDE is not set -# CONFIG_BLK_DEV_ATIIXP is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_HPT34X_AUTODMA is not set -# CONFIG_BLK_DEV_HPT366 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_PDC202XX_BURST is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_RZ1000 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SIS5513 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_IDE_CHIPSETS is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_IDEDMA_IVB is not set -# CONFIG_DMA_NONPCI is not set -# CONFIG_BLK_DEV_ATARAID is not set -# CONFIG_BLK_DEV_ATARAID_PDC is not set -# CONFIG_BLK_DEV_ATARAID_HPT is not set -# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set -# CONFIG_BLK_DEV_ATARAID_SII is not set - -# -# SCSI support -# -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_SD_EXTRA_DEVS=40 -CONFIG_CHR_DEV_ST=m -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_SR_EXTRA_DEVS=2 -CONFIG_CHR_DEV_SG=m -# CONFIG_SCSI_DEBUG_QUEUES is not set -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set - -# -# SCSI low-level drivers -# -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_7000FASST is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set -# CONFIG_SCSI_AHA1740 is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_AM53C974 is not set -# CONFIG_SCSI_MEGARAID is not set -# CONFIG_SCSI_MEGARAID2 is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_CPQFCTS is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_EATA_DMA is not set -# CONFIG_SCSI_EATA_PIO is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_PPA is not set -# CONFIG_SCSI_IMM is not set -# CONFIG_SCSI_NCR53C406A is not set -# CONFIG_SCSI_NCR53C7xx is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_NCR53C8XX is not set -# CONFIG_SCSI_SYM53C8XX is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PCI2000 is not set -# CONFIG_SCSI_PCI2220I is not set -# CONFIG_SCSI_PSI240I is not set -# CONFIG_SCSI_QLOGIC_FAS is not set -# CONFIG_SCSI_QLOGIC_ISP is not set -# CONFIG_SCSI_QLOGIC_FC is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_SEAGATE is not set -# CONFIG_SCSI_SIM710 is not set -# CONFIG_SCSI_SYM53C416 is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set -# CONFIG_SCSI_ULTRASTOR is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set -# CONFIG_FUSION_BOOT is not set -# CONFIG_FUSION_ISENSE is not set -# CONFIG_FUSION_CTL is not set -# CONFIG_FUSION_LAN is not set - -# -# IEEE 1394 (FireWire) support (EXPERIMENTAL) -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set -# CONFIG_I2O_PCI is not set -# CONFIG_I2O_BLOCK is not set -# CONFIG_I2O_LAN is not set -# CONFIG_I2O_SCSI is not set -# CONFIG_I2O_PROC is not set - -# -# Network device support -# -CONFIG_NETDEVICES=y - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set -CONFIG_DUMMY=m -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_ETHERTAP is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -# CONFIG_SUNLANCE is not set -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNBMAC is not set -# CONFIG_SUNQE is not set -# CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_AT1700 is not set -# CONFIG_DEPCA is not set -# CONFIG_HP100 is not set -# CONFIG_NET_ISA is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_AC3200 is not set -# CONFIG_APRICOT is not set -# CONFIG_B44 is not set -# CONFIG_CS89x0 is not set -# CONFIG_TULIP is not set -# CONFIG_DE4X5 is not set -# CONFIG_DGRS is not set -# CONFIG_DM9102 is not set -# CONFIG_EEPRO100 is not set -# CONFIG_EEPRO100_PIO is not set -# CONFIG_E100 is not set -# CONFIG_LNE390 is not set -# CONFIG_FEALNX is not set -CONFIG_NATSEMI=y -# CONFIG_NE2K_PCI is not set -# CONFIG_FORCEDETH is not set -# CONFIG_NE3210 is not set -# CONFIG_ES3210 is not set -# CONFIG_8139CP is not set -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_SUNDANCE_MMIO is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_VIA_RHINE_MMIO is not set -# CONFIG_WINBOND_840 is not set -# CONFIG_NET_POCKET is not set - -# -# Ethernet (1000 Mbit) -# -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_MYRI_SBUS is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SK98LIN is not set -# CONFIG_TIGON3 is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -# CONFIG_PLIP is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -# CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOE=m -# CONFIG_SLIP is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -CONFIG_STRIP=m -CONFIG_WAVELAN=m -CONFIG_ARLAN=m -CONFIG_AIRONET4500=m -CONFIG_AIRONET4500_NONCS=m -# CONFIG_AIRONET4500_PNP is not set -# CONFIG_AIRONET4500_PCI is not set -# CONFIG_AIRONET4500_ISA is not set -# CONFIG_AIRONET4500_I365 is not set -CONFIG_AIRONET4500_PROC=m -CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -# CONFIG_TMD_HERMES is not set -CONFIG_PCI_HERMES=m -CONFIG_NET_WIRELESS=y - -# -# Token Ring devices -# -# CONFIG_TR is not set -# CONFIG_NET_FC is not set -# CONFIG_RCPCI is not set -# CONFIG_SHAPER is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set - -# -# Amateur Radio support -# -# CONFIG_HAMRADIO is not set - -# -# IrDA (infrared) support -# -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRDA_DEBUG=y - -# -# Infrared-port device drivers -# -# CONFIG_IRTTY_SIR is not set -# CONFIG_IRPORT_SIR is not set -# CONFIG_DONGLE is not set -# CONFIG_USB_IRDA is not set -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -# CONFIG_TOSHIBA_OLD is not set -CONFIG_TOSHIBA_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -# CONFIG_VIA_IRCC_FIR is not set - -# -# ISDN subsystem -# -# CONFIG_ISDN is not set - -# -# Old CD-ROM drivers (not SCSI, not IDE) -# -# CONFIG_CD_NO_IDESCSI is not set - -# -# Input core support -# -CONFIG_INPUT=y -CONFIG_INPUT_KEYBDEV=y -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=800 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_UINPUT=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_SERIAL=y -CONFIG_SERIAL_CONSOLE=y -CONFIG_SERIAL_EXTENDED=y -# CONFIG_SERIAL_MANY_PORTS is not set -CONFIG_SERIAL_SHARE_IRQ=y -# CONFIG_SERIAL_DETECT_IRQ is not set -# CONFIG_SERIAL_MULTIPORT is not set -# CONFIG_HUB6 is not set -# CONFIG_SERIAL_NONSTANDARD is not set -CONFIG_UNIX98_PTYS=y -CONFIG_UNIX98_PTY_COUNT=256 -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -# CONFIG_TIPAR is not set - -# -# I2C support -# -# CONFIG_I2C is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set -CONFIG_MOUSE=y -CONFIG_PSMOUSE=y -# CONFIG_82C710_MOUSE is not set -# CONFIG_PC110_PAD is not set -# CONFIG_MK712_MOUSE is not set - -# -# Joysticks -# -# CONFIG_INPUT_GAMEPORT is not set -# CONFIG_INPUT_NS558 is not set -# CONFIG_INPUT_LIGHTNING is not set -# CONFIG_INPUT_PCIGAME is not set -# CONFIG_INPUT_CS461X is not set -# CONFIG_INPUT_EMU10K1 is not set -# CONFIG_INPUT_SERIO is not set -# CONFIG_INPUT_SERPORT is not set -# CONFIG_INPUT_ANALOG is not set -# CONFIG_INPUT_A3D is not set -# CONFIG_INPUT_ADI is not set -# CONFIG_INPUT_COBRA is not set -# CONFIG_INPUT_GF2K is not set -# CONFIG_INPUT_GRIP is not set -# CONFIG_INPUT_INTERACT is not set -# CONFIG_INPUT_TMDC is not set -# CONFIG_INPUT_SIDEWINDER is not set -# CONFIG_INPUT_IFORCE_USB is not set -# CONFIG_INPUT_IFORCE_232 is not set -# CONFIG_INPUT_WARRIOR is not set -# CONFIG_INPUT_MAGELLAN is not set -# CONFIG_INPUT_SPACEORB is not set -# CONFIG_INPUT_SPACEBALL is not set -# CONFIG_INPUT_STINGER is not set -# CONFIG_INPUT_DB9 is not set -# CONFIG_INPUT_GAMECON is not set -# CONFIG_INPUT_TURBOGRAFX is not set -# CONFIG_QIC02_TAPE is not set -# CONFIG_IPMI_HANDLER is not set -# CONFIG_IPMI_PANIC_EVENT is not set -# CONFIG_IPMI_DEVICE_INTERFACE is not set -# CONFIG_IPMI_KCS is not set -# CONFIG_IPMI_WATCHDOG is not set - -# -# Watchdog Cards -# -# CONFIG_WATCHDOG is not set -# CONFIG_SCx200 is not set -# CONFIG_SCx200_GPIO is not set -# CONFIG_AMD_RNG is not set -# CONFIG_INTEL_RNG is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_AMD_PM768 is not set -CONFIG_NVRAM=m -CONFIG_RTC=m -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_SONYPI is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_FTAPE is not set -# CONFIG_AGP is not set - -# -# Direct Rendering Manager (XFree86 DRI support) -# -CONFIG_DRM=y -# CONFIG_DRM_OLD is not set -CONFIG_DRM_NEW=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_GAMMA is not set -# CONFIG_DRM_R128 is not set -CONFIG_DRM_RADEON=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I810_XFREE_41 is not set -# CONFIG_DRM_I830 is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_SIS is not set -# CONFIG_MWAVE is not set -# CONFIG_OBMOUSE is not set - -# -# Multimedia devices -# -CONFIG_VIDEO_DEV=m - -# -# Video For Linux -# -CONFIG_VIDEO_PROC_FS=y -# CONFIG_I2C_PARPORT is not set -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_PMS is not set -# CONFIG_VIDEO_BWQCAM is not set -# CONFIG_VIDEO_CQCAM is not set -# CONFIG_VIDEO_W9966 is not set -CONFIG_VIDEO_CPIA=m -# CONFIG_VIDEO_CPIA_PP is not set -CONFIG_VIDEO_CPIA_USB=m -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_STRADIS is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_ZORAN_BUZ is not set -# CONFIG_VIDEO_ZORAN_DC10 is not set -# CONFIG_VIDEO_ZORAN_LML33 is not set -# CONFIG_VIDEO_ZR36120 is not set -# CONFIG_VIDEO_MEYE is not set - -# -# Radio Adapters -# -# CONFIG_RADIO_CADET is not set -# CONFIG_RADIO_RTRACK is not set -# CONFIG_RADIO_RTRACK2 is not set -# CONFIG_RADIO_AZTECH is not set -# CONFIG_RADIO_GEMTEK is not set -# CONFIG_RADIO_GEMTEK_PCI is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set -# CONFIG_RADIO_MIROPCM20 is not set -# CONFIG_RADIO_MIROPCM20_RDS is not set -# CONFIG_RADIO_SF16FMI is not set -# CONFIG_RADIO_SF16FMR2 is not set -# CONFIG_RADIO_TERRATEC is not set -# CONFIG_RADIO_TRUST is not set -# CONFIG_RADIO_TYPHOON is not set -# CONFIG_RADIO_ZOLTRIX is not set - -# -# File systems -# -# CONFIG_QUOTA is not set -# CONFIG_QFMT_V2 is not set -# CONFIG_AUTOFS_FS is not set -CONFIG_AUTOFS4_FS=m -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_ADFS_FS is not set -# CONFIG_ADFS_FS_RW is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BEFS_DEBUG is not set -# CONFIG_BFS_FS is not set -CONFIG_EXT3_FS=y -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -# CONFIG_UMSDOS_FS is not set -CONFIG_VFAT_FS=m -# CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_CRAMFS=m -CONFIG_TMPFS=y -CONFIG_RAMFS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -# CONFIG_JFS_FS is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set -# CONFIG_HPFS_FS is not set -CONFIG_PROC_FS=y -CONFIG_DEVFS_FS=y -# CONFIG_DEVFS_MOUNT is not set -# CONFIG_DEVFS_DEBUG is not set -CONFIG_DEVPTS_FS=y -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX4FS_RW is not set -CONFIG_ROMFS_FS=m -CONFIG_EXT2_FS=y -# CONFIG_SYSV_FS is not set -# CONFIG_UDF_FS is not set -# CONFIG_UDF_RW is not set -# CONFIG_UFS_FS is not set -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_XFS_FS is not set -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_RT is not set -# CONFIG_XFS_TRACE is not set -# CONFIG_XFS_DEBUG is not set - -# -# Network File Systems -# -CONFIG_CODA_FS=m -# CONFIG_INTERMEZZO_FS is not set -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_DIRECTIO is not set -# CONFIG_ROOT_NFS is not set -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_NFSD_TCP=y -CONFIG_SUNRPC=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp437" -# CONFIG_SMB_UNIX is not set -# CONFIG_NCP_FS is not set -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -# CONFIG_NCPFS_NFS_NS is not set -# CONFIG_NCPFS_OS2_NS is not set -# CONFIG_NCPFS_SMALLDOS is not set -# CONFIG_NCPFS_NLS is not set -# CONFIG_NCPFS_EXTRAS is not set -CONFIG_ZISOFS_FS=m - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_SMB_NLS=y -CONFIG_NLS=y - -# -# Native Language Support -# -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=m -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=m -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -CONFIG_NLS_ISO8859_1=m -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -CONFIG_NLS_ISO8859_15=m -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set - -# -# Console drivers -# -CONFIG_VGA_CONSOLE=y -CONFIG_VIDEO_SELECT=y -# CONFIG_MDA_CONSOLE is not set - -# -# Frame-buffer support -# -CONFIG_FB=y -CONFIG_DUMMY_CONSOLE=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_CLGEN is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CYBER2000 is not set -CONFIG_FB_VESA=y -# CONFIG_FB_VGA16 is not set -# CONFIG_FB_HGA is not set -CONFIG_VIDEO_SELECT=y -# CONFIG_FB_MATROX is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_INTEL is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_IT8181 is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FBCON_ADVANCED is not set -CONFIG_FBCON_CFB8=y -CONFIG_FBCON_CFB16=y -CONFIG_FBCON_CFB24=y -CONFIG_FBCON_CFB32=y -# CONFIG_FBCON_FONTWIDTH8_ONLY is not set -# CONFIG_FBCON_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - -# -# Sound -# -CONFIG_SOUND=m -# CONFIG_SOUND_ALI5455 is not set -# CONFIG_SOUND_BT878 is not set -# CONFIG_SOUND_CMPCI is not set -# CONFIG_SOUND_EMU10K1 is not set -# CONFIG_MIDI_EMU10K1 is not set -# CONFIG_SOUND_FUSION is not set -# CONFIG_SOUND_CS4281 is not set -# CONFIG_SOUND_ES1370 is not set -# CONFIG_SOUND_ES1371 is not set -# CONFIG_SOUND_ESSSOLO1 is not set -# CONFIG_SOUND_MAESTRO is not set -# CONFIG_SOUND_MAESTRO3 is not set -# CONFIG_SOUND_FORTE is not set -CONFIG_SOUND_ICH=m -# CONFIG_SOUND_RME96XX is not set -# CONFIG_SOUND_SONICVIBES is not set -# CONFIG_SOUND_TRIDENT is not set -# CONFIG_SOUND_MSNDCLAS is not set -# CONFIG_SOUND_MSNDPIN is not set -# CONFIG_SOUND_VIA82CXXX is not set -# CONFIG_MIDI_VIA82CXXX is not set -# CONFIG_SOUND_OSS is not set -# CONFIG_SOUND_TVMIXER is not set -# CONFIG_SOUND_AD1980 is not set -# CONFIG_SOUND_WM97XX is not set - -# -# USB support -# -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_EHCI_HCD is not set -CONFIG_USB_UHCI=m -# CONFIG_USB_UHCI_ALT is not set -CONFIG_USB_OHCI=y -# CONFIG_USB_SL811HS_ALT is not set -# CONFIG_USB_SL811HS is not set -CONFIG_USB_AUDIO=m -# CONFIG_USB_EMI26 is not set -CONFIG_USB_MIDI=m -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_HP8200e=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_AIPTEK=m -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_DC2XX is not set -# CONFIG_USB_MDC800 is not set -CONFIG_USB_SCANNER=m -# CONFIG_USB_MICROTEK is not set -# CONFIG_USB_HPUSBSCSI is not set -CONFIG_USB_IBMCAM=m -# CONFIG_USB_KONICAWC is not set -CONFIG_USB_OV511=m -CONFIG_USB_PWC=m -CONFIG_USB_SE401=m -CONFIG_USB_STV680=m -# CONFIG_USB_W9968CF is not set -CONFIG_USB_VICAM=m -CONFIG_USB_DSBR=m -# CONFIG_USB_DABUSB is not set -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_KAWETH=m -CONFIG_USB_CATC=m -CONFIG_USB_CDCETHER=m -CONFIG_USB_USBNET=m -CONFIG_USB_USS720=m - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -# CONFIG_USB_SERIAL_DEBUG is not set -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_VISOR is not set -CONFIG_USB_SERIAL_IPAQ=m -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OMNINET is not set -CONFIG_USB_RIO500=m -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_TIGL is not set -# CONFIG_USB_BRLVGER is not set -CONFIG_USB_LCD=m - -# -# Support for USB gadgets -# -# CONFIG_USB_GADGET is not set - -# -# Bluetooth support -# -CONFIG_BLUEZ=m -CONFIG_BLUEZ_L2CAP=m -CONFIG_BLUEZ_SCO=m -# CONFIG_BLUEZ_RFCOMM is not set -CONFIG_BLUEZ_BNEP=m -# CONFIG_BLUEZ_BNEP_MC_FILTER is not set -# CONFIG_BLUEZ_BNEP_PROTO_FILTER is not set - -# -# Bluetooth device drivers -# -CONFIG_BLUEZ_HCIUSB=m -CONFIG_BLUEZ_HCIUSB_SCO=y -CONFIG_BLUEZ_HCIUART=m -CONFIG_BLUEZ_HCIUART_H4=y -# CONFIG_BLUEZ_HCIUART_BCSP is not set -# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set -# CONFIG_BLUEZ_HCIBFUSB is not set -# CONFIG_BLUEZ_HCIDTL1 is not set -# CONFIG_BLUEZ_HCIBT3C is not set -# CONFIG_BLUEZ_HCIBLUECARD is not set -# CONFIG_BLUEZ_HCIBTUART is not set -CONFIG_BLUEZ_HCIVHCI=m - -# -# Kernel hacking -# -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=0 - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_BLOWFISH=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_SERPENT=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_CAST5=y -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_ARC4 is not set -CONFIG_CRYPTO_DEFLATE=y -# CONFIG_CRYPTO_TEST is not set - -# -# Library routines -# -# CONFIG_CRC32 is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -# CONFIG_FW_LOADER is not set diff --git a/packages/linux/linux-netvista_2.4.27.bb b/packages/linux/linux-netvista_2.4.27.bb deleted file mode 100644 index 2b2721c7c4..0000000000 --- a/packages/linux/linux-netvista_2.4.27.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Linux kernel x86 for IBM Netvista" -LICENSE = "GPL" -PR = "r4" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ - file://netvista_defconfig" -S = "${WORKDIR}/linux-${PV}" - -COMPATIBLE_HOST='i.86.*-linux' - -inherit kernel - -KERNEL_CCSUFFIX = "-3.3.4" -ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" - -# Avoid getting the kernel in the rootfs -FILES_kernel = "" -ALLOW_EMPTY_kernel = "1" -PACKAGES += "kernel-image" -FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/netvista_defconfig ${S}/.config -} -- cgit v1.2.3 From 5f72d5a8d7c068e2b3420e765be27c1a4a9435c3 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 15:58:49 +0000 Subject: linux-x86: Add Netvista 8365 defconfig --- .../linux/linux-x86-2.6.20/netvista/.mtn2git_empty | 0 packages/linux/linux-x86-2.6.20/netvista/defconfig | 1685 ++++++++++++++++++++ 2 files changed, 1685 insertions(+) create mode 100644 packages/linux/linux-x86-2.6.20/netvista/.mtn2git_empty create mode 100644 packages/linux/linux-x86-2.6.20/netvista/defconfig (limited to 'packages') diff --git a/packages/linux/linux-x86-2.6.20/netvista/.mtn2git_empty b/packages/linux/linux-x86-2.6.20/netvista/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-x86-2.6.20/netvista/defconfig b/packages/linux/linux-x86-2.6.20/netvista/defconfig new file mode 100644 index 0000000000..864a42b303 --- /dev/null +++ b/packages/linux/linux-x86-2.6.20/netvista/defconfig @@ -0,0 +1,1685 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.20 +# Tue Apr 3 00:46:14 2007 +# +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_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +# CONFIG_IKCONFIG is not set +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +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 +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=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 +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# Processor type and features +# +# CONFIG_SMP is not set +CONFIG_X86_PC=y +# 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=y +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MCORE2 is not set +# 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=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_XADD=y +CONFIG_X86_L1_CACHE_SHIFT=7 +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_F00F_BUG=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_ALIGNMENT_16=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_HPET_TIMER=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +# CONFIG_X86_UP_APIC is not set +CONFIG_X86_MCE=y +# CONFIG_X86_MCE_NONFATAL 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=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +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=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +CONFIG_SECCOMP=y +# 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_KEXEC is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_COMPAT_VDSO=y + +# +# Power management options (ACPI, APM) +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_SOFTWARE_SUSPEND is not set + +# +# ACPI (Advanced Configuration and Power Interface) Support +# +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=m +# CONFIG_ACPI_HOTKEY is not set +CONFIG_ACPI_FAN=y +# CONFIG_ACPI_DOCK is not set +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_THERMAL=y +# CONFIG_ACPI_ASUS is not set +CONFIG_ACPI_IBM=m +# CONFIG_ACPI_IBM_DOCK is not set +# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +# CONFIG_ACPI_CONTAINER is not set + +# +# APM (Advanced Power Management) BIOS Support +# +CONFIG_APM=y +CONFIG_APM_IGNORE_USER_SUSPEND=y +CONFIG_APM_DO_ENABLE=y +CONFIG_APM_CPU_IDLE=y +CONFIG_APM_DISPLAY_BLANK=y +# CONFIG_APM_RTC_IS_GMT is not set +CONFIG_APM_ALLOW_INTS=y +# CONFIG_APM_REAL_MODE_POWER_OFF is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# 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_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_QUEUE=y + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +# CONFIG_IEEE80211_CRYPT_TKIP is not set +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +CONFIG_PARPORT=y +CONFIG_PARPORT_PC=y +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set + +# +# Plug and Play support +# +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +CONFIG_PNPACPI=y + +# +# Block devices +# +CONFIG_BLK_DEV_FD=y +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# Misc devices +# +# CONFIG_IBM_ASM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_MSI_LAPTOP is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECD=y +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_CMD640=y +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_IDEPNP is not set +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_RZ1000=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_ATIIXP is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# 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 +# CONFIG_BLK_DEV_SC1200 is not set +CONFIG_BLK_DEV_PIIX=y +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# 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 +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# 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 + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_IEEE1394=y + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394_OUI_DB is not set +# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# + +# +# Texas Instruments PCILynx requires I2C +# +CONFIG_IEEE1394_OHCI1394=y + +# +# Protocol Drivers +# +# CONFIG_IEEE1394_VIDEO1394 is not set +# CONFIG_IEEE1394_SBP2 is not set +# CONFIG_IEEE1394_ETH1394 is not set +# CONFIG_IEEE1394_DV1394 is not set +CONFIG_IEEE1394_RAWIO=y + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_NET_SB1000 is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set + +# +# Tulip family network device support +# +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +# CONFIG_HP100 is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +CONFIG_AMD8111_ETH=m +CONFIG_AMD8111E_NAPI=y +CONFIG_ADAPTEC_STARFIRE=m +# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_B44=m +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_DGRS=m +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +# CONFIG_8139CP is not set +CONFIG_8139TOO=y +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +CONFIG_SUNDANCE_MMIO=y +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_RHINE_NAPI=y +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_QLA3XXX is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +# CONFIG_IXGB is not set +CONFIG_S2IO=m +# CONFIG_S2IO_NAPI is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y + +# +# 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=m +# CONFIG_PCI_ATMEL is not set + +# +# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +# +# CONFIG_PRISM54 is not set +CONFIG_USB_ZD1201=m +# CONFIG_HOSTAP is not set +# CONFIG_BCM43XX is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_NET_WIRELESS=y + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_CONSOLE is not set +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_TIPAR is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +CONFIG_RTC=m +# CONFIG_GEN_RTC is not set +# 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 is not set +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 +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_I810 is not set +# CONFIG_DRM_I830 is not set +# CONFIG_DRM_I915 is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +# CONFIG_DRM_VIA is not set +# 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 + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=y +CONFIG_FB_VESA=y +# CONFIG_FB_HGA is not set +# 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 +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# 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 + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_VIDEO_SELECT=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_SEQUENCER=y +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_RTCTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_MTS64 is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# PCI devices +# +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# 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 +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# 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_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +CONFIG_SND_INTEL8X0=y +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_AC97_POWER_SAVE is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y + +# +# HID Devices +# +CONFIG_HID=y + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=y + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +CONFIG_USB_TOUCHSCREEN=m +CONFIG_USB_TOUCHSCREEN_EGALAX=y +CONFIG_USB_TOUCHSCREEN_PANJIT=y +CONFIG_USB_TOUCHSCREEN_3M=y +CONFIG_USB_TOUCHSCREEN_ITM=y +CONFIG_USB_TOUCHSCREEN_ETURBO=y +CONFIG_USB_TOUCHSCREEN_GUNZE=y +CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +CONFIG_USB_CYTHERM=m +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# +# CONFIG_EDAC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_INTF_DEV_UIE_EMUL=y + +# +# RTC drivers +# +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_TEST=m +CONFIG_RTC_DRV_V3020=m + +# +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices +# + +# +# Virtualization +# +# CONFIG_KVM is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +# CONFIG_ZISOFS is not set +CONFIG_UDF_FS=y +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=y +# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=y +CONFIG_EXPORTFS=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Instrumentation Support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +# CONFIG_KPROBES is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_UNUSED_SYMBOLS=y +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_EARLY_PRINTK=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +# CONFIG_CRYPTO_TWOFISH_586 is not set +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_AES_586 is not set +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_TEST is not set + +# +# 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 +# +CONFIG_BITREVERSE=y +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_X86_BIOS_REBOOT=y +CONFIG_KTIME_SCALAR=y -- cgit v1.2.3 From a696fdaf77e9f88543553972c9b8f5bc875deee1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 16:10:57 +0000 Subject: gpe-image: Remove obsolete familiar feed. --- packages/images/gpe-image.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb index b448c0a9b1..552384c9e6 100644 --- a/packages/images/gpe-image.bb +++ b/packages/images/gpe-image.bb @@ -1,4 +1,3 @@ -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" PR = "r20" -- cgit v1.2.3 From 29aa09ddf9d16f968166689f5108a90da3d87a40 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 16:41:33 +0000 Subject: libart-lgpl: Add i486 configuration header. --- packages/gnome/libart-lgpl/i486/.mtn2git_empty | 0 packages/gnome/libart-lgpl/i486/art_config.h | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 packages/gnome/libart-lgpl/i486/.mtn2git_empty create mode 100644 packages/gnome/libart-lgpl/i486/art_config.h (limited to 'packages') diff --git a/packages/gnome/libart-lgpl/i486/.mtn2git_empty b/packages/gnome/libart-lgpl/i486/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/libart-lgpl/i486/art_config.h b/packages/gnome/libart-lgpl/i486/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/packages/gnome/libart-lgpl/i486/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; -- cgit v1.2.3 From 4a66594e3ea75d5b42c859b30e3aa834690028eb Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 3 Apr 2007 18:41:46 +0000 Subject: u-boot_LABEL.2006.06.30.2020.bb : Set DEFAULT_PREFERENCE = -1 --- packages/uboot/u-boot_LABEL.2006.06.30.2020.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb index c29aba7cd5..de0373782b 100644 --- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb +++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb @@ -1,6 +1,7 @@ require u-boot.inc PR = "r2" +DEFAULT_PREFERENCE = "-1" TAG = "${@bb.data.getVar('PV',d,1).replace('.', '_')}" -- cgit v1.2.3 From 2ab3af9be00f5562ddca11d3d374c8bb50810afd Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 3 Apr 2007 18:44:39 +0000 Subject: u-boot_1.2.0.bb : Add version 1.2.0 of u-boot. --- packages/uboot/u-boot_1.2.0.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/uboot/u-boot_1.2.0.bb (limited to 'packages') diff --git a/packages/uboot/u-boot_1.2.0.bb b/packages/uboot/u-boot_1.2.0.bb new file mode 100644 index 0000000000..15d16bd571 --- /dev/null +++ b/packages/uboot/u-boot_1.2.0.bb @@ -0,0 +1,7 @@ +require u-boot.inc + +PR = "r1" + +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2" + +PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From e101fbf6dc45df8320fb4568d820dcfd414744e8 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 18:46:24 +0000 Subject: packages/gpe-today/gpe-today_cvs.bb * drop obsolete version packages/gpe-today/gpe-today_svn.bb * up-to-date svn version to replace obsolete cvs .bb --- packages/gpe-today/gpe-today_cvs.bb | 29 ----------------------------- packages/gpe-today/gpe-today_svn.bb | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 packages/gpe-today/gpe-today_cvs.bb create mode 100644 packages/gpe-today/gpe-today_svn.bb (limited to 'packages') diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb deleted file mode 100644 index 47e9c01a66..0000000000 --- a/packages/gpe-today/gpe-today_cvs.bb +++ /dev/null @@ -1,29 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" -DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" -SECTION = "gpe" -PRIORITY = "optional" - - -S = "${WORKDIR}/${PN}" -#Remove the dash below when 0.10 changes in PV -PV = "0.11+cvs-${SRCDATE}" -PR = "r0" - -inherit gpe - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN} \ - file://Makefile.dpkg_ipkg \ - file://Makefile.translation" - - -do_compile () { - sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile - mkdir build - cp ${WORKDIR}/Makefile.* build/ - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - - diff --git a/packages/gpe-today/gpe-today_svn.bb b/packages/gpe-today/gpe-today_svn.bb new file mode 100644 index 0000000000..329e2271ea --- /dev/null +++ b/packages/gpe-today/gpe-today_svn.bb @@ -0,0 +1,24 @@ +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" +PV = "0.11+svn-${SRCDATE}" +PR = "r0" + +inherit gpe + +SRC_URI = "${GPE_SVN} \ + file://Makefile.dpkg_ipkg \ + file://Makefile.translation" + +S = "${WORKDIR}/${PN}" + + +do_compile () { + sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile + mkdir -p build + cp ${WORKDIR}/Makefile.* build/ + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From e9236642dd21630c3abe13d8db1b807c3db1cdee Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 19:09:31 +0000 Subject: packages/gpe-scap/gpe-scap_svn.bb * add new svn build recipe --- packages/gpe-scap/gpe-scap_svn.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/gpe-scap/gpe-scap_svn.bb (limited to 'packages') diff --git a/packages/gpe-scap/gpe-scap_svn.bb b/packages/gpe-scap/gpe-scap_svn.bb new file mode 100644 index 0000000000..3360189422 --- /dev/null +++ b/packages/gpe-scap/gpe-scap_svn.bb @@ -0,0 +1,12 @@ +DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" +RREPLACES = "gpe-screenshot" +PV = "1.2+svn-${SRCDATE}" +PR = "r1" + +inherit autotools + +SRC_URI += "${GPE_EXTRA_SVN}" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 205c9d448868dcb43296f71b938d3a16ea04f12c Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Tue, 3 Apr 2007 21:39:10 +0000 Subject: compulab-pxa270: create jffs2 images w/ summary information --- packages/linux/compulab-pxa270_2.6.16.bb | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb index 0e9a43d9b6..928bde8f6a 100644 --- a/packages/linux/compulab-pxa270_2.6.16.bb +++ b/packages/linux/compulab-pxa270_2.6.16.bb @@ -1,7 +1,12 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Compulab PXA270 system" LICENSE = "GPL" -PR = "r2" +PR = "r3" + +# coreutils is required for the stat command which is used +# to create the programming images used with USB. Version +# >= 6.0 is required. +DEPENDS = "coreutils-native" # Note, the compulab package contains a binary NAND driver that is not # EABI compatible @@ -29,8 +34,20 @@ do_configure_prepend() { } do_deploy() { + KNAME=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME} + # Create an image file that has the size prepended (used by cm-x270 BL) + # The following can only be done on a little endian machine + size=$(stat --printf=%s ${KNAME}) + size_=$(printf '\%03o'\ + $((size & 0x000000FF))\ + $((size>>8 & 0x000000FF))\ + $((size>>16 & 0x000000FF))\ + $((size>>24 & 0x000000FF))) + size_=${size_}'\c' + echo -e $size_ > ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img + cat ${KNAME} >> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img } do_deploy[dirs] = "${S}" -- cgit v1.2.3 From 8f230b532b01946c51ef6a02dbac8832b9d59389 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 21:40:10 +0000 Subject: packages/gpe-dm/gpe-dm_svn.bb * add new svn build recipe for gpe-dm --- packages/gpe-dm/gpe-dm_svn.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/gpe-dm/gpe-dm_svn.bb (limited to 'packages') diff --git a/packages/gpe-dm/gpe-dm_svn.bb b/packages/gpe-dm/gpe-dm_svn.bb new file mode 100644 index 0000000000..64bc155a70 --- /dev/null +++ b/packages/gpe-dm/gpe-dm_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "GPE Display Manager" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "glib-2.0 xserver-common" +RDEPENDS_${PN} += "procps xserver-common" +PV = "gpe-dm-0.50+svn-${SRCDATE}" + +inherit gpe autotools update-rc.d + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +INITSCRIPT_NAME = "gpe-dm" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -- cgit v1.2.3 From d1aad874fe8cee98bad9f5f2e703a59841c92d55 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 21:51:00 +0000 Subject: packages/gpe-dm/gpe-dm_svn.bb * added correct default preference level --- packages/gpe-dm/gpe-dm_svn.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gpe-dm/gpe-dm_svn.bb b/packages/gpe-dm/gpe-dm_svn.bb index 64bc155a70..1b1409f29a 100644 --- a/packages/gpe-dm/gpe-dm_svn.bb +++ b/packages/gpe-dm/gpe-dm_svn.bb @@ -14,3 +14,5 @@ S = "${WORKDIR}/${PN}" INITSCRIPT_NAME = "gpe-dm" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 4bc1972f00a651b580b3c11f08ae6eea6a0a5db2 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Tue, 3 Apr 2007 21:57:08 +0000 Subject: packages/gpe-edit/gpe-edit_svn.bb * add new gpe-edit svn build recipe --- packages/gpe-edit/gpe-edit_svn.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/gpe-edit/gpe-edit_svn.bb (limited to 'packages') diff --git a/packages/gpe-edit/gpe-edit_svn.bb b/packages/gpe-edit/gpe-edit_svn.bb new file mode 100644 index 0000000000..780294bd13 --- /dev/null +++ b/packages/gpe-edit/gpe-edit_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Editor for the GPE Palmtop Environment" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" + +inherit gpe autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 34ba65578669a18c33e3c208a27173fb3712f99e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 22:21:38 +0000 Subject: prismstumbler: Some additional fixes. --- .../prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty | 0 .../prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch | 13 +++++++++++++ packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb | 8 +++++--- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty create mode 100644 packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch (limited to 'packages') diff --git a/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch new file mode 100644 index 0000000000..638a877b77 --- /dev/null +++ b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch @@ -0,0 +1,13 @@ +--- prismstumbler-0.7.4pre1/src/daemon/gpsctl.c~ 2007-04-04 00:10:03.000000000 +0200 ++++ prismstumbler-0.7.4pre1/src/daemon/gpsctl.c 2007-04-04 00:10:03.000000000 +0200 +@@ -30,8 +30,8 @@ + if(!gps_conn) + return 0; + +- *lat = (float) gps_conn->newdata.latitude; +- *lon = (float) gps_conn->newdata.longitude; ++ *lat = (float) gps_conn->fix.latitude; ++ *lon = (float) gps_conn->fix.longitude; + return 1; + } + diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index 44401df7dd..9311f894d0 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r0" +PR = "r1" PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" @@ -9,7 +9,8 @@ DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd" RDEPENDS = "wireless-tools" RRECOMMENDS = "gpsd" -SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz" +SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \ + file://gpsapi.patch;patch=1" S = "${WORKDIR}/${PN}-0.7.4pre1" @@ -21,7 +22,8 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ - --without-athena --enable-dbus" + --without-athena --enable-dbus \ + --with-libiw=${STAGING_DIR}/${HOST_SYS}" CFLAGS =+ "-I${S}/include" LDFLAGS += "-lz" -- cgit v1.2.3 From 57a694b5428496fb3a695c9464a233c417338f00 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 3 Apr 2007 22:36:14 +0000 Subject: altboot: Add SVNR30 snapshot - Fix Neo1973 Menu options (except NFS) - Enable Neo1973 menu-navigation for /sbin/altboot - Add generic work-around for busybox ps - Fix /bin/sh boot on NSLU2 - Do no longer package emtpy "Advanced" directory --- packages/altboot/altboot_1.1.1+wip-SVNR28.bb | 123 -------------------------- packages/altboot/altboot_1.1.1+wip-SVNR30.bb | 124 +++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 123 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR28.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR30.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR28.bb b/packages/altboot/altboot_1.1.1+wip-SVNR28.bb deleted file mode 100644 index 4c14aef7b5..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-SVNR28.bb +++ /dev/null @@ -1,123 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -SVN_REV = "28" -PR = "r1" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "${MACHINE}" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" - -S = "${WORKDIR}/trunk/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -MACHINE_DIR = "${MACHINE}" -MACHINE_DIR_nslu2be = "nslu2le" - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE_DIR} - then - install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${S}/altboot.func ${D}/etc - install -m 0644 ${S}/altboot.sbin ${D}/etc - install -m 0644 ${S}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - ln -s /sbin/init.altboot ${D}/sbin/altboot - - if test -d ${S}/${MACHINE_DIR}/altboot-menu - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - else - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/altboot-menu/Advanced - then - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - fi - - if test -d ${S}/${MACHINE_DIR}/altboot.rc - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc - else - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc - fi -} - -###################################################################################### - -do_configure() { - cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ - mv ${S}/init.altboot_ ${S}/init.altboot -} - -###################################################################################### - -pkg_postinst_${PN}() { - test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 - - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot - - update-alternatives --remove init /sbin/init.altboot -} - diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb new file mode 100644 index 0000000000..8b4a65a098 --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb @@ -0,0 +1,124 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SVN_REV = "30" +PR = "r1" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE_DIR} + then + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot + + if test -d ${S}/${MACHINE_DIR}/altboot-menu + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced + then + install -d ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/altboot-menu/Advanced + then + install -d ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE_DIR}/altboot.rc + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + + update-alternatives --remove init /sbin/init.altboot +} + -- cgit v1.2.3 From 55dfa6d977ef935a30191ab09e0c377f794baaa8 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 3 Apr 2007 23:21:39 +0000 Subject: perl: Fix perl build for sh3/sh4. The recent change to support powerpc was wiping out the options that were set for sh3/sh4 - we only need to init the OPTIONS once. --- packages/perl/perl.inc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index f063d0e403..64e548a121 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -46,13 +46,10 @@ do_compile() { if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" fi - - # You must use gcc to link on powerpc also - OPTIONS="" - if test ${TARGET_ARCH} = "powerpc" ; then - OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" - fi - + # You must use gcc to link on powerpc also + if test ${TARGET_ARCH} = "powerpc" ; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi oe_runmake perl $OPTIONS } -- cgit v1.2.3 From 3a88290f931baa6feda702c9d5ab7948f8dc1ba1 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 2 Apr 2007 18:42:52 +0000 Subject: slugos-packages: added task-native-sdk --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 41ddc79e8d..843d2ace4a 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r29" +PR = "r30" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -162,6 +162,7 @@ SLUGOS_PACKAGES = "\ streamripper \ sysfsutils \ tar \ + task-native-sdk \ task-mokogateway-everything \ thttpd \ tiff \ -- cgit v1.2.3 From a02de7dc2abfec94b33a4d37d2b17771b704e470 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 22:53:05 +0000 Subject: xserver-common: Add 1.16 --- packages/xserver-common/xserver-common_1.16.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/xserver-common/xserver-common_1.16.bb (limited to 'packages') diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb new file mode 100644 index 0000000000..48320ba006 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r2" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://xserver-imageon.patch;patch=1 \ + file://calibrate-only-if-ts.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} -- cgit v1.2.3 From 5ccff680d2f57dc7c4d4f9b89f062a107be89275 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 3 Apr 2007 19:38:20 +0000 Subject: slugos-packages: Demoted madfu - fails to build --- packages/meta/slugos-packages.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 287a8166af..67d204eea7 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r30" +PR = "r31" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -104,7 +104,6 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ - madfu \ madplay \ madwifi-ng \ mailx \ @@ -195,6 +194,7 @@ SLUGOS_BROKEN_PACKAGES = "\ irssi \ libgphoto2 \ logrotate \ + madfu \ mediatomb \ mpd \ netpbm \ -- cgit v1.2.3 From 8c0a27b1777b2e3f0dd2041123a0255abd646dce Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 08:21:45 +0000 Subject: gcc-cross-sdk: add 4.1.2 with its own SRC_URI to remove zecke-xgcc-cpp and failfast patches --- packages/gcc/gcc-cross-sdk_4.1.2.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/gcc/gcc-cross-sdk_4.1.2.bb (limited to 'packages') diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb new file mode 100644 index 0000000000..e3050d3926 --- /dev/null +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The GNU cc and gcc C compilers." +HOMEPAGE = "http://www.gnu.org/software/gcc/" +SECTION = "devel" +LICENSE = "GPL" +PR = "r0" + +inherit sdk + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" +PACKAGES = "${PN}" + +require gcc_${PV}.bb +require gcc4-build-sdk.inc +require gcc-package-sdk.inc -- cgit v1.2.3 From f216b756051a8a7c5ce69d2bdb59ec1cb3a76886 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 08:31:08 +0000 Subject: gcc-cross-sdk: actually add the SRC_URI --- packages/gcc/gcc-cross-sdk_4.1.2.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'packages') diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index e3050d3926..f3968f512d 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -14,3 +14,29 @@ PACKAGES = "${PN}" require gcc_${PV}.bb require gcc4-build-sdk.inc require gcc-package-sdk.inc + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ + file://100-uclibc-conf.patch;patch=1 \ + file://110-arm-eabi.patch;patch=1 \ + file://200-uclibc-locale.patch;patch=1 \ + file://300-libstdc++-pic.patch;patch=1 \ + file://301-missing-execinfo_h.patch;patch=1 \ + file://302-c99-snprintf.patch;patch=1 \ + file://303-c99-complex-ugly-hack.patch;patch=1 \ + file://304-index_macro.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://740-sh-pr24836.patch;patch=1 \ + file://800-arm-bigendian.patch;patch=1 \ + file://801-arm-bigendian-eabi.patch;patch=1 \ + file://arm-nolibfloat.patch;patch=1 \ + file://arm-softfloat.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://arm-thumb.patch;patch=1 \ + file://arm-thumb-cache.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://unbreak-armv4t.patch;patch=1 \ + file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ + " + +SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " + -- cgit v1.2.3 From bcfc6829b0765a16d7d55e142e31f17d0b25dc41 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 08:41:32 +0000 Subject: gcc 4.1.x: move fail-fast to gcc-cross since it's only needed there --- packages/gcc/gcc-cross_4.1.1.bb | 2 ++ packages/gcc/gcc-cross_4.1.2.bb | 2 ++ packages/gcc/gcc_4.1.1.bb | 3 +-- packages/gcc/gcc_4.1.2.bb | 3 +-- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 67dbc83940..04b34919ec 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -15,4 +15,6 @@ require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc +SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " + EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index bb1114cf3b..dab2f332a2 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -15,4 +15,6 @@ require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc +SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " + EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index b668769ceb..c88692ae0c 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r12" +PR = "r13" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -35,7 +35,6 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://gcc-ignore-cache.patch;patch=1 \ " -SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " SRC_URI_append_powerpc = " file://ppc-gcc-41-20060515.patch;patch=1 \ diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 91f6624aa1..2e6036d119 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -32,7 +32,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ " -SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits -- cgit v1.2.3 From 8c4198fc6f3bf5656e41affe35e78e5ea449a901 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 08:55:46 +0000 Subject: gcc-package-sdk.inc: libg2c isn't always there, so don't error out on stripping --- packages/gcc/gcc-package-sdk.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc index 9d44fb51ab..1e5f2aaa5d 100644 --- a/packages/gcc/gcc-package-sdk.inc +++ b/packages/gcc/gcc-package-sdk.inc @@ -41,7 +41,7 @@ do_install () { # the packaging. if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then ${TARGET_PREFIX}strip ${D}${libdir}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}${libdir}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${libdir}/libg2c.so.* || true ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* fi } -- cgit v1.2.3 From bc518973a69a34e2792559213879754a4fd4c2a3 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 3 Apr 2007 19:51:20 +0000 Subject: slugos-packages: Demoted task-native-sdk - glibc fails to build --- packages/meta/slugos-packages.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 67d204eea7..917df6876c 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r31" +PR = "r32" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -162,7 +162,6 @@ SLUGOS_PACKAGES = "\ streamripper \ sysfsutils \ tar \ - task-native-sdk \ task-mokogateway-everything \ thttpd \ tiff \ @@ -206,6 +205,7 @@ SLUGOS_BROKEN_PACKAGES = "\ unionfs-utils \ lirc \ pwc \ + task-native-sdk \ zd1211 \ mysql \ wview-sim-mysql wview-vpro-mysql \ -- cgit v1.2.3 From 7f35ac9d6f5d27b6e3f602be876c1f6c7d273803 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 3 Apr 2007 20:06:22 +0000 Subject: tzdata: Updated to 2007e --- packages/tzcode/tzcode-native_2007d.bb | 21 ----- packages/tzcode/tzcode-native_2007e.bb | 21 +++++ packages/tzdata/tzdata_2007d.bb | 158 --------------------------------- packages/tzdata/tzdata_2007e.bb | 158 +++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 packages/tzcode/tzcode-native_2007d.bb create mode 100644 packages/tzcode/tzcode-native_2007e.bb delete mode 100644 packages/tzdata/tzdata_2007d.bb create mode 100644 packages/tzdata/tzdata_2007e.bb (limited to 'packages') diff --git a/packages/tzcode/tzcode-native_2007d.bb b/packages/tzcode/tzcode-native_2007d.bb deleted file mode 100644 index 8e721d6d9a..0000000000 --- a/packages/tzcode/tzcode-native_2007d.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" - -PR = "r0" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -inherit native - -do_stage () { - install -d ${STAGING_BINDIR_NATIVE} - install -m 755 zic ${STAGING_BINDIR_NATIVE}/ - install -m 755 zdump ${STAGING_BINDIR_NATIVE}/ - install -m 755 tzselect ${STAGING_BINDIR_NATIVE}/ -} - -do_install () { - : -} diff --git a/packages/tzcode/tzcode-native_2007e.bb b/packages/tzcode/tzcode-native_2007e.bb new file mode 100644 index 0000000000..8e721d6d9a --- /dev/null +++ b/packages/tzcode/tzcode-native_2007e.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" + +PR = "r0" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ + ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +inherit native + +do_stage () { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 zic ${STAGING_BINDIR_NATIVE}/ + install -m 755 zdump ${STAGING_BINDIR_NATIVE}/ + install -m 755 tzselect ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + : +} diff --git a/packages/tzdata/tzdata_2007d.bb b/packages/tzdata/tzdata_2007d.bb deleted file mode 100644 index 46d941c269..0000000000 --- a/packages/tzdata/tzdata_2007d.bb +++ /dev/null @@ -1,158 +0,0 @@ -DESCRIPTION = "Timezone data" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "tzcode-native" - -PR = "r0" - -PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -RPROVIDES = "tzdata" -RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -TZONES= "africa antarctica asia australasia europe northamerica southamerica \ - factory solar87 solar88 solar89 etcetera backward systemv \ -# pacificnew \ - " - -do_compile () { - for zone in ${TZONES}; do \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - done -} - -do_install () { - install -d ${D}/usr ${D}${datadir}/zoneinfo - cp -pPR ${S}/usr ${D}/ -} - -# Packages primarily organized by directory with a major city -# in most time zones in the base package - -PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" - -FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" -RPROVIDES_tzdata-africa = "tzdata-africa" - -FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ - ${datadir}/zoneinfo/US/* \ - ${datadir}/zoneinfo/Brazil/* \ - ${datadir}/zoneinfo/Canada/* \ - ${datadir}/zoneinfo/Mexico/* \ - ${datadir}/zoneinfo/Chile/*" -RPROVIDES_tzdata-americas = "tzdata-americas" - -FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" -RPROVIDES_tzdata-antarctica = "tzdata-antarctica" - -FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" -RPROVIDES_tzdata-arctic = "tzdata-arctic" - -FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ - ${datadir}/zoneinfo/Indian/* \ - ${datadir}/zoneinfo/Mideast/*" -RPROVIDES_tzdata-asia = "tzdata-asia" - -FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" -RPROVIDES_tzdata-atlantic = "tzdata-atlantic" - -FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" -RPROVIDES_tzdata-australia = "tzdata-australia" - -FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" -RPROVIDES_tzdata-europe = "tzdata-europe" - -FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" -RPROVIDES_tzdata-pacific = "tzdata-pacific" - -FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" -RPROVIDES_tzdata-posix = "tzdata-posix" - -FILES_tzdata-right += "${datadir}/zoneinfo/right/*" -RPROVIDES_tzdata-right = "tzdata-right" - - -FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ - ${datadir}/zoneinfo/Egypt \ - ${datadir}/zoneinfo/Eire \ - ${datadir}/zoneinfo/Factory \ - ${datadir}/zoneinfo/GB-Eire \ - ${datadir}/zoneinfo/Hongkong \ - ${datadir}/zoneinfo/Iceland \ - ${datadir}/zoneinfo/Iran \ - ${datadir}/zoneinfo/Israel \ - ${datadir}/zoneinfo/Jamaica \ - ${datadir}/zoneinfo/Japan \ - ${datadir}/zoneinfo/Kwajalein \ - ${datadir}/zoneinfo/Libya \ - ${datadir}/zoneinfo/Navajo \ - ${datadir}/zoneinfo/Poland \ - ${datadir}/zoneinfo/Portugal \ - ${datadir}/zoneinfo/Singapore \ - ${datadir}/zoneinfo/Turkey" -RPROVIDES_tzdata-misc = "tzdata-misc" - - -FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ - ${datadir}/zoneinfo/America/Anchorage \ - ${datadir}/zoneinfo/America/Los_Angeles \ - ${datadir}/zoneinfo/America/Denver \ - ${datadir}/zoneinfo/America/Chicago \ - ${datadir}/zoneinfo/America/New_York \ - ${datadir}/zoneinfo/America/Caracas \ - ${datadir}/zoneinfo/America/Sao_Paulo \ - ${datadir}/zoneinfo/Europe/London \ - ${datadir}/zoneinfo/Europe/Paris \ - ${datadir}/zoneinfo/Africa/Cairo \ - ${datadir}/zoneinfo/Europe/Moscow \ - ${datadir}/zoneinfo/Asia/Dubai \ - ${datadir}/zoneinfo/Asia/Karachi \ - ${datadir}/zoneinfo/Asia/Dhaka \ - ${datadir}/zoneinfo/Asia/Bankok \ - ${datadir}/zoneinfo/Asia/Hong_Kong \ - ${datadir}/zoneinfo/Asia/Tokyo \ - ${datadir}/zoneinfo/Australia/Sydney \ - ${datadir}/zoneinfo/Pacific/Noumea \ - ${datadir}/zoneinfo/CET \ - ${datadir}/zoneinfo/CST6CDT \ - ${datadir}/zoneinfo/EET \ - ${datadir}/zoneinfo/EST \ - ${datadir}/zoneinfo/EST5EDT \ - ${datadir}/zoneinfo/GB \ - ${datadir}/zoneinfo/GMT \ - ${datadir}/zoneinfo/GMT+0 \ - ${datadir}/zoneinfo/GMT-0 \ - ${datadir}/zoneinfo/GMT0 \ - ${datadir}/zoneinfo/Greenwich \ - ${datadir}/zoneinfo/HST \ - ${datadir}/zoneinfo/MET \ - ${datadir}/zoneinfo/MST \ - ${datadir}/zoneinfo/MST7MDT \ - ${datadir}/zoneinfo/NZ \ - ${datadir}/zoneinfo/NZ-CHAT \ - ${datadir}/zoneinfo/PRC \ - ${datadir}/zoneinfo/PST8PDT \ - ${datadir}/zoneinfo/ROC \ - ${datadir}/zoneinfo/ROK \ - ${datadir}/zoneinfo/UCT \ - ${datadir}/zoneinfo/UTC \ - ${datadir}/zoneinfo/Universal \ - ${datadir}/zoneinfo/W-SU \ - ${datadir}/zoneinfo/WET \ - ${datadir}/zoneinfo/Zulu \ - ${datadir}/zoneinfo/Etc/*" diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007e.bb new file mode 100644 index 0000000000..46d941c269 --- /dev/null +++ b/packages/tzdata/tzdata_2007e.bb @@ -0,0 +1,158 @@ +DESCRIPTION = "Timezone data" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "tzcode-native" + +PR = "r0" + +PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +RPROVIDES = "tzdata" +RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ + timezone-arctic timezone-asia timezone-atlantic \ + timezone-australia timezone-europe timezone-indian \ + timezone-iso3166.tab timezone-pacific timezone-zone.tab" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +TZONES= "africa antarctica asia australasia europe northamerica southamerica \ + factory solar87 solar88 solar89 etcetera backward systemv \ +# pacificnew \ + " + +do_compile () { + for zone in ${TZONES}; do \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + done +} + +do_install () { + install -d ${D}/usr ${D}${datadir}/zoneinfo + cp -pPR ${S}/usr ${D}/ +} + +# Packages primarily organized by directory with a major city +# in most time zones in the base package + +PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" + +FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" +RPROVIDES_tzdata-africa = "tzdata-africa" + +FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ + ${datadir}/zoneinfo/US/* \ + ${datadir}/zoneinfo/Brazil/* \ + ${datadir}/zoneinfo/Canada/* \ + ${datadir}/zoneinfo/Mexico/* \ + ${datadir}/zoneinfo/Chile/*" +RPROVIDES_tzdata-americas = "tzdata-americas" + +FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" +RPROVIDES_tzdata-antarctica = "tzdata-antarctica" + +FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" +RPROVIDES_tzdata-arctic = "tzdata-arctic" + +FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ + ${datadir}/zoneinfo/Indian/* \ + ${datadir}/zoneinfo/Mideast/*" +RPROVIDES_tzdata-asia = "tzdata-asia" + +FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" +RPROVIDES_tzdata-atlantic = "tzdata-atlantic" + +FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" +RPROVIDES_tzdata-australia = "tzdata-australia" + +FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" +RPROVIDES_tzdata-europe = "tzdata-europe" + +FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" +RPROVIDES_tzdata-pacific = "tzdata-pacific" + +FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" +RPROVIDES_tzdata-posix = "tzdata-posix" + +FILES_tzdata-right += "${datadir}/zoneinfo/right/*" +RPROVIDES_tzdata-right = "tzdata-right" + + +FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ + ${datadir}/zoneinfo/Egypt \ + ${datadir}/zoneinfo/Eire \ + ${datadir}/zoneinfo/Factory \ + ${datadir}/zoneinfo/GB-Eire \ + ${datadir}/zoneinfo/Hongkong \ + ${datadir}/zoneinfo/Iceland \ + ${datadir}/zoneinfo/Iran \ + ${datadir}/zoneinfo/Israel \ + ${datadir}/zoneinfo/Jamaica \ + ${datadir}/zoneinfo/Japan \ + ${datadir}/zoneinfo/Kwajalein \ + ${datadir}/zoneinfo/Libya \ + ${datadir}/zoneinfo/Navajo \ + ${datadir}/zoneinfo/Poland \ + ${datadir}/zoneinfo/Portugal \ + ${datadir}/zoneinfo/Singapore \ + ${datadir}/zoneinfo/Turkey" +RPROVIDES_tzdata-misc = "tzdata-misc" + + +FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ + ${datadir}/zoneinfo/America/Anchorage \ + ${datadir}/zoneinfo/America/Los_Angeles \ + ${datadir}/zoneinfo/America/Denver \ + ${datadir}/zoneinfo/America/Chicago \ + ${datadir}/zoneinfo/America/New_York \ + ${datadir}/zoneinfo/America/Caracas \ + ${datadir}/zoneinfo/America/Sao_Paulo \ + ${datadir}/zoneinfo/Europe/London \ + ${datadir}/zoneinfo/Europe/Paris \ + ${datadir}/zoneinfo/Africa/Cairo \ + ${datadir}/zoneinfo/Europe/Moscow \ + ${datadir}/zoneinfo/Asia/Dubai \ + ${datadir}/zoneinfo/Asia/Karachi \ + ${datadir}/zoneinfo/Asia/Dhaka \ + ${datadir}/zoneinfo/Asia/Bankok \ + ${datadir}/zoneinfo/Asia/Hong_Kong \ + ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Sydney \ + ${datadir}/zoneinfo/Pacific/Noumea \ + ${datadir}/zoneinfo/CET \ + ${datadir}/zoneinfo/CST6CDT \ + ${datadir}/zoneinfo/EET \ + ${datadir}/zoneinfo/EST \ + ${datadir}/zoneinfo/EST5EDT \ + ${datadir}/zoneinfo/GB \ + ${datadir}/zoneinfo/GMT \ + ${datadir}/zoneinfo/GMT+0 \ + ${datadir}/zoneinfo/GMT-0 \ + ${datadir}/zoneinfo/GMT0 \ + ${datadir}/zoneinfo/Greenwich \ + ${datadir}/zoneinfo/HST \ + ${datadir}/zoneinfo/MET \ + ${datadir}/zoneinfo/MST \ + ${datadir}/zoneinfo/MST7MDT \ + ${datadir}/zoneinfo/NZ \ + ${datadir}/zoneinfo/NZ-CHAT \ + ${datadir}/zoneinfo/PRC \ + ${datadir}/zoneinfo/PST8PDT \ + ${datadir}/zoneinfo/ROC \ + ${datadir}/zoneinfo/ROK \ + ${datadir}/zoneinfo/UCT \ + ${datadir}/zoneinfo/UTC \ + ${datadir}/zoneinfo/Universal \ + ${datadir}/zoneinfo/W-SU \ + ${datadir}/zoneinfo/WET \ + ${datadir}/zoneinfo/Zulu \ + ${datadir}/zoneinfo/Etc/*" -- cgit v1.2.3 From ce2d4eb176af03e8a8c75f0294fed6a400545720 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 4 Apr 2007 11:48:40 +0000 Subject: puzzles: update to r7436 --- packages/puzzles/puzzles_r7387.bb | 47 --------------------------------------- packages/puzzles/puzzles_r7436.bb | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 packages/puzzles/puzzles_r7387.bb create mode 100644 packages/puzzles/puzzles_r7436.bb (limited to 'packages') diff --git a/packages/puzzles/puzzles_r7387.bb b/packages/puzzles/puzzles_r7387.bb deleted file mode 100644 index 9b3b3842c7..0000000000 --- a/packages/puzzles/puzzles_r7387.bb +++ /dev/null @@ -1,47 +0,0 @@ - -DEPENDS = "gtk+ libxt" -PR = "r2" - -SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ - file://game.png" - -do_compile_prepend = " \ - export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ - export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " - -FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" -FILES_${PN}-dbg += "${prefix}/games/.debug" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - install -d ${D}/${prefix}/ - install -d ${D}/${prefix}/games/ - oe_runmake install - - install -d ${D}/${datadir}/ - install -d ${D}/${datadir}/applications/ - install -d ${D}/${datadir}/pixmaps/ - - install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ - - cd ${D}/${prefix}/games - for prog in *; do - if [ -x $prog ]; then - echo "making ${D}/${datadir}/applications/$prog.desktop" - cat < ${D}/${datadir}/applications/$prog.desktop -[Desktop Entry] -Encoding=UTF-8 -Name=$prog -Exec=${prefix}/games/$prog -Icon=game.png -Terminal=false -Type=Application -Categories=Game -StartupNotify=true -SingleInstance=true -STOP - fi - done -} diff --git a/packages/puzzles/puzzles_r7436.bb b/packages/puzzles/puzzles_r7436.bb new file mode 100644 index 0000000000..9b3b3842c7 --- /dev/null +++ b/packages/puzzles/puzzles_r7436.bb @@ -0,0 +1,47 @@ + +DEPENDS = "gtk+ libxt" +PR = "r2" + +SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ + file://game.png" + +do_compile_prepend = " \ + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " + +FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" +FILES_${PN}-dbg += "${prefix}/games/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + install -d ${D}/${prefix}/ + install -d ${D}/${prefix}/games/ + oe_runmake install + + install -d ${D}/${datadir}/ + install -d ${D}/${datadir}/applications/ + install -d ${D}/${datadir}/pixmaps/ + + install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ + + cd ${D}/${prefix}/games + for prog in *; do + if [ -x $prog ]; then + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat < ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Encoding=UTF-8 +Name=$prog +Exec=${prefix}/games/$prog +Icon=game.png +Terminal=false +Type=Application +Categories=Game +StartupNotify=true +SingleInstance=true +STOP + fi + done +} -- cgit v1.2.3 From 81a723e863c98fd2a3529da88c4eb731450263c9 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 4 Apr 2007 11:48:40 +0000 Subject: madfu: Add package madfu, to load firmware for m-audio devices --- packages/madfu/.mtn2git_empty | 0 packages/madfu/files/.mtn2git_empty | 0 packages/madfu/files/autofoo.patch | 54 +++++++++++++++++++++++++++++++++++++ packages/madfu/madfu_1.2.bb | 29 ++++++++++++++++++++ packages/meta/slugos-packages.bb | 1 + 5 files changed, 84 insertions(+) create mode 100644 packages/madfu/.mtn2git_empty create mode 100644 packages/madfu/files/.mtn2git_empty create mode 100644 packages/madfu/files/autofoo.patch create mode 100644 packages/madfu/madfu_1.2.bb (limited to 'packages') diff --git a/packages/madfu/.mtn2git_empty b/packages/madfu/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/madfu/files/.mtn2git_empty b/packages/madfu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/madfu/files/autofoo.patch b/packages/madfu/files/autofoo.patch new file mode 100644 index 0000000000..a89d38b144 --- /dev/null +++ b/packages/madfu/files/autofoo.patch @@ -0,0 +1,54 @@ +--- madfuload-1.2/configure.org 2007-04-04 13:30:55.186393000 +0200 ++++ madfuload-1.2/configure 2007-04-04 13:33:26.286393000 +0200 +@@ -2831,50 +2831,7 @@ + else + udev_dir="/etc/udev" + fi; +-as_ac_File=`echo "ac_cv_file_$udev_dir/udev.conf" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $udev_dir/udev.conf" >&5 +-echo $ECHO_N "checking for $udev_dir/udev.conf... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$udev_dir/udev.conf"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- udev_conf="$udev_dir/udev.conf" +-else +- udev_conf="" +-fi +- +- +-echo "$as_me:$LINENO: checking for udev rules directory" >&5 +-echo $ECHO_N "checking for udev rules directory... $ECHO_C" >&6 +-udev_rules="" +-if test -r "$udev_conf"; then +- udev_rules=`. "$udev_conf"; echo "$udev_rules"` +-fi +-if test -n "$udev_rules"; then +- echo "$as_me:$LINENO: result: $udev_rules" >&5 +-echo "${ECHO_T}$udev_rules" >&6 +-else +- udev_rules="$udev_dir/rules.d" +- echo "$as_me:$LINENO: result: not found; assuming $udev_rules" >&5 +-echo "${ECHO_T}not found; assuming $udev_rules" >&6 +-fi +-if test ! -d "$udev_rules"; then +- { { echo "$as_me:$LINENO: error: $udev_rules not found" >&5 +-echo "$as_me: error: $udev_rules not found" >&2;} +- { (exit 1); exit 1; }; } +-fi ++udev_rules="$udev_dir/rules.d" + UDEV_RULES_DIR=$udev_rules + + diff --git a/packages/madfu/madfu_1.2.bb b/packages/madfu/madfu_1.2.bb new file mode 100644 index 0000000000..be94f4e13b --- /dev/null +++ b/packages/madfu/madfu_1.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Firmware loader for m-audio devices" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz \ + file://autofoo.patch;patch=1" +inherit autotools + +S = ${WORKDIR}/madfuload-1.2 + +#EXTRA_OECONF = "--without-udev" +FILES_${PN} += "${libdir}/firmware/" + +do_configure() { + oe_runconf +} + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}/${sbindir} + install -m 755 ${S}/madfuload ${D}/${sbindir} + install -d ${D}/${libdir}/firmware + install -m 644 ${S}/*.bin ${D}/${libdir}/firmware + install -d ${D}/${sysconfdir}/udev/rules + install -m 644 ${S}/42-madfuload.rules ${D}/${sysconfdir}/udev/rules +} diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 843d2ace4a..287a8166af 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -104,6 +104,7 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ + madfu \ madplay \ madwifi-ng \ mailx \ -- cgit v1.2.3 From f0f89d19f347b304800e730c69a7fbb86acb9b4b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 4 Apr 2007 11:58:54 +0000 Subject: madfu: Clean up so it matches oe style guide --- packages/madfu/madfu_1.2.bb | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'packages') diff --git a/packages/madfu/madfu_1.2.bb b/packages/madfu/madfu_1.2.bb index be94f4e13b..354e65aced 100644 --- a/packages/madfu/madfu_1.2.bb +++ b/packages/madfu/madfu_1.2.bb @@ -3,27 +3,25 @@ LICENSE = "GPL" PR = "r1" SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz \ - file://autofoo.patch;patch=1" -inherit autotools + file://autofoo.patch;patch=1" -S = ${WORKDIR}/madfuload-1.2 +S = "${WORKDIR}/madfuload-1.2" -#EXTRA_OECONF = "--without-udev" -FILES_${PN} += "${libdir}/firmware/" +inherit autotools do_configure() { - oe_runconf + oe_runconf } - do_compile() { - oe_runmake + oe_runmake } - do_install() { - install -d ${D}/${sbindir} - install -m 755 ${S}/madfuload ${D}/${sbindir} - install -d ${D}/${libdir}/firmware - install -m 644 ${S}/*.bin ${D}/${libdir}/firmware - install -d ${D}/${sysconfdir}/udev/rules - install -m 644 ${S}/42-madfuload.rules ${D}/${sysconfdir}/udev/rules + install -d ${D}/${sbindir} + install -m 755 ${S}/madfuload ${D}/${sbindir} + install -d ${D}/${libdir}/firmware + install -m 644 ${S}/*.bin ${D}/${libdir}/firmware + install -d ${D}/${sysconfdir}/udev/rules + install -m 644 ${S}/42-madfuload.rules ${D}/${sysconfdir}/udev/rules } + +FILES_${PN} += "${libdir}/firmware/" -- cgit v1.2.3 From 3ca1d8940066de44946f0645b12476ead082b09c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 4 Apr 2007 12:07:51 +0000 Subject: gtk+: Apply patch to 2.6.10 to allow background images in iconview styles. --- packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch | 20 ++++++++++++++++++++ packages/gtk+/gtk+_2.6.10.bb | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch (limited to 'packages') diff --git a/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch b/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch new file mode 100644 index 0000000000..039440f933 --- /dev/null +++ b/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch @@ -0,0 +1,20 @@ +diff -ur gtk+-2.8.20/gtk/gtkiconview.c gtk+-2.8.20-new/gtk/gtkiconview.c +--- gtk+-2.8.20/gtk/gtkiconview.c 2006-04-11 20:44:15.000000000 +0200 ++++ gtk+-2.8.20-new/gtk/gtkiconview.c 2007-01-03 20:20:26.000000000 +0100 +@@ -899,9 +899,14 @@ + gdk_window_set_user_data (icon_view->priv->bin_window, widget); + + widget->style = gtk_style_attach (widget->style, widget->window); +- gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]); ++/* gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]); + gdk_window_set_background (widget->window, &widget->style->base[widget->state]); +- ++*/ ++printf("realize iconview\n"); ++// gdk_window_set_back_pixmap(widget->window, NULL, FALSE); ++// gdk_window_set_back_pixmap(icon_view->priv->bin_window, NULL, FALSE); ++ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); ++ gtk_style_set_background (widget->style, icon_view->priv->bin_window, GTK_STATE_NORMAL); + gdk_window_show (icon_view->priv->bin_window); + } + diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index f3d36bcb52..c096bbe688 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -32,7 +32,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://gtk.keynav.gtksettings.patch;patch=1;pnum=0 \ file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \ file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \ - file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0" + file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \ + file://gtk+-2.6.10-bg.patch;patch=1" inherit autotools pkgconfig -- cgit v1.2.3 From b19fbe04169b2eda4d8f833fbc548b183e4e9442 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 4 Apr 2007 12:29:43 +0000 Subject: linux-x86: Deploy bzImage --- packages/linux/linux-x86_2.6.20.bb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'packages') diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb index 5db1563733..4e35164828 100644 --- a/packages/linux/linux-x86_2.6.20.bb +++ b/packages/linux/linux-x86_2.6.20.bb @@ -17,3 +17,11 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config } +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/i386/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_populate_staging after do_compile -- cgit v1.2.3 From 64dc6ff478708aa826b492f458a0116979e28fff Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 4 Apr 2007 12:33:21 +0000 Subject: puzzles: add svn version --- packages/puzzles/puzzles_svn.bb | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 packages/puzzles/puzzles_svn.bb (limited to 'packages') diff --git a/packages/puzzles/puzzles_svn.bb b/packages/puzzles/puzzles_svn.bb new file mode 100644 index 0000000000..536aa445b7 --- /dev/null +++ b/packages/puzzles/puzzles_svn.bb @@ -0,0 +1,53 @@ +DEFAULT_PREFERENCE = "-1" + +DEPENDS = "gtk+ libxt" +PV = "r7436+svn${SRCDATE}" + +SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;proto=svn \ + file://game.png" +S = "${WORKDIR}/puzzles" + +do_configure () { + ./mkfiles.pl +} + +do_compile_prepend = " \ + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " + +FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" +FILES_${PN}-dbg += "${prefix}/games/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + install -d ${D}/${prefix}/ + install -d ${D}/${prefix}/games/ + oe_runmake install + + install -d ${D}/${datadir}/ + install -d ${D}/${datadir}/applications/ + install -d ${D}/${datadir}/pixmaps/ + + install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ + + cd ${D}/${prefix}/games + for prog in *; do + if [ -x $prog ]; then + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat < ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Encoding=UTF-8 +Name=$prog +Exec=${prefix}/games/$prog +Icon=game.png +Terminal=false +Type=Application +Categories=Game +StartupNotify=true +SingleInstance=true +STOP + fi + done +} -- cgit v1.2.3 From 77e64186f9856c0239fe7580a826ad7f3705f9c9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 12:36:04 +0000 Subject: ipkg-utils-native 1.6+cvs20050404: Fix version comparision algorithm, now it treats version as structured notion, and compares it component by component (epoch (was before), then upstream version, then package revision). * Closes #2061. --- .../ipkg-py-sane-vercompare.patch | 51 ++++++++++++++++++++++ .../ipkg-utils-native_1.6+cvs20050404.bb | 5 ++- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch (limited to 'packages') diff --git a/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch b/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch new file mode 100644 index 0000000000..00ee391405 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch @@ -0,0 +1,51 @@ +Only in ipkg-utils: ipkg-py-sane-vercompare.patch +diff -ur ipkg-utils.org/ipkg.py ipkg-utils/ipkg.py +--- ipkg-utils.org/ipkg.py 2005-01-08 18:08:52.000000000 +0000 ++++ ipkg-utils/ipkg.py 2007-04-04 11:52:46.000000000 +0000 +@@ -48,9 +48,9 @@ + self.epoch = epoch + self.version = version + +- def _versioncompare(self, ref): +- selfversion = self.version +- refversion = ref.version ++ def _versioncompare(self, selfversion, refversion): ++ if not selfversion: selfversion = "" ++ if not refversion: refversion = "" + while 1: + ## first look for non-numeric version component + selfm = re.match('([^0-9]*)(.*)', selfversion) +@@ -89,7 +89,18 @@ + elif (self.epoch < ref.epoch): + return -1 + else: +- return self._versioncompare(ref) ++ self_ver_comps = re.match(r"(.+?)(-r.+)?$", self.version) ++ ref_ver_comps = re.match(r"(.+?)(-r.+)?$", ref.version) ++ #print (self_ver_comps.group(1), self_ver_comps.group(2)) ++ #print (ref_ver_comps.group(1), ref_ver_comps.group(2)) ++ r = self._versioncompare(self_ver_comps.group(1), ref_ver_comps.group(1)) ++ if r == 0: ++ r = self._versioncompare(self_ver_comps.group(2), ref_ver_comps.group(2)) ++ #print "compare: %s vs %s = %d" % (self, ref, r) ++ return r ++ ++ def __str__(self): ++ return str(self.epoch) + ":" + self.version + + def parse_version(versionstr): + epoch = 0 +@@ -445,6 +456,13 @@ + return self.packages[key] + + if __name__ == "__main__": ++ ++ assert Version(0, "1.2.2-r1").compare(Version(0, "1.2.3-r0")) == -1 ++ assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2+cvs20070308-r0")) == -1 ++ assert Version(0, "1.2.2+cvs20070308").compare(Version(0, "1.2.2-r0")) == 1 ++ assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2-r0")) == 0 ++ assert Version(0, "1.2.2-r5").compare(Version(0, "1.2.2-r0")) == 1 ++ + package = Package() + + package.set_package("FooBar") diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 8079b46267..03a381387e 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,8 +1,9 @@ require ipkg-utils_${PV}.bb -SRC_URI += "file://ipkg-utils-fix.patch;patch=1" +SRC_URI += "file://ipkg-utils-fix.patch;patch=1 \ + file://ipkg-py-sane-vercompare.patch;patch=1" RDEPENDS = "" -PR = "r8" +PR = "r9" inherit native -- cgit v1.2.3 From 0086fe0cf43e1e1c850418afcda3b69f8737222e Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Wed, 4 Apr 2007 12:41:50 +0000 Subject: compulab-pxa270: add 2.6.20 version of compulab cm-x270 kernel --- .../linux/compulab-pxa270-2.6.20/.mtn2git_empty | 0 .../compulab-pxa270-2.6.20/0001-gitignore.patch | 31 + .../compulab-pxa270-2.6.20/0002-cm-x270-base.patch | 2161 ++++++++++++++++++++ .../compulab-pxa270-2.6.20/0003-ramdisk_load.patch | 38 + .../compulab-pxa270-2.6.20/0004-nand-driver.patch | 324 +++ .../0005-mmcsd_large_cards-r0.patch | 41 + .../0006-mmcsd_no_scr_check-r0.patch | 35 + packages/linux/compulab-pxa270-2.6.20/defconfig | 1188 +++++++++++ packages/linux/compulab-pxa270_2.6.20.bb | 61 + 9 files changed, 3879 insertions(+) create mode 100644 packages/linux/compulab-pxa270-2.6.20/.mtn2git_empty create mode 100644 packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch create mode 100644 packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch create mode 100644 packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch create mode 100644 packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch create mode 100644 packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch create mode 100644 packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch create mode 100644 packages/linux/compulab-pxa270-2.6.20/defconfig create mode 100644 packages/linux/compulab-pxa270_2.6.20.bb (limited to 'packages') diff --git a/packages/linux/compulab-pxa270-2.6.20/.mtn2git_empty b/packages/linux/compulab-pxa270-2.6.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch b/packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch new file mode 100644 index 0000000000..a8003e09c9 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch @@ -0,0 +1,31 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri Mar 16 23:15:39 2007 -0400 +Subject: [PATCH] gitignore + +add igonore files + +--- + + .gitignore | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +base 62d0cfcb27cf755cebdc93ca95dabc83608007cd +last 4db3152d3aeabcd82479f5b9c40ff79aa3ff620a +diff --git a/.gitignore b/.gitignore +index 060a71d41ad7ccc3214065a182e6f67568420071..2ead940e09fc0c193104928a7e085d9f62a57f5f 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -45,3 +45,9 @@ series + + # cscope files + cscope.* ++ ++arch/arm/boot/Image ++arch/arm/boot/compressed/piggy.gz ++arch/arm/boot/zImage ++include/asm-arm/arch ++include/asm-arm/mach-types.h +-- +1.4.4.4 + diff --git a/packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch b/packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch new file mode 100644 index 0000000000..4186bed0e3 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch @@ -0,0 +1,2161 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri Mar 16 23:15:47 2007 -0400 +Subject: [PATCH] cm x270 base + +Refreshed patch cm-x270-base. +(Base: 62d0cfcb27cf755cebdc93ca95dabc83608007cd) +(Last: 71b86b9caafa8efec4cd20370cb016f0975bc6e6) + +--- + + arch/arm/boot/compressed/head-xscale.S | 5 + arch/arm/configs/cm_x270_defconfig | 1312 ++++++++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 20 + arch/arm/mach-pxa/Makefile | 1 + arch/arm/mach-pxa/cm-x270.c | 663 ++++++++++++++++ + include/asm-arm/arch-pxa/cm-x270.h | 72 ++ + 6 files changed, 2073 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/configs/cm_x270_defconfig + create mode 100644 arch/arm/mach-pxa/cm-x270.c + create mode 100644 include/asm-arm/arch-pxa/cm-x270.h + +base 4db3152d3aeabcd82479f5b9c40ff79aa3ff620a +last 32abeb7a135309651fabb41ebfab98c9f6b67dbf +diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S +index 73c5d9e0201c47fd48b6a79194e3cb0413d5147f..dc894592c9fbc3755e5ef47cddaeb47bc884de6a 100644 +--- a/arch/arm/boot/compressed/head-xscale.S ++++ b/arch/arm/boot/compressed/head-xscale.S +@@ -53,3 +53,8 @@ __XScale_start: + str r1, [r0, #0x18] + #endif + ++#if defined(CONFIG_MACH_ARMCORE) ++ mov r7, #(MACH_TYPE_ARMCORE & 0xFF00) ++ add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF) ++#endif ++ +diff --git a/arch/arm/configs/cm_x270_defconfig b/arch/arm/configs/cm_x270_defconfig +new file mode 100644 +index 0000000000000000000000000000000000000000..f87d617d3f0f92355a9c818d874c3a22492f45cc +--- /dev/null ++++ b/arch/arm/configs/cm_x270_defconfig +@@ -0,0 +1,1312 @@ ++# ++# Automatically generated make config: don't edit ++# Linux kernel version: 2.6.16 ++# Tue Sep 26 10:07:36 2006 ++# ++CONFIG_ARM=y ++CONFIG_MMU=y ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++CONFIG_GENERIC_CALIBRATE_DELAY=y ++CONFIG_ARCH_MTD_XIP=y ++ ++# ++# Code maturity level options ++# ++CONFIG_EXPERIMENTAL=y ++CONFIG_BROKEN_ON_SMP=y ++CONFIG_INIT_ENV_ARG_LIMIT=32 ++ ++# ++# General setup ++# ++CONFIG_LOCALVERSION="-cm-x270" ++# CONFIG_LOCALVERSION_AUTO is not set ++CONFIG_SWAP=y ++CONFIG_SYSVIPC=y ++# CONFIG_POSIX_MQUEUE is not set ++# CONFIG_BSD_PROCESS_ACCT is not set ++CONFIG_SYSCTL=y ++# CONFIG_AUDIT is not set ++CONFIG_IKCONFIG=y ++CONFIG_IKCONFIG_PROC=y ++CONFIG_INITRAMFS_SOURCE="" ++CONFIG_UID16=y ++CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++CONFIG_EMBEDDED=y ++CONFIG_KALLSYMS=y ++# CONFIG_KALLSYMS_ALL is not set ++# CONFIG_KALLSYMS_EXTRA_PASS is not set ++CONFIG_HOTPLUG=y ++CONFIG_PRINTK=y ++CONFIG_BUG=y ++CONFIG_ELF_CORE=y ++CONFIG_BASE_FULL=y ++CONFIG_FUTEX=y ++CONFIG_EPOLL=y ++CONFIG_SHMEM=y ++CONFIG_CC_ALIGN_FUNCTIONS=0 ++CONFIG_CC_ALIGN_LABELS=0 ++CONFIG_CC_ALIGN_LOOPS=0 ++CONFIG_CC_ALIGN_JUMPS=0 ++CONFIG_SLAB=y ++# CONFIG_TINY_SHMEM is not set ++CONFIG_BASE_SMALL=0 ++# CONFIG_SLOB is not set ++ ++# ++# Loadable module support ++# ++CONFIG_MODULES=y ++CONFIG_MODULE_UNLOAD=y ++CONFIG_MODULE_FORCE_UNLOAD=y ++CONFIG_OBSOLETE_MODPARM=y ++# CONFIG_MODVERSIONS is not set ++# CONFIG_MODULE_SRCVERSION_ALL is not set ++CONFIG_KMOD=y ++ ++# ++# Block layer ++# ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++CONFIG_IOSCHED_AS=y ++CONFIG_IOSCHED_DEADLINE=y ++CONFIG_IOSCHED_CFQ=y ++CONFIG_DEFAULT_AS=y ++# CONFIG_DEFAULT_DEADLINE is not set ++# CONFIG_DEFAULT_CFQ is not set ++# CONFIG_DEFAULT_NOOP is not set ++CONFIG_DEFAULT_IOSCHED="anticipatory" ++ ++# ++# System Type ++# ++# CONFIG_ARCH_CLPS7500 is not set ++# CONFIG_ARCH_CLPS711X is not set ++# CONFIG_ARCH_CO285 is not set ++# CONFIG_ARCH_EBSA110 is not set ++# CONFIG_ARCH_FOOTBRIDGE is not set ++# CONFIG_ARCH_INTEGRATOR is not set ++# CONFIG_ARCH_IOP3XX is not set ++# CONFIG_ARCH_IXP4XX is not set ++# CONFIG_ARCH_IXP2000 is not set ++# CONFIG_ARCH_L7200 is not set ++CONFIG_ARCH_PXA=y ++# CONFIG_ARCH_RPC is not set ++# CONFIG_ARCH_SA1100 is not set ++# CONFIG_ARCH_S3C2410 is not set ++# CONFIG_ARCH_SHARK is not set ++# CONFIG_ARCH_LH7A40X is not set ++# CONFIG_ARCH_OMAP is not set ++# CONFIG_ARCH_VERSATILE is not set ++# CONFIG_ARCH_REALVIEW is not set ++# CONFIG_ARCH_IMX is not set ++# CONFIG_ARCH_H720X is not set ++# CONFIG_ARCH_AAEC2000 is not set ++# CONFIG_ARCH_AT91RM9200 is not set ++ ++# ++# Intel PXA2xx Implementations ++# ++# CONFIG_ARCH_LUBBOCK is not set ++# CONFIG_MACH_MAINSTONE is not set ++CONFIG_MACH_ARMCORE=y ++# CONFIG_ARCH_PXA_IDP is not set ++# CONFIG_PXA_SHARPSL is not set ++CONFIG_ARMCORE_REV12=y ++# CONFIG_ARMCORE_REV11 is not set ++CONFIG_PXA27x=y ++CONFIG_IWMMXT=y ++ ++# ++# Processor Type ++# ++CONFIG_CPU_32=y ++CONFIG_CPU_XSCALE=y ++CONFIG_CPU_32v5=y ++CONFIG_CPU_ABRT_EV5T=y ++CONFIG_CPU_CACHE_VIVT=y ++CONFIG_CPU_TLB_V4WBI=y ++ ++# ++# Processor Features ++# ++CONFIG_ARM_THUMB=y ++CONFIG_XSCALE_PMU=y ++CONFIG_DMABOUNCE=y ++ ++# ++# Bus support ++# ++CONFIG_PCI=y ++CONFIG_PCI_HOST_ITE8152=y ++# CONFIG_PCI_LEGACY_PROC is not set ++# CONFIG_PCI_DEBUG is not set ++ ++# ++# PCCARD (PCMCIA/CardBus) support ++# ++CONFIG_PCCARD=y ++# CONFIG_PCMCIA_DEBUG is not set ++CONFIG_PCMCIA=m ++# CONFIG_PCMCIA_LOAD_CIS is not set ++CONFIG_PCMCIA_IOCTL=y ++CONFIG_CARDBUS=y ++ ++# ++# PC-card bridges ++# ++CONFIG_YENTA=m ++CONFIG_YENTA_O2=y ++CONFIG_YENTA_RICOH=y ++CONFIG_YENTA_TI=y ++CONFIG_YENTA_ENE_TUNE=y ++CONFIG_YENTA_TOSHIBA=y ++# CONFIG_PD6729 is not set ++# CONFIG_I82092 is not set ++CONFIG_PCMCIA_PXA2XX=m ++CONFIG_PCCARD_NONSTATIC=m ++ ++# ++# Kernel Features ++# ++# CONFIG_PREEMPT is not set ++# CONFIG_NO_IDLE_HZ is not set ++# CONFIG_AEABI is not set ++# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set ++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_SPLIT_PTLOCK_CPUS=4096 ++CONFIG_LEDS=y ++CONFIG_LEDS_TIMER=y ++CONFIG_LEDS_CPU=y ++CONFIG_ALIGNMENT_TRAP=y ++ ++# ++# Boot options ++# ++CONFIG_ZBOOT_ROM_TEXT=0x0 ++CONFIG_ZBOOT_ROM_BSS=0x0 ++CONFIG_CMDLINE="" ++# CONFIG_XIP_KERNEL is not set ++ ++# ++# Floating point emulation ++# ++ ++# ++# At least one emulation must be selected ++# ++CONFIG_FPE_NWFPE=y ++# CONFIG_FPE_NWFPE_XP is not set ++# CONFIG_FPE_FASTFPE is not set ++ ++# ++# Userspace binary formats ++# ++CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_AOUT is not set ++# CONFIG_BINFMT_MISC is not set ++# CONFIG_ARTHUR is not set ++ ++# ++# Power management options ++# ++CONFIG_PM=y ++CONFIG_PM_LEGACY=y ++# CONFIG_PM_DEBUG is not set ++# CONFIG_APM is not set ++ ++# ++# Networking ++# ++CONFIG_NET=y ++ ++# ++# Networking options ++# ++# CONFIG_NETDEBUG is not set ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++CONFIG_UNIX=y ++# CONFIG_NET_KEY is not set ++CONFIG_INET=y ++# CONFIG_IP_MULTICAST is not set ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_FIB_HASH=y ++CONFIG_IP_PNP=y ++CONFIG_IP_PNP_DHCP=y ++CONFIG_IP_PNP_BOOTP=y ++# CONFIG_IP_PNP_RARP is not set ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_ARPD is not set ++# CONFIG_SYN_COOKIES is not set ++# CONFIG_INET_AH is not set ++# CONFIG_INET_ESP is not set ++# CONFIG_INET_IPCOMP is not set ++# CONFIG_INET_TUNNEL is not set ++CONFIG_INET_DIAG=y ++CONFIG_INET_TCP_DIAG=y ++# CONFIG_TCP_CONG_ADVANCED is not set ++CONFIG_TCP_CONG_BIC=y ++# CONFIG_IPV6 is not set ++# CONFIG_NETFILTER is not set ++ ++# ++# DCCP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_DCCP is not set ++ ++# ++# SCTP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_SCTP is not set ++ ++# ++# TIPC Configuration (EXPERIMENTAL) ++# ++# CONFIG_TIPC is not set ++# CONFIG_ATM is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_VLAN_8021Q is not set ++# CONFIG_DECNET is not set ++# CONFIG_LLC2 is not set ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_NET_DIVERT is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++ ++# ++# QoS and/or fair queueing ++# ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++# CONFIG_HAMRADIO is not set ++# CONFIG_IRDA is not set ++# CONFIG_BT is not set ++CONFIG_IEEE80211=m ++# CONFIG_IEEE80211_DEBUG is not set ++CONFIG_IEEE80211_CRYPT_WEP=m ++CONFIG_IEEE80211_CRYPT_CCMP=m ++# CONFIG_IEEE80211_CRYPT_TKIP is not set ++ ++# ++# Device Drivers ++# ++ ++# ++# Generic Driver Options ++# ++CONFIG_STANDALONE=y ++CONFIG_PREVENT_FIRMWARE_BUILD=y ++CONFIG_FW_LOADER=y ++# CONFIG_DEBUG_DRIVER is not set ++ ++# ++# Connector - unified userspace <-> kernelspace linker ++# ++# CONFIG_CONNECTOR is not set ++ ++# ++# Memory Technology Devices (MTD) ++# ++# CONFIG_MTD is not set ++ ++# ++# Parallel port support ++# ++# CONFIG_PARPORT is not set ++ ++# ++# Plug and Play support ++# ++ ++# ++# Block devices ++# ++# CONFIG_BLK_CPQ_DA is not set ++# CONFIG_BLK_CPQ_CISS_DA is not set ++# CONFIG_BLK_DEV_DAC960 is not set ++# CONFIG_BLK_DEV_UMEM is not set ++# CONFIG_BLK_DEV_COW_COMMON is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_CRYPTOLOOP is not set ++# CONFIG_BLK_DEV_NBD is not set ++# CONFIG_BLK_DEV_SX8 is not set ++# CONFIG_BLK_DEV_UB is not set ++CONFIG_BLK_DEV_RAM=y ++CONFIG_BLK_DEV_RAM_COUNT=16 ++CONFIG_BLK_DEV_RAM_SIZE=12000 ++CONFIG_BLK_DEV_INITRD=y ++# CONFIG_CDROM_PKTCDVD is not set ++# CONFIG_ATA_OVER_ETH is not set ++CONFIG_ARMCORE_FLASH=y ++# CONFIG_ARMCORE_NOR is not set ++CONFIG_ARMCORE_NAND=y ++ ++# ++# ATA/ATAPI/MFM/RLL support ++# ++CONFIG_IDE=m ++CONFIG_BLK_DEV_IDE=m ++ ++# ++# Please see Documentation/ide.txt for help/info on IDE drives ++# ++# CONFIG_BLK_DEV_IDE_SATA is not set ++CONFIG_BLK_DEV_IDEDISK=m ++# CONFIG_IDEDISK_MULTI_MODE is not set ++CONFIG_BLK_DEV_IDECS=m ++CONFIG_BLK_DEV_IDECD=m ++# CONFIG_BLK_DEV_IDETAPE is not set ++# CONFIG_BLK_DEV_IDEFLOPPY is not set ++CONFIG_BLK_DEV_IDESCSI=m ++# CONFIG_IDE_TASK_IOCTL is not set ++ ++# ++# IDE chipset support/bugfixes ++# ++CONFIG_IDE_GENERIC=m ++# CONFIG_BLK_DEV_IDEPCI is not set ++# CONFIG_IDE_ARM is not set ++CONFIG_BLK_DEV_IDE_CM_X270=m ++# CONFIG_BLK_DEV_IDEDMA is not set ++# CONFIG_IDEDMA_AUTO is not set ++# CONFIG_BLK_DEV_HD is not set ++ ++# ++# SCSI device support ++# ++# CONFIG_RAID_ATTRS is not set ++CONFIG_SCSI=y ++# CONFIG_SCSI_PROC_FS is not set ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++# CONFIG_CHR_DEV_ST is not set ++# CONFIG_CHR_DEV_OSST is not set ++# CONFIG_BLK_DEV_SR is not set ++# CONFIG_CHR_DEV_SG is not set ++# CONFIG_CHR_DEV_SCH is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_MULTI_LUN is not set ++# CONFIG_SCSI_CONSTANTS is not set ++# CONFIG_SCSI_LOGGING is not set ++ ++# ++# SCSI Transport Attributes ++# ++# CONFIG_SCSI_SPI_ATTRS is not set ++# CONFIG_SCSI_FC_ATTRS is not set ++# CONFIG_SCSI_ISCSI_ATTRS is not set ++# CONFIG_SCSI_SAS_ATTRS is not set ++ ++# ++# SCSI low-level drivers ++# ++# CONFIG_ISCSI_TCP is not set ++# CONFIG_BLK_DEV_3W_XXXX_RAID is not set ++# CONFIG_SCSI_3W_9XXX is not set ++# CONFIG_SCSI_ACARD is not set ++# CONFIG_SCSI_AACRAID is not set ++# CONFIG_SCSI_AIC7XXX is not set ++# CONFIG_SCSI_AIC7XXX_OLD is not set ++# CONFIG_SCSI_AIC79XX is not set ++# CONFIG_SCSI_DPT_I2O is not set ++# CONFIG_MEGARAID_NEWGEN is not set ++# CONFIG_MEGARAID_LEGACY is not set ++# CONFIG_MEGARAID_SAS is not set ++# CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_DMX3191D is not set ++# CONFIG_SCSI_FUTURE_DOMAIN is not set ++# CONFIG_SCSI_IPS is not set ++# CONFIG_SCSI_INITIO is not set ++# CONFIG_SCSI_INIA100 is not set ++# CONFIG_SCSI_SYM53C8XX_2 is not set ++# CONFIG_SCSI_IPR is not set ++# CONFIG_SCSI_QLOGIC_FC is not set ++# CONFIG_SCSI_QLOGIC_1280 is not set ++# CONFIG_SCSI_QLA_FC is not set ++# 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 ++ ++# ++# PCMCIA SCSI adapter support ++# ++# CONFIG_PCMCIA_AHA152X is not set ++# CONFIG_PCMCIA_FDOMAIN is not set ++# CONFIG_PCMCIA_NINJA_SCSI is not set ++# CONFIG_PCMCIA_QLOGIC is not set ++# CONFIG_PCMCIA_SYM53C500 is not set ++ ++# ++# Multi-device support (RAID and LVM) ++# ++# CONFIG_MD is not set ++ ++# ++# Fusion MPT device support ++# ++# CONFIG_FUSION is not set ++# CONFIG_FUSION_SPI is not set ++# CONFIG_FUSION_FC is not set ++# CONFIG_FUSION_SAS is not set ++ ++# ++# IEEE 1394 (FireWire) support ++# ++# CONFIG_IEEE1394 is not set ++ ++# ++# I2O device support ++# ++# CONFIG_I2O is not set ++ ++# ++# Network device support ++# ++CONFIG_NETDEVICES=y ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_EQUALIZER is not set ++# CONFIG_TUN is not set ++ ++# ++# ARCnet devices ++# ++# CONFIG_ARCNET is not set ++ ++# ++# PHY device support ++# ++# CONFIG_PHYLIB is not set ++ ++# ++# Ethernet (10 or 100Mbit) ++# ++CONFIG_NET_ETHERNET=y ++CONFIG_MII=y ++# CONFIG_HAPPYMEAL is not set ++# CONFIG_SUNGEM is not set ++# CONFIG_CASSINI is not set ++# CONFIG_NET_VENDOR_3COM is not set ++# CONFIG_SMC91X is not set ++CONFIG_DM9000=y ++CONFIG_DM9000_NOEPROM=y ++ ++# ++# Tulip family network device support ++# ++# CONFIG_NET_TULIP is not set ++# CONFIG_HP100 is not set ++CONFIG_NET_PCI=y ++# CONFIG_PCNET32 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_FEALNX is not set ++# CONFIG_NATSEMI is not set ++# CONFIG_NE2K_PCI is not set ++# CONFIG_8139CP is not set ++CONFIG_8139TOO=m ++# CONFIG_8139TOO_PIO is not set ++# CONFIG_8139TOO_TUNE_TWISTER is not set ++# CONFIG_8139TOO_8129 is not set ++# CONFIG_8139_OLD_RX_RESET is not set ++# 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 ++ ++# ++# Ethernet (1000 Mbit) ++# ++# CONFIG_ACENIC is not set ++# CONFIG_DL2K is not set ++# CONFIG_E1000 is not set ++# CONFIG_NS83820 is not set ++# CONFIG_HAMACHI is not set ++# CONFIG_YELLOWFIN is not set ++# CONFIG_R8169 is not set ++# CONFIG_SIS190 is not set ++# CONFIG_SKGE is not set ++# CONFIG_SKY2 is not set ++# CONFIG_SK98LIN is not set ++# CONFIG_VIA_VELOCITY is not set ++# CONFIG_TIGON3 is not set ++# CONFIG_BNX2 is not set ++ ++# ++# Ethernet (10000 Mbit) ++# ++# CONFIG_CHELSIO_T1 is not set ++# CONFIG_IXGB is not set ++# CONFIG_S2IO is not set ++ ++# ++# Token Ring devices ++# ++# CONFIG_TR is not set ++ ++# ++# Wireless LAN (non-hamradio) ++# ++CONFIG_NET_RADIO=y ++ ++# ++# Obsolete Wireless cards support (pre-802.11) ++# ++# CONFIG_STRIP is not set ++# CONFIG_PCMCIA_WAVELAN is not set ++# CONFIG_PCMCIA_NETWAVE is not set ++ ++# ++# Wireless 802.11 Frequency Hopping cards support ++# ++# CONFIG_PCMCIA_RAYCS is not set ++ ++# ++# Wireless 802.11b ISA/PCI cards support ++# ++# CONFIG_IPW2100 is not set ++# CONFIG_IPW2200 is not set ++# CONFIG_HERMES is not set ++# CONFIG_ATMEL is not set ++ ++# ++# Wireless 802.11b Pcmcia/Cardbus cards support ++# ++# CONFIG_AIRO_CS is not set ++# CONFIG_PCMCIA_WL3501 is not set ++ ++# ++# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support ++# ++# CONFIG_PRISM54 is not set ++# CONFIG_HOSTAP is not set ++CONFIG_NET_WIRELESS=y ++ ++# ++# PCMCIA network device support ++# ++CONFIG_NET_PCMCIA=y ++# CONFIG_PCMCIA_3C589 is not set ++# CONFIG_PCMCIA_3C574 is not set ++# CONFIG_PCMCIA_FMVJ18X is not set ++CONFIG_PCMCIA_PCNET=m ++# CONFIG_PCMCIA_NMCLAN is not set ++# CONFIG_PCMCIA_SMC91C92 is not set ++# CONFIG_PCMCIA_XIRC2PS is not set ++# CONFIG_PCMCIA_AXNET is not set ++ ++# ++# Wan interfaces ++# ++# CONFIG_WAN is not set ++# CONFIG_FDDI is not set ++# CONFIG_HIPPI is not set ++# CONFIG_PPP is not set ++# CONFIG_SLIP is not set ++# CONFIG_NET_FC is not set ++# CONFIG_SHAPER is not set ++# CONFIG_NETCONSOLE is not set ++# CONFIG_NETPOLL is not set ++# CONFIG_NET_POLL_CONTROLLER is not set ++ ++# ++# ISDN subsystem ++# ++# CONFIG_ISDN is not set ++ ++# ++# Input device support ++# ++CONFIG_INPUT=y ++ ++# ++# Userland interfaces ++# ++CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV_PSAUX=y ++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 ++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 ++# CONFIG_INPUT_JOYDEV is not set ++# CONFIG_INPUT_TSDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_EVBUG is not set ++ ++# ++# Input Device Drivers ++# ++# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_INPUT_MOUSE is not set ++# CONFIG_INPUT_JOYSTICK is not set ++# CONFIG_INPUT_TOUCHSCREEN is not set ++# CONFIG_INPUT_MISC is not set ++ ++# ++# Hardware I/O ports ++# ++CONFIG_SERIO=y ++# CONFIG_SERIO_SERPORT is not set ++# CONFIG_SERIO_PCIPS2 is not set ++CONFIG_SERIO_LIBPS2=y ++# CONFIG_SERIO_RAW is not set ++# CONFIG_GAMEPORT is not set ++ ++# ++# Character devices ++# ++CONFIG_VT=y ++CONFIG_VT_CONSOLE=y ++CONFIG_HW_CONSOLE=y ++# CONFIG_SERIAL_NONSTANDARD is not set ++ ++# ++# Serial drivers ++# ++CONFIG_SERIAL_8250=y ++# CONFIG_SERIAL_8250_CONSOLE is not set ++# CONFIG_SERIAL_8250_CS is not set ++CONFIG_SERIAL_8250_NR_UARTS=4 ++CONFIG_SERIAL_8250_RUNTIME_UARTS=4 ++# CONFIG_SERIAL_8250_EXTENDED is not set ++ ++# ++# Non-8250 serial port support ++# ++CONFIG_SERIAL_PXA=y ++CONFIG_SERIAL_PXA_CONSOLE=y ++CONFIG_SERIAL_CORE=y ++CONFIG_SERIAL_CORE_CONSOLE=y ++# CONFIG_SERIAL_JSM is not set ++CONFIG_UNIX98_PTYS=y ++CONFIG_LEGACY_PTYS=y ++CONFIG_LEGACY_PTY_COUNT=256 ++ ++# ++# IPMI ++# ++# CONFIG_IPMI_HANDLER is not set ++ ++# ++# Watchdog Cards ++# ++# CONFIG_WATCHDOG is not set ++# CONFIG_NVRAM is not set ++# CONFIG_RTC is not set ++# CONFIG_DTLK is not set ++# CONFIG_R3964 is not set ++# CONFIG_APPLICOM is not set ++ ++# ++# Ftape, the floppy tape device driver ++# ++# CONFIG_DRM is not set ++ ++# ++# PCMCIA character devices ++# ++# CONFIG_SYNCLINK_CS is not set ++# CONFIG_CARDMAN_4000 is not set ++# CONFIG_CARDMAN_4040 is not set ++# CONFIG_RAW_DRIVER is not set ++ ++# ++# TPM devices ++# ++# CONFIG_TCG_TPM is not set ++# CONFIG_TELCLOCK is not set ++CONFIG_EMV3020_RTC=y ++ ++# ++# I2C support ++# ++# CONFIG_I2C is not set ++ ++# ++# SPI support ++# ++# CONFIG_SPI is not set ++# CONFIG_SPI_MASTER is not set ++ ++# ++# Dallas's 1-wire bus ++# ++# CONFIG_W1 is not set ++ ++# ++# Hardware Monitoring support ++# ++# CONFIG_HWMON is not set ++# CONFIG_HWMON_VID is not set ++ ++# ++# Misc devices ++# ++ ++# ++# Multimedia Capabilities Port drivers ++# ++CONFIG_UCB1400=m ++CONFIG_UCB1400_TS=m ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++ ++# ++# Digital Video Broadcasting Devices ++# ++# CONFIG_DVB is not set ++ ++# ++# Graphics support ++# ++CONFIG_FB=y ++CONFIG_FB_CFB_FILLRECT=y ++CONFIG_FB_CFB_COPYAREA=y ++CONFIG_FB_CFB_IMAGEBLIT=y ++# CONFIG_FB_MACMODES is not set ++# CONFIG_FB_MODE_HELPERS is not set ++# CONFIG_FB_TILEBLITTING is not set ++# CONFIG_FB_CIRRUS is not set ++# CONFIG_FB_PM2 is not set ++# CONFIG_FB_CYBER2000 is not set ++# CONFIG_FB_ASILIANT is not set ++# CONFIG_FB_IMSTT is not set ++# CONFIG_FB_S1D13XXX is not set ++# CONFIG_FB_NVIDIA is not set ++# CONFIG_FB_RIVA is not set ++# CONFIG_FB_MATROX is not set ++# CONFIG_FB_RADEON_OLD is not set ++# CONFIG_FB_RADEON is not set ++# CONFIG_FB_ATY128 is not set ++# CONFIG_FB_ATY is not set ++# CONFIG_FB_SAVAGE is not set ++# CONFIG_FB_SIS is not set ++# CONFIG_FB_NEOMAGIC is not set ++# CONFIG_FB_KYRO is not set ++# CONFIG_FB_3DFX is not set ++# CONFIG_FB_VOODOO1 is not set ++# CONFIG_FB_TRIDENT is not set ++CONFIG_FB_PXA=y ++# CONFIG_FB_PXA_PARAMETERS is not set ++CONFIG_FB_MBX=m ++# CONFIG_FB_VIRTUAL is not set ++ ++# ++# Console display driver support ++# ++# CONFIG_VGA_CONSOLE is not set ++CONFIG_DUMMY_CONSOLE=y ++CONFIG_FRAMEBUFFER_CONSOLE=y ++# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set ++# CONFIG_FONTS is not set ++CONFIG_FONT_8x8=y ++CONFIG_FONT_8x16=y ++ ++# ++# Logo configuration ++# ++CONFIG_LOGO=y ++CONFIG_LOGO_LINUX_MONO=y ++CONFIG_LOGO_LINUX_VGA16=y ++CONFIG_LOGO_LINUX_CLUT224=y ++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++ ++# ++# Sound ++# ++CONFIG_SOUND=m ++ ++# ++# Advanced Linux Sound Architecture ++# ++CONFIG_SND=m ++CONFIG_SND_TIMER=m ++CONFIG_SND_PCM=m ++# CONFIG_SND_SEQUENCER is not set ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_MIXER_OSS=m ++CONFIG_SND_PCM_OSS=m ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++# CONFIG_SND_VERBOSE_PRINTK is not set ++# CONFIG_SND_DEBUG is not set ++ ++# ++# Generic devices ++# ++CONFIG_SND_AC97_CODEC=m ++CONFIG_SND_AC97_BUS=m ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++ ++# ++# PCI devices ++# ++# CONFIG_SND_AD1889 is not set ++# CONFIG_SND_ALI5451 is not set ++# CONFIG_SND_ATIIXP is not set ++# CONFIG_SND_ATIIXP_MODEM is not set ++# CONFIG_SND_AU8810 is not set ++# CONFIG_SND_AU8820 is not set ++# CONFIG_SND_AU8830 is not set ++# CONFIG_SND_AZT3328 is not set ++# CONFIG_SND_BT87X is not set ++# CONFIG_SND_CA0106 is not set ++# CONFIG_SND_CMIPCI is not set ++# CONFIG_SND_CS4281 is not set ++# CONFIG_SND_CS46XX is not set ++# 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_ES1938 is not set ++# CONFIG_SND_ES1968 is not set ++# CONFIG_SND_FM801 is not set ++# CONFIG_SND_HDA_INTEL is not set ++# CONFIG_SND_HDSP is not set ++# CONFIG_SND_HDSPM is not set ++# CONFIG_SND_ICE1712 is not set ++# CONFIG_SND_ICE1724 is not set ++# CONFIG_SND_INTEL8X0 is not set ++# CONFIG_SND_INTEL8X0M is not set ++# CONFIG_SND_KORG1212 is not set ++# CONFIG_SND_MAESTRO3 is not set ++# CONFIG_SND_MIXART is not set ++# CONFIG_SND_NM256 is not set ++# CONFIG_SND_PCXHR is not set ++# CONFIG_SND_RME32 is not set ++# CONFIG_SND_RME96 is not set ++# CONFIG_SND_RME9652 is not set ++# CONFIG_SND_SONICVIBES is not set ++# CONFIG_SND_TRIDENT is not set ++# CONFIG_SND_VIA82XX is not set ++# CONFIG_SND_VIA82XX_MODEM is not set ++# CONFIG_SND_VX222 is not set ++# CONFIG_SND_YMFPCI is not set ++ ++# ++# ALSA ARM devices ++# ++CONFIG_SND_PXA2XX_PCM=m ++CONFIG_SND_PXA2XX_AC97=m ++ ++# ++# USB devices ++# ++# CONFIG_SND_USB_AUDIO is not set ++ ++# ++# PCMCIA devices ++# ++ ++# ++# Open Sound System ++# ++# CONFIG_SOUND_PRIME is not set ++ ++# ++# USB support ++# ++CONFIG_USB_ARCH_HAS_HCD=y ++CONFIG_USB_ARCH_HAS_OHCI=y ++CONFIG_USB=y ++# CONFIG_USB_DEBUG is not set ++ ++# ++# Miscellaneous USB options ++# ++CONFIG_USB_DEVICEFS=y ++# CONFIG_USB_BANDWIDTH is not set ++# CONFIG_USB_DYNAMIC_MINORS is not set ++# CONFIG_USB_SUSPEND is not set ++# CONFIG_USB_OTG is not set ++ ++# ++# USB Host Controller Drivers ++# ++# CONFIG_USB_EHCI_HCD is not set ++# CONFIG_USB_ISP116X_HCD is not set ++CONFIG_USB_OHCI_HCD=y ++# CONFIG_USB_OHCI_BIG_ENDIAN is not set ++CONFIG_USB_OHCI_LITTLE_ENDIAN=y ++# CONFIG_USB_UHCI_HCD is not set ++# CONFIG_USB_SL811_HCD is not set ++ ++# ++# USB Device Class drivers ++# ++# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set ++# CONFIG_USB_ACM is not set ++# CONFIG_USB_PRINTER is not set ++ ++# ++# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' ++# ++ ++# ++# may also be needed; see USB_STORAGE Help for more information ++# ++CONFIG_USB_STORAGE=y ++# CONFIG_USB_STORAGE_DEBUG is not set ++# CONFIG_USB_STORAGE_DATAFAB is not set ++# CONFIG_USB_STORAGE_FREECOM is not set ++# CONFIG_USB_STORAGE_ISD200 is not set ++# CONFIG_USB_STORAGE_DPCM is not set ++# CONFIG_USB_STORAGE_USBAT is not set ++# CONFIG_USB_STORAGE_SDDR09 is not set ++# CONFIG_USB_STORAGE_SDDR55 is not set ++# CONFIG_USB_STORAGE_JUMPSHOT is not set ++# CONFIG_USB_STORAGE_ALAUDA is not set ++# CONFIG_USB_LIBUSUAL is not set ++ ++# ++# USB Input Devices ++# ++CONFIG_USB_HID=y ++CONFIG_USB_HIDINPUT=y ++# CONFIG_USB_HIDINPUT_POWERBOOK is not set ++# CONFIG_HID_FF is not set ++# CONFIG_USB_HIDDEV is not set ++# CONFIG_USB_AIPTEK is not set ++# CONFIG_USB_WACOM is not set ++# CONFIG_USB_ACECAD is not set ++# CONFIG_USB_KBTAB is not set ++# CONFIG_USB_POWERMATE is not set ++# CONFIG_USB_MTOUCH is not set ++# CONFIG_USB_ITMTOUCH is not set ++# CONFIG_USB_EGALAX is not set ++# CONFIG_USB_YEALINK is not set ++# CONFIG_USB_XPAD is not set ++# CONFIG_USB_ATI_REMOTE is not set ++# CONFIG_USB_ATI_REMOTE2 is not set ++# CONFIG_USB_KEYSPAN_REMOTE is not set ++# CONFIG_USB_APPLETOUCH is not set ++ ++# ++# USB Imaging devices ++# ++# CONFIG_USB_MDC800 is not set ++# CONFIG_USB_MICROTEK is not set ++ ++# ++# USB Multimedia devices ++# ++# CONFIG_USB_DABUSB is not set ++ ++# ++# Video4Linux support is needed for USB Multimedia device support ++# ++ ++# ++# USB Network Adapters ++# ++# CONFIG_USB_CATC is not set ++# CONFIG_USB_KAWETH is not set ++# CONFIG_USB_PEGASUS is not set ++# CONFIG_USB_RTL8150 is not set ++# CONFIG_USB_USBNET is not set ++# CONFIG_USB_ZD1201 is not set ++CONFIG_USB_MON=y ++ ++# ++# USB port drivers ++# ++ ++# ++# USB Serial Converter support ++# ++# CONFIG_USB_SERIAL is not set ++ ++# ++# USB Miscellaneous drivers ++# ++# CONFIG_USB_EMI62 is not set ++# CONFIG_USB_EMI26 is not set ++# CONFIG_USB_AUERSWALD is not set ++# CONFIG_USB_RIO500 is not set ++# CONFIG_USB_LEGOTOWER is not set ++# CONFIG_USB_LCD is not set ++# CONFIG_USB_LED is not set ++# CONFIG_USB_CYTHERM is not set ++# CONFIG_USB_PHIDGETKIT is not set ++# CONFIG_USB_PHIDGETSERVO is not set ++# CONFIG_USB_IDMOUSE is not set ++# CONFIG_USB_LD is not set ++# CONFIG_USB_TEST is not set ++ ++# ++# USB DSL modem support ++# ++ ++# ++# USB Gadget Support ++# ++# CONFIG_USB_GADGET is not set ++ ++# ++# MMC/SD Card support ++# ++CONFIG_MMC=m ++# CONFIG_MMC_DEBUG is not set ++CONFIG_MMC_BLOCK=m ++CONFIG_MMC_PXA=m ++ ++# ++# File systems ++# ++CONFIG_EXT2_FS=y ++# CONFIG_EXT2_FS_XATTR is not set ++# CONFIG_EXT2_FS_XIP is not set ++CONFIG_EXT3_FS=y ++CONFIG_EXT3_FS_XATTR=y ++# CONFIG_EXT3_FS_POSIX_ACL is not set ++# CONFIG_EXT3_FS_SECURITY is not set ++CONFIG_JBD=y ++# CONFIG_JBD_DEBUG is not set ++CONFIG_FS_MBCACHE=y ++# CONFIG_REISERFS_FS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_FS_POSIX_ACL is not set ++# CONFIG_XFS_FS is not set ++# CONFIG_OCFS2_FS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_ROMFS_FS is not set ++CONFIG_INOTIFY=y ++# CONFIG_QUOTA is not set ++CONFIG_DNOTIFY=y ++# CONFIG_AUTOFS_FS is not set ++# CONFIG_AUTOFS4_FS is not set ++# CONFIG_FUSE_FS is not set ++ ++# ++# CD-ROM/DVD Filesystems ++# ++# CONFIG_ISO9660_FS is not set ++# CONFIG_UDF_FS is not set ++ ++# ++# DOS/FAT/NT Filesystems ++# ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_FAT_DEFAULT_CODEPAGE=437 ++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ++# CONFIG_NTFS_FS is not set ++ ++# ++# Pseudo filesystems ++# ++CONFIG_PROC_FS=y ++CONFIG_SYSFS=y ++CONFIG_TMPFS=y ++# CONFIG_HUGETLB_PAGE is not set ++CONFIG_RAMFS=y ++# CONFIG_RELAYFS_FS is not set ++# CONFIG_CONFIGFS_FS is not set ++ ++# ++# Miscellaneous filesystems ++# ++# CONFIG_ADFS_FS is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# CONFIG_BEFS_FS is not set ++# CONFIG_BFS_FS is not set ++# CONFIG_EFS_FS is not set ++# CONFIG_CRAMFS is not set ++# CONFIG_VXFS_FS is not set ++# CONFIG_HPFS_FS is not set ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_SYSV_FS is not set ++# CONFIG_UFS_FS is not set ++ ++# ++# Network File Systems ++# ++CONFIG_NFS_FS=y ++CONFIG_NFS_V3=y ++# CONFIG_NFS_V3_ACL is not set ++# CONFIG_NFS_V4 is not set ++# CONFIG_NFS_DIRECTIO is not set ++# CONFIG_NFSD is not set ++CONFIG_ROOT_NFS=y ++CONFIG_LOCKD=y ++CONFIG_LOCKD_V4=y ++CONFIG_NFS_COMMON=y ++CONFIG_SUNRPC=y ++# CONFIG_RPCSEC_GSS_KRB5 is not set ++# CONFIG_RPCSEC_GSS_SPKM3 is not set ++CONFIG_SMB_FS=y ++# CONFIG_SMB_NLS_DEFAULT is not set ++# CONFIG_CIFS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_CODA_FS is not set ++# CONFIG_AFS_FS is not set ++# CONFIG_9P_FS is not set ++ ++# ++# Partition Types ++# ++# CONFIG_PARTITION_ADVANCED is not set ++CONFIG_MSDOS_PARTITION=y ++ ++# ++# Native Language Support ++# ++CONFIG_NLS=y ++CONFIG_NLS_DEFAULT="iso8859-1" ++CONFIG_NLS_CODEPAGE_437=y ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# CONFIG_NLS_CODEPAGE_949 is not set ++# CONFIG_NLS_CODEPAGE_874 is not set ++# CONFIG_NLS_ISO8859_8 is not set ++# CONFIG_NLS_CODEPAGE_1250 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ASCII is not set ++CONFIG_NLS_ISO8859_1=y ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++ ++# ++# Profiling support ++# ++# CONFIG_PROFILING is not set ++ ++# ++# Kernel hacking ++# ++# CONFIG_PRINTK_TIME is not set ++CONFIG_MAGIC_SYSRQ=y ++CONFIG_DEBUG_KERNEL=y ++CONFIG_LOG_BUF_SHIFT=17 ++# CONFIG_DETECT_SOFTLOCKUP is not set ++# CONFIG_SCHEDSTATS is not set ++# CONFIG_DEBUG_SLAB is not set ++# CONFIG_DEBUG_MUTEXES is not set ++# CONFIG_DEBUG_SPINLOCK is not set ++# CONFIG_DEBUG_SPINLOCK_SLEEP is not set ++# CONFIG_DEBUG_KOBJECT is not set ++# CONFIG_DEBUG_BUGVERBOSE is not set ++CONFIG_DEBUG_INFO=y ++# CONFIG_DEBUG_FS is not set ++# CONFIG_DEBUG_VM is not set ++CONFIG_FRAME_POINTER=y ++CONFIG_FORCED_INLINING=y ++# CONFIG_RCU_TORTURE_TEST is not set ++CONFIG_DEBUG_USER=y ++# CONFIG_DEBUG_WAITQ is not set ++CONFIG_DEBUG_ERRORS=y ++CONFIG_DEBUG_LL=y ++# CONFIG_DEBUG_ICEDCC is not set ++ ++# ++# Security options ++# ++# CONFIG_KEYS is not set ++# CONFIG_SECURITY is not set ++ ++# ++# Cryptographic options ++# ++CONFIG_CRYPTO=y ++# CONFIG_CRYPTO_HMAC is not set ++# CONFIG_CRYPTO_NULL is not set ++# CONFIG_CRYPTO_MD4 is not set ++# CONFIG_CRYPTO_MD5 is not set ++# CONFIG_CRYPTO_SHA1 is not set ++# CONFIG_CRYPTO_SHA256 is not set ++# CONFIG_CRYPTO_SHA512 is not set ++# CONFIG_CRYPTO_WP512 is not set ++# CONFIG_CRYPTO_TGR192 is not set ++# CONFIG_CRYPTO_DES is not set ++# CONFIG_CRYPTO_BLOWFISH is not set ++# CONFIG_CRYPTO_TWOFISH is not set ++# CONFIG_CRYPTO_SERPENT is not set ++CONFIG_CRYPTO_AES=m ++# CONFIG_CRYPTO_CAST5 is not set ++# CONFIG_CRYPTO_CAST6 is not set ++# CONFIG_CRYPTO_TEA is not set ++CONFIG_CRYPTO_ARC4=m ++# CONFIG_CRYPTO_KHAZAD is not set ++# CONFIG_CRYPTO_ANUBIS is not set ++# CONFIG_CRYPTO_DEFLATE is not set ++# CONFIG_CRYPTO_MICHAEL_MIC is not set ++# CONFIG_CRYPTO_CRC32C is not set ++# CONFIG_CRYPTO_TEST is not set ++ ++# ++# Hardware crypto devices ++# ++ ++# ++# Library routines ++# ++# CONFIG_CRC_CCITT is not set ++# CONFIG_CRC16 is not set ++CONFIG_CRC32=y ++# CONFIG_LIBCRC32C is not set +diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig +index 5c0a10041cd17c1fc7c9ae97a442d266b4dd8c05..0fece09f16ca71297f278d8c6306ae74d2f10c03 100644 +--- a/arch/arm/mach-pxa/Kconfig ++++ b/arch/arm/mach-pxa/Kconfig +@@ -1,5 +1,8 @@ + if ARCH_PXA + ++config CM_X270 ++ bool ++ + menu "Intel PXA2xx Implementations" + + choice +@@ -18,6 +21,12 @@ config MACH_MAINSTONE + bool "Intel HCDDBBVA0 Development Platform" + select PXA27x + ++config MACH_ARMCORE ++ bool "CompuLab CM-X270 modules" ++ select PXA27x ++ select IWMMXT ++ select CM_X270 ++ + config ARCH_PXA_IDP + bool "Accelent Xscale IDP" + select PXA25x +@@ -71,6 +80,17 @@ endchoice + + endif + ++if MACH_ARMCORE ++choice ++ prompt "Select CM-X270 revision" ++ config ARMCORE_REV12 ++ bool "CM-X270 revision 1.2" ++ config ARMCORE_REV11 ++ bool "CM-X270 revision 1.1" ++endchoice ++ ++endif ++ + endmenu + + config MACH_POODLE +diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile +index 9093eb1c94ebdfae3a94611a1d586c493ad01d9a..116afca194431fb4b6e1b1c2e2eb6ce466259751 100644 +--- a/arch/arm/mach-pxa/Makefile ++++ b/arch/arm/mach-pxa/Makefile +@@ -18,6 +18,7 @@ obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o sp + obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o + obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o + obj-$(CONFIG_MACH_TOSA) += tosa.o ++obj-$(CONFIG_CM_X270) += cm-x270.o + + # Support for blinky lights + led-y := leds.o +diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c +new file mode 100644 +index 0000000000000000000000000000000000000000..00fbd81d819ef19ef032ab2ff1ef58dfc3b1270c +--- /dev/null ++++ b/arch/arm/mach-pxa/cm-x270.c +@@ -0,0 +1,663 @@ ++/* ++ * linux/arch/arm/mach-pxa/cm-x270.c ++ * ++ * Copyright (C) 2006 CompuLab, Ltd. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++//#include ++#include ++//#include ++#include ++#include ++//#include ++#include ++#include ++ ++//#include ++ ++#include "generic.h" ++ ++#define RTC_PHYS_BASE (PXA_CS1_PHYS + (5 << 22)) ++#define DM9000_PHYS_BASE (PXA_CS1_PHYS + (6 << 22)) ++ ++static struct resource cmx270_dm9k_resource[] = { ++ [0] = { ++ .start = DM9000_PHYS_BASE, ++ .end = DM9000_PHYS_BASE + 4, ++ .flags = IORESOURCE_MEM, ++ }, ++ [1] = { ++ .start = DM9000_PHYS_BASE + 8, ++ .end = DM9000_PHYS_BASE + 8 + 500, ++ .flags = IORESOURCE_MEM, ++ }, ++ [2] = { ++ .start = CMX270_ETHIRQ, ++ .end = CMX270_ETHIRQ, ++ .flags = IORESOURCE_IRQ, ++ } ++}; ++ ++/* for the moment we limit ourselves to 32bit IO until some ++ * better IO routines can be written and tested ++ */ ++static struct dm9000_plat_data cmx270_dm9k_platdata = { ++ .flags = DM9000_PLATF_32BITONLY, ++}; ++ ++/* Ethernet device */ ++static struct platform_device cmx270_device_dm9k = { ++ .name = "dm9000", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(cmx270_dm9k_resource), ++ .resource = cmx270_dm9k_resource, ++ .dev = { ++ .platform_data = &cmx270_dm9k_platdata, ++ } ++}; ++ ++#if 0 ++/* audio device */ ++static struct platform_device cmx270_audio_device = { ++ .name = "pxa2xx-ac97", ++ .id = -1, ++}; ++ ++/* touchscreen controller */ ++static struct platform_device cmx270_ts_device = { ++ .name = "ucb1x00", ++ .id = -1, ++}; ++ ++/* RTC */ ++static struct resource cmx270_v3020_resource[] = { ++ [0] = { ++ .start = RTC_PHYS_BASE, ++ .end = RTC_PHYS_BASE + 4, ++ .flags = IORESOURCE_MEM, ++ }, ++}; ++ ++static struct platform_device cmx270_rtc_device = { ++ .name = "emv3020-rtc", ++ .num_resources = ARRAY_SIZE(cmx270_v3020_resource), ++ .resource = cmx270_v3020_resource, ++ .id = -1, ++}; ++#endif ++ ++ ++/* platform devices */ ++static struct platform_device *platform_devices[] __initdata = { ++ &cmx270_device_dm9k, ++ //&cmx270_audio_device, ++ //&cmx270_ts_device, ++ //&cmx270_rtc_device, ++ //&cmx270_2700G, ++}; ++ ++ ++ ++ ++#define CMX270_FLASH_VIRT (CMX270_IDE104_VIRT + PXA_CS_SIZE - (8<<20)) ++/* Map PCI companion and IDE/General Purpose CS statically */ ++static struct map_desc cmx270_io_desc[] __initdata = { ++ [0] = { /* IDE/general purpose space */ ++ .virtual = CMX270_IDE104_VIRT, ++ .pfn = __phys_to_pfn(CMX270_IDE104_PHYS), ++ .length = PXA_CS_SIZE - (8<<20), ++ .type = MT_DEVICE ++ }, ++ [1] = { /* NOR flash */ ++ .virtual = CMX270_FLASH_VIRT, ++ .pfn = __phys_to_pfn(PXA_CS0_PHYS), ++ .length = (8<<20), /* up to 8 MByte flash */ ++ .type = MT_DEVICE ++ }, ++}; ++ ++static struct pxafb_mode_info sharp_vga_tft_mode = { ++ .pixclock = 38461, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 60, ++ .vsync_len = 2, ++ .left_margin = 72, ++ .upper_margin = 32, ++ .right_margin = 72, ++ .lower_margin = 10, ++ .sync = 0, ++}; ++ ++ ++static struct pxafb_mach_info cmx270_pxafb_info = { ++ .num_modes = 1, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x01) | ++ LCCR3_Acb(0xff)), ++ .modes = &sharp_vga_tft_mode ++}; ++ ++#if 0 ++/*********************** Display definitions ****************************/ ++static int mtype=MTYPE_CRT640x480; ++static int mbpp=-1; ++ ++struct cmx270_display_info { ++ struct pxafb_mach_info fb_info; ++ char *display_name; ++}; ++ ++static struct __initdata cmx270_display_info cmx270_displays[] = { ++ [ MTYPE_STN320x240 ] = { ++ .fb_info = { ++ .pixclock = 76923, ++ .bpp = 8, ++ .xres = 320, ++ .yres = 240, ++ .hsync_len = 3, ++ .vsync_len = 2, ++ .left_margin = 3, ++ .upper_margin = 0, ++ .right_margin = 3, ++ .lower_margin = 0, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .lccr0 = 0, ++ .lccr3 = (LCCR3_PixClkDiv(0x03) | ++ LCCR3_Acb(0xff) | ++ LCCR3_PCP), ++ .cmap_greyscale = 0, ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++ }, ++ .display_name = "STN 320x240", ++ }, ++ [ MTYPE_TFT640x480 ] = { ++ .fb_info = { ++ .pixclock = 38461, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 60, ++ .vsync_len = 2, ++ .left_margin = 70, ++ .upper_margin = 10, ++ .right_margin = 70, ++ .lower_margin = 5, ++ .sync = 0, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x01) | ++ LCCR3_Acb(0xff) | ++ LCCR3_PCP), ++ .cmap_greyscale = 0, ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++ }, ++ .display_name = "TFT 640x480", ++ }, ++ [ MTYPE_CRT640x480 ] = { ++ .fb_info = { ++ .pixclock = 38461, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 63, ++ .vsync_len = 2, ++ .left_margin = 81, ++ .upper_margin = 33, ++ .right_margin = 16, ++ .lower_margin = 10, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x01) | ++ LCCR3_Acb(0xff)), ++ .cmap_greyscale = 0, ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++ }, ++ .display_name = "CRT 640x480", ++ }, ++ [ MTYPE_CRT800x600 ] = { ++ .fb_info = { ++ .pixclock = 28846, ++ .bpp = 8, ++ .xres = 800, ++ .yres = 600, ++ .hsync_len = 63, ++ .vsync_len = 2, ++ .left_margin = 26, ++ .upper_margin = 21, ++ .right_margin = 26, ++ .lower_margin = 11, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x02) | ++ LCCR3_Acb(0xff)), ++ .cmap_greyscale = 0, ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++ }, ++ .display_name = "CRT 800x600", ++ }, ++ [ MTYPE_CRT1024x768 ] = { ++ .fb_info = { ++ .pixclock = 0, ++ .xres = 0, ++ .yres = 0, ++ }, ++ .display_name = "CRT 1024x768", ++ }, ++ [ MTYPE_USER_DEFINED ] = { ++ .fb_info = { ++ .pixclock = LCD_PIXCLOCK, ++ .bpp = LCD_BPP, ++ .xres = LCD_XRES, ++ .yres = LCD_YRES, ++ .hsync_len = LCD_HORIZONTAL_SYNC_PULSE_WIDTH, ++ .vsync_len = LCD_VERTICAL_SYNC_PULSE_WIDTH, ++ .left_margin = LCD_BEGIN_OF_LINE_WAIT_COUNT, ++ .upper_margin = LCD_BEGIN_FRAME_WAIT_COUNT, ++ .right_margin = LCD_END_OF_LINE_WAIT_COUNT, ++ .lower_margin = LCD_END_OF_FRAME_WAIT_COUNT, ++ .sync = LCD_SYNC, ++ .lccr0 = LCD_LCCR0, ++ .lccr3 = LCD_LCCR3, ++ .cmap_greyscale = CMAP_GREYSCALE, ++ .cmap_inverse = CMAP_INVERSE, ++ .cmap_static = CMAP_STATIC, ++ }, ++ .display_name = LCD_NAME, ++ }, ++ [ MTYPE_TFT320x240 ] = { ++ .fb_info = { ++ .pixclock = 134615, ++ .bpp = 16, ++ .xres = 320, ++ .yres = 240, ++ .hsync_len = 63, ++ .vsync_len = 7, ++ .left_margin = 75, ++ .upper_margin = 0, ++ .right_margin = 15, ++ .lower_margin = 15, ++ .sync = 0, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x06) | ++ LCCR3_Acb(0xff) | ++ LCCR3_PCP), ++ .cmap_greyscale = 0, ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++ }, ++ .display_name = "TFT 320x240", ++ }, ++ [ MTYPE_STN640x480 ] = { ++ .fb_info = { ++ .pixclock = 57692, ++ .bpp = 8, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 4, ++ .vsync_len = 2, ++ .left_margin = 10, ++ .upper_margin = 5, ++ .right_margin = 10, ++ .lower_margin = 5, ++ .sync = (FB_SYNC_HOR_HIGH_ACT | ++ FB_SYNC_VERT_HIGH_ACT), ++ .lccr0 = 0, ++ .lccr3 = (LCCR3_PixClkDiv(0x02) | ++ LCCR3_Acb(0xff)), ++ .cmap_greyscale = 0, ++ .cmap_inverse = 0, ++ .cmap_static = 0, ++ }, ++ .display_name = "STN 640x480", ++ }, ++}; ++ ++static int __init monitor_params(char *str) ++{ ++ mtype = simple_strtol(str, NULL, 0); ++ return 1; ++} ++ ++__setup("monitor=", monitor_params); ++ ++static int __init fb_bpp(char *str) ++{ ++ mbpp = simple_strtol(str, NULL, 0); ++ return 1; ++} ++ ++__setup("bpp=", fb_bpp); ++#endif ++ ++/* PXA27x OHCI controller setup */ ++static int cmx270_ohci_init(struct device *dev) ++{ ++ /* Set the Power Control Polarity Low */ ++ UHCHR = (UHCHR | UHCHR_PCPL) & ++ ~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE); ++ ++ return 0; ++} ++ ++static struct pxaohci_platform_data cmx270_ohci_platform_data = { ++ .port_mode = PMM_PERPORT_MODE, ++ .init = cmx270_ohci_init, ++}; ++ ++ ++static int cmx270_mci_init(struct device *dev, irq_handler_t mstone_detect_int, void *data) ++{ ++ int err; ++ ++ /* ++ * setup GPIO for PXA27x MMC controller ++ */ ++ pxa_gpio_mode(GPIO32_MMCCLK_MD); ++ pxa_gpio_mode(GPIO112_MMCCMD_MD); ++ pxa_gpio_mode(GPIO92_MMCDAT0_MD); ++ pxa_gpio_mode(GPIO109_MMCDAT1_MD); ++ pxa_gpio_mode(GPIO110_MMCDAT2_MD); ++ pxa_gpio_mode(GPIO111_MMCDAT3_MD); ++ ++ /* SB-X270 uses GPIO105 as SD power enable */ ++ pxa_gpio_mode(105 | GPIO_OUT); ++ ++ /* card detect IRQ on GPIO 83 */ ++ pxa_gpio_mode(IRQ_TO_GPIO(CMX270_MMC_IRQ)); ++ set_irq_type(CMX270_MMC_IRQ, IRQT_FALLING); ++ ++ err = request_irq(CMX270_MMC_IRQ, mstone_detect_int, IRQF_DISABLED, ++ "MMC card detect", data); ++ if (err) { ++ printk(KERN_ERR "cmx270_mci_init: MMC/SD: can't request MMC card detect IRQ\n"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static void cmx270_mci_setpower(struct device *dev, unsigned int vdd) ++{ ++ struct pxamci_platform_data* p_d = dev->platform_data; ++ ++ if (( 1 << vdd) & p_d->ocr_mask) { ++ printk(KERN_DEBUG "%s: on\n", __FUNCTION__); ++ GPCR(105) = GPIO_bit(105); ++ } else { ++ GPSR(105) = GPIO_bit(105); ++ printk(KERN_DEBUG "%s: off\n", __FUNCTION__); ++ } ++} ++ ++static void cmx270_mci_exit(struct device *dev, void *data) ++{ ++ free_irq(CMX270_MMC_IRQ, data); ++} ++ ++static struct pxamci_platform_data cmx270_mci_platform_data = { ++ .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, ++ .init = cmx270_mci_init, ++ .setpower = cmx270_mci_setpower, ++ .exit = cmx270_mci_exit, ++}; ++ ++ ++#ifdef CONFIG_PM ++/* timeout for RTC wakeup */ ++unsigned int cmx270_suspend_timeout; ++ ++static ssize_t timeout_show(struct subsystem * subsys, char * buf) ++{ ++ char * s = buf; ++ ++ s += sprintf(s,"%d seconds\n", cmx270_suspend_timeout); ++ return (s - buf); ++} ++ ++static ssize_t timeout_store(struct subsystem * subsys, const char * buf, size_t n) ++{ ++ char *endp = 0; ++ int timeout; ++ ++ timeout = simple_strtoul(buf, &endp, 10); ++ if ( *endp && *endp != '\n') ++ return -EINVAL; ++ ++ cmx270_suspend_timeout = timeout; ++ return n; ++} ++ ++static struct subsys_attribute timeout_attr = { ++ .attr = { ++ .name = __stringify(timeout), ++ .mode = 0644, ++ }, ++ .show = timeout_show, ++ .store = timeout_store, ++}; ++ ++static struct attribute * g[] = { ++ &timeout_attr.attr, ++ NULL, ++}; ++ ++static struct attribute_group attr_group = { ++ .attrs = g, ++}; ++ ++extern struct subsystem power_subsys; ++static unsigned long sleep_save_ite[10]; ++static unsigned long sleep_save_msc[10]; ++ ++static int cmx270_suspend(struct sys_device *dev, pm_message_t state) ++{ ++ /* save MSC registers */ ++ sleep_save_msc[0] = MSC0; ++ sleep_save_msc[1] = MSC1; ++ sleep_save_msc[2] = MSC2; ++ ++ /* setup power saving mode registers */ ++ PCFR = 0x0; ++ PSLR = 0xff400000; ++ PMCR = 0x00000005; ++ PWER = 0x80000000; ++ PFER = 0x00000000; ++ PRER = 0x00000000; ++ PGSR0 = 0xC0018800; ++ PGSR1 = 0x004F0002; ++ PGSR2 = 0x6021C000; ++ PGSR3 = 0x00020000; ++ ++ if ( cmx270_suspend_timeout ) { ++ RTAR = RCNR + cmx270_suspend_timeout; ++ cmx270_suspend_timeout = 0; ++ } ++ ++ return 0; ++} ++ ++static int cmx270_resume(struct sys_device *dev) ++{ ++ /* restore MSC registers */ ++ MSC0 = sleep_save_msc[0]; ++ MSC1 = sleep_save_msc[1]; ++ MSC2 = sleep_save_msc[2]; ++ ++ return 0; ++} ++ ++static struct sysdev_class cmx270_pm_sysclass = { ++ set_kset_name("pm"), ++ .resume = cmx270_resume, ++ .suspend = cmx270_suspend, ++}; ++ ++static struct sys_device cmx270_pm_device = { ++ .cls = &cmx270_pm_sysclass, ++}; ++ ++static int __init cmx270_pm_init(void) ++{ ++ int error; ++ error = sysdev_class_register(&cmx270_pm_sysclass); ++ if (error == 0) ++ error = sysdev_register(&cmx270_pm_device); ++ ++ error = sysfs_create_group(&power_subsys.kset.kobj,&attr_group); ++ return error; ++} ++#else ++static int __init cmx270_pm_init(void) { return 0; } ++#endif ++ ++/* SA1111 compatibiliy 8 bit read register needed for proper function ++ of ITE8152 UART */ ++#define MEMC_SA1111 __REG(0x48000064) ++ ++static void __init cmx270_init(void) ++{ ++ /* set display timings for VGA 640x480 by default */ ++ //struct cmx270_display_info *tfbi = &cmx270_displays[2]; ++ ++ MEMC_SA1111 = 0x3c; ++ ++ cmx270_pm_init(); ++ ++#if 0 ++ ++ if ( mtype >= 0 && mtype < ARRAY_SIZE(cmx270_displays) ) ++ ++ /* use default instead of unsupported displays */ ++ if ( tfbi->fb_info.pixclock == 0 && ++ tfbi->fb_info.xres == 0 && ++ tfbi->fb_info.yres == 0 ) { ++ printk(KERN_WARNING "CM-X270 does not support %s display\n", cmx270_displays[mtype].display_name); ++ tfbi = &cmx270_displays[2]; ++ } ++ ++ /* setup color depth */ ++ if( mtype == MTYPE_USER_DEFINED ) { ++ mbpp = tfbi->fb_info.bpp; ++ } ++ if( mbpp > 0 ) { ++ if( (mbpp!=1) && (mbpp!=2) && (mbpp!=4) && ++ (mbpp!=8) && (mbpp!=16)) { ++ printk(KERN_WARNING "Illegal BPP value " ++ "supplied, leaving default\n"); ++ mbpp = 8; ++ } ++ } ++ else mbpp = 8; ++ tfbi->fb_info.bpp = mbpp; ++ ++ printk(KERN_INFO "Running a %s display with %d bits per pixel\n", ++ tfbi->display_name, tfbi->fb_info.bpp); ++ set_pxa_fb_info(&tfbi->fb_info); ++#endif ++ ++ set_pxa_fb_info(&cmx270_pxafb_info); ++ ++ /* register CM-X270 platform devices */ ++ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); ++ ++ /* set MCI and OHCI platform parameters */ ++ pxa_set_mci_info(&cmx270_mci_platform_data); ++ pxa_set_ohci_info(&cmx270_ohci_platform_data); ++ ++ /* This enables the STUART */ ++ pxa_gpio_mode(GPIO46_STRXD_MD); ++ pxa_gpio_mode(GPIO47_STTXD_MD); ++ ++ /* This enables the BTUART */ ++ pxa_gpio_mode(GPIO42_BTRXD_MD); ++ pxa_gpio_mode(GPIO43_BTTXD_MD); ++ pxa_gpio_mode(GPIO44_BTCTS_MD); ++ pxa_gpio_mode(GPIO45_BTRTS_MD); ++} ++ ++int machine_is_cmx270l(void) ++{ ++ int is_l = 0; ++ volatile unsigned char *flash = ++ (volatile unsigned char *)(CMX270_FLASH_VIRT + 0x3ffe8UL); ++ char rev[10]; ++ int i; ++ ++ memset(rev, 0, 10); ++ for ( i = 0; i < 8; i++ ) ++ rev[i] = flash[i]; ++ if ( (rev[6] - '0') > 1 ) ++ is_l = 1; ++ ++ printk(KERN_DEBUG "%s: revision read: %s, is_l = %d\n", ++ __FUNCTION__, rev, is_l); ++ ++ return is_l; ++} ++ ++static void __init cmx270_init_irq(void) ++{ ++ pxa_init_irq(); ++ ++ /* LED and NAND GPIOs should not be probed for IRQ */ ++ set_irq_flags(IRQ_GPIO(11), 0); ++ set_irq_flags(IRQ_GPIO(89), 0); ++ set_irq_flags(IRQ_GPIO(93), 0); ++ set_irq_flags(IRQ_GPIO(94), 0); ++ ++ /* Setup interrupt for dm9000 */ ++ pxa_gpio_mode(IRQ_TO_GPIO(CMX270_ETHIRQ)); ++ set_irq_type(CMX270_ETHIRQ, IRQT_RISING); ++ ++} ++ ++static void __init cmx270_map_io(void) ++{ ++ pxa_map_io(); ++ iotable_init(cmx270_io_desc, ARRAY_SIZE(cmx270_io_desc)); ++} ++ ++ ++MACHINE_START(ARMCORE, "Compulab CM-x270") ++ .boot_params = 0xa0000100, ++ .phys_io = 0x40000000, ++ .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, ++ .map_io = cmx270_map_io, ++ .init_irq = cmx270_init_irq, ++ .timer = &pxa_timer, ++ .init_machine = cmx270_init, ++MACHINE_END ++ +diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h +new file mode 100644 +index 0000000000000000000000000000000000000000..36f9917d55168f5498617fee7ed1b19bf9d3051b +--- /dev/null ++++ b/include/asm-arm/arch-pxa/cm-x270.h +@@ -0,0 +1,72 @@ ++/* ++ * linux/include/asm/arch-pxa/armcore.h ++ * ++ * Compulab Ltd., 2003 ++ * ++ * ARMCore registers ++ */ ++ ++//#include ++ ++#define CMX270_CS1_PHYS (PXA_CS1_PHYS) ++#define MARATHON_PHYS (PXA_CS2_PHYS) ++#define CMX270_IDE104_PHYS (PXA_CS3_PHYS) ++#define CMX270_IT8152_PHYS (PXA_CS4_PHYS) ++ ++#define PXA_CS_SIZE (64*1024*1024) ++ ++/* Virtual map */ ++ ++#define CMX270_VIRT_BASE (0xe8000000) ++ ++#define CMX270_IT8152_VIRT (CMX270_VIRT_BASE) ++#define CMX270_IDE104_VIRT (CMX270_IT8152_VIRT + PXA_CS_SIZE) ++ ++ ++/* GPIO related definitions */ ++#define GPIO_IT8152_IRQ (22) ++#define GPIO_RED_LED (93) ++#define GPIO_GREEN_LED (94) ++ ++ ++#define IRQ_GPIO_IT8152_IRQ IRQ_GPIO(GPIO_IT8152_IRQ) ++#define PME_IRQ IRQ_GPIO(0) ++#define CMX270_IDE_IRQ IRQ_GPIO(100) ++#define CMX270_GPIRQ1 IRQ_GPIO(101) ++#define CMX270_TOUCHIRQ IRQ_GPIO(96) ++#define CMX270_ETHIRQ IRQ_GPIO(10) ++#define CMX270_GFXIRQ IRQ_GPIO(95) ++#define CMX270_NANDIRQ IRQ_GPIO(89) ++#define CMX270_MMC_IRQ IRQ_GPIO(83) ++ ++/* LED macros */ ++#define CMX270_RED_ON() GPCR(GPIO_RED_LED) = GPIO_bit(GPIO_RED_LED) ++#define CMX270_RED_OFF() GPSR(GPIO_RED_LED) = GPIO_bit(GPIO_RED_LED) ++#define CMX270_GREEN_ON() GPCR(GPIO_GREEN_LED) = GPIO_bit(GPIO_GREEN_LED) ++#define CMX270_GREEN_OFF() GPSR(GPIO_GREEN_LED) = GPIO_bit(GPIO_GREEN_LED) ++ ++/* PCMCIA related definitions */ ++#define PCC_DETECT(x) (GPLR(84 - (x)) & GPIO_bit(84 - (x))) ++#define PCC_READY(x) (GPLR(82 - (x)) & GPIO_bit(81 - (x))) ++ ++#define PCMCIA_S0_CD_VALID IRQ_GPIO(84) ++#define PCMCIA_S0_CD_VALID_EDGE GPIO_BOTH_EDGES ++ ++#define PCMCIA_S1_CD_VALID IRQ_GPIO(83) ++#define PCMCIA_S1_CD_VALID_EDGE GPIO_BOTH_EDGES ++ ++#define PCMCIA_S0_RDYINT IRQ_GPIO(82) ++#define PCMCIA_S1_RDYINT IRQ_GPIO(81) ++ ++#define PCMCIA_RESET_GPIO 53 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +1.4.4.4 + diff --git a/packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch b/packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch new file mode 100644 index 0000000000..b96ae410f5 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch @@ -0,0 +1,38 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri Mar 16 23:23:10 2007 -0400 +Subject: [PATCH] ramdisk_load + +initramfs loading fix + +--- + + init/initramfs.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +base 32abeb7a135309651fabb41ebfab98c9f6b67dbf +last a34beb5936e5819d8b2d51b153434825700463ef +diff --git a/init/initramfs.c b/init/initramfs.c +index 4fa0f7977de1a16db501d91c3c9b062cb7898c2d..545d1cd9dfffeb88835cc2f219db51497c963449 100644 +--- a/init/initramfs.c ++++ b/init/initramfs.c +@@ -535,6 +535,16 @@ static int __init populate_rootfs(void) + #ifdef CONFIG_BLK_DEV_INITRD + if (initrd_start) { + #ifdef CONFIG_BLK_DEV_RAM ++ ++ /* hack to make initramfs work because the ++ * compulab BL does not zero out the ++ * initrd memory ++ */ ++ int initrd_size = *(int *)(0xef9c0000); ++ initrd_end = initrd_start + initrd_size; ++ //printk("CLIFF: initrd_start = 0x%x\n", initrd_start); ++ //printk("CLIFF: initrd_end = 0x%x\n", initrd_end); ++ + int fd; + printk(KERN_INFO "checking if image is initramfs..."); + err = unpack_to_rootfs((char *)initrd_start, +-- +1.4.4.4 + diff --git a/packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch b/packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch new file mode 100644 index 0000000000..f8e05c3c22 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch @@ -0,0 +1,324 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Tue Apr 3 11:38:59 2007 -0400 +Subject: [PATCH] nand driver + +2.6.20 NAND flash driver for cm-x270 + +--- + + drivers/mtd/nand/Kconfig | 4 + + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/cmx270-nand.c | 271 ++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 276 insertions(+), 0 deletions(-) + create mode 100644 drivers/mtd/nand/cmx270-nand.c + +base a34beb5936e5819d8b2d51b153434825700463ef +last deaa2960bd8fb1f706a935cd7a87321977e6f568 +diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig +index 358f55a82dbe4ebb73b1b0ee460063a6145e3f0e..c80272bcc69b6e13ab0c4403e4635a8a4076dc6c 100644 +--- a/drivers/mtd/nand/Kconfig ++++ b/drivers/mtd/nand/Kconfig +@@ -247,6 +247,10 @@ config MTD_NAND_AT91 + help + Enables support for NAND Flash / Smart Media Card interface + on Atmel AT91 processors. ++ ++config MTD_NAND_CM_X270 ++ tristate "Support for NAND Flash on CompuLab CM-X270" ++ depends on MTD_NAND && ARCH_PXA + + config MTD_NAND_NANDSIM + tristate "Support for NAND Flash Simulator" +diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile +index f7a53f0b70177451680402a2c2cce4c98991cd6e..d5abbca6d5ae18e287af0b02075f99838d35dc85 100644 +--- a/drivers/mtd/nand/Makefile ++++ b/drivers/mtd/nand/Makefile +@@ -24,6 +24,7 @@ obj-$(CONFIG_MTD_NAND_NANDSIM) += nandsim.o + obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o + obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o + obj-$(CONFIG_MTD_NAND_AT91) += at91_nand.o ++obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270-nand.o + + nand-objs := nand_base.o nand_bbt.o + cafe_nand-objs := cafe.o cafe_ecc.o +diff --git a/drivers/mtd/nand/cmx270-nand.c b/drivers/mtd/nand/cmx270-nand.c +new file mode 100644 +index 0000000000000000000000000000000000000000..1cd531e610dee846e246b4b1d56bb4119939682b +--- /dev/null ++++ b/drivers/mtd/nand/cmx270-nand.c +@@ -0,0 +1,271 @@ ++/* ++ * drivers/mtd/nand/cmx270-nand.c ++ * ++ * Copyright (C) 2005 Compulab, Ltd. (mike@compulab.co.il) ++ * 2007 BEC Systems, LLC (cbrake@bec-systems.com) ++ * - updated to 2.6.20 NAND API ++ * ++ * Derived from drivers/mtd/nand/h1910.c ++ * Copyright (C) 2002 Marius Gröger (mag@sysgo.de) ++ * Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de) ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Overview: ++ * This is a device driver for the NAND flash device found on the ++ * CM-X270 board. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define GPIO_NAND_CS (11) ++#define GPIO_NAND_RB (89) ++ ++#define DRAIN_WB() \ ++ do { \ ++ unsigned char dummy; \ ++ asm volatile ("mcr p15, 0, r0, c7, c10, 4":::"r0"); \ ++ dummy=*((volatile unsigned char*)UNCACHED_ADDR); \ ++ } while(0); ++ ++/* ++ * MTD structure for CM-X270 board ++ */ ++static struct mtd_info *cmx270_nand_mtd = NULL; ++ ++/* ++ * Module stuff ++ */ ++ ++#ifdef CONFIG_MTD_PARTITIONS ++/* ++ * Define static partitions for flash device ++ */ ++static struct mtd_partition partition_info[] = { ++ { ++ .name = "app", ++ .offset = 0, ++ .size = 64*1024*1024 ++ }, ++ { ++ .name = "data", ++ .offset = MTDPART_OFS_APPEND, ++ .size = MTDPART_SIZ_FULL ++ } ++}; ++ ++#define NUM_PARTITIONS ARRAY_SIZE(partition_info) ++ ++#endif ++ ++ ++static u_char cmx270_read_byte(struct mtd_info *mtd) ++{ ++ struct nand_chip *this = mtd->priv; ++ return (readl(this->IO_ADDR_R) >> 16); ++} ++ ++static void cmx270_write_byte(struct mtd_info *mtd, u_char byte) ++{ ++ struct nand_chip *this = mtd->priv; ++ writel((byte << 16), this->IO_ADDR_W); ++} ++ ++static void cmx270_write_buf(struct mtd_info *mtd, const u_char *buf, int len) ++{ ++ int i; ++ struct nand_chip *this = mtd->priv; ++ ++ for (i=0; iIO_ADDR_W); ++ } ++} ++ ++static void cmx270_read_buf(struct mtd_info *mtd, u_char *buf, int len) ++{ ++ int i; ++ struct nand_chip *this = mtd->priv; ++ ++ for (i=0; iIO_ADDR_R) >> 16; ++ } ++} ++ ++static int cmx270_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) ++{ ++ int i; ++ struct nand_chip *this = mtd->priv; ++ ++ for (i=0; iIO_ADDR_R) >> 16) ) ++ return -EFAULT; ++ } ++ ++ return 0; ++} ++ ++static inline void nand_cs_on(void) ++{ ++ GPCR(GPIO_NAND_CS) = GPIO_bit(GPIO_NAND_CS); ++} ++ ++static void nand_cs_off(void) ++{ ++ DRAIN_WB(); ++ ++ GPSR(GPIO_NAND_CS) = GPIO_bit(GPIO_NAND_CS); ++} ++ ++/* ++ * hardware specific access to control-lines ++ * ++ * NAND_NCE: bit 0 - GPIO_NAND_CS ++ * NAND_CLE: bit 1 - address bit 2 ++ * NAND_ALE: bit 2 - address bit 3 ++ */ ++static void cmx270_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) ++{ ++ struct nand_chip* chip = mtd->priv; ++ ++ DRAIN_WB(); ++ ++ if (ctrl & NAND_CTRL_CHANGE) { ++ if (ctrl & NAND_NCE) nand_cs_on(); ++ else nand_cs_off(); ++ } ++ ++ ++ if (cmd != NAND_CMD_NONE) { ++ writel(cmd << 16, (unsigned int)(chip->IO_ADDR_W) | ((ctrl & 0x6) << 1 )); ++ } ++ ++ DRAIN_WB(); ++} ++ ++/* ++ * read device ready pin ++ */ ++static int cmx270_device_ready(struct mtd_info *mtd) ++{ ++ DRAIN_WB(); ++ return ( GPLR(GPIO_NAND_RB) & GPIO_bit(GPIO_NAND_RB) ); ++} ++ ++/* ++ * Main initialization routine ++ */ ++static int __init cmx270_init (void) ++{ ++ struct nand_chip *this; ++ const char *part_type = 0; ++ int mtd_parts_nb = 0; ++ struct mtd_partition *mtd_parts = 0; ++ static unsigned int nandaddr = 0; ++ ++ ++ /* Allocate memory for MTD device structure and private data */ ++ cmx270_nand_mtd = kmalloc(sizeof(struct mtd_info) + ++ sizeof(struct nand_chip), ++ GFP_KERNEL); ++ if (!cmx270_nand_mtd) { ++ printk("Unable to allocate CM-X270 NAND MTD device structure.\n"); ++ return -ENOMEM; ++ } ++ ++ nandaddr = (volatile unsigned int)ioremap(PXA_CS1_PHYS, 100); ++ ++ /* Get pointer to private data */ ++ this = (struct nand_chip *) (&cmx270_nand_mtd[1]); ++ ++ /* Initialize structures */ ++ memset((char *) cmx270_nand_mtd, 0, sizeof(struct mtd_info)); ++ memset((char *) this, 0, sizeof(struct nand_chip)); ++ ++ /* Link the private data with the MTD structure */ ++ cmx270_nand_mtd->priv = this; ++ cmx270_nand_mtd->owner = THIS_MODULE; ++ ++ /* insert callbacks */ ++ this->IO_ADDR_R = (void __iomem *)nandaddr; ++ this->IO_ADDR_W = (void __iomem *)nandaddr; ++ this->cmd_ctrl = cmx270_hwcontrol; ++/* this->dev_ready = cmx270_device_ready; /\* unknown whether that was correct or not so we will just do it like this *\/ */ ++ ++ /* 15 us command delay time */ ++ this->chip_delay = 50; ++ this->ecc.mode = NAND_ECC_SOFT; ++ ++ /* read/write functions */ ++ this->read_byte = cmx270_read_byte; ++ //this->write_byte = cmx270_write_byte; ++ this->read_buf = cmx270_read_buf; ++ this->write_buf = cmx270_write_buf; ++ this->verify_buf = cmx270_verify_buf; ++ ++ /* Scan to find existence of the device */ ++ if (nand_scan (cmx270_nand_mtd, 1)) { ++ printk(KERN_NOTICE "No NAND device - returning -ENXIO\n"); ++ iounmap((void*)nandaddr); ++ kfree (cmx270_nand_mtd); ++ return -ENXIO; ++ } ++ ++//#ifdef CONFIG_MTD_CMDLINE_PARTS ++#if 0 ++ mtd_parts_nb = parse_cmdline_partitions(cmx270_nand_mtd, &mtd_parts, ++ "cmx270"); ++ if (mtd_parts_nb > 0) ++ part_type = "command line"; ++ else ++ mtd_parts_nb = 0; ++#endif ++ if (mtd_parts_nb == 0) ++ { ++ mtd_parts = partition_info; ++ mtd_parts_nb = NUM_PARTITIONS; ++ part_type = "static"; ++ } ++ ++ /* Register the partitions */ ++ printk(KERN_NOTICE "Using %s partition definition\n", part_type); ++ add_mtd_partitions(cmx270_nand_mtd, mtd_parts, mtd_parts_nb); ++ ++ /* Return happy */ ++ return 0; ++} ++module_init(cmx270_init); ++ ++/* ++ * Clean up routine ++ */ ++static void __exit cmx270_cleanup (void) ++{ ++ struct nand_chip *this; ++ ++ this = (struct nand_chip *) (&cmx270_nand_mtd[1]); ++ iounmap(this->IO_ADDR_R); ++ ++ /* Release resources, unregister device */ ++ nand_release (cmx270_nand_mtd); ++ ++ /* Free the MTD device structure */ ++ kfree (cmx270_nand_mtd); ++} ++module_exit(cmx270_cleanup); ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Mike Rapoport "); ++MODULE_DESCRIPTION("NAND flash driver for Compulab CM-X270 Core"); +-- +1.4.4.4 + diff --git a/packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch b/packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch new file mode 100644 index 0000000000..87c46d7144 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch @@ -0,0 +1,41 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Tue Apr 3 22:16:15 2007 -0400 +Subject: [PATCH] mmcsd_large_cards r0 + +large card patch + +--- + + drivers/mmc/mmc_block.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +base deaa2960bd8fb1f706a935cd7a87321977e6f568 +last b6144d28fde6225f49d1d56e49b333b7ff11d8dd +diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c +index 87713572293f0d3044e077e1b9944617dc14ce1f..8ebf6c6d672236ee23081769aebd7aaffea70d1a 100644 +--- a/drivers/mmc/mmc_block.c ++++ b/drivers/mmc/mmc_block.c +@@ -406,6 +406,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + { + struct mmc_blk_data *md; + int devidx, ret; ++ unsigned long cap; + + devidx = find_first_zero_bit(dev_use, MMC_NUM_MINORS); + if (devidx >= MMC_NUM_MINORS) +@@ -471,6 +472,11 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + + sprintf(md->disk->disk_name, "mmcblk%d", devidx); + ++ if (card->csd.read_blkbits > 9) ++ md->block_bits = 9; ++ else ++ md->block_bits = card->csd.read_blkbits; ++ + blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits); + + /* +-- +1.4.4.4 + diff --git a/packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch b/packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch new file mode 100644 index 0000000000..c1cbcec8f0 --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch @@ -0,0 +1,35 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Tue Apr 3 22:17:25 2007 -0400 +Subject: [PATCH] mmcsd_no_scr_check r0 + +mmc_no_sd check + +--- + + drivers/mmc/mmc.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +base b6144d28fde6225f49d1d56e49b333b7ff11d8dd +last 8139d6c8b46a7a041094753eced2d46e006d93ab +diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c +index 6f2a282e2b9759c0511cf5501a0bd4e9bd501e3f..b0c830c65a27f5579a2d4f67345e4d9bd1f0fe24 100644 +--- a/drivers/mmc/mmc.c ++++ b/drivers/mmc/mmc.c +@@ -670,9 +670,11 @@ static void mmc_decode_scr(struct mmc_card *card) + + scr_struct = UNSTUFF_BITS(resp, 60, 4); + if (scr_struct != 0) { +- printk("%s: unrecognised SCR structure version %d\n", ++ printk("%s: Warning - unrecognised SCR structure version %d\n", + mmc_hostname(card->host), scr_struct); +- mmc_card_set_bad(card); ++ //mmc_card_set_bad(card); ++ scr->bus_widths = 0; ++ scr->sda_vsn = 0; + return; + } + +-- +1.4.4.4 + diff --git a/packages/linux/compulab-pxa270-2.6.20/defconfig b/packages/linux/compulab-pxa270-2.6.20/defconfig new file mode 100644 index 0000000000..d7a62f274e --- /dev/null +++ b/packages/linux/compulab-pxa270-2.6.20/defconfig @@ -0,0 +1,1188 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.20 +# Tue Apr 3 23:39:41 2007 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="-cm-x270" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=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 +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +CONFIG_CM_X270=y + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +CONFIG_MACH_ARMCORE=y +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_ARMCORE_REV12=y +# CONFIG_ARMCORE_REV11 is not set +CONFIG_SVS_POWER=y +CONFIG_PXA27x=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# +CONFIG_PROC_GPIO=y + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +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_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS1,38400 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root)" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=0x0 +CONFIG_MTD_PHYSMAP_LEN=0x400000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_SHARPSL is not set +CONFIG_MTD_NAND_CM_X270=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_SMC91X is not set +CONFIG_DM9000=y +# CONFIG_SMC911X is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# HID Devices +# +CONFIG_HID=y + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_PXA=m +# CONFIG_MMC_TIFM_SD is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=m +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=m +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/compulab-pxa270_2.6.20.bb b/packages/linux/compulab-pxa270_2.6.20.bb new file mode 100644 index 0000000000..1897073d4d --- /dev/null +++ b/packages/linux/compulab-pxa270_2.6.20.bb @@ -0,0 +1,61 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for the Compulab PXA270 system" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ + file://0001-gitignore.patch;patch=1 \ + file://0002-cm-x270-base.patch;patch=1 \ + file://0003-ramdisk_load.patch;patch=1 \ + file://0004-nand-driver.patch;patch=1 \ + file://0005-mmcsd_large_cards-r0.patch;patch=1 \ + file://0006-mmcsd_no_scr_check-r0.patch;patch=1 \ + file://defconfig \ + " + +# Note, for 2.6.20, we are no longer using the compulab binary +# flash driver -- use JFFS2 instead + + +S = "${WORKDIR}/linux-2.6.20" + +COMPATIBLE_HOST = 'arm.*-linux' + +inherit kernel +inherit package + +ARCH = "arm" +KERNEL_IMAGETYPE = "zImage" + +FILES_kernel-image = "" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + +do_deploy() { + KNAME=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME} + # Create an image file that has the size prepended (used by cm-x270 BL) + # The following can only be done on a little endian machine + # note, the following does not work on all machines as it requires a + # recent version of coreutils (>= 6.0). The correct solution is to code + # the following in Python instead + #size=$(stat --printf=%s ${KNAME}) + #size_=$(printf '\%03o'\ + #$((size & 0x000000FF))\ + #$((size>>8 & 0x000000FF))\ + #$((size>>16 & 0x000000FF))\ + #$((size>>24 & 0x000000FF))) + #size_=${size_}'\c' + #echo -e $size_ > ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img + #cat ${KNAME} >> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + +COMPATIBLE_MACHINE = "compulab-pxa270" + -- cgit v1.2.3 From 6d8a683342e9c2881bd29044b5512f4ec047d414 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Wed, 4 Apr 2007 12:44:07 +0000 Subject: compulab-pxa270 2.6.16: remove image creation code as it does not work on all distros --- packages/linux/compulab-pxa270_2.6.16.bb | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb index 928bde8f6a..6e09281546 100644 --- a/packages/linux/compulab-pxa270_2.6.16.bb +++ b/packages/linux/compulab-pxa270_2.6.16.bb @@ -3,11 +3,6 @@ DESCRIPTION = "Linux kernel for the Compulab PXA270 system" LICENSE = "GPL" PR = "r3" -# coreutils is required for the stat command which is used -# to create the programming images used with USB. Version -# >= 6.0 is required. -DEPENDS = "coreutils-native" - # Note, the compulab package contains a binary NAND driver that is not # EABI compatible @@ -39,15 +34,18 @@ do_deploy() { install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME} # Create an image file that has the size prepended (used by cm-x270 BL) # The following can only be done on a little endian machine - size=$(stat --printf=%s ${KNAME}) - size_=$(printf '\%03o'\ - $((size & 0x000000FF))\ - $((size>>8 & 0x000000FF))\ - $((size>>16 & 0x000000FF))\ - $((size>>24 & 0x000000FF))) - size_=${size_}'\c' - echo -e $size_ > ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img - cat ${KNAME} >> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img + # the following does not work on all computers as it requires a recent + # version of coreutils (>= 6.0). We will eventually replace the following + # with python code. + #size=$(stat --printf=%s ${KNAME}) + #size_=$(printf '\%03o'\ + #$((size & 0x000000FF))\ + #$((size>>8 & 0x000000FF))\ + #$((size>>16 & 0x000000FF))\ + #$((size>>24 & 0x000000FF))) + #size_=${size_}'\c' + #echo -e $size_ > ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img + #cat ${KNAME} >> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img } do_deploy[dirs] = "${S}" -- cgit v1.2.3 From 10a4ae270e88fc15be3c3b4feeb3b34fd125cf63 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 4 Apr 2007 16:16:47 +0000 Subject: zip: added DESCRIPTION, cleaned recipes (from Poky) --- packages/zip/zip-native_2.32.bb | 5 +++-- packages/zip/zip.inc | 5 ++++- packages/zip/zip_2.32.bb | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb index fde61efcb7..cfa4272378 100644 --- a/packages/zip/zip-native_2.32.bb +++ b/packages/zip/zip-native_2.32.bb @@ -1,6 +1,7 @@ -SECTION = "console/utils" -inherit native require zip_${PV}.bb + +inherit native + S = "${WORKDIR}/zip-${PV}" do_stage() { diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc index b66b4b217f..8d04bd5f61 100644 --- a/packages/zip/zip.inc +++ b/packages/zip/zip.inc @@ -1,6 +1,9 @@ +DESCRIPTION = "Archiver for .zip files" SECTION = "console/utils" -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" LICENSE = "Info-ZIP" + +SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" + EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ 'BINFLAGS=0755' 'INSTALL_D=install -d'" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb index b8c4ae9da0..4e01db84c7 100644 --- a/packages/zip/zip_2.32.bb +++ b/packages/zip/zip_2.32.bb @@ -1,2 +1,3 @@ require zip.inc -PR="r0" + +PR="r1" -- cgit v1.2.3 From 02b58300db097bfde9cb7ffbd2e4b651dad9599c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 17:00:37 +0000 Subject: linux-handhelds-2.6: Add 2.6.20-hh6, drop 2.6.20-hh3. --- packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb | 11 +++++++++++ packages/linux/linux-handhelds-2.6_cvs.bb | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb deleted file mode 100644 index b34d4630a0..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index d6ab646606..8d657237b9 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "20" -HHV = "5" +HHV = "6" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" -- cgit v1.2.3 From a5c9f4472ec674e4cf26957902997b5e45c26e56 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 17:11:57 +0000 Subject: linux-handhelds-2.6: Update defconfigs for h3900 & h4000. * Defconfigman-generated static configs from HH.org CVS. --- packages/linux/linux-handhelds-2.6/h3900/defconfig | 248 +++++++++++++---- packages/linux/linux-handhelds-2.6/h4000/defconfig | 297 ++++++++++++++++----- 2 files changed, 428 insertions(+), 117 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index 52b2c8741e..1ad5c9589b 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-hh8 -# Mon Jan 22 05:03:33 2007 +# Linux kernel version: 2.6.20-hh5 +# Sun Apr 1 09:55:56 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -11,6 +11,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y @@ -39,6 +41,7 @@ CONFIG_SYSVIPC=y # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -78,7 +81,9 @@ CONFIG_KMOD=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 @@ -112,6 +117,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set @@ -155,13 +161,16 @@ CONFIG_IPAQ_H3900_BATTERY=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA25x=y @@ -194,6 +203,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_IWMMXT is not set CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y @@ -213,16 +223,7 @@ CONFIG_KEXEC=y # # PCCARD (PCMCIA/CardBus) support # -CONFIG_PCCARD=y -CONFIG_PCMCIA_DEBUG=y -CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y - -# -# PC-card bridges -# -# CONFIG_PCMCIA_PXA2XX is not set +# CONFIG_PCCARD is not set # # Kernel Features @@ -255,7 +256,20 @@ CONFIG_CMDLINE="keepinitrd" # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y # # Floating point emulation @@ -280,8 +294,8 @@ CONFIG_BINFMT_ELF=y # CONFIG_PM=y # CONFIG_PM_LEGACY is not set -CONFIG_PM_DEBUG=y -# CONFIG_DISABLE_CONSOLE_SUSPEND is not set +# CONFIG_PM_DEBUG is not set +CONFIG_DPM_DEBUG=y CONFIG_PM_SYSFS_DEPRECATED=y CONFIG_APM=y @@ -294,12 +308,9 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=m +CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -321,11 +332,12 @@ CONFIG_IP_PNP=y # CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # # IP: Virtual Server Configuration @@ -342,24 +354,12 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_SIP is not set # CONFIG_IP_NF_QUEUE is not set # @@ -398,8 +398,64 @@ CONFIG_IP_NF_IRC=m # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +CONFIG_IRCOMM=y +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=y +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIVHCI is not set # CONFIG_IEEE80211 is not set # @@ -423,7 +479,78 @@ CONFIG_FW_LOADER=y # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set # # Parallel port support @@ -541,6 +668,9 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set CONFIG_TOUCHSCREEN_ASIC2=y +# CONFIG_TOUCHSCREEN_ADC is not set +# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set # CONFIG_INPUT_MISC is not set # @@ -569,8 +699,10 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_PXA_IR=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=32 @@ -589,17 +721,6 @@ CONFIG_LEGACY_PTY_COUNT=32 # CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# - -# -# PCMCIA character devices -# -# CONFIG_SYNCLINK_CS is not set -# CONFIG_CARDMAN_4000 is not set -# CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # @@ -697,7 +818,9 @@ CONFIG_HTC_ASIC3=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +CONFIG_ADC=y # CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_AD7877 is not set CONFIG_ADC_ASIC2=y # CONFIG_TIFM_CORE is not set @@ -715,7 +838,11 @@ CONFIG_LEDS_CLASS=y # # LED Triggers # -# CONFIG_LEDS_TRIGGERS is not set +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HWTIMER=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_SHARED=y # # Multimedia devices @@ -792,6 +919,11 @@ CONFIG_SOUND=y # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +# CONFIG_HID is not set + # # USB support # @@ -831,6 +963,7 @@ CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set # # MMC/SD Card support @@ -940,6 +1073,7 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1021,6 +1155,11 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -1033,6 +1172,8 @@ CONFIG_PRINTK_TIME=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_DETECT_SOFTLOCKUP=y @@ -1048,17 +1189,15 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set CONFIG_DEBUG_VM=y # CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y -# CONFIG_HEADERS_CHECK is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_DEBUG_USER=y -# CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set # # Security options @@ -1074,6 +1213,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y @@ -1082,8 +1222,10 @@ CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_ECB is not set # CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set @@ -1107,6 +1249,7 @@ CONFIG_CRYPTO_DEFLATE=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y @@ -1114,3 +1257,4 @@ CONFIG_CRC32=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index f17812c9f4..f649d6f014 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-hh8 -# Mon Jan 22 05:03:36 2007 +# Linux kernel version: 2.6.20-hh5 +# Mon Apr 2 06:23:29 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -11,6 +11,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y @@ -39,6 +41,7 @@ CONFIG_SYSVIPC=y # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -78,7 +81,9 @@ CONFIG_KMOD=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 @@ -112,6 +117,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set @@ -141,16 +147,17 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_H2200 is not set # CONFIG_MACH_H3900 is not set CONFIG_MACH_H4000=y -# CONFIG_IPAQ_H4000_SERIAL is not set -CONFIG_IPAQ_H4000_UDC=y +CONFIG_MACH_H4300=y +CONFIG_IPAQ_H4000_IRDA=y +# CONFIG_IPAQ_H4000_UDC is not set CONFIG_IPAQ_H4000_LCD=y CONFIG_IPAQ_H4000_BACKLIGHT=y -CONFIG_IPAQ_H4000_TS=y CONFIG_IPAQ_H4000_BUTTONS=y -CONFIG_IPAQ_H4000_BATT=y +# CONFIG_IPAQ_H4000_BATT is not set +CONFIG_IPAQ_H4000_BATTERY=y CONFIG_IPAQ_H4000_LEDS=y CONFIG_IPAQ_H4000_BT=y -CONFIG_IPAQ_H4300_KBD=m +CONFIG_IPAQ_H4300_KBD=y # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set @@ -162,13 +169,16 @@ CONFIG_IPAQ_H4300_KBD=m # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA25x=y @@ -202,6 +212,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_IWMMXT is not set CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y @@ -221,16 +232,7 @@ CONFIG_KEXEC=y # # PCCARD (PCMCIA/CardBus) support # -CONFIG_PCCARD=y -CONFIG_PCMCIA_DEBUG=y -CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y - -# -# PC-card bridges -# -# CONFIG_PCMCIA_PXA2XX is not set +# CONFIG_PCCARD is not set # # Kernel Features @@ -263,7 +265,20 @@ CONFIG_CMDLINE="keepinitrd" # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y # # Floating point emulation @@ -288,8 +303,8 @@ CONFIG_BINFMT_ELF=y # CONFIG_PM=y # CONFIG_PM_LEGACY is not set -CONFIG_PM_DEBUG=y -# CONFIG_DISABLE_CONSOLE_SUSPEND is not set +# CONFIG_PM_DEBUG is not set +CONFIG_DPM_DEBUG=y CONFIG_PM_SYSFS_DEPRECATED=y CONFIG_APM=y @@ -302,12 +317,9 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=m +CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -329,11 +341,12 @@ CONFIG_IP_PNP=y # CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # # IP: Virtual Server Configuration @@ -350,24 +363,12 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_SIP is not set # CONFIG_IP_NF_QUEUE is not set # @@ -406,8 +407,66 @@ CONFIG_IP_NF_IRC=m # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +CONFIG_IRCOMM=y +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=y +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIVHCI is not set # CONFIG_IEEE80211 is not set # @@ -431,7 +490,88 @@ CONFIG_FW_LOADER=y # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_DISKONCHIP=y +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_SHARPSL is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set # # Parallel port support @@ -536,7 +676,20 @@ CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_NAVPOINT is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y +# CONFIG_TOUCHSCREEN_UCB1400 is not set # CONFIG_INPUT_MISC is not set # @@ -565,8 +718,10 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_PXA_IR=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_RS232_SERIAL=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=32 @@ -585,17 +740,7 @@ CONFIG_LEGACY_PTY_COUNT=32 # CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# - -# -# PCMCIA character devices -# -# CONFIG_SYNCLINK_CS is not set -# CONFIG_CARDMAN_4000 is not set -# CONFIG_CARDMAN_4040 is not set +# CONFIG_TIHTC is not set # CONFIG_RAW_DRIVER is not set # @@ -663,7 +808,9 @@ CONFIG_I2C_PXA=m # # Hardware Monitoring - Battery # -# CONFIG_BATTERY_MONITOR is not set +CONFIG_BATTERY_MONITOR=y +CONFIG_ADC_BATTERY=y +CONFIG_APM_POWER=y # # L3 serial bus support @@ -693,7 +840,9 @@ CONFIG_HTC_ASIC3=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +CONFIG_ADC=y CONFIG_ADC_ADS7846_SSP=y +# CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set # @@ -710,7 +859,11 @@ CONFIG_LEDS_ASIC3=y # # LED Triggers # -# CONFIG_LEDS_TRIGGERS is not set +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HWTIMER=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_SHARED=y # # Multimedia devices @@ -808,12 +961,7 @@ CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_H4000=m CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set - -# -# PCMCIA devices -# -# CONFIG_SND_VXPOCKET is not set -# CONFIG_SND_PDAUDIOCF is not set +# CONFIG_SND_RECON is not set # # SoC audio support @@ -826,6 +974,11 @@ CONFIG_SND_UDA1380=m # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +# CONFIG_HID is not set + # # USB support # @@ -865,6 +1018,7 @@ CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set +CONFIG_USB_PXA2XX_GPIO=y # # MMC/SD Card support @@ -974,6 +1128,7 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1055,6 +1210,11 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -1067,6 +1227,8 @@ CONFIG_PRINTK_TIME=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_DETECT_SOFTLOCKUP=y @@ -1082,17 +1244,15 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set CONFIG_DEBUG_VM=y # CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y -# CONFIG_HEADERS_CHECK is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_DEBUG_USER=y -# CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set # # Security options @@ -1108,6 +1268,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y @@ -1116,8 +1277,10 @@ CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_ECB is not set # CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set @@ -1141,10 +1304,14 @@ CONFIG_CRYPTO_DEFLATE=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_DEC16=y CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y -- cgit v1.2.3 From c72b4cf97ca4e3b5cad4b9e51dee4d571b7e5e0a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 4 Apr 2007 17:17:50 +0000 Subject: libol: use binconfig class to install libol-config (from Poky) --- packages/libol/libol_0.3.18.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb index 9484f8e99e..b8ad9b30ac 100644 --- a/packages/libol/libol_0.3.18.bb +++ b/packages/libol/libol_0.3.18.bb @@ -1,15 +1,13 @@ -PR = "r6" +PR = "r7" SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${P}.tar.gz" S = "${WORKDIR}/${PN}-${PV}" -inherit autotools +inherit autotools binconfig do_stage() { - install -d ${STAGING_BINDIR_CROSS} install -d ${STAGING_INCDIR}/libol - install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}/ install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/ ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0 install ${S}/src/*.h ${STAGING_INCDIR}/libol/ -- cgit v1.2.3 From 560b2aad44dfccdba3d5e305cc065bc48b727ec6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 17:36:42 +0000 Subject: linux-handhelds-2.6 2.6.20-hh6: Fake commit to add proper changelog for -hh6. * Changes since -hh5: 1. First set of defconfigman-generated configs was committed, for h3900, h4000, hx4700. These go to *_static_defconfig namespace. Together with them, reference bootlogs were imported, to fight regression stream. 2. htchimalaya, htcblueangel, htcalpine: Revamps for the current kernel. 3. htcathena: Keys support. 4. htchermes: Elaboration, proper clocks setup. 5. h5000: Suspend/resume works. 6. n_tihtc: TI Calypso GSM chipset line discipline (many htc devices). 7. ts-adc-debounce: Make fully configurable via platform_data; turn off debugging by default. 8. pxa-regs.h: More registers added. --- packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb index b34d4630a0..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From e8a033fde25eae94e89c8dd0fa4f0c35ac4e1e2d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 18:05:57 +0000 Subject: linux-handhelds-2.6: Add defconfig for h5000. * Defconfigman-generated, from kernel CVS. --- packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From aecf5148eee745bfcae4de372c741ed1f207af3a Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Wed, 4 Apr 2007 18:40:19 +0000 Subject: packages/gtk-webcore/files/build_silence.patch * remove now obsolete build fix packages/gtk-webcore/osb-nrcit_svn.bb * updated svn recipe to add some more patches packages/gtk-webcore/files/NRCit_HTTP_auth.diff * new patch that fix HTTP AUTH issues packages/gtk-webcore/files/NRCit_unmap.diff * patch to fix redraw issues --- packages/gtk-webcore/files/NRCit_HTTP_auth.diff | 132 ++++++++++++++++++++++++ packages/gtk-webcore/files/NRCit_unmap.diff | 39 +++++++ packages/gtk-webcore/files/build_silence.patch | 16 --- packages/gtk-webcore/osb-nrcit_svn.bb | 2 + 4 files changed, 173 insertions(+), 16 deletions(-) create mode 100644 packages/gtk-webcore/files/NRCit_HTTP_auth.diff create mode 100644 packages/gtk-webcore/files/NRCit_unmap.diff (limited to 'packages') diff --git a/packages/gtk-webcore/files/NRCit_HTTP_auth.diff b/packages/gtk-webcore/files/NRCit_HTTP_auth.diff new file mode 100644 index 0000000000..7a2df30d1d --- /dev/null +++ b/packages/gtk-webcore/files/NRCit_HTTP_auth.diff @@ -0,0 +1,132 @@ +Index: NRCit/src/Http.cpp +=================================================================== +--- NRCit/src/Http.cpp (revision 55) ++++ NRCit/src/Http.cpp (working copy) +@@ -299,3 +299,9 @@ + { + + } ++ ++HttpHeaderWWWAuthenticate::HttpHeaderWWWAuthenticate(const gchar * value) ++ : HttpHeader(WWWAuthenticate, "WWW-Authenticate", value) ++{ ++ ++} +Index: NRCit/src/HttpCurl.cpp +=================================================================== +--- NRCit/src/HttpCurl.cpp (revision 55) ++++ NRCit/src/HttpCurl.cpp (working copy) +@@ -69,7 +69,7 @@ + void setPostData(const gchar * contentType, GByteArray *); + + protected: +- bool shouldAuthenticate() { return m_authenticate; } ++ bool shouldAuthenticate() { return m_need_authenticate; } + + /** Authenticates the request. */ + void doAuth(); +@@ -89,7 +89,7 @@ + + GByteArray * postData; + bool headerEnd; +- bool m_authenticate; ++ bool m_need_authenticate; + + gchar * proxy; + CurlFactory* parent; +@@ -374,7 +374,7 @@ + ,curl_post_last(NULL) + ,postData(NULL) + ,headerEnd(false) +- ,m_authenticate(true) ++ ,m_need_authenticate(true) + ,proxy(NULL) + ,parent(aParent) + ,status(-1) +@@ -438,7 +438,8 @@ + } + + void CurlRequest::doAuth() { +- m_authenticate = m_listener->authenticate(this); ++ m_listener->authenticate(this); ++ m_need_authenticate = false; // set false to go on processing data in CurlRequest::data + } + + void CurlRequest::execute() +@@ -457,6 +458,8 @@ + curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(handle, CURLOPT_MAXREDIRS, 10); + ++ curl_easy_setopt(handle, CURLOPT_AUTOREFERER, 1); ++ + // url ptr must remain valid through the request + curl_easy_setopt(handle, CURLOPT_URL, m_url); + +@@ -534,7 +537,7 @@ + + + // if we are in middle of authenticating, do nothing. +- if (status != HTTP_AUTH_REQUIRED || !m_authenticate) { ++ if (status != HTTP_AUTH_REQUIRED || !m_need_authenticate) { + m_listener->data(this, data, len); + } + } +@@ -570,6 +573,8 @@ + header = new HttpHeaderRefresh(value); + } else if (!strcmp(key, HTTP_SET_COOKIE)) { + header = new HttpHeaderSetCookie(value); ++ } else if (!strcmp(key, HTTP_WWW_AUTHENTICATE)) { ++ header = new HttpHeaderWWWAuthenticate(value); + } else { + header = new HttpHeader(HttpHeader::Unknown, key, value); + } +@@ -584,7 +589,7 @@ + { + HttpHeader *hdr = parseHeader(data, len); + if (hdr) { +- if (hdr->key() == HTTP_WWW_AUTHENTICATE && hdr->value()) ++ if (!strcmp(hdr->key(), HTTP_WWW_AUTHENTICATE) && hdr->value()) + { + const gchar * value = hdr->value(); + char * realm = g_strrstr(value, "realm=" ); +Index: NRCit/src/PageLoadListener.cpp +=================================================================== +--- NRCit/src/PageLoadListener.cpp (revision 55) ++++ NRCit/src/PageLoadListener.cpp (working copy) +@@ -206,8 +206,9 @@ + creds->setCredential(newcred, space); + request->authenticate(newcred.user(), newcred.password()); + } +- if (user) g_free(user); +- if (password) g_free(password); ++ // Do not free these values which are owned by Webi. ++ // if (user) g_free(user); ++ // if (password) g_free(password); + return ret; + } + +Index: NRCit/src/Http.h +=================================================================== +--- NRCit/src/Http.h (revision 55) ++++ NRCit/src/Http.h (working copy) +@@ -165,6 +165,7 @@ + ContentLength, + Refresh, + SetCookie, ++ WWWAuthenticate, + Unknown, + Invalid + }; +@@ -236,6 +237,12 @@ + ~HttpHeaderSetCookie() {} + }; + ++class HttpHeaderWWWAuthenticate : public HttpHeader ++{ ++public: ++ HttpHeaderWWWAuthenticate(const gchar* value); ++ ~HttpHeaderWWWAuthenticate() {} ++}; + + + #endif diff --git a/packages/gtk-webcore/files/NRCit_unmap.diff b/packages/gtk-webcore/files/NRCit_unmap.diff new file mode 100644 index 0000000000..1f2be39922 --- /dev/null +++ b/packages/gtk-webcore/files/NRCit_unmap.diff @@ -0,0 +1,39 @@ +Index: NRCit/src/gtk/webi.cc +=================================================================== +--- NRCit/src/gtk/webi.cc (リビジョン 55) ++++ NRCit/src/gtk/webi.cc (作業コピー) +@@ -50,6 +50,7 @@ + static void _webi_finalize (GObject * self) G_GNUC_UNUSED; + static void _webi_realize (GtkWidget * widget) G_GNUC_UNUSED; + static void _webi_map (GtkWidget * widget) G_GNUC_UNUSED; ++static void _webi_unmap (GtkWidget * widget) G_GNUC_UNUSED; + static gboolean _webi_expose_event (GtkWidget * widget, GdkEventExpose * event) G_GNUC_UNUSED; + static void _webi_size_allocate (GtkWidget * widget, GtkAllocation * allocation) G_GNUC_UNUSED; + +@@ -305,6 +306,7 @@ + g_object_class->finalize = _webi_finalize; + gtk_widget_class->realize = _webi_realize; + gtk_widget_class->map = _webi_map; ++ gtk_widget_class->unmap = _webi_unmap; + gtk_widget_class->expose_event = _webi_expose_event; + gtk_widget_class->size_allocate = _webi_size_allocate; + return; +@@ -736,6 +738,18 @@ + } + #undef PARENT_HANDLER + ++static void ++_webi_unmap (GtkWidget * widget) ++{ ++ ++ g_return_if_fail(widget != NULL); ++ g_return_if_fail(WEBI_IS_WEBI (widget)); ++ ++ GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED); ++ ++ gdk_window_hide(widget->window); ++} ++ + static gboolean + _webi_expose_event (GtkWidget * widget, GdkEventExpose * event) + #define PARENT_HANDLER(___widget,___event) \ diff --git a/packages/gtk-webcore/files/build_silence.patch b/packages/gtk-webcore/files/build_silence.patch index bcef3954ee..ac77e17aac 100644 --- a/packages/gtk-webcore/files/build_silence.patch +++ b/packages/gtk-webcore/files/build_silence.patch @@ -14,19 +14,3 @@ Index: configure.in LDFLAGS="$LDFLAGS $PACKAGE_LIBS $X_LIBS $JSCORE_LIBS \ -nodefaultlibs -lgcc -lc" -Index: kwiq/KWQEvent.cpp -=================================================================== ---- kwiq/KWQEvent.cpp (revision 46) -+++ kwiq/KWQEvent.cpp (working copy) -@@ -759,10 +759,10 @@ - #if 0 - if (state & GDK_MOD1_MASK) - qstate |= Qt::AltButton; --#endif - - if (state & GDK_META_MASK) - qstate |= Qt::MetaButton; -+#endif - - if (isKeypadEvent(event)) - qstate |= Qt::Keypad; diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index 8a11d61996..2060cb26d4 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -10,6 +10,8 @@ PR = "r0" DEPENDS = "curl librsvg osb-nrcore" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \ + file://NRCit_unmap.diff;patch=1 \ + file://NRCit_HTTP_auth.diff;patch=1 \ file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1" S = "${WORKDIR}/NRCit" -- cgit v1.2.3 From f15e0443cf3219ea07f90c5c6a9016fca81218c9 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Wed, 4 Apr 2007 20:59:16 +0000 Subject: packages/gpe-filemanager/gpe-filemanager_svn.bb * add new build recipe for svn gpe-filemanager packages/gpe-filemanager/files/svn-build.patch * patch needed to make gpe-filemanager_svn build --- packages/gpe-filemanager/files/.mtn2git_empty | 0 packages/gpe-filemanager/files/svn-build.patch | 240 ++++++++++++++++++++++++ packages/gpe-filemanager/gpe-filemanager_svn.bb | 18 ++ 3 files changed, 258 insertions(+) create mode 100644 packages/gpe-filemanager/files/.mtn2git_empty create mode 100644 packages/gpe-filemanager/files/svn-build.patch create mode 100644 packages/gpe-filemanager/gpe-filemanager_svn.bb (limited to 'packages') diff --git a/packages/gpe-filemanager/files/.mtn2git_empty b/packages/gpe-filemanager/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-filemanager/files/svn-build.patch b/packages/gpe-filemanager/files/svn-build.patch new file mode 100644 index 0000000000..0e226459cf --- /dev/null +++ b/packages/gpe-filemanager/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-filemanager.orig/Makefile 2007-04-03 15:33:07.466983913 +0300 ++++ gpe-filemanager/Makefile 2007-04-03 15:33:28.216166345 +0300 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = gpe-filemanager + DEBUG = no +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.25 + MIME_PIXMAPS = `cd pixmaps/document-icons && ls *.png` + +diff -Naur gpe-filemanager.orig/build/Makefile.dpkg_ipkg gpe-filemanager/build/Makefile.dpkg_ipkg +--- gpe-filemanager.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-filemanager/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-filemanager.orig/build/Makefile.translation gpe-filemanager/build/Makefile.translation +--- gpe-filemanager.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-filemanager/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s//$(MAINTAINER)/;s//$(BINPACKAGE)/;s//$(VERSION)/;s//$$i/;s!!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-filemanager/gpe-filemanager_svn.bb b/packages/gpe-filemanager/gpe-filemanager_svn.bb new file mode 100644 index 0000000000..9640e56cea --- /dev/null +++ b/packages/gpe-filemanager/gpe-filemanager_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "GPE file manager" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget gnome-vfs dbus-glib" +RDEPENDS = "gpe-icons" +RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http" +PR = "r1" +PV = "0.25+svn-${SRCDATE}" + +inherit autotools + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +FILES_${PN} += " ${datadir}/gpe" +DEFAULT_PREFERENCE = "1" -- cgit v1.2.3 From a6ce711b8e40336cba299c3b11ed79bd328a2c41 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Wed, 4 Apr 2007 21:09:05 +0000 Subject: packages/gpe-filemanager/gpe-filemanager_svn.bb * use correct default preference of -1 --- packages/gpe-filemanager/gpe-filemanager_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-filemanager/gpe-filemanager_svn.bb b/packages/gpe-filemanager/gpe-filemanager_svn.bb index 9640e56cea..2c2d82d253 100644 --- a/packages/gpe-filemanager/gpe-filemanager_svn.bb +++ b/packages/gpe-filemanager/gpe-filemanager_svn.bb @@ -15,4 +15,4 @@ SRC_URI = "${GPE_SVN} \ S = "${WORKDIR}/${PN}" FILES_${PN} += " ${datadir}/gpe" -DEFAULT_PREFERENCE = "1" +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 95de8ee135ab18189f759fea97724faf8c3fe5c0 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Wed, 4 Apr 2007 21:13:44 +0000 Subject: packages/gpe-sketchbook/gpe-sketchbook_svn.bb * add new svn build recipe packages/gpe-sketchbook/files/svn-build.patch * add build patch --- packages/gpe-sketchbook/files/.mtn2git_empty | 0 packages/gpe-sketchbook/files/svn-build.patch | 229 ++++++++++++++++++++++++++ packages/gpe-sketchbook/gpe-sketchbook_svn.bb | 31 ++++ 3 files changed, 260 insertions(+) create mode 100644 packages/gpe-sketchbook/files/.mtn2git_empty create mode 100644 packages/gpe-sketchbook/files/svn-build.patch create mode 100644 packages/gpe-sketchbook/gpe-sketchbook_svn.bb (limited to 'packages') diff --git a/packages/gpe-sketchbook/files/.mtn2git_empty b/packages/gpe-sketchbook/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-sketchbook/files/svn-build.patch b/packages/gpe-sketchbook/files/svn-build.patch new file mode 100644 index 0000000000..026689a058 --- /dev/null +++ b/packages/gpe-sketchbook/files/svn-build.patch @@ -0,0 +1,229 @@ +diff -Naur gpe-sketchbook.orig/build/Makefile.dpkg_ipkg gpe-sketchbook/build/Makefile.dpkg_ipkg +--- gpe-sketchbook.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-sketchbook/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-sketchbook.orig/build/Makefile.translation gpe-sketchbook/build/Makefile.translation +--- gpe-sketchbook.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-sketchbook/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s//$(MAINTAINER)/;s//$(BINPACKAGE)/;s//$(VERSION)/;s//$$i/;s!!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb new file mode 100644 index 0000000000..a83360d69b --- /dev/null +++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "A GPE notebook to sketch your notes" +SECTION = "gpe" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "libgpewidget" + +inherit pkgconfig autotools + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +do_compile () { + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} +do_install () { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program +} + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} += " ${datadir}/gpe/pixmaps" + +export CVSBUILD = "no" + +CFLAGS += "-D_GNU_SOURCE" + +DEFAULT_PREFERENCE = "-1" + -- cgit v1.2.3 From 7b58ef62207d56b02df774d7ed3e13d6b1f118d8 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Wed, 4 Apr 2007 21:22:35 +0000 Subject: packages/gpe-sketchbook/gpe-sketchbook_svn.bb * add PV to recognise it as an svn build --- packages/gpe-sketchbook/gpe-sketchbook_svn.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb index a83360d69b..8884746136 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb @@ -4,6 +4,7 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libgpewidget" +PV = "0.2.9+svn-${SRCDATE}" inherit pkgconfig autotools -- cgit v1.2.3 From cd0eba2a4ed708a7439b36b3b2f0fef0eb451da2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Apr 2007 23:06:24 +0000 Subject: meta packages: Create a new class, clean up the code and add correct dependencies for bitbake 1.8 --- packages/meta/meta-e-x11-core.bb | 4 ++-- packages/meta/meta-e-x11.bb | 4 ++-- packages/meta/meta-gpe-extras.bb | 7 +------ packages/meta/meta-gpe.bb | 7 ++----- packages/meta/meta-gpephone.bb | 7 ++----- packages/meta/meta-opie-all.bb | 18 ++++++++++-------- packages/meta/meta-opie.bb | 5 +---- packages/meta/meta-sdk-sbox.bb | 7 ++----- packages/meta/meta-sdk.bb | 7 +++---- packages/meta/meta-sdl.bb | 12 ++---------- packages/meta/meta-sectest-gpe.bb | 7 ++----- packages/meta/meta-toolchain.bb | 6 ++---- packages/meta/xbase-clients.bb | 3 ++- 13 files changed, 33 insertions(+), 61 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb index 21960c6573..cdc76402e1 100644 --- a/packages/meta/meta-e-x11-core.bb +++ b/packages/meta/meta-e-x11-core.bb @@ -4,7 +4,7 @@ ALLOW_EMPTY = "1" PR = "r1" PACKAGE_ARCH = "all" LICENSE = "MIT" -BUILD_ALL_DEPS="1" -DEPENDS = "task-e-x11-core" RDEPENDS = "task-e-x11-core" + +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 0edfd43496..1182b0cf42 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -4,7 +4,7 @@ ALLOW_EMPTY = "1" PR = "r1" PACKAGE_ARCH = "all" LICENSE = "MIT" -BUILD_ALL_DEPS = "1" -DEPENDS = "task-e-x11" RDEPENDS = "task-e-x11" + +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb index 0adb7c4e05..b4425a682e 100644 --- a/packages/meta/meta-gpe-extras.bb +++ b/packages/meta/meta-gpe-extras.bb @@ -2,15 +2,10 @@ DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environmen LICENSE = "MIT" PR="r2" -ALLOW_EMPTY = "1" -BUILD_ALL_DEPS = "1" - -DEPENDS = "task-gpe" - RDEPENDS = "\ gpe-task-apps-extra \ gpe-task-games \ gpe-task-web \ gpe-task-desktopapps" - +inherit meta diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index 2360db447f..d6e199f6d6 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -2,11 +2,6 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment" LICENSE = "MIT" PR = "r42" -ALLOW_EMPTY = "1" -BUILD_ALL_DEPS = "1" - -DEPENDS = "task-gpe" - RDEPENDS = "\ gpe-base-depends \ gpe-task-base \ @@ -15,3 +10,5 @@ RDEPENDS = "\ gpe-task-apps \ gpe-task-games \ gpe-task-connectivity" + +inherit meta diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb index 96e393bf47..a0bd51e5fc 100644 --- a/packages/meta/meta-gpephone.bb +++ b/packages/meta/meta-gpephone.bb @@ -2,14 +2,11 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" LICENSE = "MIT" PR = "r0" -ALLOW_EMPTY = "1" -BUILD_ALL_DEPS = "1" - -DEPENDS = "task-gpe" - RDEPENDS = "\ gpe-base-depends \ gpephone-task-base \ gpephone-task-settings \ gpephone-task-pim \ gpeph-task-connectivity" + +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb index 6f315d3306..ccdbbe973d 100644 --- a/packages/meta/meta-opie-all.bb +++ b/packages/meta/meta-opie-all.bb @@ -1,14 +1,16 @@ DESCRIPTION = "Meta-package for QPE stuff" SECTION = "opie/base" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" LICENSE = "MIT" -DEPENDS = "task-qpe" PR = "r3" -BUILD_ALL_DEPS = "1" - -RDEPENDS = "task-qpe-applets task-qpe-games task-qpe-inputmethods \ - task-qpe-multimedia task-qpe-emulators task-qpe-applications \ - task-qpe-fonts task-qpe-settings" +RDEPENDS = " \ + task-qpe-applets \ + task-qpe-games \ + task-qpe-inputmethods \ + task-qpe-multimedia \ + task-qpe-emulators \ + task-qpe-applications \ + task-qpe-fonts \ + task-qpe-settings" +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 1158d859a0..6a9c35c5e3 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,12 +1,8 @@ DESCRIPTION = "Meta-package for Opie" SECTION = "opie/base" -ALLOW_EMPTY = "1" PR = "r34" -PACKAGE_ARCH = "all" LICENSE = "MIT" -BUILD_ALL_DEPS = "1" -DEPENDS = "task-opie" RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ task-opie-base-decorations task-opie-base-inputmethods \ @@ -19,3 +15,4 @@ RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \ task-opie-multimedia task-opie-pim task-opie-settings \ task-opie-styles task-opie-todayplugins task-opie-wlan" +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 0642d49e0e..a586972a94 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -2,9 +2,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PR = "r2" -PACKAGES = "" - -inherit rootfs_ipk sdk debian +inherit rootfs_ipk sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" @@ -23,8 +21,6 @@ TARGET_INSTALL = "\ DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" -BUILD_ALL_DEPS = "1" - IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" @@ -92,4 +88,5 @@ EOF } do_populate_sdk[nostamp] = "1" +do_populate_sdk[recrdeptask] = "do_package_write" addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 7bf8606418..e49858398f 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -3,9 +3,7 @@ LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" PR = "r11" -PACKAGES = "" - -inherit sdk +inherit sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" @@ -18,6 +16,7 @@ HOST_INSTALL = "\ binutils-cross-sdk \ gcc-cross-sdk \ gdb-cross" + TARGET_INSTALL = "\ task-sdk-base \ task-sdk-opie \ @@ -26,7 +25,6 @@ TARGET_INSTALL = "\ task-sdk-gpe" RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" -BUILD_ALL_DEPS = "1" do_populate_sdk() { touch ${DEPLOY_DIR_IPK}/Packages @@ -99,4 +97,5 @@ EOF } do_populate_sdk[nostamp] = "1" +do_populate_sdk[recrdeptask] = "do_package_write" addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb index cb19cb6834..a1ab3918b7 100644 --- a/packages/meta/meta-sdl.bb +++ b/packages/meta/meta-sdl.bb @@ -1,15 +1,7 @@ DESCRIPTION = "Meta-package for SDL" LICENSE = "MIT" -RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators" PR = "r2" -ALLOW_EMPTY = "1" -BUILD_ALL_DEPS = "1" - -# no need to add libsdl as all libsdl-* already rdepend on it -RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net" - -RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame" - -RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x" +RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators" +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb index 70bcfc4bc5..a73559ab1a 100644 --- a/packages/meta/meta-sectest-gpe.bb +++ b/packages/meta/meta-sectest-gpe.bb @@ -2,11 +2,6 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image" LICENSE = "MIT" PR = "r6" -ALLOW_EMPTY = "1" -BUILD_ALL_DEPS = "1" - -DEPENDS = "task-gpe" - RDEPENDS = "\ gpe-task-base \ gpe-base-depends \ @@ -14,3 +9,5 @@ RDEPENDS = "\ gpe-task-settings \ gpe-task-pim \ gpe-task-sectest" + +inherit meta \ No newline at end of file diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 7995ac3cb8..35dbe9f4cb 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -3,9 +3,7 @@ LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" PR = "r0" -PACKAGES = "" - -inherit sdk +inherit sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" @@ -23,7 +21,6 @@ TARGET_INSTALL = "\ " RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" -BUILD_ALL_DEPS = "1" do_populate_sdk() { touch ${DEPLOY_DIR_IPK}/Packages @@ -96,4 +93,5 @@ EOF } do_populate_sdk[nostamp] = "1" +do_populate_sdk[recrdeptask] = "do_package_write" addtask populate_sdk before do_build after do_install diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb index 4297440074..5f3c640f00 100644 --- a/packages/meta/xbase-clients.bb +++ b/packages/meta/xbase-clients.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Basic X clients (meta package)" +LICENSE = "MIT" PR = "r1" ALLOW_EMPTY = "1" @@ -9,4 +10,4 @@ RDEPENDS = 'xauth \ xmodmap \ xrdb \ xset' -LICENSE = "MIT" + -- cgit v1.2.3 From 38156d3b6c2372933ff6d290cba23eb6fc288000 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 5 Apr 2007 06:29:53 +0000 Subject: perl: Rearrange the patches/files a bit. Move the 5.8.4 specific patches out of the common directory and only specify common files in the SRC_URI in perl.inc, move the others to the version specific .bb's. --- packages/perl/files/Makefile.SH.patch | 298 ------ packages/perl/files/Makefile.patch | 23 - packages/perl/files/config.sh-arm-linux.patch | 46 - packages/perl/files/config.sh-i686-linux | 1024 ------------------- packages/perl/files/config.sh-mipsel-linux | 1026 -------------------- packages/perl/files/uclibc.patch | 26 - packages/perl/perl-5.8.4/.mtn2git_empty | 0 packages/perl/perl-5.8.4/Makefile.SH.patch | 298 ++++++ packages/perl/perl-5.8.4/Makefile.patch | 23 + packages/perl/perl-5.8.4/config.sh-arm-linux.patch | 46 + packages/perl/perl-5.8.4/config.sh-i686-linux | 1024 +++++++++++++++++++ packages/perl/perl-5.8.4/config.sh-mipsel-linux | 1026 ++++++++++++++++++++ packages/perl/perl-5.8.4/uclibc.patch | 26 + packages/perl/perl.inc | 5 +- packages/perl/perl_5.8.4.bb | 4 + packages/perl/perl_5.8.7.bb | 1 + 16 files changed, 2449 insertions(+), 2447 deletions(-) delete mode 100644 packages/perl/files/Makefile.SH.patch delete mode 100644 packages/perl/files/Makefile.patch delete mode 100644 packages/perl/files/config.sh-arm-linux.patch delete mode 100644 packages/perl/files/config.sh-i686-linux delete mode 100644 packages/perl/files/config.sh-mipsel-linux delete mode 100644 packages/perl/files/uclibc.patch create mode 100644 packages/perl/perl-5.8.4/.mtn2git_empty create mode 100644 packages/perl/perl-5.8.4/Makefile.SH.patch create mode 100644 packages/perl/perl-5.8.4/Makefile.patch create mode 100644 packages/perl/perl-5.8.4/config.sh-arm-linux.patch create mode 100644 packages/perl/perl-5.8.4/config.sh-i686-linux create mode 100644 packages/perl/perl-5.8.4/config.sh-mipsel-linux create mode 100644 packages/perl/perl-5.8.4/uclibc.patch (limited to 'packages') diff --git a/packages/perl/files/Makefile.SH.patch b/packages/perl/files/Makefile.SH.patch deleted file mode 100644 index 35a4e6dfde..0000000000 --- a/packages/perl/files/Makefile.SH.patch +++ /dev/null @@ -1,298 +0,0 @@ -*** ./Makefile.SH Wed Aug 4 12:16:15 2004 ---- ./Makefile.SH.patch Wed Aug 4 14:03:42 2004 -*************** -*** 110,127 **** - # INSTALL file, under "Building a shared perl library". - # If there is no pre-existing $libperl, we don't need - # to do anything further. -! if test -f $archlib/CORE/$libperl; then -! rm -f preload -! cat <<'EOT' > preload -! #! /bin/sh -! lib=$1 -! shift -! test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" -! exec "$@" -! EOT -! chmod 755 preload -! ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" -! fi - ;; - os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" - ;; ---- 110,116 ---- - # INSTALL file, under "Building a shared perl library". - # If there is no pre-existing $libperl, we don't need - # to do anything further. -! echo linux libraries overwritten by cross-compile patches - ;; - os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" - ;; -*************** -*** 349,357 **** - .c.s: - $(CCCMDSRC) -S $*.c - -! all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make -! @echo " "; -! @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." - - .PHONY: all compile translators utilities - ---- 338,358 ---- - .c.s: - $(CCCMDSRC) -S $*.c - -! #all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make -! # @echo " "; -! # @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." -! -! all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) -! mv miniperl miniperl-cross -! ln -s hostperl miniperl -! -! more: extra.pods $(private) $(public) -! -! more2: $(dynamic_ext) -! -! more3: $(nonxs_ext) -! -! more4: extras.make - - .PHONY: all compile translators utilities - -*************** -*** 361,370 **** - cd x2p; $(MAKE) compile; - cd pod; $(MAKE) compile; - -! translators: miniperl$(EXE_EXT) lib/Config.pm FORCE - @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all - -! utilities: miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE - @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all - - ---- 362,371 ---- - cd x2p; $(MAKE) compile; - cd pod; $(MAKE) compile; - -! translators: lib/Config.pm FORCE - @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all - -! utilities: lib/Config.pm $(plextract) lib/lib.pm FORCE - @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all - - -*************** -*** 541,547 **** - $(CC) -o miniperl $(CLDFLAGS) \ - `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) -! $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest - !NO!SUBS! - ;; - beos*|next4*) ---- 542,548 ---- - $(CC) -o miniperl $(CLDFLAGS) \ - `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) -! # $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest - !NO!SUBS! - ;; - beos*|next4*) -*************** -*** 549,555 **** - miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) - $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) -! $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest - !NO!SUBS! - ;; - darwin*) ---- 550,556 ---- - miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) - $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) -! # $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest - !NO!SUBS! - ;; - darwin*) -*************** -*** 716,722 **** - # We need to autosplit in two steps because VOS can't handle so many args - # - .PHONY: preplibrary -! preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) - @sh ./makedir lib/auto - @echo " AutoSplitting perl library" - $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ ---- 717,723 ---- - # We need to autosplit in two steps because VOS can't handle so many args - # - .PHONY: preplibrary -! preplibrary: lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) - @sh ./makedir lib/auto - @echo " AutoSplitting perl library" - $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ -*************** -*** 728,738 **** - # Take care to avoid modifying lib/Config.pm without reason - # (If trying to create a new port and having problems with the configpm script, - # try 'make minitest' and/or commenting out the tests at the end of configpm.) -! lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary - $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp - sh mv-if-diff configpm.tmp $@ - -! lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm - $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp - sh mv-if-diff minimod.tmp $@ - -touch lib/ExtUtils/Miniperl.pm ---- 729,739 ---- - # Take care to avoid modifying lib/Config.pm without reason - # (If trying to create a new port and having problems with the configpm script, - # try 'make minitest' and/or commenting out the tests at the end of configpm.) -! lib/Config.pm: config.sh configpm Porting/Glossary - $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp - sh mv-if-diff configpm.tmp $@ - -! lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl lib/Config.pm - $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp - sh mv-if-diff minimod.tmp $@ - -touch lib/ExtUtils/Miniperl.pm -*************** -*** 740,757 **** - lib/re.pm: ext/re/re.pm - cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm - -! $(plextract): miniperl$(EXE_EXT) lib/Config.pm x2p/s2p - @-rm -f $@ - $(LDLIBPTH) ./miniperl -Ilib $@.PL - -! x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL - cd x2p; $(LDLIBPTH) $(MAKE) s2p - -! lib/lib.pm: miniperl$(EXE_EXT) lib/Config.pm - @-rm -f $@ - $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL - -! extra.pods: miniperl$(EXE_EXT) - -@test -f extra.pods && rm -f `cat extra.pods` - -@rm -f extra.pods - -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ ---- 741,758 ---- - lib/re.pm: ext/re/re.pm - cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm - -! $(plextract): lib/Config.pm x2p/s2p - @-rm -f $@ - $(LDLIBPTH) ./miniperl -Ilib $@.PL - -! x2p/s2p: lib/Config.pm x2p/s2p.PL - cd x2p; $(LDLIBPTH) $(MAKE) s2p - -! lib/lib.pm: lib/Config.pm - @-rm -f $@ - $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL - -! extra.pods: - -@test -f extra.pods && rm -f `cat extra.pods` - -@rm -f extra.pods - -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ -*************** -*** 798,815 **** - INSTALL_DEPENDENCE = all - - install.perl: $(INSTALL_DEPENDENCE) installperl -! if [ -n "$(COMPILE)" ]; \ -! then \ -! cd utils; $(MAKE) compile; \ -! cd ../x2p; $(MAKE) compile; \ -! cd ../pod; $(MAKE) compile; \ -! else :; \ -! fi -! $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) -! $(MAKE) extras.install -! -! install.man: all installman -! $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) - - # XXX Experimental. Hardwired values, but useful for testing. - # Eventually Configure could ask for some of these values. ---- 799,805 ---- - INSTALL_DEPENDENCE = all - - install.perl: $(INSTALL_DEPENDENCE) installperl -! hostperl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS) - - # XXX Experimental. Hardwired values, but useful for testing. - # Eventually Configure could ask for some of these values. -*************** -*** 925,940 **** - # - # DynaLoader may be needed for extensions that use Makefile.PL. - -! $(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE - @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - -! d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - -! s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - -! n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - - .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ ---- 915,930 ---- - # - # DynaLoader may be needed for extensions that use Makefile.PL. - -! $(DYNALOADER): preplibrary FORCE - @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - -! d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - -! s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - -! n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) - - .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ -*************** -*** 1074,1080 **** - - test_prep_pre: preplibrary utilities $(nonxs_ext) - -! test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) - PERL=./perl $(MAKE) _test_prep - - _test_tty: ---- 1064,1070 ---- - - test_prep_pre: preplibrary utilities $(nonxs_ext) - -! test_prep: test_prep_pre perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) - PERL=./perl $(MAKE) _test_prep - - _test_tty: -*************** -*** 1167,1173 **** - - # Can't depend on lib/Config.pm because that might be where miniperl - # is crashing. -! minitest: miniperl$(EXE_EXT) lib/re.pm - -@test -f lib/lib.pm && test -f lib/Config.pm || \ - $(MAKE) lib/Config.pm lib/lib.pm - @echo " " ---- 1157,1163 ---- - - # Can't depend on lib/Config.pm because that might be where miniperl - # is crashing. -! minitest: lib/re.pm - -@test -f lib/lib.pm && test -f lib/Config.pm || \ - $(MAKE) lib/Config.pm lib/lib.pm - @echo " " diff --git a/packages/perl/files/Makefile.patch b/packages/perl/files/Makefile.patch deleted file mode 100644 index eec127643b..0000000000 --- a/packages/perl/files/Makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -*** ./Cross/Makefile 2004-01-12 13:44:01.000000000 -0700 ---- ./Cross/Makefile.patch 2004-08-03 16:34:18.000000000 -0700 -*************** -*** 58,66 **** - $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh - cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more - cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library -! cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" -! cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" -! cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" - cd $(TOPDIR)/.. ; rm -rf install_me_here - cd $(TOPDIR)/.. ; make install-strip - cd $(TOPDIR)/.. ; sh -x Cross/warp ---- 58,66 ---- - $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh - cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more - cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library -! cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" -! cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" -! cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" - cd $(TOPDIR)/.. ; rm -rf install_me_here - cd $(TOPDIR)/.. ; make install-strip - cd $(TOPDIR)/.. ; sh -x Cross/warp diff --git a/packages/perl/files/config.sh-arm-linux.patch b/packages/perl/files/config.sh-arm-linux.patch deleted file mode 100644 index 44d8b1a89d..0000000000 --- a/packages/perl/files/config.sh-arm-linux.patch +++ /dev/null @@ -1,46 +0,0 @@ -*** ./Cross/config.sh-arm-linux Mon Dec 22 06:00:37 2003 ---- ./Cross/config.sh-arm-linux.patch Tue Aug 3 17:57:08 2004 -*************** -*** 794,805 **** - passcat='cat /etc/passwd' - patchlevel='8' - path_sep=':' -! perl5='/usr/bin/perl' - perl='' - perl_patchlevel='' - perladmin='red@criticalintegration.com' - perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' -! perlpath='/usr/bin/perl' - pg='pg' - phostname='hostname' - pidtype='pid_t' ---- 794,805 ---- - passcat='cat /etc/passwd' - patchlevel='8' - path_sep=':' -! perl5='hostperl' - perl='' - perl_patchlevel='' - perladmin='red@criticalintegration.com' - perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' -! perlpath='hostperl' - pg='pg' - phostname='hostname' - pidtype='pid_t' -*************** -*** 905,911 **** - srandom_r_proto='0' - src='.' - ssizetype='ssize_t' -! startperl='#!/usr/bin/perl' - startsh='#!/bin/sh' - static_ext=' ' - stdchar='char' ---- 905,911 ---- - srandom_r_proto='0' - src='.' - ssizetype='ssize_t' -! startperl='#!hostperl' - startsh='#!/bin/sh' - static_ext=' ' - stdchar='char' diff --git a/packages/perl/files/config.sh-i686-linux b/packages/perl/files/config.sh-i686-linux deleted file mode 100644 index 0978100abc..0000000000 --- a/packages/perl/files/config.sh-i686-linux +++ /dev/null @@ -1,1024 +0,0 @@ -#!/bin/sh -# -# This file was produced by running the Configure script. It holds all the -# definitions figured out by Configure. Should you modify one of these values, -# do not forget to propagate your changes by running "Configure -der". You may -# instead choose to run each of the .SH files by yourself, or "Configure -S". -# - -# Package name : perl5 -# Source directory : . -# Configuration time: Wed Mar 9 04:09:49 CST 2005 -# Configured by : kergoth -# Target system : linux hyperion 2.6.11-ck1 #1 wed mar 2 23:48:21 cst 2005 i686 gnulinux - -Author='' -Date='$Date' -Header='' -Id='$Id' -Locker='' -Log='$Log' -Mcc='Mcc' -RCSfile='$RCSfile' -Revision='$Revision' -Source='' -State='' -_a='.a' -_exe='' -_o='.o' -afs='false' -afsroot='/afs' -alignbytes='4' -ansi2knr='' -aphostname='/bin/hostname' -api_revision='5' -api_subversion='0' -api_version='8' -api_versionstring='5.8.0' -ar='ar' -archlib='/usr/lib/perl5/5.8.4/i686-linux' -archlibexp='/usr/lib/perl5/5.8.4/i686-linux' -archname64='' -archname='i686-linux' -archobjs='' -asctime_r_proto='0' -awk='awk' -baserev='5.0' -bash='' -bin='/usr/bin' -binexp='/usr/bin' -bison='bison' -byacc='byacc' -byteorder='1234' -c='' -castflags='0' -cat='cat' -cc='cc' -cccdlflags='-fpic' -ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i686-linux/CORE' -ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -ccname='gcc' -ccsymbols='__GNUC_PATCHLEVEL__=5' -ccversion='' -cf_by='kergoth' -cf_email='kergoth@hyperion.kergoth.com' -cf_time='Wed Mar 9 04:09:49 CST 2005' -charsize='1' -chgrp='' -chmod='chmod' -chown='' -clocktype='clock_t' -comm='comm' -compress='' -contains='grep' -cp='cp' -cpio='' -cpp='cpp' -cpp_stuff='42' -cppccsymbols='__GNUC__=3 __GNUC_MINOR__=3' -cppflags='-fno-strict-aliasing -I/usr/local/include' -cpplast='-' -cppminus='-' -cpprun='cc -E' -cppstdin='cc -E' -cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNU_LIBRARY__=6 i386=1 __i386=1 __i386__=1 __i486=1 __i486__=1 _LARGEFILE_SOURCE=1 linux=1 __linux=1 __linux__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 unix=1 __unix=1 __unix__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1' -crypt_r_proto='0' -cryptlib='' -csh='csh' -ctermid_r_proto='0' -ctime_r_proto='0' -d_Gconvert='gcvt((x),(n),(b))' -d_PRIEUldbl='define' -d_PRIFUldbl='define' -d_PRIGUldbl='define' -d_PRIXU64='define' -d_PRId64='define' -d_PRIeldbl='define' -d_PRIfldbl='define' -d_PRIgldbl='define' -d_PRIi64='define' -d_PRIo64='define' -d_PRIu64='define' -d_PRIx64='define' -d_SCNfldbl='define' -d__fwalk='undef' -d_access='define' -d_accessx='undef' -d_aintl='undef' -d_alarm='define' -d_archlib='define' -d_asctime_r='undef' -d_atolf='undef' -d_atoll='define' -d_attribut='define' -d_bcmp='define' -d_bcopy='define' -d_bsd='undef' -d_bsdgetpgrp='undef' -d_bsdsetpgrp='undef' -d_bzero='define' -d_casti32='undef' -d_castneg='define' -d_charvspr='define' -d_chown='define' -d_chroot='define' -d_chsize='undef' -d_class='undef' -d_closedir='define' -d_cmsghdr_s='define' -d_const='define' -d_copysignl='define' -d_crypt='define' -d_crypt_r='undef' -d_csh='undef' -d_ctermid_r='undef' -d_ctime_r='undef' -d_cuserid='define' -d_dbl_dig='define' -d_dbminitproto='undef' -d_difftime='define' -d_dirfd='define' -d_dirnamlen='undef' -d_dlerror='define' -d_dlopen='define' -d_dlsymun='undef' -d_dosuid='undef' -d_drand48_r='undef' -d_drand48proto='define' -d_dup2='define' -d_eaccess='undef' -d_endgrent='define' -d_endgrent_r='undef' -d_endhent='define' -d_endhostent_r='undef' -d_endnent='define' -d_endnetent_r='undef' -d_endpent='define' -d_endprotoent_r='undef' -d_endpwent='define' -d_endpwent_r='undef' -d_endsent='define' -d_endservent_r='undef' -d_eofnblk='define' -d_eunice='undef' -d_faststdio='undef' -d_fchdir='define' -d_fchmod='define' -d_fchown='define' -d_fcntl='define' -d_fcntl_can_lock='define' -d_fd_macros='define' -d_fd_set='define' -d_fds_bits='undef' -d_fgetpos='define' -d_finite='define' -d_finitel='define' -d_flexfnam='define' -d_flock='define' -d_flockproto='define' -d_fork='define' -d_fp_class='undef' -d_fpathconf='define' -d_fpclass='undef' -d_fpclassify='undef' -d_fpclassl='undef' -d_fpos64_t='undef' -d_frexpl='define' -d_fs_data_s='undef' -d_fseeko='define' -d_fsetpos='define' -d_fstatfs='define' -d_fstatvfs='define' -d_fsync='define' -d_ftello='define' -d_ftime='undef' -d_getcwd='define' -d_getespwnam='undef' -d_getfsstat='undef' -d_getgrent='define' -d_getgrent_r='undef' -d_getgrgid_r='undef' -d_getgrnam_r='undef' -d_getgrps='define' -d_gethbyaddr='define' -d_gethbyname='define' -d_gethent='define' -d_gethname='define' -d_gethostbyaddr_r='undef' -d_gethostbyname_r='undef' -d_gethostent_r='undef' -d_gethostprotos='define' -d_getitimer='define' -d_getlogin='define' -d_getlogin_r='undef' -d_getmnt='undef' -d_getmntent='define' -d_getnbyaddr='define' -d_getnbyname='define' -d_getnent='define' -d_getnetbyaddr_r='undef' -d_getnetbyname_r='undef' -d_getnetent_r='undef' -d_getnetprotos='define' -d_getpagsz='define' -d_getpbyname='define' -d_getpbynumber='define' -d_getpent='define' -d_getpgid='define' -d_getpgrp2='undef' -d_getpgrp='define' -d_getppid='define' -d_getprior='define' -d_getprotobyname_r='undef' -d_getprotobynumber_r='undef' -d_getprotoent_r='undef' -d_getprotoprotos='define' -d_getprpwnam='undef' -d_getpwent='define' -d_getpwent_r='undef' -d_getpwnam_r='undef' -d_getpwuid_r='undef' -d_getsbyname='define' -d_getsbyport='define' -d_getsent='define' -d_getservbyname_r='undef' -d_getservbyport_r='undef' -d_getservent_r='undef' -d_getservprotos='define' -d_getspnam='define' -d_getspnam_r='undef' -d_gettimeod='define' -d_gmtime_r='undef' -d_gnulibc='define' -d_grpasswd='define' -d_hasmntopt='define' -d_htonl='define' -d_ilogbl='define' -d_index='undef' -d_inetaton='define' -d_int64_t='define' -d_isascii='define' -d_isfinite='undef' -d_isinf='define' -d_isnan='define' -d_isnanl='define' -d_killpg='define' -d_lchown='define' -d_ldbl_dig='define' -d_link='define' -d_localtime_r='undef' -d_locconv='define' -d_lockf='define' -d_longdbl='define' -d_longlong='define' -d_lseekproto='define' -d_lstat='define' -d_madvise='define' -d_mblen='define' -d_mbstowcs='define' -d_mbtowc='define' -d_memchr='define' -d_memcmp='define' -d_memcpy='define' -d_memmove='define' -d_memset='define' -d_mkdir='define' -d_mkdtemp='define' -d_mkfifo='define' -d_mkstemp='define' -d_mkstemps='undef' -d_mktime='define' -d_mmap='define' -d_modfl='define' -d_modfl_pow32_bug='undef' -d_modflproto='undef' -d_mprotect='define' -d_msg='define' -d_msg_ctrunc='define' -d_msg_dontroute='define' -d_msg_oob='define' -d_msg_peek='define' -d_msg_proxy='define' -d_msgctl='define' -d_msgget='define' -d_msghdr_s='define' -d_msgrcv='define' -d_msgsnd='define' -d_msync='define' -d_munmap='define' -d_mymalloc='undef' -d_nice='define' -d_nl_langinfo='define' -d_nv_preserves_uv='define' -d_off64_t='undef' -d_old_pthread_create_joinable='undef' -d_oldpthreads='undef' -d_oldsock='undef' -d_open3='define' -d_pathconf='define' -d_pause='define' -d_perl_otherlibdirs='undef' -d_phostname='undef' -d_pipe='define' -d_poll='define' -d_portable='define' -d_procselfexe='define' -d_pthread_atfork='undef' -d_pthread_attr_setscope='define' -d_pthread_yield='undef' -d_pwage='undef' -d_pwchange='undef' -d_pwclass='undef' -d_pwcomment='undef' -d_pwexpire='undef' -d_pwgecos='define' -d_pwpasswd='define' -d_pwquota='undef' -d_qgcvt='define' -d_quad='define' -d_random_r='undef' -d_readdir64_r='undef' -d_readdir='define' -d_readdir_r='undef' -d_readlink='define' -d_readv='define' -d_recvmsg='define' -d_rename='define' -d_rewinddir='define' -d_rmdir='define' -d_safebcpy='undef' -d_safemcpy='undef' -d_sanemcmp='define' -d_sbrkproto='define' -d_scalbnl='define' -d_sched_yield='define' -d_scm_rights='define' -d_seekdir='define' -d_select='define' -d_sem='define' -d_semctl='define' -d_semctl_semid_ds='define' -d_semctl_semun='define' -d_semget='define' -d_semop='define' -d_sendmsg='define' -d_setegid='define' -d_seteuid='define' -d_setgrent='define' -d_setgrent_r='undef' -d_setgrps='define' -d_sethent='define' -d_sethostent_r='undef' -d_setitimer='define' -d_setlinebuf='define' -d_setlocale='define' -d_setlocale_r='undef' -d_setnent='define' -d_setnetent_r='undef' -d_setpent='define' -d_setpgid='define' -d_setpgrp2='undef' -d_setpgrp='define' -d_setprior='define' -d_setproctitle='undef' -d_setprotoent_r='undef' -d_setpwent='define' -d_setpwent_r='undef' -d_setregid='define' -d_setresgid='define' -d_setresuid='define' -d_setreuid='define' -d_setrgid='undef' -d_setruid='undef' -d_setsent='define' -d_setservent_r='undef' -d_setsid='define' -d_setvbuf='define' -d_sfio='undef' -d_shm='define' -d_shmat='define' -d_shmatprototype='define' -d_shmctl='define' -d_shmdt='define' -d_shmget='define' -d_sigaction='define' -d_sigprocmask='define' -d_sigsetjmp='define' -d_sockatmark='define' -d_sockatmarkproto='undef' -d_socket='define' -d_socklen_t='define' -d_sockpair='define' -d_socks5_init='undef' -d_sqrtl='define' -d_srand48_r='undef' -d_srandom_r='undef' -d_sresgproto='undef' -d_sresuproto='undef' -d_statblks='define' -d_statfs_f_flags='undef' -d_statfs_s='define' -d_statvfs='define' -d_stdio_cnt_lval='undef' -d_stdio_ptr_lval='undef' -d_stdio_ptr_lval_nochange_cnt='undef' -d_stdio_ptr_lval_sets_cnt='undef' -d_stdio_stream_array='undef' -d_stdiobase='undef' -d_stdstdio='undef' -d_strchr='define' -d_strcoll='define' -d_strctcpy='define' -d_strerrm='strerror(e)' -d_strerror='define' -d_strerror_r='undef' -d_strftime='define' -d_strtod='define' -d_strtol='define' -d_strtold='define' -d_strtoll='define' -d_strtoq='define' -d_strtoul='define' -d_strtoull='define' -d_strtouq='define' -d_strxfrm='define' -d_suidsafe='undef' -d_symlink='define' -d_syscall='define' -d_syscallproto='define' -d_sysconf='define' -d_sysernlst='' -d_syserrlst='define' -d_system='define' -d_tcgetpgrp='define' -d_tcsetpgrp='define' -d_telldir='define' -d_telldirproto='define' -d_time='define' -d_times='define' -d_tm_tm_gmtoff='define' -d_tm_tm_zone='define' -d_tmpnam_r='undef' -d_truncate='define' -d_ttyname_r='undef' -d_tzname='define' -d_u32align='undef' -d_ualarm='define' -d_umask='define' -d_uname='define' -d_union_semun='undef' -d_unordered='undef' -d_usleep='define' -d_usleepproto='define' -d_ustat='define' -d_vendorarch='undef' -d_vendorbin='undef' -d_vendorlib='undef' -d_vendorscript='undef' -d_vfork='undef' -d_void_closedir='undef' -d_voidsig='define' -d_voidtty='' -d_volatile='define' -d_vprintf='define' -d_wait4='define' -d_waitpid='define' -d_wcstombs='define' -d_wctomb='define' -d_writev='define' -d_xenix='undef' -date='date' -db_hashtype='u_int32_t' -db_prefixtype='size_t' -db_version_major='' -db_version_minor='' -db_version_patch='' -defvoidused='15' -direntrytype='struct dirent' -dlext='so' -dlsrc='dl_dlopen.xs' -doublesize='8' -drand01='drand48()' -drand48_r_proto='0' -dynamic_ext='attrs B ByteLoader Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared' -eagain='EAGAIN' -ebcdic='undef' -echo='echo' -egrep='egrep' -emacs='' -endgrent_r_proto='0' -endhostent_r_proto='0' -endnetent_r_proto='0' -endprotoent_r_proto='0' -endpwent_r_proto='0' -endservent_r_proto='0' -eunicefix=':' -exe_ext='' -expr='expr' -extensions='attrs B ByteLoader Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared Errno' -extras='' -fflushNULL='define' -fflushall='undef' -find='' -firstmakefile='makefile' -flex='' -fpossize='16' -fpostype='fpos_t' -freetype='void' -from=':' -full_ar='/usr/bin/ar' -full_csh='csh' -full_sed='/bin/sed' -gccansipedantic='' -gccosandvers='' -gccversion='3.3.5 (Debian 1:3.3.5-6)' -getgrent_r_proto='0' -getgrgid_r_proto='0' -getgrnam_r_proto='0' -gethostbyaddr_r_proto='0' -gethostbyname_r_proto='0' -gethostent_r_proto='0' -getlogin_r_proto='0' -getnetbyaddr_r_proto='0' -getnetbyname_r_proto='0' -getnetent_r_proto='0' -getprotobyname_r_proto='0' -getprotobynumber_r_proto='0' -getprotoent_r_proto='0' -getpwent_r_proto='0' -getpwnam_r_proto='0' -getpwuid_r_proto='0' -getservbyname_r_proto='0' -getservbyport_r_proto='0' -getservent_r_proto='0' -getspnam_r_proto='0' -gidformat='"lu"' -gidsign='1' -gidsize='4' -gidtype='gid_t' -glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' -gmake='gmake' -gmtime_r_proto='0' -gnulibc_version='2.3.2' -grep='grep' -groupcat='cat /etc/group' -groupstype='gid_t' -gzip='gzip' -h_fcntl='false' -h_sysfile='true' -hint='recommended' -hostcat='cat /etc/hosts' -html1dir=' ' -html1direxp='' -html3dir=' ' -html3direxp='' -i16size='2' -i16type='short' -i32size='4' -i32type='long' -i64size='8' -i64type='long long' -i8size='1' -i8type='char' -i_arpainet='define' -i_bsdioctl='' -i_crypt='define' -i_db='undef' -i_dbm='undef' -i_dirent='define' -i_dld='undef' -i_dlfcn='define' -i_fcntl='undef' -i_float='define' -i_fp='undef' -i_fp_class='undef' -i_gdbm='undef' -i_grp='define' -i_ieeefp='undef' -i_inttypes='define' -i_langinfo='define' -i_libutil='undef' -i_limits='define' -i_locale='define' -i_machcthr='undef' -i_malloc='define' -i_math='define' -i_memory='undef' -i_mntent='define' -i_ndbm='undef' -i_netdb='define' -i_neterrno='undef' -i_netinettcp='define' -i_niin='define' -i_poll='define' -i_prot='undef' -i_pthread='define' -i_pwd='define' -i_rpcsvcdbm='undef' -i_sfio='undef' -i_sgtty='undef' -i_shadow='define' -i_socks='undef' -i_stdarg='define' -i_stddef='define' -i_stdlib='define' -i_string='define' -i_sunmath='undef' -i_sysaccess='undef' -i_sysdir='define' -i_sysfile='define' -i_sysfilio='undef' -i_sysin='undef' -i_sysioctl='define' -i_syslog='define' -i_sysmman='define' -i_sysmode='undef' -i_sysmount='define' -i_sysndir='undef' -i_sysparam='define' -i_sysresrc='define' -i_syssecrt='undef' -i_sysselct='define' -i_syssockio='undef' -i_sysstat='define' -i_sysstatfs='define' -i_sysstatvfs='define' -i_systime='define' -i_systimek='undef' -i_systimes='define' -i_systypes='define' -i_sysuio='define' -i_sysun='define' -i_sysutsname='define' -i_sysvfs='define' -i_syswait='define' -i_termio='undef' -i_termios='define' -i_time='define' -i_unistd='define' -i_ustat='define' -i_utime='define' -i_values='define' -i_varargs='undef' -i_varhdr='stdarg.h' -i_vfork='undef' -ignore_versioned_solibs='y' -inc_version_list=' ' -inc_version_list_init='0' -incpath='' -inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i686-linux' -installbin='./install_me_here/usr/bin' -installhtml1dir='' -installhtml3dir='' -installman1dir='./install_me_here/usr/share/man/man1' -installman3dir='./install_me_here/usr/share/man/man3' -installprefix='./install_me_here/usr' -installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.4' -installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i686-linux' -installsitebin='./install_me_here/usr/bin' -installsitehtml1dir='' -installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' -installsiteman1dir='./install_me_here/usr/share/man/man1' -installsiteman3dir='./install_me_here/usr/share/man/man3' -installsitescript='./install_me_here/usr/bin' -installstyle='./install_me_herelib/perl5' -installusrbinperl='undef' -installvendorarch='' -installvendorbin='' -installvendorhtml1dir='' -installvendorhtml3dir='' -installvendorlib='' -installvendorman1dir='' -installvendorman3dir='' -installvendorscript='' -intsize='4' -issymlink='/usr/bin/test -h' -ivdformat='"ld"' -ivsize='4' -ivtype='long' -known_extensions='attrs B ByteLoader Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared' -ksh='' -ld='cc' -lddlflags='-shared -L/usr/local/lib' -ldflags=' -L/usr/local/lib' -ldflags_uselargefiles='' -ldlibpthname='LD_LIBRARY_PATH' -less='less' -lib_ext='.a' -libc='/lib/libc-2.3.2.so' -libperl='libperl.so' -libpth='/usr/local/lib /lib /usr/lib' -libs='-ldl -lm -lc -lcrypt' -libsdirs=' /usr/lib' -libsfiles=' libdl.so libm.so libc.so libcrypt.so' -libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libc.so /usr/lib/libcrypt.so' -libspath=' /usr/local/lib /lib /usr/lib' -libswanted='gdbm gdbm_compat db dl m c crypt' -libswanted_uselargefiles='' -line='' -lint='' -lkflags='' -ln='ln' -lns='/bin/ln -s' -localtime_r_proto='0' -locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' -loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' -longdblsize='12' -longlongsize='8' -longsize='4' -lp='' -lpr='' -ls='ls' -lseeksize='8' -lseektype='off_t' -mail='' -mailx='' -make='make' -make_set_make='#' -mallocobj='' -mallocsrc='' -malloctype='void *' -man1dir='/usr/share/man/man1' -man1direxp='/usr/share/man/man1' -man1ext='1' -man3dir='/usr/share/man/man3' -man3direxp='/usr/share/man/man3' -man3ext='3' -mips_type='' -mistrustnm='' -mkdir='mkdir' -mmaptype='void *' -modetype='mode_t' -more='more' -multiarch='undef' -mv='' -myarchname='i686-linux' -mydomain='.kergoth.com' -myhostname='hyperion' -myuname='linux hyperion 2.6.11-ck1 #1 wed mar 2 23:48:21 cst 2005 i686 gnulinux ' -n='-n' -need_va_copy='undef' -netdb_hlen_type='size_t' -netdb_host_type='const void *' -netdb_name_type='const char *' -netdb_net_type='in_addr_t' -nm='nm' -nm_opt='' -nm_so_opt='--dynamic' -nonxs_ext='Errno' -nroff='nroff' -nvEUformat='"E"' -nvFUformat='"F"' -nvGUformat='"G"' -nv_preserves_uv_bits='32' -nveformat='"e"' -nvfformat='"f"' -nvgformat='"g"' -nvsize='8' -nvtype='double' -o_nonblock='O_NONBLOCK' -obj_ext='.o' -old_pthread_create_joinable='' -optimize='-O2' -orderlib='false' -osname='linux' -osvers='2.6.11-ck1' -otherlibdirs=' ' -package='perl5' -pager='/usr/bin/less' -passcat='cat /etc/passwd' -patchlevel='8' -path_sep=':' -perl5='hostperl' -perl='' -perl_patchlevel='' -perladmin='' -perllibs='-ldl -lm -lc -lcrypt' -perlpath='hostperl' -pg='pg' -phostname='hostname' -pidtype='pid_t' -plibpth='' -pmake='' -pr='' -prefix='/usr' -prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.4' -privlibexp='/usr/lib/perl5/5.8.4' -procselfexe='"/proc/self/exe"' -prototype='define' -ptrsize='4' -quadkind='3' -quadtype='long long' -randbits='48' -randfunc='drand48' -random_r_proto='0' -randseedtype='long' -ranlib=':' -rd_nodata='-1' -readdir64_r_proto='0' -readdir_r_proto='0' -revision='5' -rm='rm' -rmail='' -run='' -runnm='false' -sPRIEUldbl='"LE"' -sPRIFUldbl='"LF"' -sPRIGUldbl='"LG"' -sPRIXU64='"LX"' -sPRId64='"Ld"' -sPRIeldbl='"Le"' -sPRIfldbl='"Lf"' -sPRIgldbl='"Lg"' -sPRIi64='"Li"' -sPRIo64='"Lo"' -sPRIu64='"Lu"' -sPRIx64='"Lx"' -sSCNfldbl='"Lf"' -sched_yield='sched_yield()' -scriptdir='/usr/bin' -scriptdirexp='/usr/bin' -sed='sed' -seedfunc='srand48' -selectminbits='32' -selecttype='fd_set *' -sendmail='' -setgrent_r_proto='0' -sethostent_r_proto='0' -setlocale_r_proto='0' -setnetent_r_proto='0' -setprotoent_r_proto='0' -setpwent_r_proto='0' -setservent_r_proto='0' -sh='/bin/sh' -shar='' -sharpbang='#!' -shmattype='void *' -shortsize='2' -shrpenv='' -shsharp='true' -sig_count='65' -sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 RTMIN NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED ' -sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "RTMIN", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0' -sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 ' -sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' -sig_size='69' -signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.4/i686-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i686-linux' -sitebin='/usr/bin' -sitebinexp='/usr/bin' -sitehtml1dir='' -sitehtml1direxp='' -sitehtml3dir='' -sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.8.4' -sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.8.4' -siteman1dir='/usr/share/man/man1' -siteman1direxp='/usr/share/man/man1' -siteman3dir='/usr/share/man/man3' -siteman3direxp='/usr/share/man/man3' -siteprefix='/usr' -siteprefixexp='/usr' -sitescript='/usr/bin' -sitescriptexp='/usr/bin' -sizesize='4' -sizetype='size_t' -sleep='' -smail='' -so='so' -sockethdr='' -socketlib='' -socksizetype='socklen_t' -sort='sort' -spackage='Perl5' -spitshell='cat' -srand48_r_proto='0' -srandom_r_proto='0' -src='.' -ssizetype='ssize_t' -startperl='#!hostperl' -startsh='#!/bin/sh' -static_ext=' ' -stdchar='char' -stdio_base='((fp)->_IO_read_base)' -stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' -stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' -stdio_filbuf='' -stdio_ptr='((fp)->_IO_read_ptr)' -stdio_stream_array='' -strerror_r_proto='0' -strings='/usr/include/string.h' -submit='' -subversion='4' -sysman='/usr/share/man/man1' -tail='' -tar='' -targetarch='' -tbl='' -tee='' -test='test' -timeincl='/usr/include/sys/time.h /usr/include/time.h ' -timetype='time_t' -tmpnam_r_proto='0' -to=':' -touch='touch' -tr='tr' -trnl='\n' -troff='' -ttyname_r_proto='0' -u16size='2' -u16type='unsigned short' -u32size='4' -u32type='unsigned long' -u64size='8' -u64type='unsigned long long' -u8size='1' -u8type='unsigned char' -uidformat='"lu"' -uidsign='1' -uidsize='4' -uidtype='uid_t' -uname='uname' -uniq='uniq' -uquadtype='unsigned long long' -use5005threads='undef' -use64bitall='undef' -use64bitint='undef' -usecrosscompile='undef' -usedl='define' -usefaststdio='define' -useithreads='undef' -uselargefiles='define' -uselongdouble='undef' -usemallocwrap='define' -usemorebits='undef' -usemultiplicity='undef' -usemymalloc='n' -usenm='false' -useopcode='true' -useperlio='define' -useposix='true' -usereentrant='undef' -usesfio='false' -useshrplib='true' -usesocks='undef' -usethreads='undef' -usevendorprefix='undef' -usevfork='false' -usrinc='/usr/include' -uuname='' -uvXUformat='"lX"' -uvoformat='"lo"' -uvsize='4' -uvtype='unsigned long' -uvuformat='"lu"' -uvxformat='"lx"' -vendorarch='' -vendorarchexp='' -vendorbin='' -vendorbinexp='' -vendorhtml1dir=' ' -vendorhtml1direxp='' -vendorhtml3dir=' ' -vendorhtml3direxp='' -vendorlib='' -vendorlib_stem='' -vendorlibexp='' -vendorman1dir=' ' -vendorman1direxp='' -vendorman3dir=' ' -vendorman3direxp='' -vendorprefix='' -vendorprefixexp='' -vendorscript='' -vendorscriptexp='' -version='5.8.4' -version_patchlevel_string='version 8 subversion 4' -versiononly='undef' -vi='' -voidflags='15' -xlibpth='/usr/lib/386 /lib/386' -yacc='yacc' -yaccflags='' -zcat='' -zip='zip' -# Configure command line arguments. -config_arg0='./Configure' -config_args='' -config_argc=0 -PERL_REVISION=5 -PERL_VERSION=8 -PERL_SUBVERSION=4 -PERL_API_REVISION=5 -PERL_API_VERSION=8 -PERL_API_SUBVERSION=0 -PERL_PATCHLEVEL= -PERL_CONFIG_SH=true diff --git a/packages/perl/files/config.sh-mipsel-linux b/packages/perl/files/config.sh-mipsel-linux deleted file mode 100644 index eedf443f04..0000000000 --- a/packages/perl/files/config.sh-mipsel-linux +++ /dev/null @@ -1,1026 +0,0 @@ -#!/bin/sh -# -# This file was produced by running the Configure script. It holds all the -# definitions figured out by Configure. Should you modify one of these values, -# do not forget to propagate your changes by running "Configure -der". You may -# instead choose to run each of the .SH files by yourself, or "Configure -S". -# - -# Package name : perl5 -# Source directory : . -# Configuration time: Mon Sep 20 18:18:52 CEST 2004 -# Configured by : root -# Target system : linux mtx-nfs 2.4.24mtx #59 mon jul 12 15:19:41 cest 2004 mips gnulinux - -Author='' -Date='$Date' -Header='' -Id='$Id' -Locker='' -Log='$Log' -Mcc='Mcc' -RCSfile='$RCSfile' -Revision='$Revision' -Source='' -State='' -_a='.a' -_exe='' -_o='.o' -afs='false' -afsroot='/afs' -alignbytes='8' -ansi2knr='' -aphostname='/bin/hostname' -api_revision='5' -api_subversion='0' -api_version='8' -api_versionstring='5.8.0' -ar='ar' -archlib='/usr/lib/perl5/5.8.4/mipsel-linux' -archlibexp='/usr/lib/perl5/5.8.4/mipsel-linux' -archname64='' -archname='mips-linux' -archobjs='' -asctime_r_proto='0' -awk='awk' -baserev='5.0' -bash='' -bin='/usr/bin' -binexp='/usr/bin' -bison='bison' -byacc='byacc' -byteorder='1234' -c='' -castflags='0' -cat='cat' -cc='cc' -cccdlflags='-fpic' -ccdlflags='-rdynamic' -ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -ccname='gcc' -ccsymbols='__GNUC_MINOR__=3 __GNUC_PATCHLEVEL__=4' -ccversion='' -cf_by='root' -cf_email='root@mtx-nfs.nonet' -cf_time='Mon Sep 20 18:18:52 CEST 2004' -charsize='1' -chgrp='' -chmod='chmod' -chown='' -clocktype='clock_t' -comm='comm' -compress='' -contains='grep' -cp='cp' -cpio='' -cpp='cpp' -cpp_stuff='42' -cppccsymbols='__GNUC__=3' -cppflags='-fno-strict-aliasing -I/usr/local/include' -cpplast='-' -cppminus='-' -cpprun='cc -E' -cppstdin='cc -E' -cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNUC_MINOR__=3 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1' -crypt_r_proto='0' -cryptlib='' -csh='csh' -ctermid_r_proto='0' -ctime_r_proto='0' -d_Gconvert='gcvt((x),(n),(b))' -d_PRIEUldbl='define' -d_PRIFUldbl='define' -d_PRIGUldbl='define' -d_PRIXU64='define' -d_PRId64='define' -d_PRIeldbl='define' -d_PRIfldbl='define' -d_PRIgldbl='define' -d_PRIi64='define' -d_PRIo64='define' -d_PRIu64='define' -d_PRIx64='define' -d_SCNfldbl='define' -d__fwalk='undef' -d_access='define' -d_accessx='undef' -d_aintl='undef' -d_alarm='define' -d_archlib='define' -d_asctime_r='undef' -d_atolf='undef' -d_atoll='define' -d_attribut='define' -d_bcmp='define' -d_bcopy='define' -d_bsd='undef' -d_bsdgetpgrp='undef' -d_bsdsetpgrp='undef' -d_bzero='define' -d_casti32='define' -d_castneg='define' -d_charvspr='define' -d_chown='define' -d_chroot='define' -d_chsize='undef' -d_class='undef' -d_closedir='define' -d_cmsghdr_s='define' -d_const='define' -d_copysignl='define' -d_crypt='define' -d_crypt_r='undef' -d_csh='define' -d_ctermid_r='undef' -d_ctime_r='undef' -d_cuserid='define' -d_dbl_dig='define' -d_dbminitproto='undef' -d_difftime='define' -d_dirfd='define' -d_dirnamlen='undef' -d_dlerror='define' -d_dlopen='define' -d_dlsymun='undef' -d_dosuid='undef' -d_drand48_r='undef' -d_drand48proto='define' -d_dup2='define' -d_eaccess='undef' -d_endgrent='define' -d_endgrent_r='undef' -d_endhent='define' -d_endhostent_r='undef' -d_endnent='define' -d_endnetent_r='undef' -d_endpent='define' -d_endprotoent_r='undef' -d_endpwent='define' -d_endpwent_r='undef' -d_endsent='define' -d_endservent_r='undef' -d_eofnblk='define' -d_eunice='undef' -d_faststdio='undef' -d_fchdir='define' -d_fchmod='define' -d_fchown='define' -d_fcntl='define' -d_fcntl_can_lock='define' -d_fd_macros='define' -d_fd_set='define' -d_fds_bits='undef' -d_fgetpos='define' -d_finite='define' -d_finitel='define' -d_flexfnam='define' -d_flock='define' -d_flockproto='define' -d_fork='define' -d_fp_class='undef' -d_fpathconf='define' -d_fpclass='undef' -d_fpclassify='undef' -d_fpclassl='undef' -d_fpos64_t='undef' -d_frexpl='define' -d_fs_data_s='undef' -d_fseeko='define' -d_fsetpos='define' -d_fstatfs='define' -d_fstatvfs='define' -d_fsync='define' -d_ftello='define' -d_ftime='undef' -d_getcwd='define' -d_getespwnam='undef' -d_getfsstat='undef' -d_getgrent='define' -d_getgrent_r='undef' -d_getgrgid_r='undef' -d_getgrnam_r='undef' -d_getgrps='define' -d_gethbyaddr='define' -d_gethbyname='define' -d_gethent='define' -d_gethname='define' -d_gethostbyaddr_r='undef' -d_gethostbyname_r='undef' -d_gethostent_r='undef' -d_gethostprotos='define' -d_getitimer='define' -d_getlogin='define' -d_getlogin_r='undef' -d_getmnt='undef' -d_getmntent='define' -d_getnbyaddr='define' -d_getnbyname='define' -d_getnent='define' -d_getnetbyaddr_r='undef' -d_getnetbyname_r='undef' -d_getnetent_r='undef' -d_getnetprotos='define' -d_getpagsz='define' -d_getpbyname='define' -d_getpbynumber='define' -d_getpent='define' -d_getpgid='define' -d_getpgrp2='undef' -d_getpgrp='define' -d_getppid='define' -d_getprior='define' -d_getprotobyname_r='undef' -d_getprotobynumber_r='undef' -d_getprotoent_r='undef' -d_getprotoprotos='define' -d_getprpwnam='undef' -d_getpwent='define' -d_getpwent_r='undef' -d_getpwnam_r='undef' -d_getpwuid_r='undef' -d_getsbyname='define' -d_getsbyport='define' -d_getsent='define' -d_getservbyname_r='undef' -d_getservbyport_r='undef' -d_getservent_r='undef' -d_getservprotos='define' -d_getspnam='define' -d_getspnam_r='undef' -d_gettimeod='define' -d_gmtime_r='undef' -d_gnulibc='define' -d_grpasswd='define' -d_hasmntopt='define' -d_htonl='define' -d_ilogbl='define' -d_index='undef' -d_inetaton='define' -d_int64_t='define' -d_isascii='define' -d_isfinite='undef' -d_isinf='define' -d_isnan='define' -d_isnanl='define' -d_killpg='define' -d_lchown='define' -d_ldbl_dig='define' -d_link='define' -d_localtime_r='undef' -d_locconv='define' -d_lockf='define' -d_longdbl='define' -d_longlong='define' -d_lseekproto='define' -d_lstat='define' -d_madvise='define' -d_mblen='define' -d_mbstowcs='define' -d_mbtowc='define' -d_memchr='define' -d_memcmp='define' -d_memcpy='define' -d_memmove='define' -d_memset='define' -d_mkdir='define' -d_mkdtemp='define' -d_mkfifo='define' -d_mkstemp='define' -d_mkstemps='undef' -d_mktime='define' -d_mmap='define' -d_modfl='define' -d_modfl_pow32_bug='undef' -d_modflproto='undef' -d_mprotect='define' -d_msg='define' -d_msg_ctrunc='define' -d_msg_dontroute='define' -d_msg_oob='define' -d_msg_peek='define' -d_msg_proxy='define' -d_msgctl='define' -d_msgget='define' -d_msghdr_s='define' -d_msgrcv='define' -d_msgsnd='define' -d_msync='define' -d_munmap='define' -d_mymalloc='undef' -d_nice='define' -d_nl_langinfo='define' -d_nv_preserves_uv='define' -d_off64_t='undef' -d_old_pthread_create_joinable='undef' -d_oldpthreads='undef' -d_oldsock='undef' -d_open3='define' -d_pathconf='define' -d_pause='define' -d_perl_otherlibdirs='undef' -d_phostname='undef' -d_pipe='define' -d_poll='define' -d_portable='define' -d_procselfexe='define' -d_pthread_atfork='undef' -d_pthread_attr_setscope='define' -d_pthread_yield='undef' -d_pwage='undef' -d_pwchange='undef' -d_pwclass='undef' -d_pwcomment='undef' -d_pwexpire='undef' -d_pwgecos='define' -d_pwpasswd='define' -d_pwquota='undef' -d_qgcvt='define' -d_quad='define' -d_random_r='undef' -d_readdir64_r='undef' -d_readdir='define' -d_readdir_r='undef' -d_readlink='define' -d_readv='define' -d_recvmsg='define' -d_rename='define' -d_rewinddir='define' -d_rmdir='define' -d_safebcpy='undef' -d_safemcpy='undef' -d_sanemcmp='define' -d_sbrkproto='define' -d_scalbnl='define' -d_sched_yield='define' -d_scm_rights='define' -d_seekdir='define' -d_select='define' -d_sem='define' -d_semctl='define' -d_semctl_semid_ds='define' -d_semctl_semun='define' -d_semget='define' -d_semop='define' -d_sendmsg='define' -d_setegid='define' -d_seteuid='define' -d_setgrent='define' -d_setgrent_r='undef' -d_setgrps='define' -d_sethent='define' -d_sethostent_r='undef' -d_setitimer='define' -d_setlinebuf='define' -d_setlocale='define' -d_setlocale_r='undef' -d_setnent='define' -d_setnetent_r='undef' -d_setpent='define' -d_setpgid='define' -d_setpgrp2='undef' -d_setpgrp='define' -d_setprior='define' -d_setproctitle='undef' -d_setprotoent_r='undef' -d_setpwent='define' -d_setpwent_r='undef' -d_setregid='define' -d_setresgid='define' -d_setresuid='define' -d_setreuid='define' -d_setrgid='undef' -d_setruid='undef' -d_setsent='define' -d_setservent_r='undef' -d_setsid='define' -d_setvbuf='define' -d_sfio='undef' -d_shm='define' -d_shmat='define' -d_shmatprototype='define' -d_shmctl='define' -d_shmdt='define' -d_shmget='define' -d_sigaction='define' -d_sigprocmask='define' -d_sigsetjmp='define' -d_sockatmark='define' -d_sockatmarkproto='undef' -d_socket='define' -d_socklen_t='define' -d_sockpair='define' -d_socks5_init='undef' -d_sqrtl='define' -d_srand48_r='undef' -d_srandom_r='undef' -d_sresgproto='undef' -d_sresuproto='undef' -d_statblks='define' -d_statfs_f_flags='undef' -d_statfs_s='define' -d_statvfs='define' -d_stdio_cnt_lval='undef' -d_stdio_ptr_lval='undef' -d_stdio_ptr_lval_nochange_cnt='undef' -d_stdio_ptr_lval_sets_cnt='undef' -d_stdio_stream_array='undef' -d_stdiobase='undef' -d_stdstdio='undef' -d_strchr='define' -d_strcoll='define' -d_strctcpy='define' -d_strerrm='strerror(e)' -d_strerror='define' -d_strerror_r='undef' -d_strftime='define' -d_strtod='define' -d_strtol='define' -d_strtold='define' -d_strtoll='define' -d_strtoq='define' -d_strtoul='define' -d_strtoull='define' -d_strtouq='define' -d_strxfrm='define' -d_suidsafe='undef' -d_symlink='define' -d_syscall='define' -d_syscallproto='define' -d_sysconf='define' -d_sysernlst='' -d_syserrlst='define' -d_system='define' -d_tcgetpgrp='define' -d_tcsetpgrp='define' -d_telldir='define' -d_telldirproto='define' -d_time='define' -d_times='define' -d_tm_tm_gmtoff='define' -d_tm_tm_zone='define' -d_tmpnam_r='undef' -d_truncate='define' -d_ttyname_r='undef' -d_tzname='define' -d_u32align='undef' -d_ualarm='define' -d_umask='define' -d_uname='define' -d_union_semun='undef' -d_unordered='undef' -d_usleep='define' -d_usleepproto='define' -d_ustat='define' -d_vendorarch='undef' -d_vendorbin='undef' -d_vendorlib='undef' -d_vendorscript='undef' -d_vfork='undef' -d_void_closedir='undef' -d_voidsig='define' -d_voidtty='' -d_volatile='define' -d_vprintf='define' -d_wait4='define' -d_waitpid='define' -d_wcstombs='define' -d_wctomb='define' -d_writev='define' -d_xenix='undef' -date='date' -db_hashtype='u_int32_t' -db_prefixtype='size_t' -db_version_major='' -db_version_minor='' -db_version_patch='' -defvoidused='15' -direntrytype='struct dirent' -dlext='so' -dlsrc='dl_dlopen.xs' -doublesize='8' -drand01='drand48()' -drand48_r_proto='0' -dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' -eagain='EAGAIN' -ebcdic='undef' -echo='echo' -egrep='egrep' -emacs='' -endgrent_r_proto='0' -endhostent_r_proto='0' -endnetent_r_proto='0' -endprotoent_r_proto='0' -endpwent_r_proto='0' -endservent_r_proto='0' -eunicefix=':' -exe_ext='' -expr='expr' -extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno' -extras='' -fflushNULL='define' -fflushall='undef' -find='' -firstmakefile='makefile' -flex='' -fpossize='16' -fpostype='fpos_t' -freetype='void' -from=':' -full_ar='/usr/bin/ar' -full_csh='/bin/csh' -full_sed='/bin/sed' -gccansipedantic='' -gccosandvers='' -gccversion='3.3.4 (Debian 1:3.3.4-3)' -getgrent_r_proto='0' -getgrgid_r_proto='0' -getgrnam_r_proto='0' -gethostbyaddr_r_proto='0' -gethostbyname_r_proto='0' -gethostent_r_proto='0' -getlogin_r_proto='0' -getnetbyaddr_r_proto='0' -getnetbyname_r_proto='0' -getnetent_r_proto='0' -getprotobyname_r_proto='0' -getprotobynumber_r_proto='0' -getprotoent_r_proto='0' -getpwent_r_proto='0' -getpwnam_r_proto='0' -getpwuid_r_proto='0' -getservbyname_r_proto='0' -getservbyport_r_proto='0' -getservent_r_proto='0' -getspnam_r_proto='0' -gidformat='"lu"' -gidsign='1' -gidsize='4' -gidtype='gid_t' -glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' -gmake='gmake' -gmtime_r_proto='0' -gnulibc_version='2.3.2' -grep='grep' -groupcat='cat /etc/group' -groupstype='gid_t' -gzip='gzip' -h_fcntl='false' -h_sysfile='true' -hint='recommended' -hostcat='' -html1dir=' ' -html1direxp='' -html3dir=' ' -html3direxp='' -i16size='2' -i16type='short' -i32size='4' -i32type='long' -i64size='8' -i64type='long long' -i8size='1' -i8type='char' -i_arpainet='define' -i_bsdioctl='' -i_crypt='define' -i_db='undef' -i_dbm='undef' -i_dirent='define' -i_dld='undef' -i_dlfcn='define' -i_fcntl='undef' -i_float='define' -i_fp='undef' -i_fp_class='undef' -i_gdbm='undef' -i_grp='define' -i_ieeefp='undef' -i_inttypes='define' -i_langinfo='define' -i_libutil='undef' -i_limits='define' -i_locale='define' -i_machcthr='undef' -i_malloc='define' -i_math='define' -i_memory='undef' -i_mntent='define' -i_ndbm='undef' -i_netdb='define' -i_neterrno='undef' -i_netinettcp='define' -i_niin='define' -i_poll='define' -i_prot='undef' -i_pthread='define' -i_pwd='define' -i_rpcsvcdbm='undef' -i_sfio='undef' -i_sgtty='undef' -i_shadow='define' -i_socks='undef' -i_stdarg='define' -i_stddef='define' -i_stdlib='define' -i_string='define' -i_sunmath='undef' -i_sysaccess='undef' -i_sysdir='define' -i_sysfile='define' -i_sysfilio='undef' -i_sysin='undef' -i_sysioctl='define' -i_syslog='define' -i_sysmman='define' -i_sysmode='undef' -i_sysmount='define' -i_sysndir='undef' -i_sysparam='define' -i_sysresrc='define' -i_syssecrt='undef' -i_sysselct='define' -i_syssockio='undef' -i_sysstat='define' -i_sysstatfs='define' -i_sysstatvfs='define' -i_systime='define' -i_systimek='undef' -i_systimes='define' -i_systypes='define' -i_sysuio='define' -i_sysun='define' -i_sysutsname='define' -i_sysvfs='define' -i_syswait='define' -i_termio='undef' -i_termios='define' -i_time='define' -i_unistd='define' -i_ustat='define' -i_utime='define' -i_values='define' -i_varargs='undef' -i_varhdr='stdarg.h' -i_vfork='undef' -ignore_versioned_solibs='y' -inc_version_list=' ' -inc_version_list_init='0' -incpath='' -inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.4/mipsel-linux' -installbin='./install_me_here/usr/bin' -installhtml1dir='' -installhtml3dir='' -installman1dir='./install_me_here/usr/share/man/man1' -installman3dir='./install_me_here/usr/share/man/man3' -installprefix='./install_me_here/usr' -installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.4' -installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' -installsitebin='./install_me_here/usr/bin' -installsitehtml1dir='' -installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' -installsiteman1dir='./install_me_here/usr/share/man/man1' -installsiteman3dir='./install_me_here/usr/share/man/man3' -installsitescript='./install_me_here/usr/bin' -installstyle='./install_me_herelib/perl5' -installusrbinperl='undef' -installvendorarch='' -installvendorbin='' -installvendorhtml1dir='' -installvendorhtml3dir='' -installvendorlib='' -installvendorman1dir='' -installvendorman3dir='' -installvendorscript='' -intsize='4' -issymlink='/usr/bin/test -h' -ivdformat='"ld"' -ivsize='4' -ivtype='long' -known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' -ksh='' -ld='cc' -lddlflags='-shared -L/usr/local/lib' -ldflags=' -L/usr/local/lib' -ldflags_uselargefiles='' -ldlibpthname='LD_LIBRARY_PATH' -less='less' -lib_ext='.a' -libc='/lib/libc-2.3.2.so' -libperl='libperl.so' -libpth='/usr/local/lib /lib /usr/lib' -libs='-lnsl -ldl -lm -lcrypt -lutil -lc' -libsdirs=' /usr/lib' -libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' -libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' -libspath=' /usr/local/lib /lib /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' -libswanted_uselargefiles='' -line='' -lint='' -lkflags='' -ln='ln' -lns='/bin/ln -s' -localtime_r_proto='0' -locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' -loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' -longdblsize='8' -longlongsize='8' -longsize='4' -lp='' -lpr='' -ls='ls' -lseeksize='8' -lseektype='off_t' -mail='' -mailx='' -make='make' -make_set_make='#' -mallocobj='' -mallocsrc='' -malloctype='void *' -man1dir='/usr/share/man/man1' -man1direxp='/usr/share/man/man1' -man1ext='1' -man3dir='/usr/share/man/man3' -man3direxp='/usr/share/man/man3' -man3ext='3' -mips_type='' -mistrustnm='' -mkdir='mkdir' -mmaptype='void *' -modetype='mode_t' -more='more' -multiarch='undef' -mv='' -myarchname='mips-linux' -mydomain='.nonet' -myhostname='mtx-nfs' -myuname='linux mtx-nfs 2.4.24mtx #59 mon jul 12 15:19:41 cest 2004 mips gnulinux ' -n='-n' -need_va_copy='undef' -netdb_hlen_type='size_t' -netdb_host_type='const void *' -netdb_name_type='const char *' -netdb_net_type='in_addr_t' -nm='nm' -nm_opt='' -nm_so_opt='--dynamic' -nonxs_ext='Errno' -nroff='nroff' -nvEUformat='"E"' -nvFUformat='"F"' -nvGUformat='"G"' -nv_preserves_uv_bits='32' -nveformat='"e"' -nvfformat='"f"' -nvgformat='"g"' -nvsize='8' -nvtype='double' -o_nonblock='O_NONBLOCK' -obj_ext='.o' -old_pthread_create_joinable='' -optimize='-O2' -orderlib='false' -osname='linux' -osvers='2.4.24mtx' -otherlibdirs=' ' -package='perl5' -pager='/usr/bin/less' -passcat='cat /etc/passwd' -patchlevel='8' -path_sep=':' -perl5='/usr/bin/perl' -perl='' -perl_patchlevel='' -perladmin='root@mtx-nfs.nonet' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' -perlpath='/usr/bin/perl' -pg='pg' -phostname='hostname' -pidtype='pid_t' -plibpth='' -pm_apiversion='5.005' -pmake='' -pr='' -prefix='/usr' -prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.4' -privlibexp='/usr/lib/perl5/5.8.4' -procselfexe='"/proc/self/exe"' -prototype='define' -ptrsize='4' -quadkind='3' -quadtype='long long' -randbits='48' -randfunc='drand48' -random_r_proto='0' -randseedtype='long' -ranlib=':' -rd_nodata='-1' -readdir64_r_proto='0' -readdir_r_proto='0' -revision='5' -rm='rm' -rmail='' -run='' -runnm='false' -sPRIEUldbl='"E"' -sPRIFUldbl='"F"' -sPRIGUldbl='"G"' -sPRIXU64='"LX"' -sPRId64='"Ld"' -sPRIeldbl='"e"' -sPRIfldbl='"f"' -sPRIgldbl='"g"' -sPRIi64='"Li"' -sPRIo64='"Lo"' -sPRIu64='"Lu"' -sPRIx64='"Lx"' -sSCNfldbl='"f"' -sched_yield='sched_yield()' -scriptdir='/usr/bin' -scriptdirexp='/usr/bin' -sed='sed' -seedfunc='srand48' -selectminbits='32' -selecttype='fd_set *' -sendmail='' -setgrent_r_proto='0' -sethostent_r_proto='0' -setlocale_r_proto='0' -setnetent_r_proto='0' -setprotoent_r_proto='0' -setpwent_r_proto='0' -setservent_r_proto='0' -sh='/bin/sh' -shar='' -sharpbang='#!' -shmattype='void *' -shortsize='2' -shrpenv='' -shsharp='true' -sig_count='128' -sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ NUM32 NUM33 NUM34 RTMIN NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL ' -sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "NUM32", "NUM33", "NUM34", "RTMIN", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0' -sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 ' -sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' -sig_size='131' -signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' -sitebin='/usr/bin' -sitebinexp='/usr/bin' -sitehtml1dir='' -sitehtml1direxp='' -sitehtml3dir='' -sitehtml3direxp='' -sitelib='/usr/lib/perl5' -sitelib_stem='/usr/lib/perl5' -sitelibexp='/usr/lib/perl5' -siteman1dir='/usr/share/man/man1' -siteman1direxp='/usr/share/man/man1' -siteman3dir='/usr/share/man/man3' -siteman3direxp='/usr/share/man/man3' -siteprefix='/usr' -siteprefixexp='/usr' -sitescript='/usr/bin' -sitescriptexp='/usr/bin' -sizesize='4' -sizetype='size_t' -sleep='' -smail='' -so='so' -sockethdr='' -socketlib='' -socksizetype='socklen_t' -sort='sort' -spackage='Perl5' -spitshell='cat' -srand48_r_proto='0' -srandom_r_proto='0' -src='.' -ssizetype='ssize_t' -startperl='#!/usr/bin/perl' -startsh='#!/bin/sh' -static_ext=' ' -stdchar='char' -stdio_base='((fp)->_IO_read_base)' -stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' -stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' -stdio_filbuf='' -stdio_ptr='((fp)->_IO_read_ptr)' -stdio_stream_array='' -strerror_r_proto='0' -strings='/usr/include/string.h' -submit='' -subversion='3' -sysman='/usr/share/man/man1' -tail='' -tar='' -targetarch='' -tbl='' -tee='' -test='test' -timeincl='/usr/include/sys/time.h /usr/include/time.h ' -timetype='time_t' -tmpnam_r_proto='0' -to=':' -touch='touch' -tr='tr' -trnl='\n' -troff='' -ttyname_r_proto='0' -u16size='2' -u16type='unsigned short' -u32size='4' -u32type='unsigned long' -u64size='8' -u64type='unsigned long long' -u8size='1' -u8type='unsigned char' -uidformat='"lu"' -uidsign='1' -uidsize='4' -uidtype='uid_t' -uname='uname' -uniq='uniq' -uquadtype='unsigned long long' -use5005threads='undef' -use64bitall='undef' -use64bitint='undef' -usecrosscompile='undef' -usedl='define' -usefaststdio='define' -useithreads='undef' -uselargefiles='define' -uselongdouble='undef' -usemorebits='undef' -usemultiplicity='undef' -usemymalloc='n' -usemallocwrap='define' -usenm='false' -useopcode='true' -useperlio='define' -useposix='true' -usereentrant='undef' -usesfio='false' -useshrplib='true' -usesocks='undef' -usethreads='undef' -usevendorprefix='undef' -usevfork='false' -usrinc='/usr/include' -uuname='' -uvXUformat='"lX"' -uvoformat='"lo"' -uvsize='4' -uvtype='unsigned long' -uvuformat='"lu"' -uvxformat='"lx"' -vendorarch='' -vendorarchexp='' -vendorbin='' -vendorbinexp='' -vendorhtml1dir=' ' -vendorhtml1direxp='' -vendorhtml3dir=' ' -vendorhtml3direxp='' -vendorlib='' -vendorlib_stem='' -vendorlibexp='' -vendorman1dir=' ' -vendorman1direxp='' -vendorman3dir=' ' -vendorman3direxp='' -vendorprefix='' -vendorprefixexp='' -vendorscript='' -vendorscriptexp='' -version='5.8.4' -version_patchlevel_string='version 8 subversion 3' -versiononly='undef' -vi='' -voidflags='15' -xlibpth='/usr/lib/386 /lib/386' -xs_apiversion='5.8.4' -yacc='yacc' -yaccflags='' -zcat='' -zip='zip' -# Configure command line arguments. -config_arg0='./Configure' -config_args='-des' -config_argc=1 -config_arg1='-des' -PERL_REVISION=5 -PERL_VERSION=8 -PERL_SUBVERSION=3 -PERL_API_REVISION=5 -PERL_API_VERSION=8 -PERL_API_SUBVERSION=0 -PERL_PATCHLEVELPERL_CONFIG_SH=true diff --git a/packages/perl/files/uclibc.patch b/packages/perl/files/uclibc.patch deleted file mode 100644 index ce8fe80ff2..0000000000 --- a/packages/perl/files/uclibc.patch +++ /dev/null @@ -1,26 +0,0 @@ -As seen at http://codepoet.org/lists/uclibc/2004-March/008512.html: - -Try the following (untested). In .26, the field member was filedes. -Current cvs uses __filedes (double underscore prefix). - -Manuel - ---- perl-5.8.4.orig/perlio.c 2004-03-22 14:54:03.000000000 -0500 -+++ perl-5.8.4/perlio.c 2005-03-09 04:33:49.386767312 -0500 -@@ -2824,7 +2824,15 @@ - /* XXX this could use PerlIO_canset_fileno() and - * PerlIO_set_fileno() support from Configure - */ --# if defined(__GLIBC__) -+# if defined(__UCLIBC__) -+ /* uClibc must come before glibc because it defines __GLIBC__ as well. */ -+# if defined(__MASK_READING) -+ f->__filedes = -1; -+# else -+ f->filedes = -1; -+# endif -+ return 1; -+# elif defined(__GLIBC__) - /* There may be a better way for GLIBC: - - libio.h defines a flag to not close() on cleanup - */ diff --git a/packages/perl/perl-5.8.4/.mtn2git_empty b/packages/perl/perl-5.8.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/perl/perl-5.8.4/Makefile.SH.patch b/packages/perl/perl-5.8.4/Makefile.SH.patch new file mode 100644 index 0000000000..35a4e6dfde --- /dev/null +++ b/packages/perl/perl-5.8.4/Makefile.SH.patch @@ -0,0 +1,298 @@ +*** ./Makefile.SH Wed Aug 4 12:16:15 2004 +--- ./Makefile.SH.patch Wed Aug 4 14:03:42 2004 +*************** +*** 110,127 **** + # INSTALL file, under "Building a shared perl library". + # If there is no pre-existing $libperl, we don't need + # to do anything further. +! if test -f $archlib/CORE/$libperl; then +! rm -f preload +! cat <<'EOT' > preload +! #! /bin/sh +! lib=$1 +! shift +! test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" +! exec "$@" +! EOT +! chmod 755 preload +! ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" +! fi + ;; + os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" + ;; +--- 110,116 ---- + # INSTALL file, under "Building a shared perl library". + # If there is no pre-existing $libperl, we don't need + # to do anything further. +! echo linux libraries overwritten by cross-compile patches + ;; + os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" + ;; +*************** +*** 349,357 **** + .c.s: + $(CCCMDSRC) -S $*.c + +! all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make +! @echo " "; +! @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." + + .PHONY: all compile translators utilities + +--- 338,358 ---- + .c.s: + $(CCCMDSRC) -S $*.c + +! #all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make +! # @echo " "; +! # @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." +! +! all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) +! mv miniperl miniperl-cross +! ln -s hostperl miniperl +! +! more: extra.pods $(private) $(public) +! +! more2: $(dynamic_ext) +! +! more3: $(nonxs_ext) +! +! more4: extras.make + + .PHONY: all compile translators utilities + +*************** +*** 361,370 **** + cd x2p; $(MAKE) compile; + cd pod; $(MAKE) compile; + +! translators: miniperl$(EXE_EXT) lib/Config.pm FORCE + @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all + +! utilities: miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE + @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all + + +--- 362,371 ---- + cd x2p; $(MAKE) compile; + cd pod; $(MAKE) compile; + +! translators: lib/Config.pm FORCE + @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all + +! utilities: lib/Config.pm $(plextract) lib/lib.pm FORCE + @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all + + +*************** +*** 541,547 **** + $(CC) -o miniperl $(CLDFLAGS) \ + `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) +! $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + beos*|next4*) +--- 542,548 ---- + $(CC) -o miniperl $(CLDFLAGS) \ + `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) +! # $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + beos*|next4*) +*************** +*** 549,555 **** + miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) + $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) +! $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + darwin*) +--- 550,556 ---- + miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) + $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) +! # $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + darwin*) +*************** +*** 716,722 **** + # We need to autosplit in two steps because VOS can't handle so many args + # + .PHONY: preplibrary +! preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) + @sh ./makedir lib/auto + @echo " AutoSplitting perl library" + $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ +--- 717,723 ---- + # We need to autosplit in two steps because VOS can't handle so many args + # + .PHONY: preplibrary +! preplibrary: lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) + @sh ./makedir lib/auto + @echo " AutoSplitting perl library" + $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ +*************** +*** 728,738 **** + # Take care to avoid modifying lib/Config.pm without reason + # (If trying to create a new port and having problems with the configpm script, + # try 'make minitest' and/or commenting out the tests at the end of configpm.) +! lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary + $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp + sh mv-if-diff configpm.tmp $@ + +! lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm + $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp + sh mv-if-diff minimod.tmp $@ + -touch lib/ExtUtils/Miniperl.pm +--- 729,739 ---- + # Take care to avoid modifying lib/Config.pm without reason + # (If trying to create a new port and having problems with the configpm script, + # try 'make minitest' and/or commenting out the tests at the end of configpm.) +! lib/Config.pm: config.sh configpm Porting/Glossary + $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp + sh mv-if-diff configpm.tmp $@ + +! lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl lib/Config.pm + $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp + sh mv-if-diff minimod.tmp $@ + -touch lib/ExtUtils/Miniperl.pm +*************** +*** 740,757 **** + lib/re.pm: ext/re/re.pm + cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm + +! $(plextract): miniperl$(EXE_EXT) lib/Config.pm x2p/s2p + @-rm -f $@ + $(LDLIBPTH) ./miniperl -Ilib $@.PL + +! x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL + cd x2p; $(LDLIBPTH) $(MAKE) s2p + +! lib/lib.pm: miniperl$(EXE_EXT) lib/Config.pm + @-rm -f $@ + $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL + +! extra.pods: miniperl$(EXE_EXT) + -@test -f extra.pods && rm -f `cat extra.pods` + -@rm -f extra.pods + -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ +--- 741,758 ---- + lib/re.pm: ext/re/re.pm + cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm + +! $(plextract): lib/Config.pm x2p/s2p + @-rm -f $@ + $(LDLIBPTH) ./miniperl -Ilib $@.PL + +! x2p/s2p: lib/Config.pm x2p/s2p.PL + cd x2p; $(LDLIBPTH) $(MAKE) s2p + +! lib/lib.pm: lib/Config.pm + @-rm -f $@ + $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL + +! extra.pods: + -@test -f extra.pods && rm -f `cat extra.pods` + -@rm -f extra.pods + -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ +*************** +*** 798,815 **** + INSTALL_DEPENDENCE = all + + install.perl: $(INSTALL_DEPENDENCE) installperl +! if [ -n "$(COMPILE)" ]; \ +! then \ +! cd utils; $(MAKE) compile; \ +! cd ../x2p; $(MAKE) compile; \ +! cd ../pod; $(MAKE) compile; \ +! else :; \ +! fi +! $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) +! $(MAKE) extras.install +! +! install.man: all installman +! $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) + + # XXX Experimental. Hardwired values, but useful for testing. + # Eventually Configure could ask for some of these values. +--- 799,805 ---- + INSTALL_DEPENDENCE = all + + install.perl: $(INSTALL_DEPENDENCE) installperl +! hostperl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS) + + # XXX Experimental. Hardwired values, but useful for testing. + # Eventually Configure could ask for some of these values. +*************** +*** 925,940 **** + # + # DynaLoader may be needed for extensions that use Makefile.PL. + +! $(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +! d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +! s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +! n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + + .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ +--- 915,930 ---- + # + # DynaLoader may be needed for extensions that use Makefile.PL. + +! $(DYNALOADER): preplibrary FORCE + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +! d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +! s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +! n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + + .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ +*************** +*** 1074,1080 **** + + test_prep_pre: preplibrary utilities $(nonxs_ext) + +! test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) + PERL=./perl $(MAKE) _test_prep + + _test_tty: +--- 1064,1070 ---- + + test_prep_pre: preplibrary utilities $(nonxs_ext) + +! test_prep: test_prep_pre perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) + PERL=./perl $(MAKE) _test_prep + + _test_tty: +*************** +*** 1167,1173 **** + + # Can't depend on lib/Config.pm because that might be where miniperl + # is crashing. +! minitest: miniperl$(EXE_EXT) lib/re.pm + -@test -f lib/lib.pm && test -f lib/Config.pm || \ + $(MAKE) lib/Config.pm lib/lib.pm + @echo " " +--- 1157,1163 ---- + + # Can't depend on lib/Config.pm because that might be where miniperl + # is crashing. +! minitest: lib/re.pm + -@test -f lib/lib.pm && test -f lib/Config.pm || \ + $(MAKE) lib/Config.pm lib/lib.pm + @echo " " diff --git a/packages/perl/perl-5.8.4/Makefile.patch b/packages/perl/perl-5.8.4/Makefile.patch new file mode 100644 index 0000000000..eec127643b --- /dev/null +++ b/packages/perl/perl-5.8.4/Makefile.patch @@ -0,0 +1,23 @@ +*** ./Cross/Makefile 2004-01-12 13:44:01.000000000 -0700 +--- ./Cross/Makefile.patch 2004-08-03 16:34:18.000000000 -0700 +*************** +*** 58,66 **** + $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh + cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more + cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library +! cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" +! cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" +! cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" + cd $(TOPDIR)/.. ; rm -rf install_me_here + cd $(TOPDIR)/.. ; make install-strip + cd $(TOPDIR)/.. ; sh -x Cross/warp +--- 58,66 ---- + $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh + cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more + cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library +! cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" +! cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" +! cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" + cd $(TOPDIR)/.. ; rm -rf install_me_here + cd $(TOPDIR)/.. ; make install-strip + cd $(TOPDIR)/.. ; sh -x Cross/warp diff --git a/packages/perl/perl-5.8.4/config.sh-arm-linux.patch b/packages/perl/perl-5.8.4/config.sh-arm-linux.patch new file mode 100644 index 0000000000..44d8b1a89d --- /dev/null +++ b/packages/perl/perl-5.8.4/config.sh-arm-linux.patch @@ -0,0 +1,46 @@ +*** ./Cross/config.sh-arm-linux Mon Dec 22 06:00:37 2003 +--- ./Cross/config.sh-arm-linux.patch Tue Aug 3 17:57:08 2004 +*************** +*** 794,805 **** + passcat='cat /etc/passwd' + patchlevel='8' + path_sep=':' +! perl5='/usr/bin/perl' + perl='' + perl_patchlevel='' + perladmin='red@criticalintegration.com' + perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +! perlpath='/usr/bin/perl' + pg='pg' + phostname='hostname' + pidtype='pid_t' +--- 794,805 ---- + passcat='cat /etc/passwd' + patchlevel='8' + path_sep=':' +! perl5='hostperl' + perl='' + perl_patchlevel='' + perladmin='red@criticalintegration.com' + perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +! perlpath='hostperl' + pg='pg' + phostname='hostname' + pidtype='pid_t' +*************** +*** 905,911 **** + srandom_r_proto='0' + src='.' + ssizetype='ssize_t' +! startperl='#!/usr/bin/perl' + startsh='#!/bin/sh' + static_ext=' ' + stdchar='char' +--- 905,911 ---- + srandom_r_proto='0' + src='.' + ssizetype='ssize_t' +! startperl='#!hostperl' + startsh='#!/bin/sh' + static_ext=' ' + stdchar='char' diff --git a/packages/perl/perl-5.8.4/config.sh-i686-linux b/packages/perl/perl-5.8.4/config.sh-i686-linux new file mode 100644 index 0000000000..0978100abc --- /dev/null +++ b/packages/perl/perl-5.8.4/config.sh-i686-linux @@ -0,0 +1,1024 @@ +#!/bin/sh +# +# This file was produced by running the Configure script. It holds all the +# definitions figured out by Configure. Should you modify one of these values, +# do not forget to propagate your changes by running "Configure -der". You may +# instead choose to run each of the .SH files by yourself, or "Configure -S". +# + +# Package name : perl5 +# Source directory : . +# Configuration time: Wed Mar 9 04:09:49 CST 2005 +# Configured by : kergoth +# Target system : linux hyperion 2.6.11-ck1 #1 wed mar 2 23:48:21 cst 2005 i686 gnulinux + +Author='' +Date='$Date' +Header='' +Id='$Id' +Locker='' +Log='$Log' +Mcc='Mcc' +RCSfile='$RCSfile' +Revision='$Revision' +Source='' +State='' +_a='.a' +_exe='' +_o='.o' +afs='false' +afsroot='/afs' +alignbytes='4' +ansi2knr='' +aphostname='/bin/hostname' +api_revision='5' +api_subversion='0' +api_version='8' +api_versionstring='5.8.0' +ar='ar' +archlib='/usr/lib/perl5/5.8.4/i686-linux' +archlibexp='/usr/lib/perl5/5.8.4/i686-linux' +archname64='' +archname='i686-linux' +archobjs='' +asctime_r_proto='0' +awk='awk' +baserev='5.0' +bash='' +bin='/usr/bin' +binexp='/usr/bin' +bison='bison' +byacc='byacc' +byteorder='1234' +c='' +castflags='0' +cat='cat' +cc='cc' +cccdlflags='-fpic' +ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i686-linux/CORE' +ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccname='gcc' +ccsymbols='__GNUC_PATCHLEVEL__=5' +ccversion='' +cf_by='kergoth' +cf_email='kergoth@hyperion.kergoth.com' +cf_time='Wed Mar 9 04:09:49 CST 2005' +charsize='1' +chgrp='' +chmod='chmod' +chown='' +clocktype='clock_t' +comm='comm' +compress='' +contains='grep' +cp='cp' +cpio='' +cpp='cpp' +cpp_stuff='42' +cppccsymbols='__GNUC__=3 __GNUC_MINOR__=3' +cppflags='-fno-strict-aliasing -I/usr/local/include' +cpplast='-' +cppminus='-' +cpprun='cc -E' +cppstdin='cc -E' +cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNU_LIBRARY__=6 i386=1 __i386=1 __i386__=1 __i486=1 __i486__=1 _LARGEFILE_SOURCE=1 linux=1 __linux=1 __linux__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 unix=1 __unix=1 __unix__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1' +crypt_r_proto='0' +cryptlib='' +csh='csh' +ctermid_r_proto='0' +ctime_r_proto='0' +d_Gconvert='gcvt((x),(n),(b))' +d_PRIEUldbl='define' +d_PRIFUldbl='define' +d_PRIGUldbl='define' +d_PRIXU64='define' +d_PRId64='define' +d_PRIeldbl='define' +d_PRIfldbl='define' +d_PRIgldbl='define' +d_PRIi64='define' +d_PRIo64='define' +d_PRIu64='define' +d_PRIx64='define' +d_SCNfldbl='define' +d__fwalk='undef' +d_access='define' +d_accessx='undef' +d_aintl='undef' +d_alarm='define' +d_archlib='define' +d_asctime_r='undef' +d_atolf='undef' +d_atoll='define' +d_attribut='define' +d_bcmp='define' +d_bcopy='define' +d_bsd='undef' +d_bsdgetpgrp='undef' +d_bsdsetpgrp='undef' +d_bzero='define' +d_casti32='undef' +d_castneg='define' +d_charvspr='define' +d_chown='define' +d_chroot='define' +d_chsize='undef' +d_class='undef' +d_closedir='define' +d_cmsghdr_s='define' +d_const='define' +d_copysignl='define' +d_crypt='define' +d_crypt_r='undef' +d_csh='undef' +d_ctermid_r='undef' +d_ctime_r='undef' +d_cuserid='define' +d_dbl_dig='define' +d_dbminitproto='undef' +d_difftime='define' +d_dirfd='define' +d_dirnamlen='undef' +d_dlerror='define' +d_dlopen='define' +d_dlsymun='undef' +d_dosuid='undef' +d_drand48_r='undef' +d_drand48proto='define' +d_dup2='define' +d_eaccess='undef' +d_endgrent='define' +d_endgrent_r='undef' +d_endhent='define' +d_endhostent_r='undef' +d_endnent='define' +d_endnetent_r='undef' +d_endpent='define' +d_endprotoent_r='undef' +d_endpwent='define' +d_endpwent_r='undef' +d_endsent='define' +d_endservent_r='undef' +d_eofnblk='define' +d_eunice='undef' +d_faststdio='undef' +d_fchdir='define' +d_fchmod='define' +d_fchown='define' +d_fcntl='define' +d_fcntl_can_lock='define' +d_fd_macros='define' +d_fd_set='define' +d_fds_bits='undef' +d_fgetpos='define' +d_finite='define' +d_finitel='define' +d_flexfnam='define' +d_flock='define' +d_flockproto='define' +d_fork='define' +d_fp_class='undef' +d_fpathconf='define' +d_fpclass='undef' +d_fpclassify='undef' +d_fpclassl='undef' +d_fpos64_t='undef' +d_frexpl='define' +d_fs_data_s='undef' +d_fseeko='define' +d_fsetpos='define' +d_fstatfs='define' +d_fstatvfs='define' +d_fsync='define' +d_ftello='define' +d_ftime='undef' +d_getcwd='define' +d_getespwnam='undef' +d_getfsstat='undef' +d_getgrent='define' +d_getgrent_r='undef' +d_getgrgid_r='undef' +d_getgrnam_r='undef' +d_getgrps='define' +d_gethbyaddr='define' +d_gethbyname='define' +d_gethent='define' +d_gethname='define' +d_gethostbyaddr_r='undef' +d_gethostbyname_r='undef' +d_gethostent_r='undef' +d_gethostprotos='define' +d_getitimer='define' +d_getlogin='define' +d_getlogin_r='undef' +d_getmnt='undef' +d_getmntent='define' +d_getnbyaddr='define' +d_getnbyname='define' +d_getnent='define' +d_getnetbyaddr_r='undef' +d_getnetbyname_r='undef' +d_getnetent_r='undef' +d_getnetprotos='define' +d_getpagsz='define' +d_getpbyname='define' +d_getpbynumber='define' +d_getpent='define' +d_getpgid='define' +d_getpgrp2='undef' +d_getpgrp='define' +d_getppid='define' +d_getprior='define' +d_getprotobyname_r='undef' +d_getprotobynumber_r='undef' +d_getprotoent_r='undef' +d_getprotoprotos='define' +d_getprpwnam='undef' +d_getpwent='define' +d_getpwent_r='undef' +d_getpwnam_r='undef' +d_getpwuid_r='undef' +d_getsbyname='define' +d_getsbyport='define' +d_getsent='define' +d_getservbyname_r='undef' +d_getservbyport_r='undef' +d_getservent_r='undef' +d_getservprotos='define' +d_getspnam='define' +d_getspnam_r='undef' +d_gettimeod='define' +d_gmtime_r='undef' +d_gnulibc='define' +d_grpasswd='define' +d_hasmntopt='define' +d_htonl='define' +d_ilogbl='define' +d_index='undef' +d_inetaton='define' +d_int64_t='define' +d_isascii='define' +d_isfinite='undef' +d_isinf='define' +d_isnan='define' +d_isnanl='define' +d_killpg='define' +d_lchown='define' +d_ldbl_dig='define' +d_link='define' +d_localtime_r='undef' +d_locconv='define' +d_lockf='define' +d_longdbl='define' +d_longlong='define' +d_lseekproto='define' +d_lstat='define' +d_madvise='define' +d_mblen='define' +d_mbstowcs='define' +d_mbtowc='define' +d_memchr='define' +d_memcmp='define' +d_memcpy='define' +d_memmove='define' +d_memset='define' +d_mkdir='define' +d_mkdtemp='define' +d_mkfifo='define' +d_mkstemp='define' +d_mkstemps='undef' +d_mktime='define' +d_mmap='define' +d_modfl='define' +d_modfl_pow32_bug='undef' +d_modflproto='undef' +d_mprotect='define' +d_msg='define' +d_msg_ctrunc='define' +d_msg_dontroute='define' +d_msg_oob='define' +d_msg_peek='define' +d_msg_proxy='define' +d_msgctl='define' +d_msgget='define' +d_msghdr_s='define' +d_msgrcv='define' +d_msgsnd='define' +d_msync='define' +d_munmap='define' +d_mymalloc='undef' +d_nice='define' +d_nl_langinfo='define' +d_nv_preserves_uv='define' +d_off64_t='undef' +d_old_pthread_create_joinable='undef' +d_oldpthreads='undef' +d_oldsock='undef' +d_open3='define' +d_pathconf='define' +d_pause='define' +d_perl_otherlibdirs='undef' +d_phostname='undef' +d_pipe='define' +d_poll='define' +d_portable='define' +d_procselfexe='define' +d_pthread_atfork='undef' +d_pthread_attr_setscope='define' +d_pthread_yield='undef' +d_pwage='undef' +d_pwchange='undef' +d_pwclass='undef' +d_pwcomment='undef' +d_pwexpire='undef' +d_pwgecos='define' +d_pwpasswd='define' +d_pwquota='undef' +d_qgcvt='define' +d_quad='define' +d_random_r='undef' +d_readdir64_r='undef' +d_readdir='define' +d_readdir_r='undef' +d_readlink='define' +d_readv='define' +d_recvmsg='define' +d_rename='define' +d_rewinddir='define' +d_rmdir='define' +d_safebcpy='undef' +d_safemcpy='undef' +d_sanemcmp='define' +d_sbrkproto='define' +d_scalbnl='define' +d_sched_yield='define' +d_scm_rights='define' +d_seekdir='define' +d_select='define' +d_sem='define' +d_semctl='define' +d_semctl_semid_ds='define' +d_semctl_semun='define' +d_semget='define' +d_semop='define' +d_sendmsg='define' +d_setegid='define' +d_seteuid='define' +d_setgrent='define' +d_setgrent_r='undef' +d_setgrps='define' +d_sethent='define' +d_sethostent_r='undef' +d_setitimer='define' +d_setlinebuf='define' +d_setlocale='define' +d_setlocale_r='undef' +d_setnent='define' +d_setnetent_r='undef' +d_setpent='define' +d_setpgid='define' +d_setpgrp2='undef' +d_setpgrp='define' +d_setprior='define' +d_setproctitle='undef' +d_setprotoent_r='undef' +d_setpwent='define' +d_setpwent_r='undef' +d_setregid='define' +d_setresgid='define' +d_setresuid='define' +d_setreuid='define' +d_setrgid='undef' +d_setruid='undef' +d_setsent='define' +d_setservent_r='undef' +d_setsid='define' +d_setvbuf='define' +d_sfio='undef' +d_shm='define' +d_shmat='define' +d_shmatprototype='define' +d_shmctl='define' +d_shmdt='define' +d_shmget='define' +d_sigaction='define' +d_sigprocmask='define' +d_sigsetjmp='define' +d_sockatmark='define' +d_sockatmarkproto='undef' +d_socket='define' +d_socklen_t='define' +d_sockpair='define' +d_socks5_init='undef' +d_sqrtl='define' +d_srand48_r='undef' +d_srandom_r='undef' +d_sresgproto='undef' +d_sresuproto='undef' +d_statblks='define' +d_statfs_f_flags='undef' +d_statfs_s='define' +d_statvfs='define' +d_stdio_cnt_lval='undef' +d_stdio_ptr_lval='undef' +d_stdio_ptr_lval_nochange_cnt='undef' +d_stdio_ptr_lval_sets_cnt='undef' +d_stdio_stream_array='undef' +d_stdiobase='undef' +d_stdstdio='undef' +d_strchr='define' +d_strcoll='define' +d_strctcpy='define' +d_strerrm='strerror(e)' +d_strerror='define' +d_strerror_r='undef' +d_strftime='define' +d_strtod='define' +d_strtol='define' +d_strtold='define' +d_strtoll='define' +d_strtoq='define' +d_strtoul='define' +d_strtoull='define' +d_strtouq='define' +d_strxfrm='define' +d_suidsafe='undef' +d_symlink='define' +d_syscall='define' +d_syscallproto='define' +d_sysconf='define' +d_sysernlst='' +d_syserrlst='define' +d_system='define' +d_tcgetpgrp='define' +d_tcsetpgrp='define' +d_telldir='define' +d_telldirproto='define' +d_time='define' +d_times='define' +d_tm_tm_gmtoff='define' +d_tm_tm_zone='define' +d_tmpnam_r='undef' +d_truncate='define' +d_ttyname_r='undef' +d_tzname='define' +d_u32align='undef' +d_ualarm='define' +d_umask='define' +d_uname='define' +d_union_semun='undef' +d_unordered='undef' +d_usleep='define' +d_usleepproto='define' +d_ustat='define' +d_vendorarch='undef' +d_vendorbin='undef' +d_vendorlib='undef' +d_vendorscript='undef' +d_vfork='undef' +d_void_closedir='undef' +d_voidsig='define' +d_voidtty='' +d_volatile='define' +d_vprintf='define' +d_wait4='define' +d_waitpid='define' +d_wcstombs='define' +d_wctomb='define' +d_writev='define' +d_xenix='undef' +date='date' +db_hashtype='u_int32_t' +db_prefixtype='size_t' +db_version_major='' +db_version_minor='' +db_version_patch='' +defvoidused='15' +direntrytype='struct dirent' +dlext='so' +dlsrc='dl_dlopen.xs' +doublesize='8' +drand01='drand48()' +drand48_r_proto='0' +dynamic_ext='attrs B ByteLoader Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared' +eagain='EAGAIN' +ebcdic='undef' +echo='echo' +egrep='egrep' +emacs='' +endgrent_r_proto='0' +endhostent_r_proto='0' +endnetent_r_proto='0' +endprotoent_r_proto='0' +endpwent_r_proto='0' +endservent_r_proto='0' +eunicefix=':' +exe_ext='' +expr='expr' +extensions='attrs B ByteLoader Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared Errno' +extras='' +fflushNULL='define' +fflushall='undef' +find='' +firstmakefile='makefile' +flex='' +fpossize='16' +fpostype='fpos_t' +freetype='void' +from=':' +full_ar='/usr/bin/ar' +full_csh='csh' +full_sed='/bin/sed' +gccansipedantic='' +gccosandvers='' +gccversion='3.3.5 (Debian 1:3.3.5-6)' +getgrent_r_proto='0' +getgrgid_r_proto='0' +getgrnam_r_proto='0' +gethostbyaddr_r_proto='0' +gethostbyname_r_proto='0' +gethostent_r_proto='0' +getlogin_r_proto='0' +getnetbyaddr_r_proto='0' +getnetbyname_r_proto='0' +getnetent_r_proto='0' +getprotobyname_r_proto='0' +getprotobynumber_r_proto='0' +getprotoent_r_proto='0' +getpwent_r_proto='0' +getpwnam_r_proto='0' +getpwuid_r_proto='0' +getservbyname_r_proto='0' +getservbyport_r_proto='0' +getservent_r_proto='0' +getspnam_r_proto='0' +gidformat='"lu"' +gidsign='1' +gidsize='4' +gidtype='gid_t' +glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' +gmake='gmake' +gmtime_r_proto='0' +gnulibc_version='2.3.2' +grep='grep' +groupcat='cat /etc/group' +groupstype='gid_t' +gzip='gzip' +h_fcntl='false' +h_sysfile='true' +hint='recommended' +hostcat='cat /etc/hosts' +html1dir=' ' +html1direxp='' +html3dir=' ' +html3direxp='' +i16size='2' +i16type='short' +i32size='4' +i32type='long' +i64size='8' +i64type='long long' +i8size='1' +i8type='char' +i_arpainet='define' +i_bsdioctl='' +i_crypt='define' +i_db='undef' +i_dbm='undef' +i_dirent='define' +i_dld='undef' +i_dlfcn='define' +i_fcntl='undef' +i_float='define' +i_fp='undef' +i_fp_class='undef' +i_gdbm='undef' +i_grp='define' +i_ieeefp='undef' +i_inttypes='define' +i_langinfo='define' +i_libutil='undef' +i_limits='define' +i_locale='define' +i_machcthr='undef' +i_malloc='define' +i_math='define' +i_memory='undef' +i_mntent='define' +i_ndbm='undef' +i_netdb='define' +i_neterrno='undef' +i_netinettcp='define' +i_niin='define' +i_poll='define' +i_prot='undef' +i_pthread='define' +i_pwd='define' +i_rpcsvcdbm='undef' +i_sfio='undef' +i_sgtty='undef' +i_shadow='define' +i_socks='undef' +i_stdarg='define' +i_stddef='define' +i_stdlib='define' +i_string='define' +i_sunmath='undef' +i_sysaccess='undef' +i_sysdir='define' +i_sysfile='define' +i_sysfilio='undef' +i_sysin='undef' +i_sysioctl='define' +i_syslog='define' +i_sysmman='define' +i_sysmode='undef' +i_sysmount='define' +i_sysndir='undef' +i_sysparam='define' +i_sysresrc='define' +i_syssecrt='undef' +i_sysselct='define' +i_syssockio='undef' +i_sysstat='define' +i_sysstatfs='define' +i_sysstatvfs='define' +i_systime='define' +i_systimek='undef' +i_systimes='define' +i_systypes='define' +i_sysuio='define' +i_sysun='define' +i_sysutsname='define' +i_sysvfs='define' +i_syswait='define' +i_termio='undef' +i_termios='define' +i_time='define' +i_unistd='define' +i_ustat='define' +i_utime='define' +i_values='define' +i_varargs='undef' +i_varhdr='stdarg.h' +i_vfork='undef' +ignore_versioned_solibs='y' +inc_version_list=' ' +inc_version_list_init='0' +incpath='' +inews='' +installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i686-linux' +installbin='./install_me_here/usr/bin' +installhtml1dir='' +installhtml3dir='' +installman1dir='./install_me_here/usr/share/man/man1' +installman3dir='./install_me_here/usr/share/man/man3' +installprefix='./install_me_here/usr' +installprefixexp='./install_me_here/usr' +installprivlib='./install_me_here/usr/lib/perl5/5.8.4' +installscript='./install_me_here/usr/bin' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i686-linux' +installsitebin='./install_me_here/usr/bin' +installsitehtml1dir='' +installsitehtml3dir='' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' +installsiteman1dir='./install_me_here/usr/share/man/man1' +installsiteman3dir='./install_me_here/usr/share/man/man3' +installsitescript='./install_me_here/usr/bin' +installstyle='./install_me_herelib/perl5' +installusrbinperl='undef' +installvendorarch='' +installvendorbin='' +installvendorhtml1dir='' +installvendorhtml3dir='' +installvendorlib='' +installvendorman1dir='' +installvendorman3dir='' +installvendorscript='' +intsize='4' +issymlink='/usr/bin/test -h' +ivdformat='"ld"' +ivsize='4' +ivtype='long' +known_extensions='attrs B ByteLoader Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared' +ksh='' +ld='cc' +lddlflags='-shared -L/usr/local/lib' +ldflags=' -L/usr/local/lib' +ldflags_uselargefiles='' +ldlibpthname='LD_LIBRARY_PATH' +less='less' +lib_ext='.a' +libc='/lib/libc-2.3.2.so' +libperl='libperl.so' +libpth='/usr/local/lib /lib /usr/lib' +libs='-ldl -lm -lc -lcrypt' +libsdirs=' /usr/lib' +libsfiles=' libdl.so libm.so libc.so libcrypt.so' +libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libc.so /usr/lib/libcrypt.so' +libspath=' /usr/local/lib /lib /usr/lib' +libswanted='gdbm gdbm_compat db dl m c crypt' +libswanted_uselargefiles='' +line='' +lint='' +lkflags='' +ln='ln' +lns='/bin/ln -s' +localtime_r_proto='0' +locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' +loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' +longdblsize='12' +longlongsize='8' +longsize='4' +lp='' +lpr='' +ls='ls' +lseeksize='8' +lseektype='off_t' +mail='' +mailx='' +make='make' +make_set_make='#' +mallocobj='' +mallocsrc='' +malloctype='void *' +man1dir='/usr/share/man/man1' +man1direxp='/usr/share/man/man1' +man1ext='1' +man3dir='/usr/share/man/man3' +man3direxp='/usr/share/man/man3' +man3ext='3' +mips_type='' +mistrustnm='' +mkdir='mkdir' +mmaptype='void *' +modetype='mode_t' +more='more' +multiarch='undef' +mv='' +myarchname='i686-linux' +mydomain='.kergoth.com' +myhostname='hyperion' +myuname='linux hyperion 2.6.11-ck1 #1 wed mar 2 23:48:21 cst 2005 i686 gnulinux ' +n='-n' +need_va_copy='undef' +netdb_hlen_type='size_t' +netdb_host_type='const void *' +netdb_name_type='const char *' +netdb_net_type='in_addr_t' +nm='nm' +nm_opt='' +nm_so_opt='--dynamic' +nonxs_ext='Errno' +nroff='nroff' +nvEUformat='"E"' +nvFUformat='"F"' +nvGUformat='"G"' +nv_preserves_uv_bits='32' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' +nvsize='8' +nvtype='double' +o_nonblock='O_NONBLOCK' +obj_ext='.o' +old_pthread_create_joinable='' +optimize='-O2' +orderlib='false' +osname='linux' +osvers='2.6.11-ck1' +otherlibdirs=' ' +package='perl5' +pager='/usr/bin/less' +passcat='cat /etc/passwd' +patchlevel='8' +path_sep=':' +perl5='hostperl' +perl='' +perl_patchlevel='' +perladmin='' +perllibs='-ldl -lm -lc -lcrypt' +perlpath='hostperl' +pg='pg' +phostname='hostname' +pidtype='pid_t' +plibpth='' +pmake='' +pr='' +prefix='/usr' +prefixexp='/usr' +privlib='/usr/lib/perl5/5.8.4' +privlibexp='/usr/lib/perl5/5.8.4' +procselfexe='"/proc/self/exe"' +prototype='define' +ptrsize='4' +quadkind='3' +quadtype='long long' +randbits='48' +randfunc='drand48' +random_r_proto='0' +randseedtype='long' +ranlib=':' +rd_nodata='-1' +readdir64_r_proto='0' +readdir_r_proto='0' +revision='5' +rm='rm' +rmail='' +run='' +runnm='false' +sPRIEUldbl='"LE"' +sPRIFUldbl='"LF"' +sPRIGUldbl='"LG"' +sPRIXU64='"LX"' +sPRId64='"Ld"' +sPRIeldbl='"Le"' +sPRIfldbl='"Lf"' +sPRIgldbl='"Lg"' +sPRIi64='"Li"' +sPRIo64='"Lo"' +sPRIu64='"Lu"' +sPRIx64='"Lx"' +sSCNfldbl='"Lf"' +sched_yield='sched_yield()' +scriptdir='/usr/bin' +scriptdirexp='/usr/bin' +sed='sed' +seedfunc='srand48' +selectminbits='32' +selecttype='fd_set *' +sendmail='' +setgrent_r_proto='0' +sethostent_r_proto='0' +setlocale_r_proto='0' +setnetent_r_proto='0' +setprotoent_r_proto='0' +setpwent_r_proto='0' +setservent_r_proto='0' +sh='/bin/sh' +shar='' +sharpbang='#!' +shmattype='void *' +shortsize='2' +shrpenv='' +shsharp='true' +sig_count='65' +sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 RTMIN NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED ' +sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "RTMIN", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0' +sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 ' +sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' +sig_size='69' +signal_t='void' +sitearch='/usr/lib/perl5/site_perl/5.8.4/i686-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i686-linux' +sitebin='/usr/bin' +sitebinexp='/usr/bin' +sitehtml1dir='' +sitehtml1direxp='' +sitehtml3dir='' +sitehtml3direxp='' +sitelib='/usr/lib/perl5/site_perl/5.8.4' +sitelib_stem='/usr/lib/perl5/site_perl' +sitelibexp='/usr/lib/perl5/site_perl/5.8.4' +siteman1dir='/usr/share/man/man1' +siteman1direxp='/usr/share/man/man1' +siteman3dir='/usr/share/man/man3' +siteman3direxp='/usr/share/man/man3' +siteprefix='/usr' +siteprefixexp='/usr' +sitescript='/usr/bin' +sitescriptexp='/usr/bin' +sizesize='4' +sizetype='size_t' +sleep='' +smail='' +so='so' +sockethdr='' +socketlib='' +socksizetype='socklen_t' +sort='sort' +spackage='Perl5' +spitshell='cat' +srand48_r_proto='0' +srandom_r_proto='0' +src='.' +ssizetype='ssize_t' +startperl='#!hostperl' +startsh='#!/bin/sh' +static_ext=' ' +stdchar='char' +stdio_base='((fp)->_IO_read_base)' +stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' +stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' +stdio_filbuf='' +stdio_ptr='((fp)->_IO_read_ptr)' +stdio_stream_array='' +strerror_r_proto='0' +strings='/usr/include/string.h' +submit='' +subversion='4' +sysman='/usr/share/man/man1' +tail='' +tar='' +targetarch='' +tbl='' +tee='' +test='test' +timeincl='/usr/include/sys/time.h /usr/include/time.h ' +timetype='time_t' +tmpnam_r_proto='0' +to=':' +touch='touch' +tr='tr' +trnl='\n' +troff='' +ttyname_r_proto='0' +u16size='2' +u16type='unsigned short' +u32size='4' +u32type='unsigned long' +u64size='8' +u64type='unsigned long long' +u8size='1' +u8type='unsigned char' +uidformat='"lu"' +uidsign='1' +uidsize='4' +uidtype='uid_t' +uname='uname' +uniq='uniq' +uquadtype='unsigned long long' +use5005threads='undef' +use64bitall='undef' +use64bitint='undef' +usecrosscompile='undef' +usedl='define' +usefaststdio='define' +useithreads='undef' +uselargefiles='define' +uselongdouble='undef' +usemallocwrap='define' +usemorebits='undef' +usemultiplicity='undef' +usemymalloc='n' +usenm='false' +useopcode='true' +useperlio='define' +useposix='true' +usereentrant='undef' +usesfio='false' +useshrplib='true' +usesocks='undef' +usethreads='undef' +usevendorprefix='undef' +usevfork='false' +usrinc='/usr/include' +uuname='' +uvXUformat='"lX"' +uvoformat='"lo"' +uvsize='4' +uvtype='unsigned long' +uvuformat='"lu"' +uvxformat='"lx"' +vendorarch='' +vendorarchexp='' +vendorbin='' +vendorbinexp='' +vendorhtml1dir=' ' +vendorhtml1direxp='' +vendorhtml3dir=' ' +vendorhtml3direxp='' +vendorlib='' +vendorlib_stem='' +vendorlibexp='' +vendorman1dir=' ' +vendorman1direxp='' +vendorman3dir=' ' +vendorman3direxp='' +vendorprefix='' +vendorprefixexp='' +vendorscript='' +vendorscriptexp='' +version='5.8.4' +version_patchlevel_string='version 8 subversion 4' +versiononly='undef' +vi='' +voidflags='15' +xlibpth='/usr/lib/386 /lib/386' +yacc='yacc' +yaccflags='' +zcat='' +zip='zip' +# Configure command line arguments. +config_arg0='./Configure' +config_args='' +config_argc=0 +PERL_REVISION=5 +PERL_VERSION=8 +PERL_SUBVERSION=4 +PERL_API_REVISION=5 +PERL_API_VERSION=8 +PERL_API_SUBVERSION=0 +PERL_PATCHLEVEL= +PERL_CONFIG_SH=true diff --git a/packages/perl/perl-5.8.4/config.sh-mipsel-linux b/packages/perl/perl-5.8.4/config.sh-mipsel-linux new file mode 100644 index 0000000000..eedf443f04 --- /dev/null +++ b/packages/perl/perl-5.8.4/config.sh-mipsel-linux @@ -0,0 +1,1026 @@ +#!/bin/sh +# +# This file was produced by running the Configure script. It holds all the +# definitions figured out by Configure. Should you modify one of these values, +# do not forget to propagate your changes by running "Configure -der". You may +# instead choose to run each of the .SH files by yourself, or "Configure -S". +# + +# Package name : perl5 +# Source directory : . +# Configuration time: Mon Sep 20 18:18:52 CEST 2004 +# Configured by : root +# Target system : linux mtx-nfs 2.4.24mtx #59 mon jul 12 15:19:41 cest 2004 mips gnulinux + +Author='' +Date='$Date' +Header='' +Id='$Id' +Locker='' +Log='$Log' +Mcc='Mcc' +RCSfile='$RCSfile' +Revision='$Revision' +Source='' +State='' +_a='.a' +_exe='' +_o='.o' +afs='false' +afsroot='/afs' +alignbytes='8' +ansi2knr='' +aphostname='/bin/hostname' +api_revision='5' +api_subversion='0' +api_version='8' +api_versionstring='5.8.0' +ar='ar' +archlib='/usr/lib/perl5/5.8.4/mipsel-linux' +archlibexp='/usr/lib/perl5/5.8.4/mipsel-linux' +archname64='' +archname='mips-linux' +archobjs='' +asctime_r_proto='0' +awk='awk' +baserev='5.0' +bash='' +bin='/usr/bin' +binexp='/usr/bin' +bison='bison' +byacc='byacc' +byteorder='1234' +c='' +castflags='0' +cat='cat' +cc='cc' +cccdlflags='-fpic' +ccdlflags='-rdynamic' +ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccname='gcc' +ccsymbols='__GNUC_MINOR__=3 __GNUC_PATCHLEVEL__=4' +ccversion='' +cf_by='root' +cf_email='root@mtx-nfs.nonet' +cf_time='Mon Sep 20 18:18:52 CEST 2004' +charsize='1' +chgrp='' +chmod='chmod' +chown='' +clocktype='clock_t' +comm='comm' +compress='' +contains='grep' +cp='cp' +cpio='' +cpp='cpp' +cpp_stuff='42' +cppccsymbols='__GNUC__=3' +cppflags='-fno-strict-aliasing -I/usr/local/include' +cpplast='-' +cppminus='-' +cpprun='cc -E' +cppstdin='cc -E' +cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNUC_MINOR__=3 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1' +crypt_r_proto='0' +cryptlib='' +csh='csh' +ctermid_r_proto='0' +ctime_r_proto='0' +d_Gconvert='gcvt((x),(n),(b))' +d_PRIEUldbl='define' +d_PRIFUldbl='define' +d_PRIGUldbl='define' +d_PRIXU64='define' +d_PRId64='define' +d_PRIeldbl='define' +d_PRIfldbl='define' +d_PRIgldbl='define' +d_PRIi64='define' +d_PRIo64='define' +d_PRIu64='define' +d_PRIx64='define' +d_SCNfldbl='define' +d__fwalk='undef' +d_access='define' +d_accessx='undef' +d_aintl='undef' +d_alarm='define' +d_archlib='define' +d_asctime_r='undef' +d_atolf='undef' +d_atoll='define' +d_attribut='define' +d_bcmp='define' +d_bcopy='define' +d_bsd='undef' +d_bsdgetpgrp='undef' +d_bsdsetpgrp='undef' +d_bzero='define' +d_casti32='define' +d_castneg='define' +d_charvspr='define' +d_chown='define' +d_chroot='define' +d_chsize='undef' +d_class='undef' +d_closedir='define' +d_cmsghdr_s='define' +d_const='define' +d_copysignl='define' +d_crypt='define' +d_crypt_r='undef' +d_csh='define' +d_ctermid_r='undef' +d_ctime_r='undef' +d_cuserid='define' +d_dbl_dig='define' +d_dbminitproto='undef' +d_difftime='define' +d_dirfd='define' +d_dirnamlen='undef' +d_dlerror='define' +d_dlopen='define' +d_dlsymun='undef' +d_dosuid='undef' +d_drand48_r='undef' +d_drand48proto='define' +d_dup2='define' +d_eaccess='undef' +d_endgrent='define' +d_endgrent_r='undef' +d_endhent='define' +d_endhostent_r='undef' +d_endnent='define' +d_endnetent_r='undef' +d_endpent='define' +d_endprotoent_r='undef' +d_endpwent='define' +d_endpwent_r='undef' +d_endsent='define' +d_endservent_r='undef' +d_eofnblk='define' +d_eunice='undef' +d_faststdio='undef' +d_fchdir='define' +d_fchmod='define' +d_fchown='define' +d_fcntl='define' +d_fcntl_can_lock='define' +d_fd_macros='define' +d_fd_set='define' +d_fds_bits='undef' +d_fgetpos='define' +d_finite='define' +d_finitel='define' +d_flexfnam='define' +d_flock='define' +d_flockproto='define' +d_fork='define' +d_fp_class='undef' +d_fpathconf='define' +d_fpclass='undef' +d_fpclassify='undef' +d_fpclassl='undef' +d_fpos64_t='undef' +d_frexpl='define' +d_fs_data_s='undef' +d_fseeko='define' +d_fsetpos='define' +d_fstatfs='define' +d_fstatvfs='define' +d_fsync='define' +d_ftello='define' +d_ftime='undef' +d_getcwd='define' +d_getespwnam='undef' +d_getfsstat='undef' +d_getgrent='define' +d_getgrent_r='undef' +d_getgrgid_r='undef' +d_getgrnam_r='undef' +d_getgrps='define' +d_gethbyaddr='define' +d_gethbyname='define' +d_gethent='define' +d_gethname='define' +d_gethostbyaddr_r='undef' +d_gethostbyname_r='undef' +d_gethostent_r='undef' +d_gethostprotos='define' +d_getitimer='define' +d_getlogin='define' +d_getlogin_r='undef' +d_getmnt='undef' +d_getmntent='define' +d_getnbyaddr='define' +d_getnbyname='define' +d_getnent='define' +d_getnetbyaddr_r='undef' +d_getnetbyname_r='undef' +d_getnetent_r='undef' +d_getnetprotos='define' +d_getpagsz='define' +d_getpbyname='define' +d_getpbynumber='define' +d_getpent='define' +d_getpgid='define' +d_getpgrp2='undef' +d_getpgrp='define' +d_getppid='define' +d_getprior='define' +d_getprotobyname_r='undef' +d_getprotobynumber_r='undef' +d_getprotoent_r='undef' +d_getprotoprotos='define' +d_getprpwnam='undef' +d_getpwent='define' +d_getpwent_r='undef' +d_getpwnam_r='undef' +d_getpwuid_r='undef' +d_getsbyname='define' +d_getsbyport='define' +d_getsent='define' +d_getservbyname_r='undef' +d_getservbyport_r='undef' +d_getservent_r='undef' +d_getservprotos='define' +d_getspnam='define' +d_getspnam_r='undef' +d_gettimeod='define' +d_gmtime_r='undef' +d_gnulibc='define' +d_grpasswd='define' +d_hasmntopt='define' +d_htonl='define' +d_ilogbl='define' +d_index='undef' +d_inetaton='define' +d_int64_t='define' +d_isascii='define' +d_isfinite='undef' +d_isinf='define' +d_isnan='define' +d_isnanl='define' +d_killpg='define' +d_lchown='define' +d_ldbl_dig='define' +d_link='define' +d_localtime_r='undef' +d_locconv='define' +d_lockf='define' +d_longdbl='define' +d_longlong='define' +d_lseekproto='define' +d_lstat='define' +d_madvise='define' +d_mblen='define' +d_mbstowcs='define' +d_mbtowc='define' +d_memchr='define' +d_memcmp='define' +d_memcpy='define' +d_memmove='define' +d_memset='define' +d_mkdir='define' +d_mkdtemp='define' +d_mkfifo='define' +d_mkstemp='define' +d_mkstemps='undef' +d_mktime='define' +d_mmap='define' +d_modfl='define' +d_modfl_pow32_bug='undef' +d_modflproto='undef' +d_mprotect='define' +d_msg='define' +d_msg_ctrunc='define' +d_msg_dontroute='define' +d_msg_oob='define' +d_msg_peek='define' +d_msg_proxy='define' +d_msgctl='define' +d_msgget='define' +d_msghdr_s='define' +d_msgrcv='define' +d_msgsnd='define' +d_msync='define' +d_munmap='define' +d_mymalloc='undef' +d_nice='define' +d_nl_langinfo='define' +d_nv_preserves_uv='define' +d_off64_t='undef' +d_old_pthread_create_joinable='undef' +d_oldpthreads='undef' +d_oldsock='undef' +d_open3='define' +d_pathconf='define' +d_pause='define' +d_perl_otherlibdirs='undef' +d_phostname='undef' +d_pipe='define' +d_poll='define' +d_portable='define' +d_procselfexe='define' +d_pthread_atfork='undef' +d_pthread_attr_setscope='define' +d_pthread_yield='undef' +d_pwage='undef' +d_pwchange='undef' +d_pwclass='undef' +d_pwcomment='undef' +d_pwexpire='undef' +d_pwgecos='define' +d_pwpasswd='define' +d_pwquota='undef' +d_qgcvt='define' +d_quad='define' +d_random_r='undef' +d_readdir64_r='undef' +d_readdir='define' +d_readdir_r='undef' +d_readlink='define' +d_readv='define' +d_recvmsg='define' +d_rename='define' +d_rewinddir='define' +d_rmdir='define' +d_safebcpy='undef' +d_safemcpy='undef' +d_sanemcmp='define' +d_sbrkproto='define' +d_scalbnl='define' +d_sched_yield='define' +d_scm_rights='define' +d_seekdir='define' +d_select='define' +d_sem='define' +d_semctl='define' +d_semctl_semid_ds='define' +d_semctl_semun='define' +d_semget='define' +d_semop='define' +d_sendmsg='define' +d_setegid='define' +d_seteuid='define' +d_setgrent='define' +d_setgrent_r='undef' +d_setgrps='define' +d_sethent='define' +d_sethostent_r='undef' +d_setitimer='define' +d_setlinebuf='define' +d_setlocale='define' +d_setlocale_r='undef' +d_setnent='define' +d_setnetent_r='undef' +d_setpent='define' +d_setpgid='define' +d_setpgrp2='undef' +d_setpgrp='define' +d_setprior='define' +d_setproctitle='undef' +d_setprotoent_r='undef' +d_setpwent='define' +d_setpwent_r='undef' +d_setregid='define' +d_setresgid='define' +d_setresuid='define' +d_setreuid='define' +d_setrgid='undef' +d_setruid='undef' +d_setsent='define' +d_setservent_r='undef' +d_setsid='define' +d_setvbuf='define' +d_sfio='undef' +d_shm='define' +d_shmat='define' +d_shmatprototype='define' +d_shmctl='define' +d_shmdt='define' +d_shmget='define' +d_sigaction='define' +d_sigprocmask='define' +d_sigsetjmp='define' +d_sockatmark='define' +d_sockatmarkproto='undef' +d_socket='define' +d_socklen_t='define' +d_sockpair='define' +d_socks5_init='undef' +d_sqrtl='define' +d_srand48_r='undef' +d_srandom_r='undef' +d_sresgproto='undef' +d_sresuproto='undef' +d_statblks='define' +d_statfs_f_flags='undef' +d_statfs_s='define' +d_statvfs='define' +d_stdio_cnt_lval='undef' +d_stdio_ptr_lval='undef' +d_stdio_ptr_lval_nochange_cnt='undef' +d_stdio_ptr_lval_sets_cnt='undef' +d_stdio_stream_array='undef' +d_stdiobase='undef' +d_stdstdio='undef' +d_strchr='define' +d_strcoll='define' +d_strctcpy='define' +d_strerrm='strerror(e)' +d_strerror='define' +d_strerror_r='undef' +d_strftime='define' +d_strtod='define' +d_strtol='define' +d_strtold='define' +d_strtoll='define' +d_strtoq='define' +d_strtoul='define' +d_strtoull='define' +d_strtouq='define' +d_strxfrm='define' +d_suidsafe='undef' +d_symlink='define' +d_syscall='define' +d_syscallproto='define' +d_sysconf='define' +d_sysernlst='' +d_syserrlst='define' +d_system='define' +d_tcgetpgrp='define' +d_tcsetpgrp='define' +d_telldir='define' +d_telldirproto='define' +d_time='define' +d_times='define' +d_tm_tm_gmtoff='define' +d_tm_tm_zone='define' +d_tmpnam_r='undef' +d_truncate='define' +d_ttyname_r='undef' +d_tzname='define' +d_u32align='undef' +d_ualarm='define' +d_umask='define' +d_uname='define' +d_union_semun='undef' +d_unordered='undef' +d_usleep='define' +d_usleepproto='define' +d_ustat='define' +d_vendorarch='undef' +d_vendorbin='undef' +d_vendorlib='undef' +d_vendorscript='undef' +d_vfork='undef' +d_void_closedir='undef' +d_voidsig='define' +d_voidtty='' +d_volatile='define' +d_vprintf='define' +d_wait4='define' +d_waitpid='define' +d_wcstombs='define' +d_wctomb='define' +d_writev='define' +d_xenix='undef' +date='date' +db_hashtype='u_int32_t' +db_prefixtype='size_t' +db_version_major='' +db_version_minor='' +db_version_patch='' +defvoidused='15' +direntrytype='struct dirent' +dlext='so' +dlsrc='dl_dlopen.xs' +doublesize='8' +drand01='drand48()' +drand48_r_proto='0' +dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' +eagain='EAGAIN' +ebcdic='undef' +echo='echo' +egrep='egrep' +emacs='' +endgrent_r_proto='0' +endhostent_r_proto='0' +endnetent_r_proto='0' +endprotoent_r_proto='0' +endpwent_r_proto='0' +endservent_r_proto='0' +eunicefix=':' +exe_ext='' +expr='expr' +extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno' +extras='' +fflushNULL='define' +fflushall='undef' +find='' +firstmakefile='makefile' +flex='' +fpossize='16' +fpostype='fpos_t' +freetype='void' +from=':' +full_ar='/usr/bin/ar' +full_csh='/bin/csh' +full_sed='/bin/sed' +gccansipedantic='' +gccosandvers='' +gccversion='3.3.4 (Debian 1:3.3.4-3)' +getgrent_r_proto='0' +getgrgid_r_proto='0' +getgrnam_r_proto='0' +gethostbyaddr_r_proto='0' +gethostbyname_r_proto='0' +gethostent_r_proto='0' +getlogin_r_proto='0' +getnetbyaddr_r_proto='0' +getnetbyname_r_proto='0' +getnetent_r_proto='0' +getprotobyname_r_proto='0' +getprotobynumber_r_proto='0' +getprotoent_r_proto='0' +getpwent_r_proto='0' +getpwnam_r_proto='0' +getpwuid_r_proto='0' +getservbyname_r_proto='0' +getservbyport_r_proto='0' +getservent_r_proto='0' +getspnam_r_proto='0' +gidformat='"lu"' +gidsign='1' +gidsize='4' +gidtype='gid_t' +glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' +gmake='gmake' +gmtime_r_proto='0' +gnulibc_version='2.3.2' +grep='grep' +groupcat='cat /etc/group' +groupstype='gid_t' +gzip='gzip' +h_fcntl='false' +h_sysfile='true' +hint='recommended' +hostcat='' +html1dir=' ' +html1direxp='' +html3dir=' ' +html3direxp='' +i16size='2' +i16type='short' +i32size='4' +i32type='long' +i64size='8' +i64type='long long' +i8size='1' +i8type='char' +i_arpainet='define' +i_bsdioctl='' +i_crypt='define' +i_db='undef' +i_dbm='undef' +i_dirent='define' +i_dld='undef' +i_dlfcn='define' +i_fcntl='undef' +i_float='define' +i_fp='undef' +i_fp_class='undef' +i_gdbm='undef' +i_grp='define' +i_ieeefp='undef' +i_inttypes='define' +i_langinfo='define' +i_libutil='undef' +i_limits='define' +i_locale='define' +i_machcthr='undef' +i_malloc='define' +i_math='define' +i_memory='undef' +i_mntent='define' +i_ndbm='undef' +i_netdb='define' +i_neterrno='undef' +i_netinettcp='define' +i_niin='define' +i_poll='define' +i_prot='undef' +i_pthread='define' +i_pwd='define' +i_rpcsvcdbm='undef' +i_sfio='undef' +i_sgtty='undef' +i_shadow='define' +i_socks='undef' +i_stdarg='define' +i_stddef='define' +i_stdlib='define' +i_string='define' +i_sunmath='undef' +i_sysaccess='undef' +i_sysdir='define' +i_sysfile='define' +i_sysfilio='undef' +i_sysin='undef' +i_sysioctl='define' +i_syslog='define' +i_sysmman='define' +i_sysmode='undef' +i_sysmount='define' +i_sysndir='undef' +i_sysparam='define' +i_sysresrc='define' +i_syssecrt='undef' +i_sysselct='define' +i_syssockio='undef' +i_sysstat='define' +i_sysstatfs='define' +i_sysstatvfs='define' +i_systime='define' +i_systimek='undef' +i_systimes='define' +i_systypes='define' +i_sysuio='define' +i_sysun='define' +i_sysutsname='define' +i_sysvfs='define' +i_syswait='define' +i_termio='undef' +i_termios='define' +i_time='define' +i_unistd='define' +i_ustat='define' +i_utime='define' +i_values='define' +i_varargs='undef' +i_varhdr='stdarg.h' +i_vfork='undef' +ignore_versioned_solibs='y' +inc_version_list=' ' +inc_version_list_init='0' +incpath='' +inews='' +installarchlib='./install_me_here/usr/lib/perl5/5.8.4/mipsel-linux' +installbin='./install_me_here/usr/bin' +installhtml1dir='' +installhtml3dir='' +installman1dir='./install_me_here/usr/share/man/man1' +installman3dir='./install_me_here/usr/share/man/man3' +installprefix='./install_me_here/usr' +installprefixexp='./install_me_here/usr' +installprivlib='./install_me_here/usr/lib/perl5/5.8.4' +installscript='./install_me_here/usr/bin' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' +installsitebin='./install_me_here/usr/bin' +installsitehtml1dir='' +installsitehtml3dir='' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' +installsiteman1dir='./install_me_here/usr/share/man/man1' +installsiteman3dir='./install_me_here/usr/share/man/man3' +installsitescript='./install_me_here/usr/bin' +installstyle='./install_me_herelib/perl5' +installusrbinperl='undef' +installvendorarch='' +installvendorbin='' +installvendorhtml1dir='' +installvendorhtml3dir='' +installvendorlib='' +installvendorman1dir='' +installvendorman3dir='' +installvendorscript='' +intsize='4' +issymlink='/usr/bin/test -h' +ivdformat='"ld"' +ivsize='4' +ivtype='long' +known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' +ksh='' +ld='cc' +lddlflags='-shared -L/usr/local/lib' +ldflags=' -L/usr/local/lib' +ldflags_uselargefiles='' +ldlibpthname='LD_LIBRARY_PATH' +less='less' +lib_ext='.a' +libc='/lib/libc-2.3.2.so' +libperl='libperl.so' +libpth='/usr/local/lib /lib /usr/lib' +libs='-lnsl -ldl -lm -lcrypt -lutil -lc' +libsdirs=' /usr/lib' +libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' +libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' +libspath=' /usr/local/lib /lib /usr/lib' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' +libswanted_uselargefiles='' +line='' +lint='' +lkflags='' +ln='ln' +lns='/bin/ln -s' +localtime_r_proto='0' +locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' +loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' +longdblsize='8' +longlongsize='8' +longsize='4' +lp='' +lpr='' +ls='ls' +lseeksize='8' +lseektype='off_t' +mail='' +mailx='' +make='make' +make_set_make='#' +mallocobj='' +mallocsrc='' +malloctype='void *' +man1dir='/usr/share/man/man1' +man1direxp='/usr/share/man/man1' +man1ext='1' +man3dir='/usr/share/man/man3' +man3direxp='/usr/share/man/man3' +man3ext='3' +mips_type='' +mistrustnm='' +mkdir='mkdir' +mmaptype='void *' +modetype='mode_t' +more='more' +multiarch='undef' +mv='' +myarchname='mips-linux' +mydomain='.nonet' +myhostname='mtx-nfs' +myuname='linux mtx-nfs 2.4.24mtx #59 mon jul 12 15:19:41 cest 2004 mips gnulinux ' +n='-n' +need_va_copy='undef' +netdb_hlen_type='size_t' +netdb_host_type='const void *' +netdb_name_type='const char *' +netdb_net_type='in_addr_t' +nm='nm' +nm_opt='' +nm_so_opt='--dynamic' +nonxs_ext='Errno' +nroff='nroff' +nvEUformat='"E"' +nvFUformat='"F"' +nvGUformat='"G"' +nv_preserves_uv_bits='32' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' +nvsize='8' +nvtype='double' +o_nonblock='O_NONBLOCK' +obj_ext='.o' +old_pthread_create_joinable='' +optimize='-O2' +orderlib='false' +osname='linux' +osvers='2.4.24mtx' +otherlibdirs=' ' +package='perl5' +pager='/usr/bin/less' +passcat='cat /etc/passwd' +patchlevel='8' +path_sep=':' +perl5='/usr/bin/perl' +perl='' +perl_patchlevel='' +perladmin='root@mtx-nfs.nonet' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +perlpath='/usr/bin/perl' +pg='pg' +phostname='hostname' +pidtype='pid_t' +plibpth='' +pm_apiversion='5.005' +pmake='' +pr='' +prefix='/usr' +prefixexp='/usr' +privlib='/usr/lib/perl5/5.8.4' +privlibexp='/usr/lib/perl5/5.8.4' +procselfexe='"/proc/self/exe"' +prototype='define' +ptrsize='4' +quadkind='3' +quadtype='long long' +randbits='48' +randfunc='drand48' +random_r_proto='0' +randseedtype='long' +ranlib=':' +rd_nodata='-1' +readdir64_r_proto='0' +readdir_r_proto='0' +revision='5' +rm='rm' +rmail='' +run='' +runnm='false' +sPRIEUldbl='"E"' +sPRIFUldbl='"F"' +sPRIGUldbl='"G"' +sPRIXU64='"LX"' +sPRId64='"Ld"' +sPRIeldbl='"e"' +sPRIfldbl='"f"' +sPRIgldbl='"g"' +sPRIi64='"Li"' +sPRIo64='"Lo"' +sPRIu64='"Lu"' +sPRIx64='"Lx"' +sSCNfldbl='"f"' +sched_yield='sched_yield()' +scriptdir='/usr/bin' +scriptdirexp='/usr/bin' +sed='sed' +seedfunc='srand48' +selectminbits='32' +selecttype='fd_set *' +sendmail='' +setgrent_r_proto='0' +sethostent_r_proto='0' +setlocale_r_proto='0' +setnetent_r_proto='0' +setprotoent_r_proto='0' +setpwent_r_proto='0' +setservent_r_proto='0' +sh='/bin/sh' +shar='' +sharpbang='#!' +shmattype='void *' +shortsize='2' +shrpenv='' +shsharp='true' +sig_count='128' +sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ NUM32 NUM33 NUM34 RTMIN NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL ' +sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "NUM32", "NUM33", "NUM34", "RTMIN", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0' +sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 ' +sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' +sig_size='131' +signal_t='void' +sitearch='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' +sitebin='/usr/bin' +sitebinexp='/usr/bin' +sitehtml1dir='' +sitehtml1direxp='' +sitehtml3dir='' +sitehtml3direxp='' +sitelib='/usr/lib/perl5' +sitelib_stem='/usr/lib/perl5' +sitelibexp='/usr/lib/perl5' +siteman1dir='/usr/share/man/man1' +siteman1direxp='/usr/share/man/man1' +siteman3dir='/usr/share/man/man3' +siteman3direxp='/usr/share/man/man3' +siteprefix='/usr' +siteprefixexp='/usr' +sitescript='/usr/bin' +sitescriptexp='/usr/bin' +sizesize='4' +sizetype='size_t' +sleep='' +smail='' +so='so' +sockethdr='' +socketlib='' +socksizetype='socklen_t' +sort='sort' +spackage='Perl5' +spitshell='cat' +srand48_r_proto='0' +srandom_r_proto='0' +src='.' +ssizetype='ssize_t' +startperl='#!/usr/bin/perl' +startsh='#!/bin/sh' +static_ext=' ' +stdchar='char' +stdio_base='((fp)->_IO_read_base)' +stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' +stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' +stdio_filbuf='' +stdio_ptr='((fp)->_IO_read_ptr)' +stdio_stream_array='' +strerror_r_proto='0' +strings='/usr/include/string.h' +submit='' +subversion='3' +sysman='/usr/share/man/man1' +tail='' +tar='' +targetarch='' +tbl='' +tee='' +test='test' +timeincl='/usr/include/sys/time.h /usr/include/time.h ' +timetype='time_t' +tmpnam_r_proto='0' +to=':' +touch='touch' +tr='tr' +trnl='\n' +troff='' +ttyname_r_proto='0' +u16size='2' +u16type='unsigned short' +u32size='4' +u32type='unsigned long' +u64size='8' +u64type='unsigned long long' +u8size='1' +u8type='unsigned char' +uidformat='"lu"' +uidsign='1' +uidsize='4' +uidtype='uid_t' +uname='uname' +uniq='uniq' +uquadtype='unsigned long long' +use5005threads='undef' +use64bitall='undef' +use64bitint='undef' +usecrosscompile='undef' +usedl='define' +usefaststdio='define' +useithreads='undef' +uselargefiles='define' +uselongdouble='undef' +usemorebits='undef' +usemultiplicity='undef' +usemymalloc='n' +usemallocwrap='define' +usenm='false' +useopcode='true' +useperlio='define' +useposix='true' +usereentrant='undef' +usesfio='false' +useshrplib='true' +usesocks='undef' +usethreads='undef' +usevendorprefix='undef' +usevfork='false' +usrinc='/usr/include' +uuname='' +uvXUformat='"lX"' +uvoformat='"lo"' +uvsize='4' +uvtype='unsigned long' +uvuformat='"lu"' +uvxformat='"lx"' +vendorarch='' +vendorarchexp='' +vendorbin='' +vendorbinexp='' +vendorhtml1dir=' ' +vendorhtml1direxp='' +vendorhtml3dir=' ' +vendorhtml3direxp='' +vendorlib='' +vendorlib_stem='' +vendorlibexp='' +vendorman1dir=' ' +vendorman1direxp='' +vendorman3dir=' ' +vendorman3direxp='' +vendorprefix='' +vendorprefixexp='' +vendorscript='' +vendorscriptexp='' +version='5.8.4' +version_patchlevel_string='version 8 subversion 3' +versiononly='undef' +vi='' +voidflags='15' +xlibpth='/usr/lib/386 /lib/386' +xs_apiversion='5.8.4' +yacc='yacc' +yaccflags='' +zcat='' +zip='zip' +# Configure command line arguments. +config_arg0='./Configure' +config_args='-des' +config_argc=1 +config_arg1='-des' +PERL_REVISION=5 +PERL_VERSION=8 +PERL_SUBVERSION=3 +PERL_API_REVISION=5 +PERL_API_VERSION=8 +PERL_API_SUBVERSION=0 +PERL_PATCHLEVELPERL_CONFIG_SH=true diff --git a/packages/perl/perl-5.8.4/uclibc.patch b/packages/perl/perl-5.8.4/uclibc.patch new file mode 100644 index 0000000000..ce8fe80ff2 --- /dev/null +++ b/packages/perl/perl-5.8.4/uclibc.patch @@ -0,0 +1,26 @@ +As seen at http://codepoet.org/lists/uclibc/2004-March/008512.html: + +Try the following (untested). In .26, the field member was filedes. +Current cvs uses __filedes (double underscore prefix). + +Manuel + +--- perl-5.8.4.orig/perlio.c 2004-03-22 14:54:03.000000000 -0500 ++++ perl-5.8.4/perlio.c 2005-03-09 04:33:49.386767312 -0500 +@@ -2824,7 +2824,15 @@ + /* XXX this could use PerlIO_canset_fileno() and + * PerlIO_set_fileno() support from Configure + */ +-# if defined(__GLIBC__) ++# if defined(__UCLIBC__) ++ /* uClibc must come before glibc because it defines __GLIBC__ as well. */ ++# if defined(__MASK_READING) ++ f->__filedes = -1; ++# else ++ f->filedes = -1; ++# endif ++ return 1; ++# elif defined(__GLIBC__) + /* There may be a better way for GLIBC: + - libio.h defines a flag to not close() on cleanup + */ diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 64e548a121..3e5ac504cd 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -9,10 +9,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://Makefile.patch;patch=1 \ file://config.sh-arm-linux.patch;patch=1 \ file://libperl-5.8.3-create-libperl-soname.patch;patch=1;pnum=0 \ - file://uclibc.patch;patch=1 \ - file://Makefile.SH.patch \ - file://config.sh-mipsel-linux \ - file://config.sh-i686-linux" + file://Makefile.SH.patch" HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}" diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb index 7509f1b66b..085182bb50 100644 --- a/packages/perl/perl_5.8.4.bb +++ b/packages/perl/perl_5.8.4.bb @@ -1,3 +1,7 @@ require perl.inc PR = "r5" + +SRC_URI += "file://uclibc.patch;patch=1 \ + file://config.sh-mipsel-linux \ + file://config.sh-i686-linux" diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 12aec88a02..69b5784f38 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -7,6 +7,7 @@ require perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ file://config.sh-powerpc-linux \ + file://config.sh-mipsel-linux \ file://config.sh-i386-linux \ file://config.sh-i486-linux \ file://config.sh-i586-linux \ -- cgit v1.2.3 From 4ff751b50feb7397a9909f1a684008fa17423223 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 5 Apr 2007 06:52:55 +0000 Subject: perl 5.8.7: Simplify the addition of patches to support gcc for linking and using PIC for compiling shared libraries. --- packages/perl/perl_5.8.7.bb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 69b5784f38..874c95a79c 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -16,14 +16,13 @@ SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-sh3-linux \ file://config.sh-sh4-linux" -# Patches for sh3/sh4, use gcc to link and override generaet.sh to -# use PIC mode for compiling shared library objects. -SRC_URI_append_sh4 += "file://override-generate-sh.patch;patch=1" -SRC_URI_append_sh4 += "file://makefile-usegcc-to-link.patch;patch=1" -SRC_URI_append_sh3 += "file://override-generate-sh.patch;patch=1" -SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1" -SRC_URI_append_powerpc += "file://override-generate-sh.patch;patch=1" -SRC_URI_append_powerpc += "file://makefile-usegcc-to-link.patch;patch=1" +# Use gcc to link and use PIC mode for compiling shared libs +GCCLINK_SRC = "file://override-generate-sh.patch;patch=1 \ + file://makefile-usegcc-to-link.patch;patch=1" + +SRC_URI_append_sh4 += " ${GCCLINK_SRC}" +SRC_URI_append_sh3 += " ${GCCLINK_SRC}" +SRC_URI_append_powerpc += " ${GCCLINK_SRC}" PARALLEL_MAKE = "" -- cgit v1.2.3 From 6589d01dfe208474892ff4fbb3cb01fb0da603c6 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 5 Apr 2007 06:54:17 +0000 Subject: perl: Move the do_configure from perl.inc into perl_5.8.4.bb since it is only really useful for this version of perl the way it's written. --- packages/perl/perl.inc | 22 ---------------------- packages/perl/perl_5.8.4.bb | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 3e5ac504cd..cda260efcd 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -13,28 +13,6 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}" -do_configure() { - ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl - cp ${HOSTPERL} hostperl - cd Cross - rm -f Makefile.SH.patch - cp ${WORKDIR}/Makefile.SH.patch . - cp ${WORKDIR}/config.sh-mipsel-linux . - cp ${WORKDIR}/config.sh-i686-linux . - cat config.sh-arm-linux | sed -e "s,arm-linux,armeb-linux,g" > config.sh-armeb-linux - for i in config.sh-*-linux; do - a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`" - newfile="`echo $i|sed -e 's,-linux$,-linux-uclibc,g'`" - cat $i | sed -e "s,${a}-linux,${a}-linux-uclibc,g; \ - s,d_sockatmark='define',d_sockatmark='undef',g;" > $newfile - done - sed -i -e 's,./install_me_here,${D},g' config.sh-${TARGET_ARCH}-${TARGET_OS} - rm -f config - echo "ARCH = ${TARGET_ARCH}" > config - echo "OS = ${TARGET_OS}" >> config - oe_runmake patch -} - do_compile() { sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL cd Cross diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb index 085182bb50..10a871c8dd 100644 --- a/packages/perl/perl_5.8.4.bb +++ b/packages/perl/perl_5.8.4.bb @@ -5,3 +5,25 @@ PR = "r5" SRC_URI += "file://uclibc.patch;patch=1 \ file://config.sh-mipsel-linux \ file://config.sh-i686-linux" + +do_configure() { + ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl + cp ${HOSTPERL} hostperl + cd Cross + rm -f Makefile.SH.patch + cp ${WORKDIR}/Makefile.SH.patch . + cp ${WORKDIR}/config.sh-mipsel-linux . + cp ${WORKDIR}/config.sh-i686-linux . + cat config.sh-arm-linux | sed -e "s,arm-linux,armeb-linux,g" > config.sh-armeb-linux + for i in config.sh-*-linux; do + a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`" + newfile="`echo $i|sed -e 's,-linux$,-linux-uclibc,g'`" + cat $i | sed -e "s,${a}-linux,${a}-linux-uclibc,g; \ + s,d_sockatmark='define',d_sockatmark='undef',g;" > $newfile + done + sed -i -e 's,./install_me_here,${D},g' config.sh-${TARGET_ARCH}-${TARGET_OS} + rm -f config + echo "ARCH = ${TARGET_ARCH}" > config + echo "OS = ${TARGET_OS}" >> config + oe_runmake patch +} -- cgit v1.2.3 From dac5219ef520c61d4174d7ae3c29353f55410cfb Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Thu, 5 Apr 2007 07:01:32 +0000 Subject: packages/linux/linux-jlime-jornada6xx-2.6.21rc5: * Addition of new kernel for the hp6xx platform. Updates since last is mainly focused on adjusting to changed API's and also moving from ide-sh into Pata. --- .../.mtn2git_empty | 0 .../linux-jlime-jornada6xx-2.6.21rc5/defconfig | 1245 ++++++++++++++++++++ .../git-20070405-2.patch | 1058 +++++++++++++++++ packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb | 32 + 4 files changed, 2335 insertions(+) create mode 100644 packages/linux/linux-jlime-jornada6xx-2.6.21rc5/.mtn2git_empty create mode 100644 packages/linux/linux-jlime-jornada6xx-2.6.21rc5/defconfig create mode 100644 packages/linux/linux-jlime-jornada6xx-2.6.21rc5/git-20070405-2.patch create mode 100644 packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb (limited to 'packages') diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/.mtn2git_empty b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/defconfig b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/defconfig new file mode 100644 index 0000000000..2a86055123 --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/defconfig @@ -0,0 +1,1245 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21-rc5 +# Wed Apr 4 23:26:23 2007 +# +CONFIG_SUPERH=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME is not set +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=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" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +CONFIG_RELAY=y +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# 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 +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System type +# +# CONFIG_SH_SOLUTION_ENGINE is not set +# CONFIG_SH_7751_SOLUTION_ENGINE is not set +# CONFIG_SH_7300_SOLUTION_ENGINE is not set +# CONFIG_SH_7343_SOLUTION_ENGINE is not set +# CONFIG_SH_73180_SOLUTION_ENGINE is not set +# CONFIG_SH_7751_SYSTEMH is not set +CONFIG_SH_HP6XX=y +# CONFIG_SH_SATURN is not set +# CONFIG_SH_DREAMCAST is not set +# CONFIG_SH_MPC1211 is not set +# CONFIG_SH_SH03 is not set +# CONFIG_SH_SECUREEDGE5410 is not set +# CONFIG_SH_HS7751RVOIP is not set +# CONFIG_SH_7710VOIPGW is not set +# CONFIG_SH_RTS7751R2D is not set +# CONFIG_SH_R7780RP is not set +# CONFIG_SH_EDOSK7705 is not set +# CONFIG_SH_SH4202_MICRODEV is not set +# CONFIG_SH_LANDISK is not set +# CONFIG_SH_TITAN is not set +# CONFIG_SH_SHMIN is not set +# CONFIG_SH_7206_SOLUTION_ENGINE is not set +# CONFIG_SH_7619_SOLUTION_ENGINE is not set +# CONFIG_SH_UNKNOWN is not set + +# +# Processor selection +# +CONFIG_CPU_SH3=y + +# +# SH-2 Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7604 is not set +# CONFIG_CPU_SUBTYPE_SH7619 is not set + +# +# SH-2A Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7206 is not set + +# +# SH-3 Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7300 is not set +# CONFIG_CPU_SUBTYPE_SH7705 is not set +# CONFIG_CPU_SUBTYPE_SH7706 is not set +# CONFIG_CPU_SUBTYPE_SH7707 is not set +# CONFIG_CPU_SUBTYPE_SH7708 is not set +CONFIG_CPU_SUBTYPE_SH7709=y +# CONFIG_CPU_SUBTYPE_SH7710 is not set + +# +# SH-4 Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7750 is not set +# CONFIG_CPU_SUBTYPE_SH7091 is not set +# CONFIG_CPU_SUBTYPE_SH7750R is not set +# CONFIG_CPU_SUBTYPE_SH7750S is not set +# CONFIG_CPU_SUBTYPE_SH7751 is not set +# CONFIG_CPU_SUBTYPE_SH7751R is not set +# CONFIG_CPU_SUBTYPE_SH7760 is not set +# CONFIG_CPU_SUBTYPE_SH4_202 is not set + +# +# ST40 Processor Support +# +# CONFIG_CPU_SUBTYPE_ST40STB1 is not set +# CONFIG_CPU_SUBTYPE_ST40GX1 is not set + +# +# SH-4A Processor Support +# +# CONFIG_CPU_SUBTYPE_SH7770 is not set +# CONFIG_CPU_SUBTYPE_SH7780 is not set +# CONFIG_CPU_SUBTYPE_SH7785 is not set + +# +# SH4AL-DSP Processor Support +# +# CONFIG_CPU_SUBTYPE_SH73180 is not set +# CONFIG_CPU_SUBTYPE_SH7343 is not set +# CONFIG_CPU_SUBTYPE_SH7722 is not set + +# +# Memory management options +# +CONFIG_MMU=y +CONFIG_PAGE_OFFSET=0x80000000 +CONFIG_MEMORY_START=0x0d000000 +CONFIG_MEMORY_SIZE=0x00400000 +CONFIG_VSYSCALL=y +CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_8KB is not set +# CONFIG_PAGE_SIZE_64KB is not set +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_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 + +# +# Cache configuration +# +# CONFIG_SH_DIRECT_MAPPED is not set +CONFIG_SH_WRITETHROUGH=y +# CONFIG_SH_OCRAM is not set + +# +# Processor features +# +CONFIG_CPU_LITTLE_ENDIAN=y +# CONFIG_CPU_BIG_ENDIAN is not set +# CONFIG_SH_FPU_EMU is not set +CONFIG_SH_DSP=y +CONFIG_SH_ADC=y +CONFIG_CPU_HAS_INTEVT=y +CONFIG_CPU_HAS_PINT_IRQ=y +CONFIG_CPU_HAS_IPR_IRQ=y +CONFIG_CPU_HAS_SR_RB=y + +# +# Timer support +# +CONFIG_SH_TMU=y +CONFIG_SH_TIMER_IRQ=16 +# CONFIG_NO_IDLE_HZ is not set +CONFIG_SH_PCLK_FREQ=22110000 + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# DMA support +# +CONFIG_SH_DMA=y +CONFIG_NR_ONCHIP_DMA_CHANNELS=4 +# CONFIG_NR_DMA_CHANNELS_BOOL is not set + +# +# Companion Chips +# +CONFIG_HD6446X_SERIES=y +CONFIG_HD64461=y +# CONFIG_HD64465 is not set +CONFIG_HD64461_IRQ=36 +CONFIG_HD64461_IOBASE=0xb0000000 +CONFIG_HD64461_ENABLER=y + +# +# Additional SuperH Device Drivers +# +# CONFIG_PUSH_SWITCH is not set + +# +# Kernel features +# +# 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_KEXEC is not set +# CONFIG_SMP is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set + +# +# Boot options +# +CONFIG_ZERO_PAGE_OFFSET=0x00001000 +CONFIG_BOOT_LINK_OFFSET=0x00800000 +# CONFIG_UBC_WAKEUP is not set +# CONFIG_CMDLINE_BOOL is not set + +# +# Bus options +# +CONFIG_ISA=y +# CONFIG_PCI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA_IOCTL is not set + +# +# PC-card bridges +# +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +CONFIG_PCMCIA_PROBE=y + +# +# PCI Hotplug Support +# + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_FLAT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options (EXPERIMENTAL) +# +# CONFIG_PM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_NETDEBUG=y +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +CONFIG_IEEE80211=y +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=y +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +CONFIG_PARPORT=y +# CONFIG_PARPORT_PC is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set + +# +# Plug and Play support +# +# CONFIG_PNP is not set +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# Misc devices +# + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +# CONFIG_PATA_LEGACY is not set +# CONFIG_PATA_PCMCIA is not set +# CONFIG_PATA_QDI is not set +# CONFIG_PATA_WINBOND_VLB is not set +CONFIG_PATA_PLATFORM=y + +# +# Old CD-ROM drivers (not SCSI, not IDE) +# +# CONFIG_CD_NO_IDESCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_STNIC is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SMC91X is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +# CONFIG_NET_PCI is not set +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# 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 +# CONFIG_ARLAN is not set +# CONFIG_WAVELAN is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +# CONFIG_PCMCIA_PCNET is not set +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PLIP is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_TOUCHSCREEN_HP600=y +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_SH_SCI_NR_UARTS=2 +CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=5 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_TIPAR is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m +# CONFIG_GEN_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_HP680=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frambuffer hardware drivers +# +# CONFIG_FB_EPSON1355 is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_HIT=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +CONFIG_FONT_PEARL_8x8=y +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +# CONFIG_USB_ARCH_HAS_HCD is not set +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SH=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices +# + +# +# Auxiliary Display support +# + +# +# Virtualization +# + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_SH_STANDARD_BIOS is not set +# CONFIG_EARLY_SCIF_CONSOLE is not set +# CONFIG_KGDB is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_MANAGER=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=y +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +CONFIG_CRYPTO_MICHAEL_MIC=m +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/git-20070405-2.patch b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/git-20070405-2.patch new file mode 100644 index 0000000000..205d62a952 --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/git-20070405-2.patch @@ -0,0 +1,1058 @@ +diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c +index b5a9664..5c6726d 100644 +--- a/arch/sh/boards/hp6xx/setup.c ++++ b/arch/sh/boards/hp6xx/setup.c +@@ -2,6 +2,8 @@ + * linux/arch/sh/boards/hp6xx/setup.c + * + * Copyright (C) 2002 Andriy Skulysh ++ * Copyright (C) 2007 Kristoffer Ericson ++ * + * + * May be copied or modified under the terms of the GNU General Public + * License. See linux/COPYING for more information. +@@ -10,6 +12,7 @@ + */ + #include + #include ++#include + #include + #include + #include +@@ -19,6 +22,41 @@ + #define SCPCR 0xa4000116 + #define SCPDR 0xa4000136 + ++/* CF Slot */ ++static struct resource cf_ide_resources[] = { ++ [0] = { ++ .start = 0x15000000 + 0x1f0, ++ .end = 0x15000000 + 0x1f0 + 0x08 - 0x01, ++ .flags = IORESOURCE_MEM, ++ }, ++ [1] = { ++ .start = 0x15000000 + 0x1fe, ++ .end = 0x15000000 + 0x1fe + 0x01, ++ .flags = IORESOURCE_MEM, ++ }, ++ [2] = { ++ .start = 93, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct platform_device cf_ide_device = { ++ .name = "pata_platform", ++ .id = -1, ++ .num_resources = ARRAY_SIZE(cf_ide_resources), ++ .resource = cf_ide_resources, ++}; ++ ++static struct platform_device *hp6xx_devices[] __initdata = { ++ ++ &cf_ide_device, ++}; ++ ++static int __init hp6xx_devices_setup(void) ++{ ++ return platform_add_devices(hp6xx_devices,ARRAY_SIZE(hp6xx_devices)); ++} ++ + static void __init hp6xx_setup(char **cmdline_p) + { + u8 v8; +@@ -61,40 +99,12 @@ static void __init hp6xx_setup(char **cmdline_p) + ctrl_outw(v, SCPCR); + } + +-/* +- * XXX: This is stupid, we should have a generic machine vector for the cchips +- * and just wrap the platform setup code in to this, as it's the only thing +- * that ends up being different. +- */ ++device_initcall(hp6xx_devices_setup); ++ + struct sh_machine_vector mv_hp6xx __initmv = { + .mv_name = "hp6xx", + .mv_setup = hp6xx_setup, + .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM, +- +- .mv_inb = hd64461_inb, +- .mv_inw = hd64461_inw, +- .mv_inl = hd64461_inl, +- .mv_outb = hd64461_outb, +- .mv_outw = hd64461_outw, +- .mv_outl = hd64461_outl, +- +- .mv_inb_p = hd64461_inb_p, +- .mv_inw_p = hd64461_inw, +- .mv_inl_p = hd64461_inl, +- .mv_outb_p = hd64461_outb_p, +- .mv_outw_p = hd64461_outw, +- .mv_outl_p = hd64461_outl, +- +- .mv_insb = hd64461_insb, +- .mv_insw = hd64461_insw, +- .mv_insl = hd64461_insl, +- .mv_outsb = hd64461_outsb, +- .mv_outsw = hd64461_outsw, +- .mv_outsl = hd64461_outsl, +- +- .mv_readw = hd64461_readw, +- .mv_writew = hd64461_writew, +- + .mv_irq_demux = hd64461_irq_demux, + }; + ALIAS_MV(hp6xx) +diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c +index 4d49b5c..f59e73f 100644 +--- a/arch/sh/cchips/hd6446x/hd64461/setup.c ++++ b/arch/sh/cchips/hd6446x/hd64461/setup.c +@@ -122,7 +122,7 @@ int hd64461_irq_demux(int irq) + } + } + } +- return __irq_demux(irq); ++ return (irq); + } + + static struct irqaction irq0 = { hd64461_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64461", NULL, NULL }; +diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c +index 06ed060..b56fab8 100644 +--- a/arch/sh/drivers/dma/dma-sh.c ++++ b/arch/sh/drivers/dma/dma-sh.c +@@ -19,6 +19,13 @@ + #include + #include "dma-sh.h" + ++#ifdef CONFIG_CPU_SUBTYPE_SH7709 ++ #define DMTE0_IRQ 48 ++ #define DMTE1_IRQ 49 ++ #define DMTE2_IRQ 50 ++ #define DMTE3_IRQ 51 ++#endif ++ + static int dmte_irq_map[] = { + DMTE0_IRQ, + DMTE1_IRQ, +diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7709.c b/arch/sh/kernel/cpu/sh3/setup-sh7709.c +index dc9b211..3e9bb0c 100644 +--- a/arch/sh/kernel/cpu/sh3/setup-sh7709.c ++++ b/arch/sh/kernel/cpu/sh3/setup-sh7709.c +@@ -52,20 +52,29 @@ static int __init sh7709_devices_setup(void) + } + __initcall(sh7709_devices_setup); + +-#define IPRx(A,N) .addr=A, .shift=0*N*-1 ++#define IPRx(A,N) .addr=A, .shift=N + #define IPRA(N) IPRx(0xfffffee2UL,N) + #define IPRB(N) IPRx(0xfffffee4UL,N) ++#define IPRC(N) IPRx(0xa4000016UL,N) ++#define IPRD(N) IPRx(0xa4000018UL,N) + #define IPRE(N) IPRx(0xa400001aUL,N) + + static struct ipr_data sh7709_ipr_map[] = { +- [16] = { IPRA(15-12), 2 }, /* TMU TUNI0 */ +- [17] = { IPRA(11-8), 4 }, /* TMU TUNI1 */ +- [22] = { IPRA(3-0), 2 }, /* RTC CUI */ +- [23 ... 26] = { IPRB(7-4), 3 }, /* SCI */ +- [27] = { IPRB(15-12), 2 }, /* WDT ITI */ +- [48 ... 51] = { IPRE(15-12), 7 }, /* DMA */ +- [52 ... 55] = { IPRE(11-8), 3 }, /* IRDA */ +- [56 ... 59] = { IPRE(7-4), 3 }, /* SCIF */ ++ [16] = { IPRA(12), 2 }, /* TMU TUNI0 */ ++ [17] = { IPRA(8), 4 }, /* TMU TUNI1 */ ++ [18 ... 19] = { IPRA(4), 1 }, /* TMU TUNI1 */ ++ [20 ... 22] = { IPRA(0), 2 }, /* RTC CUI */ ++ [23 ... 26] = { IPRB(4), 3 }, /* SCI */ ++ [27] = { IPRB(12), 2 }, /* WDT ITI */ ++ [32] = { IPRC(0), 1 }, /* IRQ 0 */ ++ [33] = { IPRC(4), 1 }, /* IRQ 1 */ ++ [34] = { IPRC(8), 1 }, /* IRQ 2 APM */ ++ [35] = { IPRC(12), 1 }, /* IRQ 3 TOUCHSCREEN */ ++ [36] = { IPRD(0), 1 }, /* IRQ 4 */ ++ [37] = { IPRD(4), 1 }, /* IRQ 5 */ ++ [48 ... 51] = { IPRE(12), 7 }, /* DMA */ ++ [52 ... 55] = { IPRE(8), 3 }, /* IRDA */ ++ [56 ... 59] = { IPRE(4), 3 }, /* SCIF */ + }; + + void __init init_IRQ_ipr() +diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig +index f17e9c7..52a6323 100644 +--- a/drivers/input/keyboard/Kconfig ++++ b/drivers/input/keyboard/Kconfig +@@ -68,6 +68,9 @@ config KEYBOARD_ATKBD_RDI_KEYCODES + right-hand column will be interpreted as the key shown in the + left-hand column. + ++config KEYBOARD_HP680 ++ tristate "HP 680 Keyboard Driver" ++ + config KEYBOARD_SUNKBD + tristate "Sun Type 4 and Type 5 keyboard" + select SERIO +diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile +index 586a0fe..09ee105 100644 +--- a/drivers/input/keyboard/Makefile ++++ b/drivers/input/keyboard/Makefile +@@ -19,4 +19,4 @@ obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o + obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o + obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o + obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o +- ++obj-$(CONFIG_KEYBOARD_HP680) += scan_keyb.o hp680_keyb.o +diff --git a/drivers/input/keyboard/hp680_keyb.c b/drivers/input/keyboard/hp680_keyb.c +new file mode 100644 +index 0000000..d534a2c +--- /dev/null ++++ b/drivers/input/keyboard/hp680_keyb.c +@@ -0,0 +1,235 @@ ++/* ++ * drivers/input/keyboard/hp680_keyb.c ++ * ++ * HP Jornada 680/690 scan keyboard ++ * ++ * Copyright (C) 2005 Andriy Skulysh ++ * Copyright (C) 2006 Paul Mundt ++ * Copyright (C) 2007 Kristoffer Ericson ++ * ++ * Splited from drivers/input/keyboard/hp600_keyb.c ++ * ++ * Copyright (C) 2000 YAEGASHI Takeshi ++ * HP600 keyboard scan routine and translation table ++ * Copyright (C) 2000 Niibe Yutaka ++ * HP620 keyboard translation table ++ */ ++#include ++#include ++#include ++#include ++#include ++#include "scan_keyb.h" ++ ++#define PCCR 0xa4000104 ++#define PDCR 0xa4000106 ++#define PECR 0xa4000108 ++#define PFCR 0xa400010a ++#define PCDR 0xa4000124 ++#define PDDR 0xa4000126 ++#define PEDR 0xa4000128 ++#define PFDR 0xa400012a ++#define PGDR 0xa400012c ++#define PHDR 0xa400012e ++#define PJDR 0xa4000130 ++#define PKDR 0xa4000132 ++#define PLDR 0xa4000134 ++ ++/*************************************************************** ++HP Jornada 680(SWEDISH version) keyboard ++[!] indicates Special Characters ++ ++_______________________________________________________________________ ++| ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 POWER| ++| 1 2 3 4 5 6 7 8 9 0 + ` BKPSPACE| ++|* Q W E R T Y U I O P ! ^ ENTER| ++| TAB A S D F G H J K L ! ! ' ENTER| ++| SHIFT Z X C V B N M , . - UP SHIFT| ++| CTRL WIN ALT ? =======SPACE======== ALTG DEL LEF DO RI ] ++----------------------------------------------------------------------- ++ ++ ++****************************************************************/ ++ ++ ++ ++/**************************************************************** ++HP Jornada 690(Japanese version) keyboard scan matrix ++ ++ PTC7 PTC6 PTC5 PTC4 PTC3 PTC2 PTC1 PTC0 ++PTD1 REC Escape on/off Han/Zen Hira Eisu ++PTD5 REC Z on/off Enter : / ++PTD7 REC Right Down ++PTE0 REC Windows on/off ++PTE1 REC A on/off ] [ ; ++PTE3 REC Tab on/off ShirtR \ Up ++PTE6 REC Q on/off BS @ P ++PTE7 REC 1 on/off ^ - 0 ++ ++ PTF7 PTF6 PTF5 PTF4 PTF3 PTF2 PTF1 PTF0 ++PTD1 F5 F4 F6 F7 F8 F3 F2 F1 ++PTD5 N B M , . V C X ++PTD7 Muhen Alt Left ++PTE0 Henkan _ Del Space Ctrl ++PTE1 H G J K L F D S ++PTE3 ShiftL ++PTE6 Y T U I O R E W ++PTE7 6 5 7 8 9 4 3 2 ++ ++ PTG5 PTG4 PTG3 PTG0 PTH0 ++* REC REW FWW Cover on/off ++ ++ ++ 7 6 5 4 3 2 1 0 ++C: 0xffff 0xdf IP IP IP IP IP IP IP IP ++D: 0x6786 0x59 O I O IP I F O I ++E: 0x5045 0x00 O O F F O F O O ++F: 0xffff 0xff IP IP IP IP IP IP IP IP ++G: 0xaffe 0xfd I I IP IP IP IP IP I ++H: 0x70f2 0x49 O IP F F IP IP F I ++J: 0x0704 0x22 F F O IP F F O F ++K: 0x0100 0x10 F F F O F F F F ++L: 0x0c3c 0x26 F F IP F F IP IP F ++ ++****************************************************************/ ++ ++static const unsigned char hp680_japanese_table[] = { ++/* ++ /* PTD1 */ ++ /* ? ? ? ? Esc ? ? ? */ ++ 0x3a, 0x70, 0x29, 0x00, 0x01, 0x00, 0x00, 0x00, ++ /* F1 F2 F3 F8 F7 F6 F4 F5 */ ++ 0x3b, 0x3c, 0x3d, 0x42, 0x41, 0x40, 0x3e, 0x3f, ++ ++ /* PTD5 */ ++ /* / : Enter ? Z ? ? ? */ ++ 0x35, 0x28, 0x1c, 0x00, 0x2c, 0x00, 0x00, 0x00, ++ /* X C V . , M B N */ ++ 0x2d, 0x2e, 0x2f, 0x34, 0x33, 0x32, 0x30, 0x31, ++ ++ /* PTD7 */ ++ /* Down Right ? ? ? ? ? ? */ ++ 0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ /* ? ? ? Left ? ? Alt ? */ ++ 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b, ++ ++ /* PTE0 */ ++ /* ? ? ? ? Win ? ? ? */ ++ 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, ++ /* Ctrl ? Space Del _ ? ? ? */ ++ 0x1d, 0x00, 0x39, 0x53, 0x73, 0xf9, 0x00, 0x00, ++ ++ /* PTE1 */ ++ /* ; [ ] ? A ? ? ? */ ++ 0x27, 0x1b, 0x2b, 0x00, 0x1e, 0x00, 0x00, 0x00, ++ /* S D F L K J G H */ ++ 0x1f, 0x20, 0x21, 0x26, 0x25, 0x24, 0x22, 0x23, ++ ++ /* PTE3 */ ++ /* Up \ ShiftR ? Q ? ? ? */ ++ 0x48, 0x7d, 0x36, 0x00, 0x0f, 0x00, 0x00, 0x00, ++ /* ? ShiftL ? ? ? ? ? ? */ ++ 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ ++ /* PTE6 */ ++ /* P @ BS ? Q ? ? ? */ ++ 0x19, 0x1a, 0x0e, 0x00, 0x10, 0x00, 0x00, 0x00, ++ /* W E R O I U T Y */ ++ 0x11, 0x12, 0x13, 0x18, 0x17, 0x16, 0x14, 0x15, ++ ++ /* PTE7 */ ++ /* 0 + = ? 1 ? ? ? */ ++ 0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, ++ /* 2 3 4 9 8 7 5 6 */ ++ 0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07, ++ ++ /* **** */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++}; ++ ++static int hp680_japanese_scan_kbd(unsigned char *s) ++{ ++ int i; ++ unsigned short ec_static,dc_static; /* = UINT16_t */ ++ unsigned char matrix_switch[] = { ++ 0xfd, 0xff, /* PTD1 PD(1) */ ++ 0xdf, 0xff, /* PTD5 PD(5) */ ++ 0x7f, 0xff, /* PTD7 PD(7) */ ++ 0xff, 0xfe, /* PTE0 PE(0) */ ++ 0xff, 0xfd, /* PTE1 PE(1) */ ++ 0xff, 0xf7, /* PTE3 PE(3) */ ++ 0xff, 0xbf, /* PTE6 PE(6) */ ++ 0xff, 0x7f, /* PTE7 PE(7) */ ++ }, *t=matrix_switch; ++ /* PD(x) : ++ 1. 0xcc0c & (1~(1 << (2*(x)+1))))) ++ 2. (0xf0cf & 0xfffff) */ ++ /* PE(x) : ++ 1. 0xcc0c & 0xffff ++ 2. 0xf0cf & (1~(1 << (2*(x)+1))))) */ ++ unsigned short matrix_PDE[] = { ++ 0xcc04, 0xf0cf, /* PD(1) */ ++ 0xc40c, 0xf0cf, /* PD(5) */ ++ 0x4c0c, 0xf0cf, /* PD(7) */ ++ 0xcc0c, 0xf0cd, /* PE(0) */ ++ 0xcc0c, 0xf0c7, /* PE(1) */ ++ 0xcc0c, 0xf04f, /* PE(3) */ ++ 0xcc0c, 0xd0cf, /* PE(6) */ ++ 0xcc0c, 0x70cf, /* PE(7) */ ++ } ++ , *y=matrix_PDE; ++ /* Save these control reg bits */ ++ dc_static = (ctrl_inw(PDCR) & (~0xcc0c)); ++ ec_static = (ctrl_inw(PECR) & (~0xf0cf)); ++ ++ for(i=0; i<8; i++) { ++ /* disable output for all but the one we want to scan */ ++ ctrl_outw((dc_static | *y++), PDCR); ++ ctrl_outw((ec_static | *y++), PECR); ++ udelay(5); ++ ++ /* Get scanline row */ ++ ctrl_outb(*t++, PDDR); ++ ctrl_outb(*t++, PEDR); ++ udelay(50); ++ ++ /* Read data */ ++ *s++=ctrl_inb(PCDR); ++ *s++=ctrl_inb(PFDR); ++ } ++ /* Scan no lines */ ++ ctrl_outb(0xff, PDDR); ++ ctrl_outb(0xff, PEDR); ++ ++ /* Enable all scanlines */ ++ ctrl_outw((dc_static | (0x5555 & 0xcc0c)),PDCR); ++ ctrl_outw((ec_static | (0x5555 & 0xf0cf)),PECR); ++ /* Ignore extra keys and events */ ++ ++ *s++=ctrl_inb(PGDR); ++ *s++=ctrl_inb(PHDR); ++ ++ return 0; ++} ++ ++static struct scan_keyboard hp680_kbd = { ++ .scan = hp680_japanese_scan_kbd, ++ .table = hp680_japanese_table, ++ .length = 16, ++}; ++ ++static int __init hp680_kbd_init_hw(void) ++{ ++ printk(KERN_INFO "HP680 matrix scan keyboard registered\n"); ++ return register_scan_keyboard(&hp680_kbd); ++} ++ ++static void __exit hp680_kbd_exit_hw(void) ++{ ++ unregister_scan_keyboard(&hp680_kbd); ++} ++ ++module_init(hp680_kbd_init_hw); ++module_exit(hp680_kbd_exit_hw); ++MODULE_LICENSE("GPL"); +diff --git a/drivers/input/keyboard/scan_keyb.c b/drivers/input/keyboard/scan_keyb.c +new file mode 100644 +index 0000000..e65668b +--- /dev/null ++++ b/drivers/input/keyboard/scan_keyb.c +@@ -0,0 +1,148 @@ ++/* ++ * Generic scan keyboard driver ++ * ++ * Copyright (C) 2000 YAEGASHI Takeshi ++ * Copyright (C) 2003 Andriy Skulysh ++ * Copyright (C) 2006 Paul Mundt ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file "COPYING" in the main directory of this archive ++ * for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "scan_keyb.h" ++ ++#define SCANHZ (HZ/20) ++ ++static int scan_jiffies; ++static struct scan_keyboard *keyboards; ++struct timer_list scan_timer; ++static char *hpkbd_name = "Hitachi scankeyboard"; ++static char *hpkbd_phys = "input0"; ++ ++static void check_kbd(struct scan_keyboard *kbd, ++ unsigned char *new, unsigned char *old) ++{ ++ const unsigned char *table = kbd->table; ++ int length = kbd->length; ++ int need_tasklet_schedule = 0; ++ unsigned int xor, bit; ++ ++ while (length-- > 0) { ++ if ((xor = *new ^ *old) == 0) ++ table += 8; ++ else { ++ for (bit = 0x01; bit < 0x100; bit <<= 1) { ++ if (xor & bit) { ++ input_report_key(kbd->dev, *table, ++ !(*new & bit)); ++ need_tasklet_schedule = 1; ++ } ++ ++ table++; ++ } ++ } ++ ++ new++; ++ old++; ++ } ++ ++ if (need_tasklet_schedule) { ++ input_sync(kbd->dev); ++ tasklet_schedule(&keyboard_tasklet); ++ } ++} ++ ++static void scan_kbd(unsigned long dummy) ++{ ++ struct scan_keyboard *kbd; ++ ++ scan_jiffies++; ++ ++ for (kbd = keyboards; kbd != NULL; kbd = kbd->next) { ++ if (scan_jiffies & 1) { ++ if (!kbd->scan(kbd->s0)) ++ check_kbd(kbd, kbd->s0, kbd->s1); ++ else ++ memcpy(kbd->s0, kbd->s1, kbd->length); ++ } else { ++ if (!kbd->scan(kbd->s1)) ++ check_kbd(kbd, kbd->s1, kbd->s0); ++ else ++ memcpy(kbd->s1, kbd->s0, kbd->length); ++ } ++ } ++ ++ mod_timer(&scan_timer, jiffies + SCANHZ); ++} ++ ++int register_scan_keyboard(struct scan_keyboard *kbd) ++{ ++ int i; ++ ++ kbd->s0 = kmalloc(kbd->length, GFP_KERNEL); ++ if (kbd->s0 == NULL) ++ goto error; ++ ++ kbd->s1 = kmalloc(kbd->length, GFP_KERNEL); ++ if (kbd->s1 == NULL) ++ goto error; ++ ++ memset(kbd->s0, -1, kbd->length); ++ memset(kbd->s1, -1, kbd->length); ++ ++ kbd->dev = input_allocate_device(); ++ if (!kbd->dev) ++ goto error; ++ ++ kbd->dev->name = hpkbd_name; ++ kbd->dev->phys = hpkbd_phys; ++ kbd->dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); ++ //init_input_dev(kbd->dev); ++ kbd->dev->keycode = (unsigned char *)kbd->table; ++ kbd->dev->keycodesize = sizeof(unsigned char); ++ kbd->dev->keycodemax = ARRAY_SIZE(kbd->table); ++ ++ for (i = 0; i < 128; i++) ++ if (kbd->table[i]) ++ set_bit(kbd->table[i], kbd->dev->keybit); ++ ++ clear_bit(0, kbd->dev->keybit); ++ input_register_device(kbd->dev); ++ ++ kbd->next = keyboards; ++ keyboards = kbd; ++ ++ init_timer(&scan_timer); ++ scan_timer.expires = jiffies + SCANHZ; ++ scan_timer.data = 0; ++ scan_timer.function = scan_kbd; ++ add_timer(&scan_timer); ++ ++ return 0; ++ ++error: ++ kfree(kbd->s1); ++ kfree(kbd->s0); ++ ++ return -ENOMEM; ++} ++EXPORT_SYMBOL_GPL(register_scan_keyboard); ++ ++void unregister_scan_keyboard(struct scan_keyboard *kbd) ++{ ++ del_timer_sync(&scan_timer); ++ keyboards = kbd->next; ++ input_unregister_device(kbd->dev); ++ input_free_device(kbd->dev); ++} ++EXPORT_SYMBOL_GPL(unregister_scan_keyboard); +diff --git a/drivers/input/keyboard/scan_keyb.h b/drivers/input/keyboard/scan_keyb.h +new file mode 100644 +index 0000000..e50510f +--- /dev/null ++++ b/drivers/input/keyboard/scan_keyb.h +@@ -0,0 +1,16 @@ ++#ifndef __DRIVER_CHAR_SCAN_KEYB_H ++#define __DRIVER_CHAR_SCAN_KEYB_H ++ ++struct scan_keyboard { ++ struct scan_keyboard *next; ++ int (*scan)(unsigned char *buffer); ++ const unsigned char *table; ++ unsigned char *s0, *s1; ++ int length; ++ struct input_dev *dev; ++}; ++ ++int register_scan_keyboard(struct scan_keyboard *); ++void unregister_scan_keyboard(struct scan_keyboard *); ++ ++#endif +diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c +index 2490874..0450d28 100644 +--- a/drivers/input/touchscreen/hp680_ts_input.c ++++ b/drivers/input/touchscreen/hp680_ts_input.c +@@ -18,12 +18,12 @@ + #define PHDR 0xa400012e + #define SCPDR 0xa4000136 + +-static void do_softint(void *data); ++static void do_softint(struct work_struct *work); + + static struct input_dev *hp680_ts_dev; +-static DECLARE_WORK(work, do_softint, 0); ++static DECLARE_DELAYED_WORK(work, do_softint); + +-static void do_softint(void *data) ++static void do_softint(struct work_struct *work) + { + int absx = 0, absy = 0; + u8 scpdr; +@@ -68,9 +68,8 @@ static void do_softint(void *data) + + static irqreturn_t hp680_ts_interrupt(int irq, void *dev) + { +- disable_irq_nosync(irq); ++ disable_irq_nosync(irq); + schedule_delayed_work(&work, HZ / 20); +- + return IRQ_HANDLED; + } + +@@ -108,7 +107,7 @@ static int __init hp680_ts_init(void) + return 0; + + fail2: free_irq(HP680_TS_IRQ, NULL); +- cancel_delayed_work(&work); ++ cancel_delayed_work(&work); /* delay_ts->work */ + flush_scheduled_work(); + fail1: input_free_device(hp680_ts_dev); + return err; +diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c +index 0899fcc..109329a 100644 +--- a/drivers/video/backlight/hp680_bl.c ++++ b/drivers/video/backlight/hp680_bl.c +@@ -125,8 +125,8 @@ static int hp680bl_remove(struct platform_device *pdev) + { + struct backlight_device *bd = platform_get_drvdata(pdev); + +- hp680bl_data.brightness = 0; +- hp680bl_data.power = 0; ++// hp680bl_data.brightness = 0; ++// hp680bl_data.power = 0; + hp680bl_send_intensity(bd); + + backlight_device_unregister(bd); +diff --git a/include/asm-sh/hd64461.h b/include/asm-sh/hd64461.h +index 27e5c34..cd2e5f9 100644 +--- a/include/asm-sh/hd64461.h ++++ b/include/asm-sh/hd64461.h +@@ -9,111 +9,122 @@ + /* Constants for PCMCIA mappings */ + #define HD64461_PCC_WINDOW 0x01000000 + +-#define HD64461_PCC0_BASE 0xb8000000 /* area 6 */ +-#define HD64461_PCC0_ATTR (HD64461_PCC0_BASE) +-#define HD64461_PCC0_COMM (HD64461_PCC0_BASE+HD64461_PCC_WINDOW) +-#define HD64461_PCC0_IO (HD64461_PCC0_BASE+2*HD64461_PCC_WINDOW) +- +-#define HD64461_PCC1_BASE 0xb4000000 /* area 5 */ +-#define HD64461_PCC1_ATTR (HD64461_PCC1_BASE) +-#define HD64461_PCC1_COMM (HD64461_PCC1_BASE+HD64461_PCC_WINDOW) +- +-#define HD64461_STBCR 0x10000 +-#define HD64461_STBCR_CKIO_STBY 0x2000 +-#define HD64461_STBCR_SAFECKE_IST 0x1000 +-#define HD64461_STBCR_SLCKE_IST 0x0800 +-#define HD64461_STBCR_SAFECKE_OST 0x0400 +-#define HD64461_STBCR_SLCKE_OST 0x0200 +-#define HD64461_STBCR_SMIAST 0x0100 +-#define HD64461_STBCR_SLCDST 0x0080 +-#define HD64461_STBCR_SPC0ST 0x0040 +-#define HD64461_STBCR_SPC1ST 0x0020 +-#define HD64461_STBCR_SAFEST 0x0010 +-#define HD64461_STBCR_STM0ST 0x0008 +-#define HD64461_STBCR_STM1ST 0x0004 +-#define HD64461_STBCR_SIRST 0x0002 +-#define HD64461_STBCR_SURTST 0x0001 +- +-#define HD64461_SYSCR 0x10002 +-#define HD64461_SCPUCR 0x10004 +- +-#define HD64461_LCDCBAR 0x11000 +-#define HD64461_LCDCLOR 0x11002 +-#define HD64461_LCDCCR 0x11004 +-#define HD64461_LCDCCR_STBACK 0x0400 +-#define HD64461_LCDCCR_STREQ 0x0100 +-#define HD64461_LCDCCR_MOFF 0x0080 +-#define HD64461_LCDCCR_REFSEL 0x0040 +-#define HD64461_LCDCCR_EPON 0x0020 +-#define HD64461_LCDCCR_SPON 0x0010 +- +-#define HD64461_LDR1 0x11010 ++#define HD64461_PCC0_BASE 0xb8000000 /* area 6 */ ++#define HD64461_PCC0_ATTR (HD64461_PCC0_BASE) /* 0xb8000000 */ ++#define HD64461_PCC0_COMM (HD64461_PCC0_BASE+HD64461_PCC_WINDOW) /* 0xb9000000 */ ++#define HD64461_PCC0_IO (HD64461_PCC0_BASE+2*HD64461_PCC_WINDOW) /* 0xba000000 */ ++ ++#define HD64461_PCC1_BASE 0xb4000000 /* area 5 */ ++#define HD64461_PCC1_ATTR (HD64461_PCC1_BASE) /* 0xb4000000 */ ++#define HD64461_PCC1_COMM (HD64461_PCC1_BASE+HD64461_PCC_WINDOW) /* 0xb5000000 */ ++ ++/* if PORT < 0xf000 then ADDR = 0xa0000000 + PORT */ ++#define HD64461_STBCR (CONFIG_HD64461_IOBASE) ++#define HD64461_STBCR_CKIO_STBY 0xa0002000 ++#define HD64461_STBCR_SAFECKE_IST 0xa0001000 ++#define HD64461_STBCR_SLCKE_IST 0xa0000800 ++#define HD64461_STBCR_SAFECKE_OST 0xa0000400 ++#define HD64461_STBCR_SLCKE_OST 0xa0000200 ++#define HD64461_STBCR_SMIAST 0xa0000100 ++#define HD64461_STBCR_SLCDST 0xa0000080 ++#define HD64461_STBCR_SPC0ST 0xa0000040 ++#define HD64461_STBCR_SPC1ST 0xa0000020 ++#define HD64461_STBCR_SAFEST 0xa0000010 ++#define HD64461_STBCR_STM0ST 0xa0000008 ++#define HD64461_STBCR_STM1ST 0xa0000004 ++#define HD64461_STBCR_SIRST 0xa0000002 ++#define HD64461_STBCR_SURTST 0xa0000001 ++ ++/* if PORT < 0x20000 then ADDR = CONFIG_HD64461_IOBASE + PORT - 0x10000 */ ++#define HD64461_SYSCR (CONFIG_HD64461_IOBASE + 0x10002 - 0x10000) ++#define HD64461_SCPUCR (CONFIG_HD64461_IOBASE + 0x10004 - 0x10000) ++#define HD64461_LCDCBAR (CONFIG_HD64461_IOBASE + 0x11000 - 0x10000) ++#define HD64461_LCDCLOR (CONFIG_HD64461_IOBASE + 0x11002 - 0x10000) ++#define HD64461_LCDCCR (CONFIG_HD64461_IOBASE + 0x11004 - 0x10000) ++ ++ ++/* if PORT < 0xf000 then ADDR = 0xa0000000 + PORT */ ++#define HD64461_LCDCCR_STBACK (0xa0000000 + 0x0400) ++#define HD64461_LCDCCR_STREQ (0xa0000000 + 0x0100) ++#define HD64461_LCDCCR_MOFF (0xa0000000 + 0x0080) ++#define HD64461_LCDCCR_REFSEL (0xa0000000 + 0x0040) ++#define HD64461_LCDCCR_EPON (0xa0000000 + 0x0020) ++#define HD64461_LCDCCR_SPON (0xa0000000 + 0x0010) ++ ++/* if PORT < 0x20000 then ADDR = CONFIG_HD64461_IOBASE + PORT - 0x10000 */ ++#define HD64461_LDR1 (CONFIG_HD64461_IOBASE + 0x11010 - 0x10000) ++ ++/* if PORT < 0xf000 then ADDR = 0xa0000000 + PORT */ + #define HD64461_LDR1_DON 0x01 + #define HD64461_LDR1_DINV 0x80 + +-#define HD64461_LDR2 0x11012 +-#define HD64461_LDHNCR 0x11014 +-#define HD64461_LDHNSR 0x11016 +-#define HD64461_LDVNTR 0x11018 +-#define HD64461_LDVNDR 0x1101a +-#define HD64461_LDVSPR 0x1101c +-#define HD64461_LDR3 0x1101e +- +-#define HD64461_CPTWAR 0x11030 +-#define HD64461_CPTWDR 0x11032 +-#define HD64461_CPTRAR 0x11034 +-#define HD64461_CPTRDR 0x11036 +- +-#define HD64461_GRDOR 0x11040 +-#define HD64461_GRSCR 0x11042 +-#define HD64461_GRCFGR 0x11044 ++/* if PORT < 0x20000 then ADDR = CONFIG_HD64461_IOBASE + PORT - 0x10000 */ ++#define HD64461_LDR2 (CONFIG_HD64461_IOBASE + 0x11012 - 0x10000) ++#define HD64461_LDHNCR (CONFIG_HD64461_IOBASE + 0x11014 - 0x10000) ++#define HD64461_LDHNSR (CONFIG_HD64461_IOBASE + 0x11016 - 0x10000) ++#define HD64461_LDVNTR (CONFIG_HD64461_IOBASE + 0x11018 - 0x10000) ++#define HD64461_LDVNDR (CONFIG_HD64461_IOBASE + 0x1101a - 0x10000) ++#define HD64461_LDVSPR (CONFIG_HD64461_IOBASE + 0x1101c - 0x10000) ++#define HD64461_LDR3 (CONFIG_HD64461_IOBASE + 0x1101e - 0x10000) ++ ++#define HD64461_CPTWAR (CONFIG_HD64461_IOBASE + 0x11030 - 0x10000) ++#define HD64461_CPTWDR (CONFIG_HD64461_IOBASE + 0x11032 - 0x10000) ++#define HD64461_CPTRAR (CONFIG_HD64461_IOBASE + 0x11034 - 0x10000) ++#define HD64461_CPTRDR (CONFIG_HD64461_IOBASE + 0x11036 - 0x10000) ++ ++#define HD64461_GRDOR (CONFIG_HD64461_IOBASE + 0x11040 - 0x10000) ++#define HD64461_GRSCR (CONFIG_HD64461_IOBASE + 0x11042 - 0x10000) ++#define HD64461_GRCFGR (CONFIG_HD64461_IOBASE + 0x11044 - 0x10000) ++ + #define HD64461_GRCFGR_ACCSTATUS 0x10 + #define HD64461_GRCFGR_ACCRESET 0x08 +-#define HD64461_GRCFGR_ACCSTART_BITBLT 0x06 +-#define HD64461_GRCFGR_ACCSTART_LINE 0x04 ++#define HD64461_GRCFGR_ACCSTART_BITBLT 0x06 ++#define HD64461_GRCFGR_ACCSTART_LINE 0x04 + #define HD64461_GRCFGR_COLORDEPTH16 0x01 + +-#define HD64461_LNSARH 0x11046 +-#define HD64461_LNSARL 0x11048 +-#define HD64461_LNAXLR 0x1104a +-#define HD64461_LNDGR 0x1104c +-#define HD64461_LNAXR 0x1104e +-#define HD64461_LNERTR 0x11050 +-#define HD64461_LNMDR 0x11052 +-#define HD64461_BBTSSARH 0x11054 +-#define HD64461_BBTSSARL 0x11056 +-#define HD64461_BBTDSARH 0x11058 +-#define HD64461_BBTDSARL 0x1105a +-#define HD64461_BBTDWR 0x1105c +-#define HD64461_BBTDHR 0x1105e +-#define HD64461_BBTPARH 0x11060 +-#define HD64461_BBTPARL 0x11062 +-#define HD64461_BBTMARH 0x11064 +-#define HD64461_BBTMARL 0x11066 +-#define HD64461_BBTROPR 0x11068 +-#define HD64461_BBTMDR 0x1106a +- ++/* if PORT < 0x20000 then CONFIG_HD64461_IOBASE + PORT - 0x10000 */ ++#define HD64461_LNSARH (CONFIG_HD64461_IOBASE + 0x11046 - 0x10000) ++#define HD64461_LNSARL (CONFIG_HD64461_IOBASE + 0x11048 - 0x10000) ++#define HD64461_LNAXLR (CONFIG_HD64461_IOBASE + 0x1104a - 0x10000) ++#define HD64461_LNDGR (CONFIG_HD64461_IOBASE + 0x1104c - 0x10000) ++#define HD64461_LNAXR (CONFIG_HD64461_IOBASE + 0x1104e - 0x10000) ++#define HD64461_LNERTR (CONFIG_HD64461_IOBASE + 0x11050 - 0x10000) ++#define HD64461_LNMDR (CONFIG_HD64461_IOBASE + 0x11052 - 0x10000) ++#define HD64461_BBTSSARH (CONFIG_HD64461_IOBASE + 0x11054 - 0x10000) ++#define HD64461_BBTSSARL (CONFIG_HD64461_IOBASE + 0x11056 - 0x10000) ++#define HD64461_BBTDSARH (CONFIG_HD64461_IOBASE + 0x11058 - 0x10000) ++#define HD64461_BBTDSARL (CONFIG_HD64461_IOBASE + 0x1105a - 0x10000) ++#define HD64461_BBTDWR (CONFIG_HD64461_IOBASE + 0x1105c - 0x10000) ++#define HD64461_BBTDHR (CONFIG_HD64461_IOBASE + 0x1105e - 0x10000) ++#define HD64461_BBTPARH (CONFIG_HD64461_IOBASE + 0x11060 - 0x10000) ++#define HD64461_BBTPARL (CONFIG_HD64461_IOBASE + 0x11062 - 0x10000) ++#define HD64461_BBTMARH (CONFIG_HD64461_IOBASE + 0x11064 - 0x10000) ++#define HD64461_BBTMARL (CONFIG_HD64461_IOBASE + 0x11066 - 0x10000) ++#define HD64461_BBTROPR (CONFIG_HD64461_IOBASE + 0x11068 - 0x10000) ++#define HD64461_BBTMDR (CONFIG_HD64461_IOBASE + 0x1106a - 0x10000) ++ ++/* These must be like this, otherwise the Jornada will not boot! */ + /* PC Card Controller Registers */ +-#define HD64461_PCC0ISR 0x12000 /* socket 0 interface status */ +-#define HD64461_PCC0GCR 0x12002 /* socket 0 general control */ +-#define HD64461_PCC0CSCR 0x12004 /* socket 0 card status change */ +-#define HD64461_PCC0CSCIER 0x12006 /* socket 0 card status change interrupt enable */ +-#define HD64461_PCC0SCR 0x12008 /* socket 0 software control */ +-#define HD64461_PCC1ISR 0x12010 /* socket 1 interface status */ +-#define HD64461_PCC1GCR 0x12012 /* socket 1 general control */ +-#define HD64461_PCC1CSCR 0x12014 /* socket 1 card status change */ +-#define HD64461_PCC1CSCIER 0x12016 /* socket 1 card status change interrupt enable */ +-#define HD64461_PCC1SCR 0x12018 /* socket 1 software control */ ++#define HD64461_PCC0ISR (CONFIG_HD64461_IOBASE + 0x12000 - 0x10000) /* socket 0 interface status */ ++#define HD64461_PCC0GCR (CONFIG_HD64461_IOBASE + 0x12002 - 0x10000) /* socket 0 general control */ ++#define HD64461_PCC0CSCR (CONFIG_HD64461_IOBASE + 0x12004 - 0x10000) /* socket 0 card status change */ ++#define HD64461_PCC0CSCIER (CONFIG_HD64461_IOBASE + 0x12006 - 0x10000) /* socket 0 card status change interrupt enable */ ++#define HD64461_PCC0SCR (CONFIG_HD64461_IOBASE + 0x12008 - 0x10000) /* socket 0 software control */ ++#define HD64461_PCC1ISR (CONFIG_HD64461_IOBASE + 0x12010 - 0x10000) /* socket 1 interface status */ ++#define HD64461_PCC1GCR (CONFIG_HD64461_IOBASE + 0x12012 - 0x10000) /* socket 1 general control */ ++#define HD64461_PCC1CSCR (CONFIG_HD64461_IOBASE + 0x12014 - 0x10000) /* socket 1 card status change */ ++#define HD64461_PCC1CSCIER (CONFIG_HD64461_IOBASE + 0x12016 - 0x10000) /* socket 1 card status change interrupt enable */ ++#define HD64461_PCC1SCR (CONFIG_HD64461_IOBASE + 0x12018 - 0x10000) /* socket 1 software control */ + + /* PCC Interface Status Register */ +-#define HD64461_PCCISR_READY 0x80 /* card ready */ +-#define HD64461_PCCISR_MWP 0x40 /* card write-protected */ +-#define HD64461_PCCISR_VS2 0x20 /* voltage select pin 2 */ +-#define HD64461_PCCISR_VS1 0x10 /* voltage select pin 1 */ +-#define HD64461_PCCISR_CD2 0x08 /* card detect 2 */ +-#define HD64461_PCCISR_CD1 0x04 /* card detect 1 */ +-#define HD64461_PCCISR_BVD2 0x02 /* battery 1 */ +-#define HD64461_PCCISR_BVD1 0x01 /* battery 1 */ ++#define HD64461_PCCISR_READY 0x80 /* card ready */ ++#define HD64461_PCCISR_MWP 0x40 /* card write-protected */ ++#define HD64461_PCCISR_VS2 0x20 /* voltage select pin 2 */ ++#define HD64461_PCCISR_VS1 0x10 /* voltage select pin 1 */ ++#define HD64461_PCCISR_CD2 0x08 /* card detect 2 */ ++#define HD64461_PCCISR_CD1 0x04 /* card detect 1 */ ++#define HD64461_PCCISR_BVD2 0x02 /* battery 1 */ ++#define HD64461_PCCISR_BVD1 0x01 /* battery 1 */ + + #define HD64461_PCCISR_PCD_MASK 0x0c /* card detect */ + #define HD64461_PCCISR_BVD_MASK 0x03 /* battery voltage */ +@@ -160,29 +171,29 @@ + #define HD64461_PCCSCR_VCC1 0x02 /* voltage control pin 1 */ + #define HD64461_PCCSCR_SWP 0x01 /* write protect */ + +-#define HD64461_P0OCR 0x1202a +-#define HD64461_P1OCR 0x1202c +-#define HD64461_PGCR 0x1202e +- +-#define HD64461_GPACR 0x14000 +-#define HD64461_GPBCR 0x14002 +-#define HD64461_GPCCR 0x14004 +-#define HD64461_GPDCR 0x14006 +-#define HD64461_GPADR 0x14010 +-#define HD64461_GPBDR 0x14012 +-#define HD64461_GPCDR 0x14014 +-#define HD64461_GPDDR 0x14016 +-#define HD64461_GPAICR 0x14020 +-#define HD64461_GPBICR 0x14022 +-#define HD64461_GPCICR 0x14024 +-#define HD64461_GPDICR 0x14026 +-#define HD64461_GPAISR 0x14040 +-#define HD64461_GPBISR 0x14042 +-#define HD64461_GPCISR 0x14044 +-#define HD64461_GPDISR 0x14046 +- +-#define HD64461_NIRR 0x15000 +-#define HD64461_NIMR 0x15002 ++#define HD64461_P0OCR (CONFIG_HD64461_IOBASE + 0x1202a - 0x10000) ++#define HD64461_P1OCR (CONFIG_HD64461_IOBASE + 0x1202c - 0x10000) ++#define HD64461_PGCR (CONFIG_HD64461_IOBASE + 0x1202e - 0x10000) ++ ++#define HD64461_GPACR (CONFIG_HD64461_IOBASE + 0x14000 - 0x10000) ++#define HD64461_GPBCR (CONFIG_HD64461_IOBASE + 0x14002 - 0x10000) ++#define HD64461_GPCCR (CONFIG_HD64461_IOBASE + 0x14004 - 0x10000) ++#define HD64461_GPDCR (CONFIG_HD64461_IOBASE + 0x14006 - 0x10000) ++#define HD64461_GPADR (CONFIG_HD64461_IOBASE + 0x14010 - 0x10000) ++#define HD64461_GPBDR (CONFIG_HD64461_IOBASE + 0x14012 - 0x10000) ++#define HD64461_GPCDR (CONFIG_HD64461_IOBASE + 0x14014 - 0x10000) ++#define HD64461_GPDDR (CONFIG_HD64461_IOBASE + 0x14016 - 0x10000) ++#define HD64461_GPAICR (CONFIG_HD64461_IOBASE + 0x14020 - 0x10000) ++#define HD64461_GPBICR (CONFIG_HD64461_IOBASE + 0x14022 - 0x10000) ++#define HD64461_GPCICR (CONFIG_HD64461_IOBASE + 0x14024 - 0x10000) ++#define HD64461_GPDICR (CONFIG_HD64461_IOBASE + 0x14026 - 0x10000) ++#define HD64461_GPAISR (CONFIG_HD64461_IOBASE + 0x14040 - 0x10000) ++#define HD64461_GPBISR (CONFIG_HD64461_IOBASE + 0x14042 - 0x10000) ++#define HD64461_GPCISR (CONFIG_HD64461_IOBASE + 0x14044 - 0x10000) ++#define HD64461_GPDISR (CONFIG_HD64461_IOBASE + 0x14046 - 0x10000) ++ ++#define HD64461_NIRR 0xb0005000 /* 0x10005000 */ ++#define HD64461_NIMR 0xb0005002 /* 0x10005002 */ + + #define HD64461_IRQBASE OFFCHIP_IRQ_BASE + #define HD64461_IRQ_NUM 16 +diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h +index a0e55b0..08848ee 100644 +--- a/include/asm-sh/io.h ++++ b/include/asm-sh/io.h +@@ -143,6 +143,7 @@ void __raw_readsl(unsigned long addr, void *data, int longlen); + #define readl_relaxed(a) readl(a) + + /* Simple MMIO */ ++#ifndef CONFIG_CPU_SUBTYPE_SH7709 + #define ioread8(a) readb(a) + #define ioread16(a) readw(a) + #define ioread16be(a) be16_to_cpu(__raw_readw((a))) +@@ -154,6 +155,7 @@ void __raw_readsl(unsigned long addr, void *data, int longlen); + #define iowrite16be(v,a) __raw_writew(cpu_to_be16((v)),(a)) + #define iowrite32(v,a) writel((v),(a)) + #define iowrite32be(v,a) __raw_writel(cpu_to_be32((v)),(a)) ++#endif + + #define ioread8_rep(a,d,c) insb((a),(d),(c)) + #define ioread16_rep(a,d,c) insw((a),(d),(c)) +@@ -163,6 +165,20 @@ void __raw_readsl(unsigned long addr, void *data, int longlen); + #define iowrite16_rep(a,s,c) outsw((a),(s),(c)) + #define iowrite32_rep(a,s,c) outsl((a),(s),(c)) + ++#ifdef CONFIG_CPU_SUBTYPE_SH7709 ++ #define ioread8(a) inb(a) ++ #define ioread16(a) inw(a) ++ #define ioread16be(a) be16_to_cpu(inw((a))) ++ #define ioread32(a) inl(a) ++ #define ioread32be(v,a) be32_to_cpu(inl((a))) ++ ++ #define iowrite8(v,a) outb((v),(a)) ++ #define iowrite16(v,a) outw((v),(a)) ++ #define iowrite16be(v,a) outw(cpu_to_be16((v),(a))) ++ #define iowrite32(v,a) outl((v),(a)) ++ #define iowrite32be(v,a) outl(cpu_to_be32((v),(a))) ++#endif ++ + #define mmiowb() wmb() /* synco on SH-4A, otherwise a nop */ + + /* +diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h +index afe188f..95f9a1a 100644 +--- a/include/asm-sh/irq.h ++++ b/include/asm-sh/irq.h +@@ -23,6 +23,40 @@ + defined(CONFIG_CPU_SUBTYPE_SH7705) + # define ONCHIP_NR_IRQS 64 // Actually 61 + # define PINT_NR_IRQS 16 ++ ++ #define INTC_IRR0 0xa4000004UL ++ #define INTC_IRR1 0xa4000006UL ++ #define INTC_IRR2 0xa4000008UL ++ ++ #define INTC_IPRA 0xfffffee2UL ++ #define INTC_IPRB 0xfffffee4UL ++ #define INTC_IPRD 0xa4000018UL ++ ++ #define INTC_INTER 0xa4000014UL ++ ++ #define INTC_ICR0 0xfffffee0UL ++ #define INTC_ICR1 0xa4000010UL ++ #define INTC_ICR2 0xa4000012UL ++ ++ #define PORT_PACR 0xa4000100UL ++ #define PORT_PBCR 0xa4000102UL ++ #define PORT_PCCR 0xa4000104UL ++ #define PORT_PFCR 0xa400010aUL ++ ++ #define PORT_PADR 0xa4000120UL ++ #define PORT_PBDR 0xa4000122UL ++ #define PORT_PCDR 0xa4000124UL ++ #define PORT_PFDR 0xa400012aUL ++ ++ #define PINT0_IRQ 40 ++ #define PINT8_IRQ 41 ++ #define PINT0_IPR_ADDR INTC_IPRD ++ #define PINT8_IPR_ADDR INTC_IPRD ++ #define PINT0_IPR_POS 3 ++ #define PINT8_IPR_POS 2 ++ #define PINT0_PRIORITY 2 ++ #define PINT8_PRIORITY 2 ++ + #elif defined(CONFIG_CPU_SUBTYPE_SH7710) + # define ONCHIP_NR_IRQS 104 + #elif defined(CONFIG_CPU_SUBTYPE_SH7750) +diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c +index 7ea9acc..dcfcad0 100644 +--- a/sound/oss/sh_dac_audio.c ++++ b/sound/oss/sh_dac_audio.c +@@ -32,6 +32,7 @@ + #define MODNAME "sh_dac_audio" + + #define TMU_TOCR_INIT 0x00 ++#define TIMER1_IRQ 14 + + #define TMU1_TCR_INIT 0x0020 /* Clock/4, rising edge; interrupt on */ + #define TMU1_TSTR_INIT 0x02 /* Bit to turn on TMU1 */ +@@ -104,7 +105,7 @@ static void dac_audio_set_rate(void) + unsigned long interval; + struct clk *clk; + +- clk = clk_get("module_clk"); ++ clk = clk_get("module_clk", NULL); + interval = (clk_get_rate(clk) / 4) / rate; + clk_put(clk); + ctrl_outl(interval, TMU1_TCOR); diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb new file mode 100644 index 0000000000..f38fa5c26e --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb @@ -0,0 +1,32 @@ +SECTION = "kernel" +DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" +LICENSE = "GPL" +PR = "r0" + +COMPATIBLE_HOST = "sh.*-linux" +#COMPATIBLE_MACHINE = "jornada6xx" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.21-rc5 \ + file://git-20070405-2.patch;patch=1 \ + file://defconfig" + + +S = "${WORKDIR}/linux-${PV}" + +inherit kernel + +#Lets let 3.4.x handle the compilation of this one +KERNEL_CCSUFFIX = "-3.4.4" + +ARCH = "sh" +KERNEL_IMAGETYPE = "zImage" +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE) +} -- cgit v1.2.3 From 3818aeb7c402b4c3408bf7d845d46f989f9c66aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Apr 2007 07:40:58 +0000 Subject: openmoko: remove some more proto=https entries --- packages/openmoko-base/openmoko-common_svn.bb | 2 +- packages/uboot/uboot-gta01_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb index 15cc97d39f..e72d325bb9 100644 --- a/packages/openmoko-base/openmoko-common_svn.bb +++ b/packages/openmoko-base/openmoko-common_svn.bb @@ -5,7 +5,7 @@ PR = "r1" inherit openmoko-base -SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=images;proto=https" +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=images;proto=http" S = "${WORKDIR}" dirs = "images/pixmaps" diff --git a/packages/uboot/uboot-gta01_svn.bb b/packages/uboot/uboot-gta01_svn.bb index 0775bfcc91..b30a5bc66e 100644 --- a/packages/uboot/uboot-gta01_svn.bb +++ b/packages/uboot/uboot-gta01_svn.bb @@ -10,7 +10,7 @@ PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=https \ + svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \ file://fix-arm920t-eabi.patch;patch=1" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -- cgit v1.2.3 From 96676c1519bf6882fe3cd96e9af80fdce62b02fc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Apr 2007 08:06:41 +0000 Subject: sysvinit/inittab: if your machine ships the *exact* *same* inittab as sysvinit/inittab it isn't machine specific, so remove it --- .../sysvinit/sysvinit/htcuniversal/.mtn2git_empty | 0 packages/sysvinit/sysvinit/htcuniversal/inittab | 30 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 packages/sysvinit/sysvinit/htcuniversal/.mtn2git_empty delete mode 100644 packages/sysvinit/sysvinit/htcuniversal/inittab (limited to 'packages') diff --git a/packages/sysvinit/sysvinit/htcuniversal/.mtn2git_empty b/packages/sysvinit/sysvinit/htcuniversal/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sysvinit/sysvinit/htcuniversal/inittab b/packages/sysvinit/sysvinit/htcuniversal/inittab deleted file mode 100644 index 6abbdf4558..0000000000 --- a/packages/sysvinit/sysvinit/htcuniversal/inittab +++ /dev/null @@ -1,30 +0,0 @@ -# /etc/inittab: init(8) configuration. -# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ - -# The default runlevel. -id:5:initdefault: - -# Boot-time system configuration/initialization script. -# This is run first except when booting in emergency (-b) mode. -si::sysinit:/etc/init.d/rcS - -# What to do in single-user mode. -~~:S:wait:/sbin/sulogin - -# /etc/init.d executes the S and K scripts upon change -# of runlevel. -# -# Runlevel 0 is halt. -# Runlevel 1 is single-user. -# Runlevels 2-5 are multi-user. -# Runlevel 6 is reboot. - -l0:0:wait:/etc/init.d/rc 0 -l1:1:wait:/etc/init.d/rc 1 -l2:2:wait:/etc/init.d/rc 2 -l3:3:wait:/etc/init.d/rc 3 -l4:4:wait:/etc/init.d/rc 4 -l5:5:wait:/etc/init.d/rc 5 -l6:6:wait:/etc/init.d/rc 6 -# Normally not reached, but fallthrough in case of emergency. -z6:6:respawn:/sbin/sulogin -- cgit v1.2.3 From b96de293f83c5860731e5a63ef27b1af2921a23c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Apr 2007 09:00:22 +0000 Subject: task-base: add sir-dev and irtty-sir (suggested by goxboxlive) --- packages/tasks/task-base.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index ea76027335..8df6fa0450 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 = "r21" +PR = "r22" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -227,6 +227,8 @@ task-base-irda-rrecommends = "\ ${@base_contains("DISTRO_FEATURES", "ppp", "kernel-module-irnet", "",d)} \ kernel-module-irport \ kernel-module-irtty \ + kernel-module-irtty-sir \ + kernel-module-sir-dev \ ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} " task-base-usbgadget-rrecommends = "\ -- cgit v1.2.3 From 6a111dc1a6d7cc44ac3019ced52d5bbc17f0b136 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 5 Apr 2007 09:04:17 +0000 Subject: libgsmd: experimental plugin infrastructure for magician and universal - subject to change --- packages/gsm/files/htcuniversal/.mtn2git_empty | 0 packages/gsm/files/htcuniversal/default | 10 + packages/gsm/files/interpreter-ready.patch | 47 -- packages/gsm/files/magician/default | 5 +- packages/gsm/files/magician/ldisc.patch | 66 -- packages/gsm/files/magician/vendor-tihtc.patch | 325 --------- packages/gsm/files/numeric.patch | 56 ++ packages/gsm/files/plugin.patch | 935 +++++++++++++++++++++++++ packages/gsm/libgsmd_svn.bb | 14 +- 9 files changed, 1012 insertions(+), 446 deletions(-) create mode 100644 packages/gsm/files/htcuniversal/.mtn2git_empty create mode 100644 packages/gsm/files/htcuniversal/default delete mode 100644 packages/gsm/files/interpreter-ready.patch delete mode 100644 packages/gsm/files/magician/ldisc.patch delete mode 100644 packages/gsm/files/magician/vendor-tihtc.patch create mode 100644 packages/gsm/files/numeric.patch create mode 100644 packages/gsm/files/plugin.patch (limited to 'packages') diff --git a/packages/gsm/files/htcuniversal/.mtn2git_empty b/packages/gsm/files/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gsm/files/htcuniversal/default b/packages/gsm/files/htcuniversal/default new file mode 100644 index 0000000000..3c9a8da949 --- /dev/null +++ b/packages/gsm/files/htcuniversal/default @@ -0,0 +1,10 @@ +# gsmd This shell script configures for the gsmd init script. + +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +# this should be in a common /etc/default/serial, together +# with BT_DEV, and IR_DEV +GSM_DEV="/dev/ttyS0" diff --git a/packages/gsm/files/interpreter-ready.patch b/packages/gsm/files/interpreter-ready.patch deleted file mode 100644 index cc6b9c6e2b..0000000000 --- a/packages/gsm/files/interpreter-ready.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: gsm/include/gsmd/gsmd.h -=================================================================== ---- gsm.orig/include/gsmd/gsmd.h 2007-03-29 17:07:10.000000000 +0200 -+++ gsm/include/gsmd/gsmd.h 2007-03-29 17:07:43.000000000 +0200 -@@ -58,6 +58,7 @@ - - struct gsmd { - unsigned int flags; -+ int interpreter_ready; - struct gsmd_fd gfd_uart; - struct gsmd_fd gfd_sock; - struct llparser llp; -Index: gsm/src/gsmd/atcmd.c -=================================================================== ---- gsm.orig/src/gsmd/atcmd.c 2007-03-29 17:06:01.000000000 +0200 -+++ gsm/src/gsmd/atcmd.c 2007-03-29 17:08:27.000000000 +0200 -@@ -183,6 +183,7 @@ - * an empty string or that 'ready' string, we need to init the modem */ - if (strlen(buf) == 0 || - !strcmp(buf, "AT-Command Interpreter ready")) { -+ g->interpreter_ready = 1; - gsmd_initsettings(g); - return 0; - } -@@ -372,7 +373,7 @@ - } - - /* write pending commands to UART */ -- if (what & GSMD_FD_WRITE) { -+ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { - struct gsmd_atcmd *pos, *pos2; - llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { - len = strlen(pos->buf); -Index: gsm/src/gsmd/gsmd.c -=================================================================== ---- gsm.orig/src/gsmd/gsmd.c 2007-03-29 17:06:04.000000000 +0200 -+++ gsm/src/gsmd/gsmd.c 2007-03-29 17:08:59.000000000 +0200 -@@ -291,7 +291,8 @@ - - gsmd_vendor_plugin_find(&g); - -- gsmd_initsettings(&g); -+ if (g.interpreter_ready) -+ gsmd_initsettings(&g); - - gsmd_opname_init(&g); - diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default index a9c3b94b1d..523d0b9479 100644 --- a/packages/gsm/files/magician/default +++ b/packages/gsm/files/magician/default @@ -1,9 +1,10 @@ # gsmd This shell script configures for the gsmd init script. -# Set line Discipline 17 (N_TIHTC), needs ldisc.patch-ed gsmd -GSMD_OPTS="-s 115200 -F -D 17" +GSMD_OPTS="-s 115200 -F" # If your GSM device needs to be powered up, uncomment and modify the next line #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" +# this should be in a common /etc/default/serial, together +# with BT_DEV, and IR_DEV GSM_DEV="/dev/ttyS1" diff --git a/packages/gsm/files/magician/ldisc.patch b/packages/gsm/files/magician/ldisc.patch deleted file mode 100644 index 30d4a8812a..0000000000 --- a/packages/gsm/files/magician/ldisc.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: gsm/src/gsmd/gsmd.c -=================================================================== ---- gsm.orig/src/gsmd/gsmd.c 2007-03-29 15:29:31.000000000 +0200 -+++ gsm/src/gsmd/gsmd.c 2007-03-29 15:33:07.000000000 +0200 -@@ -32,6 +32,7 @@ - #define _GNU_SOURCE - #include - -+#include - #include - #include - -@@ -150,6 +151,7 @@ - { "speed", 1, NULL, 's' }, - { "logfile", 1, NULL, 'l' }, - { "hwflow", 0, NULL, 'F' }, -+ { "ldisc", 1, NULL, 'D' }, - { "leak-report", 0, NULL, 'L' }, - { 0, 0, 0, 0 } - }; -@@ -165,6 +167,7 @@ - "\t-p dev\t--device dev\tSpecify serial device to be used\n" - "\t-s spd\t--speed spd\tSpecify speed in bps (9600,38400,115200,...)\n" - "\t-F\t--hwflow\tHardware Flow Control (RTS/CTS)\n" -+ "\t-D\t--ldisc num\tSet line discipline (0=N_TTY,...)\n" - "\t-L\t--leak-report\tLeak Report of talloc memory allocator\n" - "\t-l file\t--logfile file\tSpecify a logfile to log to\n" - ); -@@ -191,6 +194,7 @@ - int daemonize = 0; - int bps = 115200; - int hwflow = 0; -+ int ldisc = 0; - char *device = "/dev/ttyUSB0"; - char *logfile = "syslog"; - -@@ -202,7 +206,7 @@ - gsmd_tallocs = talloc_named_const(NULL, 1, "GSMD"); - - /*FIXME: parse commandline, set daemonize, device, ... */ -- while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:", opts, NULL)) != -1) { -+ while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:D:", opts, NULL)) != -1) { - switch (argch) { - case 'V': - /* FIXME */ -@@ -232,6 +236,8 @@ - fprintf(stderr, "can't open logfile `%s'\n", optarg); - exit(2); - } -+ case 'D': -+ ldisc = atoi(optarg); - break; - } - } -@@ -249,6 +255,11 @@ - exit(1); - } - -+ if (ldisc && ioctl(fd, TIOCSETD, &ldisc) < 0) { -+ fprintf(stderr, "can't set line discipline\n"); -+ exit(1); -+ } -+ - if (gsmd_initialize(&g) < 0) { - fprintf(stderr, "internal error\n"); - exit(1); diff --git a/packages/gsm/files/magician/vendor-tihtc.patch b/packages/gsm/files/magician/vendor-tihtc.patch deleted file mode 100644 index a2f22ffbea..0000000000 --- a/packages/gsm/files/magician/vendor-tihtc.patch +++ /dev/null @@ -1,325 +0,0 @@ -Index: gsm/src/gsmd/vendor_tihtc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/src/gsmd/vendor_tihtc.c 2007-03-27 13:12:05.000000000 +0200 -@@ -0,0 +1,294 @@ -+/* TI [Calypso] with HTC firmware gsmd plugin -+ * -+ * Written by Philipp Zabel -+ * based on vendor_ti.c -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "gsmd.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if 0 -+#include "vendorplugin.h" -+ -+static int -+ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen) -+{ -+ switch (optname) { -+ case GSMD_OPT_CIPHER_IND: -+ /* FIXME: send AT%CPRI=? */ -+ break; -+ default: -+ return -EINVAL; -+ } -+} -+ -+static int -+ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen) -+{ -+ switch (optname) { -+ case GSMD_OPT_CIPHER_IND: -+ /* FIXME: send AT%CPRI= */ -+ break; -+ default: -+ return -EINVAL; -+ } -+} -+ -+#endif -+ -+ -+static int htccsq_parse(char *buf, int len, const char *param, -+ struct gsmd *gsmd) -+{ -+ char *tok; -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, -+ sizeof(*aux)); -+ -+ DEBUGP("entering htccsq_parse param=`%s'\n", param); -+ if (!ucmd) -+ return -EINVAL; -+ -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ /* FIXME: contains values 1-5, should be mapped to 0-31 somehow? */ -+ /* 2 --> 11 */ -+ aux->u.signal.sigq.rssi = atoi(buf); -+ aux->u.signal.sigq.ber = 99; -+ -+ DEBUGP("sending EVT_SIGNAL\n"); -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); -+ -+ return 0; -+ -+out_free_io: -+ free(ucmd); -+ return -EIO; -+} -+ -+static int cpri_parse(char *buf, int len, const char *param, struct gsmd *gsmd) -+{ -+ char *tok1, *tok2; -+ -+ tok1 = strtok(buf, ","); -+ if (!tok1) -+ return -EIO; -+ -+ tok2 = strtok(NULL, ","); -+ if (!tok2) { -+ switch (atoi(tok1)) { -+ case 0: -+ gsmd->dev_state.ciph_ind.flags &= ~GSMD_CIPHIND_ACTIVE; -+ break; -+ case 1: -+ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_ACTIVE; -+ break; -+ case 2: -+ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_DISABLED_SIM; -+ break; -+ } -+ } else { -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, -+ GSMD_EVT_CIPHER, -+ sizeof(*aux)); -+ if (!ucmd) -+ return -ENOMEM; -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ aux->u.cipher.net_state_gsm = atoi(tok1); -+ aux->u.cipher.net_state_gsm = atoi(tok2); -+ -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_CIPHER); -+ } -+ -+ return 0; -+} -+ -+/* Call Progress Information */ -+static int cpi_parse(char *buf, int len, const char *param, struct gsmd *gsmd) -+{ -+ char *tok; -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, -+ GSMD_EVT_OUT_STATUS, -+ sizeof(*aux)); -+ -+ DEBUGP("entering cpi_parse param=`%s'\n", param); -+ if (!ucmd) -+ return -EINVAL; -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ /* Format: cId, msgType, ibt, tch, dir,[mode],[number],[type],[alpha],[cause],line */ -+ -+ /* call ID */ -+ tok = strtok(buf, ","); -+ if (!tok) -+ goto out_free_io; -+ -+ /* message type (layer 3) */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_free_io; -+ aux->u.call_status.prog = atoi(tok); -+ -+ /* in-band tones */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_free_io; -+ -+ if (*tok == '1') -+ aux->u.call_status.ibt = 1; -+ else -+ aux->u.call_status.ibt = 0; -+ -+ /* TCH allocated */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_free_io; -+ -+ if (*tok == '1') -+ aux->u.call_status.tch = 1; -+ else -+ aux->u.call_status.tch = 0; -+ -+ /* direction */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_send; -+ -+ switch (*tok) { -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ aux->u.call_status.dir = (*tok - '0'); -+ break; -+ default: -+ break; -+ } -+ -+ /* mode */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_send; -+ -+out_send: -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_OUT_STATUS); -+ -+ return 0; -+ -+out_free_io: -+ talloc_free(ucmd); -+ return -EIO; -+} -+ -+static const struct gsmd_unsolicit tihtc_unsolicit[] = { -+ { "%HTCCSQ", &htccsq_parse }, /* Signal Quality */ -+ { "%CPRI", &cpri_parse }, /* Ciphering Indication */ -+ { "%CPI", &cpi_parse }, /* Call Progress Information */ -+ -+ /* FIXME: parse the below and generate the respective events */ -+ -+ /* %CGREG: reports extended information about GPRS registration state */ -+}; -+ -+static int cpi_detect_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) -+{ -+ struct gsmd *g = ctx; -+ struct gsm_extrsp *er; -+ -+ if (strncmp(resp, "%CPI: ", 6)) -+ return -EINVAL; -+ resp += 6; -+ -+ er = extrsp_parse(cmd, resp); -+ if (!er) -+ return -EINVAL; -+ -+ if (extrsp_supports(er, 0, 3)) -+ return gsmd_simplecmd(g, "AT%CPI=3"); -+ else if (extrsp_supports(er, 0, 2)) -+ return gsmd_simplecmd(g, "AT%CPI=2"); -+ else -+ DEBUGP("Call Progress Indication mode 2 or 3 not supported!!\n"); -+ -+ talloc_free(er); -+ return 0; -+} -+ -+static int tihtc_detect(struct gsmd *g) -+{ -+ /* FIXME: do actual detection of vendor if we have multiple vendors */ -+ /* open /proc/cpuinfo and check for HTC Magician or HTC Blueangel? */ -+ /* check for N_TIHTC ldisc? or set it ourselves? */ -+ return 1; -+} -+ -+static int tihtc_initsettings(struct gsmd *g) -+{ -+ int rc; -+ struct gsmd_atcmd *cmd; -+ -+ /* use %CGREG */ -+ //rc |= gsmd_simplecmd(g, "AT%CGREG=3"); -+ /* enable %CPRI: ciphering indications */ -+ rc |= gsmd_simplecmd(g, "AT%CPRI=1"); -+ /* enable %HTCCSQ: signal quality reports */ -+ rc |= gsmd_simplecmd(g, "AT%HTCCSQ=1"); -+ /* send unsolicited commands at any time */ -+ rc |= gsmd_simplecmd(g, "AT%CUNS=0"); -+ -+ /* enable %CPI: call progress indication */ -+ cmd = atcmd_fill("AT%CPI=?", 9, &cpi_detect_cb, g, 0); -+ if (cmd) -+ atcmd_submit(g, cmd); -+ -+ return rc; -+} -+ -+static struct gsmd_vendor_plugin plugin_tihtc = { -+ .name = "TI Calypso / HTC firmware", -+ .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit), -+ .unsolicit = tihtc_unsolicit, -+ .detect = &tihtc_detect, -+ .initsettings = &tihtc_initsettings, -+}; -+ -+/* FIXME: this will be _init() when we make this a plugin */ -+int tihtc_init(void) -+{ -+ return gsmd_vendor_plugin_register(&plugin_tihtc); -+} -Index: gsm/src/gsmd/gsmd.c -=================================================================== ---- gsm.orig/src/gsmd/gsmd.c 2007-03-27 13:07:59.000000000 +0200 -+++ gsm/src/gsmd/gsmd.c 2007-03-27 13:08:08.000000000 +0200 -@@ -276,7 +276,7 @@ - } - - /* FIXME: do this dynamically */ -- ticalypso_init(); -+ tihtc_init(); - - gsmd_vendor_plugin_find(&g); - -Index: gsm/src/gsmd/Makefile.am -=================================================================== ---- gsm.orig/src/gsmd/Makefile.am 2007-03-27 13:09:11.000000000 +0200 -+++ gsm/src/gsmd/Makefile.am 2007-03-27 13:09:20.000000000 +0200 -@@ -4,7 +4,7 @@ - sbin_PROGRAMS = gsmd - - gsmd_SOURCES = gsmd.c atcmd.c select.c vendor.c usock.c unsolicited.c log.c \ -- vendor_ti.c talloc.c operator_cache.c ext_response.c -+ vendor_ti.c vendor_tihtc.c talloc.c operator_cache.c ext_response.c - #gsmd_LDADD = ../libgsmd/libgsmd.la - #gsmd_LDFLAGS = -dynamic - diff --git a/packages/gsm/files/numeric.patch b/packages/gsm/files/numeric.patch new file mode 100644 index 0000000000..cd1990cbe5 --- /dev/null +++ b/packages/gsm/files/numeric.patch @@ -0,0 +1,56 @@ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-04-02 09:59:16.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-04-02 10:10:54.000000000 +0200 +@@ -207,7 +207,7 @@ + * TBD + */ + +- if (buf[0] == '+' || buf[0] == '%') { ++ if (buf[0] == '+' || buf[0] == '%' || buf[0] == '@') { + /* an extended response */ + const char *colon = strchr(buf, ':'); + if (!colon) { +@@ -269,14 +269,13 @@ + memcpy(cmd->buf, buf, len); + } + } else { +- if (!strcmp(buf, "RING")) { ++ if (!strcmp(buf, "RING") || buf[0] == '2') { + /* this is the only non-extended unsolicited return + * code, part of Case 'B' */ + return unsolicited_parse(g, buf, len, NULL); + } + +- if (!strcmp(buf, "ERROR") || +- ((g->flags & GSMD_FLAG_V0) && buf[0] == '4')) { ++ if (!strcmp(buf, "ERROR") || buf[0] == '4') { + /* Part of Case 'C' */ + DEBUGP("unspecified error\n"); + if (cmd) +@@ -285,8 +284,7 @@ + goto final_cb; + } + +- if (!strncmp(buf, "OK", 2) +- || ((g->flags & GSMD_FLAG_V0) && buf[0] == '0')) { ++ if (!strncmp(buf, "OK", 2) || buf[0] == '0') { + /* Part of Case 'C' */ + if (cmd) + cmd->ret = 0; +@@ -296,13 +294,13 @@ + + /* FIXME: handling of those special commands in response to + * ATD / ATA */ +- if (!strncmp(buf, "NO CARRIER", 11)) { ++ if (!strncmp(buf, "NO CARRIER", 11) || buf[0] == '3') { + /* Part of Case 'D' */ + final = 1; + goto final_cb; + } + +- if (!strncmp(buf, "BUSY", 4)) { ++ if (!strncmp(buf, "BUSY", 4) || buf[0] == '7') { + /* Part of Case 'D' */ + final = 1; + goto final_cb; diff --git a/packages/gsm/files/plugin.patch b/packages/gsm/files/plugin.patch new file mode 100644 index 0000000000..7f455ce718 --- /dev/null +++ b/packages/gsm/files/plugin.patch @@ -0,0 +1,935 @@ +Index: gsm/include/gsmd/gsmd.h +=================================================================== +--- gsm.orig/include/gsmd/gsmd.h 2007-04-02 09:58:55.000000000 +0200 ++++ gsm/include/gsmd/gsmd.h 2007-04-02 11:03:41.000000000 +0200 +@@ -7,6 +7,7 @@ + + #include + ++#include + #include + #include + #include +@@ -58,12 +59,14 @@ + + struct gsmd { + unsigned int flags; ++ int interpreter_ready; + struct gsmd_fd gfd_uart; + struct gsmd_fd gfd_sock; + struct llparser llp; + struct llist_head users; + struct llist_head pending_atcmds; /* our busy gsmd_atcmds */ + struct llist_head busy_atcmds; /* our busy gsmd_atcmds */ ++ struct gsmd_machine_plugin *machinepl; + struct gsmd_vendor_plugin *vendorpl; + struct gsmd_device_state dev_state; + +Index: gsm/include/gsmd/machineplugin.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/include/gsmd/machineplugin.h 2007-04-02 11:03:41.000000000 +0200 +@@ -0,0 +1,24 @@ ++#ifndef _GSMD_MACHINEPLUG_H ++#define _GSMD_MACHINEPLUG_H ++ ++#ifdef __GSMD__ ++ ++#include ++#include ++ ++struct gsmd; ++ ++struct gsmd_machine_plugin { ++ struct llist_head list; ++ unsigned char *name; ++ int (*detect)(struct gsmd *g); ++ int (*init)(struct gsmd *g, int fd); ++}; ++ ++extern int gsmd_machine_plugin_register(struct gsmd_machine_plugin *pl); ++extern void gsmd_machine_plugin_unregister(struct gsmd_machine_plugin *pl); ++extern int gsmd_machine_plugin_find(struct gsmd *g); ++ ++#endif /* __GSMD__ */ ++ ++#endif +Index: gsm/src/gsmd/machine_tihtc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/machine_tihtc.c 2007-04-02 11:03:41.000000000 +0200 +@@ -0,0 +1,71 @@ ++/* TI [Calypso] with HTC firmware machine plugin ++ * ++ * Written by Philipp Zabel ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define N_TIHTC 17 ++ ++static int tihtc_detect(struct gsmd *g) ++{ ++ /* FIXME: do actual detection of machine if we have multiple machines */ ++ return 1; ++} ++ ++static int tihtc_init(struct gsmd *g, int fd) ++{ ++ int ldisc = N_TIHTC; ++ int rc; ++ ++ /* ++ * Himalaya, Blueangel, Alpine and Magican ++ * power up their GSM chipsets when the ++ * tty is opened. Wait for the "AT-Command ++ * Interpreter ready" message before trying ++ * to send commands. ++ */ ++ g->interpreter_ready = 0; ++ ++ /* Set the line discipline to N_TIHTC */ ++ rc = ioctl(fd, TIOCSETD, &ldisc); ++ if (rc < 0) ++ fprintf(stderr, "can't set line discipline\n"); ++ ++ return rc; ++} ++ ++struct gsmd_machine_plugin gsmd_machine_plugin = { ++ .name = "TI Calypso / HTC firmware", ++ .detect = &tihtc_detect, ++ .init = &tihtc_init, ++}; +Index: gsm/src/gsmd/machine_generic.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/machine_generic.c 2007-04-02 11:03:41.000000000 +0200 +@@ -0,0 +1,61 @@ ++/* generic machine plugin ++ * ++ * Written by Philipp Zabel ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int generic_detect(struct gsmd *g) ++{ ++ /* FIXME: do actual detection of machine if we have multiple machines */ ++ return 1; ++} ++ ++static int generic_init(struct gsmd *g, int fd) ++{ ++ int rc; ++ ++ /* ++ * We assume that the GSM chipset can take ++ * input immediately, so we don't have to ++ * wait for the "AT-Command Interpreter ready" ++ * message before trying to send commands. ++ */ ++ g->interpreter_ready = 1; ++ ++ return 0; ++} ++ ++struct gsmd_machine_plugin gsmd_machine_plugin = { ++ .name = "generic", ++ .detect = &generic_detect, ++ .init = &generic_init, ++}; +Index: gsm/src/gsmd/machine.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/machine.c 2007-04-02 13:43:04.000000000 +0200 +@@ -0,0 +1,140 @@ ++/* gsmd machine plugin core ++ * ++ * Written by Philipp Zabel ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++ ++static LLIST_HEAD(machinepl_list); ++ ++int gsmd_machine_plugin_register(struct gsmd_machine_plugin *pl) ++{ ++ llist_add(&pl->list, &machinepl_list); ++ ++ return 0; ++} ++ ++void gsmd_machine_plugin_unregister(struct gsmd_machine_plugin *pl) ++{ ++ llist_del(&pl->list); ++} ++ ++int gsmd_machine_plugin_find(struct gsmd *g) ++{ ++ struct gsmd_machine_plugin *pl; ++ ++ if (g->machinepl) ++ return -EEXIST; ++ ++ llist_for_each_entry(pl, &machinepl_list, list) { ++ if (pl->detect(g) == 1) { ++ DEBUGP("selecting machine plugin \"%s\"\n", pl->name); ++ g->machinepl = pl; ++ return 1; ++ } ++ } ++ ++ return 0; ++} ++ ++int gsmd_machine_plugin_load(char *name) ++{ ++ int rc = -1; ++ void *plugin; ++ struct gsmd_machine_plugin *pl; ++ char buf[128]; ++ ++ DEBUGP("loading machine plugin \"%s\"\n", name); ++ ++ snprintf(buf, sizeof(buf), PLUGINDIR"/libgsmd-machine_%s.so", name); ++ ++ plugin = dlopen(buf, RTLD_LAZY); ++ if (!plugin) { ++ fprintf(stderr, "gsmd_machine_plugin_load: %s\n", dlerror()); ++ return -1; ++ } ++ ++ pl = dlsym(plugin, "gsmd_machine_plugin"); ++ if (pl) ++ rc = gsmd_machine_plugin_register(pl); ++ else ++ dlclose(plugin); ++ ++ return rc; ++} ++ ++/* maybe /etc/gsmd/cpuinfo */ ++struct machines { ++ char *cpuinfo; ++ char *machine; ++ char *vendor; ++} machines[] = { ++ { "GTA01", "generic", "ti" }, ++ { "HTC Blueangel", "tihtc", "tihtc" }, ++ { "HTC Himalaya", "tihtc", "tihtc" }, ++ { "HTC Magician", "tihtc", "tihtc" }, ++ { "HTC Universal", "generic", "qc" }, ++ { NULL, NULL, NULL }, ++}; ++ ++int gsmd_machine_plugin_init(struct gsmd *g, int fd) ++{ ++ FILE *cpuinfo; ++ char buf[1024]; ++ char *line, *machine = NULL; ++ int i, rc; ++ ++ cpuinfo = fopen("/proc/cpuinfo", "r"); ++ fread(buf, sizeof(buf), 1, cpuinfo); ++ fclose(cpuinfo); ++ ++ line = strtok(buf, "\n"); ++ while (line = strtok(NULL, "\n")) { ++ if (strncmp(line, "Hardware\t: ", 11) == 0) { ++ machine = line+11; ++ break; ++ } ++ } ++ /* FIXME: do this dynamically */ ++ if (machine) { ++ for (i = 0; machines[i].cpuinfo; i++) { ++ if (strcmp(machine, machines[i].cpuinfo) == 0) { ++ DEBUGP("detected %s\n", machine); ++ rc = gsmd_machine_plugin_load(machines[i].machine); ++ rc |= gsmd_vendor_plugin_load(machines[i].vendor); ++ return rc; ++ } ++ } ++ } ++ /* load generic machine and all vendor plugins */ ++ rc = gsmd_machine_plugin_load("generic"); ++ gsmd_vendor_plugin_load("ti"); ++ gsmd_vendor_plugin_load("tihtc"); ++ gsmd_vendor_plugin_load("qc"); ++ return rc; ++} +Index: gsm/src/gsmd/vendor_qc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/vendor_qc.c 2007-04-02 11:03:41.000000000 +0200 +@@ -0,0 +1,104 @@ ++/* Qualcomm [msm6250] gsmd plugin ++ * ++ * Written by Philipp Zabel ++ * based on vendor_ti.c ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int htccsq_parse(char *buf, int len, const char *param, ++ struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, ++ sizeof(*aux)); ++ static int rssi_table[] = { 0,5,10,15,20,25,99 }; /* FIXME */ ++ unsigned int i; ++ ++ DEBUGP("entering htccsq_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ i = atoi(buf); ++ if (i > 6) ++ i = 6; ++ aux->u.signal.sigq.rssi = rssi_table[atoi(buf)]; ++ aux->u.signal.sigq.ber = 99; ++ ++ DEBUGP("sending EVT_SIGNAL\n"); ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); ++ ++ return 0; ++ ++out_free_io: ++ free(ucmd); ++ return -EIO; ++} ++ ++static const struct gsmd_unsolicit qc_unsolicit[] = { ++ { "@HTCCSQ", &htccsq_parse }, /* Signal Quality */ ++ ++ /* FIXME: parse the below and generate the respective events */ ++ ++ /* %CGREG: reports extended information about GPRS registration state */ ++}; ++ ++static int qc_detect(struct gsmd *g) ++{ ++ /* FIXME: do actual detection of vendor if we have multiple vendors */ ++ /* open /proc/cpuinfo and check for HTC Universal? */ ++ return 1; ++} ++ ++static int qc_initsettings(struct gsmd *g) ++{ ++ int rc; ++ struct gsmd_atcmd *cmd; ++ ++ /* enable @HTCCSQ: signal quality reports */ ++ rc |= gsmd_simplecmd(g, "AT@HTCCSQ=1"); ++ ++ return rc; ++} ++ ++struct gsmd_vendor_plugin gsmd_vendor_plugin = { ++ .name = "Qualcomm msm6250", ++ .num_unsolicit = ARRAY_SIZE(qc_unsolicit), ++ .unsolicit = qc_unsolicit, ++ .detect = &qc_detect, ++ .initsettings = &qc_initsettings, ++}; +Index: gsm/src/gsmd/Makefile.am +=================================================================== +--- gsm.orig/src/gsmd/Makefile.am 2007-04-02 09:58:55.000000000 +0200 ++++ gsm/src/gsmd/Makefile.am 2007-04-02 13:33:11.000000000 +0200 +@@ -1,11 +1,26 @@ + INCLUDES = $(all_includes) -I$(top_srcdir)/include + AM_CFLAGS = -std=gnu99 ++plugindir = $(libdir)/gsmd + + sbin_PROGRAMS = gsmd + +-gsmd_SOURCES = gsmd.c atcmd.c select.c vendor.c usock.c unsolicited.c log.c \ +- vendor_ti.c talloc.c operator_cache.c ext_response.c +-#gsmd_LDADD = ../libgsmd/libgsmd.la +-#gsmd_LDFLAGS = -dynamic ++gsmd_CFLAGS = -D PLUGINDIR=\"$(plugindir)\" ++gsmd_SOURCES = gsmd.c atcmd.c select.c machine.c vendor.c unsolicited.c log.c \ ++ usock.c talloc.c operator_cache.c ext_response.c ++gsmd_LDADD = -ldl ++gsmd_LDFLAGS = -Wl,--export-dynamic ++ ++plugin_LTLIBRARIES = libgsmd-machine_generic.la \ ++ libgsmd-machine_tihtc.la \ ++ libgsmd-vendor_ti.la \ ++ libgsmd-vendor_tihtc.la \ ++ libgsmd-vendor_qc.la ++ ++libgsmd_machine_generic_la_SOURCES = machine_generic.c ++libgsmd_machine_tihtc_la_SOURCES = machine_tihtc.c ++ ++libgsmd_vendor_ti_la_SOURCES = vendor_ti.c ++libgsmd_vendor_tihtc_la_SOURCES = vendor_tihtc.c ++libgsmd_vendor_qc_la_SOURCES = vendor_qc.c + + noinst_HEADERS = gsmd.h +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-04-02 11:03:40.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-04-02 11:03:41.000000000 +0200 +@@ -183,6 +183,7 @@ + * an empty string or that 'ready' string, we need to init the modem */ + if (strlen(buf) == 0 || + !strcmp(buf, "AT-Command Interpreter ready")) { ++ g->interpreter_ready = 1; + gsmd_initsettings(g); + return 0; + } +@@ -370,7 +371,7 @@ + } + + /* write pending commands to UART */ +- if (what & GSMD_FD_WRITE) { ++ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { + struct gsmd_atcmd *pos, *pos2; + llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { + len = strlen(pos->buf); +Index: gsm/src/gsmd/vendor_tihtc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/vendor_tihtc.c 2007-04-02 13:16:45.000000000 +0200 +@@ -0,0 +1,305 @@ ++/* TI [Calypso] with HTC firmware gsmd plugin ++ * ++ * Written by Philipp Zabel ++ * based on vendor_ti.c ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int gsmd_test_atcb(struct gsmd_atcmd *cmd, void *ctx, char *resp) ++{ ++ printf("`%s' returned `%s'\n", cmd->buf, resp); ++ return 0; ++} ++ ++int gsmd_simplecmd(struct gsmd *gsmd, char *cmdtxt) ++{ ++ struct gsmd_atcmd *cmd; ++ cmd = atcmd_fill(cmdtxt, strlen(cmdtxt)+1, &gsmd_test_atcb, NULL, 0); ++ if (!cmd) ++ return -ENOMEM; ++ ++ return atcmd_submit(gsmd, cmd); ++} ++ ++ ++#if 0 ++#include "vendorplugin.h" ++ ++static int ++ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen) ++{ ++ switch (optname) { ++ case GSMD_OPT_CIPHER_IND: ++ /* FIXME: send AT%CPRI=? */ ++ break; ++ default: ++ return -EINVAL; ++ } ++} ++ ++static int ++ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen) ++{ ++ switch (optname) { ++ case GSMD_OPT_CIPHER_IND: ++ /* FIXME: send AT%CPRI= */ ++ break; ++ default: ++ return -EINVAL; ++ } ++} ++ ++#endif ++ ++ ++static int htccsq_parse(char *buf, int len, const char *param, ++ struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, ++ sizeof(*aux)); ++ ++ DEBUGP("entering htccsq_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ /* FIXME: contains values 1-5, should be mapped to 0-31 somehow? */ ++ /* 2 --> 11 */ ++ aux->u.signal.sigq.rssi = atoi(buf); ++ aux->u.signal.sigq.ber = 99; ++ ++ DEBUGP("sending EVT_SIGNAL\n"); ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); ++ ++ return 0; ++ ++out_free_io: ++ free(ucmd); ++ return -EIO; ++} ++ ++static int cpri_parse(char *buf, int len, const char *param, struct gsmd *gsmd) ++{ ++ char *tok1, *tok2; ++ ++ tok1 = strtok(buf, ","); ++ if (!tok1) ++ return -EIO; ++ ++ tok2 = strtok(NULL, ","); ++ if (!tok2) { ++ switch (atoi(tok1)) { ++ case 0: ++ gsmd->dev_state.ciph_ind.flags &= ~GSMD_CIPHIND_ACTIVE; ++ break; ++ case 1: ++ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_ACTIVE; ++ break; ++ case 2: ++ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_DISABLED_SIM; ++ break; ++ } ++ } else { ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, ++ GSMD_EVT_CIPHER, ++ sizeof(*aux)); ++ if (!ucmd) ++ return -ENOMEM; ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ aux->u.cipher.net_state_gsm = atoi(tok1); ++ aux->u.cipher.net_state_gsm = atoi(tok2); ++ ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_CIPHER); ++ } ++ ++ return 0; ++} ++ ++/* Call Progress Information */ ++static int cpi_parse(char *buf, int len, const char *param, struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, ++ GSMD_EVT_OUT_STATUS, ++ sizeof(*aux)); ++ ++ DEBUGP("entering cpi_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ /* Format: cId, msgType, ibt, tch, dir,[mode],[number],[type],[alpha],[cause],line */ ++ ++ /* call ID */ ++ tok = strtok(buf, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ /* message type (layer 3) */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ aux->u.call_status.prog = atoi(tok); ++ ++ /* in-band tones */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ if (*tok == '1') ++ aux->u.call_status.ibt = 1; ++ else ++ aux->u.call_status.ibt = 0; ++ ++ /* TCH allocated */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ if (*tok == '1') ++ aux->u.call_status.tch = 1; ++ else ++ aux->u.call_status.tch = 0; ++ ++ /* direction */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_send; ++ ++ switch (*tok) { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ aux->u.call_status.dir = (*tok - '0'); ++ break; ++ default: ++ break; ++ } ++ ++ /* mode */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_send; ++ ++out_send: ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_OUT_STATUS); ++ ++ return 0; ++ ++out_free_io: ++ talloc_free(ucmd); ++ return -EIO; ++} ++ ++static const struct gsmd_unsolicit tihtc_unsolicit[] = { ++ { "%HTCCSQ", &htccsq_parse }, /* Signal Quality */ ++ { "%CPRI", &cpri_parse }, /* Ciphering Indication */ ++ { "%CPI", &cpi_parse }, /* Call Progress Information */ ++ ++ /* FIXME: parse the below and generate the respective events */ ++ ++ /* %CGREG: reports extended information about GPRS registration state */ ++}; ++ ++static int cpi_detect_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) ++{ ++ struct gsmd *g = ctx; ++ struct gsm_extrsp *er; ++ ++ if (strncmp(resp, "%CPI: ", 6)) ++ return -EINVAL; ++ resp += 6; ++ ++ er = extrsp_parse(cmd, resp); ++ if (!er) ++ return -EINVAL; ++ ++ if (extrsp_supports(er, 0, 3)) ++ return gsmd_simplecmd(g, "AT%CPI=3"); ++ else if (extrsp_supports(er, 0, 2)) ++ return gsmd_simplecmd(g, "AT%CPI=2"); ++ else ++ DEBUGP("Call Progress Indication mode 2 or 3 not supported!!\n"); ++ ++ talloc_free(er); ++ return 0; ++} ++ ++static int tihtc_detect(struct gsmd *g) ++{ ++ /* FIXME: do actual detection of vendor if we have multiple vendors */ ++ /* open /proc/cpuinfo and check for HTC Magician or HTC Blueangel? */ ++ /* check for N_TIHTC ldisc? or set it ourselves? */ ++ return 1; ++} ++ ++static int tihtc_initsettings(struct gsmd *g) ++{ ++ int rc; ++ struct gsmd_atcmd *cmd; ++ ++ /* use %CGREG */ ++ //rc |= gsmd_simplecmd(g, "AT%CGREG=3"); ++ /* enable %CPRI: ciphering indications */ ++ rc |= gsmd_simplecmd(g, "AT%CPRI=1"); ++ /* enable %HTCCSQ: signal quality reports */ ++ rc |= gsmd_simplecmd(g, "AT%HTCCSQ=1"); ++ /* send unsolicited commands at any time */ ++ rc |= gsmd_simplecmd(g, "AT%CUNS=0"); ++ ++ /* enable %CPI: call progress indication */ ++ cmd = atcmd_fill("AT%CPI=?", 9, &cpi_detect_cb, g, 0); ++ if (cmd) ++ atcmd_submit(g, cmd); ++ ++ return rc; ++} ++ ++struct gsmd_vendor_plugin gsmd_vendor_plugin = { ++ .name = "TI Calypso / HTC firmware", ++ .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit), ++ .unsolicit = tihtc_unsolicit, ++ .detect = &tihtc_detect, ++ .initsettings = &tihtc_initsettings, ++}; +Index: gsm/src/gsmd/vendor_ti.c +=================================================================== +--- gsm.orig/src/gsmd/vendor_ti.c 2007-04-02 09:58:55.000000000 +0200 ++++ gsm/src/gsmd/vendor_ti.c 2007-04-02 11:03:41.000000000 +0200 +@@ -301,16 +301,10 @@ + return rc; + } + +-static struct gsmd_vendor_plugin plugin_ticalypso = { ++struct gsmd_vendor_plugin gsmd_vendor_plugin = { + .name = "TI Calypso", + .num_unsolicit = ARRAY_SIZE(ticalypso_unsolicit), + .unsolicit = ticalypso_unsolicit, + .detect = &ticalypso_detect, + .initsettings = &ticalypso_initsettings, + }; +- +-/* FIXME: this will be _init() when we make this a plugin */ +-int ticalypso_init(void) +-{ +- return gsmd_vendor_plugin_register(&plugin_ticalypso); +-} +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-04-02 09:58:55.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-04-02 13:39:40.000000000 +0200 +@@ -254,6 +254,21 @@ + exit(1); + } + ++ if (gsmd_machine_plugin_init(&g) < 0) { ++ fprintf(stderr, "no machine plugins found\n"); ++ exit(1); ++ } ++ ++ /* select a machine plugin and load possible vendor plugins */ ++ gsmd_machine_plugin_find(&g); ++ ++ /* initialize the machine plugin */ ++ if (g.machinepl->init) ++ if (g.machinepl->init(&g, fd) < 0) { ++ fprintf(stderr, "couldn't initialize machine plugin\n"); ++ exit(1); ++ } ++ + if (atcmd_init(&g, fd) < 0) { + fprintf(stderr, "can't initialize UART device\n"); + exit(1); +@@ -275,12 +290,11 @@ + setsid(); + } + +- /* FIXME: do this dynamically */ +- ticalypso_init(); +- ++ /* select a vendor plugin */ + gsmd_vendor_plugin_find(&g); + +- gsmd_initsettings(&g); ++ if (g.interpreter_ready) ++ gsmd_initsettings(&g); + + gsmd_opname_init(&g); + +Index: gsm/src/gsmd/vendor.c +=================================================================== +--- gsm.orig/src/gsmd/vendor.c 2007-04-02 09:58:55.000000000 +0200 ++++ gsm/src/gsmd/vendor.c 2007-04-02 13:38:38.000000000 +0200 +@@ -20,7 +20,10 @@ + * + */ + ++#include + #include ++#include ++#include + + #include + +@@ -52,6 +55,7 @@ + + llist_for_each_entry(pl, &vendorpl_list, list) { + if (pl->detect(g) == 1) { ++ DEBUGP("selecting vendor plugin \"%s\"\n", pl->name); + g->vendorpl = pl; + return 1; + } +@@ -59,3 +63,29 @@ + + return 0; + } ++ ++int gsmd_vendor_plugin_load(char *name) ++{ ++ int rc = -1; ++ void *lib; ++ struct gsmd_vendor_plugin *pl; ++ char buf[128]; ++ ++ DEBUGP("loading vendor plugin \"%s\"\n", name); ++ ++ snprintf(buf, sizeof(buf), PLUGINDIR"/libgsmd-vendor_%s.so", name); ++ ++ lib = dlopen(buf, RTLD_LAZY); ++ if (!lib) { ++ fprintf(stderr, "gsmd_vendor_plugin_load: %s\n", dlerror()); ++ return -1; ++ } ++ ++ pl = dlsym(lib, "gsmd_vendor_plugin"); ++ if (pl) ++ rc = gsmd_vendor_plugin_register(pl); ++ else ++ dlclose(lib); ++ ++ return rc; ++} diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 2019185b33..607d4db1be 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,17 +4,17 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r8" +PR = "r10" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ file://default" S = "${WORKDIR}/gsm" -SRC_URI_append_htcuniversal = " file://interpreter-ready.patch;patch=1" -SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ - file://interpreter-ready.patch;patch=1 \ - file://ldisc.patch;patch=1" +SRC_URI_append_magician = "file://numeric.patch;patch=1 \ + file://plugin.patch;patch=1" +SRC_URI_append_htcuniversal = "file://numeric.patch;patch=1 \ + file://plugin.patch;patch=1" inherit autotools pkgconfig update-rc.d @@ -32,10 +32,12 @@ do_install_append() { install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd } -PACKAGES =+ "${PN}-tools gsmd" +PACKAGES =+ "${PN}-tools gsmd gsmd-plugins" RDEPENDS_${PN} = "gsmd" +RRECOMMENDS_gsmd = "gsmd-plugins" FILES_${PN}-tools = "${bindir}/*" FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}" +FILES_gsmd-plugins = "${libdir}/gsmd/*.so*" PACKAGES_DYNAMIC = "libgsmd* gsmd" -- cgit v1.2.3 From 929b9fa9bc6848966f88c5e5e476a7cac04a4177 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 10:03:18 +0000 Subject: gtk+: Minor packaging fix --- packages/gtk+/gtk+_2.6.10.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index c096bbe688..f632a76582 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -38,6 +38,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ inherit autotools pkgconfig FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${sysconfdir}/gtk-2.0 \ ${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-2.0 \ ${libdir}/lib*.so.* \ -- cgit v1.2.3 From 90201c31c70908b3a010e02a4884039a4b333552 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 10:25:37 +0000 Subject: gtk+: not useful --- packages/gtk+/gtk+_2.6.10.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index f632a76582..ed2d9aea80 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -38,7 +38,6 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ inherit autotools pkgconfig FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${sysconfdir}/gtk-2.0 \ ${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-2.0 \ ${libdir}/lib*.so.* \ -- cgit v1.2.3 From ab4ed138ed1800e41cbd339258056ffee34a7caa Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 10:37:42 +0000 Subject: task-sdk-sbox: Add new task to cover some scratchbox SDK stuff --- packages/tasks/task-sdk-sbox.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/tasks/task-sdk-sbox.bb (limited to 'packages') diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb new file mode 100644 index 0000000000..855d720143 --- /dev/null +++ b/packages/tasks/task-sdk-sbox.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "SDK task for Scratchbox rootstraps" +PR = "r2" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS := "\ + glib-2.0-utils \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-jpg \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-xpm \ + intltool \ + strace \ + gdb \ + sbrsh \ + fakeroot \ + " \ No newline at end of file -- cgit v1.2.3 From 4f417a092e87d879c0d57aff1be185646878cb96 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 10:40:41 +0000 Subject: meta-sdk-sbox: Several updates - we can build binaries now and have the most important tools. Depens on debian, doctools and perl devkit --- packages/meta/meta-sdk-sbox.bb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index a586972a94..98fb6053c0 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r2" +PACKAGES = "" +PR = "r4" inherit rootfs_ipk sdk meta @@ -14,6 +15,7 @@ FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ task-sdk-base \ + task-sdk-sbox \ task-sdk-x11 \ task-sdk-x11-ext \ task-sdk-gpe \ @@ -22,6 +24,7 @@ TARGET_INSTALL = "\ DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" + IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" do_populate_sdk() { @@ -73,8 +76,12 @@ EOF # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - # remove broken .la files - #rm ${SDK_OUTPUT}/${prefix}/lib/*.la + # fixup libtool files + cd ${SDK_OUTPUT}/${prefix}/lib/ + for f in *.la ; do + sed -i 's%${STAGING_DIR}${TARGET_SYS}%/usr/%g' "$f" + done + # fix pkgconfig data files cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig -- cgit v1.2.3 From c0e1d6349d7b14a83101f41989b7393259b9534d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 10:50:22 +0000 Subject: linux-x86: Update Nevista defconf --- packages/linux/linux-x86-2.6.20/netvista/defconfig | 63 +++++++++++++++++----- packages/linux/linux-x86_2.6.20.bb | 2 +- 2 files changed, 50 insertions(+), 15 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-x86-2.6.20/netvista/defconfig b/packages/linux/linux-x86-2.6.20/netvista/defconfig index 864a42b303..4db3370642 100644 --- a/packages/linux/linux-x86-2.6.20/netvista/defconfig +++ b/packages/linux/linux-x86-2.6.20/netvista/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20 -# Tue Apr 3 00:46:14 2007 +# Thu Apr 5 12:46:55 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -870,11 +870,13 @@ CONFIG_INPUT=y # CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_MOUSEDEV_SCREEN_X=800 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600 # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=800 +CONFIG_INPUT_TSDEV_SCREEN_Y=600 +CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # @@ -892,7 +894,15 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m # CONFIG_INPUT_MISC is not set # @@ -1117,6 +1127,7 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y +CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=y # CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y @@ -1134,7 +1145,8 @@ CONFIG_SND_VERBOSE_PROCFS=y # # Generic devices # -CONFIG_SND_AC97_CODEC=y +CONFIG_SND_MPU401_UART=m +CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DUMMY is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set @@ -1160,7 +1172,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_CS5535AUDIO=m # CONFIG_SND_DARLA20 is not set # CONFIG_SND_GINA20 is not set # CONFIG_SND_LAYLA20 is not set @@ -1185,7 +1197,7 @@ CONFIG_SND_AC97_CODEC=y # CONFIG_SND_HDSPM is not set # CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1724 is not set -CONFIG_SND_INTEL8X0=y +CONFIG_SND_INTEL8X0=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_KORG1212 is not set # CONFIG_SND_MAESTRO3 is not set @@ -1197,9 +1209,9 @@ CONFIG_SND_INTEL8X0=y # CONFIG_SND_RME96 is not set # CONFIG_SND_RME9652 is not set # CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_TRIDENT is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set # CONFIG_SND_AC97_POWER_SAVE is not set @@ -1213,8 +1225,31 @@ CONFIG_SND_INTEL8X0=y # # Open Sound System # -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=y +CONFIG_SOUND_PRIME=m +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_SOUND_PSS is not set +CONFIG_SOUND_SB=m +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_KAHLUA is not set +CONFIG_AC97_BUS=m # # HID Devices diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb index 5db1563733..d7600dcfa9 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 = "r0" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" -- cgit v1.2.3 From 4276eaaa0a342118dfa85731a772c084d9e8fa56 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Apr 2007 13:21:49 +0000 Subject: hwdata: add 0.191 --- packages/hwdata/.mtn2git_empty | 0 packages/hwdata/hwdata_0.191.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 packages/hwdata/.mtn2git_empty create mode 100644 packages/hwdata/hwdata_0.191.bb (limited to 'packages') diff --git a/packages/hwdata/.mtn2git_empty b/packages/hwdata/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hwdata/hwdata_0.191.bb b/packages/hwdata/hwdata_0.191.bb new file mode 100644 index 0000000000..2dfe1433bf --- /dev/null +++ b/packages/hwdata/hwdata_0.191.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "This package contains various hardware identification and configuration data, such as the pci.ids database, or the XFree86/xorg Cards database. It's needed for the kudzu hardware detection." +LICENSE = "GPL + X11" + +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191.orig.tar.gz \ + http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191-1.diff.gz;patch=1 \ + " + +PACKAGE_ARCH = "all" + + +do_install() { + mkdir -p ${D}${datadir}/hwdata + install -m644 MonitorsDB pci* usb.ids video* upgradelist ${D}${datadir}/hwdata +} -- cgit v1.2.3 From 88c0b219feb00934e45de5e94b55f961c7210845 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 13:24:01 +0000 Subject: ptim-headers: Shared headers for Phone Text Input --- packages/gpephone/ptim-headers_svn.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gpephone/ptim-headers_svn.bb (limited to 'packages') diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb new file mode 100644 index 0000000000..94986852c8 --- /dev/null +++ b/packages/gpephone/ptim-headers_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Phone input method - shared headers" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+" +PV = "0.1+svn-${SRCDATE}" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imheaders" + +S = "${WORKDIR}/imheaders" + +DEFAULT_PREFERENCE = "-1" + +do_starge () { + autotools_do_stage_all +} \ No newline at end of file -- cgit v1.2.3 From da2a25a55186a940d6ce9b399bbc2b268c38bec8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 13:40:23 +0000 Subject: ptim-headers: fix typo --- packages/gpephone/ptim-headers_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb index 94986852c8..0ff243c7d6 100644 --- a/packages/gpephone/ptim-headers_svn.bb +++ b/packages/gpephone/ptim-headers_svn.bb @@ -13,6 +13,6 @@ S = "${WORKDIR}/imheaders" DEFAULT_PREFERENCE = "-1" -do_starge () { +do_stage () { autotools_do_stage_all } \ No newline at end of file -- cgit v1.2.3 From d79e06819a0f1395395119b09b532dfc6bf246aa Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 13:42:48 +0000 Subject: ptim-headers: fix another typo --- packages/gpephone/ptim-headers_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb index 0ff243c7d6..1d8ce9c4c7 100644 --- a/packages/gpephone/ptim-headers_svn.bb +++ b/packages/gpephone/ptim-headers_svn.bb @@ -14,5 +14,5 @@ S = "${WORKDIR}/imheaders" DEFAULT_PREFERENCE = "-1" do_stage () { - autotools_do_stage_all + autotools_stage_all } \ No newline at end of file -- cgit v1.2.3 From 58bd699b44464bdd8bc1a90d84c5d5a964728e7b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:27:44 +0000 Subject: ptim-manager: Add the Phone Text Input manager module. --- packages/gpephone/ptim-manager_svn.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/gpephone/ptim-manager_svn.bb (limited to 'packages') diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb new file mode 100644 index 0000000000..fe812a21ce --- /dev/null +++ b/packages/gpephone/ptim-manager_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Phone input method manager module" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ ptim-headers libiac" +PV = "0.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \ + file://gtkmodule-location.patch;patch=1;pnum=0" + +S = "${WORKDIR}/immanager" + +FILES_${PN} += "${libdir}/gtk-2.0/*/immodules/*.so ${libdir}/gtk-2.0/*/immodules/ptim" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la" + +do_stage () { + autotools_stage_all +} \ No newline at end of file -- cgit v1.2.3 From 41b3c1fccb8850a9447c1e4e4ab120fe63667fd5 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:28:36 +0000 Subject: ptim-manager: Add patch --- packages/gpephone/ptim-manager/.mtn2git_empty | 0 .../gpephone/ptim-manager/gtkmodule-location.patch | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 packages/gpephone/ptim-manager/.mtn2git_empty create mode 100644 packages/gpephone/ptim-manager/gtkmodule-location.patch (limited to 'packages') diff --git a/packages/gpephone/ptim-manager/.mtn2git_empty b/packages/gpephone/ptim-manager/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/ptim-manager/gtkmodule-location.patch b/packages/gpephone/ptim-manager/gtkmodule-location.patch new file mode 100644 index 0000000000..d02166e1ac --- /dev/null +++ b/packages/gpephone/ptim-manager/gtkmodule-location.patch @@ -0,0 +1,21 @@ +--- src/Makefile.am~ 2007-04-05 16:01:29.000000000 +0200 ++++ src/Makefile.am 2007-04-05 16:01:29.000000000 +0200 +@@ -3,7 +3,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules ++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules + + INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \ + -I. $(IMMANAGER_CFLAGS) +--- Makefile.am~ 2007-04-05 16:21:36.000000000 +0200 ++++ Makefile.am 2007-04-05 16:21:36.000000000 +0200 +@@ -3,6 +3,6 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-confdir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/ ++confdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/ + conf_DATA = \ + conf/imconfig -- cgit v1.2.3 From 09d5e0f91495fcd66847b6db030683e30c15c124 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:31:09 +0000 Subject: gpe-session-scripts-phone: Update session file to set up environment for PTIM. --- packages/gpephone/gpe-session-scripts-phone/phonesession | 8 ++++++++ packages/gpephone/gpe-session-scripts-phone_0.67.bb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession index 689b3c01ed..38c1f90db0 100755 --- a/packages/gpephone/gpe-session-scripts-phone/phonesession +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -30,6 +30,14 @@ export TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache # For Calendar export CAL_RES_PATH=$APP_PATH/share/res +# For GTK input engine +export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim +export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps +export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig +export PTIM_HELPER_PATH=$PTIM_PATH/helper +export PTIM_ENGINE_PATH=$PTIM_PATH/engine +export GTK_IM_MODULE=ptim + # Start GPE Phone Edition apps through matchbox session gpe-applauncher& sleep 2 diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index 5312d63249..5af3ff683a 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://phonesession \ file://disable-composite.xsettings" -PR = "r3" +PR = "r4" S = "${WORKDIR}/gpe-session-scripts-${PV}" -- cgit v1.2.3 From e00c88e75b489aff5c24e93b19d3b6ff5fd64189 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:46:36 +0000 Subject: ptim-helper: Phone Text Input helper module. --- packages/gpephone/ptim-helper/.mtn2git_empty | 0 .../gpephone/ptim-helper/gtkmodule-location.patch | 22 +++++++++++++++++++++ packages/gpephone/ptim-helper_svn.bb | 23 ++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 packages/gpephone/ptim-helper/.mtn2git_empty create mode 100644 packages/gpephone/ptim-helper/gtkmodule-location.patch create mode 100644 packages/gpephone/ptim-helper_svn.bb (limited to 'packages') diff --git a/packages/gpephone/ptim-helper/.mtn2git_empty b/packages/gpephone/ptim-helper/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/ptim-helper/gtkmodule-location.patch b/packages/gpephone/ptim-helper/gtkmodule-location.patch new file mode 100644 index 0000000000..cd0e469608 --- /dev/null +++ b/packages/gpephone/ptim-helper/gtkmodule-location.patch @@ -0,0 +1,22 @@ +--- src/Makefile.am~ 2007-04-05 16:40:45.000000000 +0200 ++++ src/Makefile.am 2007-04-05 16:40:45.000000000 +0200 +@@ -3,7 +3,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper ++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper + + INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \ + -I. $(IMHELPER_CFLAGS) +--- pixmaps/Makefile.am~ 2007-04-05 16:43:16.000000000 +0200 ++++ pixmaps/Makefile.am 2007-04-05 16:43:16.000000000 +0200 +@@ -1,7 +1,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-pixmapsdir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps ++pixmapsdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps + pixmaps_DATA = \ + next.png \ + prev.png \ diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb new file mode 100644 index 0000000000..3b97fc7027 --- /dev/null +++ b/packages/gpephone/ptim-helper_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Phone input method helper module" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ ptim-headers" +PV = "0.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper \ + file://gtkmodule-location.patch;patch=1;pnum=0" + +S = "${WORKDIR}/imhelper" + +FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la" + +do_stage () { + autotools_stage_all +} \ No newline at end of file -- cgit v1.2.3 From 7b2921b6a2689ee0a3bb647af56378f3a0a8e00e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:55:12 +0000 Subject: ptim-engine: New package: Phone Text Input Engine --- packages/gpephone/ptim-engine/.mtn2git_empty | 0 .../gpephone/ptim-engine/gtkmodule-location.patch | 11 +++++++++++ packages/gpephone/ptim-engine_svn.bb | 23 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 packages/gpephone/ptim-engine/.mtn2git_empty create mode 100644 packages/gpephone/ptim-engine/gtkmodule-location.patch create mode 100644 packages/gpephone/ptim-engine_svn.bb (limited to 'packages') diff --git a/packages/gpephone/ptim-engine/.mtn2git_empty b/packages/gpephone/ptim-engine/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/ptim-engine/gtkmodule-location.patch b/packages/gpephone/ptim-engine/gtkmodule-location.patch new file mode 100644 index 0000000000..6882f1239d --- /dev/null +++ b/packages/gpephone/ptim-engine/gtkmodule-location.patch @@ -0,0 +1,11 @@ +--- src/Makefile.am~ 2007-04-05 16:49:43.000000000 +0200 ++++ src/Makefile.am 2007-04-05 16:49:43.000000000 +0200 +@@ -3,7 +3,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine ++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine + + INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \ + -I. $(IMENGINE_CFLAGS) diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb new file mode 100644 index 0000000000..286a1edf8d --- /dev/null +++ b/packages/gpephone/ptim-engine_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Phone input method engine" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "LiPS" +DEPENDS = "gtk+ ptim-headers" +PV = "0.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine \ + file://gtkmodule-location.patch;patch=1;pnum=0" + +S = "${WORKDIR}/imengine" + +FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so " +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" + +do_stage () { + autotools_stage_all +} \ No newline at end of file -- cgit v1.2.3 From 74bf56afe26dbc5d629a4b2f9c7329932e63d17b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:57:35 +0000 Subject: ptim: Adjust license information. --- packages/gpephone/ptim-headers_svn.bb | 2 +- packages/gpephone/ptim-helper_svn.bb | 2 +- packages/gpephone/ptim-manager_svn.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb index 1d8ce9c4c7..304c103505 100644 --- a/packages/gpephone/ptim-headers_svn.bb +++ b/packages/gpephone/ptim-headers_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Phone input method - shared headers" SECTION = "gpephone" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LiPS" DEPENDS = "gtk+" PV = "0.1+svn-${SRCDATE}" diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb index 3b97fc7027..0d0ac653b5 100644 --- a/packages/gpephone/ptim-helper_svn.bb +++ b/packages/gpephone/ptim-helper_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Phone input method helper module" SECTION = "gpephone" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" PV = "0.1+svn-${SRCDATE}" diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb index fe812a21ce..b1113636e9 100644 --- a/packages/gpephone/ptim-manager_svn.bb +++ b/packages/gpephone/ptim-manager_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Phone input method manager module" SECTION = "gpephone" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers libiac" PV = "0.1+svn-${SRCDATE}" -- cgit v1.2.3 From 4728076e2fdfb6b9444c50a23549ecedcbe09264 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:59:30 +0000 Subject: task-gpephone: Add PTIM bits. --- packages/tasks/task-gpephone.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index e03886f0fd..a480a03b86 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition" -PR = "r3" +PR = "r4" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -67,7 +67,9 @@ RDEPENDS_gpephone-task-base := "\ pango-module-basic-x \ pango-module-basic-fc \ detect-stylus \ - libgtkinput \ + ptim-manager \ + ptim-helper \ + ptim-engine \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \ " -- cgit v1.2.3 From 1387d0a7c4c00774283a78bd798379616e307abb Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Thu, 5 Apr 2007 22:57:31 +0000 Subject: linux/linux-jlime-jornada6xx-2.6.21rc5: * Minor fixes to let patches apply * Addition of patch that will not be in git until 2.6.21rc6 --- packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch | 4 ++++ packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch (limited to 'packages') diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch new file mode 100644 index 0000000000..c4819514d7 --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx-2.6.21rc5/hp6xx-IRQ3.patch @@ -0,0 +1,4 @@ +14c14 +< #define HP680_TS_IRQ IRQ3_IRQ +--- +> #define HP680_TS_IRQ 35 diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb index f38fa5c26e..0f689a42e2 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb @@ -8,10 +8,11 @@ COMPATIBLE_HOST = "sh.*-linux" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.21-rc5 \ file://git-20070405-2.patch;patch=1 \ - file://defconfig" + file://hp6xx-IRQ3.patch=0 \ + file://defconfig" -S = "${WORKDIR}/linux-${PV}" +S = "${WORKDIR}/git" inherit kernel -- cgit v1.2.3 From 1cffad5fd96074261aab5702cbc0935f53019001 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Thu, 5 Apr 2007 23:15:45 +0000 Subject: linux-jlime-jornada6xx: minor typo in patch --- packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb index 0f689a42e2..82b54258b5 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb @@ -8,7 +8,7 @@ COMPATIBLE_HOST = "sh.*-linux" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.21-rc5 \ file://git-20070405-2.patch;patch=1 \ - file://hp6xx-IRQ3.patch=0 \ + file://hp6xx-IRQ3.patch;patch=1 \ file://defconfig" -- cgit v1.2.3 From b69d4cc70e67e973e51d7f2234ff181de90f399f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:49:27 +0000 Subject: task-sdk-sbox: Add some useful things. --- packages/tasks/task-sdk-sbox.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb index 855d720143..67d5ed47f4 100644 --- a/packages/tasks/task-sdk-sbox.bb +++ b/packages/tasks/task-sdk-sbox.bb @@ -1,17 +1,22 @@ DESCRIPTION = "SDK task for Scratchbox rootstraps" -PR = "r2" +PR = "r4" LICENSE = "MIT" ALLOW_EMPTY = "1" RDEPENDS := "\ glib-2.0-utils \ gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpg \ + gdk-pixbuf-loader-jpeg \ gdk-pixbuf-loader-gif \ gdk-pixbuf-loader-xpm \ intltool \ + intltool-dev \ strace \ gdb \ sbrsh \ fakeroot \ + matchbox-wm \ + dbus \ + joe \ + ipkg \ " \ No newline at end of file -- cgit v1.2.3 From 530a3e9647aba8369e01c5e90b8f9672febdd2cd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Apr 2007 19:08:07 +0000 Subject: hal: install /var/cache/hald --- packages/hal/files/99_hal | 1 + packages/hal/hal_0.5.9.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/hal/files/99_hal b/packages/hal/files/99_hal index f3d477231e..f983db9ee5 100644 --- a/packages/hal/files/99_hal +++ b/packages/hal/files/99_hal @@ -1 +1,2 @@ d root root 0700 /var/run/hald none +d root root 0700 /var/cache/hald none diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index e021f03045..bb9dc82b52 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -8,7 +8,7 @@ RDEPENDS += "udev hal-info" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r0" +PR = "r1" SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ file://99_hal" -- cgit v1.2.3 From 25382a5b4176440e9bdbdce41ef51a1df03a6b6d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 6 Apr 2007 09:53:40 +0000 Subject: irda-utils 0.9.16: Don't add irattach to startup services by default. * This just wastes power (to have IrDA on all the time), and conflicts with other userspace wanting to control the port. * Per RFC on teh OE mailing list. --- packages/irda-utils/irda-utils_0.9.16.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb index ee5580b1de..19bcdf397c 100644 --- a/packages/irda-utils/irda-utils_0.9.16.bb +++ b/packages/irda-utils/irda-utils_0.9.16.bb @@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \ such as phones and laptops." SECTION = "base" LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -12,7 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ export SYS_INCLUDES="-I${STAGING_INCDIR}" -inherit autotools update-rc.d +inherit autotools INITSCRIPT_NAME = "irattach" INITSCRIPT_PARAMS = "defaults 20" -- cgit v1.2.3 From 40097bddbebbc1ec87560eca0bbe8e4bb586bcb8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 6 Apr 2007 10:11:19 +0000 Subject: irda-utils: Make service script detect default IrDA port on PXA2xx devices. * Some issue is that some PXA2xx devices use ttyS2 for non-IrDA, these should be added to case *before* '"XScale-PXA2"*'. This should not be a problem as irattach is no longer started on boot, only manually. * Otherwise, assume that default is no IrDA, not some random serial port. * A bit of reformatting, too. --- packages/irda-utils/files/init | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/irda-utils/files/init b/packages/irda-utils/files/init index 2d93af34df..1944b9d782 100755 --- a/packages/irda-utils/files/init +++ b/packages/irda-utils/files/init @@ -1,21 +1,26 @@ #! /bin/sh +NAME="irattach" + module_id() { awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' /dev/null 2>&1 & + irattach ${DEVICE} ${ARGS} > /dev/null 2>&1 echo "$NAME." ;; stop) echo -n "Stopping IrDA: " - killall irattach > /dev/null 2>&1 + killall irattach > /dev/null 2>&1 echo "$NAME." ;; restart|force-reload) echo -n "Restarting IrDA: " - irattach ${DEVICE} ${ARGS} > /dev/null 2>&1 & + irattach ${DEVICE} ${ARGS} > /dev/null 2>&1 sleep 1 - killall irattach > /dev/null 2>&1 + killall irattach > /dev/null 2>&1 echo "$NAME." ;; *) -- cgit v1.2.3 From 8ca40d1a5672fbe593fc02bc1b2caf037b00aaa2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 6 Apr 2007 10:15:30 +0000 Subject: irda-utils: Reformat init script using tabs instead of spaces to save precious embedded space. --- packages/irda-utils/files/init | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/irda-utils/files/init b/packages/irda-utils/files/init index 1944b9d782..a00596fc85 100755 --- a/packages/irda-utils/files/init +++ b/packages/irda-utils/files/init @@ -3,10 +3,10 @@ NAME="irattach" module_id() { - awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' /dev/null 2>&1 - echo "$NAME." - ;; + echo "$NAME." + ;; stop) - echo -n "Stopping IrDA: " + echo -n "Stopping IrDA: " killall irattach > /dev/null 2>&1 - echo "$NAME." - ;; + echo "$NAME." + ;; restart|force-reload) - echo -n "Restarting IrDA: " + echo -n "Restarting IrDA: " irattach ${DEVICE} ${ARGS} > /dev/null 2>&1 - sleep 1 + sleep 1 killall irattach > /dev/null 2>&1 - echo "$NAME." - ;; + echo "$NAME." + ;; *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; esac -- cgit v1.2.3 From dd28663ceb432255e635bab931be2cb6360e7f07 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 6 Apr 2007 10:33:25 +0000 Subject: opie-image: Drop machine appends for opie-image, make it be the same on all machines. * Those appends were found to not work at all (overwrire INSTALL_PACKAGES instead) * Let's have default opie-image clean and lean, and the same for all machines, which helps support and QA. Use package manager, folks! * If there's a need for more packaged images, let's create opie-big-image. --- packages/images/opie-image.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index 3613ccafde..cd8d7df654 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -2,7 +2,7 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" LICENSE = "MIT" -PR = "r21" +PR = "r22" DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie" RDEPENDS = "${INSTALL_PACKAGES}" @@ -14,9 +14,6 @@ INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-apple task-opie-extra-settings \ task-opie-bluetooth task-opie-irda " -INSTALL_PACKAGES_spitz_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" -INSTALL_PACKAGES_akita_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" - export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. -- cgit v1.2.3 From 6a13fed946bb5ee8611c66679c8be49111c98931 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 6 Apr 2007 11:03:46 +0000 Subject: libwpd: Add missing DEPENDS on libgsf. * Closes #2089. --- packages/libwpd/libwpd_0.8.4.bb | 2 +- packages/libwpd/libwpd_0.8.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libwpd/libwpd_0.8.4.bb b/packages/libwpd/libwpd_0.8.4.bb index 46a59e8dc8..4e6ee91a4f 100644 --- a/packages/libwpd/libwpd_0.8.4.bb +++ b/packages/libwpd/libwpd_0.8.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect docu HOMEPAGE = "http://libwpd.sourceforge.net/index.html" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" - +DEPENDS = "libgsf" inherit autotools pkgconfig diff --git a/packages/libwpd/libwpd_0.8.6.bb b/packages/libwpd/libwpd_0.8.6.bb index 46a59e8dc8..4e6ee91a4f 100644 --- a/packages/libwpd/libwpd_0.8.6.bb +++ b/packages/libwpd/libwpd_0.8.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect docu HOMEPAGE = "http://libwpd.sourceforge.net/index.html" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" - +DEPENDS = "libgsf" inherit autotools pkgconfig -- cgit v1.2.3 From 4070ee3c649d218ce0fe119b10b6729d3a775545 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 6 Apr 2007 11:06:00 +0000 Subject: btscanner 2.0: Add missing DEPENDS on libxml2. --- packages/btscanner/btscanner_2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/btscanner/btscanner_2.0.bb b/packages/btscanner/btscanner_2.0.bb index ac991ef078..1e75824c0e 100644 --- a/packages/btscanner/btscanner_2.0.bb +++ b/packages/btscanner/btscanner_2.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extract information from Bluetooth devices in range." SECTION = "libs" PRIORITY = "optional" HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads§ion=01_bluetooth" -DEPENDS = "bluez-libs gdbm ncurses" +DEPENDS = "bluez-libs gdbm ncurses libxml2" PR = "r0" LICENSE = "GPLv2" -- cgit v1.2.3 From f19d9e69c8c394d5c23acce0d4043a17af821acf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 12:03:47 +0000 Subject: task-sdk-sbox, task-sdk: clean out base sdk packages, they should only contain a toolchain --- packages/tasks/task-sdk-sbox.bb | 14 ++------------ packages/tasks/task-sdk.bb | 43 ++--------------------------------------- 2 files changed, 4 insertions(+), 53 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb index 67d5ed47f4..3b1051f570 100644 --- a/packages/tasks/task-sdk-sbox.bb +++ b/packages/tasks/task-sdk-sbox.bb @@ -1,22 +1,12 @@ DESCRIPTION = "SDK task for Scratchbox rootstraps" -PR = "r4" +PR = "r5" LICENSE = "MIT" ALLOW_EMPTY = "1" RDEPENDS := "\ - glib-2.0-utils \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - intltool \ - intltool-dev \ strace \ gdb \ sbrsh \ fakeroot \ - matchbox-wm \ - dbus \ - joe \ ipkg \ - " \ No newline at end of file + " diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 7039077516..cc2ec0860e 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r6" +PR = "r7" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -20,47 +20,8 @@ RDEPENDS_task-sdk-base := "\ glibc \ glibc-dev \ libgcc1 \ - alsa-dev \ - audiofile-dev \ - bluez-libs-dev \ - dbus-dev \ - expat-dev \ - fontconfig-dev \ - freetype-dev \ - glib-2.0-dev \ - gstreamer-dev \ - libice-dev \ ipkg-dev \ - jpeg-dev \ - libapm-dev \ - alsa-lib-dev \ - libdisplaymigration-dev \ - libetpan-dev \ - libgcrypt-dev \ - libglade-dev \ - gnutls-dev \ - libgpg-error-dev \ - libidl-dev \ - libiw-dev \ - libmimedir-dev \ - libpcap-dev \ - libpixman-dev \ - libpng-dev \ - libschedule-dev \ - libsm-dev \ - libsoundgen-dev \ - libsoup-dev \ - libsvg-dev \ - libtododb-dev \ - libts-dev \ - libxml2-dev \ - ncurses-dev \ - openobex-dev \ - popt-dev \ - readline-dev \ - libsqlite-dev \ - zlib-dev \ - libxmu-dev" + " RDEPENDS_task-sdk-x11 := "\ atk-dev \ -- cgit v1.2.3 From d979498abcf3f3f7ff19425f2e63e89d913b0418 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 12:12:05 +0000 Subject: meta-sdk, meta-sdk-sbox: these are general targets, so they should only contain a basic toolchain * attempt to make them generic instead of hardcoding 'arm-linux' --- packages/meta/meta-sdk-sbox.bb | 9 +++------ packages/meta/meta-sdk.bb | 19 ++++++++----------- 2 files changed, 11 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 98fb6053c0..f3a19a4773 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PACKAGES = "" -PR = "r4" +PR = "r5" inherit rootfs_ipk sdk meta @@ -16,10 +16,7 @@ FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ task-sdk-base \ task-sdk-sbox \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe \ - task-sdk-gpephone" + " DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" @@ -62,7 +59,7 @@ EOF #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib #rm -rf ${SDK_OUTPUT}/${prefix}/lib/* - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/usr/include/ cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index e49858398f..a7fe8884c1 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for SDK including GPE and Opie" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r11" +PR = "r12" inherit sdk meta @@ -19,10 +19,7 @@ HOST_INSTALL = "\ TARGET_INSTALL = "\ task-sdk-base \ - task-sdk-opie \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe" + " RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" @@ -65,7 +62,7 @@ EOF mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x @@ -73,22 +70,22 @@ EOF echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc # remove broken .la files - rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la + rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig + cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f" done for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f" + sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" done mkdir -p ${SDK_DEPLOY} -- cgit v1.2.3 From 23b4bd455100addba89dba370c947dd4bc78793c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 12:20:19 +0000 Subject: meta-sdk*: repair sed damage --- packages/meta/meta-sdk-sbox.bb | 2 +- packages/meta/meta-sdk.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index f3a19a4773..1e96e76d5a 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -59,7 +59,7 @@ EOF #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib #rm -rf ${SDK_OUTPUT}/${prefix}/lib/* - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/usr/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index a7fe8884c1..86bb212214 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -62,7 +62,7 @@ EOF mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x -- cgit v1.2.3 From 87e6f6230db9484fa0d68ce6a6550c7380352d32 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 14:14:19 +0000 Subject: glib-2.0: update to 2.12.11n --- packages/glib-2.0/glib-2.0-2.12.11/.mtn2git_empty | 0 .../glib-2.0-2.12.11/configure-libtool.patch | 20 ++++++++++++++++++++ packages/glib-2.0/glib-2.0_2.12.11.bb | 6 ++++++ 3 files changed, 26 insertions(+) create mode 100644 packages/glib-2.0/glib-2.0-2.12.11/.mtn2git_empty create mode 100644 packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch create mode 100644 packages/glib-2.0/glib-2.0_2.12.11.bb (limited to 'packages') diff --git a/packages/glib-2.0/glib-2.0-2.12.11/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch new file mode 100644 index 0000000000..50ffc628db --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch @@ -0,0 +1,20 @@ +--- /tmp/configure.in 2007-02-04 12:07:05.000000000 +0100 ++++ glib-2.12.9/configure.in 2007-02-04 12:08:04.655251000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1239,7 +1239,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ diff --git a/packages/glib-2.0/glib-2.0_2.12.11.bb b/packages/glib-2.0/glib-2.0_2.12.11.bb new file mode 100644 index 0000000000..4d8e59b355 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.12.11.bb @@ -0,0 +1,6 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" + -- cgit v1.2.3 From c437fab54da56451b89472095669b44d353b52fa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 14:35:57 +0000 Subject: cups: add 1.2.10 --- packages/cups/cups_1.2.10.bb | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 packages/cups/cups_1.2.10.bb (limited to 'packages') diff --git a/packages/cups/cups_1.2.10.bb b/packages/cups/cups_1.2.10.bb new file mode 100644 index 0000000000..8201dd9201 --- /dev/null +++ b/packages/cups/cups_1.2.10.bb @@ -0,0 +1,76 @@ +DESCRIPTION = "An Internet printing system for Unix." +SECTION = "console/utils" +LICENSE = "GPL LGPL" +DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native" +PR = "r0" + +SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ + " + +inherit autotools binconfig + +LDFLAGS += " -L${STAGING_LIBDIR} " + +EXTRA_OECONF = " \ + --enable-gnutls \ + --enable-dbus \ + --enable-browsing \ + --disable-openssl \ + --disable-tiff \ + --without-php \ + --without-perl \ + --without-python \ + --without-java \ + " + + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +do_compile () { + sed -i s:STRIP:NOSTRIP: Makedefs + sed -i s:serial:: backend/Makefile + + echo "all:" > man/Makefile + echo "install:" >> man/Makefile + + oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ + "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ + "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ + "LIBZ=-lz -L${STAGING_LIBDIR}" \ + "-I." +} + +fakeroot do_install () { + oe_runmake "DSTROOT=${D}" install +} + +do_stage () { + install -d ${STAGING_INCDIR}/cups + install ${S}/cups/*.h ${STAGING_INCDIR}/cups/ + install ${S}/filter/*.h ${STAGING_INCDIR}/cups/ + oe_libinstall -C cups -so libcups ${STAGING_LIBDIR} + oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR} +} + +FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ + ${libdir}/cups/cgi-bin/.debug \ + ${libdir}/cups/filter/.debug \ + ${libdir}/cups/monitor/.debug \ + ${libdir}/cups/notifier/.debug \ + ${libdir}/cups/daemon/.debug \ + " +#package the html for the webgui inside the main packages (~1MB uncompressed) + +FILES_${PN} += "${datadir}/doc/cups/images \ + ${datadir}/doc/cups/*html \ + ${datadir}/doc/cups/*.css \ + ${datadir}/icons/ \ + " + + + + -- cgit v1.2.3 From a52d027772bf6d0dd30b6731dfb375d3c5c29929 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 6 Apr 2007 15:01:37 +0000 Subject: linux-smdk2440_2.6.20+git : add a new version updated to 2.6.21-rc6+asoc remove older versions that are in various states of disrepair. --- .../linux/linux-smdk2440-2.6.19/.mtn2git_empty | 0 .../smdk2440-touchscreen-r2.patch | 532 --------------------- .../linux/linux-smdk2440-2.6.20+git/.mtn2git_empty | 0 ...cs8900A-network-device-for-smdk2440-board.patch | 92 ++++ packages/linux/linux-smdk2440/defconfig-smdk2440 | 203 +++++--- .../linux-smdk2440/smdk2440-touchscreen-r3.patch | 529 -------------------- packages/linux/linux-smdk2440_2.6.19.bb | 39 -- packages/linux/linux-smdk2440_2.6.20+git.bb | 38 ++ 8 files changed, 258 insertions(+), 1175 deletions(-) delete mode 100644 packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty delete mode 100644 packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch create mode 100644 packages/linux/linux-smdk2440-2.6.20+git/.mtn2git_empty create mode 100644 packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch delete mode 100644 packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch delete mode 100644 packages/linux/linux-smdk2440_2.6.19.bb create mode 100644 packages/linux/linux-smdk2440_2.6.20+git.bb (limited to 'packages') diff --git a/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty b/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch b/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch deleted file mode 100644 index d785cb885f..0000000000 --- a/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch +++ /dev/null @@ -1,532 +0,0 @@ -Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -=================================================================== ---- /dev/null -+++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -@@ -0,0 +1,351 @@ -+/* -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * Copyright (c) 2004 Arnaud Patard -+ * iPAQ H1940 touchscreen support -+ * -+ * ChangeLog -+ * -+ * 2004-09-05: Herbert Pötzl -+ * - added clock (de-)allocation code -+ * -+ * 2005-03-06: Arnaud Patard -+ * - h1940_ -> s3c2410 (this driver is now also used on the n30 -+ * machines :P) -+ * - Debug messages are now enabled with the config option -+ * TOUCHSCREEN_S3C2410_DEBUG -+ * - Changed the way the value are read -+ * - Input subsystem should now work -+ * - Use ioremap and readl/writel -+ * -+ * 2005-03-23: Arnaud Patard -+ * - Make use of some undocumented features of the touchscreen -+ * controller -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+/* For ts.dev.id.version */ -+#define S3C2410TSVERSION 0x0101 -+ -+#define WAIT4INT(x) (((x)<<8) | \ -+ S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_XY_PST(3)) -+ -+#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0)) -+ -+#define DEBUG_LVL KERN_DEBUG -+ -+MODULE_AUTHOR("Arnaud Patard "); -+MODULE_DESCRIPTION("s3c2410 touchscreen driver"); -+MODULE_LICENSE("GPL"); -+ -+/* -+ * Definitions & global arrays. -+ */ -+ -+ -+static char *s3c2410ts_name = "s3c2410 TouchScreen"; -+ -+/* -+ * Per-touchscreen data. -+ */ -+ -+struct s3c2410ts { -+ struct input_dev *dev; -+ long xp; -+ long yp; -+ int count; -+ int shift; -+}; -+ -+static struct s3c2410ts ts; -+static void __iomem *base_addr; -+ -+static inline void s3c2410_ts_connect(void) -+{ -+ s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON); -+} -+ -+static void touch_timer_fire(unsigned long data) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ if (updown) { -+ if (ts.count != 0) { -+ ts.xp >>= ts.shift; -+ ts.yp >>= ts.shift; -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ { -+ struct timeval tv; -+ do_gettimeofday(&tv); -+ printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp); -+ } -+#endif -+ -+ input_report_abs(ts.dev, ABS_Y, ts.xp); -+ input_report_abs(ts.dev, ABS_X, ts.yp); -+ -+ input_report_key(ts.dev, BTN_TOUCH, 1); -+ input_report_abs(ts.dev, ABS_PRESSURE, 1); -+ input_sync(ts.dev); -+ } -+ -+ ts.count = 0; -+ -+ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); -+ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); -+ } else { -+ ts.count = 0; -+ -+ input_report_abs(ts.dev, ABS_Y, ts.xp); -+ input_report_abs(ts.dev, ABS_X, ts.yp); -+ -+ input_report_key(ts.dev, BTN_TOUCH, 0); -+ input_report_abs(ts.dev, ABS_PRESSURE, 0); -+ input_sync(ts.dev); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ } -+} -+ -+static struct timer_list touch_timer = -+ TIMER_INITIALIZER(touch_timer_fire, 0, 0); -+ -+static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ /* TODO we should never get an interrupt with updown set while -+ * the timer is running, but maybe we ought to verify that the -+ * timer isn't running anyways. */ -+ -+ if (updown) -+ touch_timer_fire(0); -+ -+ return IRQ_HANDLED; -+} -+ -+ -+static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK; -+ ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK; -+ ts.count++; -+ -+ if (ts.count < (1<dev.platform_data; -+ -+ if (!info) -+ { -+ printk(KERN_ERR "Hm... too bad : no platform data for ts\n"); -+ return -EINVAL; -+ } -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "Entering s3c2410ts_init\n"); -+#endif -+ -+ adc_clock = clk_get(NULL, "adc"); -+ if (!adc_clock) { -+ printk(KERN_ERR "failed to get adc clock source\n"); -+ return -ENOENT; -+ } -+ clk_enable(adc_clock); -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "got and enabled clock\n"); -+#endif -+ -+ base_addr=ioremap(S3C2410_PA_ADC,0x20); -+ if (base_addr == NULL) { -+ printk(KERN_ERR "Failed to remap register block\n"); -+ return -ENOMEM; -+ } -+ -+ -+ /* Configure GPIOs */ -+ s3c2410_ts_connect(); -+ -+ if ((info->presc&0xff) > 0) -+ writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\ -+ base_addr+S3C2410_ADCCON); -+ else -+ writel(0,base_addr+S3C2410_ADCCON); -+ -+ -+ /* Initialise registers */ -+ if ((info->delay&0xffff) > 0) -+ writel(info->delay & 0xffff, base_addr+S3C2410_ADCDLY); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ -+ /* Initialise input stuff */ -+ memset(&ts, 0, sizeof(struct s3c2410ts)); -+ input_dev = input_allocate_device(); -+ -+ if (!input_dev) { -+ printk(KERN_ERR "Unable to allocate the input device !!\n"); -+ return -ENOMEM; -+ } -+ -+ ts.dev = input_dev; -+ ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS); -+ ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); -+ input_set_abs_params(ts.dev, ABS_X, 0x10, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_Y, 0x10, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); -+ -+ ts.dev->private = &ts; -+ ts.dev->name = s3c2410ts_name; -+ ts.dev->id.bustype = BUS_RS232; -+ ts.dev->id.vendor = 0xDEAD; -+ ts.dev->id.product = 0xBEEF; -+ ts.dev->id.version = S3C2410TSVERSION; -+ -+ ts.shift = info->oversampling_shift; -+ -+ /* Get irqs */ -+ if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ -+ printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name); -+ -+ /* All went ok, so register to the input system */ -+ input_register_device(ts.dev); -+ -+ return 0; -+} -+ -+static int s3c2410ts_remove(struct platform_device *pdev) -+{ -+ disable_irq(IRQ_ADC); -+ disable_irq(IRQ_TC); -+ free_irq(IRQ_TC,ts.dev); -+ free_irq(IRQ_ADC,ts.dev); -+ -+ if (adc_clock) { -+ clk_disable(adc_clock); -+ clk_put(adc_clock); -+ adc_clock = NULL; -+ } -+ -+ input_unregister_device(ts.dev); -+ iounmap(base_addr); -+ -+ return 0; -+} -+ -+static struct platform_driver s3c2410ts_driver = { -+ .driver = { -+ .name = "s3c2410-ts", -+ .owner = THIS_MODULE, -+ }, -+ .probe = s3c2410ts_probe, -+ .remove = s3c2410ts_remove, -+}; -+ -+ -+static int __init s3c2410ts_init(void) -+{ -+ return platform_driver_register(&s3c2410ts_driver); -+} -+ -+static void __exit s3c2410ts_exit(void) -+{ -+ platform_driver_unregister(&s3c2410ts_driver); -+} -+ -+module_init(s3c2410ts_init); -+module_exit(s3c2410ts_exit); -+ -+/* -+ Local variables: -+ compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." -+ c-basic-offset: 8 -+ End: -+*/ -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c -@@ -28,6 +28,7 @@ - #include - - #include -+#include - - #include "devs.h" - #include "cpu.h" -@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand = - - EXPORT_SYMBOL(s3c_device_nand); - -+/* Touchscreen */ -+struct platform_device s3c_device_ts = { -+ .name = "s3c2410-ts", -+ .id = -1, -+}; -+ -+EXPORT_SYMBOL(s3c_device_ts); -+ -+static struct s3c2410_ts_mach_info s3c2410ts_info; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) -+{ -+ memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info)); -+ s3c_device_ts.dev.platform_data = &s3c2410ts_info; -+} -+EXPORT_SYMBOL(set_s3c2410ts_info); -+ - /* USB Device (Gadget)*/ - - static struct resource s3c_usbgadget_resource[] = { -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h -@@ -41,6 +41,8 @@ extern struct platform_device s3c_device - extern struct platform_device s3c_device_timer3; - - extern struct platform_device s3c_device_usbgadget; -+extern struct platform_device s3c_device_ts; -+ - - /* s3c2440 specific devices */ - -Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -@@ -38,6 +38,7 @@ - - #include - #include -+#include - - #include "s3c2410.h" - #include "s3c2440.h" -@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_ - &s3c_device_wdt, - &s3c_device_i2c, - &s3c_device_iis, -+ &s3c_device_ts, - }; - - static struct s3c24xx_board smdk2440_board __initdata = { -@@ -184,6 +186,13 @@ static struct s3c24xx_board smdk2440_boa - .devices_count = ARRAY_SIZE(smdk2440_devices) - }; - -+static struct s3c2410_ts_mach_info smdk2440_ts_cfg __initdata = { -+ .delay = 10000, -+ .presc = 49, -+ .oversampling_shift = 2, -+}; -+ -+ - static void __init smdk2440_map_io(void) - { - s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); -@@ -195,6 +204,7 @@ static void __init smdk2440_map_io(void) - static void __init smdk2440_machine_init(void) - { - s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg); -+ set_s3c2410ts_info(&smdk2440_ts_cfg); - - smdk_machine_init(); - } -Index: linux-2.6.19/drivers/input/touchscreen/Kconfig -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig -+++ linux-2.6.19/drivers/input/touchscreen/Kconfig -@@ -49,6 +49,25 @@ config TOUCHSCREEN_CORGI - To compile this driver as a module, choose M here: the - module will be called corgi_ts. - -+config TOUCHSCREEN_S3C2410 -+ tristate "Samsung S3C2410 touchscreen input driver" -+ depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN -+ select SERIO -+ help -+ Say Y here if you have the s3c2410 touchscreen. -+ -+ If unsure, say N. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called s3c2410_ts. -+ -+config TOUCHSCREEN_S3C2410_DEBUG -+ boolean "Samsung S3C2410 touchscreen debug messages" -+ depends on TOUCHSCREEN_S3C2410 -+ help -+ Select this if you want debug messages -+ -+ - config TOUCHSCREEN_GUNZE - tristate "Gunze AHL-51S touchscreen" - select SERIO -Index: linux-2.6.19/drivers/input/touchscreen/Makefile -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Makefile -+++ linux-2.6.19/drivers/input/touchscreen/Makefile -@@ -15,3 +15,4 @@ obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680 - obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o -+obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -=================================================================== ---- /dev/null -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -@@ -0,0 +1,28 @@ -+/* linux/include/asm/arch-s3c2410/ts.h -+ * -+ * Copyright (c) 2005 Arnaud Patard -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ * -+ * Changelog: -+ * 24-Mar-2005 RTP Created file -+ * 03-Aug-2005 RTP Renamed to ts.h -+ */ -+ -+#ifndef __ASM_ARM_TS_H -+#define __ASM_ARM_TS_H -+ -+struct s3c2410_ts_mach_info { -+ int delay; -+ int presc; -+ int oversampling_shift; -+}; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info); -+ -+#endif /* __ASM_ARM_TS_H */ -+ -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -=================================================================== ---- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -@@ -41,7 +41,7 @@ - #define S3C2410_ADCTSC_XP_SEN (1<<4) - #define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) - #define S3C2410_ADCTSC_AUTO_PST (1<<2) --#define S3C2410_ADCTSC_XY_PST (0x3<<0) -+#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0) - - /* ADCDAT0 Bits */ - #define S3C2410_ADCDAT0_UPDOWN (1<<15) diff --git a/packages/linux/linux-smdk2440-2.6.20+git/.mtn2git_empty b/packages/linux/linux-smdk2440-2.6.20+git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch b/packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch new file mode 100644 index 0000000000..bf8a0081dd --- /dev/null +++ b/packages/linux/linux-smdk2440-2.6.20+git/0001-Enable-cs8900A-network-device-for-smdk2440-board.patch @@ -0,0 +1,92 @@ +From 44c48cf15a3072185ce3541a127a89bfbb2b346f Mon Sep 17 00:00:00 2001 +From: Graeme Gregory +Date: Fri, 6 Apr 2007 15:47:13 +0100 +Subject: [PATCH] Enable cs8900A network device for smdk2440 board. + +Signed-off-by: Graeme Gregory +--- + arch/arm/mach-s3c2440/mach-smdk2440.c | 7 ++++++- + drivers/net/cs89x0.c | 20 ++++++++++++++++++-- + 2 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c +index c17eb5b..fb36665 100644 +--- a/arch/arm/mach-s3c2440/mach-smdk2440.c ++++ b/arch/arm/mach-s3c2440/mach-smdk2440.c +@@ -69,7 +69,12 @@ static struct map_desc smdk2440_iodesc[] __initdata = { + .pfn = __phys_to_pfn(S3C2410_CS2 + (1<<24)), + .length = SZ_4M, + .type = MT_DEVICE, +- } ++ }, { ++ .virtual = (u32)S3C2410_ADDR(0x04000000) , ++ .pfn = __phys_to_pfn(S3C2410_CS3 + (1<<24)), ++ .length = SZ_16M, ++ .type = MT_DEVICE, ++ } + }; + + #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK +diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c +index 4612f71..534653e 100644 +--- a/drivers/net/cs89x0.c ++++ b/drivers/net/cs89x0.c +@@ -187,6 +187,10 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; + #include + static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; + static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; ++#elif defined(CONFIG_ARCH_S3C2440) ++static unsigned int netcard_portlist[] __initdata = {S3C2410_ADDR(0x04000000) + 0x300 , 0}; ++static unsigned int cs8900_irq_map[] = {IRQ_EINT9, 0, 0, 0}; ++static unsigned char cs8900_mac[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02}; + #elif defined(CONFIG_ARCH_PNX010X) + #include + #include +@@ -719,6 +723,14 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) + + printk( "[Cirrus EEPROM] "); + } ++#if defined(CONFIG_ARCH_S3C2440) ++ else ++ { ++ for (i=0; i < ETH_ALEN; i++) { ++ dev->dev_addr[i] = cs8900_mac[i]; ++ } ++ } ++#endif + + printk("\n"); + +@@ -802,7 +814,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) + } else { + i = lp->isa_config & INT_NO_MASK; + if (lp->chip_type == CS8900) { +-#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) ++#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) || defined(CONFIG_ARCH_S3C2410) + i = cs8900_irq_map[0]; + #else + /* Translate the IRQ using the IRQ mapping table. */ +@@ -1309,7 +1321,7 @@ net_open(struct net_device *dev) + else + #endif + { +-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) ++#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_ARCH_S3C2410) + if (((1 << dev->irq) & lp->irq_map) == 0) { + printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", + dev->name, dev->irq, lp->irq_map); +@@ -1324,7 +1336,11 @@ net_open(struct net_device *dev) + writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); + #endif + write_irq(dev, lp->chip_type, dev->irq); ++#if !defined(CONFIG_ARCH_S3C2440) + ret = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev); ++#else ++ ret = request_irq(dev->irq, &net_interrupt, IRQF_DISABLED | IRQF_TRIGGER_HIGH, dev->name, dev); ++#endif + if (ret) { + if (net_debug) + printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); +-- +1.5.1 + diff --git a/packages/linux/linux-smdk2440/defconfig-smdk2440 b/packages/linux/linux-smdk2440/defconfig-smdk2440 index 5bdf67e850..8805af7413 100644 --- a/packages/linux/linux-smdk2440/defconfig-smdk2440 +++ b/packages/linux/linux-smdk2440/defconfig-smdk2440 @@ -1,11 +1,14 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc2 -# Thu Jan 4 13:31:25 2007 +# Linux kernel version: 2.6.21-rc6 +# Fri Apr 6 15:53:13 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_NO_IOPORT=y CONFIG_GENERIC_HARDIRQS=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y @@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -33,6 +37,7 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set @@ -41,6 +46,7 @@ CONFIG_SYSVIPC=y # CONFIG_IKCONFIG is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y @@ -120,6 +126,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -128,55 +135,73 @@ CONFIG_ARCH_S3C2410=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set +CONFIG_PLAT_S3C24XX=y +CONFIG_CPU_S3C244X=y +CONFIG_PM_SIMTEC=y +# CONFIG_S3C2410_BOOT_WATCHDOG is not set +# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C2410_PM_CHECK is not set +CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 +CONFIG_S3C2410_DMA=y +CONFIG_S3C2410_DMA_DEBUG=y +CONFIG_MACH_SMDK=y # -# S3C24XX Implementations +# S3C2400 Machines # -# CONFIG_MACH_AML_M5900 is not set -CONFIG_MACH_ANUBIS=y -CONFIG_MACH_OSIRIS=y -CONFIG_ARCH_BAST=y -CONFIG_BAST_PC104_IRQ=y -CONFIG_PM_H1940=y +CONFIG_CPU_S3C2410=y +CONFIG_CPU_S3C2410_DMA=y +CONFIG_S3C2410_PM=y +CONFIG_S3C2410_GPIO=y +CONFIG_S3C2410_CLOCK=y + +# +# S3C2410 Machines +# +CONFIG_ARCH_SMDK2410=y CONFIG_ARCH_H1940=y +CONFIG_PM_H1940=y CONFIG_MACH_N30=y -CONFIG_MACH_SMDK=y -CONFIG_ARCH_SMDK2410=y -CONFIG_ARCH_S3C2440=y -CONFIG_SMDK2440_CPU2440=y -CONFIG_SMDK2440_CPU2442=y -CONFIG_MACH_S3C2413=y -CONFIG_MACH_SMDK2413=y -CONFIG_MACH_VR1000=y -CONFIG_MACH_RX3715=y +CONFIG_ARCH_BAST=y CONFIG_MACH_OTOM=y -CONFIG_MACH_NEXCODER_2440=y -# CONFIG_MACH_VSTMS is not set -CONFIG_S3C2410_CLOCK=y -CONFIG_S3C2410_PM=y -CONFIG_CPU_S3C2410_DMA=y -CONFIG_CPU_S3C2410=y -CONFIG_S3C2412_PM=y +# CONFIG_MACH_AML_M5900 is not set +CONFIG_BAST_PC104_IRQ=y +CONFIG_MACH_VR1000=y +# CONFIG_MACH_QT2410 is not set CONFIG_CPU_S3C2412=y -CONFIG_CPU_S3C244X=y +CONFIG_S3C2412_DMA=y +CONFIG_S3C2412_PM=y + +# +# S3C2412 Machines +# +CONFIG_MACH_SMDK2413=y +CONFIG_MACH_S3C2413=y +# CONFIG_MACH_VSTMS is not set CONFIG_CPU_S3C2440=y +CONFIG_S3C2440_DMA=y + +# +# S3C2440 Machines +# +CONFIG_MACH_ANUBIS=y +CONFIG_MACH_OSIRIS=y +CONFIG_MACH_RX3715=y +CONFIG_ARCH_S3C2440=y +CONFIG_MACH_NEXCODER_2440=y +CONFIG_SMDK2440_CPU2440=y CONFIG_CPU_S3C2442=y # -# S3C2410 Boot +# S3C2442 Machines # -# CONFIG_S3C2410_BOOT_WATCHDOG is not set -# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +CONFIG_SMDK2440_CPU2442=y # -# S3C2410 Setup +# S3C2443 Machines # -CONFIG_S3C2410_DMA=y -CONFIG_S3C2410_DMA_DEBUG=y -# CONFIG_S3C2410_PM_DEBUG is not set -# CONFIG_S3C2410_PM_CHECK is not set -CONFIG_PM_SIMTEC=y -CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 +# CONFIG_MACH_SMDK2443 is not set # # Processor Type @@ -203,6 +228,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set # # Bus support @@ -232,6 +258,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 CONFIG_ALIGNMENT_TRAP=y # @@ -241,6 +268,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="root=/dev/nfs ip=auto rw init=/bin/bash console=ttySAC0" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -268,7 +296,7 @@ CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=y +# CONFIG_APM_EMULATION is not set # # Networking @@ -284,6 +312,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -368,6 +397,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # @@ -393,6 +423,7 @@ CONFIG_MTD_CMDLINE_PARTS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -486,6 +517,7 @@ CONFIG_PARPORT_1284=y # Plug and Play support # # CONFIG_PNP is not set +# CONFIG_PNPACPI is not set # # Block devices @@ -499,7 +531,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m @@ -528,7 +559,6 @@ CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_IDE_BAST=y # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # @@ -665,6 +695,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set @@ -675,8 +706,6 @@ CONFIG_MOUSE_PS2=y # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set -CONFIG_TOUCHSCREEN_S3C2410=y -# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -844,12 +873,13 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BITBANG=y # CONFIG_SPI_BUTTERFLY is not set -CONFIG_SPI_S3C24XX_GPIO=y # CONFIG_SPI_S3C24XX is not set +CONFIG_SPI_S3C24XX_GPIO=y # # SPI Protocol Masters # +# CONFIG_SPI_AT25 is not set # # Dallas's 1-wire bus @@ -865,6 +895,7 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set @@ -906,7 +937,11 @@ CONFIG_SENSORS_LM85=m # # Misc devices # -# CONFIG_TIFM_CORE is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set # # LED devices @@ -935,8 +970,26 @@ CONFIG_SENSORS_LM85=m # # Graphics support # +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_FB=y CONFIG_FIRMWARE_EDID=y -# CONFIG_FB is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frambuffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_S3C2410=y +# CONFIG_FB_S3C2410_DEBUG is not set +# CONFIG_FB_VIRTUAL is not set # # Console display driver support @@ -944,7 +997,19 @@ CONFIG_FIRMWARE_EDID=y # CONFIG_VGA_CONSOLE is not set # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y # # Sound @@ -978,6 +1043,7 @@ CONFIG_SND_DEBUG_DETECT=y # CONFIG_SND_MTS64 is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set +# CONFIG_SND_PORTMAN2X4 is not set # # ALSA ARM devices @@ -989,16 +1055,12 @@ CONFIG_SND_DEBUG_DETECT=y # CONFIG_SND_USB_AUDIO is not set # -# SoC audio support +# System on Chip audio support # CONFIG_SND_SOC=m # -# Soc Platforms -# - -# -# SoC Audio for the Intel PXA2xx +# SoC Platforms # # @@ -1006,7 +1068,7 @@ CONFIG_SND_SOC=m # # -# SoC Audio for the Freescale i.MX +# SoC Audio for the Intel PXA2xx # # @@ -1015,26 +1077,12 @@ CONFIG_SND_SOC=m CONFIG_SND_S3C24XX_SOC=m CONFIG_SND_S3C24XX_SOC_I2S=m CONFIG_SND_S3C24XX_SOC_SMDK2440=m +# CONFIG_SND_S3C24XX_SOC_SMDK2440_WM8956 is not set # -# Soc Codecs -# -# CONFIG_SND_SOC_AC97_CODEC is not set -CONFIG_SND_SOC_WM8711=m -CONFIG_SND_SOC_WM8510=m -CONFIG_SND_SOC_WM8731=m -CONFIG_SND_SOC_WM8750=m -CONFIG_SND_SOC_WM8753=m -CONFIG_SND_SOC_WM8772=m -CONFIG_SND_SOC_WM8971=m -# CONFIG_SND_SOC_WM8956 is not set -# CONFIG_SND_SOC_WM8976 is not set -CONFIG_SND_SOC_WM8974=m -CONFIG_SND_SOC_WM8980=m -# CONFIG_SND_SOC_WM9713 is not set -# CONFIG_SND_SOC_WM9712 is not set +# SoC Audio for the Freescale i.MX +# CONFIG_SND_SOC_UDA1380=m -CONFIG_SND_SOC_AK4535=m # # Open Sound System @@ -1045,6 +1093,7 @@ CONFIG_SND_SOC_AK4535=m # HID Devices # CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # # USB support @@ -1059,10 +1108,8 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set -# CONFIG_USB_MULTITHREAD_PROBE is not set # CONFIG_USB_OTG is not set # @@ -1070,7 +1117,8 @@ CONFIG_USB_DEVICEFS=y # # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set @@ -1093,7 +1141,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HID_POWERBOOK is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set # CONFIG_USB_AIPTEK is not set @@ -1108,6 +1156,7 @@ CONFIG_USB_HID=y # CONFIG_USB_ATI_REMOTE2 is not set # CONFIG_USB_KEYSPAN_REMOTE is not set # CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set # # USB Imaging devices @@ -1145,6 +1194,7 @@ CONFIG_USB_MON=y # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set @@ -1154,6 +1204,7 @@ CONFIG_USB_MON=y # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1368,15 +1419,16 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set CONFIG_LOG_BUF_SHIFT=16 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -1387,6 +1439,7 @@ CONFIG_DEBUG_INFO=y CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_DEBUG_USER=y # CONFIG_DEBUG_ERRORS is not set CONFIG_DEBUG_LL=y @@ -1416,4 +1469,4 @@ CONFIG_CRC32=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y diff --git a/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch b/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch deleted file mode 100644 index d03fd94017..0000000000 --- a/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch +++ /dev/null @@ -1,529 +0,0 @@ -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - -@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand = - - EXPORT_SYMBOL(s3c_device_nand); - -+/* Touchscreen */ -+struct platform_device s3c_device_ts = { -+ .name = "s3c2410-ts", -+ .id = -1, -+}; -+ -+EXPORT_SYMBOL(s3c_device_ts); -+ -+static struct s3c2410_ts_mach_info s3c2410ts_info; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info) -+{ -+ memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info)); -+ s3c_device_ts.dev.platform_data = &s3c2410ts_info; -+} -+EXPORT_SYMBOL(set_s3c2410ts_info); -+ - /* USB Device (Gadget)*/ - - static struct resource s3c_usbgadget_resource[] = { -Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h -+++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h -@@ -41,6 +41,7 @@ extern struct platform_device s3c_device - extern struct platform_device s3c_device_timer3; - - extern struct platform_device s3c_device_usbgadget; -+extern struct platform_device s3c_device_ts; - - /* s3c2440 specific devices */ - -Index: linux-2.6.19/drivers/input/touchscreen/Kconfig -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig -+++ linux-2.6.19/drivers/input/touchscreen/Kconfig -@@ -49,6 +49,24 @@ config TOUCHSCREEN_CORGI - To compile this driver as a module, choose M here: the - module will be called corgi_ts. - -+config TOUCHSCREEN_S3C2410 -+ tristate "Samsung S3C2410 touchscreen input driver" -+ depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN -+ select SERIO -+ help -+ Say Y here if you have the s3c2410 touchscreen. -+ -+ If unsure, say N. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called s3c2410_ts. -+ -+config TOUCHSCREEN_S3C2410_DEBUG -+ boolean "Samsung S3C2410 touchscreen debug messages" -+ depends on TOUCHSCREEN_S3C2410 -+ help -+ Select this if you want debug messages -+ - config TOUCHSCREEN_GUNZE - tristate "Gunze AHL-51S touchscreen" - select SERIO -Index: linux-2.6.19/drivers/input/touchscreen/Makefile -=================================================================== ---- linux-2.6.19.orig/drivers/input/touchscreen/Makefile -+++ linux-2.6.19/drivers/input/touchscreen/Makefile -@@ -15,3 +15,5 @@ obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680 - obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o - obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o -+obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o -+ -Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -=================================================================== ---- /dev/null -+++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c -@@ -0,0 +1,350 @@ -+/* -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * Copyright (c) 2004 Arnaud Patard -+ * iPAQ H1940 touchscreen support -+ * -+ * ChangeLog -+ * -+ * 2004-09-05: Herbert Pötzl -+ * - added clock (de-)allocation code -+ * -+ * 2005-03-06: Arnaud Patard -+ * - h1940_ -> s3c2410 (this driver is now also used on the n30 -+ * machines :P) -+ * - Debug messages are now enabled with the config option -+ * TOUCHSCREEN_S3C2410_DEBUG -+ * - Changed the way the value are read -+ * - Input subsystem should now work -+ * - Use ioremap and readl/writel -+ * -+ * 2005-03-23: Arnaud Patard -+ * - Make use of some undocumented features of the touchscreen -+ * controller -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+/* For ts.dev.id.version */ -+#define S3C2410TSVERSION 0x0101 -+ -+#define WAIT4INT(x) (((x)<<8) | \ -+ S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_XY_PST(3)) -+ -+#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \ -+ S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0)) -+ -+#define DEBUG_LVL KERN_DEBUG -+ -+MODULE_AUTHOR("Arnaud Patard "); -+MODULE_DESCRIPTION("s3c2410 touchscreen driver"); -+MODULE_LICENSE("GPL"); -+ -+/* -+ * Definitions & global arrays. -+ */ -+ -+ -+static char *s3c2410ts_name = "s3c2410 TouchScreen"; -+ -+/* -+ * Per-touchscreen data. -+ */ -+ -+struct s3c2410ts { -+ struct input_dev *dev; -+ long xp; -+ long yp; -+ int count; -+ int shift; -+}; -+ -+static struct s3c2410ts ts; -+static void __iomem *base_addr; -+ -+static inline void s3c2410_ts_connect(void) -+{ -+ s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON); -+ s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON); -+} -+ -+static void touch_timer_fire(unsigned long data) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ if (updown) { -+ if (ts.count != 0) { -+ ts.xp >>= ts.shift; -+ ts.yp >>= ts.shift; -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ { -+ struct timeval tv; -+ do_gettimeofday(&tv); -+ printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp); -+ } -+#endif -+ -+ input_report_abs(ts.dev, ABS_X, ts.xp); -+ input_report_abs(ts.dev, ABS_Y, ts.yp); -+ -+ input_report_key(ts.dev, BTN_TOUCH, 1); -+ input_report_abs(ts.dev, ABS_PRESSURE, 1); -+ input_sync(ts.dev); -+ } -+ -+ ts.xp = 0; -+ ts.yp = 0; -+ ts.count = 0; -+ -+ writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC); -+ writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON); -+ } else { -+ ts.count = 0; -+ -+ input_report_key(ts.dev, BTN_TOUCH, 0); -+ input_report_abs(ts.dev, ABS_PRESSURE, 0); -+ input_sync(ts.dev); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ } -+} -+ -+static struct timer_list touch_timer = -+ TIMER_INITIALIZER(touch_timer_fire, 0, 0); -+ -+static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ int updown; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN)); -+ -+ /* TODO we should never get an interrupt with updown set while -+ * the timer is running, but maybe we ought to verify that the -+ * timer isn't running anyways. */ -+ -+ if (updown) -+ touch_timer_fire(0); -+ -+ return IRQ_HANDLED; -+} -+ -+ -+static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs) -+{ -+ unsigned long data0; -+ unsigned long data1; -+ -+ data0 = readl(base_addr+S3C2410_ADCDAT0); -+ data1 = readl(base_addr+S3C2410_ADCDAT1); -+ -+ ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK; -+ ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK; -+ ts.count++; -+ -+ if (ts.count < (1<dev.platform_data; -+ -+ if (!info) -+ { -+ printk(KERN_ERR "Hm... too bad : no platform data for ts\n"); -+ return -EINVAL; -+ } -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "Entering s3c2410ts_init\n"); -+#endif -+ -+ adc_clock = clk_get(NULL, "adc"); -+ if (!adc_clock) { -+ printk(KERN_ERR "failed to get adc clock source\n"); -+ return -ENOENT; -+ } -+ clk_enable(adc_clock); -+ -+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG -+ printk(DEBUG_LVL "got and enabled clock\n"); -+#endif -+ -+ base_addr=ioremap(S3C2410_PA_ADC,0x20); -+ if (base_addr == NULL) { -+ printk(KERN_ERR "Failed to remap register block\n"); -+ return -ENOMEM; -+ } -+ -+ -+ /* Configure GPIOs */ -+ s3c2410_ts_connect(); -+ -+ if ((info->presc&0xff) > 0) -+ writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\ -+ base_addr+S3C2410_ADCCON); -+ else -+ writel(0,base_addr+S3C2410_ADCCON); -+ -+ -+ /* Initialise registers */ -+ if ((info->delay&0xffff) > 0) -+ writel(info->delay & 0xffff, base_addr+S3C2410_ADCDLY); -+ -+ writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC); -+ -+ /* Initialise input stuff */ -+ memset(&ts, 0, sizeof(struct s3c2410ts)); -+ input_dev = input_allocate_device(); -+ -+ if (!input_dev) { -+ printk(KERN_ERR "Unable to allocate the input device !!\n"); -+ return -ENOMEM; -+ } -+ -+ ts.dev = input_dev; -+ ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS); -+ ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); -+ input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0); -+ input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); -+ -+ ts.dev->private = &ts; -+ ts.dev->name = s3c2410ts_name; -+ ts.dev->id.bustype = BUS_RS232; -+ ts.dev->id.vendor = 0xDEAD; -+ ts.dev->id.product = 0xBEEF; -+ ts.dev->id.version = S3C2410TSVERSION; -+ -+ ts.shift = info->oversampling_shift; -+ -+ /* Get irqs */ -+ if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM, -+ "s3c2410_action", ts.dev)) { -+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n"); -+ iounmap(base_addr); -+ return -EIO; -+ } -+ -+ printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name); -+ -+ /* All went ok, so register to the input system */ -+ input_register_device(ts.dev); -+ -+ return 0; -+} -+ -+static int s3c2410ts_remove(struct platform_device *pdev) -+{ -+ disable_irq(IRQ_ADC); -+ disable_irq(IRQ_TC); -+ free_irq(IRQ_TC,ts.dev); -+ free_irq(IRQ_ADC,ts.dev); -+ -+ if (adc_clock) { -+ clk_disable(adc_clock); -+ clk_put(adc_clock); -+ adc_clock = NULL; -+ } -+ -+ input_unregister_device(ts.dev); -+ iounmap(base_addr); -+ -+ return 0; -+} -+ -+static struct platform_driver s3c2410ts_driver = { -+ .driver = { -+ .name = "s3c2410-ts", -+ .owner = THIS_MODULE, -+ }, -+ .probe = s3c2410ts_probe, -+ .remove = s3c2410ts_remove, -+}; -+ -+ -+static int __init s3c2410ts_init(void) -+{ -+ return platform_driver_register(&s3c2410ts_driver); -+} -+ -+static void __exit s3c2410ts_exit(void) -+{ -+ platform_driver_unregister(&s3c2410ts_driver); -+} -+ -+module_init(s3c2410ts_init); -+module_exit(s3c2410ts_exit); -+ -+/* -+ Local variables: -+ compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." -+ c-basic-offset: 8 -+ End: -+*/ -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -=================================================================== ---- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h -@@ -41,7 +41,7 @@ - #define S3C2410_ADCTSC_XP_SEN (1<<4) - #define S3C2410_ADCTSC_PULL_UP_DISABLE (1<<3) - #define S3C2410_ADCTSC_AUTO_PST (1<<2) --#define S3C2410_ADCTSC_XY_PST (0x3<<0) -+#define S3C2410_ADCTSC_XY_PST(x) (((x)&0x3)<<0) - - /* ADCDAT0 Bits */ - #define S3C2410_ADCDAT0_UPDOWN (1<<15) -Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -=================================================================== ---- /dev/null -+++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h -@@ -0,0 +1,28 @@ -+/* linux/include/asm/arch-s3c2410/ts.h -+ * -+ * Copyright (c) 2005 Arnaud Patard -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ * -+ * Changelog: -+ * 24-Mar-2005 RTP Created file -+ * 03-Aug-2005 RTP Renamed to ts.h -+ */ -+ -+#ifndef __ASM_ARM_TS_H -+#define __ASM_ARM_TS_H -+ -+struct s3c2410_ts_mach_info { -+ int delay; -+ int presc; -+ int oversampling_shift; -+}; -+ -+void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info); -+ -+#endif /* __ASM_ARM_TS_H */ -+ -Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -=================================================================== ---- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c -+++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_ - &s3c_device_wdt, - &s3c_device_i2c, - &s3c_device_iis, -+ &s3c_device_ts, - }; - - static struct s3c24xx_board smdk2440_board __initdata = { -@@ -184,6 +186,12 @@ static struct s3c24xx_board smdk2440_boa - .devices_count = ARRAY_SIZE(smdk2440_devices) - }; - -+static struct s3c2410_ts_mach_info qt2410_ts_cfg = { -+ .delay = 10000, -+ .presc = 49, -+ .oversampling_shift = 2, -+}; -+ - static void __init smdk2440_map_io(void) - { - s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); -@@ -195,6 +203,7 @@ static void __init smdk2440_map_io(void) - static void __init smdk2440_machine_init(void) - { - s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg); -+ set_s3c2410ts_info(&qt2410_ts_cfg); - - smdk_machine_init(); - } diff --git a/packages/linux/linux-smdk2440_2.6.19.bb b/packages/linux/linux-smdk2440_2.6.19.bb deleted file mode 100644 index 6b839bddf8..0000000000 --- a/packages/linux/linux-smdk2440_2.6.19.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Linux Kernel for smdk2440 compatible machines" -SECTION = "kernel" -LICENSE = "GPL" -PR = "r1" - -GGSRC = "http://www.xora.org.uk/oe/patches/" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${GGSRC}smdk2440-cs89x0-r1.patch;patch=1 \ - file://smdk2440-touchscreen-r3.patch;patch=1 \ - http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.6.patch;patch=1 \ - file://defconfig-smdk2440" - -S = "${WORKDIR}/linux-${PV}" - -inherit kernel - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = "smdk2440" -KERNEL_IMAGETYPE = "zImage" - -do_configure() { - install ${WORKDIR}/defconfig-smdk2440 ${S}/.config - #oe_runmake s3c2410_defconfig - oe_runmake oldconfig -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin - ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib -} - -do_deploy[dirs] = "${S}" - -addtask deploy before do_package after do_install - diff --git a/packages/linux/linux-smdk2440_2.6.20+git.bb b/packages/linux/linux-smdk2440_2.6.20+git.bb new file mode 100644 index 0000000000..ea9cbfb91a --- /dev/null +++ b/packages/linux/linux-smdk2440_2.6.20+git.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Linux Kernel for smdk2440 compatible machines" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r1" + +GGSRC = "http://www.xora.org.uk/oe/patches/" + +SRC_URI = "git://opensource.wolfsonmicro.com/linux-2.6-asoc-ggdev;protocol=git;tag=asoc-merge-0002 \ + file://0001-Enable-cs8900A-network-device-for-smdk2440-board.patch;patch=1 \ + file://defconfig-smdk2440" + +S = "${WORKDIR}/git" + +inherit kernel + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "smdk2440" +KERNEL_IMAGETYPE = "zImage" + +do_configure() { + install ${WORKDIR}/defconfig-smdk2440 ${S}/.config + #oe_runmake s3c2410_defconfig + oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_package after do_install + +KERNEL_RELEASE = "2.6.21" -- cgit v1.2.3 From 1c4fbfdb0d2925e76d38914d6aac41838347ea3c Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 6 Apr 2007 15:06:43 +0000 Subject: mplayer-imageon-svn.patch : forgot to add this long ago --- packages/mplayer/files/mplayer-imageon-svn.patch | 366 +++++++++++++++++++++++ 1 file changed, 366 insertions(+) create mode 100644 packages/mplayer/files/mplayer-imageon-svn.patch (limited to 'packages') diff --git a/packages/mplayer/files/mplayer-imageon-svn.patch b/packages/mplayer/files/mplayer-imageon-svn.patch new file mode 100644 index 0000000000..c8bb8709cd --- /dev/null +++ b/packages/mplayer/files/mplayer-imageon-svn.patch @@ -0,0 +1,366 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: trunk/configure +=================================================================== +--- trunk.orig/configure ++++ trunk/configure +@@ -519,6 +519,7 @@ _svga=auto + _vesa=auto + _fbdev=auto + _w100=no ++_imageon=no + _dvb=auto + _dvbhead=auto + _dxr2=auto +@@ -820,6 +821,8 @@ for ac_option do + --disable-fbdev) _fbdev=no ;; + --enable-w100) _w100=yes ;; + --disable-w100) _w100=no ;; ++ --enable-imageon) _imageon=yes ;; ++ --disable-imageon) _imageon=no ;; + --enable-dvb) _dvb=yes ;; + --disable-dvb) _dvb=no ;; + --enable-dvbhead) _dvbhead=yes ;; +@@ -4329,6 +4332,18 @@ else + fi + echores "$_w100" + ++echocheck "ATI Imageon 100 (imageon)" ++if test "$_imageon" = yes ; then ++ _def_imageon='#define HAVE_IMAGEON 1' ++ _ld_imageon='-lw100' ++ _vosrc="$_vosrc vo_imageon.c" ++ _vomodules="imageon $_vomodules" ++else ++ _def_imageon='#undef HAVE_IMAGEON' ++ _novomodules="imageon $_novomodules" ++fi ++echores "$_imageon" ++ + + echocheck "DVB" + if test "$_dvb" = auto ; then +@@ -8355,6 +8370,7 @@ $_def_xmga + $_def_syncfb + $_def_fbdev + $_def_w100 ++$_def_imageon + $_def_dxr2 + $_def_dxr3 + $_def_ivtv +Index: trunk/libvo/vo_imageon.c +=================================================================== +--- /dev/null ++++ trunk/libvo/vo_imageon.c +@@ -0,0 +1,308 @@ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++static vo_info_t info = ++{ ++ "ATI IMAGEON 100 driver", ++ "imageon", ++ "Manuel Teira", ++ "C760-Openzaurus Testing version" ++}; ++ ++LIBVO_EXTERN(imageon) ++ ++#include ++ ++static struct w100privdata_t { ++ uint8_t config; ++ ac_device_t *dev; ++ uint16_t xres; ++ uint16_t yres; ++ uint16_t ovwidth; ++ uint16_t ovheight; ++ ac_surface_t insurface; ++ ac_surface_t ovsurface; ++ uint16_t srcwidth; ++ uint16_t srcheight; ++ uint8_t rotate; ++ uint8_t scale; ++ ac_point_t ovdst; ++ ac_point_t dstpos; ++ ac_overlayprops_t ovprops; ++ uint32_t format; ++} w100_privdata; ++ ++static int preinit(const char *arg) ++{ ++ //Perhaps libw100 should include some code to query the framebuffer ++ struct w100privdata_t *pdata = &w100_privdata; ++ ++ pdata->config = 0; ++ pdata->xres = 640; ++ pdata->yres = 480; ++ pdata->dev = ac_init(pdata->xres, pdata->yres, AC_ROT90); ++ if (pdata->dev) { ++ return 0; ++ } else { ++ //Put a log message here ++ return 1; ++ } ++} ++ ++ ++static void draw_osd(void) ++{ ++} ++ ++void check_events(void) ++{ ++ mp_msg(MSGT_VO, MSGL_V, "check_events got called\n"); ++} ++ ++static int config(uint32_t srcwidth, uint32_t srcheight, ++ uint32_t dstwidth, uint32_t dstheight, ++ uint32_t flags, char *title, uint32_t format) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ uint8_t xscale, yscale; ++ uint16_t scaledwidth, scaledheight; ++ ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: srcwidth:%d, srcheight:%d, " ++ "dstwidth:%d, dstheight:%d\n", ++ srcwidth, srcheight, dstwidth, dstheight); ++ ++ if (pdata->config) { ++ ac_overlay_disable(pdata->dev); ++ ac_free_surface(pdata->dev, &pdata->insurface); ++ ac_free_surface(pdata->dev, &pdata->ovsurface); ++ } ++ ++ pdata->srcwidth = srcwidth; ++ pdata->srcheight = srcheight; ++ ++ //By the moment, only YUV420 supported ++ pdata->ovprops.format = OVLFORMAT_YUV420; ++ pdata->ovprops.portrait_mode = 0; ++ pdata->ovprops.inv_hor = 0; ++ pdata->ovprops.inv_ver = 0; ++ pdata->ovprops.yuv2rgb = 0; ++ ++ pdata->rotate = AC_ROT90; ++ ++ if (flags & VOFLAG_FULLSCREEN) { ++ pdata->ovwidth = 240; ++ pdata->ovheight = 320; ++ xscale = ac_get_scaler(pdata->ovheight, srcwidth); ++ yscale = ac_get_scaler(pdata->ovwidth, srcheight); ++ pdata->scale = (xscale > yscale) ? xscale : yscale; ++ pdata->ovdst.x = 0; ++ pdata->ovdst.y = 0; ++ pdata->ovprops.video_hor_exp = 1; ++ pdata->ovprops.video_ver_exp = 1; ++ } else { ++ pdata->ovwidth = (dstheight + 0xf) & ~0xf; ++ pdata->ovheight = (dstwidth + 0xf) & ~0xf; ++ xscale = ac_get_scaler(dstwidth, srcwidth); ++ yscale = ac_get_scaler(dstheight, srcheight); ++ pdata->ovdst.x = (pdata->xres - pdata->ovheight) / 2; ++ pdata->ovdst.y = (pdata->yres - pdata->ovwidth) / 2; ++ pdata->ovprops.video_hor_exp = 0; ++ pdata->ovprops.video_ver_exp = 0; ++ } ++ ++ pdata->scale = (xscale > yscale) ? xscale : yscale; ++ scaledwidth = ac_apply_scaler(srcwidth, pdata->scale); ++ scaledheight = ac_apply_scaler(srcheight, pdata->scale); ++ pdata->dstpos.x = (pdata->ovwidth - scaledheight) / 2; ++ pdata->dstpos.y = (pdata->ovheight - scaledwidth) / 2; ++ ++ if (ac_alloc_surface(pdata->dev, &pdata->ovsurface, ++ FMT_YUV420, ++ pdata->ovwidth, ++ pdata->ovheight, ++ AC_MEM_INTERNAL) == NULL) { ++ mp_msg(MSGT_VO, MSGL_FATAL, "Unable to allocate ov surface\n"); ++ return -1; ++ } ++ ++ if (ac_alloc_surface(pdata->dev, &pdata->insurface, ++ FMT_YUV420, srcwidth, srcheight, ++ AC_MEM_INTERNAL) == NULL) { ++ mp_msg(MSGT_VO, MSGL_WARN, ++ "No room in internal memory for insurface\n"); ++ if (ac_alloc_surface(pdata->dev, &pdata->insurface, ++ FMT_YUV420, srcwidth, srcheight, ++ AC_MEM_EXTERNAL) == NULL) { ++ mp_msg(MSGT_VO, MSGL_FATAL, ++ "Unable to allocate surface\n"); ++ ac_free_surface(pdata->dev, &pdata->ovsurface); ++ return -1; ++ } ++ } ++ ++ ac_clear_surface(pdata->dev, &pdata->ovsurface); ++ ac_clear_surface(pdata->dev, &pdata->insurface); ++ ++ ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: rotate:%d scale:%d ovwidth:%d, ovheight:%d, " ++ "ovdst(x:%d, y:%d) dstpos(x:%d,y:%d)\n", ++ pdata->rotate, ++ pdata->scale, ++ pdata->ovwidth, ++ pdata->ovheight, ++ pdata->ovdst.x, ++ pdata->ovdst.y, ++ pdata->dstpos.x, ++ pdata->dstpos.y); ++ ++ ac_overlay_setup(pdata->dev, &pdata->ovsurface, &pdata->ovsurface.rect, ++ &pdata->ovprops, 0); ++ ac_overlay_setpos(pdata->dev, &pdata->ovdst); ++ ac_overlay_enable(pdata->dev); ++ ++ pdata->config = 1; ++ return 0; ++} ++ ++static int draw_slice(uint8_t *image[], int stride[], ++ int w, int h, int x, int y) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ ac_rect_t dstrect; ++ ac_surface_t *dstsurface = &pdata->insurface; ++ int plane; ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: draw_slice(w:%d,h:%d,x:%d,y:%d)\n", ++ w, h, x, y); ++ ++ ac_reset_ctx(pdata->dev); ++ for (plane = 0; plane <= V_PLANE; plane++) { ++ mp_msg(MSGT_VO, MSGL_V, "Plane: %d, Stride: %d\n", ++ plane, stride[plane]); ++ dstrect.x = x; ++ dstrect.y = y; ++ dstrect.w = w; ++ dstrect.h = h; ++ ac_host2planerect(pdata->dev, ++ image[plane], ++ &dstrect, ++ &pdata->insurface, ++ plane); ++ } ++ return 0; ++} ++ ++static int draw_frame(uint8_t *frame[]) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ mp_msg(MSGT_VO, MSGL_V, "vo_imageon: draw_frame() not implemented!\n"); ++ ++} ++ ++static void flip_page(void) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ int plane; ++ ac_rect_t srcrect; ++ ac_point_t dstpoint; ++ ac_surface_t *insurface = &pdata->insurface; ++ ac_surface_t *ovsurface = &pdata->ovsurface; ++ ac_surfspec_t *surfspec = &ac_surfspecs[ovsurface->format]; ++ ++ mp_msg(MSGT_VO, MSGL_V, "vo_imageon: flip_page\n"); ++ ++ srcrect.x = 0; ++ srcrect.y = 0; ++ ++ ac_reset_ctx(pdata->dev); ++ if (pdata->rotate != AC_ROT0) { ++ ac_set_xform(pdata->dev, pdata->rotate, AC_NOMIRROR); ++ } ++ ac_disable_dbuf_update(pdata->dev); ++ ac_waitidle(pdata->dev); ++ for (plane = Y_PLANE; plane < surfspec->nplanes; plane++) { ++ ac_setsrcplane(pdata->dev, insurface, plane); ++ ac_setdstplane(pdata->dev, ovsurface, plane); ++ ac_prepare_scaleblt(pdata->dev, DP_DST_8BPP); ++ srcrect.w = pdata->srcwidth / surfspec->planes[plane].xsubsampling; ++ srcrect.h = pdata->srcheight / surfspec->planes[plane].ysubsampling; ++ dstpoint.x = pdata->dstpos.x / surfspec->planes[plane].xsubsampling; ++ dstpoint.y = pdata->dstpos.y / surfspec->planes[plane].ysubsampling; ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: scaleblt src(x:%d,y:%d,w:%d,h:%d)" ++ "dst(%d,%d)" ++ "scale(%d)\n", ++ srcrect.x, srcrect.y, ++ srcrect.w, srcrect.h, ++ dstpoint.x, dstpoint.y, ++ pdata->scale); ++ ac_scaleblt(pdata->dev, &srcrect, &dstpoint, ++ pdata->scale, pdata->scale); ++ } ++ ac_enable_dbuf_update(pdata->dev); ++} ++ ++static void uninit(void) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ ac_overlay_disable(pdata->dev); ++ ac_finish(pdata->dev); ++} ++ ++static int control(uint32_t request, void *data, ...) ++{ ++ struct w100privdata_t *pdata = &w100_privdata; ++ switch (request) { ++ case VOCTRL_QUERY_FORMAT: ++ return query_format(*((uint32_t *)data)); ++ case VOCTRL_FULLSCREEN: ++ mp_msg(MSGT_VO, MSGL_V, "vo_imageon: Asked for fullscreen\n"); ++ } ++ return VO_NOTIMPL; ++} ++ ++static int query_format(uint32_t format) ++{ ++ mp_msg(MSGT_VO, MSGL_V, ++ "vo_imageon: query_format was called: %x (%s)\n", ++ format, vo_format_name(format)); ++ ++ if (IMGFMT_IS_RGB(format)) { ++ return 0; ++ ++ switch (IMGFMT_RGB_DEPTH(format)) { ++ case 16: ++ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | ++ VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | ++ VFCAP_OSD | VFCAP_ACCEPT_STRIDE; ++ break; ++ } ++ } else { ++ /* Planar YUV Formats */ ++ switch (format) { ++ case IMGFMT_YV12: ++ case IMGFMT_IYUV: ++ case IMGFMT_I420: ++ case IMGFMT_YVU9: ++ case IMGFMT_IF09: ++ case IMGFMT_Y8: ++ case IMGFMT_Y800: ++ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | ++ VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | ++ VFCAP_OSD | VFCAP_ACCEPT_STRIDE; ++ break; ++ } ++ } ++ ++ return 0; ++} ++ ++ -- cgit v1.2.3 From 242ff3fff6d90d3fe37f990884429f3e814ac637 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 6 Apr 2007 16:20:21 +0000 Subject: xserver-kdrive 1.2.0: Add patch to actually enable offscreen pixmap acceleration in Xw100. * Courtesy of Manuel Teira (sirfred). * Tested on hx4700. --- .../xserver-kdrive/w100-fix-offscreen-bmp.patch | 15 +++++++++++++++ packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch b/packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch new file mode 100644 index 0000000000..39bc22c6b3 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/w100-fix-offscreen-bmp.patch @@ -0,0 +1,15 @@ +Patch suggested by Manuel Teira to actually enable offscreen pixmap +acceleration in Xw100. Value 16 is empirical, works well on hx4700, +but in case of issues, consider double it (other accelerated drivers +use bigger values than 16). + +--- xorg-server-1.2.0/hw/kdrive/w100/ati_draw.c.org 2007-04-04 10:28:57.000000000 +0000 ++++ xorg-server-1.2.0/hw/kdrive/w100/ati_draw.c 2007-04-06 14:43:40.000000000 +0000 +@@ -433,6 +433,7 @@ + * or kaaPixmapUseScreen. But this is probably caused by some bug in this + * driver... */ + atis->kaa.flags |= KAA_OFFSCREEN_PIXMAPS; ++ atis->kaa.pitchAlign = 16; + if (!kaaDrawInit(pScreen, &atis->kaa)) + return FALSE; + diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index cb58eee8a3..2ba1b09923 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,12 +3,13 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r5" +PR = "r6" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://enable-xcalibrate.patch;patch=1 \ file://w100.patch;patch=1 \ + file://w100-fix-offscreen-bmp.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" -- cgit v1.2.3 From d469070e431a1a2cf79c4a6673cb262fe83243f5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 6 Apr 2007 16:27:32 +0000 Subject: xserver-kdrive: remove bogus PACKAGE_ARCH overrides for Palm machines. * They don't use any adhoc patches to require that. * TODO: do the same for poodle. --- packages/xorg-xserver/xserver-kdrive-common.inc | 3 --- 1 file changed, 3 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 8674a55e21..02df9d2d4e 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -107,9 +107,6 @@ KDRIVE_COMMON_PATCHES = " \ SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_palmtx = "palmtx" -PACKAGE_ARCH_palmld = "palmld" -PACKAGE_ARCH_palmz72 = "palmz72" inherit autotools pkgconfig -- cgit v1.2.3 From d17c01492d1eff9271134b0ee46ea8d110bdb8d3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 16:34:26 +0000 Subject: task-sdk: move non base stuff to task-sdk-extras to avoid building half of OE when inheriting debian.bbclass --- packages/tasks/task-sdk-extra.bb | 57 ++++++++++++++++++++++++++++++++++++++++ packages/tasks/task-sdk.bb | 51 +---------------------------------- 2 files changed, 58 insertions(+), 50 deletions(-) create mode 100644 packages/tasks/task-sdk-extra.bb (limited to 'packages') diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb new file mode 100644 index 0000000000..805974c9b5 --- /dev/null +++ b/packages/tasks/task-sdk-extra.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "SDK packages" +PR = "r7" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PACKAGES = "\ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe" + +RDEPENDS_task-sdk-x11 := "\ + atk-dev \ + cairo-dev \ + gconf-dbus-dev \ + gtk+-dev \ + gtk-engines-dev \ + libsvg-cairo-dev \ + libmatchbox-dev \ + matchbox-desktop-dev \ + pango-dev \ + startup-notification-dev" + +RDEPENDS_task-sdk-x11-ext := "\ + libxcursor-dev \ + libxdmcp-dev \ + libxft-dev \ + libxrandr-dev \ + libxrender-dev \ + libxsettings-client-dev \ + randrext-dev \ + resourceext-dev \ + libx11-dev \ + libxau-dev \ + libxcalibrate-dev \ + xcalibrateext-dev \ + libxcomposite-dev \ + libxdamage-dev \ + libxext-dev \ + xextproto-dev \ + libxfont-dev \ + libxpm-dev \ + xproto-dev \ + libxt-dev \ + xtrans-dev \ + libxtst-dev" + + +RDEPENDS_task-sdk-gpe := "\ + libcontactsdb-dev \ + esound-dev \ + libeventdb-dev \ + libgpepimc-dev \ + libgpevtype-dev \ + libgpelaunch-dev \ + libgpewidget-dev \ + libhandoff-dev" + diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index cc2ec0860e..ab64de941c 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -6,9 +6,7 @@ ALLOW_EMPTY = "1" PACKAGES = "\ task-sdk-bare \ task-sdk-base \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe" + " RDEPENDS_task-sdk-bare := "\ glibc \ @@ -23,50 +21,3 @@ RDEPENDS_task-sdk-base := "\ ipkg-dev \ " -RDEPENDS_task-sdk-x11 := "\ - atk-dev \ - cairo-dev \ - gconf-dbus-dev \ - gtk+-dev \ - gtk-engines-dev \ - libsvg-cairo-dev \ - libmatchbox-dev \ - matchbox-desktop-dev \ - pango-dev \ - startup-notification-dev" - -RDEPENDS_task-sdk-x11-ext := "\ - libxcursor-dev \ - libxdmcp-dev \ - libxft-dev \ - libxrandr-dev \ - libxrender-dev \ - libxsettings-client-dev \ - randrext-dev \ - resourceext-dev \ - libx11-dev \ - libxau-dev \ - libxcalibrate-dev \ - xcalibrateext-dev \ - libxcomposite-dev \ - libxdamage-dev \ - libxext-dev \ - xextproto-dev \ - libxfont-dev \ - libxpm-dev \ - xproto-dev \ - libxt-dev \ - xtrans-dev \ - libxtst-dev" - - -RDEPENDS_task-sdk-gpe := "\ - libcontactsdb-dev \ - esound-dev \ - libeventdb-dev \ - libgpepimc-dev \ - libgpevtype-dev \ - libgpelaunch-dev \ - libgpewidget-dev \ - libhandoff-dev" - -- cgit v1.2.3 From fdc7fdcb290bc46bc52e2b5b40c0cf1b9fcac8b1 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Fri, 6 Apr 2007 21:28:43 +0000 Subject: packages/gtk-webcore/osb-jscore_svn.bb * fix issue with missing create_hash_table script --- packages/gtk-webcore/osb-jscore_svn.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index eb65a9b2fc..25e42cd85c 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -35,5 +35,7 @@ do_stage () { install -d ${STAGING_INCDIR}/osb/JavaScriptCore for i in ${S}/kjs/*.h ${S}/kjs/new; do install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore + install -d ${STAGING_INCDIR}/../share/osb-jscore + install -m 0755 ${S}/kjs/create_hash_table ${STAGING_INCDIR}/../share/osb-jscore done } -- cgit v1.2.3 From a80e9ebf17143da2f5c5349e1615068ac2032df2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 7 Apr 2007 06:23:54 +0000 Subject: opie-bartender: fix minor spelling mistake --- packages/opie-bartender/opie-bartender.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/opie-bartender/opie-bartender.inc b/packages/opie-bartender/opie-bartender.inc index 633dcc0c91..5b020d5cfa 100644 --- a/packages/opie-bartender/opie-bartender.inc +++ b/packages/opie-bartender/opie-bartender.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "Bartender drink receipe database" +DESCRIPTION = "Bartender drink recipe database" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -- cgit v1.2.3 From a1e2de8b39314b604f84ae90cfe24b77043260c2 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 10:40:45 +0000 Subject: packages/gpe-gallery/gpe-gallery_svn.bb * new svn build recipe packages/gpe-gallery/files/svn-build.patch * patch needed for svn versions to build --- packages/gpe-gallery/files/svn-build.patch | 240 +++++++++++++++++++++++++++++ packages/gpe-gallery/gpe-gallery_svn.bb | 19 +++ 2 files changed, 259 insertions(+) create mode 100644 packages/gpe-gallery/files/svn-build.patch create mode 100644 packages/gpe-gallery/gpe-gallery_svn.bb (limited to 'packages') diff --git a/packages/gpe-gallery/files/svn-build.patch b/packages/gpe-gallery/files/svn-build.patch new file mode 100644 index 0000000000..5b6edf4893 --- /dev/null +++ b/packages/gpe-gallery/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-gallery.orig/Makefile 2007-04-07 13:34:54.581405005 +0300 ++++ gpe-gallery/Makefile 2007-04-07 13:35:03.589918369 +0300 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = gpe-gallery + DEBUG = no +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.97 + + MEMBERS = main image_tools +diff -Naur gpe-gallery.orig/build/Makefile.dpkg_ipkg gpe-gallery/build/Makefile.dpkg_ipkg +--- gpe-gallery.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-gallery/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-gallery.orig/build/Makefile.translation gpe-gallery/build/Makefile.translation +--- gpe-gallery.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-gallery/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s//$(MAINTAINER)/;s//$(BINPACKAGE)/;s//$(VERSION)/;s//$$i/;s!!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-gallery/gpe-gallery_svn.bb b/packages/gpe-gallery/gpe-gallery_svn.bb new file mode 100644 index 0000000000..863dfe5f93 --- /dev/null +++ b/packages/gpe-gallery/gpe-gallery_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GPE image viewer application" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget" +PV = "0.97+svn-${SRCDATE}" + +inherit autotools +export CVSBUILD = "no" + +SRC_URI += "${GPE_EXTRA_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +FILES_${PN} += "${datadir}/gpe/pixmaps" +FILES_${PN} += "${datadir}/application-registry" + + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 633a0fd4b30c857cd2250c9e842039b700b0d23e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 7 Apr 2007 11:07:13 +0000 Subject: qte, qte-mt 2.3.10: Elaborate "kernel keyboard" handler, make it default. * Details: 1. Added support for nicely named and extensible key bindings. E.g., in loadkeys do: keycode 155 = F100 string F100 = "power" where 155 is keycode a power button happens to have on your machine, F100 is arbitrary function key (please use F100-F120), and "power" is OPIE binding. Currently defined bindings are "power", "backlight", "record" 2. K_DO ("Do") keycode is mapped to OPIE power button by default. Kernel uses K_DO for KEY_POWER input subsystem keycode. So, if your device does the right thing, it will work out of the box. 3. Implemented NumLock handling for numeric keypad. * TODO: This shouldn't override QTE's standard TTY handler, instead should be separate, but default, handler. * TODO: Drop outdated adhoc device handlers in favor of this one. --- packages/qte/qte-2.3.10/kernel-keymap.patch | 110 ++++++++++++++++++++++------ packages/qte/qte-common_2.3.10.inc | 17 ++--- packages/qte/qte-mt_2.3.10.bb | 2 +- 3 files changed, 96 insertions(+), 33 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-2.3.10/kernel-keymap.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch index a17362ba87..0111c83b45 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap.patch +++ b/packages/qte/qte-2.3.10/kernel-keymap.patch @@ -1,8 +1,6 @@ -Index: src/kernel/kernelkeyboard.cpp -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ qte/src/kernel/kernelkeyboard.cpp 2006-04-01 23:42:35.154645456 +0200 -@@ -0,0 +1,701 @@ +--- /dev/null 2004-07-13 00:58:01.000000000 +0000 ++++ qte/src/kernel/kernelkeyboard.cpp 2007-04-07 01:00:36.000000000 +0000 +@@ -0,0 +1,769 @@ +/* + + Copyright (C) 2003 Chris Larson @@ -73,6 +71,22 @@ Index: src/kernel/kernelkeyboard.cpp + */ + +/* ++ Paul Sokolovsky, 2007-04: ++ ++ 1. Added support for nicely named and extensible key bindings. ++ E.g., in loadkeys do: ++ keycode 155 = F100 ++ string F100 = "power" ++ where 155 is keycode a power button happens to have on your machine, F100 is ++ arbitrary function key (please use F100-F120), and "power" is OPIE binding. ++ Currently defined bindings are "power", "backlight", "record" ++ 2. K_DO ("Do") keycode is mapped to OPIE power button by default. Kernel uses ++ K_DO for KEY_POWER input subsystem keycode. So, if your device does the right ++ thing, it will work out of the box. ++ 3. Implemented NumLock handling for numeric keypad. ++ */ ++ ++/* + This is an alternative implementation of the QWSTtyKeyboardHandler + of Trolltech's QtE. + @@ -179,6 +193,24 @@ Index: src/kernel/kernelkeyboard.cpp + return; +} + ++static Qt::Key getSpecialKey(int fKey) ++{ ++ struct kbsentry kbs; ++ kbs.kb_func = fKey; ++ ++ if (ioctl(kbdFD, KDGKBSENT, &kbs) != 0) ++ return Qt::Key_unknown; ++ const char *str = (const char *)kbs.kb_string; ++ ++ if (!strcmp("record", str)) ++ return Qt::Key_F24; ++ else if (!strcmp("power", str)) ++ return Qt::Key_F34; ++ else if (!strcmp("backlight", str)) ++ return Qt::Key_F35; ++ ++ return Qt::Key_unknown; ++} + +void QWSTtyKeyboardHandler::readKeyboardMap() +{ @@ -221,7 +253,12 @@ Index: src/kernel/kernelkeyboard.cpp + kernel_map[map][key] = KeyMap( static_cast( Qt::Key_F1 + kval ), kval ); + else if ( kval >= 30 && kval <= 44) + kernel_map[map][key] = KeyMap( static_cast( Qt::Key_F21 + (kval - 30) ), kval ); -+ else ++ else { ++ Qt::Key specialKey = getSpecialKey(kval); ++ if (specialKey != Qt::Key_unknown) { ++ kernel_map[map][key] = KeyMap( specialKey, kval ); ++ } ++ else + switch(kbe.kb_value ) { + case K_INSERT: + kernel_map[map][key] = KeyMap( Qt::Key_Insert, kval ); @@ -251,10 +288,13 @@ Index: src/kernel/kernelkeyboard.cpp + kernel_map[map][key] = KeyMap( Qt::Key_Home, kval ); + break; + case K_DO: ++ kernel_map[map][key] = KeyMap( Qt::Key_F34, kval ); ++ break; + default: + kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval ); + break; + } ++ } + break; + + case KT_SPEC: @@ -302,56 +342,58 @@ Index: src/kernel/kernelkeyboard.cpp + */ + switch(kbe.kb_value ) { + case K_P0: -+ kernel_map[map][key] = KeyMap( Qt::Key_0, 48 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_0, kbe.kb_value ); + break; + case K_P1: -+ kernel_map[map][key] = KeyMap( Qt::Key_1, 49 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_1, kbe.kb_value ); + break; + case K_P2: -+ kernel_map[map][key] = KeyMap( Qt::Key_2, 50 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_2, kbe.kb_value ); + break; + case K_P3: -+ kernel_map[map][key] = KeyMap( Qt::Key_3, 51 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_3, kbe.kb_value ); + break; + case K_P4: -+ kernel_map[map][key] = KeyMap( Qt::Key_4, 52 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_4, kbe.kb_value ); + break; + case K_P5: -+ kernel_map[map][key] = KeyMap( Qt::Key_5, 53 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_5, kbe.kb_value ); + break; + case K_P6: -+ kernel_map[map][key] = KeyMap( Qt::Key_6, 54 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_6, kbe.kb_value ); + break; + case K_P7: -+ kernel_map[map][key] = KeyMap( Qt::Key_7, 55 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_7, kbe.kb_value ); + break; + case K_P8: -+ kernel_map[map][key] = KeyMap( Qt::Key_8, 56 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_8, kbe.kb_value ); + break; + case K_P9: -+ kernel_map[map][key] = KeyMap( Qt::Key_9, 57 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_9, kbe.kb_value ); + break; + case K_PPLUS: -+ kernel_map[map][key] = KeyMap( Qt::Key_Plus, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_Plus, '+' ); + break; + case K_PMINUS: -+ kernel_map[map][key] = KeyMap( Qt::Key_Minus, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_Minus, '-' ); + break; + case K_PSTAR: -+ kernel_map[map][key] = KeyMap( Qt::Key_multiply, 42 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_multiply, '*' ); + break; + case K_PSLASH: -+ kernel_map[map][key] = KeyMap( Qt::Key_division, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_division, '/' ); + break; + case K_PENTER: + kernel_map[map][key] = KeyMap( Qt::Key_Enter, kval ); + break; + case K_PCOMMA: -+ kernel_map[map][key] = KeyMap( Qt::Key_Comma, kval ) ; ++ kernel_map[map][key] = KeyMap( Qt::Key_Comma, '.' ) ; + break; + case K_PPLUSMINUS: + kernel_map[map][key] = KeyMap( Qt::Key_plusminus, kval ); ++ break; + case K_PDOT: ++ kernel_map[map][key] = KeyMap( Qt::Key_Comma, '.' ) ; + break; + case K_PPARENL: + kernel_map[map][key] = KeyMap( Qt::Key_ParenLeft, kval ); @@ -511,6 +553,19 @@ Index: src/kernel/kernelkeyboard.cpp + } +} + ++static Qt::Key numpad2cursor[NR_PAD] = { ++ Qt::Key_Insert, ++ Qt::Key_End, ++ Qt::Key_Down, ++ Qt::Key_Next, ++ Qt::Key_Left, ++ Qt::Key_5, ++ Qt::Key_Right, ++ Qt::Key_Home, ++ Qt::Key_Up, ++ Qt::Key_Prior, ++}; ++ +void QWSTtyKeyboardHandler::handleKey(unsigned int code, bool release) +{ + int old_modifier = modifier; @@ -522,7 +577,9 @@ Index: src/kernel/kernelkeyboard.cpp + key_map = kernel_map[0][code]; + } + -+ unsigned short unicode = acm[key_map.code] & 0xff; ++ unsigned short unicode = 0xffff; ++ if (key_map.code < 0x100) ++ unicode = acm[key_map.code & 0xff] & 0xff; + unsigned int qtKeyCode = key_map.key; + +// if ( !release ) @@ -599,6 +656,15 @@ Index: src/kernel/kernelkeyboard.cpp + + handleExtra( qtKeyCode, release ); + ++ // Do NumLock ++ if (KTYP(key_map.code) == KT_PAD) { ++ if (!numlock) { ++ qtKeyCode = numpad2cursor[KVAL(key_map.code)]; ++ } else { ++ unicode = KVAL(key_map.code) + '0'; ++ } ++ } ++ + /* + * do not repeat modifier keys + */ diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index ce9969f3a3..f148a82341 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://simpad-defaultkbd.patch;patch=1 \ file://fix-errno-exception-spec.patch;patch=1 \ file://keyboardless-buttonmap.patch;patch=1 \ + file://kernel-keymap.patch;patch=1 \ file://sharp_char.h \ file://switches.h " @@ -54,19 +55,15 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m # add device specific patches here # SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_c7x0 = "file://kernel-keymap-corgi.patch;patch=1 \ file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_spitz = "file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada6xx = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ file://mnci.patch;patch=1 \ file://mnci-touchscreen.patch;patch=1 \ diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 87eccb7e1a..4bc8c60b79 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r9" +PR = "r11" EXTRA_OECONF += "-thread" -- cgit v1.2.3 From 4827e64316bd93eff35a1d2271ef9a252f97717e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 7 Apr 2007 11:17:02 +0000 Subject: freetype: add 2.3.3 --- packages/freetype/freetype-2.3.3/.mtn2git_empty | 0 .../freetype/freetype-2.3.3/fix-x86_64-build.patch | 26 ++++++++++++++ packages/freetype/freetype-native_2.1.10.bb | 5 ++- packages/freetype/freetype_2.3.3.bb | 40 ++++++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 packages/freetype/freetype-2.3.3/.mtn2git_empty create mode 100644 packages/freetype/freetype-2.3.3/fix-x86_64-build.patch create mode 100644 packages/freetype/freetype_2.3.3.bb (limited to 'packages') diff --git a/packages/freetype/freetype-2.3.3/.mtn2git_empty b/packages/freetype/freetype-2.3.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch new file mode 100644 index 0000000000..ae504dcb0b --- /dev/null +++ b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch @@ -0,0 +1,26 @@ +Index: freetype-2.3.1/builds/unix/configure.raw +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.raw ++++ freetype-2.3.1/builds/unix/configure.raw +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) +Index: freetype-2.3.1/builds/unix/configure.ac +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.ac ++++ freetype-2.3.1/builds/unix/configure.ac +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) diff --git a/packages/freetype/freetype-native_2.1.10.bb b/packages/freetype/freetype-native_2.1.10.bb index b5e8b307cd..6f99f7ee84 100644 --- a/packages/freetype/freetype-native_2.1.10.bb +++ b/packages/freetype/freetype-native_2.1.10.bb @@ -1,5 +1,5 @@ require freetype_${PV}.bb -inherit native +inherit pkgconfig native DEPENDS = "" FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" @@ -11,8 +11,7 @@ do_configure() { } do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} + autotools_stage_all } do_install() { diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.3.bb new file mode 100644 index 0000000000..79633a3d7f --- /dev/null +++ b/packages/freetype/freetype_2.3.3.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://fix-x86_64-build.patch;patch=1" +# file://no-hardcode.patch;patch=1" +# file://configure.patch;patch=1 \ +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +DEFAULT_PREFERENCE = "-1" + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + export LIBTOOL='${LIBTOOL}' + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" -- cgit v1.2.3 From 3b4539cfddea3fcbe9f36d9089afd8962da76762 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 7 Apr 2007 11:46:37 +0000 Subject: qte: First stage of adhoc machine support cleanup: remove mnci overrides. * Negotiated with the machine maintainer, Holger Schurig. QTE 2.3 is not really used on MNCI/RAMSES, and at any time in can be re-added by following generic interfaces guidelines (TSLIB, Linux input sybsystem, etc.) --- packages/qte/qte-2.3.10/deprecated/.mtn2git_empty | 0 .../qte-2.3.10/deprecated/mnci-touchscreen.patch | 1987 ++++++++++++++++++++ packages/qte/qte-2.3.10/deprecated/mnci.patch | 125 ++ .../qte-2.3.10/deprecated/openmn/.mtn2git_empty | 0 .../qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp | 584 ++++++ .../qte-2.3.10/deprecated/openmn/qkeyboard_qws.h | 56 + packages/qte/qte-2.3.10/mnci-touchscreen.patch | 1987 -------------------- packages/qte/qte-2.3.10/mnci.patch | 125 -- packages/qte/qte-2.3.10/openmn/.mtn2git_empty | 0 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp | 584 ------ packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h | 56 - packages/qte/qte-common_2.3.10.inc | 17 - packages/qte/qte-common_2.3.12.inc | 5 - 13 files changed, 2752 insertions(+), 2774 deletions(-) create mode 100644 packages/qte/qte-2.3.10/deprecated/.mtn2git_empty create mode 100644 packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch create mode 100644 packages/qte/qte-2.3.10/deprecated/mnci.patch create mode 100644 packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty create mode 100644 packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp create mode 100644 packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h delete mode 100644 packages/qte/qte-2.3.10/mnci-touchscreen.patch delete mode 100644 packages/qte/qte-2.3.10/mnci.patch delete mode 100644 packages/qte/qte-2.3.10/openmn/.mtn2git_empty delete mode 100644 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp delete mode 100644 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h (limited to 'packages') diff --git a/packages/qte/qte-2.3.10/deprecated/.mtn2git_empty b/packages/qte/qte-2.3.10/deprecated/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch b/packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch new file mode 100644 index 0000000000..570c2ff290 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/mnci-touchscreen.patch @@ -0,0 +1,1987 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10/src/kernel/qwsmouse_qws.cpp~ramses-touchscreen ++++ qt-2.3.10/src/kernel/qwsmouse_qws.cpp +@@ -1,5 +1,5 @@ + /**************************************************************************** +-** $Id: qt/src/kernel/qwsmouse_qws.cpp 2.3.10 edited 2005-01-24 $ ++** $Id: qt/src/kernel/qwsmouse_qws.cpp 2.3.7 edited 2003-02-04 $ + ** + ** Implementation of Qt/Embedded mouse drivers + ** +@@ -47,85 +47,32 @@ + #include + #include + #include +-#include + #include + #include + #include + #include + #include + ++ + #include + #if !defined(_OS_QNX6_) + +-#ifdef QT_QWS_CASSIOPEIA +-#include +-#endif +-#ifdef QT_QWS_TSLIB +-#include +-#endif +- +- +-//#define QT_QWS_K2 +- +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_K2) +-#define QT_QWS_IPAQ_RAW +-typedef struct { +- unsigned short pressure; +- unsigned short x; +- unsigned short y; +- unsigned short pad; +- struct timeval stamp; +-} TS_EVENT; +-#elif defined(QT_QWS_SL5XXX) +-#define QT_QWS_SL5XXX_RAW +-typedef struct { +- long y; +- long x; +- long pressure; +- long long millisecs; +-} TS_EVENT; +-#define QT_QWS_TP_SAMPLE_SIZE 10 +-#define QT_QWS_TP_MINIMUM_SAMPLES 4 +-#define QT_QWS_TP_PRESSURE_THRESHOLD 500 +-#define QT_QWS_TP_MOVE_LIMIT 50 +-#define QT_QWS_TP_JITTER_LIMIT 2 +-#elif defined(QT_QWS_SLC700) +-#define QT_QWS_SLC700_RAW +-typedef struct { +- unsigned short pressure; +- unsigned short x; +- unsigned short y; +- unsigned short millisecs; +-} TS_EVENT; +-#define QT_QWS_TP_SAMPLE_SIZE 10 +-#define QT_QWS_TP_MINIMUM_SAMPLES 4 +-#define QT_QWS_TP_PRESSURE_THRESHOLD 500 +-#define QT_QWS_TP_MOVE_LIMIT 50 +-#define QT_QWS_TP_JITTER_LIMIT 2 +-#endif +- +-#ifndef QT_QWS_TP_SAMPLE_SIZE +-#define QT_QWS_TP_SAMPLE_SIZE 5 +-#endif +- +-#ifndef QT_QWS_TP_MINIMUM_SAMPLES +-#define QT_QWS_TP_MINIMUM_SAMPLES 5 ++#ifndef QT_QWS_TP_PRESSURE_DOWN_THRESHOLD ++#define QT_QWS_TP_PRESSURE_DOWN_THRESHOLD 500 + #endif + +-#ifndef QT_QWS_TP_PRESSURE_THRESHOLD +-#define QT_QWS_TP_PRESSURE_THRESHOLD 1 ++#ifndef QT_QWS_TP_PRESSURE_UP_THRESHOLD ++#define QT_QWS_TP_PRESSURE_UP_THRESHOLD 450 + #endif + +-#ifndef QT_QWS_TP_MOVE_LIMIT +-#define QT_QWS_TP_MOVE_LIMIT 100 ++#ifndef QT_QWS_TP_TABLE_SIZE ++#define QT_QWS_TP_TABLE_SIZE 2 + #endif + +-#ifndef QT_QWS_TP_JITTER_LIMIT +-#define QT_QWS_TP_JITTER_LIMIT 2 ++#ifndef QT_QWS_TP_MOVE_MAX ++#define QT_QWS_TP_MOVE_MAX 100 + #endif + +-//#define QWS_CUSTOMTOUCHPANEL +- + /*! + \class QWSMouseHandler qwsmouse_qws.h + \brief Mouse driver/handler for Qt/Embedded +@@ -168,8 +115,7 @@ + enum MouseProtocol { Unknown = -1, Auto = 0, + MouseMan, IntelliMouse, Microsoft, + QVFBMouse, TPanel, BusMouse, +- FirstAuto = MouseMan, +- LastAuto = Microsoft }; ++ }; + + static void limitToScreen( QPoint &pt ) + { +@@ -186,810 +132,14 @@ + } MouseConfig; + + static const MouseConfig mouseConfig[] = { +-#ifndef QT_NO_QWS_MOUSE_AUTO + { "Auto", Auto }, +-#endif +-#ifndef QT_NO_QWS_MOUSE_PC +- { "MouseMan", MouseMan }, +- { "IntelliMouse", IntelliMouse }, +- { "USB", IntelliMouse }, +- { "Microsoft", Microsoft }, +-#endif +-#ifndef QT_NO_QWS_VFB + { "QVFbMouse", QVFBMouse }, +-#endif + { "TPanel", TPanel }, +- { "BusMouse", BusMouse }, + { 0, Unknown } + }; + +-#ifndef QT_NO_QWS_MOUSE_AUTO +-/* +- * Automatic-detection mouse driver +- */ +- +-class QAutoMouseSubHandler { +-protected: +- enum { max_buf=32 }; +- +- int fd; +- +- uchar buffer[max_buf]; +- int nbuf; +- +- QPoint motion; +- int bstate; +- +- int goodness; +- int badness; +- +- virtual int tryData()=0; +- +-public: +- QAutoMouseSubHandler(int f) : fd(f) +- { +- nbuf = bstate = goodness = badness = 0; +- } +- +- int file() const { return fd; } +- +- void closeIfNot(int& f) +- { +- if ( fd != f ) { +- f = fd; +- close(fd); +- } +- } +- +- void worse(int by=1) { badness+=by; } +- bool reliable() const { return goodness >= 5 && badness < 50; } +- int buttonState() const { return bstate; } +- bool motionPending() const { return motion!=QPoint(0,0); } +- QPoint takeMotion() { QPoint r=motion; motion=QPoint(0,0); return r; } +- +- void appendData(uchar* data, int length) +- { +- memcpy(buffer+nbuf, data, length); +- nbuf += length; +- } +- +- enum UsageResult { Insufficient, Motion, Button }; +- +- UsageResult useData() +- { +- int pbstate = bstate; +- int n = tryData(); +- if ( n > 0 ) { +- if ( n 0 ) { +- goodness = 10; +- switch ( reply[n-1] ) { +- case 3: +- case 4: +- packetsize = 4; +- break; +- default: +- packetsize = 3; +- } +- } else { +- badness = 100; +- } +- } +- +- int tryData() +- { +- if ( nbuf >= packetsize ) { +- //int overflow = (buffer[0]>>6 )& 0x03; +- +- if ( /*overflow ||*/ !(buffer[0] & 8) ) { +- badness++; +- return 1; +- } else { +- motion += +- QPoint((buffer[0] & 0x10) ? buffer[1]-256 : buffer[1], +- (buffer[0] & 0x20) ? 256-buffer[2] : -buffer[2]); +- int nbstate = buffer[0] & 0x7; +- if ( motion.x() || motion.y() || bstate != nbstate ) { +- bstate = nbstate; +- goodness++; +- } else { +- badness++; +- return 1; +- } +- } +- return packetsize; +- } +- return 0; +- } +-}; +- +-class QAutoMouseSubHandler_serial : public QAutoMouseSubHandler { +-public: +- QAutoMouseSubHandler_serial(int f) : QAutoMouseSubHandler(f) +- { +- initSerial(); +- } +- +-protected: +- void setflags(int f) +- { +- termios tty; +- tcgetattr(fd, &tty); +- tty.c_iflag = IGNBRK | IGNPAR; +- tty.c_oflag = 0; +- tty.c_lflag = 0; +- tty.c_cflag = f | CREAD | CLOCAL | HUPCL; +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +- tty.c_line = 0; +-#endif +- tty.c_cc[VTIME] = 0; +- tty.c_cc[VMIN] = 1; +- tcsetattr(fd, TCSANOW, &tty); +- } +- +-private: +- void initSerial() +- { +- int speed[4] = { B9600, B4800, B2400, B1200 }; +- +- for (int n = 0; n < 4; n++) { +- setflags(CSTOPB | speed[n]); +- write(fd, "*q", 2); +- usleep(10000); +- } +- } +-}; +- +-class QAutoMouseSubHandler_mousesystems : public QAutoMouseSubHandler_serial { +-public: +- // ##### This driver has not been tested +- +- QAutoMouseSubHandler_mousesystems(int f) : QAutoMouseSubHandler_serial(f) +- { +- init(); +- } +- +- void init() +- { +- setflags(B1200|CS8|CSTOPB); +- // 60Hz +- if (write(fd, "R", 1)!=1) { +- badness = 100; +- return; +- } +- tcflush(fd,TCIOFLUSH); +- } +- +- int tryData() +- { +- if ( nbuf >= 5 ) { +- if ( (buffer[0] & 0xf8) != 0x80 ) { +- badness++; +- return 1; +- } +- motion += +- QPoint((signed char)buffer[1] + (signed char)buffer[3], +- -(signed char)buffer[2] + (signed char)buffer[4]); +- int t = ~buffer[0]; +- int nbstate = ((t&3) << 1) | ((t&4) >> 2); +- if ( motion.x() || motion.y() || bstate != nbstate ) { +- bstate = nbstate; +- goodness++; +- } else { +- badness++; +- return 1; +- } +- return 5; +- } +- return 0; +- } +-}; +- +-class QAutoMouseSubHandler_ms : public QAutoMouseSubHandler_serial { +- int mman; +-public: +- QAutoMouseSubHandler_ms(int f) : QAutoMouseSubHandler_serial(f) +- { +- mman=0; +- init(); +- } +- +- void init() +- { +- setflags(B1200|CS7); +- // 60Hz +- if (write(fd, "R", 1)!=1) { +- badness = 100; +- return; +- } +- tcflush(fd,TCIOFLUSH); +- } +- +- int tryData() +- { +- if ( !(buffer[0] & 0x40) ) { +- if ( buffer[0] == 0x20 && (bstate & Qt::MidButton) ) { +- mman=1; // mouseman extension +- } +- return 1; +- } +- int extra = mman&&(bstate & Qt::MidButton); +- if ( nbuf >= 3+extra ) { +- int nbstate = 0; +- if ( buffer[0] == 0x40 && !bstate && !buffer[1] && !buffer[2] ) { +- nbstate = Qt::MidButton; +- } else { +- nbstate = ((buffer[0] & 0x20) >> 5) +- | ((buffer[0] & 0x10) >> 3); +- if ( extra && buffer[3] == 0x20 ) +- nbstate = Qt::MidButton; +- } +- +- if ( buffer[1] & 0x40 ) { +- badness++; +- return 1; +- } else { +- motion += +- QPoint((signed char)((buffer[0]&0x3)<<6) +- |(signed char)(buffer[1]&0x3f), +- (signed char)((buffer[0]&0xc)<<4) +- |(signed char)(buffer[2]&0x3f)); +- if ( motion.x() || motion.y() || bstate != nbstate ) { +- bstate = nbstate; +- goodness++; +- } else { +- badness++; +- return 1; +- } +- return 3+extra; +- } +- } +- return 0; +- } +-}; +- +-/* +-QAutoMouseHandler::UsageResult QAutoMouseHandler::useDev(Dev& d) +-{ +- if ( d.nbuf >= mouseData[d.protocol].bytesPerPacket ) { +- uchar *mb = d.buf; +- int bstate = 0; +- int dx = 0; +- int dy = 0; +- +- switch (mouseProtocol) { +- case MouseMan: +- case IntelliMouse: +- { +- bstate = mb[0] & 0x7; // assuming Qt::*Button order +- +- int overflow = (mb[0]>>6 )& 0x03; +- if (mouseProtocol == MouseMan && overflow) { +- //### wheel events signalled with overflow bit, ignore for now +- } +- else { +- bool xs = mb[0] & 0x10; +- bool ys = mb[0] & 0x20; +- dx = xs ? mb[1]-256 : mb[1]; +- dy = ys ? mb[2]-256 : mb[2]; +- } +- break; +- } +- case Microsoft: +- if ( ((mb[0] & 0x20) >> 3) ) { +- bstate |= Qt::LeftButton; +- } +- if ( ((mb[0] & 0x10) >> 4) ) { +- bstate |= Qt::RightButton; +- } +- +- dx=(signed char)(((mb[0] & 0x03) << 6) | (mb[1] & 0x3f)); +- dy=-(signed char)(((mb[0] & 0x0c) << 4) | (mb[2] & 0x3f)); +- +- break; +- } +- } +- } +-*/ +- +-#endif +- +-class QAutoMouseHandler : public QWSMouseHandler { +- Q_OBJECT +- +-public: +- QAutoMouseHandler(); +- ~QAutoMouseHandler(); +- +-#ifndef QT_NO_QWS_MOUSE_AUTO +-private: +- enum { max_dev=32 }; +- QAutoMouseSubHandler *sub[max_dev]; +- QList notifiers; +- int nsub; +- int retries; +-#endif +- +-private slots: +- void readMouseData(int); +- +-private: +-#ifndef QT_NO_QWS_MOUSE_AUTO +- void openDevices(); +- void closeDevices(); +- void notify(int fd); +- bool sendEvent(QAutoMouseSubHandler& h) +- { +- if ( h.reliable() ) { +- mousePos += h.takeMotion(); +- limitToScreen( mousePos ); +-/* +-qDebug("%d,%d %c%c%c", +-mousePos.x(),mousePos.y(), +-(h.buttonState()&Qt::LeftButton)?'L':'.', +-(h.buttonState()&Qt::MidButton)?'M':'.', +-(h.buttonState()&Qt::RightButton)?'R':'.'); +-*/ +- emit mouseChanged(mousePos,h.buttonState()); +- return TRUE; +- } else { +- h.takeMotion(); +- if ( h.buttonState() & (Qt::RightButton|Qt::MidButton) ) { +- // Strange for the user to press right or middle without +- // a moving mouse! +- h.worse(); +- } +- return FALSE; +- } +- } +-#endif +-}; +- +-QAutoMouseHandler::QAutoMouseHandler() +-{ +-#ifndef QT_NO_QWS_MOUSE_AUTO +- notifiers.setAutoDelete( TRUE ); +- retries = 0; +- openDevices(); +-#endif +-} +- +-QAutoMouseHandler::~QAutoMouseHandler() +-{ +-#ifndef QT_NO_QWS_MOUSE_AUTO +- closeDevices(); +-#endif +-} +- +-#ifndef QT_NO_QWS_MOUSE_AUTO +-void QAutoMouseHandler::openDevices() +-{ +- nsub=0; +- int fd; +- fd = open( "/dev/psaux", O_RDWR | O_NDELAY ); +- if ( fd >= 0 ) { +- sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); +- notify(fd); +- } +-#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) && !defined(QT_QWS_SLC700) +- char fn[] = "/dev/ttyS?"; +- for (int ch='0'; ch<='3'; ch++) { +- fn[9] = ch; +- fd = open( fn, O_RDWR | O_NDELAY ); +- if ( fd >= 0 ) { +- //sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); +- sub[nsub++] = new QAutoMouseSubHandler_mousesystems(fd); +- sub[nsub++] = new QAutoMouseSubHandler_ms(fd); +- notify(fd); +- } +- } +-#endif +- // ... +-} +- +-void QAutoMouseHandler::closeDevices() +-{ +- int pfd=-1; +- for (int i=0; icloseIfNot(pfd); +- delete sub[i]; +- } +- notifiers.clear(); +-} +- +-void QAutoMouseHandler::notify(int fd) +-{ +- QSocketNotifier *mouseNotifier +- = new QSocketNotifier( fd, QSocketNotifier::Read, this ); +- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData(int))); +- notifiers.append( mouseNotifier ); +-} +-#endif +- +-void QAutoMouseHandler::readMouseData(int fd) +-{ +-#ifndef QT_NO_QWS_MOUSE_AUTO +- for (;;) { +- uchar buf[8]; +- int n = read(fd, buf, 8); +- if ( n<=0 ) +- break; +- for (int i=0; i 0 ) +- mouseIdx += n; +- } while ( n > 0 ); +- } +- handleMouseData(); +-#endif +-} +- +- +-#ifndef QT_NO_QWS_MOUSE_PC +-/* +-*/ +- +-void QWSMouseHandlerPrivate::handleMouseData() +-{ +- static const int accel_limit = 5; +- static const int accel = 2; +- +- int idx = 0; +- int bstate = 0; +- int dx = 0, dy = 0; +- bool sendEvent = false; +- int tdx = 0, tdy = 0; +- +- while ( mouseIdx-idx >= mouseData[mouseProtocol].bytesPerPacket ) { +- //qDebug( "Got mouse data" ); +- uchar *mb = mouseBuf+idx; +- bstate = 0; +- dx = 0; +- dy = 0; +- sendEvent = false; +- switch (mouseProtocol) { +- case MouseMan: +- case IntelliMouse: +- { +- if (mb[0] & 0x01) +- bstate |= Qt::LeftButton; +- if (mb[0] & 0x02) +- bstate |= Qt::RightButton; +- if (mb[0] & 0x04) +- bstate |= Qt::MidButton; +- +- int overflow = (mb[0]>>6 )& 0x03; +- if (mouseProtocol == MouseMan && overflow) { +- //### wheel events signalled with overflow bit, ignore for now +- } +- else { +- bool xs = mb[0] & 0x10; +- bool ys = mb[0] & 0x20; +- dx = xs ? mb[1]-256 : mb[1]; +- dy = ys ? mb[2]-256 : mb[2]; + +- sendEvent = true; +- } +-#if 0 //debug +- if (mouseProtocol == MouseMan) +- printf("(%2d) %02x %02x %02x ", idx, mb[0], mb[1], mb[2]); +- else +- printf("(%2d) %02x %02x %02x %02x ",idx,mb[0],mb[1],mb[2],mb[3]); +- const char *b1 = (mb[0] & 0x01) ? "b1":" ";//left +- const char *b2 = (mb[0] & 0x02) ? "b2":" ";//right +- const char *b3 = (mb[0] & 0x04) ? "b3":" ";//mid + +- if ( overflow ) +- printf( "Overflow%d %s %s %s (%4d,%4d)\n", overflow, +- b1, b2, b3, mousePos.x(), mousePos.y() ); +- else +- printf( "%s %s %s (%+3d,%+3d) (%4d,%4d)\n", +- b1, b2, b3, dx, dy, mousePos.x(), mousePos.y() ); +-#endif +- break; +- } +- case Microsoft: +- if ( (mb[0] & 0x20) ) +- bstate |= Qt::LeftButton; +- if ( (mb[0] & 0x10) ) +- bstate |= Qt::RightButton; +- +- dx=(signed char)(((mb[0] & 0x03) << 6) | (mb[1] & 0x3f)); +- dy=-(signed char)(((mb[0] & 0x0c) << 4) | (mb[2] & 0x3f)); +- sendEvent=true; +- +- break; +- case BusMouse: +- if ( !(mb[0] & 0x04) ) +- bstate |= Qt::LeftButton; +- if ( !(mb[0] & 0x01) ) +- bstate |= Qt::RightButton; +- +- dx=(signed char)mb[1]; +- dy=(signed char)mb[2]; +- sendEvent=true; +- break; +- +- default: +- qWarning( "Unknown mouse protocol in QWSMouseHandlerPrivate" ); +- break; +- } +- if (sendEvent) { +- if ( QABS(dx) > accel_limit || QABS(dy) > accel_limit ) { +- dx *= accel; +- dy *= accel; +- } +- tdx += dx; +- tdy += dy; +- if ( bstate != obstate ) { +- mousePos += QPoint(tdx,-tdy); +- limitToScreen( mousePos ); +- emit mouseChanged(mousePos,bstate); +- sendEvent = FALSE; +- tdx = 0; +- tdy = 0; +- obstate = bstate; +- } +- } +- idx += mouseData[mouseProtocol].bytesPerPacket; +- } +- if ( sendEvent ) { +- mousePos += QPoint(tdx,-tdy); +- limitToScreen( mousePos ); +- emit mouseChanged(mousePos,bstate); +- } +- +- int surplus = mouseIdx - idx; +- for ( int i = 0; i < surplus; i++ ) +- mouseBuf[i] = mouseBuf[idx+i]; +- mouseIdx = surplus; +-} +-#endif +- +- +-QWSMouseHandlerPrivate::QWSMouseHandlerPrivate( MouseProtocol protocol, +- QString mouseDev ) +-{ +-#ifndef QT_NO_QWS_MOUSE_PC +- mouseProtocol = protocol; +- +- if ( mouseDev.isEmpty() ) +- mouseDev = "/dev/mouse"; +- obstate = -1; +- mouseFD = -1; +- mouseFD = open( mouseDev.local8Bit().data(), O_RDWR | O_NDELAY); +- if ( mouseFD < 0 ) { +- mouseFD = open( mouseDev.local8Bit().data(), O_RDONLY | O_NDELAY); +- if ( mouseFD < 0 ) +- qDebug( "Cannot open %s (%s)", mouseDev.ascii(), +- strerror(errno)); +- } else { +- // Clear pending input +- tcflush(mouseFD,TCIFLUSH); +- +- bool ps2 = false; +- +- switch (mouseProtocol) { +- case MouseMan: +- ps2 = true; +- write(mouseFD,"",1); +- usleep(50000); +- write(mouseFD,"@EeI!",5); +- break; +- +- case IntelliMouse: { +-// ps2 = true; +- const unsigned char init1[] = { 243, 200, 243, 100, 243, 80 }; +- const unsigned char init2[] = { 246, 230, 244, 243, 100, 232, 3 }; +- write(mouseFD,init1,sizeof(init1)); +- usleep(50000); +- write(mouseFD,init2,sizeof(init2)); +- } +- break; +- +- case Microsoft: +- struct termios tty; +- +- tcgetattr(mouseFD, &tty); +- +- tty.c_iflag = IGNBRK | IGNPAR; +- tty.c_oflag = 0; +- tty.c_lflag = 0; +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +- tty.c_line = 0; +-#endif // _OS_FREEBSD_ +- tty.c_cc[VTIME] = 0; +- tty.c_cc[VMIN] = 1; +- tty.c_cflag = B1200 | CS7 | CREAD | CLOCAL | HUPCL; +- tcsetattr(mouseFD, TCSAFLUSH, &tty); /* set parameters */ +- break; +- +- case BusMouse: +- usleep(50000); +- break; +- +- default: +- qDebug("Unknown mouse protocol"); +- exit(1); +- } +- +- if (ps2) { +- char buf[] = { 246, 244 }; +- write(mouseFD,buf,1); +- write(mouseFD,buf+1,1); +- } +- +- usleep(50000); +- tcflush(mouseFD,TCIFLUSH); // ### doesn't seem to work. +- usleep(50000); +- tcflush(mouseFD,TCIFLUSH); // ### doesn't seem to work. +- +- char buf[100]; // busmouse driver will not read if bufsize < 3, YYD +- while (read(mouseFD, buf, 100) > 0) { } // eat unwanted replies +- +- mouseIdx = 0; +- +- QSocketNotifier *mouseNotifier; +- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, this ); +- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); +- } +-#else +- Q_UNUSED(protocol); +- Q_UNUSED(mouseDev); +-#endif +-} +- +-QWSMouseHandlerPrivate::~QWSMouseHandlerPrivate() +-{ +-#ifndef QT_NO_QWS_MOUSE_PC +- if (mouseFD >= 0) { +- tcflush(mouseFD,TCIFLUSH); // yyd. +- close(mouseFD); +- } +-#endif +-} +- +-/* +- * +- */ + + QCalibratedMouseHandler::QCalibratedMouseHandler() + : samples(5), currSample(0), numSamples(0) +@@ -1030,7 +180,8 @@ + if ( file.open( IO_WriteOnly ) ) { + QTextStream t( &file ); + t << a << " " << b << " " << c << " "; +- t << d << " " << e << " " << f << " " << s; ++ t << d << " " << e << " " << f << " " << s << endl; ++ file.close(); + } else + #endif + { +@@ -1046,6 +197,7 @@ + if ( file.open( IO_ReadOnly ) ) { + QTextStream t( &file ); + t >> a >> b >> c >> d >> e >> f >> s; ++ file.close(); + } else + #endif + { +@@ -1073,12 +225,24 @@ + writeCalibration(); + } + ++void QCalibratedMouseHandler::setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss) ++{ ++ a = aa; ++ b = bb; ++ c = cc; ++ d = dd; ++ e = ee; ++ f = ff; ++ s = ss; ++} ++ + QPoint QCalibratedMouseHandler::transform( const QPoint &p ) + { + QPoint tp; + + tp.setX( (a * p.x() + b * p.y() + c) / s ); + tp.setY( (d * p.x() + e * p.y() + f) / s ); ++//qDebug("QCalibratedMouseHandler::transform(%d,%d) -> %d,%d)", p.x(), p.y(), tp.x(), tp.y() ); + + return tp; + } +@@ -1143,814 +307,192 @@ + return sent; + } + +-/* +- * Handler for /dev/tpanel Linux kernel driver +- */ + +-class QVrTPanelHandlerPrivate : public QCalibratedMouseHandler { +- Q_OBJECT +-public: +- QVrTPanelHandlerPrivate(MouseProtocol, QString dev); +- ~QVrTPanelHandlerPrivate(); + +-private: +- int mouseFD; +- MouseProtocol mouseProtocol; +-private slots: +- void sendRelease(); +- void readMouseData(); +-private: +- static const int mouseBufSize = 1280; +- QTimer *rtimer; +- int mouseIdx; +- uchar mouseBuf[mouseBufSize]; +-}; + +-#ifndef QT_QWS_CASSIOPEIA +-QVrTPanelHandlerPrivate::QVrTPanelHandlerPrivate( MouseProtocol, QString ) : +- QCalibratedMouseHandler() +-{ +-} +-#else +-QVrTPanelHandlerPrivate::QVrTPanelHandlerPrivate( MouseProtocol, QString dev ) : +- QCalibratedMouseHandler() +-{ +- if ( dev.isEmpty() ) +- dev = "/dev/tpanel"; +- +- if ((mouseFD = open( dev, O_RDONLY)) < 0) { +- qFatal( "Cannot open %s (%s)", dev.latin1(), strerror(errno)); +- } else { +- sleep(1); +- } +- +- struct scanparam s; +- s.interval = 20000; +- s.settletime = 480; +- if ( ioctl(mouseFD, TPSETSCANPARM, &s) < 0 +- || fcntl(mouseFD, F_SETFL, O_NONBLOCK) < 0 ) +- qWarning("Error initializing touch panel."); +- +- QSocketNotifier *mouseNotifier; +- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, +- this ); +- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); +- +- rtimer = new QTimer( this ); +- connect( rtimer, SIGNAL(timeout()), this, SLOT(sendRelease())); +- mouseIdx = 0; +- setFilterSize( 3 ); +- +- printf("\033[?25l"); fflush(stdout); // VT100 cursor off +-} +-#endif +- +-QVrTPanelHandlerPrivate::~QVrTPanelHandlerPrivate() +-{ +- if (mouseFD >= 0) +- close(mouseFD); +-} +- +-void QVrTPanelHandlerPrivate::sendRelease() +-{ +- sendFiltered( mousePos, 0 ); +-} + +-void QVrTPanelHandlerPrivate::readMouseData() +-{ +-#ifdef QT_QWS_CASSIOPEIA +- if(!qt_screen) +- return; +- static bool pressed = FALSE; +- +- int n; +- do { +- n = read(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx ); +- if ( n > 0 ) +- mouseIdx += n; +- } while ( n > 0 && mouseIdx < mouseBufSize ); +- +- int idx = 0; +- while ( mouseIdx-idx >= (int)sizeof( short ) * 6 ) { +- uchar *mb = mouseBuf+idx; +- ushort *data = (ushort *) mb; +- if ( data[0] & 0x8000 ) { +- if ( data[5] > 750 ) { +- QPoint t(data[3]-data[4],data[2]-data[1]); +- if ( sendFiltered( t, Qt::LeftButton ) ) +- pressed = TRUE; +- if ( pressed ) +- rtimer->start( 200, TRUE ); // release unreliable +- } +- } else if ( pressed ) { +- rtimer->start( 50, TRUE ); +- pressed = FALSE; +- } +- idx += sizeof( ushort ) * 6; +- } ++struct input_event { ++ struct timeval time; ++ unsigned short type; ++ unsigned short code; ++ unsigned int value; ++}; + +- int surplus = mouseIdx - idx; +- for ( int i = 0; i < surplus; i++ ) +- mouseBuf[i] = mouseBuf[idx+i]; +- mouseIdx = surplus; + +-#endif +-} ++#define EV_ABS 0x03 ++#define ABS_X 0x00 ++#define ABS_Y 0x01 ++#define ABS_PRESSURE 0x18 + + +-class QTPanelHandlerPrivate : public QCalibratedMouseHandler ++class QInputEventHandler : public QCalibratedMouseHandler + { + Q_OBJECT + public: +- QTPanelHandlerPrivate(MouseProtocol, QString dev); +- ~QTPanelHandlerPrivate(); ++ QInputEventHandler(MouseProtocol, QString dev); ++ ~QInputEventHandler(); ++ ++ virtual void calibrate( QWSPointerCalibrationData * ); ++ virtual void setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss); + + private: +- static const int mouseBufSize = 2048; ++ void init(); ++ void fini(); ++ + int mouseFD; +- QPoint oldmouse; +- QPoint oldTotalMousePos; +- bool waspressed; +- QPointArray samples; +- unsigned int currSample; +- unsigned int lastSample; +- unsigned int numSamples; +- int skipCount; +- int mouseIdx; +- uchar mouseBuf[mouseBufSize]; ++ struct input_event sample; ++ int myX, myY, myP, oldX, oldY, oldP; ++ int xtable[QT_QWS_TP_TABLE_SIZE]; ++ int ytable[QT_QWS_TP_TABLE_SIZE]; ++ int ptr; + + private slots: + void readMouseData(); + }; + + +-QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev ) +- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), +- numSamples(0), skipCount(0) +-{ +- Q_UNUSED(dev); +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) +-#if defined(QT_QWS_IPAQ) +-# ifdef QT_QWS_IPAQ_RAW +- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { +-# else +- if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) { +-# endif +- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); +- return; +- } +-#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) +-//# ifdef QT_QWS_SL5XXX_TSRAW +-# if 0 +- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { +- qWarning( "Cannot open /dev/tsraw (%s)", strerror(errno)); +- return; +- } +-# else +- if ((mouseFD = open( "/dev/ts", O_RDONLY | O_NDELAY)) < 0) { +- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); +- return; +- } +-# endif +-#elif defined(QT_QWS_SIMPAD ) +- if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) < 0) { +- qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno)); +- return; +- } +-#endif +- +- QSocketNotifier *mouseNotifier; +- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, +- this ); +- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); +- waspressed=FALSE; +- mouseIdx = 0; +-#endif +-} +- +-QTPanelHandlerPrivate::~QTPanelHandlerPrivate() ++QInputEventHandler::QInputEventHandler( MouseProtocol, QString ) ++ : myP(-1) + { +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) +- if (mouseFD >= 0) +- close(mouseFD); +-#endif ++ init(); + } + +-void QTPanelHandlerPrivate::readMouseData() ++QInputEventHandler::~QInputEventHandler() + { +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) +- if(!qt_screen) +- return; +- +- int n; +- do { +- n = read(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx ); +- if ( n > 0 ) +- mouseIdx += n; +- } while ( n > 0 && mouseIdx < mouseBufSize ); +- +- TS_EVENT *data; +- int idx = 0; +- +- // perhaps we shouldn't be reading EVERY SAMPLE. +- while ( mouseIdx-idx >= (int)sizeof( TS_EVENT ) ) { +- uchar *mb = mouseBuf+idx; +- data = (TS_EVENT *) mb; +- if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { +-#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) +- samples[currSample] = QPoint( 1000 - data->x, data->y ); +-#else +- samples[currSample] = QPoint( data->x, data->y ); +-#endif +- +- numSamples++; +- if ( numSamples >= QT_QWS_TP_MINIMUM_SAMPLES ) { +- int sampleCount = QMIN(numSamples + 1,samples.count()); +- +- // average the rest +- mousePos = QPoint( 0, 0 ); +- QPoint totalMousePos = oldTotalMousePos; +- totalMousePos += samples[currSample]; +- if(numSamples >= samples.count()) +- totalMousePos -= samples[lastSample]; +- +- mousePos = totalMousePos / (sampleCount - 1); +- +-# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) +- mousePos = transform( mousePos ); +-# endif +- if(!waspressed) +- oldmouse = mousePos; +- QPoint dp = mousePos - oldmouse; +- int dxSqr = dp.x() * dp.x(); +- int dySqr = dp.y() * dp.y(); +- if ( dxSqr + dySqr < (QT_QWS_TP_MOVE_LIMIT * QT_QWS_TP_MOVE_LIMIT) ) { +- if ( waspressed ) { +- if ( (dxSqr + dySqr > (QT_QWS_TP_JITTER_LIMIT * QT_QWS_TP_JITTER_LIMIT) ) || skipCount > 2) { +- emit mouseChanged(mousePos,Qt::LeftButton); +- oldmouse = mousePos; +- skipCount = 0; +- } else { +- skipCount++; +- } +- } else { +- emit mouseChanged(mousePos,Qt::LeftButton); +- oldmouse=mousePos; +- waspressed=true; +- } +- +- // save recuring information +- currSample++; +- if (numSamples >= samples.count()) +- lastSample++; +- oldTotalMousePos = totalMousePos; +- } else { +- numSamples--; // don't use this sample, it was bad. +- } +- } else { +- // build up the average +- oldTotalMousePos += samples[currSample]; +- currSample++; +- } +- if ( currSample >= samples.count() ) +- currSample = 0; +- if ( lastSample >= samples.count() ) +- lastSample = 0; +- } else { +- currSample = 0; +- lastSample = 0; +- numSamples = 0; +- skipCount = 0; +- oldTotalMousePos = QPoint(0,0); +- if ( waspressed ) { +- emit mouseChanged(oldmouse,0); +- oldmouse = QPoint( -100, -100 ); +- waspressed=false; +- } +- } +- idx += sizeof( TS_EVENT ); +- } ++ fini(); + +- int surplus = mouseIdx - idx; +- for ( int i = 0; i < surplus; i++ ) +- mouseBuf[i] = mouseBuf[idx+i]; +- mouseIdx = surplus; +-#endif + } + +-// YOPY touch panel support based on changes contributed by Ron Victorelli +-// (victorrj at icubed.com) to Custom TP driver. +-// +-class QYopyTPanelHandlerPrivate : public QWSMouseHandler { +- Q_OBJECT +-public: +- QYopyTPanelHandlerPrivate(MouseProtocol, QString dev); +- ~QYopyTPanelHandlerPrivate(); +- +-private: +- int mouseFD; +- int prevstate; +-private slots: +- void readMouseData(); +- +-}; +- +-QYopyTPanelHandlerPrivate::QYopyTPanelHandlerPrivate( MouseProtocol, QString ) ++void QInputEventHandler::setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss) + { +-#ifdef QT_QWS_YOPY +- if ((mouseFD = open( "/dev/ts", O_RDONLY)) < 0) { +- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); +- return; +- } else { +- sleep(1); +- } +- prevstate=0; +- QSocketNotifier *mouseNotifier; +- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, +- this ); +- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); +-#endif +-} ++ QCalibratedMouseHandler::setCalibration(aa, bb, cc, dd, ee, ff, ss); + +-QYopyTPanelHandlerPrivate::~QYopyTPanelHandlerPrivate() +-{ +- if (mouseFD >= 0) +- close(mouseFD); ++ writeCalibration(); ++ fini(); ++ init(); + } + +-#define YOPY_XPOS(d) (d[1]&0x3FF) +-#define YOPY_YPOS(d) (d[2]&0x3FF) +-#define YOPY_PRES(d) (d[0]&0xFF) +-#define YOPY_STAT(d) (d[3]&0x01 ) +- +-struct YopyTPdata { +- +- unsigned char status; +- unsigned short xpos; +- unsigned short ypos; +- +-}; +- +-void QYopyTPanelHandlerPrivate::readMouseData() ++void QInputEventHandler::calibrate( QWSPointerCalibrationData *cd ) + { +-#ifdef QT_QWS_YOPY +- if(!qt_screen) +- return; +- YopyTPdata data; +- +- unsigned int yopDat[4]; +- +- int ret; +- +- ret=read(mouseFD,&yopDat,sizeof(yopDat)); ++ QCalibratedMouseHandler::calibrate( cd ); + +- if(ret) { +- data.status= ( YOPY_PRES(yopDat) ) ? 1 : 0; +- data.xpos=YOPY_XPOS(yopDat); +- data.ypos=YOPY_YPOS(yopDat); +- QPoint q; +- q.setX(data.xpos); +- q.setY(data.ypos); +- mousePos=q; +- if(data.status && !prevstate) { +- emit mouseChanged(mousePos,Qt::LeftButton); +- } else if( !data.status && prevstate ) { +- emit mouseChanged(mousePos,0); +- } +- prevstate = data.status; +- } +- if(ret<0) { +- qDebug("Error %s",strerror(errno)); +- } +-#endif ++ // write calibration data, and close and reopen ++ // tslib, in order to ensure it uses the new values ++ writeCalibration(); ++ fini(); ++ init(); + } + +-class QCustomTPanelHandlerPrivate : public QWSMouseHandler { +- Q_OBJECT +-public: +- QCustomTPanelHandlerPrivate(MouseProtocol, QString dev); +- ~QCustomTPanelHandlerPrivate(); +- +-private: +- int mouseFD; +-private slots: +- void readMouseData(); +- +-}; +- +-QCustomTPanelHandlerPrivate::QCustomTPanelHandlerPrivate( MouseProtocol, QString ) ++void QInputEventHandler::init() + { +-#ifdef QWS_CUSTOMTOUCHPANEL +- if ((mouseFD = open( "/dev/ts", O_RDONLY)) < 0) { +- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); ++ if ((mouseFD = open( "/dev/input/event1", O_RDONLY)) < 0) { ++ qWarning( "Cannot open /dev/input/event1 (%s)", strerror(errno)); + return; +- } else { +- sleep(1); + } + + QSocketNotifier *mouseNotifier; +- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, +- this ); ++ mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, this ); ++ setFilterSize(2); + connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); +-#endif + } + +-QCustomTPanelHandlerPrivate::~QCustomTPanelHandlerPrivate() ++void QInputEventHandler::fini() + { + if (mouseFD >= 0) + close(mouseFD); + } + +-struct CustomTPdata { +- +- unsigned char status; +- unsigned short xpos; +- unsigned short ypos; +- +-}; +- +-void QCustomTPanelHandlerPrivate::readMouseData() ++void QInputEventHandler::readMouseData() + { +-#ifdef QWS_CUSTOMTOUCHPANEL +- if(!qt_screen) +- return; +- CustomTPdata data; +- +- unsigned char data2[5]; +- +- int ret; +- +- ret=read(mouseFD,data2,5); ++ if (!qt_screen) ++ return; + +- if(ret==5) { +- data.status=data2[0]; +- data.xpos=(data2[1] << 8) | data2[2]; +- data.ypos=(data2[3] << 8) | data2[4]; +- QPoint q; +- q.setX(data.xpos); +- q.setY(data.ypos); +- mousePos=q; +- if(data.status & 0x40) { +- emit mouseChanged(mousePos,Qt::LeftButton); +- } else { +- emit mouseChanged(mousePos,0); ++ unsigned int size = read(mouseFD, &sample, sizeof(sample)); ++ if (size < sizeof(sample)) { ++ qDebug("no input"); ++ return; ++ } ++ //qDebug("type,code,val: %d,%d,%d", sample.type, sample.code, sample.value); ++ if (sample.type == EV_ABS) { ++ if (sample.code == ABS_Y) { ++ myY = sample.value; ++ return; ++ } else ++ if (sample.code == ABS_X) { ++ myX = sample.value; ++ return; ++ } else ++ if (sample.code == ABS_PRESSURE) { ++ myP = sample.value; ++ } + } +- } +- if(ret<0) { +- qDebug("Error %s",strerror(errno)); +- } +-#endif +-} +- +-/* +- * Virtual framebuffer mouse driver +- */ +- +-#ifndef QT_NO_QWS_VFB +-#include "qvfbhdr.h" +-extern int qws_display_id; +-#endif +- +-class QVFbMouseHandlerPrivate : public QWSMouseHandler { +- Q_OBJECT +-public: +- QVFbMouseHandlerPrivate(MouseProtocol, QString dev); +- ~QVFbMouseHandlerPrivate(); +- +-#ifndef QT_NO_QWS_VFB +- bool isOpen() const { return mouseFD > 0; } +- +-private: +- static const int mouseBufSize = 128; +- int mouseFD; +- int mouseIdx; +- uchar mouseBuf[mouseBufSize]; +-#endif +- +-private slots: +- void readMouseData(); +-}; +- +-QVFbMouseHandlerPrivate::QVFbMouseHandlerPrivate( MouseProtocol, QString mouseDev ) +-{ +-#ifndef QT_NO_QWS_VFB +- mouseFD = -1; +- if ( mouseDev.isEmpty() ) +- mouseDev = QString(QT_VFB_MOUSE_PIPE).arg(qws_display_id); +- +- if ((mouseFD = open( mouseDev.local8Bit().data(), O_RDWR | O_NDELAY)) < 0) { +- qDebug( "Cannot open %s (%s)", mouseDev.ascii(), +- strerror(errno)); +- } else { +- // Clear pending input +- char buf[2]; +- while (read(mouseFD, buf, 1) > 0) { } +- +- mouseIdx = 0; +- +- QSocketNotifier *mouseNotifier; +- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, this ); +- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); +- } +-#endif +-} +- +-QVFbMouseHandlerPrivate::~QVFbMouseHandlerPrivate() +-{ +-#ifndef QT_NO_QWS_VFB +- if (mouseFD >= 0) +- close(mouseFD); +-#endif +-} +- +-void QVFbMouseHandlerPrivate::readMouseData() +-{ +-#ifndef QT_NO_QWS_VFB +- int n; +- do { +- n = read(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx ); +- if ( n > 0 ) +- mouseIdx += n; +- } while ( n > 0 ); +- +- int idx = 0; +- while ( mouseIdx-idx >= int(sizeof( QPoint ) + sizeof( int )) ) { +- uchar *mb = mouseBuf+idx; +- QPoint *p = (QPoint *) mb; +- mb += sizeof( QPoint ); +- int *bstate = (int *)mb; +- mousePos = *p; +- limitToScreen( mousePos ); +- emit mouseChanged(mousePos, *bstate); +- idx += sizeof( QPoint ) + sizeof( int ); +- } +- +- int surplus = mouseIdx - idx; +- for ( int i = 0; i < surplus; i++ ) +- mouseBuf[i] = mouseBuf[idx+i]; +- mouseIdx = surplus; +-#endif +-} +- +-/* +- mouse handler for tslib +- see http://cvs.arm.linux.org.uk/ +- */ +-/* +- +- Copyright (C) 2003, 2004, 2005 Texas Instruments, Inc. +- Copyright (C) 2004, 2005 Holger Hans Peter Freyther +- All rights reserved. +- +- Redistribution and use in source and binary forms, with or without +- modification, are permitted provided that the following conditions are met: +- +- Redistributions of source code must retain the above copyright notice, +- this list of conditions and the following disclaimer. +- +- Redistributions in binary form must reproduce the above copyright +- notice, this list of conditions and the following disclaimer in the +- documentation and/or other materials provided with the distribution. +- +- Neither the name Texas Instruments, Inc nor the names of its +- contributors may be used to endorse or promote products derived +- from this software without specific prior written permission. +- +- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +- POSSIBILITY OF SUCH DAMAGE. +- +-*/ +-class QTSLibHandlerPrivate : public QCalibratedMouseHandler +-{ +- Q_OBJECT +-public: +- QTSLibHandlerPrivate(); +- ~QTSLibHandlerPrivate(); +- +- virtual void clearCalibration(); +- virtual void calibrate( QWSPointerCalibrationData * ); +- static int sortByX( const void*, const void* ); +- static int sortByY( const void*, const void* ); +- +-private: +- bool m_raw : 1; +- QSocketNotifier *m_notify; +- +-#ifdef QT_QWS_TSLIB +- struct tsdev *m_ts; +-#endif +- void openTs(); +- void closeTs(); +- void interpolateSample(); +- +-private slots: +- void readMouseData(); +- +-}; +- +-QTSLibHandlerPrivate::QTSLibHandlerPrivate() +- : m_raw(false), m_notify(0 ) +-{ +- openTs(); +-} +- +-QTSLibHandlerPrivate::~QTSLibHandlerPrivate() +-{ +- closeTs(); +-} +- +-void QTSLibHandlerPrivate::openTs() +-{ +-#ifdef QT_QWS_TSLIB +- char *tsdevice; +- if((tsdevice = getenv("TSLIB_TSDEVICE")) != NULL) { +- m_ts = ts_open( tsdevice, 1 ); //1 = nonblocking, 0 = blocking mode +- } else { +- m_ts = ts_open( "/dev/ts", 1 ); +- } +- +- if (!m_ts) { +- qWarning( "Cannot open touchscreen (%s)", strerror( errno)); +- return; +- } +- +- if (ts_config( m_ts)) { +- qWarning( "Cannot configure touchscreen (%s)", strerror( errno)); +- return; +- } +- m_notify = new QSocketNotifier( ts_fd(m_ts), QSocketNotifier::Read, this ); +- connect( m_notify, SIGNAL(activated(int)),this, SLOT(readMouseData())); +-#endif +-} +- +-void QTSLibHandlerPrivate::closeTs() +-{ +-#ifdef QT_QWS_TSLIB +- if (m_ts) +- ts_close(m_ts); +- m_ts = 0; +-#endif +- +- delete m_notify; +- m_notify = 0; +- m_raw = false; +-} +- +-void QTSLibHandlerPrivate::clearCalibration() +-{ +- m_raw = true; +-} +- +-void QTSLibHandlerPrivate::calibrate( QWSPointerCalibrationData * cd) +-{ +- QPoint dev_tl = cd->devPoints[ QWSPointerCalibrationData::TopLeft ]; +- QPoint dev_br = cd->devPoints[ QWSPointerCalibrationData::BottomRight ]; +- QPoint screen_tl = cd->screenPoints[ QWSPointerCalibrationData::TopLeft ]; +- QPoint screen_br = cd->screenPoints[ QWSPointerCalibrationData::BottomRight ]; +- int a, b, c, d, e, f, s; +- +- s = 1 << 16; + +- a = s * (screen_tl.x() - screen_br.x() ) / (dev_tl.x() - dev_br.x()); +- b = 0; +- c = s * screen_tl.x() - a * dev_tl.x(); ++ // up->up ++ if (oldP==0 && myP==0) { ++ //qDebug("uu %d,%d,%d", myX,myY,myP); ++ return; ++ } + +- d = 0; +- e = s * (screen_tl.y() - screen_br.y() ) / (dev_tl.y() - dev_br.y()); +- f = s * screen_tl.y() - e * dev_tl.y(); ++ // up->down ++ if (oldP==0 && myP>QT_QWS_TP_PRESSURE_DOWN_THRESHOLD) { ++ //qDebug("ud %d,%d,%d", myX,myY,myP); + +- QString calFile = "/etc/pointercal"; +-#ifndef QT_NO_TEXTSTREAM +- QFile file( calFile ); +- if ( file.open( IO_WriteOnly ) ) { +- QTextStream t( &file ); +- t << a << " " << b << " " << c << " "; +- t << d << " " << e << " " << f << " " << s; +- file.flush(); closeTs(); +- openTs(); +- } else +-#endif +- { +- qDebug( "Could not save calibration: %s", calFile.latin1() ); +- } +-} ++ xtable[0] = myX; ++ ytable[0] = myY; ++ ptr = 1; ++ oldX = myX; ++ oldY = myY; ++ oldP = myP; ++ return; ++ } + +-void QTSLibHandlerPrivate::readMouseData() +-{ +-#ifdef QT_QWS_TSLIB +- if(!qt_screen) +- return; ++ // down->down ++ if (oldP>QT_QWS_TP_PRESSURE_DOWN_THRESHOLD && myP>QT_QWS_TP_PRESSURE_UP_THRESHOLD) { ++ //qDebug("dd %d,%d,%d (%d,%d)", myX,myY,myP, oldX,oldY); + +- /* +- * After clear Calibration +- * we're in raw mode and do some easy median +- * search. +- */ +- if ( m_raw ) +- return interpolateSample(); ++ int dxSqr = myX-oldX; dxSqr *= dxSqr; ++ int dySqr = myY-oldY; dySqr *= dySqr; ++ oldX = myX; ++ oldY = myY; ++ if (dxSqr+dySqr > QT_QWS_TP_MOVE_MAX*QT_QWS_TP_MOVE_MAX) { ++ //qWarning("distance too wide %d", dxSqr+dySqr); ++ return; ++ } + +- static struct ts_sample sample; +- static int ret; ++ if (ptr < QT_QWS_TP_TABLE_SIZE) { ++ xtable[ptr] = myX; ++ ytable[ptr++] = myY; ++ } + +- /* +- * Ok. We need to see if we can read more than one event +- * We do this not to lose an update. +- */ +- while ( true ) { +- if ((ret = ts_read(m_ts, &sample, 1)) != 1 ) +- return; ++ if (ptr == QT_QWS_TP_TABLE_SIZE) { ++ int i; ++ int mx = 0; ++ int my = 0; ++ for (i=0; i0) { ++ xtable[i-1] = xtable[i]; ++ ytable[i-1] = ytable[i]; ++ } ++ } ++ ptr--; ++ mousePos = transform(QPoint(mx/QT_QWS_TP_TABLE_SIZE, my/QT_QWS_TP_TABLE_SIZE)); + ++ emit mouseChanged(mousePos, Qt::LeftButton); ++ } ++ return; ++ } + +- QPoint pos( sample.x, sample.y ); +- mouseChanged( pos, sample.pressure != 0 ? 1 : 0 ); +- } +-#endif ++ // down->up ++ //qDebug("du %d,%d,%d", myX,myY,myP); ++ emit mouseChanged(mousePos, 0); ++ oldP = 0; + } + +-/* +- * Lets take all down events and then sort them +- * and take the event in the middle. +- * +- * inspired by testutils.c +- */ +-void QTSLibHandlerPrivate::interpolateSample() { +-#ifdef QT_QWS_TSLIB +-#define TSLIB_MAX_SAMPLES 25 +- static struct ts_sample samples[TSLIB_MAX_SAMPLES]; +- int index = 0; +- int read_samples = 0; +- int ret; +- +- do { +- /* do not access negative arrays */ +- if ( index < 0 ) +- index = 0; +- +- /* we're opened non-blocking */ +- if((ret= ts_read_raw(m_ts, &samples[index], 1 ) ) != 1 ) +- /* no event yet, so try again */ +- if (ret==-1 ) +- continue; +- +- read_samples++; +- index = (index+1)%TSLIB_MAX_SAMPLES; +- }while (samples[index == 0 ? (TSLIB_MAX_SAMPLES-1) : index-1].pressure != 0); +- +- /* +- * If we've wrapped around each sample is used otherwise +- * we will use the index +- */ +- index = read_samples >= TSLIB_MAX_SAMPLES ? +- (TSLIB_MAX_SAMPLES-1 ) : index; +- int x, y; +- +- /* +- * now let us use the median value +- * even index does not have an item in the middle +- * so let us take the average of n/2 and (n/2)-1 as the middle +- */ +- int m = index/2; +- ::qsort(samples, index, sizeof(ts_sample), QTSLibHandlerPrivate::sortByX); +- x = (index % 2 ) ? samples[m].x : +- ( samples[m-1].x + samples[m].x )/2; +- +- ::qsort(samples, index, sizeof(ts_sample), QTSLibHandlerPrivate::sortByY); +- y = (index % 2 ) ? samples[m].y : +- ( samples[m-1].y + samples[m].y )/2; + +- emit mouseChanged( QPoint(x, y), 1 ); +- emit mouseChanged( QPoint(0, 0), 0 ); +-#endif +-} + +-int QTSLibHandlerPrivate::sortByX( const void* one, const void* two) { +-#ifdef QT_QWS_TSLIB +- return reinterpret_cast(one)->x - +- reinterpret_cast(two)->x; +-#else +- return 0; +-#endif +-} + +-int QTSLibHandlerPrivate::sortByY( const void* one, const void* two) { +-#ifdef QT_QWS_TSLIB +- return reinterpret_cast(one)->y - +- reinterpret_cast(two)->y; +-#else +- return 0; +-#endif +-} +-////// + + /* + * return a QWSMouseHandler that supports /a spec. +@@ -1977,7 +519,7 @@ + + if ( mouseProto == "USB" && mouseDev.isEmpty() ) + mouseDev = "/dev/input/mice"; +- ++ + MouseProtocol mouseProtocol = Unknown; + + int idx = 0; +@@ -1988,50 +530,7 @@ + idx++; + } + +- +- QWSMouseHandler *handler = 0; +- +- switch ( mouseProtocol ) { +-#ifndef QT_NO_QWS_MOUSE_AUTO +- case Auto: +- handler = new QAutoMouseHandler(); +- break; +-#endif +- +-#ifndef QT_NO_QWS_MOUSE_PC +- case MouseMan: +- case IntelliMouse: +- case Microsoft: +- case BusMouse: +- handler = new QWSMouseHandlerPrivate( mouseProtocol, mouseDev ); +- break; +-#endif +- +-#ifndef QT_NO_QWS_VFB +- case QVFBMouse: +- handler = new QVFbMouseHandlerPrivate( mouseProtocol, mouseDev ); +- break; +-#endif +- +- case TPanel: +-#if defined(QWS_CUSTOMTOUCHPANEL) +- handler = new QCustomTPanelHandlerPrivate(mouseProtocol,mouseDev); +-#elif defined(QT_QWS_TSLIB) +- handler = new QTSLibHandlerPrivate(); +-#elif defined(QT_QWS_YOPY) +- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); +-#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) +- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); +-#elif defined(QT_QWS_CASSIOPEIA) +- handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); +-#endif +- break; +- +- default: +- qDebug( "Mouse type %s unsupported", spec.latin1() ); +- } +- +- return handler; ++ return new QInputEventHandler( mouseProtocol, mouseDev ); + } + + #include "qwsmouse_qws.moc" +--- qt-2.3.10/src/kernel/qwsmouse_qws.h~ramses-touchscreen ++++ qt-2.3.10/src/kernel/qwsmouse_qws.h +@@ -1,5 +1,5 @@ + /**************************************************************************** +-** $Id: qt/src/kernel/qwsmouse_qws.h 2.3.10 edited 2005-01-24 $ ++** $Id: qt/src/kernel/qwsmouse_qws.h 2.3.7 edited 2001-10-03 $ + ** + ** Definition of Qt/FB central server classes + ** +@@ -70,6 +70,7 @@ + virtual void clearCalibration(); + virtual void calibrate( QWSPointerCalibrationData * ); + virtual void getCalibration( QWSPointerCalibrationData * ); ++ virtual void setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss); + + protected: + void readCalibration(); diff --git a/packages/qte/qte-2.3.10/deprecated/mnci.patch b/packages/qte/qte-2.3.10/deprecated/mnci.patch new file mode 100644 index 0000000000..c2e0e079d9 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/mnci.patch @@ -0,0 +1,125 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~ramses.patch ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp +@@ -249,20 +249,12 @@ + + static void writeTerm(const char* termctl, int sizeof_termctl) + { +-#ifdef QT_QWS_DEVFS +- const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; +-#else +- const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; +-#endif +- const char** dev=tt; +- while (*dev) { +- int tty=::open(*dev,O_WRONLY); ++qWarning("writeTerm"); ++ int tty=::open("/dev/vc/2", O_WRONLY); + if ( tty>=0 ) { + ::write(tty,termctl,sizeof_termctl); + ::close(tty); + } +- dev++; +- } + } + + /*! +@@ -275,6 +267,7 @@ + + bool QLinuxFbScreen::initDevice() + { ++qWarning("QLinuxFbScreen::initDevice"); + /* Setting up the VT parameters is done in qapplication_qws.cpp + const char termctl[]="\033[9;0]\033[?33l\033[?25l"; + writeTerm(termctl,sizeof(termctl)); */ +@@ -765,9 +758,12 @@ + } + */ + ++qWarning("QLinuxFbScreen::shutdownDevice"); ++/* + // Blankin' screen, blinkin' cursor! + const char termctl[] = "\033[9;15]\033[?33h\033[?25h\033[?0c"; + writeTerm(termctl,sizeof(termctl)); ++*/ + } + + /*! +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~ramses.patch ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp +@@ -1756,8 +1756,6 @@ + */ + if ( qws_daemon ) + { +- qWarning( "qt_init() - starting in daemon mode..." ); +- + int pid1 = fork(); + if ( pid1 == -1 ) + { +@@ -1791,7 +1789,6 @@ + } + if ( pid2 ) + { +- syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 ); + _exit( 0 ); // ok, second fork performed + } + } +@@ -1828,9 +1825,12 @@ + #if defined(_OS_LINUX_) + if ( qws_terminal_id ) + { +- qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id ); + struct vt_stat console_stat; ++#ifdef QT_QWS_DEVFS ++ int console_fd = ::open( QString().sprintf( "/dev/vc/%d", qws_terminal_id ).latin1(), O_RDWR ); ++#else + int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR ); ++#endif + if ( console_fd == -1) + { + qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); +@@ -1927,7 +1927,11 @@ + { + qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old ); + ++#ifdef QT_QWS_DEVFS ++ int console_fd = ::open( "/dev/vc/0", O_RDWR ); ++#else + int console_fd = ::open( "/dev/tty0", O_RDWR ); ++#endif + if ( console_fd == -1) + { + qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); +--- qt-2.3.10/src/kernel/qwindowsystem_qws.cpp~ramses.patch ++++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp +@@ -1791,6 +1791,7 @@ + } + + #ifndef QT_NO_QWS_KEYBOARD ++#ifndef QT_QWS_RAMSES + static int keyUnicode(int keycode) + { + const QWSServer::KeyMap *km = QWSServer::keyMap(); +@@ -1803,6 +1804,7 @@ + return 0xffff; + } + #endif ++#endif + /*! + Send a key event. You can use this to send key events generated by + "virtual keyboards". +@@ -1845,8 +1847,10 @@ + + event.simpleData.unicode = + #ifndef QT_NO_QWS_KEYBOARD ++#ifndef QT_QWS_RAMSES + unicode < 0 ? keyUnicode(keycode) : + #endif ++#endif + unicode; + event.simpleData.keycode = keycode; + event.simpleData.modifiers = modifiers; diff --git a/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty b/packages/qte/qte-2.3.10/deprecated/openmn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp new file mode 100644 index 0000000000..9917675a43 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.cpp @@ -0,0 +1,584 @@ +/**************************************************************************** +** $Id: qt/src/kernel/qkeyboard_qws.cpp 2.3.7 edited 2003-05-30 $ +** +** Implementation of Qt/Embedded keyboard drivers +** +** Created : 991025 +** +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. +** +** This file is part of the kernel module of the Qt GUI Toolkit. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses for Qt/Embedded may use this file in accordance with the +** Qt Embedded Commercial License Agreement provided with the Software. +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for +** information about Qt Commercial License Agreements. +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact info@trolltech.com if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +#include "qwindowsystem_qws.h" +#include "qwsutils_qws.h" +#include "qgfx_qws.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef QT_NO_QWS_KEYBOARD + +#include +#include +#include +#include +#include + +#define VTSWITCHSIG SIGUSR2 + +static bool vtActive = true; +static int vtQws = 0; +static int kbdFD = -1; + +static QIntDict *overrideMap = 0; + +/*! + Changes the mapping of the keyboard; adding the scancode to Unicode + mappings from \a map. The server takes over ownership of \a map + and will delete it. Use QCollection::setAutoDelete() to control + whether the contents of \a map should be deleted. + + Passing a null pointer for \a map will revert to the default keymap. +*/ + +void QWSServer::setOverrideKeys( QIntDict *map ) +{ + delete overrideMap; + overrideMap = map; +} + +/*! + \class QWSKeyboardHandler qkeyboard_qws.h + \brief Keyboard driver/handler for Qt/Embedded + + The keyboard driver/handler handles events from system devices and + generates key events. + + A QWSKeyboardHandler will usually open some system device in its + constructor, create a QSocketNotifier on that opened device and when + it receives data, it will call processKeyEvent() to send the event + to Qt/Embedded for relaying to clients. +*/ + +/*! + Subclasses call this to send a key event. The server may additionally + filter it before sending it on to applications. + +
    +
  • \a unicode is the Unicode value for the key, or 0xffff if none is appropriate. +
  • \a keycode is the Qt keycode for the key (see Qt::Key). + for the list of codes). +
  • \a modifiers is the set of modifier keys (see Qt::Modifier). +
  • \a isPress says whether this is a press or a release. +
  • \a autoRepeat says whether this event was generated by an auto-repeat + mechanism, or an actual key press. +
+*/ +void QWSKeyboardHandler::processKeyEvent(int unicode, int keycode, int modifiers, + bool isPress, bool autoRepeat) +{ + qwsServer->processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); +} + + +bool qwsSetKeyboardAutoRepeat( int /* delay */ , int /* period */ ) +{ + return FALSE; +} + +bool qwsGetKeyboardAutoRepeat( int /* delay */ , int /* period */ ) +{ + return FALSE; +} + +void qwsRestoreKeyboardLeds() +{ +} + + + + + +/* + * Virtual framebuffer keyboard driver + */ + +class QWSVFbKeyboardHandler : public QWSKeyboardHandler +{ + Q_OBJECT +public: + QWSVFbKeyboardHandler(); + virtual ~QWSVFbKeyboardHandler(); + + bool isOpen() { return fd > 0; } + +private slots: + void readKeyboardData(); + +private: + QString terminalName; + int fd; + int kbdIdx; + int kbdBufferLen; + unsigned char *kbdBuffer; + QSocketNotifier *notifier; +}; + +#ifndef QT_NO_QWS_VFB +#include "qvfbhdr.h" +extern int qws_display_id; +#endif + +QWSVFbKeyboardHandler::QWSVFbKeyboardHandler() +{ + kbdFD = -1; +#ifndef QT_NO_QWS_VFB + kbdIdx = 0; + kbdBufferLen = sizeof( QVFbKeyData ) * 5; + kbdBuffer = new unsigned char [kbdBufferLen]; + + terminalName = QString(QT_VFB_KEYBOARD_PIPE).arg(qws_display_id); + + if ((kbdFD = open( terminalName.local8Bit(), O_RDWR | O_NDELAY)) < 0) { + qDebug( "Cannot open %s (%s)", terminalName.latin1(), + strerror(errno)); + } else { + // Clear pending input + char buf[2]; + while (read(kbdFD, buf, 1) > 0) { } + + notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); + connect(notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData())); + } +#endif +} + +QWSVFbKeyboardHandler::~QWSVFbKeyboardHandler() +{ +#ifndef QT_NO_QWS_VFB + if ( kbdFD >= 0 ) + close( kbdFD ); + delete [] kbdBuffer; +#endif +} + + +void QWSVFbKeyboardHandler::readKeyboardData() +{ +#ifndef QT_NO_QWS_VFB + int n; + do { + n = read(kbdFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx ); + if ( n > 0 ) + kbdIdx += n; + } while ( n > 0 ); + + int idx = 0; + while ( kbdIdx - idx >= (int)sizeof( QVFbKeyData ) ) { + QVFbKeyData *kd = (QVFbKeyData *)(kbdBuffer + idx); + if ( kd->unicode == 0 && kd->modifiers == 0 && kd->press ) { + // magic exit key + qWarning( "Instructed to quit by Virtual Keyboard" ); + qApp->quit(); + } + processKeyEvent( kd->unicode&0xffff, kd->unicode>>16, + kd->modifiers, kd->press, kd->repeat ); + idx += sizeof( QVFbKeyData ); + } + + int surplus = kbdIdx - idx; + for ( int i = 0; i < surplus; i++ ) + kbdBuffer[i] = kbdBuffer[idx+i]; + kbdIdx = surplus; +#endif +} + + + + +struct termios origTermData; + +static void init_kbd(void) +{ + struct termios termdata; + + tcgetattr( kbdFD, &origTermData ); + tcgetattr( kbdFD, &termdata ); + + ioctl(kbdFD, KDSKBMODE, K_XLATE); + + termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); + termdata.c_oflag = 0; + termdata.c_cflag = CREAD | CS8; + termdata.c_lflag = 0; + termdata.c_cc[VTIME]=0; + termdata.c_cc[VMIN]=1; + cfsetispeed(&termdata, 9600); + cfsetospeed(&termdata, 9600); + tcsetattr(kbdFD, TCSANOW, &termdata); +} + +static void done_kbd(void) +{ + if (kbdFD >= 0) { + tcsetattr(kbdFD, TCSANOW, &origTermData); + } +} + +static void vtSwitchHandler(int /*sig*/) +{ + if (vtActive) { + qwsServer->enablePainting(false); + qt_screen->save(); + if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) { + vtActive = false; + qwsServer->closeMouse(); + done_kbd(); + } + else { + qwsServer->enablePainting(true); + } + usleep(200000); + } + else { + if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) { + init_kbd(); + qwsServer->enablePainting(true); + vtActive = true; + qt_screen->restore(); + qwsServer->openMouse(); + qwsServer->refresh(); + } + } + signal(VTSWITCHSIG, vtSwitchHandler); +} + + + +class QWSRamsesKbPrivate; +class QWSRamsesKeyboardHandler : public QWSKeyboardHandler +{ +public: + QWSRamsesKeyboardHandler( const QString& ); + virtual ~QWSRamsesKeyboardHandler(); + + virtual void processKeyEvent(int unicode, int keycode, int modifiers, + bool isPress, bool autoRepeat); + +private: + QWSRamsesKbPrivate *d; +}; + + +class QWSRamsesKbPrivate : public QObject +{ + Q_OBJECT +public: + QWSRamsesKbPrivate( QWSRamsesKeyboardHandler *, const QString &device ); + ~QWSRamsesKbPrivate(); + +private slots: + void readKeyboardData(); + +private: + void handleKey(unsigned char code, int n); + + QWSRamsesKeyboardHandler *handler; + char rbuf[255]; + int rptr; +}; + +QWSRamsesKbPrivate::QWSRamsesKbPrivate( QWSRamsesKeyboardHandler *h, const QString &device ) + : handler(h), rptr(0) +{ +#ifdef QT_QWS_DEVFS + kbdFD = ::open(device.isEmpty()?"/dev/vc/2":device.latin1(), O_RDWR|O_NDELAY, 0); +#else + kbdFD = ::open(device.isEmpty()?"/dev/tty2":device.latin1(), O_RDWR|O_NDELAY, 0); +#endif + + if ( kbdFD >= 0 ) { + QSocketNotifier *notifier; + notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); + connect( notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData()) ); + } else { + qDebug( "Cannot open keyboard" ); + } + init_kbd(); + + struct vt_mode vtMode; + ioctl(kbdFD, VT_GETMODE, &vtMode); + + // let us control VT switching + vtMode.mode = VT_PROCESS; + vtMode.relsig = VTSWITCHSIG; + vtMode.acqsig = VTSWITCHSIG; + ioctl(kbdFD, VT_SETMODE, &vtMode); + + struct vt_stat vtStat; + ioctl(kbdFD, VT_GETSTATE, &vtStat); + vtQws = vtStat.v_active; + + signal(VTSWITCHSIG, vtSwitchHandler); +} + +QWSRamsesKbPrivate::~QWSRamsesKbPrivate() +{ + signal(VTSWITCHSIG, 0); + + done_kbd(); + + struct vt_mode vtMode; + ioctl(kbdFD, VT_GETMODE, &vtMode); + /* Mickey says: "Better give up control of VT switching. + * Hey, I really hate that OS-will-reacquire-resources on process-death + * kind of thinking! + */ + vtMode.mode = VT_AUTO; + vtMode.relsig = 0; + vtMode.acqsig = 0; + ioctl(kbdFD, VT_SETMODE, &vtMode); + + ::close(kbdFD); + kbdFD = -1; +} + + +static inline int map_to_modif(int current_map) +{ + int modifiers = 0; + + if (current_map & KG_ALT) + modifiers |= Qt::ALT; + else if (current_map & KG_CTRL) + modifiers |= Qt::CTRL; + else if (current_map & KG_SHIFT) + modifiers |= Qt::SHIFT; + + return modifiers; +} + +struct { + const char *code; + unsigned short qtcode; +} qtesc_lookup[] = { + { "\e[A", Qt::Key_Up }, + { "\e[B", Qt::Key_Down }, + { "\e[C", Qt::Key_Right }, + { "\e[D", Qt::Key_Left }, + { "\e[1~", Qt::Key_Home }, + { "\e[4~", Qt::Key_End }, + { "\e[5~", Qt::Key_PageUp }, + { "\e[6~", Qt::Key_PageDown }, + + { "\e[[A", Qt::Key_F1 }, + { "\e[[B", Qt::Key_F2 }, + { "\e[[C", Qt::Key_F3 }, + { "\e[[D", Qt::Key_F4 }, + { "\e[[E", Qt::Key_F5 }, + { "\e[17~", Qt::Key_F6 }, + { "\e[18~", Qt::Key_F7 }, + { "\e[19~", Qt::Key_F8 }, + { "\e[20~", Qt::Key_F9 }, + { "\e[21~", Qt::Key_F10 }, + { "\e[23~", Qt::Key_F11 }, + { "\e[24~", Qt::Key_F12 }, + + // { "\ex", Qt::FieldExit }, + // { "\er", Qt::FieldReset }, + +}; + +struct { + unsigned char code; + unsigned short qtcode; +} qtkey_lookup[] = { + { 0x08, Qt::Key_Backspace }, + { 0x09, Qt::Key_Tab }, + { 0x0d, Qt::Key_Enter }, + { 0x1b, Qt::Key_Escape }, +}; + +void QWSRamsesKbPrivate::handleKey(unsigned char code, int n) +{ + int qtKeyCode = Qt::Key_unknown; + unsigned int i; + + //qDebug("\nhandleKey %02x %d %c", code, n, code >= ' ' ? code : ' '); + + // Single keys + if ((n==1) && (rptr==0)) { + qtKeyCode = code; + for (i=0; i < sizeof(qtkey_lookup)/sizeof(qtkey_lookup[0]); i++) { + if (qtkey_lookup[i].code == code) { + qtKeyCode = qtkey_lookup[i].qtcode; + code = 0; + break; + } + } + } else + + // Alt- sequence + if ((n==1) && (rptr==1) && (rbuf[0] == '\e')) { + //qDebug("alt-key %d", code); + handler->processKeyEvent(0, Qt::Key_Alt, 0, 1, 0); + handler->processKeyEvent(0, code-32, Qt::ALT, 1, 0); + handler->processKeyEvent(0, code-32, Qt::ALT, 0, 0); + handler->processKeyEvent(0, Qt::Key_Alt, 0, 0, 0); + rptr = 0; + return; + } else + + // End of a function key sequence + if ((n==1) && (rptr!=0)) { + rbuf[rptr++] = code; + rbuf[rptr] = 0; + for (i=0; i < sizeof(qtesc_lookup)/sizeof(qtesc_lookup[0]); i++) { + if (strncmp(rbuf, qtesc_lookup[i].code, sizeof(rbuf)) == 0) { + qtKeyCode = qtesc_lookup[i].qtcode; + code = 0; + break; + } + } + if (code != 0) { + //qWarning("no entry in key sequence table for %s", &rbuf[1]); + int oldrptr = rptr; + rptr = 0; + for (i=0; i <= oldrptr; i++) { + handleKey(rbuf[i], 1); + } + return; + } + rptr = 0; + } else + + // Middle of a function key sequence + { + if (rptr < sizeof(rbuf)) + rbuf[rptr++] = code; + return; + } + + //qDebug(" code 0x%2x %d -> qtKeyCode 0x%04x", code, code, qtKeyCode); + + handler->processKeyEvent(code, qtKeyCode, 0, 1, 0); + handler->processKeyEvent(code, qtKeyCode, 0, 0, 0); +} + + +void QWSRamsesKbPrivate::readKeyboardData() +{ + unsigned char buf[81]; + int n = read(kbdFD, buf, 80 ); + for ( int loop = 0; loop < n; loop++ ) { + handleKey(buf[loop], n-loop); + } +} + + + + + +QWSRamsesKeyboardHandler::QWSRamsesKeyboardHandler( const QString &device ) +{ + d = new QWSRamsesKbPrivate( this, device ); +} + +QWSRamsesKeyboardHandler::~QWSRamsesKeyboardHandler() +{ + delete d; +} + +void QWSRamsesKeyboardHandler::processKeyEvent(int unicode, int keycode, + int modifiers, bool isPress, bool autoRepeat) +{ + // Virtual console switching + int term = 0; + bool ctrl = modifiers & Qt::ControlButton; + bool alt = modifiers & Qt::AltButton; + if (ctrl && alt && keycode >= Qt::Key_F1 && keycode <= Qt::Key_F10) + term = keycode - Qt::Key_F1 + 1; + else if (ctrl && alt && keycode == Qt::Key_Left) + term = QMAX(vtQws - 1, 1); + else if (ctrl && alt && keycode == Qt::Key_Right) + term = QMIN(vtQws + 1, 10); + if (term && !isPress) { + ioctl(kbdFD, VT_ACTIVATE, term); + return; + } + + QWSKeyboardHandler::processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); +} + + + +/* + * keyboard driver instantiation + */ + +QWSKeyboardHandler *QWSServer::newKeyboardHandler( const QString &spec ) +{ + QWSKeyboardHandler *handler = 0; + + QString device; + QString type; + int colon=spec.find(':'); + if ( colon>=0 ) { + type = spec.left(colon); + device = spec.mid(colon+1); + } else { + type = spec; + } + + if ( type == "QVFbKeyboard" ) { + handler = new QWSVFbKeyboardHandler(); + } else if ( type == "TTY" ) { + handler = new QWSRamsesKeyboardHandler(device); + } else { + qWarning( "Keyboard type %s:%s unsupported", spec.latin1(), device.latin1() ); + } + + return handler; +} + +#include "qkeyboard_qws.moc" + +#endif // QT_NO_QWS_KEYBOARD + + diff --git a/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h new file mode 100644 index 0000000000..aa459d1448 --- /dev/null +++ b/packages/qte/qte-2.3.10/deprecated/openmn/qkeyboard_qws.h @@ -0,0 +1,56 @@ +/**************************************************************************** +** $Id: qt/src/kernel/qkeyboard_qws.h 2.3.10 edited 2005-01-24 $ +** +** Definition of Qt/Embedded keyboards +** +** Created : 991025 +** +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. +** +** This file is part of the kernel module of the Qt GUI Toolkit. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses for Qt/Embedded may use this file in accordance with the +** Qt Embedded Commercial License Agreement provided with the Software. +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for +** information about Qt Commercial License Agreements. +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact info@trolltech.com if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +#ifndef QKEYBOARD_QWS_H +#define QKEYBOARD_QWS_H + +#ifndef QT_H +#include "qobject.h" +#endif // QT_H + +#ifndef QT_NO_QWS_KEYBOARD +class Q_EXPORT QWSKeyboardHandler : public QObject { + Q_OBJECT +public: + QWSKeyboardHandler(); + virtual ~QWSKeyboardHandler(); + +protected: + virtual void processKeyEvent(int unicode, int keycode, int modifiers, + bool isPress, bool autoRepeat); +}; +#endif + +Q_EXPORT bool qwsSetKeyboardAutoRepeat( int delay, int period ); +Q_EXPORT bool qwsGetKeyboardAutoRepeat( int *delay, int *period ); + +#endif diff --git a/packages/qte/qte-2.3.10/mnci-touchscreen.patch b/packages/qte/qte-2.3.10/mnci-touchscreen.patch deleted file mode 100644 index 570c2ff290..0000000000 --- a/packages/qte/qte-2.3.10/mnci-touchscreen.patch +++ /dev/null @@ -1,1987 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.10/src/kernel/qwsmouse_qws.cpp~ramses-touchscreen -+++ qt-2.3.10/src/kernel/qwsmouse_qws.cpp -@@ -1,5 +1,5 @@ - /**************************************************************************** --** $Id: qt/src/kernel/qwsmouse_qws.cpp 2.3.10 edited 2005-01-24 $ -+** $Id: qt/src/kernel/qwsmouse_qws.cpp 2.3.7 edited 2003-02-04 $ - ** - ** Implementation of Qt/Embedded mouse drivers - ** -@@ -47,85 +47,32 @@ - #include - #include - #include --#include - #include - #include - #include - #include - #include - -+ - #include - #if !defined(_OS_QNX6_) - --#ifdef QT_QWS_CASSIOPEIA --#include --#endif --#ifdef QT_QWS_TSLIB --#include --#endif -- -- --//#define QT_QWS_K2 -- --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_K2) --#define QT_QWS_IPAQ_RAW --typedef struct { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; -- struct timeval stamp; --} TS_EVENT; --#elif defined(QT_QWS_SL5XXX) --#define QT_QWS_SL5XXX_RAW --typedef struct { -- long y; -- long x; -- long pressure; -- long long millisecs; --} TS_EVENT; --#define QT_QWS_TP_SAMPLE_SIZE 10 --#define QT_QWS_TP_MINIMUM_SAMPLES 4 --#define QT_QWS_TP_PRESSURE_THRESHOLD 500 --#define QT_QWS_TP_MOVE_LIMIT 50 --#define QT_QWS_TP_JITTER_LIMIT 2 --#elif defined(QT_QWS_SLC700) --#define QT_QWS_SLC700_RAW --typedef struct { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short millisecs; --} TS_EVENT; --#define QT_QWS_TP_SAMPLE_SIZE 10 --#define QT_QWS_TP_MINIMUM_SAMPLES 4 --#define QT_QWS_TP_PRESSURE_THRESHOLD 500 --#define QT_QWS_TP_MOVE_LIMIT 50 --#define QT_QWS_TP_JITTER_LIMIT 2 --#endif -- --#ifndef QT_QWS_TP_SAMPLE_SIZE --#define QT_QWS_TP_SAMPLE_SIZE 5 --#endif -- --#ifndef QT_QWS_TP_MINIMUM_SAMPLES --#define QT_QWS_TP_MINIMUM_SAMPLES 5 -+#ifndef QT_QWS_TP_PRESSURE_DOWN_THRESHOLD -+#define QT_QWS_TP_PRESSURE_DOWN_THRESHOLD 500 - #endif - --#ifndef QT_QWS_TP_PRESSURE_THRESHOLD --#define QT_QWS_TP_PRESSURE_THRESHOLD 1 -+#ifndef QT_QWS_TP_PRESSURE_UP_THRESHOLD -+#define QT_QWS_TP_PRESSURE_UP_THRESHOLD 450 - #endif - --#ifndef QT_QWS_TP_MOVE_LIMIT --#define QT_QWS_TP_MOVE_LIMIT 100 -+#ifndef QT_QWS_TP_TABLE_SIZE -+#define QT_QWS_TP_TABLE_SIZE 2 - #endif - --#ifndef QT_QWS_TP_JITTER_LIMIT --#define QT_QWS_TP_JITTER_LIMIT 2 -+#ifndef QT_QWS_TP_MOVE_MAX -+#define QT_QWS_TP_MOVE_MAX 100 - #endif - --//#define QWS_CUSTOMTOUCHPANEL -- - /*! - \class QWSMouseHandler qwsmouse_qws.h - \brief Mouse driver/handler for Qt/Embedded -@@ -168,8 +115,7 @@ - enum MouseProtocol { Unknown = -1, Auto = 0, - MouseMan, IntelliMouse, Microsoft, - QVFBMouse, TPanel, BusMouse, -- FirstAuto = MouseMan, -- LastAuto = Microsoft }; -+ }; - - static void limitToScreen( QPoint &pt ) - { -@@ -186,810 +132,14 @@ - } MouseConfig; - - static const MouseConfig mouseConfig[] = { --#ifndef QT_NO_QWS_MOUSE_AUTO - { "Auto", Auto }, --#endif --#ifndef QT_NO_QWS_MOUSE_PC -- { "MouseMan", MouseMan }, -- { "IntelliMouse", IntelliMouse }, -- { "USB", IntelliMouse }, -- { "Microsoft", Microsoft }, --#endif --#ifndef QT_NO_QWS_VFB - { "QVFbMouse", QVFBMouse }, --#endif - { "TPanel", TPanel }, -- { "BusMouse", BusMouse }, - { 0, Unknown } - }; - --#ifndef QT_NO_QWS_MOUSE_AUTO --/* -- * Automatic-detection mouse driver -- */ -- --class QAutoMouseSubHandler { --protected: -- enum { max_buf=32 }; -- -- int fd; -- -- uchar buffer[max_buf]; -- int nbuf; -- -- QPoint motion; -- int bstate; -- -- int goodness; -- int badness; -- -- virtual int tryData()=0; -- --public: -- QAutoMouseSubHandler(int f) : fd(f) -- { -- nbuf = bstate = goodness = badness = 0; -- } -- -- int file() const { return fd; } -- -- void closeIfNot(int& f) -- { -- if ( fd != f ) { -- f = fd; -- close(fd); -- } -- } -- -- void worse(int by=1) { badness+=by; } -- bool reliable() const { return goodness >= 5 && badness < 50; } -- int buttonState() const { return bstate; } -- bool motionPending() const { return motion!=QPoint(0,0); } -- QPoint takeMotion() { QPoint r=motion; motion=QPoint(0,0); return r; } -- -- void appendData(uchar* data, int length) -- { -- memcpy(buffer+nbuf, data, length); -- nbuf += length; -- } -- -- enum UsageResult { Insufficient, Motion, Button }; -- -- UsageResult useData() -- { -- int pbstate = bstate; -- int n = tryData(); -- if ( n > 0 ) { -- if ( n 0 ) { -- goodness = 10; -- switch ( reply[n-1] ) { -- case 3: -- case 4: -- packetsize = 4; -- break; -- default: -- packetsize = 3; -- } -- } else { -- badness = 100; -- } -- } -- -- int tryData() -- { -- if ( nbuf >= packetsize ) { -- //int overflow = (buffer[0]>>6 )& 0x03; -- -- if ( /*overflow ||*/ !(buffer[0] & 8) ) { -- badness++; -- return 1; -- } else { -- motion += -- QPoint((buffer[0] & 0x10) ? buffer[1]-256 : buffer[1], -- (buffer[0] & 0x20) ? 256-buffer[2] : -buffer[2]); -- int nbstate = buffer[0] & 0x7; -- if ( motion.x() || motion.y() || bstate != nbstate ) { -- bstate = nbstate; -- goodness++; -- } else { -- badness++; -- return 1; -- } -- } -- return packetsize; -- } -- return 0; -- } --}; -- --class QAutoMouseSubHandler_serial : public QAutoMouseSubHandler { --public: -- QAutoMouseSubHandler_serial(int f) : QAutoMouseSubHandler(f) -- { -- initSerial(); -- } -- --protected: -- void setflags(int f) -- { -- termios tty; -- tcgetattr(fd, &tty); -- tty.c_iflag = IGNBRK | IGNPAR; -- tty.c_oflag = 0; -- tty.c_lflag = 0; -- tty.c_cflag = f | CREAD | CLOCAL | HUPCL; --#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -- tty.c_line = 0; --#endif -- tty.c_cc[VTIME] = 0; -- tty.c_cc[VMIN] = 1; -- tcsetattr(fd, TCSANOW, &tty); -- } -- --private: -- void initSerial() -- { -- int speed[4] = { B9600, B4800, B2400, B1200 }; -- -- for (int n = 0; n < 4; n++) { -- setflags(CSTOPB | speed[n]); -- write(fd, "*q", 2); -- usleep(10000); -- } -- } --}; -- --class QAutoMouseSubHandler_mousesystems : public QAutoMouseSubHandler_serial { --public: -- // ##### This driver has not been tested -- -- QAutoMouseSubHandler_mousesystems(int f) : QAutoMouseSubHandler_serial(f) -- { -- init(); -- } -- -- void init() -- { -- setflags(B1200|CS8|CSTOPB); -- // 60Hz -- if (write(fd, "R", 1)!=1) { -- badness = 100; -- return; -- } -- tcflush(fd,TCIOFLUSH); -- } -- -- int tryData() -- { -- if ( nbuf >= 5 ) { -- if ( (buffer[0] & 0xf8) != 0x80 ) { -- badness++; -- return 1; -- } -- motion += -- QPoint((signed char)buffer[1] + (signed char)buffer[3], -- -(signed char)buffer[2] + (signed char)buffer[4]); -- int t = ~buffer[0]; -- int nbstate = ((t&3) << 1) | ((t&4) >> 2); -- if ( motion.x() || motion.y() || bstate != nbstate ) { -- bstate = nbstate; -- goodness++; -- } else { -- badness++; -- return 1; -- } -- return 5; -- } -- return 0; -- } --}; -- --class QAutoMouseSubHandler_ms : public QAutoMouseSubHandler_serial { -- int mman; --public: -- QAutoMouseSubHandler_ms(int f) : QAutoMouseSubHandler_serial(f) -- { -- mman=0; -- init(); -- } -- -- void init() -- { -- setflags(B1200|CS7); -- // 60Hz -- if (write(fd, "R", 1)!=1) { -- badness = 100; -- return; -- } -- tcflush(fd,TCIOFLUSH); -- } -- -- int tryData() -- { -- if ( !(buffer[0] & 0x40) ) { -- if ( buffer[0] == 0x20 && (bstate & Qt::MidButton) ) { -- mman=1; // mouseman extension -- } -- return 1; -- } -- int extra = mman&&(bstate & Qt::MidButton); -- if ( nbuf >= 3+extra ) { -- int nbstate = 0; -- if ( buffer[0] == 0x40 && !bstate && !buffer[1] && !buffer[2] ) { -- nbstate = Qt::MidButton; -- } else { -- nbstate = ((buffer[0] & 0x20) >> 5) -- | ((buffer[0] & 0x10) >> 3); -- if ( extra && buffer[3] == 0x20 ) -- nbstate = Qt::MidButton; -- } -- -- if ( buffer[1] & 0x40 ) { -- badness++; -- return 1; -- } else { -- motion += -- QPoint((signed char)((buffer[0]&0x3)<<6) -- |(signed char)(buffer[1]&0x3f), -- (signed char)((buffer[0]&0xc)<<4) -- |(signed char)(buffer[2]&0x3f)); -- if ( motion.x() || motion.y() || bstate != nbstate ) { -- bstate = nbstate; -- goodness++; -- } else { -- badness++; -- return 1; -- } -- return 3+extra; -- } -- } -- return 0; -- } --}; -- --/* --QAutoMouseHandler::UsageResult QAutoMouseHandler::useDev(Dev& d) --{ -- if ( d.nbuf >= mouseData[d.protocol].bytesPerPacket ) { -- uchar *mb = d.buf; -- int bstate = 0; -- int dx = 0; -- int dy = 0; -- -- switch (mouseProtocol) { -- case MouseMan: -- case IntelliMouse: -- { -- bstate = mb[0] & 0x7; // assuming Qt::*Button order -- -- int overflow = (mb[0]>>6 )& 0x03; -- if (mouseProtocol == MouseMan && overflow) { -- //### wheel events signalled with overflow bit, ignore for now -- } -- else { -- bool xs = mb[0] & 0x10; -- bool ys = mb[0] & 0x20; -- dx = xs ? mb[1]-256 : mb[1]; -- dy = ys ? mb[2]-256 : mb[2]; -- } -- break; -- } -- case Microsoft: -- if ( ((mb[0] & 0x20) >> 3) ) { -- bstate |= Qt::LeftButton; -- } -- if ( ((mb[0] & 0x10) >> 4) ) { -- bstate |= Qt::RightButton; -- } -- -- dx=(signed char)(((mb[0] & 0x03) << 6) | (mb[1] & 0x3f)); -- dy=-(signed char)(((mb[0] & 0x0c) << 4) | (mb[2] & 0x3f)); -- -- break; -- } -- } -- } --*/ -- --#endif -- --class QAutoMouseHandler : public QWSMouseHandler { -- Q_OBJECT -- --public: -- QAutoMouseHandler(); -- ~QAutoMouseHandler(); -- --#ifndef QT_NO_QWS_MOUSE_AUTO --private: -- enum { max_dev=32 }; -- QAutoMouseSubHandler *sub[max_dev]; -- QList notifiers; -- int nsub; -- int retries; --#endif -- --private slots: -- void readMouseData(int); -- --private: --#ifndef QT_NO_QWS_MOUSE_AUTO -- void openDevices(); -- void closeDevices(); -- void notify(int fd); -- bool sendEvent(QAutoMouseSubHandler& h) -- { -- if ( h.reliable() ) { -- mousePos += h.takeMotion(); -- limitToScreen( mousePos ); --/* --qDebug("%d,%d %c%c%c", --mousePos.x(),mousePos.y(), --(h.buttonState()&Qt::LeftButton)?'L':'.', --(h.buttonState()&Qt::MidButton)?'M':'.', --(h.buttonState()&Qt::RightButton)?'R':'.'); --*/ -- emit mouseChanged(mousePos,h.buttonState()); -- return TRUE; -- } else { -- h.takeMotion(); -- if ( h.buttonState() & (Qt::RightButton|Qt::MidButton) ) { -- // Strange for the user to press right or middle without -- // a moving mouse! -- h.worse(); -- } -- return FALSE; -- } -- } --#endif --}; -- --QAutoMouseHandler::QAutoMouseHandler() --{ --#ifndef QT_NO_QWS_MOUSE_AUTO -- notifiers.setAutoDelete( TRUE ); -- retries = 0; -- openDevices(); --#endif --} -- --QAutoMouseHandler::~QAutoMouseHandler() --{ --#ifndef QT_NO_QWS_MOUSE_AUTO -- closeDevices(); --#endif --} -- --#ifndef QT_NO_QWS_MOUSE_AUTO --void QAutoMouseHandler::openDevices() --{ -- nsub=0; -- int fd; -- fd = open( "/dev/psaux", O_RDWR | O_NDELAY ); -- if ( fd >= 0 ) { -- sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); -- notify(fd); -- } --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) && !defined(QT_QWS_SLC700) -- char fn[] = "/dev/ttyS?"; -- for (int ch='0'; ch<='3'; ch++) { -- fn[9] = ch; -- fd = open( fn, O_RDWR | O_NDELAY ); -- if ( fd >= 0 ) { -- //sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); -- sub[nsub++] = new QAutoMouseSubHandler_mousesystems(fd); -- sub[nsub++] = new QAutoMouseSubHandler_ms(fd); -- notify(fd); -- } -- } --#endif -- // ... --} -- --void QAutoMouseHandler::closeDevices() --{ -- int pfd=-1; -- for (int i=0; icloseIfNot(pfd); -- delete sub[i]; -- } -- notifiers.clear(); --} -- --void QAutoMouseHandler::notify(int fd) --{ -- QSocketNotifier *mouseNotifier -- = new QSocketNotifier( fd, QSocketNotifier::Read, this ); -- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData(int))); -- notifiers.append( mouseNotifier ); --} --#endif -- --void QAutoMouseHandler::readMouseData(int fd) --{ --#ifndef QT_NO_QWS_MOUSE_AUTO -- for (;;) { -- uchar buf[8]; -- int n = read(fd, buf, 8); -- if ( n<=0 ) -- break; -- for (int i=0; i 0 ) -- mouseIdx += n; -- } while ( n > 0 ); -- } -- handleMouseData(); --#endif --} -- -- --#ifndef QT_NO_QWS_MOUSE_PC --/* --*/ -- --void QWSMouseHandlerPrivate::handleMouseData() --{ -- static const int accel_limit = 5; -- static const int accel = 2; -- -- int idx = 0; -- int bstate = 0; -- int dx = 0, dy = 0; -- bool sendEvent = false; -- int tdx = 0, tdy = 0; -- -- while ( mouseIdx-idx >= mouseData[mouseProtocol].bytesPerPacket ) { -- //qDebug( "Got mouse data" ); -- uchar *mb = mouseBuf+idx; -- bstate = 0; -- dx = 0; -- dy = 0; -- sendEvent = false; -- switch (mouseProtocol) { -- case MouseMan: -- case IntelliMouse: -- { -- if (mb[0] & 0x01) -- bstate |= Qt::LeftButton; -- if (mb[0] & 0x02) -- bstate |= Qt::RightButton; -- if (mb[0] & 0x04) -- bstate |= Qt::MidButton; -- -- int overflow = (mb[0]>>6 )& 0x03; -- if (mouseProtocol == MouseMan && overflow) { -- //### wheel events signalled with overflow bit, ignore for now -- } -- else { -- bool xs = mb[0] & 0x10; -- bool ys = mb[0] & 0x20; -- dx = xs ? mb[1]-256 : mb[1]; -- dy = ys ? mb[2]-256 : mb[2]; - -- sendEvent = true; -- } --#if 0 //debug -- if (mouseProtocol == MouseMan) -- printf("(%2d) %02x %02x %02x ", idx, mb[0], mb[1], mb[2]); -- else -- printf("(%2d) %02x %02x %02x %02x ",idx,mb[0],mb[1],mb[2],mb[3]); -- const char *b1 = (mb[0] & 0x01) ? "b1":" ";//left -- const char *b2 = (mb[0] & 0x02) ? "b2":" ";//right -- const char *b3 = (mb[0] & 0x04) ? "b3":" ";//mid - -- if ( overflow ) -- printf( "Overflow%d %s %s %s (%4d,%4d)\n", overflow, -- b1, b2, b3, mousePos.x(), mousePos.y() ); -- else -- printf( "%s %s %s (%+3d,%+3d) (%4d,%4d)\n", -- b1, b2, b3, dx, dy, mousePos.x(), mousePos.y() ); --#endif -- break; -- } -- case Microsoft: -- if ( (mb[0] & 0x20) ) -- bstate |= Qt::LeftButton; -- if ( (mb[0] & 0x10) ) -- bstate |= Qt::RightButton; -- -- dx=(signed char)(((mb[0] & 0x03) << 6) | (mb[1] & 0x3f)); -- dy=-(signed char)(((mb[0] & 0x0c) << 4) | (mb[2] & 0x3f)); -- sendEvent=true; -- -- break; -- case BusMouse: -- if ( !(mb[0] & 0x04) ) -- bstate |= Qt::LeftButton; -- if ( !(mb[0] & 0x01) ) -- bstate |= Qt::RightButton; -- -- dx=(signed char)mb[1]; -- dy=(signed char)mb[2]; -- sendEvent=true; -- break; -- -- default: -- qWarning( "Unknown mouse protocol in QWSMouseHandlerPrivate" ); -- break; -- } -- if (sendEvent) { -- if ( QABS(dx) > accel_limit || QABS(dy) > accel_limit ) { -- dx *= accel; -- dy *= accel; -- } -- tdx += dx; -- tdy += dy; -- if ( bstate != obstate ) { -- mousePos += QPoint(tdx,-tdy); -- limitToScreen( mousePos ); -- emit mouseChanged(mousePos,bstate); -- sendEvent = FALSE; -- tdx = 0; -- tdy = 0; -- obstate = bstate; -- } -- } -- idx += mouseData[mouseProtocol].bytesPerPacket; -- } -- if ( sendEvent ) { -- mousePos += QPoint(tdx,-tdy); -- limitToScreen( mousePos ); -- emit mouseChanged(mousePos,bstate); -- } -- -- int surplus = mouseIdx - idx; -- for ( int i = 0; i < surplus; i++ ) -- mouseBuf[i] = mouseBuf[idx+i]; -- mouseIdx = surplus; --} --#endif -- -- --QWSMouseHandlerPrivate::QWSMouseHandlerPrivate( MouseProtocol protocol, -- QString mouseDev ) --{ --#ifndef QT_NO_QWS_MOUSE_PC -- mouseProtocol = protocol; -- -- if ( mouseDev.isEmpty() ) -- mouseDev = "/dev/mouse"; -- obstate = -1; -- mouseFD = -1; -- mouseFD = open( mouseDev.local8Bit().data(), O_RDWR | O_NDELAY); -- if ( mouseFD < 0 ) { -- mouseFD = open( mouseDev.local8Bit().data(), O_RDONLY | O_NDELAY); -- if ( mouseFD < 0 ) -- qDebug( "Cannot open %s (%s)", mouseDev.ascii(), -- strerror(errno)); -- } else { -- // Clear pending input -- tcflush(mouseFD,TCIFLUSH); -- -- bool ps2 = false; -- -- switch (mouseProtocol) { -- case MouseMan: -- ps2 = true; -- write(mouseFD,"",1); -- usleep(50000); -- write(mouseFD,"@EeI!",5); -- break; -- -- case IntelliMouse: { --// ps2 = true; -- const unsigned char init1[] = { 243, 200, 243, 100, 243, 80 }; -- const unsigned char init2[] = { 246, 230, 244, 243, 100, 232, 3 }; -- write(mouseFD,init1,sizeof(init1)); -- usleep(50000); -- write(mouseFD,init2,sizeof(init2)); -- } -- break; -- -- case Microsoft: -- struct termios tty; -- -- tcgetattr(mouseFD, &tty); -- -- tty.c_iflag = IGNBRK | IGNPAR; -- tty.c_oflag = 0; -- tty.c_lflag = 0; --#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -- tty.c_line = 0; --#endif // _OS_FREEBSD_ -- tty.c_cc[VTIME] = 0; -- tty.c_cc[VMIN] = 1; -- tty.c_cflag = B1200 | CS7 | CREAD | CLOCAL | HUPCL; -- tcsetattr(mouseFD, TCSAFLUSH, &tty); /* set parameters */ -- break; -- -- case BusMouse: -- usleep(50000); -- break; -- -- default: -- qDebug("Unknown mouse protocol"); -- exit(1); -- } -- -- if (ps2) { -- char buf[] = { 246, 244 }; -- write(mouseFD,buf,1); -- write(mouseFD,buf+1,1); -- } -- -- usleep(50000); -- tcflush(mouseFD,TCIFLUSH); // ### doesn't seem to work. -- usleep(50000); -- tcflush(mouseFD,TCIFLUSH); // ### doesn't seem to work. -- -- char buf[100]; // busmouse driver will not read if bufsize < 3, YYD -- while (read(mouseFD, buf, 100) > 0) { } // eat unwanted replies -- -- mouseIdx = 0; -- -- QSocketNotifier *mouseNotifier; -- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, this ); -- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); -- } --#else -- Q_UNUSED(protocol); -- Q_UNUSED(mouseDev); --#endif --} -- --QWSMouseHandlerPrivate::~QWSMouseHandlerPrivate() --{ --#ifndef QT_NO_QWS_MOUSE_PC -- if (mouseFD >= 0) { -- tcflush(mouseFD,TCIFLUSH); // yyd. -- close(mouseFD); -- } --#endif --} -- --/* -- * -- */ - - QCalibratedMouseHandler::QCalibratedMouseHandler() - : samples(5), currSample(0), numSamples(0) -@@ -1030,7 +180,8 @@ - if ( file.open( IO_WriteOnly ) ) { - QTextStream t( &file ); - t << a << " " << b << " " << c << " "; -- t << d << " " << e << " " << f << " " << s; -+ t << d << " " << e << " " << f << " " << s << endl; -+ file.close(); - } else - #endif - { -@@ -1046,6 +197,7 @@ - if ( file.open( IO_ReadOnly ) ) { - QTextStream t( &file ); - t >> a >> b >> c >> d >> e >> f >> s; -+ file.close(); - } else - #endif - { -@@ -1073,12 +225,24 @@ - writeCalibration(); - } - -+void QCalibratedMouseHandler::setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss) -+{ -+ a = aa; -+ b = bb; -+ c = cc; -+ d = dd; -+ e = ee; -+ f = ff; -+ s = ss; -+} -+ - QPoint QCalibratedMouseHandler::transform( const QPoint &p ) - { - QPoint tp; - - tp.setX( (a * p.x() + b * p.y() + c) / s ); - tp.setY( (d * p.x() + e * p.y() + f) / s ); -+//qDebug("QCalibratedMouseHandler::transform(%d,%d) -> %d,%d)", p.x(), p.y(), tp.x(), tp.y() ); - - return tp; - } -@@ -1143,814 +307,192 @@ - return sent; - } - --/* -- * Handler for /dev/tpanel Linux kernel driver -- */ - --class QVrTPanelHandlerPrivate : public QCalibratedMouseHandler { -- Q_OBJECT --public: -- QVrTPanelHandlerPrivate(MouseProtocol, QString dev); -- ~QVrTPanelHandlerPrivate(); - --private: -- int mouseFD; -- MouseProtocol mouseProtocol; --private slots: -- void sendRelease(); -- void readMouseData(); --private: -- static const int mouseBufSize = 1280; -- QTimer *rtimer; -- int mouseIdx; -- uchar mouseBuf[mouseBufSize]; --}; - --#ifndef QT_QWS_CASSIOPEIA --QVrTPanelHandlerPrivate::QVrTPanelHandlerPrivate( MouseProtocol, QString ) : -- QCalibratedMouseHandler() --{ --} --#else --QVrTPanelHandlerPrivate::QVrTPanelHandlerPrivate( MouseProtocol, QString dev ) : -- QCalibratedMouseHandler() --{ -- if ( dev.isEmpty() ) -- dev = "/dev/tpanel"; -- -- if ((mouseFD = open( dev, O_RDONLY)) < 0) { -- qFatal( "Cannot open %s (%s)", dev.latin1(), strerror(errno)); -- } else { -- sleep(1); -- } -- -- struct scanparam s; -- s.interval = 20000; -- s.settletime = 480; -- if ( ioctl(mouseFD, TPSETSCANPARM, &s) < 0 -- || fcntl(mouseFD, F_SETFL, O_NONBLOCK) < 0 ) -- qWarning("Error initializing touch panel."); -- -- QSocketNotifier *mouseNotifier; -- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, -- this ); -- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); -- -- rtimer = new QTimer( this ); -- connect( rtimer, SIGNAL(timeout()), this, SLOT(sendRelease())); -- mouseIdx = 0; -- setFilterSize( 3 ); -- -- printf("\033[?25l"); fflush(stdout); // VT100 cursor off --} --#endif -- --QVrTPanelHandlerPrivate::~QVrTPanelHandlerPrivate() --{ -- if (mouseFD >= 0) -- close(mouseFD); --} -- --void QVrTPanelHandlerPrivate::sendRelease() --{ -- sendFiltered( mousePos, 0 ); --} - --void QVrTPanelHandlerPrivate::readMouseData() --{ --#ifdef QT_QWS_CASSIOPEIA -- if(!qt_screen) -- return; -- static bool pressed = FALSE; -- -- int n; -- do { -- n = read(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx ); -- if ( n > 0 ) -- mouseIdx += n; -- } while ( n > 0 && mouseIdx < mouseBufSize ); -- -- int idx = 0; -- while ( mouseIdx-idx >= (int)sizeof( short ) * 6 ) { -- uchar *mb = mouseBuf+idx; -- ushort *data = (ushort *) mb; -- if ( data[0] & 0x8000 ) { -- if ( data[5] > 750 ) { -- QPoint t(data[3]-data[4],data[2]-data[1]); -- if ( sendFiltered( t, Qt::LeftButton ) ) -- pressed = TRUE; -- if ( pressed ) -- rtimer->start( 200, TRUE ); // release unreliable -- } -- } else if ( pressed ) { -- rtimer->start( 50, TRUE ); -- pressed = FALSE; -- } -- idx += sizeof( ushort ) * 6; -- } -+struct input_event { -+ struct timeval time; -+ unsigned short type; -+ unsigned short code; -+ unsigned int value; -+}; - -- int surplus = mouseIdx - idx; -- for ( int i = 0; i < surplus; i++ ) -- mouseBuf[i] = mouseBuf[idx+i]; -- mouseIdx = surplus; - --#endif --} -+#define EV_ABS 0x03 -+#define ABS_X 0x00 -+#define ABS_Y 0x01 -+#define ABS_PRESSURE 0x18 - - --class QTPanelHandlerPrivate : public QCalibratedMouseHandler -+class QInputEventHandler : public QCalibratedMouseHandler - { - Q_OBJECT - public: -- QTPanelHandlerPrivate(MouseProtocol, QString dev); -- ~QTPanelHandlerPrivate(); -+ QInputEventHandler(MouseProtocol, QString dev); -+ ~QInputEventHandler(); -+ -+ virtual void calibrate( QWSPointerCalibrationData * ); -+ virtual void setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss); - - private: -- static const int mouseBufSize = 2048; -+ void init(); -+ void fini(); -+ - int mouseFD; -- QPoint oldmouse; -- QPoint oldTotalMousePos; -- bool waspressed; -- QPointArray samples; -- unsigned int currSample; -- unsigned int lastSample; -- unsigned int numSamples; -- int skipCount; -- int mouseIdx; -- uchar mouseBuf[mouseBufSize]; -+ struct input_event sample; -+ int myX, myY, myP, oldX, oldY, oldP; -+ int xtable[QT_QWS_TP_TABLE_SIZE]; -+ int ytable[QT_QWS_TP_TABLE_SIZE]; -+ int ptr; - - private slots: - void readMouseData(); - }; - - --QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev ) -- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), -- numSamples(0), skipCount(0) --{ -- Q_UNUSED(dev); --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) --#if defined(QT_QWS_IPAQ) --# ifdef QT_QWS_IPAQ_RAW -- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { --# else -- if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) { --# endif -- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); -- return; -- } --#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) --//# ifdef QT_QWS_SL5XXX_TSRAW --# if 0 -- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -- qWarning( "Cannot open /dev/tsraw (%s)", strerror(errno)); -- return; -- } --# else -- if ((mouseFD = open( "/dev/ts", O_RDONLY | O_NDELAY)) < 0) { -- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); -- return; -- } --# endif --#elif defined(QT_QWS_SIMPAD ) -- if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) < 0) { -- qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno)); -- return; -- } --#endif -- -- QSocketNotifier *mouseNotifier; -- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, -- this ); -- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); -- waspressed=FALSE; -- mouseIdx = 0; --#endif --} -- --QTPanelHandlerPrivate::~QTPanelHandlerPrivate() -+QInputEventHandler::QInputEventHandler( MouseProtocol, QString ) -+ : myP(-1) - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) -- if (mouseFD >= 0) -- close(mouseFD); --#endif -+ init(); - } - --void QTPanelHandlerPrivate::readMouseData() -+QInputEventHandler::~QInputEventHandler() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) -- if(!qt_screen) -- return; -- -- int n; -- do { -- n = read(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx ); -- if ( n > 0 ) -- mouseIdx += n; -- } while ( n > 0 && mouseIdx < mouseBufSize ); -- -- TS_EVENT *data; -- int idx = 0; -- -- // perhaps we shouldn't be reading EVERY SAMPLE. -- while ( mouseIdx-idx >= (int)sizeof( TS_EVENT ) ) { -- uchar *mb = mouseBuf+idx; -- data = (TS_EVENT *) mb; -- if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { --#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -- samples[currSample] = QPoint( 1000 - data->x, data->y ); --#else -- samples[currSample] = QPoint( data->x, data->y ); --#endif -- -- numSamples++; -- if ( numSamples >= QT_QWS_TP_MINIMUM_SAMPLES ) { -- int sampleCount = QMIN(numSamples + 1,samples.count()); -- -- // average the rest -- mousePos = QPoint( 0, 0 ); -- QPoint totalMousePos = oldTotalMousePos; -- totalMousePos += samples[currSample]; -- if(numSamples >= samples.count()) -- totalMousePos -= samples[lastSample]; -- -- mousePos = totalMousePos / (sampleCount - 1); -- --# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) -- mousePos = transform( mousePos ); --# endif -- if(!waspressed) -- oldmouse = mousePos; -- QPoint dp = mousePos - oldmouse; -- int dxSqr = dp.x() * dp.x(); -- int dySqr = dp.y() * dp.y(); -- if ( dxSqr + dySqr < (QT_QWS_TP_MOVE_LIMIT * QT_QWS_TP_MOVE_LIMIT) ) { -- if ( waspressed ) { -- if ( (dxSqr + dySqr > (QT_QWS_TP_JITTER_LIMIT * QT_QWS_TP_JITTER_LIMIT) ) || skipCount > 2) { -- emit mouseChanged(mousePos,Qt::LeftButton); -- oldmouse = mousePos; -- skipCount = 0; -- } else { -- skipCount++; -- } -- } else { -- emit mouseChanged(mousePos,Qt::LeftButton); -- oldmouse=mousePos; -- waspressed=true; -- } -- -- // save recuring information -- currSample++; -- if (numSamples >= samples.count()) -- lastSample++; -- oldTotalMousePos = totalMousePos; -- } else { -- numSamples--; // don't use this sample, it was bad. -- } -- } else { -- // build up the average -- oldTotalMousePos += samples[currSample]; -- currSample++; -- } -- if ( currSample >= samples.count() ) -- currSample = 0; -- if ( lastSample >= samples.count() ) -- lastSample = 0; -- } else { -- currSample = 0; -- lastSample = 0; -- numSamples = 0; -- skipCount = 0; -- oldTotalMousePos = QPoint(0,0); -- if ( waspressed ) { -- emit mouseChanged(oldmouse,0); -- oldmouse = QPoint( -100, -100 ); -- waspressed=false; -- } -- } -- idx += sizeof( TS_EVENT ); -- } -+ fini(); - -- int surplus = mouseIdx - idx; -- for ( int i = 0; i < surplus; i++ ) -- mouseBuf[i] = mouseBuf[idx+i]; -- mouseIdx = surplus; --#endif - } - --// YOPY touch panel support based on changes contributed by Ron Victorelli --// (victorrj at icubed.com) to Custom TP driver. --// --class QYopyTPanelHandlerPrivate : public QWSMouseHandler { -- Q_OBJECT --public: -- QYopyTPanelHandlerPrivate(MouseProtocol, QString dev); -- ~QYopyTPanelHandlerPrivate(); -- --private: -- int mouseFD; -- int prevstate; --private slots: -- void readMouseData(); -- --}; -- --QYopyTPanelHandlerPrivate::QYopyTPanelHandlerPrivate( MouseProtocol, QString ) -+void QInputEventHandler::setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss) - { --#ifdef QT_QWS_YOPY -- if ((mouseFD = open( "/dev/ts", O_RDONLY)) < 0) { -- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); -- return; -- } else { -- sleep(1); -- } -- prevstate=0; -- QSocketNotifier *mouseNotifier; -- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, -- this ); -- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); --#endif --} -+ QCalibratedMouseHandler::setCalibration(aa, bb, cc, dd, ee, ff, ss); - --QYopyTPanelHandlerPrivate::~QYopyTPanelHandlerPrivate() --{ -- if (mouseFD >= 0) -- close(mouseFD); -+ writeCalibration(); -+ fini(); -+ init(); - } - --#define YOPY_XPOS(d) (d[1]&0x3FF) --#define YOPY_YPOS(d) (d[2]&0x3FF) --#define YOPY_PRES(d) (d[0]&0xFF) --#define YOPY_STAT(d) (d[3]&0x01 ) -- --struct YopyTPdata { -- -- unsigned char status; -- unsigned short xpos; -- unsigned short ypos; -- --}; -- --void QYopyTPanelHandlerPrivate::readMouseData() -+void QInputEventHandler::calibrate( QWSPointerCalibrationData *cd ) - { --#ifdef QT_QWS_YOPY -- if(!qt_screen) -- return; -- YopyTPdata data; -- -- unsigned int yopDat[4]; -- -- int ret; -- -- ret=read(mouseFD,&yopDat,sizeof(yopDat)); -+ QCalibratedMouseHandler::calibrate( cd ); - -- if(ret) { -- data.status= ( YOPY_PRES(yopDat) ) ? 1 : 0; -- data.xpos=YOPY_XPOS(yopDat); -- data.ypos=YOPY_YPOS(yopDat); -- QPoint q; -- q.setX(data.xpos); -- q.setY(data.ypos); -- mousePos=q; -- if(data.status && !prevstate) { -- emit mouseChanged(mousePos,Qt::LeftButton); -- } else if( !data.status && prevstate ) { -- emit mouseChanged(mousePos,0); -- } -- prevstate = data.status; -- } -- if(ret<0) { -- qDebug("Error %s",strerror(errno)); -- } --#endif -+ // write calibration data, and close and reopen -+ // tslib, in order to ensure it uses the new values -+ writeCalibration(); -+ fini(); -+ init(); - } - --class QCustomTPanelHandlerPrivate : public QWSMouseHandler { -- Q_OBJECT --public: -- QCustomTPanelHandlerPrivate(MouseProtocol, QString dev); -- ~QCustomTPanelHandlerPrivate(); -- --private: -- int mouseFD; --private slots: -- void readMouseData(); -- --}; -- --QCustomTPanelHandlerPrivate::QCustomTPanelHandlerPrivate( MouseProtocol, QString ) -+void QInputEventHandler::init() - { --#ifdef QWS_CUSTOMTOUCHPANEL -- if ((mouseFD = open( "/dev/ts", O_RDONLY)) < 0) { -- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); -+ if ((mouseFD = open( "/dev/input/event1", O_RDONLY)) < 0) { -+ qWarning( "Cannot open /dev/input/event1 (%s)", strerror(errno)); - return; -- } else { -- sleep(1); - } - - QSocketNotifier *mouseNotifier; -- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, -- this ); -+ mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, this ); -+ setFilterSize(2); - connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); --#endif - } - --QCustomTPanelHandlerPrivate::~QCustomTPanelHandlerPrivate() -+void QInputEventHandler::fini() - { - if (mouseFD >= 0) - close(mouseFD); - } - --struct CustomTPdata { -- -- unsigned char status; -- unsigned short xpos; -- unsigned short ypos; -- --}; -- --void QCustomTPanelHandlerPrivate::readMouseData() -+void QInputEventHandler::readMouseData() - { --#ifdef QWS_CUSTOMTOUCHPANEL -- if(!qt_screen) -- return; -- CustomTPdata data; -- -- unsigned char data2[5]; -- -- int ret; -- -- ret=read(mouseFD,data2,5); -+ if (!qt_screen) -+ return; - -- if(ret==5) { -- data.status=data2[0]; -- data.xpos=(data2[1] << 8) | data2[2]; -- data.ypos=(data2[3] << 8) | data2[4]; -- QPoint q; -- q.setX(data.xpos); -- q.setY(data.ypos); -- mousePos=q; -- if(data.status & 0x40) { -- emit mouseChanged(mousePos,Qt::LeftButton); -- } else { -- emit mouseChanged(mousePos,0); -+ unsigned int size = read(mouseFD, &sample, sizeof(sample)); -+ if (size < sizeof(sample)) { -+ qDebug("no input"); -+ return; -+ } -+ //qDebug("type,code,val: %d,%d,%d", sample.type, sample.code, sample.value); -+ if (sample.type == EV_ABS) { -+ if (sample.code == ABS_Y) { -+ myY = sample.value; -+ return; -+ } else -+ if (sample.code == ABS_X) { -+ myX = sample.value; -+ return; -+ } else -+ if (sample.code == ABS_PRESSURE) { -+ myP = sample.value; -+ } - } -- } -- if(ret<0) { -- qDebug("Error %s",strerror(errno)); -- } --#endif --} -- --/* -- * Virtual framebuffer mouse driver -- */ -- --#ifndef QT_NO_QWS_VFB --#include "qvfbhdr.h" --extern int qws_display_id; --#endif -- --class QVFbMouseHandlerPrivate : public QWSMouseHandler { -- Q_OBJECT --public: -- QVFbMouseHandlerPrivate(MouseProtocol, QString dev); -- ~QVFbMouseHandlerPrivate(); -- --#ifndef QT_NO_QWS_VFB -- bool isOpen() const { return mouseFD > 0; } -- --private: -- static const int mouseBufSize = 128; -- int mouseFD; -- int mouseIdx; -- uchar mouseBuf[mouseBufSize]; --#endif -- --private slots: -- void readMouseData(); --}; -- --QVFbMouseHandlerPrivate::QVFbMouseHandlerPrivate( MouseProtocol, QString mouseDev ) --{ --#ifndef QT_NO_QWS_VFB -- mouseFD = -1; -- if ( mouseDev.isEmpty() ) -- mouseDev = QString(QT_VFB_MOUSE_PIPE).arg(qws_display_id); -- -- if ((mouseFD = open( mouseDev.local8Bit().data(), O_RDWR | O_NDELAY)) < 0) { -- qDebug( "Cannot open %s (%s)", mouseDev.ascii(), -- strerror(errno)); -- } else { -- // Clear pending input -- char buf[2]; -- while (read(mouseFD, buf, 1) > 0) { } -- -- mouseIdx = 0; -- -- QSocketNotifier *mouseNotifier; -- mouseNotifier = new QSocketNotifier( mouseFD, QSocketNotifier::Read, this ); -- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); -- } --#endif --} -- --QVFbMouseHandlerPrivate::~QVFbMouseHandlerPrivate() --{ --#ifndef QT_NO_QWS_VFB -- if (mouseFD >= 0) -- close(mouseFD); --#endif --} -- --void QVFbMouseHandlerPrivate::readMouseData() --{ --#ifndef QT_NO_QWS_VFB -- int n; -- do { -- n = read(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx ); -- if ( n > 0 ) -- mouseIdx += n; -- } while ( n > 0 ); -- -- int idx = 0; -- while ( mouseIdx-idx >= int(sizeof( QPoint ) + sizeof( int )) ) { -- uchar *mb = mouseBuf+idx; -- QPoint *p = (QPoint *) mb; -- mb += sizeof( QPoint ); -- int *bstate = (int *)mb; -- mousePos = *p; -- limitToScreen( mousePos ); -- emit mouseChanged(mousePos, *bstate); -- idx += sizeof( QPoint ) + sizeof( int ); -- } -- -- int surplus = mouseIdx - idx; -- for ( int i = 0; i < surplus; i++ ) -- mouseBuf[i] = mouseBuf[idx+i]; -- mouseIdx = surplus; --#endif --} -- --/* -- mouse handler for tslib -- see http://cvs.arm.linux.org.uk/ -- */ --/* -- -- Copyright (C) 2003, 2004, 2005 Texas Instruments, Inc. -- Copyright (C) 2004, 2005 Holger Hans Peter Freyther -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions are met: -- -- Redistributions of source code must retain the above copyright notice, -- this list of conditions and the following disclaimer. -- -- Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- Neither the name Texas Instruments, Inc nor the names of its -- contributors may be used to endorse or promote products derived -- from this software without specific prior written permission. -- -- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -- POSSIBILITY OF SUCH DAMAGE. -- --*/ --class QTSLibHandlerPrivate : public QCalibratedMouseHandler --{ -- Q_OBJECT --public: -- QTSLibHandlerPrivate(); -- ~QTSLibHandlerPrivate(); -- -- virtual void clearCalibration(); -- virtual void calibrate( QWSPointerCalibrationData * ); -- static int sortByX( const void*, const void* ); -- static int sortByY( const void*, const void* ); -- --private: -- bool m_raw : 1; -- QSocketNotifier *m_notify; -- --#ifdef QT_QWS_TSLIB -- struct tsdev *m_ts; --#endif -- void openTs(); -- void closeTs(); -- void interpolateSample(); -- --private slots: -- void readMouseData(); -- --}; -- --QTSLibHandlerPrivate::QTSLibHandlerPrivate() -- : m_raw(false), m_notify(0 ) --{ -- openTs(); --} -- --QTSLibHandlerPrivate::~QTSLibHandlerPrivate() --{ -- closeTs(); --} -- --void QTSLibHandlerPrivate::openTs() --{ --#ifdef QT_QWS_TSLIB -- char *tsdevice; -- if((tsdevice = getenv("TSLIB_TSDEVICE")) != NULL) { -- m_ts = ts_open( tsdevice, 1 ); //1 = nonblocking, 0 = blocking mode -- } else { -- m_ts = ts_open( "/dev/ts", 1 ); -- } -- -- if (!m_ts) { -- qWarning( "Cannot open touchscreen (%s)", strerror( errno)); -- return; -- } -- -- if (ts_config( m_ts)) { -- qWarning( "Cannot configure touchscreen (%s)", strerror( errno)); -- return; -- } -- m_notify = new QSocketNotifier( ts_fd(m_ts), QSocketNotifier::Read, this ); -- connect( m_notify, SIGNAL(activated(int)),this, SLOT(readMouseData())); --#endif --} -- --void QTSLibHandlerPrivate::closeTs() --{ --#ifdef QT_QWS_TSLIB -- if (m_ts) -- ts_close(m_ts); -- m_ts = 0; --#endif -- -- delete m_notify; -- m_notify = 0; -- m_raw = false; --} -- --void QTSLibHandlerPrivate::clearCalibration() --{ -- m_raw = true; --} -- --void QTSLibHandlerPrivate::calibrate( QWSPointerCalibrationData * cd) --{ -- QPoint dev_tl = cd->devPoints[ QWSPointerCalibrationData::TopLeft ]; -- QPoint dev_br = cd->devPoints[ QWSPointerCalibrationData::BottomRight ]; -- QPoint screen_tl = cd->screenPoints[ QWSPointerCalibrationData::TopLeft ]; -- QPoint screen_br = cd->screenPoints[ QWSPointerCalibrationData::BottomRight ]; -- int a, b, c, d, e, f, s; -- -- s = 1 << 16; - -- a = s * (screen_tl.x() - screen_br.x() ) / (dev_tl.x() - dev_br.x()); -- b = 0; -- c = s * screen_tl.x() - a * dev_tl.x(); -+ // up->up -+ if (oldP==0 && myP==0) { -+ //qDebug("uu %d,%d,%d", myX,myY,myP); -+ return; -+ } - -- d = 0; -- e = s * (screen_tl.y() - screen_br.y() ) / (dev_tl.y() - dev_br.y()); -- f = s * screen_tl.y() - e * dev_tl.y(); -+ // up->down -+ if (oldP==0 && myP>QT_QWS_TP_PRESSURE_DOWN_THRESHOLD) { -+ //qDebug("ud %d,%d,%d", myX,myY,myP); - -- QString calFile = "/etc/pointercal"; --#ifndef QT_NO_TEXTSTREAM -- QFile file( calFile ); -- if ( file.open( IO_WriteOnly ) ) { -- QTextStream t( &file ); -- t << a << " " << b << " " << c << " "; -- t << d << " " << e << " " << f << " " << s; -- file.flush(); closeTs(); -- openTs(); -- } else --#endif -- { -- qDebug( "Could not save calibration: %s", calFile.latin1() ); -- } --} -+ xtable[0] = myX; -+ ytable[0] = myY; -+ ptr = 1; -+ oldX = myX; -+ oldY = myY; -+ oldP = myP; -+ return; -+ } - --void QTSLibHandlerPrivate::readMouseData() --{ --#ifdef QT_QWS_TSLIB -- if(!qt_screen) -- return; -+ // down->down -+ if (oldP>QT_QWS_TP_PRESSURE_DOWN_THRESHOLD && myP>QT_QWS_TP_PRESSURE_UP_THRESHOLD) { -+ //qDebug("dd %d,%d,%d (%d,%d)", myX,myY,myP, oldX,oldY); - -- /* -- * After clear Calibration -- * we're in raw mode and do some easy median -- * search. -- */ -- if ( m_raw ) -- return interpolateSample(); -+ int dxSqr = myX-oldX; dxSqr *= dxSqr; -+ int dySqr = myY-oldY; dySqr *= dySqr; -+ oldX = myX; -+ oldY = myY; -+ if (dxSqr+dySqr > QT_QWS_TP_MOVE_MAX*QT_QWS_TP_MOVE_MAX) { -+ //qWarning("distance too wide %d", dxSqr+dySqr); -+ return; -+ } - -- static struct ts_sample sample; -- static int ret; -+ if (ptr < QT_QWS_TP_TABLE_SIZE) { -+ xtable[ptr] = myX; -+ ytable[ptr++] = myY; -+ } - -- /* -- * Ok. We need to see if we can read more than one event -- * We do this not to lose an update. -- */ -- while ( true ) { -- if ((ret = ts_read(m_ts, &sample, 1)) != 1 ) -- return; -+ if (ptr == QT_QWS_TP_TABLE_SIZE) { -+ int i; -+ int mx = 0; -+ int my = 0; -+ for (i=0; i0) { -+ xtable[i-1] = xtable[i]; -+ ytable[i-1] = ytable[i]; -+ } -+ } -+ ptr--; -+ mousePos = transform(QPoint(mx/QT_QWS_TP_TABLE_SIZE, my/QT_QWS_TP_TABLE_SIZE)); - -+ emit mouseChanged(mousePos, Qt::LeftButton); -+ } -+ return; -+ } - -- QPoint pos( sample.x, sample.y ); -- mouseChanged( pos, sample.pressure != 0 ? 1 : 0 ); -- } --#endif -+ // down->up -+ //qDebug("du %d,%d,%d", myX,myY,myP); -+ emit mouseChanged(mousePos, 0); -+ oldP = 0; - } - --/* -- * Lets take all down events and then sort them -- * and take the event in the middle. -- * -- * inspired by testutils.c -- */ --void QTSLibHandlerPrivate::interpolateSample() { --#ifdef QT_QWS_TSLIB --#define TSLIB_MAX_SAMPLES 25 -- static struct ts_sample samples[TSLIB_MAX_SAMPLES]; -- int index = 0; -- int read_samples = 0; -- int ret; -- -- do { -- /* do not access negative arrays */ -- if ( index < 0 ) -- index = 0; -- -- /* we're opened non-blocking */ -- if((ret= ts_read_raw(m_ts, &samples[index], 1 ) ) != 1 ) -- /* no event yet, so try again */ -- if (ret==-1 ) -- continue; -- -- read_samples++; -- index = (index+1)%TSLIB_MAX_SAMPLES; -- }while (samples[index == 0 ? (TSLIB_MAX_SAMPLES-1) : index-1].pressure != 0); -- -- /* -- * If we've wrapped around each sample is used otherwise -- * we will use the index -- */ -- index = read_samples >= TSLIB_MAX_SAMPLES ? -- (TSLIB_MAX_SAMPLES-1 ) : index; -- int x, y; -- -- /* -- * now let us use the median value -- * even index does not have an item in the middle -- * so let us take the average of n/2 and (n/2)-1 as the middle -- */ -- int m = index/2; -- ::qsort(samples, index, sizeof(ts_sample), QTSLibHandlerPrivate::sortByX); -- x = (index % 2 ) ? samples[m].x : -- ( samples[m-1].x + samples[m].x )/2; -- -- ::qsort(samples, index, sizeof(ts_sample), QTSLibHandlerPrivate::sortByY); -- y = (index % 2 ) ? samples[m].y : -- ( samples[m-1].y + samples[m].y )/2; - -- emit mouseChanged( QPoint(x, y), 1 ); -- emit mouseChanged( QPoint(0, 0), 0 ); --#endif --} - --int QTSLibHandlerPrivate::sortByX( const void* one, const void* two) { --#ifdef QT_QWS_TSLIB -- return reinterpret_cast(one)->x - -- reinterpret_cast(two)->x; --#else -- return 0; --#endif --} - --int QTSLibHandlerPrivate::sortByY( const void* one, const void* two) { --#ifdef QT_QWS_TSLIB -- return reinterpret_cast(one)->y - -- reinterpret_cast(two)->y; --#else -- return 0; --#endif --} --////// - - /* - * return a QWSMouseHandler that supports /a spec. -@@ -1977,7 +519,7 @@ - - if ( mouseProto == "USB" && mouseDev.isEmpty() ) - mouseDev = "/dev/input/mice"; -- -+ - MouseProtocol mouseProtocol = Unknown; - - int idx = 0; -@@ -1988,50 +530,7 @@ - idx++; - } - -- -- QWSMouseHandler *handler = 0; -- -- switch ( mouseProtocol ) { --#ifndef QT_NO_QWS_MOUSE_AUTO -- case Auto: -- handler = new QAutoMouseHandler(); -- break; --#endif -- --#ifndef QT_NO_QWS_MOUSE_PC -- case MouseMan: -- case IntelliMouse: -- case Microsoft: -- case BusMouse: -- handler = new QWSMouseHandlerPrivate( mouseProtocol, mouseDev ); -- break; --#endif -- --#ifndef QT_NO_QWS_VFB -- case QVFBMouse: -- handler = new QVFbMouseHandlerPrivate( mouseProtocol, mouseDev ); -- break; --#endif -- -- case TPanel: --#if defined(QWS_CUSTOMTOUCHPANEL) -- handler = new QCustomTPanelHandlerPrivate(mouseProtocol,mouseDev); --#elif defined(QT_QWS_TSLIB) -- handler = new QTSLibHandlerPrivate(); --#elif defined(QT_QWS_YOPY) -- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) -- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); --#elif defined(QT_QWS_CASSIOPEIA) -- handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); --#endif -- break; -- -- default: -- qDebug( "Mouse type %s unsupported", spec.latin1() ); -- } -- -- return handler; -+ return new QInputEventHandler( mouseProtocol, mouseDev ); - } - - #include "qwsmouse_qws.moc" ---- qt-2.3.10/src/kernel/qwsmouse_qws.h~ramses-touchscreen -+++ qt-2.3.10/src/kernel/qwsmouse_qws.h -@@ -1,5 +1,5 @@ - /**************************************************************************** --** $Id: qt/src/kernel/qwsmouse_qws.h 2.3.10 edited 2005-01-24 $ -+** $Id: qt/src/kernel/qwsmouse_qws.h 2.3.7 edited 2001-10-03 $ - ** - ** Definition of Qt/FB central server classes - ** -@@ -70,6 +70,7 @@ - virtual void clearCalibration(); - virtual void calibrate( QWSPointerCalibrationData * ); - virtual void getCalibration( QWSPointerCalibrationData * ); -+ virtual void setCalibration(int aa, int bb, int cc, int dd, int ee, int ff, int ss); - - protected: - void readCalibration(); diff --git a/packages/qte/qte-2.3.10/mnci.patch b/packages/qte/qte-2.3.10/mnci.patch deleted file mode 100644 index c2e0e079d9..0000000000 --- a/packages/qte/qte-2.3.10/mnci.patch +++ /dev/null @@ -1,125 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~ramses.patch -+++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp -@@ -249,20 +249,12 @@ - - static void writeTerm(const char* termctl, int sizeof_termctl) - { --#ifdef QT_QWS_DEVFS -- const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; --#else -- const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; --#endif -- const char** dev=tt; -- while (*dev) { -- int tty=::open(*dev,O_WRONLY); -+qWarning("writeTerm"); -+ int tty=::open("/dev/vc/2", O_WRONLY); - if ( tty>=0 ) { - ::write(tty,termctl,sizeof_termctl); - ::close(tty); - } -- dev++; -- } - } - - /*! -@@ -275,6 +267,7 @@ - - bool QLinuxFbScreen::initDevice() - { -+qWarning("QLinuxFbScreen::initDevice"); - /* Setting up the VT parameters is done in qapplication_qws.cpp - const char termctl[]="\033[9;0]\033[?33l\033[?25l"; - writeTerm(termctl,sizeof(termctl)); */ -@@ -765,9 +758,12 @@ - } - */ - -+qWarning("QLinuxFbScreen::shutdownDevice"); -+/* - // Blankin' screen, blinkin' cursor! - const char termctl[] = "\033[9;15]\033[?33h\033[?25h\033[?0c"; - writeTerm(termctl,sizeof(termctl)); -+*/ - } - - /*! ---- qt-2.3.10/src/kernel/qapplication_qws.cpp~ramses.patch -+++ qt-2.3.10/src/kernel/qapplication_qws.cpp -@@ -1756,8 +1756,6 @@ - */ - if ( qws_daemon ) - { -- qWarning( "qt_init() - starting in daemon mode..." ); -- - int pid1 = fork(); - if ( pid1 == -1 ) - { -@@ -1791,7 +1789,6 @@ - } - if ( pid2 ) - { -- syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 ); - _exit( 0 ); // ok, second fork performed - } - } -@@ -1828,9 +1825,12 @@ - #if defined(_OS_LINUX_) - if ( qws_terminal_id ) - { -- qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id ); - struct vt_stat console_stat; -+#ifdef QT_QWS_DEVFS -+ int console_fd = ::open( QString().sprintf( "/dev/vc/%d", qws_terminal_id ).latin1(), O_RDWR ); -+#else - int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR ); -+#endif - if ( console_fd == -1) - { - qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -@@ -1927,7 +1927,11 @@ - { - qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old ); - -+#ifdef QT_QWS_DEVFS -+ int console_fd = ::open( "/dev/vc/0", O_RDWR ); -+#else - int console_fd = ::open( "/dev/tty0", O_RDWR ); -+#endif - if ( console_fd == -1) - { - qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); ---- qt-2.3.10/src/kernel/qwindowsystem_qws.cpp~ramses.patch -+++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp -@@ -1791,6 +1791,7 @@ - } - - #ifndef QT_NO_QWS_KEYBOARD -+#ifndef QT_QWS_RAMSES - static int keyUnicode(int keycode) - { - const QWSServer::KeyMap *km = QWSServer::keyMap(); -@@ -1803,6 +1804,7 @@ - return 0xffff; - } - #endif -+#endif - /*! - Send a key event. You can use this to send key events generated by - "virtual keyboards". -@@ -1845,8 +1847,10 @@ - - event.simpleData.unicode = - #ifndef QT_NO_QWS_KEYBOARD -+#ifndef QT_QWS_RAMSES - unicode < 0 ? keyUnicode(keycode) : - #endif -+#endif - unicode; - event.simpleData.keycode = keycode; - event.simpleData.modifiers = modifiers; diff --git a/packages/qte/qte-2.3.10/openmn/.mtn2git_empty b/packages/qte/qte-2.3.10/openmn/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp deleted file mode 100644 index 9917675a43..0000000000 --- a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp +++ /dev/null @@ -1,584 +0,0 @@ -/**************************************************************************** -** $Id: qt/src/kernel/qkeyboard_qws.cpp 2.3.7 edited 2003-05-30 $ -** -** Implementation of Qt/Embedded keyboard drivers -** -** Created : 991025 -** -** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -** -** This file is part of the kernel module of the Qt GUI Toolkit. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses for Qt/Embedded may use this file in accordance with the -** Qt Embedded Commercial License Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -#include "qwindowsystem_qws.h" -#include "qwsutils_qws.h" -#include "qgfx_qws.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef QT_NO_QWS_KEYBOARD - -#include -#include -#include -#include -#include - -#define VTSWITCHSIG SIGUSR2 - -static bool vtActive = true; -static int vtQws = 0; -static int kbdFD = -1; - -static QIntDict *overrideMap = 0; - -/*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map - and will delete it. Use QCollection::setAutoDelete() to control - whether the contents of \a map should be deleted. - - Passing a null pointer for \a map will revert to the default keymap. -*/ - -void QWSServer::setOverrideKeys( QIntDict *map ) -{ - delete overrideMap; - overrideMap = map; -} - -/*! - \class QWSKeyboardHandler qkeyboard_qws.h - \brief Keyboard driver/handler for Qt/Embedded - - The keyboard driver/handler handles events from system devices and - generates key events. - - A QWSKeyboardHandler will usually open some system device in its - constructor, create a QSocketNotifier on that opened device and when - it receives data, it will call processKeyEvent() to send the event - to Qt/Embedded for relaying to clients. -*/ - -/*! - Subclasses call this to send a key event. The server may additionally - filter it before sending it on to applications. - -
    -
  • \a unicode is the Unicode value for the key, or 0xffff if none is appropriate. -
  • \a keycode is the Qt keycode for the key (see Qt::Key). - for the list of codes). -
  • \a modifiers is the set of modifier keys (see Qt::Modifier). -
  • \a isPress says whether this is a press or a release. -
  • \a autoRepeat says whether this event was generated by an auto-repeat - mechanism, or an actual key press. -
-*/ -void QWSKeyboardHandler::processKeyEvent(int unicode, int keycode, int modifiers, - bool isPress, bool autoRepeat) -{ - qwsServer->processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); -} - - -bool qwsSetKeyboardAutoRepeat( int /* delay */ , int /* period */ ) -{ - return FALSE; -} - -bool qwsGetKeyboardAutoRepeat( int /* delay */ , int /* period */ ) -{ - return FALSE; -} - -void qwsRestoreKeyboardLeds() -{ -} - - - - - -/* - * Virtual framebuffer keyboard driver - */ - -class QWSVFbKeyboardHandler : public QWSKeyboardHandler -{ - Q_OBJECT -public: - QWSVFbKeyboardHandler(); - virtual ~QWSVFbKeyboardHandler(); - - bool isOpen() { return fd > 0; } - -private slots: - void readKeyboardData(); - -private: - QString terminalName; - int fd; - int kbdIdx; - int kbdBufferLen; - unsigned char *kbdBuffer; - QSocketNotifier *notifier; -}; - -#ifndef QT_NO_QWS_VFB -#include "qvfbhdr.h" -extern int qws_display_id; -#endif - -QWSVFbKeyboardHandler::QWSVFbKeyboardHandler() -{ - kbdFD = -1; -#ifndef QT_NO_QWS_VFB - kbdIdx = 0; - kbdBufferLen = sizeof( QVFbKeyData ) * 5; - kbdBuffer = new unsigned char [kbdBufferLen]; - - terminalName = QString(QT_VFB_KEYBOARD_PIPE).arg(qws_display_id); - - if ((kbdFD = open( terminalName.local8Bit(), O_RDWR | O_NDELAY)) < 0) { - qDebug( "Cannot open %s (%s)", terminalName.latin1(), - strerror(errno)); - } else { - // Clear pending input - char buf[2]; - while (read(kbdFD, buf, 1) > 0) { } - - notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); - connect(notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData())); - } -#endif -} - -QWSVFbKeyboardHandler::~QWSVFbKeyboardHandler() -{ -#ifndef QT_NO_QWS_VFB - if ( kbdFD >= 0 ) - close( kbdFD ); - delete [] kbdBuffer; -#endif -} - - -void QWSVFbKeyboardHandler::readKeyboardData() -{ -#ifndef QT_NO_QWS_VFB - int n; - do { - n = read(kbdFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx ); - if ( n > 0 ) - kbdIdx += n; - } while ( n > 0 ); - - int idx = 0; - while ( kbdIdx - idx >= (int)sizeof( QVFbKeyData ) ) { - QVFbKeyData *kd = (QVFbKeyData *)(kbdBuffer + idx); - if ( kd->unicode == 0 && kd->modifiers == 0 && kd->press ) { - // magic exit key - qWarning( "Instructed to quit by Virtual Keyboard" ); - qApp->quit(); - } - processKeyEvent( kd->unicode&0xffff, kd->unicode>>16, - kd->modifiers, kd->press, kd->repeat ); - idx += sizeof( QVFbKeyData ); - } - - int surplus = kbdIdx - idx; - for ( int i = 0; i < surplus; i++ ) - kbdBuffer[i] = kbdBuffer[idx+i]; - kbdIdx = surplus; -#endif -} - - - - -struct termios origTermData; - -static void init_kbd(void) -{ - struct termios termdata; - - tcgetattr( kbdFD, &origTermData ); - tcgetattr( kbdFD, &termdata ); - - ioctl(kbdFD, KDSKBMODE, K_XLATE); - - termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); - termdata.c_oflag = 0; - termdata.c_cflag = CREAD | CS8; - termdata.c_lflag = 0; - termdata.c_cc[VTIME]=0; - termdata.c_cc[VMIN]=1; - cfsetispeed(&termdata, 9600); - cfsetospeed(&termdata, 9600); - tcsetattr(kbdFD, TCSANOW, &termdata); -} - -static void done_kbd(void) -{ - if (kbdFD >= 0) { - tcsetattr(kbdFD, TCSANOW, &origTermData); - } -} - -static void vtSwitchHandler(int /*sig*/) -{ - if (vtActive) { - qwsServer->enablePainting(false); - qt_screen->save(); - if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) { - vtActive = false; - qwsServer->closeMouse(); - done_kbd(); - } - else { - qwsServer->enablePainting(true); - } - usleep(200000); - } - else { - if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) { - init_kbd(); - qwsServer->enablePainting(true); - vtActive = true; - qt_screen->restore(); - qwsServer->openMouse(); - qwsServer->refresh(); - } - } - signal(VTSWITCHSIG, vtSwitchHandler); -} - - - -class QWSRamsesKbPrivate; -class QWSRamsesKeyboardHandler : public QWSKeyboardHandler -{ -public: - QWSRamsesKeyboardHandler( const QString& ); - virtual ~QWSRamsesKeyboardHandler(); - - virtual void processKeyEvent(int unicode, int keycode, int modifiers, - bool isPress, bool autoRepeat); - -private: - QWSRamsesKbPrivate *d; -}; - - -class QWSRamsesKbPrivate : public QObject -{ - Q_OBJECT -public: - QWSRamsesKbPrivate( QWSRamsesKeyboardHandler *, const QString &device ); - ~QWSRamsesKbPrivate(); - -private slots: - void readKeyboardData(); - -private: - void handleKey(unsigned char code, int n); - - QWSRamsesKeyboardHandler *handler; - char rbuf[255]; - int rptr; -}; - -QWSRamsesKbPrivate::QWSRamsesKbPrivate( QWSRamsesKeyboardHandler *h, const QString &device ) - : handler(h), rptr(0) -{ -#ifdef QT_QWS_DEVFS - kbdFD = ::open(device.isEmpty()?"/dev/vc/2":device.latin1(), O_RDWR|O_NDELAY, 0); -#else - kbdFD = ::open(device.isEmpty()?"/dev/tty2":device.latin1(), O_RDWR|O_NDELAY, 0); -#endif - - if ( kbdFD >= 0 ) { - QSocketNotifier *notifier; - notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); - connect( notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData()) ); - } else { - qDebug( "Cannot open keyboard" ); - } - init_kbd(); - - struct vt_mode vtMode; - ioctl(kbdFD, VT_GETMODE, &vtMode); - - // let us control VT switching - vtMode.mode = VT_PROCESS; - vtMode.relsig = VTSWITCHSIG; - vtMode.acqsig = VTSWITCHSIG; - ioctl(kbdFD, VT_SETMODE, &vtMode); - - struct vt_stat vtStat; - ioctl(kbdFD, VT_GETSTATE, &vtStat); - vtQws = vtStat.v_active; - - signal(VTSWITCHSIG, vtSwitchHandler); -} - -QWSRamsesKbPrivate::~QWSRamsesKbPrivate() -{ - signal(VTSWITCHSIG, 0); - - done_kbd(); - - struct vt_mode vtMode; - ioctl(kbdFD, VT_GETMODE, &vtMode); - /* Mickey says: "Better give up control of VT switching. - * Hey, I really hate that OS-will-reacquire-resources on process-death - * kind of thinking! - */ - vtMode.mode = VT_AUTO; - vtMode.relsig = 0; - vtMode.acqsig = 0; - ioctl(kbdFD, VT_SETMODE, &vtMode); - - ::close(kbdFD); - kbdFD = -1; -} - - -static inline int map_to_modif(int current_map) -{ - int modifiers = 0; - - if (current_map & KG_ALT) - modifiers |= Qt::ALT; - else if (current_map & KG_CTRL) - modifiers |= Qt::CTRL; - else if (current_map & KG_SHIFT) - modifiers |= Qt::SHIFT; - - return modifiers; -} - -struct { - const char *code; - unsigned short qtcode; -} qtesc_lookup[] = { - { "\e[A", Qt::Key_Up }, - { "\e[B", Qt::Key_Down }, - { "\e[C", Qt::Key_Right }, - { "\e[D", Qt::Key_Left }, - { "\e[1~", Qt::Key_Home }, - { "\e[4~", Qt::Key_End }, - { "\e[5~", Qt::Key_PageUp }, - { "\e[6~", Qt::Key_PageDown }, - - { "\e[[A", Qt::Key_F1 }, - { "\e[[B", Qt::Key_F2 }, - { "\e[[C", Qt::Key_F3 }, - { "\e[[D", Qt::Key_F4 }, - { "\e[[E", Qt::Key_F5 }, - { "\e[17~", Qt::Key_F6 }, - { "\e[18~", Qt::Key_F7 }, - { "\e[19~", Qt::Key_F8 }, - { "\e[20~", Qt::Key_F9 }, - { "\e[21~", Qt::Key_F10 }, - { "\e[23~", Qt::Key_F11 }, - { "\e[24~", Qt::Key_F12 }, - - // { "\ex", Qt::FieldExit }, - // { "\er", Qt::FieldReset }, - -}; - -struct { - unsigned char code; - unsigned short qtcode; -} qtkey_lookup[] = { - { 0x08, Qt::Key_Backspace }, - { 0x09, Qt::Key_Tab }, - { 0x0d, Qt::Key_Enter }, - { 0x1b, Qt::Key_Escape }, -}; - -void QWSRamsesKbPrivate::handleKey(unsigned char code, int n) -{ - int qtKeyCode = Qt::Key_unknown; - unsigned int i; - - //qDebug("\nhandleKey %02x %d %c", code, n, code >= ' ' ? code : ' '); - - // Single keys - if ((n==1) && (rptr==0)) { - qtKeyCode = code; - for (i=0; i < sizeof(qtkey_lookup)/sizeof(qtkey_lookup[0]); i++) { - if (qtkey_lookup[i].code == code) { - qtKeyCode = qtkey_lookup[i].qtcode; - code = 0; - break; - } - } - } else - - // Alt- sequence - if ((n==1) && (rptr==1) && (rbuf[0] == '\e')) { - //qDebug("alt-key %d", code); - handler->processKeyEvent(0, Qt::Key_Alt, 0, 1, 0); - handler->processKeyEvent(0, code-32, Qt::ALT, 1, 0); - handler->processKeyEvent(0, code-32, Qt::ALT, 0, 0); - handler->processKeyEvent(0, Qt::Key_Alt, 0, 0, 0); - rptr = 0; - return; - } else - - // End of a function key sequence - if ((n==1) && (rptr!=0)) { - rbuf[rptr++] = code; - rbuf[rptr] = 0; - for (i=0; i < sizeof(qtesc_lookup)/sizeof(qtesc_lookup[0]); i++) { - if (strncmp(rbuf, qtesc_lookup[i].code, sizeof(rbuf)) == 0) { - qtKeyCode = qtesc_lookup[i].qtcode; - code = 0; - break; - } - } - if (code != 0) { - //qWarning("no entry in key sequence table for %s", &rbuf[1]); - int oldrptr = rptr; - rptr = 0; - for (i=0; i <= oldrptr; i++) { - handleKey(rbuf[i], 1); - } - return; - } - rptr = 0; - } else - - // Middle of a function key sequence - { - if (rptr < sizeof(rbuf)) - rbuf[rptr++] = code; - return; - } - - //qDebug(" code 0x%2x %d -> qtKeyCode 0x%04x", code, code, qtKeyCode); - - handler->processKeyEvent(code, qtKeyCode, 0, 1, 0); - handler->processKeyEvent(code, qtKeyCode, 0, 0, 0); -} - - -void QWSRamsesKbPrivate::readKeyboardData() -{ - unsigned char buf[81]; - int n = read(kbdFD, buf, 80 ); - for ( int loop = 0; loop < n; loop++ ) { - handleKey(buf[loop], n-loop); - } -} - - - - - -QWSRamsesKeyboardHandler::QWSRamsesKeyboardHandler( const QString &device ) -{ - d = new QWSRamsesKbPrivate( this, device ); -} - -QWSRamsesKeyboardHandler::~QWSRamsesKeyboardHandler() -{ - delete d; -} - -void QWSRamsesKeyboardHandler::processKeyEvent(int unicode, int keycode, - int modifiers, bool isPress, bool autoRepeat) -{ - // Virtual console switching - int term = 0; - bool ctrl = modifiers & Qt::ControlButton; - bool alt = modifiers & Qt::AltButton; - if (ctrl && alt && keycode >= Qt::Key_F1 && keycode <= Qt::Key_F10) - term = keycode - Qt::Key_F1 + 1; - else if (ctrl && alt && keycode == Qt::Key_Left) - term = QMAX(vtQws - 1, 1); - else if (ctrl && alt && keycode == Qt::Key_Right) - term = QMIN(vtQws + 1, 10); - if (term && !isPress) { - ioctl(kbdFD, VT_ACTIVATE, term); - return; - } - - QWSKeyboardHandler::processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); -} - - - -/* - * keyboard driver instantiation - */ - -QWSKeyboardHandler *QWSServer::newKeyboardHandler( const QString &spec ) -{ - QWSKeyboardHandler *handler = 0; - - QString device; - QString type; - int colon=spec.find(':'); - if ( colon>=0 ) { - type = spec.left(colon); - device = spec.mid(colon+1); - } else { - type = spec; - } - - if ( type == "QVFbKeyboard" ) { - handler = new QWSVFbKeyboardHandler(); - } else if ( type == "TTY" ) { - handler = new QWSRamsesKeyboardHandler(device); - } else { - qWarning( "Keyboard type %s:%s unsupported", spec.latin1(), device.latin1() ); - } - - return handler; -} - -#include "qkeyboard_qws.moc" - -#endif // QT_NO_QWS_KEYBOARD - - diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h deleted file mode 100644 index aa459d1448..0000000000 --- a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** $Id: qt/src/kernel/qkeyboard_qws.h 2.3.10 edited 2005-01-24 $ -** -** Definition of Qt/Embedded keyboards -** -** Created : 991025 -** -** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -** -** This file is part of the kernel module of the Qt GUI Toolkit. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses for Qt/Embedded may use this file in accordance with the -** Qt Embedded Commercial License Agreement provided with the Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -#ifndef QKEYBOARD_QWS_H -#define QKEYBOARD_QWS_H - -#ifndef QT_H -#include "qobject.h" -#endif // QT_H - -#ifndef QT_NO_QWS_KEYBOARD -class Q_EXPORT QWSKeyboardHandler : public QObject { - Q_OBJECT -public: - QWSKeyboardHandler(); - virtual ~QWSKeyboardHandler(); - -protected: - virtual void processKeyEvent(int unicode, int keycode, int modifiers, - bool isPress, bool autoRepeat); -}; -#endif - -Q_EXPORT bool qwsSetKeyboardAutoRepeat( int delay, int period ); -Q_EXPORT bool qwsGetKeyboardAutoRepeat( int *delay, int *period ); - -#endif diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index f148a82341..65204050ac 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -4,7 +4,6 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" -DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/libqte2" @@ -64,11 +63,6 @@ SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 \ SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " #SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_h1940 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_h2200 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " @@ -133,7 +127,6 @@ EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XX EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000" -EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" # # don't touch anything below here @@ -148,19 +141,9 @@ export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -DNO_D # enable if gcc supports visibility #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" export SYSCONF_LFLAGS = "${LDFLAGS} -lts" -export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" export SYSCONF_MOC = "${STAGING_BINDIR_NATIVE}/moc" export SYSCONF_UIC = "${STAGING_BINDIR_NATIVE}/uic" -do_configure_prepend_mnci() { - chmod -R a+w ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel - mkdir bin - ln -sf ${STAGING_BINDIR_NATIVE}/moc bin/moc - ln -sf ${STAGING_BINDIR_NATIVE}/uic bin/uic -} - # generate uclibc and eabi configurations do_configure() { for f in ${S}/configs/linux-*-g++-shared; do diff --git a/packages/qte/qte-common_2.3.12.inc b/packages/qte/qte-common_2.3.12.inc index 97c3dc4c41..cf812de460 100644 --- a/packages/qte/qte-common_2.3.12.inc +++ b/packages/qte/qte-common_2.3.12.inc @@ -41,11 +41,6 @@ SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -- cgit v1.2.3 From 41b13b4beba086ce1eb00bc15a6c27b83f6b3fc5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 7 Apr 2007 12:30:48 +0000 Subject: packages/libmrss: Move to 0.17.1 and drop all patches The patches were applied upstream, move to the new version and update the checksums. --- packages/libmrss/files/.mtn2git_empty | 0 packages/libmrss/files/atom-changes.patch | 17 --- packages/libmrss/files/bump-version.patch | 16 --- packages/libmrss/files/fix-memleaks.patch | 17 --- packages/libmrss/files/fix_atom_date_locale.patch | 121 ---------------------- packages/libmrss/libmrss_0.17.1.bb | 14 +++ packages/libmrss/libmrss_0.17.bb | 18 ---- 7 files changed, 14 insertions(+), 189 deletions(-) delete mode 100644 packages/libmrss/files/.mtn2git_empty delete mode 100644 packages/libmrss/files/atom-changes.patch delete mode 100644 packages/libmrss/files/bump-version.patch delete mode 100644 packages/libmrss/files/fix-memleaks.patch delete mode 100644 packages/libmrss/files/fix_atom_date_locale.patch create mode 100644 packages/libmrss/libmrss_0.17.1.bb delete mode 100644 packages/libmrss/libmrss_0.17.bb (limited to 'packages') diff --git a/packages/libmrss/files/.mtn2git_empty b/packages/libmrss/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libmrss/files/atom-changes.patch b/packages/libmrss/files/atom-changes.patch deleted file mode 100644 index 42f74d00f2..0000000000 --- a/packages/libmrss/files/atom-changes.patch +++ /dev/null @@ -1,17 +0,0 @@ -Make sure to always set a pubDate - -Index: libmrss-0.17/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-03-22 19:40:54.000000000 +0100 -+++ libmrss-0.17/src/mrss_parser.c 2007-03-22 19:44:15.000000000 +0100 -@@ -270,6 +270,10 @@ - && data->version == MRSS_VERSION_ATOM_1_0) - item->pubDate = - __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ else if (!strcmp(cur->value, "updated" ) && !item->pubDate -+ && data->version == MRSS_VERSION_ATOM_1_0) -+ item->pubDate = -+ __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); - - /* issued -> pubDate (Atom 0.3) */ - else if (!strcmp (cur->value, "issued") && !item->pubDate) diff --git a/packages/libmrss/files/bump-version.patch b/packages/libmrss/files/bump-version.patch deleted file mode 100644 index 2eeb6931c8..0000000000 --- a/packages/libmrss/files/bump-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -Bump the version info, specially as I changed the struct in a binary -incompatible way. - -Index: libmrss-0.17/src/Makefile.am -=================================================================== ---- libmrss-0.17.orig/src/Makefile.am 2007-04-01 16:43:58.000000000 +0200 -+++ libmrss-0.17/src/Makefile.am 2007-04-01 16:44:10.000000000 +0200 -@@ -10,7 +10,7 @@ - mrss_options.c \ - mrss_search.c - --libmrss_la_LDFLAGS = -version-info 0:16:0 -+libmrss_la_LDFLAGS = -version-info 0:17:0 - - EXTRA_DIST = mrss.h mrss_internal.h - diff --git a/packages/libmrss/files/fix-memleaks.patch b/packages/libmrss/files/fix-memleaks.patch deleted file mode 100644 index c88570c72e..0000000000 --- a/packages/libmrss/files/fix-memleaks.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libmrss-0.17/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 22:23:22.000000000 +0200 -+++ libmrss-0.17/src/mrss_parser.c 2007-04-01 22:23:42.000000000 +0200 -@@ -186,10 +186,10 @@ - cat->allocated = 1; - cat->category = c; - -- if (!(c = nxmle_find_attribute (cur, "scheme", NULL))) -+ if (c = nxmle_find_attribute (cur, "scheme", NULL)) - cat->domain = c; - -- if (!(c = nxmle_find_attribute (cur, "label", NULL))) -+ if (c = nxmle_find_attribute (cur, "label", NULL)) - cat->label = c; - - if (!*category) diff --git a/packages/libmrss/files/fix_atom_date_locale.patch b/packages/libmrss/files/fix_atom_date_locale.patch deleted file mode 100644 index 111a4859cd..0000000000 --- a/packages/libmrss/files/fix_atom_date_locale.patch +++ /dev/null @@ -1,121 +0,0 @@ -The Atom date formating code tries to create a RFC822 date. This date -requires to use the C locale for the date (for weekday-names and month-names). - -This patch uses new POSIX functionality to create a C locale and strftime_l -to create a right RFC822 date. - -Index: libmrss-0.17/src/mrss.h -=================================================================== ---- libmrss-0.17.orig/src/mrss.h 2007-02-02 12:23:49.000000000 +0100 -+++ libmrss-0.17/src/mrss.h 2007-04-01 19:46:41.000000000 +0200 -@@ -364,6 +364,9 @@ - mrss_element_t element; - int allocated; - -+ /** For internal use only: */ -+ void* c_locale; -+ - /* Data: */ - - char *file; -Index: libmrss-0.17/src/mrss_free.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_free.c 2007-02-02 12:47:46.000000000 +0100 -+++ libmrss-0.17/src/mrss_free.c 2007-04-01 19:46:41.000000000 +0200 -@@ -22,9 +22,14 @@ - # error Use configure; make; make install - #endif - -+#define _GNU_SOURCE -+ - #include "mrss.h" - #include "mrss_internal.h" - -+#include -+ -+ - static void __mrss_free_channel (mrss_t * mrss); - static void __mrss_free_category (mrss_category_t * category); - static void __mrss_free_hour (mrss_hour_t * hour); -@@ -202,6 +207,9 @@ - __mrss_free_item ((mrss_item_t *) old); - } - -+ if (mrss->c_locale) -+ freelocale (mrss->c_locale); -+ - if (mrss->allocated) - free (mrss); - } -Index: libmrss-0.17/src/mrss_parser.c -=================================================================== ---- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 19:46:41.000000000 +0200 -+++ libmrss-0.17/src/mrss_parser.c 2007-04-01 20:38:06.000000000 +0200 -@@ -22,9 +22,13 @@ - # error Use configure; make; make install - #endif - -+#define _GNU_SOURCE -+ - #include "mrss.h" - #include "mrss_internal.h" - -+#include -+ - static void - __mrss_parse_tag_insert (mrss_tag_t ** where, mrss_tag_t * what) - { -@@ -133,7 +137,7 @@ - } - - static char * --__mrss_atom_prepare_date (char *datestr) -+__mrss_atom_prepare_date (mrss_t *data, char *datestr) - { - char *ret = NULL; - if (datestr) -@@ -150,8 +154,13 @@ - stm.tm_year -= 1900; - char datebuf[256]; - free (datestr); -- strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z", -- &stm); -+ -+ if (!data->c_locale) { -+ data->c_locale = newlocale(LC_ALL_MASK,"C",NULL); -+ } -+ -+ strftime_l (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z", -+ &stm, data->c_locale); - ret = strdup (datebuf); - } - } -@@ -269,16 +278,16 @@ - else if (!strcmp (cur->value, "published") && !item->pubDate - && data->version == MRSS_VERSION_ATOM_1_0) - item->pubDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - else if (!strcmp(cur->value, "updated" ) && !item->pubDate - && data->version == MRSS_VERSION_ATOM_1_0) - item->pubDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - - /* issued -> pubDate (Atom 0.3) */ - else if (!strcmp (cur->value, "issued") && !item->pubDate) - item->pubDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - - /* id -> guid */ - else if (!strcmp (cur->value, "id") && !item->guid -@@ -701,7 +710,7 @@ - /* updated -> lastBuildDate */ - else if (!strcmp (cur->value, "updated")) - data->lastBuildDate = -- __mrss_atom_prepare_date (nxmle_get_string (cur, NULL)); -+ __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL)); - - /* author -> managingeditor */ - else if (!strcmp (cur->value, "author")) diff --git a/packages/libmrss/libmrss_0.17.1.bb b/packages/libmrss/libmrss_0.17.1.bb new file mode 100644 index 0000000000..fe2e87ca51 --- /dev/null +++ b/packages/libmrss/libmrss_0.17.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams" +LICENSE = "LGPL" +HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" + +DEPENDS = "libnxml curl" +PR = "r0" + +inherit autotools pkgconfig + +SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb deleted file mode 100644 index 0d23a2b54f..0000000000 --- a/packages/libmrss/libmrss_0.17.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams" -LICENSE = "LGPL" -HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" - -DEPENDS = "libnxml curl" -PR = "r1" - -inherit autotools pkgconfig - -SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ - file://atom-changes.patch;patch=1 \ - file://fix_atom_date_locale.patch;patch=1 \ - file://fix-memleaks.patch;patch=1 \ - file://bump-version.patch;patch=1 " - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From e13c8d9e59be4facce34d00a53c66ec22f51204b Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 13:07:11 +0000 Subject: packages/gpe-clock/gpe-clock_svn.bb * add new recipe packages/gpe-clock/files/svn-build.patch * add patch necessary to build the svn sources packages/gpe-clock/gpe-clock.inc * fix dependancies --- packages/gpe-clock/files/.mtn2git_empty | 0 packages/gpe-clock/files/svn-build.patch | 240 +++++++++++++++++++++++++++++++ packages/gpe-clock/gpe-clock.inc | 2 +- packages/gpe-clock/gpe-clock_svn.bb | 15 ++ 4 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-clock/files/.mtn2git_empty create mode 100644 packages/gpe-clock/files/svn-build.patch create mode 100644 packages/gpe-clock/gpe-clock_svn.bb (limited to 'packages') diff --git a/packages/gpe-clock/files/.mtn2git_empty b/packages/gpe-clock/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-clock/files/svn-build.patch b/packages/gpe-clock/files/svn-build.patch new file mode 100644 index 0000000000..69c6d6d07f --- /dev/null +++ b/packages/gpe-clock/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-clock/Makefile.orig 2007-04-07 13:50:17.507459397 +0300 ++++ gpe-clock/Makefile 2007-04-07 13:50:25.711926944 +0300 +@@ -2,7 +2,7 @@ + PREFIX = /usr/local + DEBUG = no + GTK2 = yes +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.25 + + LINGUAS = nl pt cs fr de ro ru sr sk sv es +diff -Naur gpe-clock.orig/build/Makefile.dpkg_ipkg gpe-clock/build/Makefile.dpkg_ipkg +--- gpe-clock.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-clock/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-clock.orig/build/Makefile.translation gpe-clock/build/Makefile.translation +--- gpe-clock.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-clock/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s//$(MAINTAINER)/;s//$(BINPACKAGE)/;s//$(VERSION)/;s//$$i/;s!!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-clock/gpe-clock.inc b/packages/gpe-clock/gpe-clock.inc index 34f628dcea..d4ae3da39c 100644 --- a/packages/gpe-clock/gpe-clock.inc +++ b/packages/gpe-clock/gpe-clock.inc @@ -3,6 +3,6 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" +RDEPENDS = "gpe-announce" inherit gpe diff --git a/packages/gpe-clock/gpe-clock_svn.bb b/packages/gpe-clock/gpe-clock_svn.bb new file mode 100644 index 0000000000..a8bbb89e67 --- /dev/null +++ b/packages/gpe-clock/gpe-clock_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "GPE panel clock" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" +RDEPENDS = "gpe-announce" + +inherit autotools + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From e881360882ce1af41ddc67405bc4dc05a8adf2b1 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 7 Apr 2007 13:36:19 +0000 Subject: nunome 1.0.1: Fix packaging. * There appears to be some binary crap in "source" archive and it was being installed instead of build files. --- packages/nunome/nunome_1.0.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb index 373f30f571..d8421c12f5 100644 --- a/packages/nunome/nunome_1.0.1.bb +++ b/packages/nunome/nunome_1.0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/" RDEPENDS = "virtual/japanese-font" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \ file://nunome.patch;patch=1" @@ -34,8 +34,8 @@ do_install() { oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib install -m 644 nunome_uni.dic ${D}${palmtopdir}/share/nunome - install -m 755 server/nnmsrv ${D}${palmtopdir}/bin - install -m 755 dicman/nnmDicman ${D}${palmtopdir}/bin + install -m 755 server.bin ${D}${palmtopdir}/bin/nnmsrv + install -m 755 dicman.bin ${D}${palmtopdir}/bin/nnmDicman install -m 644 ui/nunome.qm ${D}${palmtopdir}/i18n/ja install -m 644 dicman/nnmDicman.qm ${D}${palmtopdir}/i18n/ja } -- cgit v1.2.3 From 4c8dd4ff65a0c701fc00864a2733e9396ae7bfd4 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 15:52:37 +0000 Subject: packages/gpe-su/gpe-su_svn.bb * svn build recipe for gpe-su packages/gpe-su/files/svn-build.patch * patch to make svn source build --- packages/gpe-su/files/.mtn2git_empty | 0 packages/gpe-su/files/svn-build.patch | 240 ++++++++++++++++++++++++++++++++++ packages/gpe-su/gpe-su_svn.bb | 14 ++ 3 files changed, 254 insertions(+) create mode 100644 packages/gpe-su/files/.mtn2git_empty create mode 100644 packages/gpe-su/files/svn-build.patch create mode 100644 packages/gpe-su/gpe-su_svn.bb (limited to 'packages') diff --git a/packages/gpe-su/files/.mtn2git_empty b/packages/gpe-su/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-su/files/svn-build.patch b/packages/gpe-su/files/svn-build.patch new file mode 100644 index 0000000000..09a8dfb92f --- /dev/null +++ b/packages/gpe-su/files/svn-build.patch @@ -0,0 +1,240 @@ +--- gpe-su/Makefile.orig 2007-04-07 13:50:17.507459397 +0300 ++++ gpe-su/Makefile 2007-04-07 13:50:25.711926944 +0300 +@@ -1,7 +1,7 @@ + PREFIX = /usr/local + PACKAGE = gpe-su + DEBUG = yes +-CVSBUILD = yes ++CVSBUILD = no + VERSION = 0.19 + + LINGUAS = nl pt fr sk cs de sv ro ru sr es zh_CN +diff -Naur gpe-su.orig/build/Makefile.dpkg_ipkg gpe-su/build/Makefile.dpkg_ipkg +--- gpe-su.orig/build/Makefile.dpkg_ipkg 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-su/build/Makefile.dpkg_ipkg 2007-02-10 17:21:40.154584782 +0200 +@@ -0,0 +1,114 @@ ++## Please read the README in this directory to see how to use this ++## Makefile snippet ++ ++# Let's use whatever clean target the specific app provides ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# URL to source tarball ++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz ++ ++# can change this to e.g. /var/tmp/deb ++DEB_PATH = ../deb ++ ++ifeq ($(CVSBUILD),yes) ++LIBGPEWIDGET_PC = libgpewidget-uninstalled ++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget ++else ++LIBGPEWIDGET_PC = libgpewidget ++endif ++ ++ifeq ($(IN_LIBGPEWIDGET),) ++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) ++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) ++endif ++ ++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) ++GTKLIBS = $(shell pkg-config --libs gtk+-2.0) ++ ++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++STANDARD_CFLAGS = -MD -Wall ++ ++ifeq ($(DEBUG),yes) ++CFLAGS += -O2 -g ++LDFLAGS = -g ++else ++CFLAGS += -Os -fomit-frame-pointer ++endif ++ ++dist: check-source clean dist-prep ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ mkdir ../$(PACKAGE)-$(VERSION) ++ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) ++ ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) ++ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) ++ rm -rf ../$(PACKAGE)-$(VERSION) ++ $(MAKE) printinfo ++ ++dist-upload: dist ++ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/ ++ ++dist-prep: ++ipkg-prep: ++install-mo: ++# empty, can be filled in Makefile.translation ++ ++install: install-program install-mo ++ ++clean-dist: ++ rm -rf familiar/dist familiar/dist.list ++ ++clean: clean-dist ++ ++check-source: ++ @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi ++ ++ipkg: check-source ipkg-prep clean ++ rm -rf familiar/dist ++ mkdir -p familiar/dist/CONTROL ++ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control ++ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi ++ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi ++ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi ++ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi ++ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi ++ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program ++ rm -rf familiar/dist.list ++ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list ++ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi ++ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch ++ rm -rf familiar/dist familiar/dist.list ++ $(MAKE) printinfo ++ ++dpkg: dist ++ mkdir -p $(DEB_PATH) ++ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) ++ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian ++ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done ++ ++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) ++printinfo: ++ @printf '-------------------------------------------------------------------------------\n' ++ @printf "If this becomes a package release, please add a CVS tag.\n" ++ @printf "You can use 'make tag' for that, it will execute\n" ++ @printf " cvs tag %s\n" $(CVSTAG) ++ @printf "Please upload a tarball (created with 'make dist') to\n" ++ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" ++ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" ++ @printf "You can use 'make dist-upload' to do that.\n" ++ @printf "You are currently known as USER %s.\n" $(USER) ++ @printf '-------------------------------------------------------------------------------\n' ++ ++tag: check-source ++ cvs tag $(CVSTAG) ++ ++retag: check-source ++ cvs tag -F $(CVSTAG) ++ ++source: tag dist-upload ++ ++%.pc: %.pc.in ++ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ ++ ++.c.o:; ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ +diff -Naur gpe-su.orig/build/Makefile.translation gpe-su/build/Makefile.translation +--- gpe-su.orig/build/Makefile.translation 1970-01-01 02:00:00.000000000 +0200 ++++ gpe-su/build/Makefile.translation 2007-02-10 17:21:46.170927636 +0200 +@@ -0,0 +1,107 @@ ++.SUFFIXES: .mo .po .pot .po8 ++ ++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` ++ ++# use ipkg-build or ipkg-deb-build ++IPKG_BUILD := ipkg-build ++ ++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint ++ ++ifeq ($(DIR_PO),) ++DIR_PO := po ++endif ++ ++ifeq ($(BINPACKAGE),) ++BINPACKAGE := $(PACKAGE) ++endif ++ ++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) ++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ ++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) ++desktop-files += $(PACKAGE).desktop ++endif ++ ++ifneq ($(EXTRA_DESKTOPS),) ++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) ++endif ++ ++all-mo: $(mo-files) ++ ++all-desktop: $(desktop-files) ++ ++install-mo: all-mo ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ if [ "x$(LINGUAS)" != "x" ]; then \ ++ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ ++ fi; \ ++ fi; ++ ++.po8.mo:; ++ if [ "$(ENABLE_NLS)" != "no" ]; then \ ++ msgfmt -o $@ $<; \ ++ fi; ++ ++.po.po8:; ++ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ ++ ++update-po: $(po-files) extract-po ++ ++dist-prep: update-po freshen-po ++# empty ++ ++ifeq ($(CVSBUILD),yes) ++ipkg-prep: freshen-po ++# empty ++endif ++ ++extract-po: ++ mkdir -p $(DIR_PO) ++ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) ++ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi ++ ++clean: clean-po clean-dist-translation ++ ++clean-po: ++ rm -rf $(DIR_PO)/*.mo ++ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done ++ ++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) ++ intltool-merge -u -d $(DIR_PO) $< $@ ++ ++freshen-po: ++ rm -rf tmp-po ++ mkdir tmp-po ++ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done ++ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done ++ rm -rf tmp-po ++ ++# ------------------------------------------------------------------------ ++ ++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) ++ ++ifndef BUILD ++BUILD = ../build ++endif ++ ++transdist := familiar/dist-translation ++templates := $(BUILD)/familiar ++ipkglist := translation-ipkgs.txt ++ ++clean-dist-translation: ++ rm -rf $(transdist) $(ipkglist) ++ ++real-translation-package: all-mo ++ rm -rf $(transdist) $(ipkglist) ++ for LINGUA in $(LINGUAS); do \ ++ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ ++ mkdir -p $(transdist)/$$i/CONTROL; \ ++ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ ++ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ ++ sed -e "s//$(MAINTAINER)/;s//$(BINPACKAGE)/;s//$(VERSION)/;s//$$i/;s!!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ ++ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ ++ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ ++ done ++ ++translation-ipkg: ++ make PREFIX=/usr real-translation-package diff --git a/packages/gpe-su/gpe-su_svn.bb b/packages/gpe-su/gpe-su_svn.bb new file mode 100644 index 0000000000..113fc4abd4 --- /dev/null +++ b/packages/gpe-su/gpe-su_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "GPE Graphical root-shell frontend" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget" + +inherit pkgconfig + +SRC_URI = "${GPE_SVN} \ + file://svn-build.patch;patch=1" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" + -- cgit v1.2.3 From 9d1e59bff52f47828ddf415ba9b7c081edb036d5 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 16:06:51 +0000 Subject: packages/libgpeplugin/libgpeplugin_cvs.bb * drop obsolete cvs bb recipe, use the svn from now on --- packages/libgpeplugin/libgpeplugin_cvs.bb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 packages/libgpeplugin/libgpeplugin_cvs.bb (limited to 'packages') diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb deleted file mode 100644 index 80fc6ec095..0000000000 --- a/packages/libgpeplugin/libgpeplugin_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Plugin system for GPE applications" -AUTHOR = "Luce DeCicco " - -DEPENDS = "gtk+ libgpewidget" -PV = "0.0+cvs${SRCDATE}" - -#put examples in a seperate package -PACKAGES += "${PN}-examples" -FILES_${PN}-examples = "${bindir}/* ${libexecdir}/*" -FILES_${PN} = "${libdir}/*.so.*" - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -S = "${WORKDIR}/${PN}" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} -- cgit v1.2.3 From 919b68db7ce1b2609cb439e0317c194d2937fcf0 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 16:51:13 +0000 Subject: packages/gpe-buttonbox/gpe-buttonbox_cvs.bb * removed obsolete cvs build bb packages/gpe-buttonbox/gpe-buttonbox_svn.bb * add new working svn recipe --- packages/gpe-buttonbox/gpe-buttonbox_cvs.bb | 17 ----------------- packages/gpe-buttonbox/gpe-buttonbox_svn.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 packages/gpe-buttonbox/gpe-buttonbox_cvs.bb create mode 100644 packages/gpe-buttonbox/gpe-buttonbox_svn.bb (limited to 'packages') diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb deleted file mode 100644 index f982c4517f..0000000000 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -DEFAULT_PREFERENCE = "-1" -LICENSE = "GPL" -DESCRIPTION = "Buttonbox for gpe" - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" - -DEPENDS = "libgpewidget libgpelaunch" - -S = "${WORKDIR}/${PN}" -#Remove the dash below when 0.5 changes in PV -PV = "0.5+cvs-${SRCDATE}" -PR = "r0" - -inherit autotools - -FILES_${PN} += "${datadir}/gpe" - diff --git a/packages/gpe-buttonbox/gpe-buttonbox_svn.bb b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb new file mode 100644 index 0000000000..f1a932f788 --- /dev/null +++ b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Buttonbox for gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget libgpelaunch" +PV = "0.5+svn-${SRCDATE}" +PR = "r0" + +inherit autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +FILES_${PN} += "${datadir}/gpe" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From f557f190fab7dd26d9e9f0ca0b43e72c53d953cc Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 17:09:29 +0000 Subject: packages/gpe-what/gpe-what_cvs.bb * remove obsolete cvs recipe packages/gpe-what/gpe-what_svn.bb * add new svn recipe --- packages/gpe-what/gpe-what_cvs.bb | 12 ------------ packages/gpe-what/gpe-what_svn.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 packages/gpe-what/gpe-what_cvs.bb create mode 100644 packages/gpe-what/gpe-what_svn.bb (limited to 'packages') diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb deleted file mode 100644 index 4572d467b6..0000000000 --- a/packages/gpe-what/gpe-what_cvs.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" - -DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.41+cvs${SRCDATE}" - -inherit autotools gpe - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" - -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" diff --git a/packages/gpe-what/gpe-what_svn.bb b/packages/gpe-what/gpe-what_svn.bb new file mode 100644 index 0000000000..7ecaf20a2f --- /dev/null +++ b/packages/gpe-what/gpe-what_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "GPE modal help" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 gtk+" +PV = "0.41+svn${SRCDATE}" + +inherit autotools + +SRC_URI = "${GPE_SVN}" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 977d898f72299c3c86b565cc002810a1e9cd8b7f Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 17:52:42 +0000 Subject: packages/gpe-windowlist/gpe-windowlist_cvs.bb * remove obsolete cvs recipe packages/gpe-windowlist/gpe-windowlist_svn.bb * add new up-to-date svn recipe --- packages/gpe-windowlist/gpe-windowlist_cvs.bb | 17 ----------------- packages/gpe-windowlist/gpe-windowlist_svn.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 packages/gpe-windowlist/gpe-windowlist_cvs.bb create mode 100644 packages/gpe-windowlist/gpe-windowlist_svn.bb (limited to 'packages') diff --git a/packages/gpe-windowlist/gpe-windowlist_cvs.bb b/packages/gpe-windowlist/gpe-windowlist_cvs.bb deleted file mode 100644 index 245f5c0ff5..0000000000 --- a/packages/gpe-windowlist/gpe-windowlist_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -DEPENDS = "libgpewidget libgpelaunch gtk+" -SECTION = "gpe" -DESCRIPTION = "GPE windowlist applet" -LICENSE = "GPL" - -DEFAULT_PREFERENCE = "-1" - -PV = "0.1+cvs${SRCDATE}" -PR = "r1" - -inherit autotools gpe - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -S = "${WORKDIR}/${PN}" - - - diff --git a/packages/gpe-windowlist/gpe-windowlist_svn.bb b/packages/gpe-windowlist/gpe-windowlist_svn.bb new file mode 100644 index 0000000000..2f9d18111e --- /dev/null +++ b/packages/gpe-windowlist/gpe-windowlist_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "GPE windowlist applet" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "libgpewidget libgpelaunch gtk+" +PV = "0.1+svn${SRCDATE}" +PR = "r1" + +inherit autotools + +SRC_URI = "${GPE_EXTRA_SVN}" + +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 7be956759ed4f9df1b3d0f038b0ec599da51aa55 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 7 Apr 2007 18:29:52 +0000 Subject: perl.inc: use ${TARGET_SYS}, otherwise people with TARGET_VENDOR set can't build perl --- packages/perl/perl.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index cda260efcd..9e20ae63e6 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -19,11 +19,11 @@ do_compile() { # You must use gcc to link on sh OPTIONS="" if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then - OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + OPTIONS="LD=${TARGET_SYS}-gcc" fi # You must use gcc to link on powerpc also if test ${TARGET_ARCH} = "powerpc" ; then - OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + OPTIONS="LD=${TARGET_SYS}-gcc" fi oe_runmake perl $OPTIONS -- cgit v1.2.3 From ee9cf2e1ea9bf3e150234ea0dc3a3efa22fc344f Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 19:20:28 +0000 Subject: packages/gtk-webcore/osb-nrcore_svn.bb: fix wrong source pull * remove JavaScriptcore source pull --- packages/gtk-webcore/osb-nrcore_svn.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index de89ef78be..7959a7e752 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -6,7 +6,6 @@ PV = "0.5.2+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ - svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \ file://build_silence.patch;patch=0;maxdate=20070401" -- cgit v1.2.3 From 2effa2e0213c0cecaf6d3a0ca7390a288ebc9908 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sat, 7 Apr 2007 19:29:28 +0000 Subject: packages/gtk-webcore/osb-browser_svn.bb: new svn recipe * new svn recipe --- packages/gtk-webcore/osb-browser_svn.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gtk-webcore/osb-browser_svn.bb (limited to 'packages') diff --git a/packages/gtk-webcore/osb-browser_svn.bb b/packages/gtk-webcore/osb-browser_svn.bb new file mode 100644 index 0000000000..cbeebbcdc3 --- /dev/null +++ b/packages/gtk-webcore/osb-browser_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Gtk+ WebCore - reference browser" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" +PV = "0.5.0+svn${SRCDATE}" +PR = "r0" + +inherit autotools + +SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=osb-browser;proto=https" + +S = "${WORKDIR}/osb-browser" + +DEFAULT_PREFERENCE = "-1" + -- cgit v1.2.3