diff options
Diffstat (limited to 'packages')
149 files changed, 6608 insertions, 482 deletions
diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb index 986e17a5f9..cf10afeefe 100644 --- a/packages/addons/devshell.bb +++ b/packages/addons/devshell.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks" LICENSE = "GPL" -PR = "r2" +PR = "r3" inherit autotools pkgconfig @@ -72,4 +72,4 @@ do_deploy() { install -m 755 $shellfile ${DEPLOY_DIR}/addons } -addtask do_deploy after do_install +addtask deploy after do_install before do_package diff --git a/packages/apt/apt-0.6.46/.mtn2git_empty b/packages/apt/apt-0.6.46.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/apt/apt-0.6.46/.mtn2git_empty +++ b/packages/apt/apt-0.6.46.2/.mtn2git_empty diff --git a/packages/apt/apt-0.6.46/autofoo.patch b/packages/apt/apt-0.6.46.2/autofoo.patch index 74d787cefd..74d787cefd 100644 --- a/packages/apt/apt-0.6.46/autofoo.patch +++ b/packages/apt/apt-0.6.46.2/autofoo.patch diff --git a/packages/apt/apt-0.6.46/noconfigure.patch b/packages/apt/apt-0.6.46.2/noconfigure.patch index 682a96da24..682a96da24 100644 --- a/packages/apt/apt-0.6.46/noconfigure.patch +++ b/packages/apt/apt-0.6.46.2/noconfigure.patch diff --git a/packages/apt/apt-0.6.46/nodoc.patch b/packages/apt/apt-0.6.46.2/nodoc.patch index 9101847189..9101847189 100644 --- a/packages/apt/apt-0.6.46/nodoc.patch +++ b/packages/apt/apt-0.6.46.2/nodoc.patch diff --git a/packages/apt/apt-native_0.6.46.bb b/packages/apt/apt-native_0.6.46.2.bb index 43f73889f7..43f73889f7 100644 --- a/packages/apt/apt-native_0.6.46.bb +++ b/packages/apt/apt-native_0.6.46.2.bb diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb new file mode 100644 index 0000000000..1cd8eb270e --- /dev/null +++ b/packages/apt/apt_0.6.46.2.bb @@ -0,0 +1,9 @@ +require apt.inc + +SRC_URI += "file://autofoo.patch;patch=1 \ + file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" diff --git a/packages/apt/apt_0.6.46.bb b/packages/apt/apt_0.6.46.bb deleted file mode 100644 index 6d21638118..0000000000 --- a/packages/apt/apt_0.6.46.bb +++ /dev/null @@ -1,43 +0,0 @@ -require apt.inc - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -do_install () { - set -x - ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} - ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))} - install -d ${D}${bindir} - install -m 0755 bin/apt-cdrom ${D}${bindir}/ - install -m 0755 bin/apt-get ${D}${bindir}/ - install -m 0755 bin/apt-config ${D}${bindir}/ - install -m 0755 bin/apt-cache ${D}${bindir}/ - - 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 -a -C bin libapt-pkg ${D}${libdir}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - oe_libinstall -a -C bin libapt-inst ${D}${libdir}/ - 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/ - - install -d ${D}${libdir}/dpkg/methods/apt - install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ - install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ - install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ - - install -d ${D}${sysconfdir}/apt - install -d ${D}${localstatedir}/lib/apt/lists/partial - install -d ${D}${localstatedir}/cache/apt/archives/partial - install -d ${D}${docdir}/apt/examples - install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/ -} - diff --git a/packages/base-files/base-files/h5xxx/.mtn2git_empty b/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/base-files/base-files/h5xxx/.mtn2git_empty +++ b/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty diff --git a/packages/arpwatch/files/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch index 208c65108b..208c65108b 100644 --- a/packages/arpwatch/files/05debian_fhs.patch +++ b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch diff --git a/packages/fstests/files/.mtn2git_empty b/packages/arpwatch/arpwatch-2.1a15/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/fstests/files/.mtn2git_empty +++ b/packages/arpwatch/arpwatch-2.1a15/.mtn2git_empty diff --git a/packages/arpwatch/arpwatch-2.1a15/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a15/05debian_fhs.patch new file mode 100644 index 0000000000..c6cffb06c3 --- /dev/null +++ b/packages/arpwatch/arpwatch-2.1a15/05debian_fhs.patch @@ -0,0 +1,91 @@ +Index: arpwatch/Makefile.in +diff -u arpwatch/Makefile.in:1.1.1.1 arpwatch/Makefile.in:1.1.1.1.10.1 +--- arpwatch/Makefile.in:1.1.1.1 Tue Apr 17 13:31:36 2001 ++++ arpwatch/Makefile.in Tue Apr 17 13:53:29 2001 +@@ -31,7 +31,8 @@ + # Pathname of directory to install the man page + MANDEST = @mandir@ + # Pathname of directory to install database file +-ARPDIR = $(prefix)/arpwatch ++ARPDIR = /var/lib/arpwatch ++ETHERCODES = /usr/share/arpwatch/ethercodes.dat + + # VPATH + srcdir = @srcdir@ +@@ -45,7 +46,8 @@ + PROG = arpwatch + CCOPT = @V_CCOPT@ + INCLS = -I. @V_INCLS@ +-DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" ++DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \ ++ -DETHERCODES=\"$(ETHERCODES)\" + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +Index: arpwatch/arpsnmp.8 +diff -u arpwatch/arpsnmp.8:1.1.1.1 arpwatch/arpsnmp.8:1.1.1.1.10.1 +--- arpwatch/arpsnmp.8:1.1.1.1 Tue Apr 17 13:31:36 2001 ++++ arpwatch/arpsnmp.8 Tue Apr 17 13:53:29 2001 +@@ -69,9 +69,9 @@ + .na + .nh + .nf +-/usr/operator/arpwatch - default directory ++/var/lib/arpwatch - default directory + arp.dat - ethernet/ip address database +-ethercodes.dat - vendor ethernet block list ++/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list + .ad + .hy + .fi +Index: arpwatch/arpwatch.8 +diff -u arpwatch/arpwatch.8:1.1.1.1 arpwatch/arpwatch.8:1.1.1.1.10.1 +--- arpwatch/arpwatch.8:1.1.1.1 Tue Apr 17 13:31:36 2001 ++++ arpwatch/arpwatch.8 Tue Apr 17 13:53:29 2001 +@@ -152,9 +152,9 @@ + .na + .nh + .nf +-/usr/operator/arpwatch - default directory ++/var/lib/arpwatch - default directory + arp.dat - ethernet/ip address database +-ethercodes.dat - vendor ethernet block list ++/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list + .ad + .hy + .fi +Index: arpwatch/arpwatch.h +diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1 +--- arpwatch/arpwatch.h:1.1.1.1 Tue Apr 17 13:31:36 2001 ++++ arpwatch/arpwatch.h Tue Apr 17 13:53:29 2001 +@@ -1,7 +1,7 @@ + /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */ + + #define ARPFILE "arp.dat" +-#define ETHERCODES "ethercodes.dat" ++/* #define ETHERCODES "ethercodes.dat" */ + #define CHECKPOINT (15*60) /* Checkpoint time in seconds */ + + #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n) +Index: arpwatch/bihourly +diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1 +--- arpwatch/bihourly.sh 2006/11/21 22:53:34 1.1 ++++ arpwatch/bihourly.sh 2006/11/21 22:54:13 +@@ -6,7 +6,7 @@ + PATH=${PATH}:/usr/local/sbin + export PATH + # +-cd /usr/operator/arpwatch ++cd /usr/lib/arpwatch + # + list="`cat list`" + cname="`cat cname`" +@@ -26,7 +26,7 @@ + + alist="" + for r in ${list}; do \ +- ./arpfetch ${r} ${cname} > ${r} 2> ${temp1} ++ arpfetch ${r} ${cname} > ${r} 2> ${temp1} + if [ -s ${temp1} ]; then + echo "arpfetch ${r} errors:" + xr=${d}/${r}.$$ diff --git a/packages/arpwatch/arpwatch_2.1a15.bb b/packages/arpwatch/arpwatch_2.1a15.bb new file mode 100644 index 0000000000..74e667c510 --- /dev/null +++ b/packages/arpwatch/arpwatch_2.1a15.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "Ethernet/FDDI station activity monitor" +HOMEPAGE = "http://www-nrg.ee.lbl.gov/" +SECTION = "network" +LICENSE = "BSD" +RRECOMMENDS = "arpwatch-data" +PR = "r1" + +SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \ + file://05debian_fhs.patch;patch=1 \ + file://06debian_manpages.patch;patch=1 \ + file://init.d \ + file://arpwatch.default \ + file://arpwatch.conf \ + file://ethercodes.dat \ + file://make.patch;patch=1 \ + file://volatiles.08_arpwatch" + +inherit autotools update-rc.d + +PACKAGES =+ "arpwatch-data" + +FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat" + +do_install() { + install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d \ + ${D}${datadir}/arpwatch \ + ${D}${sysconfdir}/default/volatiles + oe_runmake install DESTDIR=${D} + oe_runmake install-man DESTDIR=${D} + for i in arp2ethers arpfetch massagevendor; do + install -m 0755 ${S}/$i ${D}${sbindir} + done + install -m 0755 ${S}/bihourly.sh ${D}${sbindir}/bihourly + for i in arp2ethers arpfetch bihourly massagevendor; do + install -m 0644 ${S}/$i.8 ${D}${mandir}/man8 + done + install -m 0755 ${WORKDIR}/init.d ${D}${sysconfdir}/init.d/arpwatch + install -m 0644 ${WORKDIR}/arpwatch.default ${D}${sysconfdir}/default/arpwatch + install -m 0644 ${WORKDIR}/arpwatch.conf ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/ethercodes.dat ${D}${datadir}/arpwatch + + # We need some /var directories + for i in 08_arpwatch; do + install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i + done +} + +pkg_postinst_${PN} () { + /etc/init.d/populate-volatile.sh update +} + +CONFFILES_${PN} = "${sysconfdir}/default/arpwatch \ + ${sysconfdir}/arpwatch.conf" + +INITSCRIPT_NAME = "arpwatch" +INITSCRIPT_PARAMS = "defaults 95 05" diff --git a/packages/arpwatch/files/arpwatch.default b/packages/arpwatch/files/arpwatch.default index b0a7d8f9ff..204dffff8e 100644 --- a/packages/arpwatch/files/arpwatch.default +++ b/packages/arpwatch/files/arpwatch.default @@ -1,7 +1,4 @@ # Global options for arpwatch(8). -# Debian: don't report bogons, don't use PROMISC. -ARGS="-N -p" - -# Debian: run as `arpwatch' user. Empty this to run as root. -RUNAS="arpwatch" +# Debian: don't report bogons +ARGS="-N" diff --git a/packages/arpwatch/files/volatiles.08_arpwatch b/packages/arpwatch/files/volatiles.08_arpwatch new file mode 100644 index 0000000000..216736153b --- /dev/null +++ b/packages/arpwatch/files/volatiles.08_arpwatch @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d root root 0775 /var/lib/arpwatch none diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty b/packages/avahi/avahi-0.6.15/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty +++ b/packages/avahi/avahi-0.6.15/.mtn2git_empty diff --git a/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch b/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch new file mode 100644 index 0000000000..0971a9eea8 --- /dev/null +++ b/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch @@ -0,0 +1,28 @@ +marcus 2006-11-11 02:56:18 UTC + + FreeBSD ports repository + + Modified files: + net/avahi Makefile distinfo + Added files: + net/avahi/files patch-avahi-daemon_dbus-protocol.c + Log: + Update to 0.6.15, and fix the build with D-BUS 1.0. + + Revision Changes Path + 1.43 +3 -3 ports/net/avahi/Makefile + 1.12 +3 -3 ports/net/avahi/distinfo + 1.3 +11 -0 ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new) + +--- avahi-daemon/dbus-protocol.c.orig Fri Nov 10 21:50:07 2006 ++++ avahi-daemon/dbus-protocol.c Fri Nov 10 21:50:55 2006 +@@ -1067,7 +1067,7 @@ static int dbus_connect(void) { + if (dbus_bus_request_name( + server->bus, + AVAHI_DBUS_NAME, +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0 + DBUS_NAME_FLAG_DO_NOT_QUEUE, + #else + DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, + diff --git a/packages/avahi/avahi_0.6.15.bb b/packages/avahi/avahi_0.6.15.bb new file mode 100644 index 0000000000..331018d23a --- /dev/null +++ b/packages/avahi/avahi_0.6.15.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" +HOMEPAGE = "http://avahi.org" +SECTION = "network" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "expat libdaemon dbus" +RRECOMMENDS_avahi-daemon = "libnss-mdns" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ + file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0" + +inherit autotools pkgconfig update-rc.d + +EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" + +PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core = "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/hosts \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ + ${sysconfdir}/avahi/avahi-autoipd.action" +FILES_avahi-utils = "${bindir}/avahi-*" + +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +do_stage() { + autotools_stage_all +} + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +# At the time the postinst runs, dbus might not be setup so only restart if running + +pkg_postinst_avahi-daemon () { + # can't do this offline + 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 + + DBUSPID=`pidof dbus-daemon` + + if [ "x$DBUSPID" != "x" ]; then + /etc/init.d/dbus-1 force-reload + fi +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} diff --git a/packages/linux/linux-nokia770-2.6.16-osso15/.mtn2git_empty b/packages/base-files/base-files/h5000/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-nokia770-2.6.16-osso15/.mtn2git_empty +++ b/packages/base-files/base-files/h5000/.mtn2git_empty diff --git a/packages/base-files/base-files/h5xxx/fstab b/packages/base-files/base-files/h5000/fstab index b44d7eacee..b44d7eacee 100644 --- a/packages/base-files/base-files/h5xxx/fstab +++ b/packages/base-files/base-files/h5000/fstab diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb index 0b85c96ada..dba0893b2b 100644 --- a/packages/bogofilter/bogofilter_0.96.0.bb +++ b/packages/bogofilter/bogofilter_0.96.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham ( by a statistical analysis of the message's header and content (body). \ The program is able to learn from the user's classifications and corrections." LICENSE = "GPL" -PR = "r5" +PR = "r6" PRIORITY = "optional" SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ @@ -34,5 +34,5 @@ pkg_postinst () { echo "bogofilter unix - n n - - pipe" >> /etc/postfix/master.cf echo " flags=R user=bogo argv=/usr/bin/postfix-filter.sh -f ${sender} -- ${recipient}" >> /etc/postfix/master.cf } - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb new file mode 100644 index 0000000000..d01d1399b8 --- /dev/null +++ b/packages/cairo/cairo_git.bb @@ -0,0 +1,28 @@ +#This is a development snapshot, so lets hint OE to use the releases +DEFAULT_PREFERENCE = "-1" + +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" +DESCRIPTION = "Cairo graphics library" +LICENSE = "MPL LGPL" + +PV = "1.3.2+git${SRCDATE}" + +SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \ + " +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +do_configure_prepend() { + sed -i s:PKGCONFIG_REQUIRED=0.19:PKGCONFIG_REQUIRED=0.15: configure.in +} + +do_compile_append() { + cd ${S}/perf ; oe_runmake +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc index 2a09c52461..b18cd06c24 100644 --- a/packages/clamav/clamav.inc +++ b/packages/clamav/clamav.inc @@ -93,21 +93,21 @@ pkg_postinst_${PN}-freshclam () { grep -q clamav: /etc/passwd || \ adduser --disabled-password --home=/var/lib/clamav/ --system \ --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_postinst_${PN}-daemon () { grep -q clamav: /etc/group || addgroup clamav grep -q clamav: /etc/passwd || \ adduser --disabled-password --home=/var/lib/clamav/ --system \ --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_postinst_${PN}-data () { grep -q clamav: /etc/group || addgroup clamav grep -q clamav: /etc/passwd || \ adduser --disabled-password --home=/var/lib/clamav/ --system \ --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } # Indicate that the default files are configuration files diff --git a/packages/clamav/clamav_0.88.5.bb b/packages/clamav/clamav_0.88.5.bb index fec4ae59d8..e721558efe 100644 --- a/packages/clamav/clamav_0.88.5.bb +++ b/packages/clamav/clamav_0.88.5.bb @@ -1,3 +1,3 @@ require clamav.inc -PR = "r0" +PR = "r1" diff --git a/packages/clamav/clamav_0.88.6.bb b/packages/clamav/clamav_0.88.6.bb index fec4ae59d8..e721558efe 100644 --- a/packages/clamav/clamav_0.88.6.bb +++ b/packages/clamav/clamav_0.88.6.bb @@ -1,3 +1,3 @@ require clamav.inc -PR = "r0" +PR = "r1" diff --git a/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch b/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch new file mode 100644 index 0000000000..cde2731477 --- /dev/null +++ b/packages/coreutils/coreutils-5.1.3/rename-eaccess.patch @@ -0,0 +1,44 @@ +# On Ubuntu edgy (and perhaps other distributions), eaccess is provided by +# unistd.h - This renames the function so as not to conflict. + +--- coreutils-5.1.3/src/test.c.old 2006-08-17 15:29:41.000000000 +0100 ++++ coreutils-5.1.3/src/test.c 2006-08-17 15:30:44.000000000 +0100 +@@ -125,7 +125,7 @@ + /* Do the same thing access(2) does, but use the effective uid and gid. */ + + static int +-eaccess (char const *file, int mode) ++_eaccess (char const *file, int mode) + { + static int have_ids; + static uid_t uid, euid; +@@ -158,7 +158,7 @@ + return result; + } + #else +-# define eaccess(F, M) euidaccess (F, M) ++# define _eaccess(F, M) euidaccess (F, M) + #endif + + /* Increment our position in the argument list. Check that we're not +@@ -623,17 +623,17 @@ + + case 'r': /* file is readable? */ + unary_advance (); +- value = -1 != eaccess (argv[pos - 1], R_OK); ++ value = -1 != _eaccess (argv[pos - 1], R_OK); + return (TRUE == value); + + case 'w': /* File is writable? */ + unary_advance (); +- value = -1 != eaccess (argv[pos - 1], W_OK); ++ value = -1 != _eaccess (argv[pos - 1], W_OK); + return (TRUE == value); + + case 'x': /* File is executable? */ + unary_advance (); +- value = -1 != eaccess (argv[pos - 1], X_OK); ++ value = -1 != _eaccess (argv[pos - 1], X_OK); + return (TRUE == value); + + case 'O': /* File is owned by you? */ diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb index 31af80907d..2f7476c2dd 100644 --- a/packages/coreutils/coreutils_5.1.3.bb +++ b/packages/coreutils/coreutils_5.1.3.bb @@ -3,11 +3,12 @@ SECTION = "base" DESCRIPTION = "A collection of core GNU utilities." RREPLACES = "textutils shellutils fileutils" RPROVIDES = "textutils shellutils fileutils" -PR = "r7" +PR = "r8" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ - file://man.patch;patch=1" + file://man.patch;patch=1 \ + file://rename-eaccess.patch;patch=1" inherit autotools diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb index 1bb806cb22..14fb728304 100644 --- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb +++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "cyrus-sasl virtual/db" LICENSE = "BSD" -PR = "r8" +PR = "r9" DEPENDS += "install-native" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \ @@ -44,7 +44,7 @@ do_install_append () { } pkg_postinst () { - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_postrm () { diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb index a95bdde228..f5a6f3458d 100644 --- a/packages/davfs2/davfs2_0.2.8.bb +++ b/packages/davfs2/davfs2_0.2.8.bb @@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5" RDEPENDS_${PN} = "kernel-module-coda" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \ file://Makefile.in.patch;patch=1 \ @@ -35,7 +35,7 @@ do_install_append () { pkg_postinst () { update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} \ ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY} - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_prerm () { diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb index 67e9306de6..7087f1f90a 100644 --- a/packages/dpkg/dpkg-native_1.13.22.bb +++ b/packages/dpkg/dpkg-native_1.13.22.bb @@ -1,6 +1,6 @@ require dpkg.inc -PR = "r1" -DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native" +PR = "r3" +DEPENDS += "zlib-native virtual/update-alternatives-native" SRC_URI += "file://noman.patch;patch=1" inherit native diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc index 90173aa55b..5fab2a7e3a 100644 --- a/packages/dpkg/dpkg.inc +++ b/packages/dpkg/dpkg.inc @@ -3,11 +3,12 @@ LICENSE = "GPL" SECTION = "base" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ + file://ignore_extra_fields.patch;patch=1 \ file://noupdalt.patch;patch=1" S = "${WORKDIR}/dpkg-${PV}" -RDEPENDS_${PN} += "update-alternatives" +DEPENDS_${PN} += "update-alternatives" PARALLEL_MAKE = "" diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb index deccb32827..0d6ae5c5fb 100644 --- a/packages/dpkg/dpkg_1.13.22.bb +++ b/packages/dpkg/dpkg_1.13.22.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r0" +PR = "r4" DEPENDS += "ncurses zlib bzip2" SRC_URI += "file://noman.patch;patch=1" diff --git a/packages/dpkg/files/ignore_extra_fields.patch b/packages/dpkg/files/ignore_extra_fields.patch new file mode 100644 index 0000000000..43878463e9 --- /dev/null +++ b/packages/dpkg/files/ignore_extra_fields.patch @@ -0,0 +1,21 @@ + dpkg-deb/build.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: dpkg-1.13.22/dpkg-deb/build.c +=================================================================== +--- dpkg-1.13.22.orig/dpkg-deb/build.c 2006-05-19 23:11:08.000000000 +0100 ++++ dpkg-1.13.22/dpkg-deb/build.c 2006-11-17 14:43:20.000000000 +0000 +@@ -220,11 +220,11 @@ void do_build(const char *const *argv) { + controlfile, checkedinfo->otherpriority); + warns++; + } +- for (field= checkedinfo->available.arbs; field; field= field->next) { ++ /*for (field= checkedinfo->available.arbs; field; field= field->next) { + fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), + controlfile, field->name); + warns++; +- } ++ }*/ + checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); + checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); + if (errs) ohshit(_("%d errors in control file"),errs); diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb index d980ea35ca..b757354c8e 100644 --- a/packages/esound/esound-gpe_20020817.bb +++ b/packages/esound/esound-gpe_20020817.bb @@ -7,7 +7,7 @@ PROVIDES += "esound" RPROVIDES += "esound" SRCDATE = "${PV}" -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \ +SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base/;module=esound;date=20061119 \ file://audiofile-please.patch;patch=1 \ file://configure.patch;patch=1" diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb index eb58e92b6e..9d48d65229 100644 --- a/packages/fakeroot/fakeroot-native_1.2.13.bb +++ b/packages/fakeroot/fakeroot-native_1.2.13.bb @@ -2,6 +2,7 @@ SECTION = "base" PR = "r0" require fakeroot_${PV}.bb inherit native +RDEPENDS="util-linux-native" SRC_URI += "file://fix-prefix.patch;patch=1" S = "${WORKDIR}/fakeroot-${PV}" diff --git a/packages/fontconfig/fontconfig_2.3.95.bb b/packages/fontconfig/fontconfig_2.3.95.bb index 5609b10394..adbd0ad558 100644 --- a/packages/fontconfig/fontconfig_2.3.95.bb +++ b/packages/fontconfig/fontconfig_2.3.95.bb @@ -12,8 +12,6 @@ PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" FILES_fontconfig-utils = "${bindir}/*" -DEFAULT_PREFERENCE = "-1" - # Work around past breakage in debian.bbclass RPROVIDES_fontconfig-utils = "libfontconfig-utils" RREPLACES_fontconfig-utils = "libfontconfig-utils" diff --git a/packages/fstests/files/compile-fix.patch b/packages/fstests/files/compile-fix.patch deleted file mode 100644 index 83b3a1cfaf..0000000000 --- a/packages/fstests/files/compile-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: tests/Makefile.am -=================================================================== ---- tests.orig/Makefile.am -+++ tests/Makefile.am -@@ -18,13 +18,13 @@ test_fb_SOURCES = test-fb.c - - # fullscreen blit to gtk drawing area via gtk pixbufs - test_gdk_SOURCES = test-gdk.c --test_gdk_LDADD = @GTK_LIBS@ --test_gdk_CFLAGS = @GTK_CFLAGS@ -+test_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # fullscreen blit to gtk drawing area via gtk pixbufs in an idle handler - test_gdk_idle_SOURCES = test-gdk-idle.c --test_gdk_idle_LDADD = @GTK_LIBS@ --test_gdk_idle_CFLAGS = @GTK_CFLAGS@ -+test_gdk_idle_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_gdk_idle_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # fullscreen blit to x window via shm - test_x_SOURCES = test-x.c -@@ -43,8 +43,8 @@ test_freetype_cached_CFLAGS = @FREETYPE_ - - # draw strings via xft - test_xft_SOURCES = test-xft.c --test_xft_LDADD = @XLIBS_LIBS@ --test_xft_CFLAGS = @XLIBS_CFLAGS@ -+test_xft_LDADD = @XLIBS_LIBS@ @PANGO_LIBS@ -+test_xft_CFLAGS = @XLIBS_CFLAGS@ @PANGO_CFLAGS@ - - # draws pango strings with just x - test_pango_SOURCES = test-pango.c -@@ -55,29 +55,29 @@ test_pango_CFLAGS = @PANGO_CFLAGS@ - - # Draws a list of Pango glyphs onto a GtkWindow with pango_xft_render - test_pango_gdk_SOURCES = test-pango-gdk.c --test_pango_gdk_LDADD = @GTK_LIBS@ --test_pango_gdk_CFLAGS = @GTK_CFLAGS@ -+test_pango_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_pango_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # Draws a list of Pango glyphs onto a GtkDrawingArea with pango_xft_render - test_pango_gtk_SOURCES = test-pango-gtk.c --test_pango_gtk_LDADD = @GTK_LIBS@ --test_pango_gtk_CFLAGS = @GTK_CFLAGS@ -+test_pango_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_pango_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # Draws a list of Pango glyphs onto a GtkWindow with gdk_draw_glyphs - # can probably go - # test_gtk_SOURCES = test-gtk.c --# test_gtk_LDADD = @GTK_LIBS@ --# test_gtk_CFLAGS = @GTK_CFLAGS@ -+# test_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+# test_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - - test_pango_layout_SOURCES = test-pango-layout.c --test_pango_layout_LDADD = @GTK_LIBS@ --test_pango_layout_CFLAGS = @GTK_CFLAGS@ -+test_pango_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_pango_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - # As above PangoLayout onto a GtkWindow with gdk_draw_layout XXX TOGO ? - test_gtk_layout_SOURCES = test-gtk-layout.c --test_gtk_layout_LDADD = @GTK_LIBS@ --test_gtk_layout_CFLAGS = @GTK_CFLAGS@ -+test_gtk_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@ -+test_gtk_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ - - - diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb index 5af7c94028..f4ec5ca919 100644 --- a/packages/fstests/fstests.bb +++ b/packages/fstests/fstests.bb @@ -8,8 +8,7 @@ PR = "r1" inherit autotools SRC_URI = \ - "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http \ - file://compile-fix.patch;patch=0" + "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http" S = "${WORKDIR}/fstests/tests" diff --git a/packages/git/git_snapshot.bb b/packages/git/git_snapshot.bb index 443fd299f6..c9048a4673 100644 --- a/packages/git/git_snapshot.bb +++ b/packages/git/git_snapshot.bb @@ -2,6 +2,11 @@ SECTION = "console/utils" LICENSE = "GPL" DESCRIPTION = "The git revision control system used by the Linux kernel developers" DEPENDS = "openssl curl" +RDEPENDS = "perl \ + perl-module-file-path \ + " + +PR = "r2" def get_git_pkgdate(d): import bb diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index db0a955f07..918fa810d8 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -8,6 +8,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" PR = "r12" +#Doesnt build for sh3 +DEFAULT_PREFERENCE_sh3="-1" + GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/gmp/gmp_4.2.1.bb b/packages/gmp/gmp_4.2.1.bb index 6af2db66a4..8ad8e29ad1 100644 --- a/packages/gmp/gmp_4.2.1.bb +++ b/packages/gmp/gmp_4.2.1.bb @@ -1,3 +1,9 @@ +PR = "r1" + +SRC_URI += "file://sh4-asmfix.patch;patch=1" + require gmp.inc -SRC_URI += "file://sh4-asmfix.patch;patch=1"
\ No newline at end of file +# Builds on sh but can't be used due to not compiling in some functions +DEFAULT_PREFERENCE_sh3 = "-1" +DEFAULT_PREFERENCE_sh4 = "-1" diff --git a/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/.mtn2git_empty b/packages/gnet/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/.mtn2git_empty +++ b/packages/gnet/files/.mtn2git_empty diff --git a/packages/gnet/files/buildfix.patch b/packages/gnet/files/buildfix.patch new file mode 100644 index 0000000000..8067620264 --- /dev/null +++ b/packages/gnet/files/buildfix.patch @@ -0,0 +1,13 @@ +Index: gnet/examples/Makefile.am +=================================================================== +--- gnet.orig/examples/Makefile.am ++++ gnet/examples/Makefile.am +@@ -2,7 +2,7 @@ + + @SET_MAKE@ + +-SUBDIRS = xmlrpc ++SUBDIRS = + + if OS_WIN32 + noinst_PROGRAMS = echoclient echoserver \ diff --git a/packages/gnet/gnet_2.0.7.bb b/packages/gnet/gnet_2.0.7.bb deleted file mode 100644 index d5e93c4000..0000000000 --- a/packages/gnet/gnet_2.0.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib." -LICENSE = "LGPL" -HOMEPAGE = "http://www.gnetlibrary.org/" - -SRC_URI = "http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz" -DEPENDS = "glib-2.0" - -EXTRA_OECONF = "--disable-pthreads" - -inherit pkgconfig autotools diff --git a/packages/gnet/gnet_cvs.bb b/packages/gnet/gnet_cvs.bb new file mode 100644 index 0000000000..28b9f1e2e3 --- /dev/null +++ b/packages/gnet/gnet_cvs.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib." +LICENSE = "LGPL" +SECTION = "libs/network" +HOMEPAGE = "http://www.gnetlibrary.org" +DEPENDS = "glib-2.0" +PV = "2.0.7+cvs${SRCDATE}" + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnet \ + file://buildfix.patch;patch=1" +S = "${WORKDIR}/gnet" + +EXTRA_OECONF = "--disable-pthreads" + +inherit autotools pkgconfig diff --git a/packages/gnome/libsoup_2.2.98.bb b/packages/gnome/libsoup_2.2.98.bb new file mode 100644 index 0000000000..581644ede5 --- /dev/null +++ b/packages/gnome/libsoup_2.2.98.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "An HTTP library implementation in C" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" + +DEPENDS = "glib-2.0 gnutls libxml2" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" + +do_stage() { + autotools_stage_all + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc +} diff --git a/packages/gtk-doc/gtk-doc.bb b/packages/gtk-doc/gtk-doc.bb index 98b1905fe8..8609138bac 100644 --- a/packages/gtk-doc/gtk-doc.bb +++ b/packages/gtk-doc/gtk-doc.bb @@ -4,5 +4,6 @@ LICENSE = "LGPL" PR="r1" do_stage() { - install -m 0644 ${WORKDIR}/gtk-doc.m4 ${STAGING_DATADIR}/aclocal + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${WORKDIR}/gtk-doc.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb index 3a3cce41df..f4298d9d07 100644 --- a/packages/havp/havp_0.82.bb +++ b/packages/havp/havp_0.82.bb @@ -8,7 +8,7 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "clamav" RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en" -PR = "r2" +PR = "r3" SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \ file://sysconfdir-is-etc.patch;patch=1 \ @@ -79,7 +79,7 @@ pkg_postinst_${PN} () { grep -q havp: /etc/passwd || \ adduser --disabled-password --home=${localstatedir}/lib/havp/ --system \ --ingroup havp --no-create-home -g "HAVP" havp - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \ diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index 2c2132209f..a60cc0d420 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -15,8 +15,12 @@ create_file() { chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache - - eval $EXEC & + + [ -e "$1" ] && { + [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." + } || { + eval $EXEC & + } } mk_dir() { @@ -27,7 +31,11 @@ mk_dir() { test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache - eval $EXEC & + [ -e "$1" ] && { + [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." + } || { + eval $EXEC & + } } link_file() { @@ -35,7 +43,11 @@ link_file() { test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache - eval $EXEC & + [ -e "$2" ] && { + echo "Cannot create link over existing -${TNAME}-." >&2 + } || { + eval $EXEC & + } } check_requirements() { @@ -109,14 +121,10 @@ apply_cfgfile() { [ "${TTYPE}" = "l" ] && { - [ -e "${TNAME}" ] && { - echo "Cannot create link over existing -${TNAME}-." >&2 - } || { - TSOURCE="$TLTARGET" - [ -L "${TNAME}" ] || { - [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." - link_file "${TSOURCE}" "${TNAME}" & - } + TSOURCE="$TLTARGET" + [ -L "${TNAME}" ] || { + [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." + link_file "${TSOURCE}" "${TNAME}" & } continue } @@ -133,11 +141,6 @@ apply_cfgfile() { } } - [ -e "${TNAME}" ] && { - [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." - continue - } - case "${TTYPE}" in "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." create_file "${TNAME}" & @@ -158,7 +161,7 @@ apply_cfgfile() { } -if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" +if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate" then sh /etc/volatile.cache else diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 73c02e5ec5..306629732a 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 = "r81" +PR = "r82" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb new file mode 100644 index 0000000000..aac3736135 --- /dev/null +++ b/packages/libmad/libmad_0.15.1b.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "MPEG Audio Decoder Library" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libid3tag" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz" +S = "${WORKDIR}/libmad-${PV}" + +inherit autotools + +EXTRA_OECONF = "-enable-speed --enable-shared" +# The ASO's don't take any account of thumb... +EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default" +EXTRA_OECONF_append_arm = " --enable-fpm=arm" + +do_configure_prepend () { +# damn picky automake... + touch NEWS AUTHORS ChangeLog +} + +do_stage() { + oe_libinstall -so libmad ${STAGING_LIBDIR} + install -m 0644 mad.h ${STAGING_INCDIR} +} diff --git a/packages/librsvg/librsvg_2.16.0.bb b/packages/librsvg/librsvg_2.16.0.bb new file mode 100644 index 0000000000..3110c12148 --- /dev/null +++ b/packages/librsvg/librsvg_2.16.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Library for rendering SVG files" +SECTION = "x11/utils" +DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt" +LICENSE = "LGPL" +PR = "r1" + +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/*" +FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug" + +EXTRA_OECONF = "--disable-mozilla-plugin" + +do_stage() { + autotools_stage_all +} diff --git a/packages/lilo-sh/lilo-sh_21.bb b/packages/lilo-sh/lilo-sh_21.bb index df8a755aee..cc4fbac8a7 100644 --- a/packages/lilo-sh/lilo-sh_21.bb +++ b/packages/lilo-sh/lilo-sh_21.bb @@ -39,3 +39,6 @@ do_install() { # Include /boot in the package FILES_${PN} = "${base_sbindir} /boot" + +# Works for sh3/sh4 only +COMPATIBLE_HOST = "sh.*-linux" diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb index 12b4e3d857..bc739d3f0f 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb @@ -5,7 +5,7 @@ PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx)' +COMPATIBLE_MACHINE = '(h3900|h5000)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb index 649704ba08..b936a4ad64 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb @@ -6,7 +6,7 @@ PR = "r2" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx)' +COMPATIBLE_MACHINE = '(h3900|h5000)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb index cf508cb720..3b1c1a073d 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb @@ -6,7 +6,7 @@ PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx)' +COMPATIBLE_MACHINE = '(h3900|h5000)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb index 6c80c4405a..21e3c18534 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx)' +COMPATIBLE_MACHINE = '(h3900|h5000)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/pango/pango-1.2.5/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/pango/pango-1.2.5/.mtn2git_empty +++ b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig index b3f8f7c100..b3f8f7c100 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index ca2f2486a9..7f2dc4c77d 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5xxx|htcuniversal|hx4700|jornada56x|simpad)' +COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|magician|simpad)' # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/spca5xx/spca5xx-20060202/.mtn2git_empty b/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/spca5xx/spca5xx-20060202/.mtn2git_empty +++ b/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/.mtn2git_empty diff --git a/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/defconf_jlime b/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/defconf_jlime new file mode 100644 index 0000000000..f05c4e8ab6 --- /dev/null +++ b/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/defconf_jlime @@ -0,0 +1,1015 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19-rc6 +# Mon Nov 20 20:39:42 2006 +# +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_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_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +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 is not set +# 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_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=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +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_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 is not set +# CONFIG_ARCH_RPC is not set +CONFIG_ARCH_SA1100=y +# 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_DMABOUNCE=y + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ASSABET is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_COLLIE is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_BADGE4 is not set +CONFIG_SA1100_JORNADA720=y +CONFIG_SA1100_JORNADA720_MCU=y +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SSP is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_SA1100=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4=y +CONFIG_CPU_CACHE_V4WB=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WB=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_SA1111=y +CONFIG_FORCE_MAX_ZONEORDER=9 + +# +# Bus support +# +CONFIG_ISA=y + +# +# 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_SA1100 is not set +CONFIG_PCMCIA_SA1111=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_NODES_SHIFT=2 +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_DISCONTIGMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +# CONFIG_CPU_FREQ_STAT is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set +# 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 is not set +CONFIG_CPU_FREQ_SA1110=y + +# +# 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 is not set +CONFIG_APM=y +CONFIG_SA1100_JORNADA720_APM=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=y +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 is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# 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_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 +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 is not set + +# +# Plug and Play support +# +# CONFIG_PNP is not set + +# +# Block devices +# +# 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_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH 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_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_IDE_ARM is not set +# 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 + +# +# 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 +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set +CONFIG_MII=m + +# +# 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=m +CONFIG_PCMCIA_NETWAVE=m + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +CONFIG_ATMEL=m + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +# CONFIG_PCMCIA_ATMEL is not set +CONFIG_PCMCIA_WL3501=m +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m + +# +# 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 is not set +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=640 +CONFIG_INPUT_TSDEV_SCREEN_Y=240 +CONFIG_INPUT_EVDEV=y +# 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_KEYBOARD_JORNADA720=y +# 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_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_JORNADA720=y +# 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_SA1100=y +CONFIG_SERIAL_SA1100_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=8 + +# +# 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 + +# +# 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 + +# +# 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 is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# +# CONFIG_TIFM_CORE is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP_SA11X0 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 + +# +# 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 is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_SA1100 is not set +CONFIG_FB_S1D13XXX=y +# 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=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=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 is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_JORNADA720=y +CONFIG_LCD_JORNADA720=y + +# +# Sound +# +# CONFIG_SOUND 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 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 + +# +# 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_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 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 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=852 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-2" +# 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_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-2" +CONFIG_NLS_CODEPAGE_437=m +# 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=y +# 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=m +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +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 +# 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=y + +# +# 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_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_USER is not set + +# +# 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_MANAGER=m +# 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_ECB=m +CONFIG_CRYPTO_CBC=m +# 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 is not set +# 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=m +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_PLIST=y diff --git a/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/jornada7xx.patch b/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/jornada7xx.patch new file mode 100644 index 0000000000..8ca6c2e2cc --- /dev/null +++ b/packages/linux/linux-jlime-jornada7xx-2.6.19rc6/jornada7xx.patch @@ -0,0 +1,3013 @@ +diff -ruN linux-2.6.18-vanilla/arch/arm/Kconfig linux-2.6.18/arch/arm/Kconfig +--- linux-2.6.18-vanilla/arch/arm/Kconfig 2006-11-20 23:12:54.000000000 +0000 ++++ linux-2.6.18/arch/arm/Kconfig 2006-11-20 23:12:33.000000000 +0000 +@@ -729,7 +729,7 @@ + + config CPU_FREQ_SA1110 + bool +- depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3) ++ depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3 || SA1100_JORNADA720) + default y + + config CPU_FREQ_INTEGRATOR +@@ -848,6 +848,17 @@ + anything, try disabling/enabling this option (or disabling/enabling + APM in your BIOS). + ++config SA1100_JORNADA720_APM ++ tristate "Jornada 720 battery status reporting" ++ depends on SA1100_JORNADA720_MCU && APM ++ help ++ Say Y here if you have a HP Jornada 7xx handheld computer and you ++ want to be able to read battery status. ++ ++ To compile this driver as a module choose M here: the ++ module will be called jornada720_apm. ++ ++ + endmenu + + source "net/Kconfig" +diff -ruN linux-2.6.18-vanilla/arch/arm/configs/jornada720_defconfig linux-2.6.18/arch/arm/configs/jornada720_defconfig +--- linux-2.6.18-vanilla/arch/arm/configs/jornada720_defconfig 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/arch/arm/configs/jornada720_defconfig 2006-11-20 23:12:36.000000000 +0000 +@@ -1,74 +1,120 @@ + # + # Automatically generated make config: don't edit +-# Linux kernel version: 2.6.12-rc1-bk2 +-# Sun Mar 27 23:10:35 2005 ++# Linux kernel version: 2.6.19-rc6 ++# Mon Nov 20 20:39:42 2006 + # + CONFIG_ARM=y ++# CONFIG_GENERIC_TIME is not set + CONFIG_MMU=y +-CONFIG_UID16=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_GENERIC_HWEIGHT=y + CONFIG_GENERIC_CALIBRATE_DELAY=y +-CONFIG_GENERIC_IOMAP=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_CLEAN_COMPILE=y + CONFIG_BROKEN_ON_SMP=y ++CONFIG_INIT_ENV_ARG_LIMIT=32 + + # + # General setup + # + CONFIG_LOCALVERSION="" +-CONFIG_SWAP=y ++# CONFIG_LOCALVERSION_AUTO is not set ++# CONFIG_SWAP is not set + CONFIG_SYSVIPC=y ++# CONFIG_IPC_NS is not set + # CONFIG_POSIX_MQUEUE is not set + # CONFIG_BSD_PROCESS_ACCT is not set +-CONFIG_SYSCTL=y ++# CONFIG_TASKSTATS is not set ++# CONFIG_UTS_NS is not set + # CONFIG_AUDIT is not set +-CONFIG_HOTPLUG=y +-CONFIG_KOBJECT_UEVENT=y + # CONFIG_IKCONFIG is not set ++# 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_CC_OPTIMIZE_FOR_SIZE=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_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 is not set +-CONFIG_OBSOLETE_MODPARM=y ++CONFIG_MODULE_UNLOAD=y ++CONFIG_MODULE_FORCE_UNLOAD=y + # CONFIG_MODVERSIONS is not set + # CONFIG_MODULE_SRCVERSION_ALL is not set + CONFIG_KMOD=y + + # ++# Block layer ++# ++CONFIG_BLOCK=y ++# CONFIG_BLK_DEV_IO_TRACE is not set ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++# CONFIG_IOSCHED_AS is not set ++# CONFIG_IOSCHED_DEADLINE is not set ++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_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_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 is not set + # CONFIG_ARCH_RPC is not set + CONFIG_ARCH_SA1100=y +@@ -76,9 +122,7 @@ + # 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_IMX is not set +-# CONFIG_ARCH_H720X is not set ++CONFIG_DMABOUNCE=y + + # + # SA11x0 Implementations +@@ -91,6 +135,7 @@ + # CONFIG_SA1100_H3800 is not set + # CONFIG_SA1100_BADGE4 is not set + CONFIG_SA1100_JORNADA720=y ++CONFIG_SA1100_JORNADA720_MCU=y + # CONFIG_SA1100_HACKKIT is not set + # CONFIG_SA1100_LART is not set + # CONFIG_SA1100_PLEB is not set +@@ -108,13 +153,15 @@ + CONFIG_CPU_CACHE_V4WB=y + CONFIG_CPU_CACHE_VIVT=y + CONFIG_CPU_TLB_V4WB=y +-CONFIG_CPU_MINICACHE=y ++CONFIG_CPU_CP15=y ++CONFIG_CPU_CP15_MMU=y + + # + # Processor Features + # ++# CONFIG_CPU_ICACHE_DISABLE is not set ++# CONFIG_CPU_DCACHE_DISABLE is not set + CONFIG_SA1111=y +-CONFIG_DMABOUNCE=y + CONFIG_FORCE_MAX_ZONEORDER=9 + + # +@@ -128,21 +175,36 @@ + 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=y ++# CONFIG_I82365 is not set + # CONFIG_TCIC is not set +-CONFIG_PCMCIA_SA1100=y +-# CONFIG_PCMCIA_SA1111 is not set +-CONFIG_PCCARD_NONSTATIC=y ++# CONFIG_PCMCIA_SA1100 is not set ++CONFIG_PCMCIA_SA1111=y + + # + # Kernel Features + # + # CONFIG_PREEMPT is not set ++# CONFIG_NO_IDLE_HZ is not set ++CONFIG_HZ=100 ++# CONFIG_AEABI is not set ++CONFIG_ARCH_DISCONTIGMEM_ENABLE=y ++CONFIG_NODES_SHIFT=2 ++CONFIG_SELECT_MEMORY_MODEL=y ++# CONFIG_FLATMEM_MANUAL is not set ++CONFIG_DISCONTIGMEM_MANUAL=y ++# CONFIG_SPARSEMEM_MANUAL is not set + CONFIG_DISCONTIGMEM=y ++CONFIG_FLAT_NODE_MEM_MAP=y ++CONFIG_NEED_MULTIPLE_NODES=y ++# CONFIG_SPARSEMEM_STATIC is not set ++CONFIG_SPLIT_PTLOCK_CPUS=4096 ++# CONFIG_RESOURCES_64BIT is not set + # CONFIG_LEDS is not set + CONFIG_ALIGNMENT_TRAP=y + +@@ -151,13 +213,24 @@ + # + CONFIG_ZBOOT_ROM_TEXT=0x0 + CONFIG_ZBOOT_ROM_BSS=0x0 +-CONFIG_CMDLINE="keepinitrd mem=32M" ++CONFIG_CMDLINE="" + # CONFIG_XIP_KERNEL is not set + + # + # CPU Frequency scaling + # +-# CONFIG_CPU_FREQ is not set ++CONFIG_CPU_FREQ=y ++CONFIG_CPU_FREQ_TABLE=m ++# CONFIG_CPU_FREQ_DEBUG is not set ++# CONFIG_CPU_FREQ_STAT is not set ++# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set ++CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y ++# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set ++# 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 is not set ++CONFIG_CPU_FREQ_SA1110=y + + # + # Floating point emulation +@@ -168,21 +241,106 @@ + # + CONFIG_FPE_NWFPE=y + # CONFIG_FPE_NWFPE_XP is not set +-CONFIG_FPE_FASTFPE=y ++# CONFIG_FPE_FASTFPE is not set + + # + # Userspace binary formats + # + CONFIG_BINFMT_ELF=y +-CONFIG_BINFMT_AOUT=m ++# CONFIG_BINFMT_AOUT is not set + # CONFIG_BINFMT_MISC is not set + # CONFIG_ARTHUR is not set + + # + # Power management options + # +-CONFIG_PM=y +-# CONFIG_APM is not set ++# CONFIG_PM is not set ++CONFIG_APM=y ++CONFIG_SA1100_JORNADA720_APM=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=y ++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 is not set ++# CONFIG_INET_XFRM_MODE_TUNNEL is not set ++# 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_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 ++CONFIG_WIRELESS_EXT=y + + # + # Device Drivers +@@ -193,89 +351,18 @@ + # + CONFIG_STANDALONE=y + CONFIG_PREVENT_FIRMWARE_BUILD=y +-# CONFIG_FW_LOADER is not set +-# CONFIG_DEBUG_DRIVER is not set ++CONFIG_FW_LOADER=y ++# CONFIG_SYS_HYPERVISOR is not set + + # +-# Memory Technology Devices (MTD) ++# Connector - unified userspace <-> kernelspace linker + # +-CONFIG_MTD=y +-CONFIG_MTD_DEBUG=y +-CONFIG_MTD_DEBUG_VERBOSE=1 +-# 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=m +-CONFIG_MTD_BLOCK=y +-# CONFIG_FTL is not set +-# CONFIG_NFTL is not set +-# CONFIG_INFTL 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=y +-CONFIG_MTD_CFI_NOSWAP=y +-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +-CONFIG_MTD_CFI_GEOMETRY=y +-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=y +-# CONFIG_MTD_CFI_AMDSTD is not set +-# 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_XIP 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_SA1100=y +-# CONFIG_MTD_EDB7312 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_BLKMTD 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 ++# CONFIG_CONNECTOR is not set + + # +-# NAND Flash Device Drivers ++# Memory Technology Devices (MTD) + # +-# CONFIG_MTD_NAND is not set ++# CONFIG_MTD is not set + + # + # Parallel port support +@@ -290,40 +377,28 @@ + # + # Block devices + # +-# CONFIG_BLK_DEV_FD is not set +-# CONFIG_BLK_DEV_XD is not set + # CONFIG_BLK_DEV_COW_COMMON is not set +-CONFIG_BLK_DEV_LOOP=m +-# CONFIG_BLK_DEV_CRYPTOLOOP is not set +-CONFIG_BLK_DEV_NBD=m ++# CONFIG_BLK_DEV_LOOP is not set ++# CONFIG_BLK_DEV_NBD is not set + # CONFIG_BLK_DEV_RAM is not set +-CONFIG_BLK_DEV_RAM_COUNT=16 +-CONFIG_INITRAMFS_SOURCE="" ++# CONFIG_BLK_DEV_INITRD is not set + # CONFIG_CDROM_PKTCDVD is not set +- +-# +-# IO Schedulers +-# +-CONFIG_IOSCHED_NOOP=y +-CONFIG_IOSCHED_AS=y +-CONFIG_IOSCHED_DEADLINE=y +-CONFIG_IOSCHED_CFQ=y + # CONFIG_ATA_OVER_ETH is not set + + # + # ATA/ATAPI/MFM/RLL support + # +-CONFIG_IDE=m +-CONFIG_BLK_DEV_IDE=m ++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=m ++CONFIG_BLK_DEV_IDEDISK=y + # CONFIG_IDEDISK_MULTI_MODE is not set +-# CONFIG_BLK_DEV_IDECS is not set +-CONFIG_BLK_DEV_IDECD=m ++CONFIG_BLK_DEV_IDECS=y ++# CONFIG_BLK_DEV_IDECD is not set + # CONFIG_BLK_DEV_IDETAPE is not set + # CONFIG_BLK_DEV_IDEFLOPPY is not set + # CONFIG_IDE_TASK_IOCTL is not set +@@ -331,7 +406,7 @@ + # + # IDE chipset support/bugfixes + # +-CONFIG_IDE_GENERIC=m ++CONFIG_IDE_GENERIC=y + # CONFIG_IDE_ARM is not set + # CONFIG_IDE_CHIPSETS is not set + # CONFIG_BLK_DEV_IDEDMA is not set +@@ -341,7 +416,9 @@ + # + # SCSI device support + # ++# CONFIG_RAID_ATTRS is not set + # CONFIG_SCSI is not set ++# CONFIG_SCSI_NETLINK is not set + + # + # Multi-device support (RAID and LVM) +@@ -351,6 +428,7 @@ + # + # Fusion MPT device support + # ++# CONFIG_FUSION is not set + + # + # IEEE 1394 (FireWire) support +@@ -361,129 +439,8 @@ + # + + # +-# Networking support ++# Network device support + # +-CONFIG_NET=y +- +-# +-# Networking options +-# +-CONFIG_PACKET=y +-CONFIG_PACKET_MMAP=y +-# CONFIG_NETLINK_DEV is not set +-CONFIG_UNIX=y +-# CONFIG_NET_KEY is not set +-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_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_IP_TCPDIAG is not set +-# CONFIG_IP_TCPDIAG_IPV6 is not set +- +-# +-# IP: Virtual Server Configuration +-# +-# CONFIG_IP_VS is not set +-# CONFIG_IPV6 is not set +-CONFIG_NETFILTER=y +-# CONFIG_NETFILTER_DEBUG is not set +- +-# +-# IP: Netfilter Configuration +-# +-# CONFIG_IP_NF_CONNTRACK is not set +-# CONFIG_IP_NF_CONNTRACK_MARK is not set +-# CONFIG_IP_NF_QUEUE is not set +-# CONFIG_IP_NF_IPTABLES is not set +-# CONFIG_IP_NF_ARPTABLES is not set +- +-# +-# SCTP Configuration (EXPERIMENTAL) +-# +-# CONFIG_IP_SCTP 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 +-# CONFIG_NET_CLS_ROUTE is not set +- +-# +-# Network testing +-# +-# CONFIG_NET_PKTGEN is not set +-# CONFIG_NETPOLL is not set +-# CONFIG_NET_POLL_CONTROLLER is not set +-# CONFIG_HAMRADIO is not set +-CONFIG_IRDA=m +- +-# +-# IrDA protocols +-# +-CONFIG_IRLAN=m +-# CONFIG_IRNET is not set +-CONFIG_IRCOMM=m +-# 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 is not set +- +-# +-# Infrared-port device drivers +-# +- +-# +-# SIR device drivers +-# +-# CONFIG_IRTTY_SIR is not set +- +-# +-# Dongle support +-# +- +-# +-# Old SIR device drivers +-# +-# CONFIG_IRPORT_SIR is not set +- +-# +-# Old Serial dongle support +-# +- +-# +-# FIR device drivers +-# +-# CONFIG_NSC_FIR is not set +-# CONFIG_WINBOND_FIR is not set +-# CONFIG_SMC_IRCC_FIR is not set +-# CONFIG_ALI_FIR is not set +-CONFIG_SA1100_FIR=m +-# CONFIG_BT is not set + CONFIG_NETDEVICES=y + # CONFIG_DUMMY is not set + # CONFIG_BONDING is not set +@@ -496,6 +453,10 @@ + # CONFIG_ARCNET is not set + + # ++# PHY device support ++# ++ ++# + # Ethernet (10 or 100Mbit) + # + # CONFIG_NET_ETHERNET is not set +@@ -518,15 +479,16 @@ + # 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=m +-CONFIG_WAVELAN=m ++# CONFIG_ARLAN is not set ++# CONFIG_WAVELAN is not set + CONFIG_PCMCIA_WAVELAN=m +-# CONFIG_PCMCIA_NETWAVE is not set ++CONFIG_PCMCIA_NETWAVE=m + + # + # Wireless 802.11 Frequency Hopping cards support +@@ -537,14 +499,17 @@ + # Wireless 802.11b ISA/PCI cards support + # + CONFIG_HERMES=m +-# CONFIG_ATMEL is not set ++CONFIG_ATMEL=m + + # + # Wireless 802.11b Pcmcia/Cardbus cards support + # + CONFIG_PCMCIA_HERMES=m ++CONFIG_PCMCIA_SPECTRUM=m + CONFIG_AIRO_CS=m +-# CONFIG_PCMCIA_WL3501 is not set ++# CONFIG_PCMCIA_ATMEL is not set ++CONFIG_PCMCIA_WL3501=m ++# CONFIG_HOSTAP is not set + CONFIG_NET_WIRELESS=y + + # +@@ -564,17 +529,12 @@ + # Wan interfaces + # + # CONFIG_WAN is not set +-CONFIG_PPP=m +-# CONFIG_PPP_MULTILINK is not set +-# CONFIG_PPP_FILTER is not set +-CONFIG_PPP_ASYNC=m +-# CONFIG_PPP_SYNC_TTY is not set +-CONFIG_PPP_DEFLATE=m +-CONFIG_PPP_BSDCOMP=m +-# CONFIG_PPPOE 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 +@@ -585,49 +545,51 @@ + # 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_PSAUX is not set + CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 + CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 + # CONFIG_INPUT_JOYDEV is not set +-# CONFIG_INPUT_TSDEV is not set +-# CONFIG_INPUT_EVDEV is not set ++CONFIG_INPUT_TSDEV=y ++CONFIG_INPUT_TSDEV_SCREEN_X=640 ++CONFIG_INPUT_TSDEV_SCREEN_Y=240 ++CONFIG_INPUT_EVDEV=y + # CONFIG_INPUT_EVBUG is not set + + # + # Input Device Drivers + # + CONFIG_INPUT_KEYBOARD=y +-CONFIG_KEYBOARD_ATKBD=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_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_KEYBOARD_STOWAWAY is not set ++CONFIG_KEYBOARD_JORNADA720=y ++# CONFIG_INPUT_MOUSE 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_PENMOUNT is not set ++# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set ++# CONFIG_TOUCHSCREEN_TOUCHWIN is not set ++CONFIG_TOUCHSCREEN_JORNADA720=y + # CONFIG_INPUT_MISC is not set + + # + # Hardware I/O ports + # +-CONFIG_SERIO=y +-CONFIG_SERIO_SERPORT=y +-# CONFIG_SERIO_SA1111 is not set +-CONFIG_SERIO_LIBPS2=y +-# CONFIG_SERIO_RAW is not set ++# CONFIG_SERIO is not set + # CONFIG_GAMEPORT is not set +-CONFIG_SOUND_GAMEPORT=y + + # + # Character devices +@@ -635,6 +597,7 @@ + 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 + + # +@@ -651,7 +614,7 @@ + CONFIG_SERIAL_CORE_CONSOLE=y + CONFIG_UNIX98_PTYS=y + CONFIG_LEGACY_PTYS=y +-CONFIG_LEGACY_PTY_COUNT=256 ++CONFIG_LEGACY_PTY_COUNT=8 + + # + # IPMI +@@ -662,20 +625,21 @@ + # Watchdog Cards + # + # CONFIG_WATCHDOG is not set ++CONFIG_HW_RANDOM=y + # CONFIG_NVRAM is not set +-# CONFIG_RTC is not set + # CONFIG_DTLK is not set + # CONFIG_R3964 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 + + # +@@ -689,8 +653,44 @@ + # 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 + # ++# CONFIG_TIFM_CORE is not set ++ ++# ++# Multimedia Capabilities Port drivers ++# ++# CONFIG_MCP_SA11X0 is not set ++ ++# ++# LED devices ++# ++# CONFIG_NEW_LEDS is not set ++ ++# ++# LED drivers ++# ++ ++# ++# LED Triggers ++# + + # + # Multimedia devices +@@ -705,14 +705,17 @@ + # + # Graphics support + # ++CONFIG_FIRMWARE_EDID=y + CONFIG_FB=y +-# CONFIG_FB_CFB_FILLRECT is not set +-# CONFIG_FB_CFB_COPYAREA is not set +-# CONFIG_FB_CFB_IMAGEBLIT is not set +-# CONFIG_FB_SOFT_CURSOR is not set ++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_SA1100 is not set ++CONFIG_FB_S1D13XXX=y + # CONFIG_FB_VIRTUAL is not set + + # +@@ -721,37 +724,50 @@ + # CONFIG_VGA_CONSOLE is not set + # CONFIG_MDA_CONSOLE is not set + CONFIG_DUMMY_CONSOLE=y +-# CONFIG_FRAMEBUFFER_CONSOLE is not set ++CONFIG_FRAMEBUFFER_CONSOLE=y ++CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y ++CONFIG_FONTS=y ++CONFIG_FONT_8x8=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 is not set +-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++CONFIG_BACKLIGHT_LCD_SUPPORT=y ++CONFIG_BACKLIGHT_CLASS_DEVICE=y ++CONFIG_BACKLIGHT_DEVICE=y ++CONFIG_LCD_CLASS_DEVICE=y ++CONFIG_LCD_DEVICE=y ++CONFIG_BACKLIGHT_JORNADA720=y ++CONFIG_LCD_JORNADA720=y + + # + # Sound + # +-CONFIG_SOUND=m +- +-# +-# Advanced Linux Sound Architecture +-# +-# CONFIG_SND is not set +- +-# +-# Open Sound System +-# +-# CONFIG_SOUND_PRIME is not set ++# CONFIG_SOUND 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 is not set + + # ++# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' ++# ++ ++# + # USB Gadget Support + # + # CONFIG_USB_GADGET is not set +@@ -762,53 +778,89 @@ + # CONFIG_MMC is not set + + # ++# 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_SA1100=y ++# CONFIG_RTC_DRV_TEST is not set ++# CONFIG_RTC_DRV_V3020 is not set ++ ++# + # File systems + # + CONFIG_EXT2_FS=y + # CONFIG_EXT2_FS_XATTR is not set +-# CONFIG_EXT3_FS is not set +-# CONFIG_JBD 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 +- +-# +-# XFS support +-# ++# 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=m +-# CONFIG_JOLIET is not set +-# CONFIG_ZISOFS is not set ++# CONFIG_ISO9660_FS is not set + # CONFIG_UDF_FS is not set + + # + # DOS/FAT/NT Filesystems + # +-# CONFIG_MSDOS_FS is not set +-# CONFIG_VFAT_FS is not set ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_FAT_DEFAULT_CODEPAGE=852 ++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-2" + # CONFIG_NTFS_FS is not set + + # + # Pseudo filesystems + # + CONFIG_PROC_FS=y ++CONFIG_PROC_SYSCTL=y + CONFIG_SYSFS=y +-CONFIG_DEVFS_FS=y +-CONFIG_DEVFS_MOUNT=y +-CONFIG_DEVFS_DEBUG=y +-# CONFIG_DEVPTS_FS_XATTR is not set +-# CONFIG_TMPFS is not set ++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 +@@ -820,15 +872,6 @@ + # 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=2 +-# CONFIG_JFFS2_FS_NAND is not set +-# CONFIG_JFFS2_FS_NOR_ECC 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 +@@ -839,21 +882,14 @@ + # + # Network File Systems + # +-CONFIG_NFS_FS=m +-CONFIG_NFS_V3=y +-# CONFIG_NFS_V4 is not set +-# CONFIG_NFS_DIRECTIO is not set ++# CONFIG_NFS_FS is not set + # CONFIG_NFSD is not set +-CONFIG_LOCKD=m +-CONFIG_LOCKD_V4=y +-CONFIG_SUNRPC=m +-# 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 +@@ -864,7 +900,46 @@ + # + # Native Language Support + # +-# CONFIG_NLS is not set ++CONFIG_NLS=y ++CONFIG_NLS_DEFAULT="iso8859-2" ++CONFIG_NLS_CODEPAGE_437=m ++# 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=y ++# 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=m ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ASCII is not set ++CONFIG_NLS_ISO8859_1=y ++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 ++# 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=y + + # + # Profiling support +@@ -875,23 +950,16 @@ + # Kernel hacking + # + # CONFIG_PRINTK_TIME is not set +-CONFIG_DEBUG_KERNEL=y ++CONFIG_ENABLE_MUST_CHECK=y + # CONFIG_MAGIC_SYSRQ is not set ++# CONFIG_UNUSED_SYMBOLS is not set ++# CONFIG_DEBUG_KERNEL is not set + CONFIG_LOG_BUF_SHIFT=14 +-# CONFIG_SCHEDSTATS is not set +-CONFIG_DEBUG_SLAB=y +-# CONFIG_DEBUG_SPINLOCK is not set +-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +-# CONFIG_DEBUG_KOBJECT is not set + CONFIG_DEBUG_BUGVERBOSE=y +-# CONFIG_DEBUG_INFO is not set + # CONFIG_DEBUG_FS is not set + CONFIG_FRAME_POINTER=y ++# CONFIG_HEADERS_CHECK 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 + + # + # Security options +@@ -902,7 +970,36 @@ + # + # 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_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_ECB=m ++CONFIG_CRYPTO_CBC=m ++# 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 is not set ++# 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 +@@ -912,7 +1009,7 @@ + # Library routines + # + CONFIG_CRC_CCITT=m ++# CONFIG_CRC16 is not set + CONFIG_CRC32=y + # CONFIG_LIBCRC32C is not set +-CONFIG_ZLIB_INFLATE=y +-CONFIG_ZLIB_DEFLATE=y ++CONFIG_PLIST=y +diff -ruN linux-2.6.18-vanilla/arch/arm/mach-sa1100/Kconfig linux-2.6.18/arch/arm/mach-sa1100/Kconfig +--- linux-2.6.18-vanilla/arch/arm/mach-sa1100/Kconfig 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/arch/arm/mach-sa1100/Kconfig 2006-11-20 23:11:07.000000000 +0000 +@@ -101,6 +101,17 @@ + handheld computer. See <http://www.hp.com/jornada/products/720> + for details. + ++config SA1100_JORNADA720_MCU ++ tristate "HP Jornada 720 Microprocessor Controller Unit" ++ depends on SA1100_JORNADA720 ++ help ++ Say Y here if you have a HP Jornada 7xx handheld computer and you ++ want to access devices connected by the MCU. Those include the ++ keyboard, touchscreen, backlight and battery. ++ ++ To compile this driver as a module choose M here: the ++ module will be called jornada720_mcu. ++ + config SA1100_HACKKIT + bool "HackKit Core CPU Board" + help +diff -ruN linux-2.6.18-vanilla/arch/arm/mach-sa1100/Makefile linux-2.6.18/arch/arm/mach-sa1100/Makefile +--- linux-2.6.18-vanilla/arch/arm/mach-sa1100/Makefile 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/arch/arm/mach-sa1100/Makefile 2006-11-20 23:11:23.000000000 +0000 +@@ -31,6 +31,8 @@ + led-$(CONFIG_SA1100_HACKKIT) += leds-hackkit.o + + obj-$(CONFIG_SA1100_JORNADA720) += jornada720.o ++obj-$(CONFIG_SA1100_JORNADA720_MCU) += jornada720_mcu.o ++obj-$(CONFIG_SA1100_JORNADA720_APM) += jornada720_apm.o + + obj-$(CONFIG_SA1100_LART) += lart.o + led-$(CONFIG_SA1100_LART) += leds-lart.o +diff -ruN linux-2.6.18-vanilla/arch/arm/mach-sa1100/cpu-sa1110.c linux-2.6.18/arch/arm/mach-sa1100/cpu-sa1110.c +--- linux-2.6.18-vanilla/arch/arm/mach-sa1100/cpu-sa1110.c 2006-11-20 23:12:54.000000000 +0000 ++++ linux-2.6.18/arch/arm/mach-sa1100/cpu-sa1110.c 2006-11-20 23:12:31.000000000 +0000 +@@ -85,7 +85,8 @@ + }, { /* Samsung K4S281632B-1H */ + .name = "K4S281632B-1H", + .rows = 12, +- .tck = 10, ++ .tck = 8, ++ .trcd = 20, + .trp = 20, + .twr = 10, + .refresh = 64000, +@@ -142,7 +143,7 @@ + sdram_calculate_timing(struct sdram_info *sd, u_int cpu_khz, + struct sdram_params *sdram) + { +- u_int mem_khz, sd_khz, trp, twr; ++ u_int mem_khz, sd_khz, trp, twr, rcd; + + mem_khz = cpu_khz / 2; + sd_khz = mem_khz; +@@ -180,8 +181,14 @@ + if (sd_khz != mem_khz) + sd->mdrefr |= MDREFR_K1DB2; + ++ rcd = ns_to_cycles(sdram->trcd, mem_khz); ++ ++#ifdef CONFIG_SA1100_JORNADA720 ++ /* Jornada 720 memory doesn't like trcd of 1 */ ++ if(rcd < 2) rcd = 2; ++#endif + /* initial number of '1's in MDCAS + 1 */ +- set_mdcas(sd->mdcas, sd_khz >= 62000, ns_to_cycles(sdram->trcd, mem_khz)); ++ set_mdcas(sd->mdcas, sd_khz >= 62000, rcd); + + #ifdef DEBUG + printk("MDCNFG: %08x MDREFR: %08x MDCAS0: %08x MDCAS1: %08x MDCAS2: %08x\n", +diff -ruN linux-2.6.18-vanilla/arch/arm/mach-sa1100/jornada720.c linux-2.6.18/arch/arm/mach-sa1100/jornada720.c +--- linux-2.6.18-vanilla/arch/arm/mach-sa1100/jornada720.c 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/arch/arm/mach-sa1100/jornada720.c 2006-11-20 23:10:41.000000000 +0000 +@@ -1,5 +1,15 @@ + /* + * linux/arch/arm/mach-sa1100/jornada720.c ++ * ++ * HP Jornada720 init code ++ * ++ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * Copyright (C) 2005 Michael Gernoth <michael@gernoth.net> ++ * ++ * 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 <linux/init.h> +@@ -10,13 +20,14 @@ + #include <linux/ioport.h> + #include <linux/mtd/mtd.h> + #include <linux/mtd/partitions.h> ++#include <video/s1d13xxxfb.h> + + #include <asm/hardware.h> + #include <asm/hardware/sa1111.h> + #include <asm/irq.h> + #include <asm/mach-types.h> + #include <asm/setup.h> +- ++#include <asm/s1d13506.h> + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> + #include <asm/mach/map.h> +@@ -24,13 +35,56 @@ + + #include "generic.h" + ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++/* line 110 of HP's doc */ ++#define TUCR_VAL 0x20000400 ++ ++/* memory space (line 52 of HP's doc) */ ++#define SA1111REGSTART 0x40000000 ++#define SA1111REGLEN 0x00001fff ++#define EPSONREGSTART 0x48000000 ++#define EPSONREGLEN 0x00100000 ++#define EPSONFBSTART 0x48200000 ++/* 512kB framebuffer */ ++#define EPSONFBLEN 512*1024 ++ ++static struct s1d13xxxfb_pdata s1d13xxxfb_data = { ++ .initregs = s1d13xxxfb_initregs, ++ .initregssize = ARRAY_SIZE(s1d13xxxfb_initregs), ++ .platform_init_video = NULL ++}; ++ ++static struct resource s1d13xxxfb_resources[] = { ++ [0] = { ++ .start = EPSONFBSTART, ++ .end = EPSONFBSTART + EPSONFBLEN, ++ .flags = IORESOURCE_MEM, ++ }, ++ [1] = { ++ .start = EPSONREGSTART, ++ .end = EPSONREGSTART + EPSONREGLEN, ++ .flags = IORESOURCE_MEM, ++ } ++}; + +-#define JORTUCR_VAL 0x20000400 ++static struct platform_device s1d13xxxfb_device = { ++ .name = S1D_DEVICENAME, ++ .id = 0, ++ .dev = { ++ .platform_data = &s1d13xxxfb_data, ++ }, ++ .num_resources = ARRAY_SIZE(s1d13xxxfb_resources), ++ .resource = s1d13xxxfb_resources, ++}; + + static struct resource sa1111_resources[] = { + [0] = { +- .start = 0x40000000, +- .end = 0x40001fff, ++ .start = SA1111REGSTART, ++ .end = SA1111REGSTART + SA1111REGLEN, + .flags = IORESOURCE_MEM, + }, + [1] = { +@@ -53,18 +107,32 @@ + .resource = sa1111_resources, + }; + ++static struct platform_device jornada720_mcu_device = { ++ .name = "jornada720_mcu", ++ .id = -1, ++}; ++ + static struct platform_device *devices[] __initdata = { + &sa1111_device, ++ &jornada720_mcu_device, ++ &s1d13xxxfb_device, + }; + ++/* a stub for now, we theoretically cannot suspend without a flashboard */ ++int pm_suspend(suspend_state_t state) ++{ ++ return -1; ++} ++ + static int __init jornada720_init(void) + { + int ret = -ENODEV; + + if (machine_is_jornada720()) { + GPDR |= GPIO_GPIO20; +- TUCR = JORTUCR_VAL; /* set the oscillator out to the SA-1101 */ +- ++ /* oscillator setup (line 116 of HP's doc) */ ++ TUCR = TUCR_VAL; ++ /* resetting SA1111 (line 118 of HP's doc) */ + GPSR = GPIO_GPIO20; + udelay(1); + GPCR = GPIO_GPIO20; +@@ -72,10 +140,6 @@ + GPSR = GPIO_GPIO20; + udelay(20); + +- /* LDD4 is speaker, LDD3 is microphone */ +- PPSR &= ~(PPC_LDD3 | PPC_LDD4); +- PPDR |= PPC_LDD3 | PPC_LDD4; +- + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); + } + return ret; +@@ -85,19 +149,19 @@ + + static struct map_desc jornada720_io_desc[] __initdata = { + { /* Epson registers */ +- .virtual = 0xf0000000, +- .pfn = __phys_to_pfn(0x48000000), +- .length = 0x00100000, ++ .virtual = 0xf0000000, ++ .pfn = __phys_to_pfn(EPSONREGSTART), ++ .length = EPSONREGLEN, + .type = MT_DEVICE + }, { /* Epson frame buffer */ +- .virtual = 0xf1000000, +- .pfn = __phys_to_pfn(0x48200000), +- .length = 0x00100000, ++ .virtual = 0xf1000000, ++ .pfn = __phys_to_pfn(EPSONFBSTART), ++ .length = EPSONFBLEN, + .type = MT_DEVICE + }, { /* SA-1111 */ +- .virtual = 0xf4000000, +- .pfn = __phys_to_pfn(0x40000000), +- .length = 0x00100000, ++ .virtual = 0xf4000000, ++ .pfn = __phys_to_pfn(SA1111REGSTART), ++ .length = SA1111REGLEN, + .type = MT_DEVICE + } + }; +@@ -106,7 +170,7 @@ + { + sa1100_map_io(); + iotable_init(jornada720_io_desc, ARRAY_SIZE(jornada720_io_desc)); +- ++ + sa1100_register_uart(0, 3); + sa1100_register_uart(1, 1); + } +@@ -116,7 +180,7 @@ + .name = "JORNADA720 boot firmware", + .size = 0x00040000, + .offset = 0, +- .mask_flags = MTD_WRITEABLE, /* force read-only */ ++ .mask_flags = MTD_WRITEABLE, /* force read-only */ + }, { + .name = "JORNADA720 kernel", + .size = 0x000c0000, +@@ -139,7 +203,7 @@ + .offset = 0x00540000, + }, { + .name = "JORNADA720 usr local", +- .size = 0, /* will expand to the end of the flash */ ++ .size = 0, /* will expand to the end of the flash */ + .offset = 0x00d00000, + } + }; +@@ -147,10 +211,12 @@ + static void jornada720_set_vpp(int vpp) + { + if (vpp) +- PPSR |= 0x80; ++ /* enabling flash write (line 470 of HP's doc) */ ++ PPSR |= PPC_LDD7; + else +- PPSR &= ~0x80; +- PPDR |= 0x80; ++ /* disabling flash write (line 470 of HP's doc) */ ++ PPSR &= ~PPC_LDD7; ++ PPDR |= PPC_LDD7; + } + + static struct flash_platform_data jornada720_flash_data = { +diff -ruN linux-2.6.18-vanilla/arch/arm/mach-sa1100/jornada720_apm.c linux-2.6.18/arch/arm/mach-sa1100/jornada720_apm.c +--- linux-2.6.18-vanilla/arch/arm/mach-sa1100/jornada720_apm.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/arch/arm/mach-sa1100/jornada720_apm.c 2006-11-20 23:11:20.000000000 +0000 +@@ -0,0 +1,195 @@ ++/* ++ * HP Jornada 720 APM driver ++ */ ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/delay.h> ++#include <linux/device.h> ++ ++#include <asm/apm.h> ++ ++#include <asm/hardware.h> ++#include <asm/arch/jornada720_mcu.h> ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++MODULE_AUTHOR("Filip Zyzniewski <filip.zyzniewski@tefnet.pl>"); ++MODULE_DESCRIPTION("Jornada 720 battery status reporting"); ++MODULE_LICENSE("GPL"); ++ ++#define jornada720_apm_battery_charging() (! (GPLR & GPIO_GPIO26) ) ++#define jornada720_apm_ac_online() ((GPLR & GPIO_GPIO4) ? 0 : 1) ++ ++#define JORNADA720_APM_BACKUP_BATTERY 0 ++#define JORNADA720_APM_MAIN_BATTERY 1 ++ ++#define JORNADA720_APM_MAIN_BATT_MIN_VOLTAGE 430 ++ ++/* without ac power */ ++#define JORNADA720_APM_MAIN_BATT_MAX_VOLTAGE 670 ++ ++/* divisor to convert jornada720_apm_get_main_battery() return value into % */ ++#define JORNADA720_APM_MAIN_BATT_DIVISOR \ ++ (JORNADA720_APM_MAIN_BATT_MAX_VOLTAGE-JORNADA720_APM_MAIN_BATT_MIN_VOLTAGE) * \ ++ (JORNADA720_APM_MAIN_BATT_MAX_VOLTAGE-JORNADA720_APM_MAIN_BATT_MIN_VOLTAGE) / 100 ++/* ++ * coeffient correcting battery voltage altered by ++ * ac power ++ */ ++#define JORNADA720_APM_MAIN_BATT_AC_COEFF 100 / 105 ++ ++ ++int jornada720_apm_get_battery_raw(int battnum) ++{ ++ unsigned char lsb, msb; ++ ++ /* getting batteries data (line 289 of HP's doc) */ ++ if (!jornada720_mcu_start(jornada720_mcu_GetBatteryData)) { ++ lsb=jornada720_mcu_read(); ++ if (battnum==JORNADA720_APM_BACKUP_BATTERY) ++ /* we are interested in the second byte */ ++ lsb=jornada720_mcu_read(); ++ else ++ /* we are interested in the first byte */ ++ jornada720_mcu_read(); ++ ++ msb=jornada720_mcu_read(); ++ } else { ++ jornada720_mcu_end(); ++ return -1; ++ } ++ ++ jornada720_mcu_end(); ++ ++ if (battnum==JORNADA720_APM_MAIN_BATTERY) { ++ /* ++ * main battery absent ++ * (http://mail-index.netbsd.org/port-hpcarm/2005/09/18/0000.html) ++ */ ++ if ((msb & 0x03) == 0x03) return -1; ++ /* putting the value together (line 300 of HP's doc) */ ++ return ((msb & 0x03) << 8) + lsb; ++ } else { ++ /* ++ * backup battery absent ++ * (http://mail-index.netbsd.org/port-hpcarm/2005/09/18/0000.html) ++ */ ++ if ((msb & 0x0c) == 0x00) return -1; ++ /* putting the value together (line 300 of HP's doc) */ ++ return ((msb & 0x0c) << 6) + lsb; ++ } ++} ++ ++int jornada720_apm_get_battery(int battnum) ++{ ++ int ret = jornada720_apm_get_battery_raw(battnum); ++ ++ if (ret == -1) ++ return ret; ++ ++ if (battnum==JORNADA720_APM_MAIN_BATTERY) { ++ /* we want 0 for a completely drained battery */ ++ ret -= JORNADA720_APM_MAIN_BATT_MIN_VOLTAGE; ++ ++ /* voltage(time) is not linear */ ++ ret *= ret; ++ ++ /* let's bring it down to 0-100% range */ ++ ret /= JORNADA720_APM_MAIN_BATT_DIVISOR; ++ ++ /* plugging AC power causes voltage to rise a bit */ ++ if (jornada720_apm_ac_online()) ++ ret = ret * JORNADA720_APM_MAIN_BATT_AC_COEFF; ++ ++ /* ++ * sometimes it tends to fluctuate a bit above 100%, which ++ * looks funny, so we bring it down ++ */ ++ if (ret > 100) ret=100; ++ ++ } ++ ++ /* ++ * returning a raw value, because we don't know how to calculate % ++ * for a backup battery ++ */ ++ return ret; ++} ++ ++static void jornada720_apm_get_power_status(struct apm_power_info *info) ++{ ++ ++ info->battery_life=jornada720_apm_get_battery(JORNADA720_APM_MAIN_BATTERY); ++ ++ if (info->battery_life==-1) { ++ info->battery_status = APM_BATTERY_STATUS_NOT_PRESENT; ++ info->battery_flag = APM_BATTERY_FLAG_NOT_PRESENT; ++ ++ } else if (info->battery_life < 30) { ++ info->battery_status = APM_BATTERY_STATUS_LOW; ++ info->battery_flag = APM_BATTERY_FLAG_LOW; ++ ++ } else if (info->battery_life < 5) { ++ info->battery_status = APM_BATTERY_STATUS_CRITICAL; ++ info->battery_flag = APM_BATTERY_FLAG_CRITICAL; ++ ++ } else { ++ info->battery_status = APM_BATTERY_STATUS_HIGH; ++ info->battery_flag = APM_BATTERY_FLAG_HIGH; ++ } ++ ++ if (jornada720_apm_battery_charging()) ++ info->battery_status = APM_BATTERY_STATUS_CHARGING; ++ ++ info->ac_line_status = jornada720_apm_ac_online(); ++} ++ ++static int jornada720_apm_probe(struct device *dev) { ++ ++ /* we provide a function to check battery levels etc */ ++ apm_get_power_status=jornada720_apm_get_power_status; ++ ++ return 0; ++} ++ ++static int jornada720_apm_remove(struct device *dev) { ++ if(apm_get_power_status==jornada720_apm_get_power_status) ++ apm_get_power_status=NULL; ++ return 0; ++} ++ ++static struct device_driver jornada720_apm_driver = { ++ .name = jornada720_mcu_bus_id_apm, ++ .bus = &jornada720_mcu_bus_type, ++ .probe = jornada720_apm_probe, ++ .remove = jornada720_apm_remove, ++ .owner = THIS_MODULE, ++}; ++ ++static int __init jornada720_apm_init(void) { ++ int ret, backup_level; ++ ++ ret = driver_register(&jornada720_apm_driver); ++ if(ret) return ret; ++ ++ backup_level = jornada720_apm_get_battery(JORNADA720_APM_BACKUP_BATTERY); ++ ++ if(backup_level != -1) ++ printk(KERN_INFO "jornada720_apm: backup battery level: %i\n", backup_level); ++ else ++ printk(KERN_INFO "jornada720_apm: backup battery not present\n"); ++ ++ return ret; ++} ++ ++static void __exit jornada720_apm_exit(void) { ++ driver_unregister(&jornada720_apm_driver); ++} ++ ++ ++module_init(jornada720_apm_init); ++module_exit(jornada720_apm_exit); +diff -ruN linux-2.6.18-vanilla/arch/arm/mach-sa1100/jornada720_mcu.c linux-2.6.18/arch/arm/mach-sa1100/jornada720_mcu.c +--- linux-2.6.18-vanilla/arch/arm/mach-sa1100/jornada720_mcu.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/arch/arm/mach-sa1100/jornada720_mcu.c 2006-11-20 23:11:00.000000000 +0000 +@@ -0,0 +1,248 @@ ++/* ++ * arch/arm/mach-sa1100/jornada720_mcu.c ++ * ++ * HP Jornada 720 Microprocessor Control Unit driver ++ * ++ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * Copyright (C) 2005 Michael Gernoth <michael@gernoth.net> ++ * ++ * 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 <linux/module.h> ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/device.h> ++#include <linux/platform_device.h> ++ ++#include <asm/hardware.h> ++#include <asm/arch/jornada720_mcu.h> ++ ++/* TODO: ++ * when CONFIG_SA1100_SSP will be definable and ssp header will be present, ++ * CONFIG_SA1100_SSP should be added to this module's dependencies and this ++ * include should be removed in favour of ssp header file ++ */ ++#include "ssp.c" ++ ++MODULE_AUTHOR("Filip Zyzniewski <filip.zyzniewski@tefnet.pl>"); ++MODULE_DESCRIPTION("HP Jornada 720 Microprocessor Controller Unit driver"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++ ++/* ++ * we have to lock to avoid starting ++ * second transmission during one taking place ++ */ ++static spinlock_t jornada720_mcu_lock = SPIN_LOCK_UNLOCKED; ++static unsigned long jornada720_mcu_flags; ++ ++ ++u8 inline jornada720_mcu_reverse(u8 x) ++{ ++ /* byte ghijklmn becomes nmlkjihg (line 205 of HP's doc) */ ++ return ++ ((0x80 & x) >> 7) | ++ ((0x40 & x) >> 5) | ++ ((0x20 & x) >> 3) | ++ ((0x10 & x) >> 1) | ++ ((0x08 & x) << 1) | ++ ((0x04 & x) << 3) | ++ ((0x02 & x) << 5) | ++ ((0x01 & x) << 7) ; ++} ++ ++ ++int jornada720_mcu_byte(u8 byte) ++{ ++ u16 ret; ++ int timeout = 400000; ++ ++ /* wating for GPIO 10 to go low (line 197 of HP's doc) */ ++ while ((GPLR & GPIO_GPIO10)) { ++ if (!--timeout) { ++ printk("jornada720_mcu_byte ret -ETIMEDOUT\n"); ++ return -ETIMEDOUT; ++ } ++ cpu_relax(); ++ } ++ ++ ret=jornada720_mcu_reverse(byte) << 8; ++ ++ ssp_write_word(ret); ++ ssp_read_word(&ret); ++ ++ return jornada720_mcu_reverse(ret); ++} ++ ++EXPORT_SYMBOL(jornada720_mcu_byte); ++ ++ ++/* ++ * WARNING: remember to jornada720_mcu_end() after every ++ * jornada720_mcu_start() or you will deadlock! ++ */ ++ ++int jornada720_mcu_start(u8 byte) ++{ ++ int i; ++ ++ /* we don't want other access to the MCU now */ ++ spin_lock_irqsave(&jornada720_mcu_lock, jornada720_mcu_flags); ++ ++ /* clear to enable MCU (line 194 of HP's doc) */ ++ GPCR = GPIO_GPIO25; ++ ++ /* we should always get TxDummy after first request */ ++ if (jornada720_mcu_byte(byte) != jornada720_mcu_TxDummy) ++ { ++ printk(KERN_WARNING "jornada720_mcu: leftover MCU data, flushing\n"); ++ for (i = 0; i < 256; i++) ++ if (jornada720_mcu_read() == -1) ++ break; ++ return -1; ++ } ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL(jornada720_mcu_start); ++ ++ ++void jornada720_mcu_end(void) ++{ ++ /* end of transmission (line 203 of HP's doc) */ ++ GPSR = GPIO_GPIO25; ++ spin_unlock_irqrestore(&jornada720_mcu_lock, jornada720_mcu_flags); ++} ++ ++EXPORT_SYMBOL(jornada720_mcu_end); ++ ++ ++/* Jornada 720 devices accessed by the MCU */ ++static struct device jornada720_mcu_bus_devices[] = { ++ /* keyboard */ ++ { .bus_id = jornada720_mcu_bus_id_kbd }, ++ ++ /* touchscreen */ ++ { .bus_id = jornada720_mcu_bus_id_ts }, ++ ++ /* apm (batteries) */ ++ { .bus_id = jornada720_mcu_bus_id_apm }, ++ ++ /* backlight */ ++ { .bus_id = jornada720_mcu_bus_id_bl }, ++ ++ /* lcd display */ ++ { .bus_id = jornada720_mcu_bus_id_lcd }, ++}; ++ ++static int jornada720_mcu_bus_match(struct device *dev, struct device_driver *drv) ++{ ++ return ! strcmp(dev->bus_id, drv->name); ++} ++ ++struct bus_type jornada720_mcu_bus_type = { ++ .name = "jornada720_mcu_bus", ++ .match = jornada720_mcu_bus_match, ++}; ++ ++EXPORT_SYMBOL(jornada720_mcu_bus_type); ++ ++ ++void jornada720_mcu_bus_device_release(struct device *dev) ++{ ++ /* ++ * those device structures are static, so we don't ++ * have anything to free ++ */ ++} ++ ++static int __init jornada720_mcu_probe(struct platform_device *dev) ++{ ++ int ret, i; ++ ++ /* we don't want any data yet (line 203 of HP's doc) */ ++ GPSR = GPIO_GPIO25; ++ ret=ssp_init(); ++ if (ret) ++ return ret; ++ ++ /* initialization of MCU serial interface (line 182 of HP's doc) */ ++ Ser4MCCR0 = 0; ++ Ser4SSCR0 = 0x0387; ++ Ser4SSCR1 = 0x18; ++ ++ ssp_flush(); ++ ++ /* test of MCU presence */ ++ ret = jornada720_mcu_start(jornada720_mcu_GetBrightness); ++ if(!ret) jornada720_mcu_read(); ++ jornada720_mcu_end(); ++ ++ if(ret < 0) { ++ ssp_exit(); ++ return -ENODEV; ++ } ++ ++ /* registering devices accessible through this bus */ ++ for(i=0; i<ARRAY_SIZE(jornada720_mcu_bus_devices); i++) { ++ jornada720_mcu_bus_devices[i].bus = &jornada720_mcu_bus_type; ++ jornada720_mcu_bus_devices[i].parent = &(dev->dev); ++ jornada720_mcu_bus_devices[i].release = jornada720_mcu_bus_device_release; ++ ret = device_register(jornada720_mcu_bus_devices + i); ++ if (ret) ++ break; ++ } ++ ++ if (ret) { ++ for(; i <= 0; i--) { ++ device_unregister(jornada720_mcu_bus_devices + i); ++ } ++ ssp_exit(); ++ } ++ ++ return ret; ++} ++ ++static int jornada720_mcu_remove(struct platform_device *dev) ++{ ++ int i; ++ for(i=0; i<ARRAY_SIZE(jornada720_mcu_bus_devices); i++) ++ device_unregister(jornada720_mcu_bus_devices + i); ++ /* we don't want data anymore (line 203 of HP's doc) */ ++ GPSR = GPIO_GPIO25; ++ ssp_exit(); ++ return 0; ++} ++ ++struct platform_driver jornada720_mcu_driver = { ++ .probe = jornada720_mcu_probe, ++ .remove = jornada720_mcu_remove, ++ .driver = { ++ .name = "jornada720_mcu", ++ }, ++}; ++ ++static int __init jornada720_mcu_init(void) { ++ int ret = bus_register(&jornada720_mcu_bus_type); ++ if (!ret) ++ return platform_driver_register(&jornada720_mcu_driver); ++ return ret; ++} ++ ++static void __exit jornada720_mcu_exit(void) { ++ bus_unregister(&jornada720_mcu_bus_type); ++ platform_driver_unregister(&jornada720_mcu_driver); ++} ++ ++module_init(jornada720_mcu_init); ++module_exit(jornada720_mcu_exit); +diff -ruN linux-2.6.18-vanilla/drivers/input/keyboard/Kconfig linux-2.6.18/drivers/input/keyboard/Kconfig +--- linux-2.6.18-vanilla/drivers/input/keyboard/Kconfig 2006-11-20 23:12:57.000000000 +0000 ++++ linux-2.6.18/drivers/input/keyboard/Kconfig 2006-11-20 23:11:39.000000000 +0000 +@@ -203,4 +203,15 @@ + To compile this driver as a module, choose M here: the + module will be called omap-keypad. + ++config KEYBOARD_JORNADA720 ++ tristate "HP Jornada 720 Keyboard Support" ++ depends on SA1100_JORNADA720_MCU ++ default y ++ help ++ Say Y to enable keyboard on the hewlett Packard Jornada ++ 7xx(710/720/728) series of PDAs. ++ ++ To compile this driver as a module choose M here: the ++ module will be called jornada720_kbd. ++ + endif +diff -ruN linux-2.6.18-vanilla/drivers/input/keyboard/Makefile linux-2.6.18/drivers/input/keyboard/Makefile +--- linux-2.6.18-vanilla/drivers/input/keyboard/Makefile 2006-11-20 23:12:57.000000000 +0000 ++++ linux-2.6.18/drivers/input/keyboard/Makefile 2006-11-20 23:11:36.000000000 +0000 +@@ -17,4 +17,5 @@ + obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o + obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o + obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o ++obj-$(CONFIG_KEYBOARD_JORNADA720) += jornada720_kbd.o + +diff -ruN linux-2.6.18-vanilla/drivers/input/keyboard/jornada720_kbd.c linux-2.6.18/drivers/input/keyboard/jornada720_kbd.c +--- linux-2.6.18-vanilla/drivers/input/keyboard/jornada720_kbd.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/drivers/input/keyboard/jornada720_kbd.c 2006-11-20 23:11:33.000000000 +0000 +@@ -0,0 +1,159 @@ ++/* ++ * drivers/input/keyboard/jornada720_kbd.c ++ * ++ * Jornada 720 keyboard interface ++ * ++ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * Copyright (C) 2004 Alex Lange <chicken@handhelds.org> ++ * ++ * 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 <linux/input.h> ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/interrupt.h> ++#include <linux/device.h> ++ ++#include <asm/hardware.h> ++#include <asm/arch/jornada720_mcu.h> ++ ++MODULE_AUTHOR("Alex Lange <chicken@handhelds.org>"); ++MODULE_DESCRIPTION("Jornada 720 keyboard driver"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++static struct input_dev *dev; ++ ++static char jornada720_kbd_name[] = "Jornada 720 keyboard"; ++ ++/* line 227 of HP's doc */ ++static unsigned char jornada720_normal_keymap[128] = { ++ 0, 1, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 87, KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_MUTE, ++ 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, ++ 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 43, 14, 0, 0, 0, ++ 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, KEY_LEFTBRACE, KEY_RIGHTBRACE, 0, 0, 0, ++ 0, 44, 45, 46, 47, 48, 49, 50, 51, 52, KEY_KPMINUS, 40, 28, 0, 0, 0, ++ 0, 15, 0, 42, 0, 40, 0, 0, 0, 0, 103, 0, 54, 0, 0, 0, ++ 0, 0, 0, 0, 0, 56, KEY_GRAVE, 0, 0, 105, 108, 106, 0, 0, 0, 0, ++ 0, 55, 29, 0, 57, 0, 0, 0, 53, 111, 0, 0, 0, 0, 0, 116, ++}; ++ ++static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id) ++{ ++ int key, keycode; ++ int count, mcu_data=0; ++ ++ /* start of dialogue with the MCU (line 217 of HP's doc) */ ++ if(jornada720_mcu_start(jornada720_mcu_GetScanKeyCode)) { ++ printk(KERN_WARNING "jornada720_kbd: GetScanKeyCode failed\n"); ++ jornada720_mcu_end(); ++ return IRQ_HANDLED; ++ } ++ ++ /* amount of key events (line 218 of HP's doc) */ ++ count = jornada720_mcu_read(); ++ ++ while (count-- > 0) { ++ /* keycode (line 219 of HP's doc) */ ++ key = mcu_data = jornada720_mcu_read(); ++ ++ if (key < 0) { ++ jornada720_mcu_end(); ++ return IRQ_HANDLED; ++ } ++ ++ /* scancode > 128 means key release (line 223 of HP's doc) */ ++ if (key > 128) ++ key = key - 128; ++ ++ keycode = jornada720_normal_keymap[key]; ++ ++ if (mcu_data < 128) { ++ /* key pressed (line 223 of HP's doc) */ ++ input_report_key(dev, keycode, 1); ++ input_sync(dev); ++ } ++ else { ++ /* key released (line 223 of HP's doc) */ ++ input_report_key(dev, keycode, 0); ++ input_sync(dev); ++ } ++ } ++ ++ ++ jornada720_mcu_end(); ++ ++ return IRQ_HANDLED; ++} ++ ++static int jornada720_kbd_probe(struct device *_dev) ++{ ++ int i, ret; ++ ++ dev = input_allocate_device(); ++ if (!dev) ++ return -ENOMEM; ++ ++ dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); ++ dev->keybit[LONG(KEY_SUSPEND)] |= BIT(KEY_SUSPEND); ++ ++ for ( i=0 ; i<=128 ; i++ ) { ++ if (jornada720_normal_keymap[i]) ++ set_bit(jornada720_normal_keymap[i], dev->keybit); ++ } ++ ++ dev->name = jornada720_kbd_name; ++ ++ /* keyboard is on GPIO0 (line 215 of HP's doc) */ ++ ret = request_irq(IRQ_GPIO0, ++ jornada720_kbd_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_FALLING, ++ jornada720_kbd_name, dev); ++ if (ret) { ++ printk(KERN_WARNING "Unable to grab IRQ for %s: %d\n", jornada720_kbd_name, ret); ++ input_free_device(dev); ++ return ret; ++ } ++ ++ input_register_device(dev); ++ ++ return 0; ++ ++} ++ ++static int jornada720_kbd_remove(struct device *_dev) ++{ ++ free_irq(IRQ_GPIO0, dev); ++ input_unregister_device(dev); ++ return 0; ++} ++ ++static struct device_driver jornada720_kbd_driver = { ++ .name = jornada720_mcu_bus_id_kbd, ++ .bus = &jornada720_mcu_bus_type, ++ .probe = jornada720_kbd_probe, ++ .remove = jornada720_kbd_remove, ++ .owner = THIS_MODULE ++}; ++ ++static int __init jornada720_kbd_init(void) ++{ ++ return driver_register(&jornada720_kbd_driver); ++} ++ ++static void __exit jornada720_kbd_exit(void) ++{ ++ driver_unregister(&jornada720_kbd_driver); ++} ++ ++module_init(jornada720_kbd_init); ++module_exit(jornada720_kbd_exit); +diff -ruN linux-2.6.18-vanilla/drivers/input/touchscreen/Kconfig linux-2.6.18/drivers/input/touchscreen/Kconfig +--- linux-2.6.18-vanilla/drivers/input/touchscreen/Kconfig 2006-11-20 23:12:57.000000000 +0000 ++++ linux-2.6.18/drivers/input/touchscreen/Kconfig 2006-11-20 23:11:53.000000000 +0000 +@@ -144,4 +144,14 @@ + To compile this driver as a module, choose M here: the + module will be called touchwin. + ++config TOUCHSCREEN_JORNADA720 ++ tristate "HP Jornada 720 touchscreen support" ++ depends on SA1100_JORNADA720_MCU ++ help ++ Say Y here if you are using a HP Jornada 7xx (710/720/728) PDA ++ and want to use the touchscreen. ++ ++ To compile this driver as a module choose M here: the ++ module will be called jornada720_ts. ++ + endif +diff -ruN linux-2.6.18-vanilla/drivers/input/touchscreen/Makefile linux-2.6.18/drivers/input/touchscreen/Makefile +--- linux-2.6.18-vanilla/drivers/input/touchscreen/Makefile 2006-11-20 23:12:57.000000000 +0000 ++++ linux-2.6.18/drivers/input/touchscreen/Makefile 2006-11-20 23:11:50.000000000 +0000 +@@ -15,3 +15,4 @@ + obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o + obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o + obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o ++obj-$(CONFIG_TOUCHSCREEN_JORNADA720) += jornada720_ts.o +diff -ruN linux-2.6.18-vanilla/drivers/input/touchscreen/jornada720_ts.c linux-2.6.18/drivers/input/touchscreen/jornada720_ts.c +--- linux-2.6.18-vanilla/drivers/input/touchscreen/jornada720_ts.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/drivers/input/touchscreen/jornada720_ts.c 2006-11-20 23:11:48.000000000 +0000 +@@ -0,0 +1,173 @@ ++/* ++ * drivers/input/touchscreen/jornada720_ts.c ++ * ++ * Jornada 720 touchscreen interface ++ * ++ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * Copyright (C) 2004 Alex Lange <chicken@handhelds.org> ++ * ++ * 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 <linux/input.h> ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/interrupt.h> ++#include <linux/device.h> ++ ++#include <asm/hardware.h> ++#include <asm/arch/jornada720_mcu.h> ++ ++MODULE_AUTHOR("Alex Lange <chicken@handhelds.org>"); ++MODULE_DESCRIPTION("Jornada 720 touchscreen driver"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++static struct input_dev *dev; ++ ++static char jornada720_ts_name[] = "Jornada 720 touchscreen"; ++ ++ ++static irqreturn_t jornada720_ts_interrupt(int irq, void *dev_id) ++{ ++ int X[3], Y[3], high_x, high_y, x, y; ++ ++ /* check if pen is up (line 264 of HP's doc) */ ++ if(GPLR & GPIO_GPIO(9)) { ++ /* report pen up */ ++ input_report_key(dev, BTN_TOUCH, 0); ++ input_report_abs(dev, ABS_PRESSURE, 0); ++ input_sync(dev); ++ ++ return IRQ_HANDLED; ++ } ++ ++ /* ++ * read x & y data from mcu interface and ++ * pass it on (line 265 of HP's doc) ++ */ ++ if(jornada720_mcu_start(jornada720_mcu_GetTouchSamples)) { ++ jornada720_mcu_end(); ++ return IRQ_HANDLED; ++ } ++ ++ /* ++ * beware: HP's doc specifies incorrect order of sample ++ * bytes, MSBs for X and Y are the last two ones. ++ */ ++ ++ /* LSBs for X (line 272 of HP's doc */ ++ X[0] = jornada720_mcu_read(); ++ X[1] = jornada720_mcu_read(); ++ X[2] = jornada720_mcu_read(); ++ ++ /* LSBs for Y (line 276 of HP's doc */ ++ Y[0] = jornada720_mcu_read(); ++ Y[1] = jornada720_mcu_read(); ++ Y[2] = jornada720_mcu_read(); ++ ++ /* MSBs for X (line 275 of HP's doc */ ++ high_x = jornada720_mcu_read(); ++ ++ /* MSBs for Y (line 279 of HP's doc) */ ++ high_y = jornada720_mcu_read(); ++ ++ jornada720_mcu_end(); ++ ++ /* calculating actual values (line 281 of HP's doc) */ ++ X[0] |= (high_x & 3) << 8; ++ X[1] |= (high_x & 0xc) << 6; ++ X[2] |= (high_x & 0x30) << 4; ++ ++ Y[0] |= (high_y & 3) << 8; ++ Y[1] |= (high_y & 0xc) << 6; ++ Y[2] |= (high_y & 0x30) << 4; ++ ++ /* simple averaging filter */ ++ x = (X[0] + X[1] + X[2])/3; ++ y = (Y[0] + Y[1] + Y[2])/3; ++ ++ /* report pen down */ ++ input_report_key(dev, BTN_TOUCH, 1); ++ input_report_abs(dev, ABS_X, x); ++ input_report_abs(dev, ABS_Y, y); ++ input_report_abs(dev, ABS_PRESSURE, 1); ++ input_sync(dev); ++ ++ return IRQ_HANDLED; ++ ++} ++ ++ ++static int jornada720_ts_probe(struct device *_dev) ++{ ++ int ret; ++ ++ dev = input_allocate_device(); ++ if (!dev) ++ return -ENOMEM; ++ ++ dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); ++ dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE); ++ dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); ++ ++ dev->absmin[ABS_X] = 270; dev->absmin[ABS_Y] = 180; ++ dev->absmax[ABS_X] = 3900; dev->absmax[ABS_Y] = 3700; ++ ++ dev->name = jornada720_ts_name; ++ ++ /* ++ * touchscreen is on GPIO9 (Line 263 of HP's doc. It says we should ++ * care for falling edge, but in fact we need a rising edge.) ++ */ ++ ret = request_irq(IRQ_GPIO9, ++ jornada720_ts_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING, ++ jornada720_ts_name, dev); ++ if (ret) { ++ printk("Unable to grab IRQ for %s: %d\n", jornada720_ts_name, ret); ++ input_free_device(dev); ++ return ret; ++ } ++ ++ input_register_device(dev); ++ ++ return 0; ++} ++ ++ ++static int jornada720_ts_remove(struct device *_dev) ++{ ++ free_irq(IRQ_GPIO9, dev); ++ input_unregister_device(dev); ++ return 0; ++} ++ ++static struct device_driver jornada720_ts_driver = { ++ .name = jornada720_mcu_bus_id_ts, ++ .bus = &jornada720_mcu_bus_type, ++ .probe = jornada720_ts_probe, ++ .remove = jornada720_ts_remove, ++ .owner = THIS_MODULE ++}; ++ ++static int __init jornada720_ts_init(void) ++{ ++ return driver_register(&jornada720_ts_driver); ++} ++ ++static void __exit jornada720_ts_exit(void) ++{ ++ driver_unregister(&jornada720_ts_driver); ++} ++ ++module_init(jornada720_ts_init); ++module_exit(jornada720_ts_exit); +diff -ruN linux-2.6.18-vanilla/drivers/video/backlight/Kconfig linux-2.6.18/drivers/video/backlight/Kconfig +--- linux-2.6.18-vanilla/drivers/video/backlight/Kconfig 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/drivers/video/backlight/Kconfig 2006-11-20 23:12:17.000000000 +0000 +@@ -66,3 +66,24 @@ + If you have a HP Jornada 680, say y to enable the + backlight driver. + ++config BACKLIGHT_JORNADA720 ++ tristate "HP Jornada 720 Backlight Driver" ++ depends on BACKLIGHT_DEVICE && SA1100_JORNADA720_MCU ++ default y ++ help ++ If you have a HP Jornada 7xx, say y to enable the ++ backlight driver. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called jornada720_bl. ++ ++config LCD_JORNADA720 ++ tristate "HP Jornada 720 LCD control" ++ depends on LCD_DEVICE && SA1100_JORNADA720_MCU ++ default y ++ help ++ If you have a HP Jornada 7xx, say y to be able to ++ set contrast and power state of the LCD. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called jornada720_lcd. +diff -ruN linux-2.6.18-vanilla/drivers/video/backlight/Makefile linux-2.6.18/drivers/video/backlight/Makefile +--- linux-2.6.18-vanilla/drivers/video/backlight/Makefile 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/drivers/video/backlight/Makefile 2006-11-20 23:12:15.000000000 +0000 +@@ -5,3 +5,5 @@ + obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o + obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o + obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o ++obj-$(CONFIG_BACKLIGHT_JORNADA720) += jornada720_bl.o ++obj-$(CONFIG_LCD_JORNADA720) += jornada720_lcd.o +diff -ruN linux-2.6.18-vanilla/drivers/video/backlight/jornada720_bl.c linux-2.6.18/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.18-vanilla/drivers/video/backlight/jornada720_bl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/drivers/video/backlight/jornada720_bl.c 2006-11-20 23:12:01.000000000 +0000 +@@ -0,0 +1,145 @@ ++/* ++ * drivers/video/backlight/jornada720_bl.c ++ * ++ * Backlight Driver for HP Jornada 720 ++ * ++ * Copyright (c) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * ++ * 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 <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/backlight.h> ++#include <linux/fb.h> ++#include <linux/device.h> ++#include <asm/hardware.h> ++#include <asm/arch/jornada720_mcu.h> ++#include <video/s1d13xxxfb.h> ++ ++MODULE_AUTHOR("Filip Zyzniewski <filip.zyzniewski@tefnet.pl>"); ++MODULE_DESCRIPTION("HP Jornada 720 Backlight Driver"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++#define JORNADA720_BL_MAX_BRIGHTNESS 0xff ++ ++/* default brightness (line 460 of HP's doc - it's ++ * mistakenly referred as default contrast there) */ ++#define JORNADA720_BL_DEFAULT_BRIGHTNESS 0x19 ++ ++static struct backlight_device *jornada720_bl_device; ++ ++static int jornada720_bl_get_brightness(struct backlight_device *dev) ++{ ++ int ret; ++ ++ /* check if backlight is on (line 461 of HP's doc */ ++ if(!(PPSR & PPC_LDD1)) ++ return 255; ++ ++ /* get data from the MCU (line 310 of HP's doc) */ ++ if(jornada720_mcu_start(jornada720_mcu_GetBrightness)) { ++ printk(KERN_WARNING "jornada720_bl: GetBrightness failed\n"); ++ ret=256; ++ } else ++ ret=jornada720_mcu_read(); ++ ++ jornada720_mcu_end(); ++ ++ /* 0 is max brightness for the kernel, opposite for the MCU */ ++ return 255-ret; ++} ++ ++static int jornada720_bl_update_status(struct backlight_device *dev) ++{ ++ int ret=0; ++ ++ ++ if (dev->props->power != FB_BLANK_UNBLANK || dev->props->fb_blank != FB_BLANK_UNBLANK) { ++ /* turn off the backlight PWM (line 313 of HP's doc) */ ++ ret=jornada720_mcu_start(jornada720_mcu_BrightnessOff); ++ if(ret) ++ printk(KERN_WARNING "jornada720_bl: BrightnessOff failed\n"); ++ /* turn off the backlight (line 461 of HP's doc) */ ++ PPSR &= ~PPC_LDD1; ++ PPDR |= PPC_LDD1; ++ } ++ else { ++ /* turn the backlight on (line 461 of HP's doc) */ ++ PPSR |= PPC_LDD1; ++ /* line 309 of HP's doc */ ++ if (!(ret=jornada720_mcu_start(jornada720_mcu_SetBrightness))) { ++ /* 0 is max brightness for the kernel, opposite for the MCU */ ++ if(jornada720_mcu_byte(255 - dev->props->brightness) != jornada720_mcu_TxDummy) ++ ret = -1; ++ } else ++ printk(KERN_WARNING "jornada720_bl: SetBrightness failed\n"); ++ } ++ ++ jornada720_mcu_end(); ++ ++ return ret; ++} ++ ++ ++static struct backlight_properties jornada720_bl_data = { ++ .owner = THIS_MODULE, ++ .max_brightness = JORNADA720_BL_MAX_BRIGHTNESS, ++ .get_brightness = jornada720_bl_get_brightness, ++ .update_status = jornada720_bl_update_status, ++}; ++ ++static int jornada720_bl_probe(struct device *_dev) ++{ ++ /* ++ * name must match fb driver name (documentation of ++ * backlight_device_register() in backlight.c ++ */ ++ jornada720_bl_device = backlight_device_register (S1D_DEVICENAME, ++ NULL, &jornada720_bl_data); ++ if (IS_ERR (jornada720_bl_device)) ++ return PTR_ERR (jornada720_bl_device); ++ ++ jornada720_bl_data.power = FB_BLANK_UNBLANK; ++ jornada720_bl_data.brightness = JORNADA720_BL_DEFAULT_BRIGHTNESS; ++ jornada720_bl_update_status(jornada720_bl_device); ++ ++ return 0; ++ ++} ++ ++static int jornada720_bl_remove(struct device *_dev) ++{ ++ backlight_device_unregister(jornada720_bl_device); ++ return 0; ++} ++ ++static struct device_driver jornada720_bl_driver = { ++ .name = jornada720_mcu_bus_id_bl, ++ .bus = &jornada720_mcu_bus_type, ++ .probe = jornada720_bl_probe, ++ .remove = jornada720_bl_remove, ++ .owner = THIS_MODULE ++}; ++ ++static int __init jornada720_bl_init(void) ++{ ++ return driver_register(&jornada720_bl_driver); ++} ++ ++static void __exit jornada720_bl_exit(void) ++{ ++ driver_unregister(&jornada720_bl_driver); ++} ++ ++module_init(jornada720_bl_init); ++module_exit(jornada720_bl_exit); +diff -ruN linux-2.6.18-vanilla/drivers/video/backlight/jornada720_lcd.c linux-2.6.18/drivers/video/backlight/jornada720_lcd.c +--- linux-2.6.18-vanilla/drivers/video/backlight/jornada720_lcd.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/drivers/video/backlight/jornada720_lcd.c 2006-11-20 23:12:12.000000000 +0000 +@@ -0,0 +1,152 @@ ++/* ++ * drivers/video/backlight/jornada720_lcd.c ++ * ++ * LCD display driver for HP Jornada 720 ++ * ++ * Copyright (c) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * ++ * 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 <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/lcd.h> ++#include <linux/fb.h> ++#include <linux/delay.h> ++#include <linux/device.h> ++#include <asm/hardware.h> ++#include <asm/arch/jornada720_mcu.h> ++#include <video/s1d13xxxfb.h> ++ ++MODULE_AUTHOR("Filip Zyzniewski <filip.zyzniewski@tefnet.pl>"); ++MODULE_DESCRIPTION("HP Jornada 720 LCD control"); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++#define JORNADA720_LCD_MAX_CONTRAST 0xff ++ ++/* default contrast (line 457 of HP's doc, but it looks bad with that one) */ ++#define JORNADA720_LCD_DEFAULT_CONTRAST 0x80 ++ ++static struct lcd_device *jornada720_lcd_device; ++ ++static int jornada720_lcd_set_contrast(struct lcd_device *dev, int contrast) ++{ ++ int ret=0; ++ ++ /* line 312 of HP's doc */ ++ if ( !(ret=jornada720_mcu_start(jornada720_mcu_SetContrast)) ) { ++ if(jornada720_mcu_byte(contrast) != jornada720_mcu_TxDummy) ++ ret = -1; ++ } else ++ printk(KERN_WARNING "jornada720_lcd: SetContrast failed\n"); ++ ++ jornada720_mcu_end(); ++ ++ return ret; ++} ++ ++static int jornada720_lcd_get_power(struct lcd_device *dev) { ++ /* LDD2 in PPC is responsible for LCD power (line 458 of HP's doc */ ++ if(PPSR & PPC_LDD2) ++ return FB_BLANK_UNBLANK; ++ else ++ return FB_BLANK_POWERDOWN; ++} ++ ++static int jornada720_lcd_set_power(struct lcd_device *dev, int power) { ++ if (power != FB_BLANK_UNBLANK) { ++ /* turn off the LCD (line 458 of HP's doc) */ ++ PPSR &= ~PPC_LDD2; ++ PPDR |= PPC_LDD2; ++ } else ++ /* turn on the LCD (line 458 of HP's doc) */ ++ PPSR |= PPC_LDD2; ++ return 0; ++} ++ ++static int jornada720_lcd_get_contrast(struct lcd_device *dev) ++{ ++ int ret; ++ ++ /* check if LCD is on (line 458 of HP's doc */ ++ if(jornada720_lcd_get_power(dev) != FB_BLANK_UNBLANK) ++ return 0; ++ ++ /* get the data from MCU (line 312 of HP's doc) */ ++ if(jornada720_mcu_start(jornada720_mcu_GetContrast)) { ++ printk(KERN_WARNING "jornada720_lcd: GetContrast failed\n"); ++ ret=256; ++ } else ++ ret=jornada720_mcu_read(); ++ ++ jornada720_mcu_end(); ++ ++ return ret; ++} ++ ++static struct lcd_properties jornada720_lcd_data = { ++ .owner = THIS_MODULE, ++ .max_contrast = JORNADA720_LCD_MAX_CONTRAST, ++ .get_contrast = jornada720_lcd_get_contrast, ++ .set_contrast = jornada720_lcd_set_contrast, ++ .get_power = jornada720_lcd_get_power, ++ .set_power = jornada720_lcd_set_power, ++}; ++ ++static int jornada720_lcd_probe(struct device *_dev) ++{ ++ /* ++ * name must match fb driver name (documentation of ++ * lcd_device_register() in lcd.c ++ */ ++ jornada720_lcd_device = lcd_device_register (S1D_DEVICENAME, ++ NULL, &jornada720_lcd_data); ++ if (IS_ERR (jornada720_lcd_device)) ++ return PTR_ERR (jornada720_lcd_device); ++ ++ /* line 457 of HP's doc */ ++ jornada720_lcd_set_contrast(jornada720_lcd_device, JORNADA720_LCD_DEFAULT_CONTRAST); ++ /* line 458 of HP's doc */ ++ jornada720_lcd_set_power(jornada720_lcd_device, FB_BLANK_UNBLANK); ++ /* line 459 of HP's doc */ ++ msleep(100); ++ ++ return 0; ++ ++} ++ ++static int jornada720_lcd_remove(struct device *_dev) ++{ ++ lcd_device_unregister(jornada720_lcd_device); ++ return 0; ++} ++ ++static struct device_driver jornada720_lcd_driver = { ++ .name = jornada720_mcu_bus_id_lcd, ++ .bus = &jornada720_mcu_bus_type, ++ .probe = jornada720_lcd_probe, ++ .remove = jornada720_lcd_remove, ++ .owner = THIS_MODULE ++}; ++ ++static int __init jornada720_lcd_init(void) ++{ ++ return driver_register(&jornada720_lcd_driver); ++} ++ ++static void __exit jornada720_lcd_exit(void) ++{ ++ driver_unregister(&jornada720_lcd_driver); ++} ++ ++module_init(jornada720_lcd_init); ++module_exit(jornada720_lcd_exit); +diff -ruN linux-2.6.18-vanilla/drivers/video/s1d13xxxfb.c linux-2.6.18/drivers/video/s1d13xxxfb.c +--- linux-2.6.18-vanilla/drivers/video/s1d13xxxfb.c 2006-09-20 03:42:06.000000000 +0000 ++++ linux-2.6.18/drivers/video/s1d13xxxfb.c 2006-11-20 23:10:47.000000000 +0000 +@@ -540,7 +540,7 @@ + int ret = 0; + u8 revision; + +- dbg("probe called: device is %p\n", dev); ++ dbg("probe called: device is %p\n", pdev); + + printk(KERN_INFO "Epson S1D13XXX FB Driver\n"); + +diff -ruN linux-2.6.18-vanilla/include/asm-arm/arch-sa1100/jornada720.h linux-2.6.18/include/asm-arm/arch-sa1100/jornada720.h +--- linux-2.6.18-vanilla/include/asm-arm/arch-sa1100/jornada720.h 2006-11-20 23:13:04.000000000 +0000 ++++ linux-2.6.18/include/asm-arm/arch-sa1100/jornada720.h 1970-01-01 00:00:00.000000000 +0000 +@@ -1,42 +0,0 @@ +-/* +- * linux/include/asm-arm/arch-sa1100/jornada720.h +- * +- * Created 2000/11/29 by John Ankcorn <jca@lcs.mit.edu> +- * +- * This file contains the hardware specific definitions for HP Jornada 720 +- * +- */ +- +-#ifndef __ASM_ARCH_HARDWARE_H +-#error "include <asm/hardware.h> instead" +-#endif +- +-#define SA1111_BASE (0x40000000) +- +-#define GPIO_JORNADA720_KEYBOARD GPIO_GPIO(0) +-#define GPIO_JORNADA720_MOUSE GPIO_GPIO(9) +- +-#define GPIO_JORNADA720_KEYBOARD_IRQ IRQ_GPIO0 +-#define GPIO_JORNADA720_MOUSE_IRQ IRQ_GPIO9 +- +-/* MCU COMMANDS */ +-#define MCU_GetBatteryData 0xc0 +-#define MCU_GetScanKeyCode 0x90 +-#define MCU_GetTouchSamples 0xa0 +-#define MCU_GetContrast 0xD0 +-#define MCU_SetContrast 0xD1 +-#define MCU_GetBrightness 0xD2 +-#define MCU_SetBrightness 0xD3 +-#define MCU_ContrastOff 0xD8 +-#define MCU_BrightnessOff 0xD9 +-#define MCU_PWMOFF 0xDF +-#define MCU_TxDummy 0x11 +-#define MCU_ErrorCode 0x00 +- +-#ifndef __ASSEMBLY__ +- +-void jornada720_mcu_init(void); +-void jornada_contrast(int arg_contrast); +-void jornada720_battery(void); +-int jornada720_getkey(unsigned char *data, int size); +-#endif +diff -ruN linux-2.6.18-vanilla/include/asm-arm/arch-sa1100/jornada720_mcu.h linux-2.6.18/include/asm-arm/arch-sa1100/jornada720_mcu.h +--- linux-2.6.18-vanilla/include/asm-arm/arch-sa1100/jornada720_mcu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/include/asm-arm/arch-sa1100/jornada720_mcu.h 2006-11-20 23:10:57.000000000 +0000 +@@ -0,0 +1,48 @@ ++/* ++ * include/asm-arm/arch-sa1100/jornada720_mcu.h ++ * ++ * This file contains MCU communication API defintions for HP Jornada 720 ++ * ++ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu> ++ * ++ * 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. ++ * ++ */ ++ ++/* Jornada 720 Microprocessor Control Unit commands */ ++#define jornada720_mcu_GetBatteryData 0xc0 ++#define jornada720_mcu_GetScanKeyCode 0x90 ++#define jornada720_mcu_GetTouchSamples 0xa0 ++#define jornada720_mcu_GetContrast 0xD0 ++#define jornada720_mcu_SetContrast 0xD1 ++#define jornada720_mcu_GetBrightness 0xD2 ++#define jornada720_mcu_SetBrightness 0xD3 ++#define jornada720_mcu_ContrastOff 0xD8 ++#define jornada720_mcu_BrightnessOff 0xD9 ++#define jornada720_mcu_PWMOFF 0xDF ++#define jornada720_mcu_TxDummy 0x11 ++#define jornada720_mcu_ErrorCode 0x00 ++ ++/* devices accessible through the MCU */ ++#define jornada720_mcu_bus_id_kbd "jornada720_kbd" ++#define jornada720_mcu_bus_id_ts "jornada720_ts" ++#define jornada720_mcu_bus_id_apm "jornada720_apm" ++#define jornada720_mcu_bus_id_lcd "jornada720_lcd" ++#define jornada720_mcu_bus_id_bl "jornada720_bl" ++ ++int jornada720_mcu_byte(u8 byte); ++ ++#define jornada720_mcu_read() jornada720_mcu_byte(jornada720_mcu_TxDummy) ++ ++/* ++ * WARNING: remember to jornada720_mcu_end() after every ++ * jornada720_mcu_start() or you will deadlock! ++ */ ++int jornada720_mcu_start(u8 byte); ++ ++void jornada720_mcu_end(void); ++ ++extern struct bus_type jornada720_mcu_bus_type; +diff -ruN linux-2.6.18-vanilla/include/asm-arm/s1d13506.h linux-2.6.18/include/asm-arm/s1d13506.h +--- linux-2.6.18-vanilla/include/asm-arm/s1d13506.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.18/include/asm-arm/s1d13506.h 2006-11-20 23:10:50.000000000 +0000 +@@ -0,0 +1,135 @@ ++/* ++ * include/asm-arm/s1d13506.h ++ * ++ * Epson S1D13xxx chip register init for ARM machines ++ * ++ * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl> ++ * ++ * 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. ++ * ++ */ ++ ++/* ++ * HP Documentation referred in this file: ++ * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt ++ */ ++ ++static struct s1d13xxxfb_regval s1d13xxxfb_initregs[] = { ++ /* line 344 of HP's doc */ ++ {0x0001,0x00}, // Miscellaneous Register ++ {0x01FC,0x00}, // Display Mode Register ++#if defined(CONFIG_SA1100_JORNADA720) ++ {0x0004,0x00}, // General IO Pins Configuration Register 0 ++ {0x0005,0x00}, // General IO Pins Configuration Register 1 ++ {0x0008,0x00}, // General IO Pins Control Register 0 ++ {0x0009,0x00}, // General IO Pins Control Register 1 ++ {0x0010,0x01}, // Memory Clock Configuration Register ++ {0x0014,0x11}, // LCD Pixel Clock Configuration Register ++ {0x0018,0x01}, // CRT/TV Pixel Clock Configuration Register ++ {0x001C,0x01}, // MediaPlug Clock Configuration Register ++ {0x001E,0x01}, // CPU To Memory Wait State Select Register ++ {0x0020,0x00}, // Memory Configuration Register ++ {0x0021,0x45}, // DRAM Refresh Rate Register ++ {0x002A,0x01}, // DRAM Timings Control Register 0 ++ {0x002B,0x03}, // DRAM Timings Control Register 1 ++ {0x0030,0x1c}, // Panel Type Register ++ {0x0031,0x00}, // MOD Rate Register ++ {0x0032,0x4F}, // LCD Horizontal Display Width Register ++ {0x0034,0x07}, // LCD Horizontal Non-Display Period Register ++ {0x0035,0x01}, // TFT FPLINE Start Position Register ++ {0x0036,0x0B}, // TFT FPLINE Pulse Width Register ++ {0x0038,0xEF}, // LCD Vertical Display Height Register 0 ++ {0x0039,0x00}, // LCD Vertical Display Height Register 1 ++ {0x003A,0x13}, // LCD Vertical Non-Display Period Register ++ {0x003B,0x0B}, // TFT FPFRAME Start Position Register ++ {0x003C,0x01}, // TFT FPFRAME Pulse Width Register ++ {0x0040,0x05}, // LCD Display Mode Register (2:4bpp,3:8bpp,5:16bpp) ++ {0x0041,0x00}, // LCD Miscellaneous Register ++ {0x0042,0x00}, // LCD Display Start Address Register 0 ++ {0x0043,0x00}, // LCD Display Start Address Register 1 ++ {0x0044,0x00}, // LCD Display Start Address Register 2 ++ {0x0046,0x80}, // LCD Memory Address Offset Register 0 ++ {0x0047,0x02}, // LCD Memory Address Offset Register 1 ++ {0x0048,0x00}, // LCD Pixel Panning Register ++ {0x004A,0x00}, // LCD Display FIFO High Threshold Control Register ++ {0x004B,0x00}, // LCD Display FIFO Low Threshold Control Register ++ {0x0050,0x4F}, // CRT/TV Horizontal Display Width Register ++ {0x0052,0x13}, // CRT/TV Horizontal Non-Display Period Register ++ {0x0053,0x01}, // CRT/TV HRTC Start Position Register ++ {0x0054,0x0B}, // CRT/TV HRTC Pulse Width Register ++ {0x0056,0xDF}, // CRT/TV Vertical Display Height Register 0 ++ {0x0057,0x01}, // CRT/TV Vertical Display Height Register 1 ++ {0x0058,0x2B}, // CRT/TV Vertical Non-Display Period Register ++ {0x0059,0x09}, // CRT/TV VRTC Start Position Register ++ {0x005A,0x01}, // CRT/TV VRTC Pulse Width Register ++ {0x005B,0x10}, // TV Output Control Register ++ {0x0060,0x03}, // CRT/TV Display Mode Register (2:4bpp,3:8bpp,5:16bpp) ++ {0x0062,0x00}, // CRT/TV Display Start Address Register 0 ++ {0x0063,0x00}, // CRT/TV Display Start Address Register 1 ++ {0x0064,0x00}, // CRT/TV Display Start Address Register 2 ++ {0x0066,0x40}, // CRT/TV Memory Address Offset Register 0 ++ {0x0067,0x01}, // CRT/TV Memory Address Offset Register 1 ++ {0x0068,0x00}, // CRT/TV Pixel Panning Register ++ {0x006A,0x00}, // CRT/TV Display FIFO High Threshold Control Register ++ {0x006B,0x00}, // CRT/TV Display FIFO Low Threshold Control Register ++ {0x0070,0x00}, // LCD Ink/Cursor Control Register ++ {0x0071,0x01}, // LCD Ink/Cursor Start Address Register ++ {0x0072,0x00}, // LCD Cursor X Position Register 0 ++ {0x0073,0x00}, // LCD Cursor X Position Register 1 ++ {0x0074,0x00}, // LCD Cursor Y Position Register 0 ++ {0x0075,0x00}, // LCD Cursor Y Position Register 1 ++ {0x0076,0x00}, // LCD Ink/Cursor Blue Color 0 Register ++ {0x0077,0x00}, // LCD Ink/Cursor Green Color 0 Register ++ {0x0078,0x00}, // LCD Ink/Cursor Red Color 0 Register ++ {0x007A,0x1F}, // LCD Ink/Cursor Blue Color 1 Register ++ {0x007B,0x3F}, // LCD Ink/Cursor Green Color 1 Register ++ {0x007C,0x1F}, // LCD Ink/Cursor Red Color 1 Register ++ {0x007E,0x00}, // LCD Ink/Cursor FIFO Threshold Register ++ {0x0080,0x00}, // CRT/TV Ink/Cursor Control Register ++ {0x0081,0x01}, // CRT/TV Ink/Cursor Start Address Register ++ {0x0082,0x00}, // CRT/TV Cursor X Position Register 0 ++ {0x0083,0x00}, // CRT/TV Cursor X Position Register 1 ++ {0x0084,0x00}, // CRT/TV Cursor Y Position Register 0 ++ {0x0085,0x00}, // CRT/TV Cursor Y Position Register 1 ++ {0x0086,0x00}, // CRT/TV Ink/Cursor Blue Color 0 Register ++ {0x0087,0x00}, // CRT/TV Ink/Cursor Green Color 0 Register ++ {0x0088,0x00}, // CRT/TV Ink/Cursor Red Color 0 Register ++ {0x008A,0x1F}, // CRT/TV Ink/Cursor Blue Color 1 Register ++ {0x008B,0x3F}, // CRT/TV Ink/Cursor Green Color 1 Register ++ {0x008C,0x1F}, // CRT/TV Ink/Cursor Red Color 1 Register ++ {0x008E,0x00}, // CRT/TV Ink/Cursor FIFO Threshold Register ++ {0x0100,0x00}, // BitBlt Control Register 0 ++ {0x0101,0x00}, // BitBlt Control Register 1 ++ {0x0102,0x00}, // BitBlt ROP Code/Color Expansion Register ++ {0x0103,0x00}, // BitBlt Operation Register ++ {0x0104,0x00}, // BitBlt Source Start Address Register 0 ++ {0x0105,0x00}, // BitBlt Source Start Address Register 1 ++ {0x0106,0x00}, // BitBlt Source Start Address Register 2 ++ {0x0108,0x00}, // BitBlt Destination Start Address Register 0 ++ {0x0109,0x00}, // BitBlt Destination Start Address Register 1 ++ {0x010A,0x00}, // BitBlt Destination Start Address Register 2 ++ {0x010C,0x00}, // BitBlt Memory Address Offset Register 0 ++ {0x010D,0x00}, // BitBlt Memory Address Offset Register 1 ++ {0x0110,0x00}, // BitBlt Width Register 0 ++ {0x0111,0x00}, // BitBlt Width Register 1 ++ {0x0112,0x00}, // BitBlt Height Register 0 ++ {0x0113,0x00}, // BitBlt Height Register 1 ++ {0x0114,0x00}, // BitBlt Background Color Register 0 ++ {0x0115,0x00}, // BitBlt Background Color Register 1 ++ {0x0118,0x00}, // BitBlt Foreground Color Register 0 ++ {0x0119,0x00}, // BitBlt Foreground Color Register 1 ++ {0x01E0,0x00}, // Look-Up Table Mode Register ++ {0x01E2,0x00}, // Look-Up Table Address Register ++ /* not sure, wouldn't like to mess with the driver */ ++ {0x01E4,0x00}, // Look-Up Table Data Register ++ /* jornada doc says 0x00, but I trust the driver */ ++ {0x01F0,0x10}, // Power Save Configuration Register ++ {0x01F1,0x00}, // Power Save Status Register ++ {0x01F4,0x00}, // CPU-to-Memory Access Watchdog Timer Register ++ {0x01FC,0x01}, // Display Mode Register(0x01:LCD, 0x02:CRT, 0x03:LCD&CRT) ++#elif 1 ++#error "define a register set for your machine" ++#endif ++}; +diff -ruN linux-2.6.18-vanilla/include/video/s1d13xxxfb.h linux-2.6.18/include/video/s1d13xxxfb.h +--- linux-2.6.18-vanilla/include/video/s1d13xxxfb.h 2006-11-20 23:13:06.000000000 +0000 ++++ linux-2.6.18/include/video/s1d13xxxfb.h 2006-11-20 23:10:38.000000000 +0000 +@@ -14,7 +14,13 @@ + #define S1D13XXXFB_H + + #define S1D_PALETTE_SIZE 256 ++ ++#if defined(CONFIG_SA1100_JORNADA720) ++#define S1D_CHIP_REV 4 /* expected chip revision number for s1d13506 */ ++#else + #define S1D_CHIP_REV 7 /* expected chip revision number for s1d13806 */ ++#endif ++ + #define S1D_FBID "S1D13806" + #define S1D_DEVICENAME "s1d13806fb" + diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb new file mode 100644 index 0000000000..9768c3f8f5 --- /dev/null +++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb @@ -0,0 +1,34 @@ +SECTION = "kernel" +DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" +LICENSE = "GPL" +PR = "r0" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "jornada7xx" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \ + http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ + file://jornada7xx-2.6.19rc6.patch;patch=0 \ + file://defconf_jlime " + +S = "${WORKDIR}/linux-${PV}" + +inherit kernel + +#Lets let 3.4.x handle the compilation of this one +KERNEL_CCSUFFIX = "-3.4.4" + +ARCH = "arm" +KERNEL_IMAGETYPE = "zImage" +KERNEL_RELEASE = "2.6.19-rc6" + +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconf_jlime ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE) +} diff --git a/packages/tslib/tslib/h5xxx/.mtn2git_empty b/packages/linux/linux-nokia770-2.6.16-osso26/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/h5xxx/.mtn2git_empty +++ b/packages/linux/linux-nokia770-2.6.16-osso26/.mtn2git_empty diff --git a/packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch b/packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch new file mode 100644 index 0000000000..66bf993878 --- /dev/null +++ b/packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch @@ -0,0 +1,11 @@ +--- kernel-source-2.6.16-2.6.16.rel/drivers/i2c/chips/tlv320aic23.c.orig 2006-11-22 11:48:20.000000000 +0100 ++++ kernel-source-2.6.16-2.6.16.rel/drivers/i2c/chips/tlv320aic23.c 2006-11-22 11:48:42.000000000 +0100 +@@ -184,7 +184,7 @@ + } + + static struct i2c_driver aic23_driver = { +- .driver { ++ .driver = { + .name = "OMAP+TLV320AIC23 codec", + }, + .id = I2C_DRIVERID_MISC, diff --git a/packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch b/packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch new file mode 100644 index 0000000000..a311fd0cb0 --- /dev/null +++ b/packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch @@ -0,0 +1,19 @@ +--- kernel-source-2.6.16-2.6.16.rel/drivers/usb/core/hub.c.orig 2006-11-22 12:17:01.000000000 +0100 ++++ kernel-source-2.6.16-2.6.16.rel/drivers/usb/core/hub.c 2006-11-22 12:17:48.000000000 +0100 +@@ -1289,6 +1289,7 @@ + * + * Only the hub driver or root-hub registrar should ever call this. + */ ++static int __usb_suspend_device(struct usb_device *, int port1); + int usb_new_device(struct usb_device *udev) + { + int err; +@@ -1371,8 +1372,6 @@ + * (Includes HNP test device.) + */ + if (udev->bus->b_hnp_enable || udev->bus->is_b_host) { +- static int __usb_suspend_device(struct usb_device *, +- int port1); + err = __usb_suspend_device(udev, udev->bus->otg_port); + if (err < 0) + dev_dbg(&udev->dev, "HNP fail, %d\n", err); diff --git a/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/.mtn2git_empty b/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/.mtn2git_empty diff --git a/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig b/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig index 315ac831e9..315ac831e9 100644 --- a/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig +++ b/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig diff --git a/packages/linux/linux-nokia770_2.6.16-osso15.bb b/packages/linux/linux-nokia770_2.6.16-osso26.bb index ff239f9d06..f7b5ca0a2f 100644 --- a/packages/linux/linux-nokia770_2.6.16-osso15.bb +++ b/packages/linux/linux-nokia770_2.6.16-osso26.bb @@ -1,9 +1,11 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Nokia 770" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://repository.maemo.org/pool/mistral/non-free/source/k/kernel-source-2.6.16/kernel-source-2.6.16_2.6.16.rel-osso15.tar.gz \ + file://fix_tlv320aic23_compile.patch;patch=1 \ + file://fix_usb_hub_compile.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/kernel-source-2.6.16-2.6.16.rel" @@ -35,7 +37,7 @@ do_configure_prepend() { } do_deploy() { - install -d ${DEPLOY_DIR}/images + install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} } diff --git a/packages/linux/mx21ads-kernel/.mtn2git_empty b/packages/linux/mx21ads-kernel/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/mx21ads-kernel/.mtn2git_empty diff --git a/packages/linux/mx21ads-kernel/mx21ads_defconfig b/packages/linux/mx21ads-kernel/mx21ads_defconfig new file mode 100644 index 0000000000..ba54ea2484 --- /dev/null +++ b/packages/linux/mx21ads-kernel/mx21ads_defconfig @@ -0,0 +1,1180 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19-rc5 +# Wed Nov 15 22:33:25 2006 +# +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_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=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="-csb" +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_SWAP is not set +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 is not set +# 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 is not set +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +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 is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_BLK_DEV_IO_TRACE 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_FAMILY_IMX=y +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X 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 is not set +# 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 + +# +# IMX Implementations +# +# CONFIG_ARCH_MX1ADS is not set +CONFIG_MACH_MX21ADS=y +# CONFIG_MACH_CSB535 is not set +CONFIG_ARCH_IMX21=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=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 + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT 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=ttyS0,115200n8 ip=bootp root=/dev/nfs mem=64M" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# 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=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 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_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_DEBUG_DRIVER 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 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=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 + +# +# 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_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=y + +# +# 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_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 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=8192 +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 is not set +# CONFIG_SCSI_NETLINK 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 is not set +CONFIG_CS89x0=y +# CONFIG_CIRRUS is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA 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 is not set +# 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 is not set +# CONFIG_INPUT_MOUSE 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_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_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +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_HW_RANDOM is not set +# CONFIG_NVRAM 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 + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=y +# CONFIG_I2C_CHARDEV is not set + +# +# 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_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set +CONFIG_I2C_IMX=y + +# +# 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_WM8731 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 is not set + +# +# SPI Protocol Masters +# + +# +# 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 +# +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +# CONFIG_LEDS_CLASS is not set + +# +# LED drivers +# + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGERS 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 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_IMX=y +# CONFIG_FB_S1D13XXX 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=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 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_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 + +# +# ALSA ARM devices +# + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# 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_ISP116X_HCD is not set +# 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 is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE 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 + +# +# 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 +# + +# +# 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 + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_IMX=y +# 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 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 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_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# 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_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=y +# 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=y +# 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_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# 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=y +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=y + +# +# 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_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# 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 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# 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=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_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_MANAGER=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# 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_ECB=m +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# 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=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb new file mode 100644 index 0000000000..54b398eec8 --- /dev/null +++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb @@ -0,0 +1,61 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for the MX21ADS" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ + http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ + http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx21/mx21ads-2.6.19rc6-lg1.patch.bz2;patch=1 \ + file://mx21ads_defconfig" + +S = "${WORKDIR}/linux-2.6.18" + +COMPATIBLE_HOST = 'arm.*-linux' +COMPATIBLE_MACHINE = "mx21ads" + +inherit kernel +inherit package + +ARCH = "arm" +KERNEL_IMAGETYPE = "zImage" +RPROVIDES_kernel-image += "hostap-modules" + +# to get module dependencies working +KERNEL_RELEASE = "2.6.19-rc6" + + +#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000" +#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/mx21ads_defconfig ${S}/defconfig + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${S}/defconfig' >>'${S}/.config' + + +# echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + + yes '' | oe_runmake oldconfig + +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + + diff --git a/packages/linux/mx31ads-kernel/imx31ads_defconfig b/packages/linux/mx31ads-kernel/imx31ads_defconfig index 3836ed03ea..83cd5f933d 100644 --- a/packages/linux/mx31ads-kernel/imx31ads_defconfig +++ b/packages/linux/mx31ads-kernel/imx31ads_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-rc5 -# Mon Nov 13 12:42:45 2006 +# Linux kernel version: 2.6.19-rc6 +# Mon Nov 20 18:11:58 2006 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -235,9 +235,9 @@ CONFIG_MXC_IPU_PF=y # MXC SPI support # CONFIG_MXC_SPI=y -# CONFIG_MXC_SPI_SELECT1 is not set +CONFIG_MXC_SPI_SELECT1=y CONFIG_MXC_SPI_SELECT2=y -# CONFIG_MXC_SPI_SELECT3 is not set +CONFIG_MXC_SPI_SELECT3=y # # MXC SSI support @@ -308,7 +308,7 @@ CONFIG_PM_LEGACY=y # Dynamic Power Management # CONFIG_DPM=y -# CONFIG_DPM_STATS is not set +CONFIG_DPM_STATS=y CONFIG_DPM_PROCFS=y # diff --git a/packages/linux/mx31ads-kernel_2.6.19rc5.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb index 0957fe71fe..d164dfd810 100644 --- a/packages/linux/mx31ads-kernel_2.6.19rc5.bb +++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb @@ -1,11 +1,11 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the MX31ADS" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc5.bz2;patch=1 \ - http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc5-lg3.patch.bz2;patch=1 \ + http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ + http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc6-lg1.patch.bz2;patch=1 \ file://imx31ads_defconfig" S = "${WORKDIR}/linux-2.6.18" @@ -18,9 +18,10 @@ inherit package ARCH = "arm" KERNEL_IMAGETYPE = "zImage" +RPROVIDES_kernel-image += "hostap-modules" # to get module dependencies working -KERNEL_RELEASE = "2.6.19-rc5" +KERNEL_RELEASE = "2.6.19-rc6" #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000" @@ -56,5 +57,3 @@ do_deploy() { do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile - - diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb index 6534285fd4..6193067bfa 100644 --- a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb +++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb @@ -14,7 +14,7 @@ CFLAGS += "-I${STAGING_INCDIR} \ -I${STAGING_INCDIR}/cairo \ -DWNCK_I_KNOW_THIS_IS_UNSTABLE" -SRC_URI = "http://mail.pdaxrom.org/1.1.0beta1/src/${P}.tar.bz2" +SRC_URI = "http://www.pdaxrom.org/download/1.1.0beta4/src/${P}.tar.bz2" do_install() { install -d ${D}/${datadir}/applications diff --git a/packages/networkmanager/files/dbus-1.0-fix.patch b/packages/networkmanager/files/dbus-1.0-fix.patch new file mode 100644 index 0000000000..29edc255f0 --- /dev/null +++ b/packages/networkmanager/files/dbus-1.0-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/NetworkManagerDbus.c 2006-11-21 11:07:35.000000000 +0100 ++++ NetworkManager-0.6.4/src/NetworkManagerDbus.c 2006-11-21 11:08:35.748554000 +0100 +@@ -833,7 +833,7 @@ + } + + dbus_error_init (&error); +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) || DBUS_VERSION_MAJOR > 0 + flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ + #else + flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index 0496909e65..95e85002b0 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -6,11 +6,12 @@ PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r2" +PR = "r4" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ - file://99_networkmanager \ + file://dbus-1.0-fix.patch;patch=1 \ + file://99_networkmanager \ file://NetworkManager \ file://nm-applet.desktop" @@ -47,6 +48,9 @@ do_install () { install -m 0755 ${WORKDIR}/nm-applet.desktop ${D}/${datadir}/ } +pkg_postinst () { + /etc/init.d/populate-volatile.sh update +} FILES_${PN} += "${datadir} \ ${libdir}/*.so* \ diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb index 4f3a815380..b8a2e40395 100644 --- a/packages/omniorb/omniorb-native_4.0.7.bb +++ b/packages/omniorb/omniorb-native_4.0.7.bb @@ -1,26 +1,18 @@ +SECTION = "devel" +DEPENDS += "python-native" PR = "r0" + SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz" -SECTION = "devel" -S = "${WORKDIR}/omniORB-${PV}" -DEPENDS += "python-native" +S = "${WORKDIR}/omniORB-${PV}" inherit native autotools do_compile () { - oe_runmake + oe_runmake } - # Ugly hack so libtool does not find native libs when building cross packages # We really only build this package for omniidl anyway do_stage_append() { - rm -f ${STAGING_DIR}/${BUILD_SYS}/lib/libomni* + rm -f ${STAGING_DIR}/${BUILD_SYS}/lib/libomni* } - -#do_stage() { -# install -m 0755 src/bison ${STAGING_BINDIR}/ -# ln -sf ./bison ${STAGING_BINDIR}/yacc -# install -d ${STAGING_BINDIR}/../share/bison/m4sugar -# install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_BINDIR}/../share/bison/ -# install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_BINDIR}/../share/bison/m4sugar/ -#} diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb index d9094926b2..d475b22791 100644 --- a/packages/omniorb/omniorb_4.0.7.bb +++ b/packages/omniorb/omniorb_4.0.7.bb @@ -1,10 +1,9 @@ -PR = "r0" DESCRIPTION = "OmniORB High Performance ORB" SECTION = "devel" PRIORITY = "optional" LICENSE = "LGPL" - DEPENDS = "omniorb-native" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \ file://omniORB.cfg \ @@ -19,20 +18,18 @@ S = "${WORKDIR}/omniORB-${PV}" inherit autotools pkgconfig do_compile () { - export EmbeddedSystem=1 - export TOOLBINDIR=${STAGING_BINDIR} - oe_runmake + export EmbeddedSystem=1 + export TOOLBINDIR=${STAGING_BINDIR} + oe_runmake } - -do_stage () { - export EmbeddedSystem=1 - autotools_stage_all -} - do_install () { - export EmbeddedSystem=1 - make DESTDIR=${D} install - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/omniORB.cfg ${D}${sysconfdir} - install -d ${D}${localstatedir}/omninames + export EmbeddedSystem=1 + make DESTDIR=${D} install + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/omniORB.cfg ${D}${sysconfdir} + install -d ${D}${localstatedir}/omninames +} +do_stage () { + export EmbeddedSystem=1 + autotools_stage_all } diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb index a599685ee1..328ae6ede0 100644 --- a/packages/p3scan/p3scan_2.9.05d.bb +++ b/packages/p3scan/p3scan_2.9.05d.bb @@ -6,7 +6,7 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "gmp bzip2 zlib clamav openssl" RDEPENDS_${PN} = "${PN}-templates-en" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \ file://libtool-fix.patch;patch=1 \ @@ -76,7 +76,7 @@ pkg_postinst_${PN} () { grep -q mail: /etc/passwd || \ adduser --disabled-password --home=${localstatedir}/mail --system \ --ingroup mail --no-create-home -g "Mail" mail - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } CONFFILES_${PN} = "${sysconfdir}/p3scan/p3scan.conf" diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb index 7faf2d9d7e..d9273e0b78 100644 --- a/packages/pango/pango_1.10.2.bb +++ b/packages/pango/pango_1.10.2.bb @@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" @@ -20,10 +20,13 @@ EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" - +LEAD_SONAME = "libpango-1.0*" LIBV = "1.4.0" +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + do_stage () { autotools_stage_all } diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index f1ddb9a6af..6e07832f34 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/packages/pango/pango_1.12.0.bb @@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" @@ -22,10 +22,13 @@ EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" - +LEAD_SONAME = "libpango-1.0*" LIBV = "1.5.0" +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + do_stage () { for lib in pango pangox pangoft2 pangoxft pangocairo; do oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ diff --git a/packages/pango/pango_1.13.3.bb b/packages/pango/pango_1.13.3.bb index 8f4b56ced8..ba0e606c42 100644 --- a/packages/pango/pango_1.13.3.bb +++ b/packages/pango/pango_1.13.3.bb @@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" @@ -21,10 +21,13 @@ EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" - +LEAD_SONAME = "libpango-1.0*" LIBV = "1.5.0" +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + do_stage () { for lib in pango pangox pangoft2 pangoxft pangocairo; do oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb index 80e86aeede..b98e241af5 100644 --- a/packages/pango/pango_1.14.0.bb +++ b/packages/pango/pango_1.14.0.bb @@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -PR = "r1" +PR = "r2" PACKAGES_DYNAMIC = "pango-module-*" @@ -22,10 +22,13 @@ EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" - +LEAD_SONAME = "libpango-1.0*" LIBV = "1.5.0" +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + do_stage () { autotools_stage_all } diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb index f1ae669135..c0b5b04b98 100644 --- a/packages/pango/pango_1.9.1.bb +++ b/packages/pango/pango_1.9.1.bb @@ -5,7 +5,7 @@ RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -PR = "r0" +PR = "r1" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" @@ -19,10 +19,13 @@ EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" -FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*" - +LEAD_SONAME = "libpango-1.0*" LIBV = "1.4.0" +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + do_stage () { for lib in pango pangox pangoft2 pangoxft; do oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ diff --git a/packages/parted/parted_1.8.0.bb b/packages/parted/parted_1.8.0.bb new file mode 100644 index 0000000000..8681055855 --- /dev/null +++ b/packages/parted/parted_1.8.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv2" +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs-libs" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-Werror" +#export CFLAGS = "-mstructure-size-boundary=8" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/pcmanfm/files/desktop.patch b/packages/pcmanfm/files/desktop.patch new file mode 100644 index 0000000000..764f5b7845 --- /dev/null +++ b/packages/pcmanfm/files/desktop.patch @@ -0,0 +1,11 @@ +--- pcmanfm-0.3.2-beta/pcmanfm.desktop.in.old 2006-09-25 11:43:07.000000000 +0100 ++++ pcmanfm-0.3.2-beta/pcmanfm.desktop.in 2006-09-25 11:44:59.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Categories=Application;System;Utility;Core;GTK; + Encoding=UTF-8 +-Name=PCMan File Manager ++Name=File Manager + Name[zh_TW]=PCMan 檔案管理程式 + Name[pl]=Przeglądarka plików z zakładkami + Exec=pcmanfm %f diff --git a/packages/pcmanfm/files/no-fam.patch b/packages/pcmanfm/files/no-fam.patch new file mode 100644 index 0000000000..b87a02df01 --- /dev/null +++ b/packages/pcmanfm/files/no-fam.patch @@ -0,0 +1,432 @@ +diff -urNd ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/configure.in pcmanfm-0.3.0.1/configure.in +--- ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/configure.in 2006-08-20 15:45:28.000000000 +0100 ++++ pcmanfm-0.3.0.1/configure.in 2006-08-20 20:37:36.000000000 +0100 +@@ -63,8 +63,8 @@ + LIBS="$LIBS $FAM_LIBS" + AC_CHECK_FUNCS([FAMNoExists]) + LIBS="$save_LIBS" +-else +- AC_MSG_ERROR([Fatal Error: no fam or gamin detected.]) ++#else ++# AC_MSG_ERROR([Fatal Error: no fam or gamin detected.]) + fi + + AC_SUBST([FAM_CFLAGS]) +diff -urNd ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c +--- ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c 2006-07-16 20:00:46.000000000 +0100 ++++ pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c 2006-08-20 20:54:07.000000000 +0100 +@@ -31,7 +31,6 @@ + VFSFileMonitorCallbackEntry; + + static GHashTable* monitor_hash = NULL; +-static FAMConnection fam; + static GIOChannel* fam_io_channel = NULL; + static guint fam_io_watch = 0; + +@@ -40,6 +39,8 @@ + GIOCondition cond, + gpointer user_data ); + ++#ifdef HAVE_FAM_H ++static FAMConnection fam; + + static gboolean connect_to_fam() + { +@@ -81,6 +82,16 @@ + FAMClose( &fam ); + } + } ++#else ++static gboolean connect_to_fam () ++{ ++ return FALSE; ++} ++ ++static void disconnect_from_fam () ++{ ++} ++#endif + + /* final cleanup */ + void vfs_file_monitor_clean() +@@ -109,6 +120,7 @@ + VFSFileMonitorCallback cb, + gpointer user_data ) + { ++#ifdef HAVE_FAM_H + VFSFileMonitor * monitor; + VFSFileMonitorCallbackEntry cb_ent; + gboolean add_new = FALSE; +@@ -154,12 +166,16 @@ + } + ++monitor->n_ref; + return monitor; ++#else ++ return NULL; ++#endif + } + + void vfs_file_monitor_remove( VFSFileMonitor* fm, + VFSFileMonitorCallback cb, + gpointer user_data ) + { ++#ifdef HAVE_FAM_H + int i; + VFSFileMonitorCallbackEntry* callbacks; + if ( cb && fm->callbacks ) +@@ -183,12 +199,14 @@ + g_array_free( fm->callbacks, TRUE ); + g_slice_free( VFSFileMonitor, fm ); + } ++#endif + } + + static void reconnect_fam( gpointer key, + gpointer value, + gpointer user_data ) + { ++#ifdef HAVE_FAM_H + struct stat file_stat; + VFSFileMonitor* monitor = ( VFSFileMonitor* ) value; + const char* path = ( const char* ) key; +@@ -209,6 +227,7 @@ + monitor ); + } + } ++#endif + } + + /* event handler of all FAM events */ +@@ -216,6 +235,7 @@ + GIOCondition cond, + gpointer user_data ) + { ++#ifdef HAVE_FAM_H + FAMEvent evt; + VFSFileMonitor* monitor = NULL; + VFSFileMonitorCallbackEntry* cb; +@@ -266,5 +286,8 @@ + } + } + return TRUE; ++#else ++ return TRUE; ++#endif + } + +diff -urNd ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c~ pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c~ +--- ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c~ 1970-01-01 01:00:00.000000000 +0100 ++++ pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.c~ 2006-08-20 20:50:49.000000000 +0100 +@@ -0,0 +1,292 @@ ++/* ++* C Implementation: vfs-monitor ++* ++* Description: ++* ++* ++* Author: Hong Jen Yee (PCMan) <pcman.tw (AT) gmail.com>, (C) 2006 ++* ++* Copyright: See COPYING file that comes with this distribution ++* ++*/ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include "vfs-file-monitor.h" ++#include <sys/types.h> /* for stat */ ++#include <sys/stat.h> ++ ++#include <stdlib.h> ++#include <string.h> ++ ++#include "glib-mem.h" ++ ++typedef struct ++{ ++ VFSFileMonitorCallback callback; ++ gpointer user_data; ++} ++VFSFileMonitorCallbackEntry; ++ ++static GHashTable* monitor_hash = NULL; ++static FAMConnection fam; ++static GIOChannel* fam_io_channel = NULL; ++static guint fam_io_watch = 0; ++ ++/* event handler of all FAM events */ ++static gboolean on_fam_event( GIOChannel *channel, ++ GIOCondition cond, ++ gpointer user_data ); ++ ++#ifdef HAVE_FAM_H ++static gboolean connect_to_fam() ++{ ++ if ( FAMOpen( &fam ) ) ++ { ++ fam_io_channel = NULL; ++ fam.fd = -1; ++ g_warning( "There is no FAM/gamin server\n" ); ++ return FALSE; ++ } ++#if HAVE_FAMNOEXISTS ++ /* ++ * Disable the initital directory content loading. ++ * This can greatly speed up directory loading, but ++ * unfortunately, it's not compatible with original FAM. ++ */ ++ FAMNoExists( &fam ); /* This is an extension of gamin */ ++#endif ++ ++ fam_io_channel = g_io_channel_unix_new( fam.fd ); ++ g_io_channel_set_encoding( fam_io_channel, NULL, NULL ); ++ g_io_channel_set_buffered( fam_io_channel, FALSE ); ++ ++ fam_io_watch = g_io_add_watch( fam_io_channel, ++ G_IO_IN | G_IO_HUP, ++ on_fam_event, ++ NULL ); ++ return TRUE; ++} ++ ++static void disconnect_from_fam() ++{ ++ if ( fam_io_channel ) ++ { ++ g_io_channel_unref( fam_io_channel ); ++ fam_io_channel = NULL; ++ g_source_remove( fam_io_watch ); ++ ++ FAMClose( &fam ); ++ } ++} ++#else ++static gboolean connect_to_fam () ++{ ++ return FALSE; ++} ++ ++static void disconnect_from_fam () ++{ ++} ++#endif ++ ++/* final cleanup */ ++void vfs_file_monitor_clean() ++{ ++ disconnect_from_fam(); ++ if ( monitor_hash ) ++ { ++ g_hash_table_destroy( monitor_hash ); ++ monitor_hash = NULL; ++ } ++} ++ ++/* ++* Init monitor: ++* Establish connection with gamin/fam. ++*/ ++gboolean vfs_file_monitor_init() ++{ ++ monitor_hash = g_hash_table_new( g_str_hash, g_str_equal ); ++ if ( ! connect_to_fam() ) ++ return FALSE; ++ return TRUE; ++} ++ ++VFSFileMonitor* vfs_file_monitor_add( const char* path, ++ VFSFileMonitorCallback cb, ++ gpointer user_data ) ++{ ++#ifdef HAVE_FAM_H ++ VFSFileMonitor * monitor; ++ VFSFileMonitorCallbackEntry cb_ent; ++ gboolean add_new = FALSE; ++ struct stat file_stat; ++ ++ if ( ! monitor_hash ) ++ { ++ if ( !vfs_file_monitor_init() ) ++ return NULL; ++ } ++ monitor = ( VFSFileMonitor* ) g_hash_table_lookup ( monitor_hash, path ); ++ if ( ! monitor ) ++ { ++ monitor = g_slice_new0( VFSFileMonitor ); ++ monitor->path = g_strdup( path ); ++ monitor->callbacks = g_array_new ( FALSE, FALSE, sizeof( VFSFileMonitorCallbackEntry ) ); ++ g_hash_table_insert ( monitor_hash, ++ path, ++ monitor ); ++ if ( lstat( path, &file_stat ) != -1 ) ++ { ++ if ( S_ISDIR( file_stat.st_mode ) ) ++ { ++ FAMMonitorDirectory( &fam, ++ path, ++ &monitor->request, ++ monitor ); ++ } ++ else ++ { ++ FAMMonitorFile( &fam, ++ path, ++ &monitor->request, ++ monitor ); ++ } ++ } ++ } ++ if ( cb ) ++ { /* Install a callback */ ++ cb_ent.callback = cb; ++ cb_ent.user_data = user_data; ++ monitor->callbacks = g_array_append_val( monitor->callbacks, cb_ent ); ++ } ++ ++monitor->n_ref; ++ return monitor; ++#else ++ return NULL; ++#endif ++} ++ ++void vfs_file_monitor_remove( VFSFileMonitor* fm, ++ VFSFileMonitorCallback cb, ++ gpointer user_data ) ++{ ++#ifdef HAVE_FAM_H ++ int i; ++ VFSFileMonitorCallbackEntry* callbacks; ++ if ( cb && fm->callbacks ) ++ { ++ callbacks = ( VFSFileMonitorCallbackEntry* ) fm->callbacks->data; ++ for ( i = 0; i < fm->callbacks->len; ++i ) ++ { ++ if ( callbacks[ i ].callback == cb && callbacks[ i ].user_data == user_data ) ++ { ++ fm->callbacks = g_array_remove_index_fast ( fm->callbacks, i ); ++ break; ++ } ++ } ++ } ++ --fm->n_ref; ++ if ( 0 >= fm->n_ref ) ++ { ++ FAMCancelMonitor( &fam, &fm->request ); ++ g_hash_table_remove( monitor_hash, fm->path ); ++ g_free( fm->path ); ++ g_array_free( fm->callbacks, TRUE ); ++ g_slice_free( VFSFileMonitor, fm ); ++ } ++#endif ++} ++ ++static void reconnect_fam( gpointer key, ++ gpointer value, ++ gpointer user_data ) ++{ ++#ifdef HAVE_FAM_H ++ struct stat file_stat; ++ VFSFileMonitor* monitor = ( VFSFileMonitor* ) value; ++ const char* path = ( const char* ) key; ++ if ( lstat( path, &file_stat ) != -1 ) ++ { ++ if ( S_ISDIR( file_stat.st_mode ) ) ++ { ++ FAMMonitorDirectory( &fam, ++ path, ++ &monitor->request, ++ monitor ); ++ } ++ else ++ { ++ FAMMonitorFile( &fam, ++ path, ++ &monitor->request, ++ monitor ); ++ } ++ } ++#endif ++} ++ ++/* event handler of all FAM events */ ++static gboolean on_fam_event( GIOChannel *channel, ++ GIOCondition cond, ++ gpointer user_data ) ++{ ++#ifdef HAVE_FAM_H ++ FAMEvent evt; ++ VFSFileMonitor* monitor = NULL; ++ VFSFileMonitorCallbackEntry* cb; ++ VFSFileMonitorCallback func; ++ int i; ++ ++ if ( cond & G_IO_HUP ) ++ { ++ disconnect_from_fam(); ++ if ( g_hash_table_size ( monitor_hash ) > 0 ) ++ { ++ /* ++ Disconnected from FAM server, but there are still monitors. ++ This may be caused by crash of FAM server. ++ So we have to reconnect to FAM server. ++ */ ++ connect_to_fam(); ++ g_hash_table_foreach( monitor_hash, ( GHFunc ) reconnect_fam, NULL ); ++ } ++ return TRUE; /* don't need to remove the event source since ++ it has been removed by disconnect_from_fam(). */ ++ } ++ ++ while ( FAMPending( &fam ) ) ++ { ++ if ( FAMNextEvent( &fam, &evt ) > 0 ) ++ { ++ monitor = ( VFSFileMonitor* ) evt.userdata; ++ switch ( evt.code ) ++ { ++ case FAMCreated: ++ case FAMDeleted: ++ case FAMChanged: ++ /* Call the callback functions */ ++ if ( monitor->callbacks && monitor->callbacks->len ) ++ { ++ cb = ( VFSFileMonitorCallbackEntry* ) monitor->callbacks->data; ++ for ( i = 0; i < monitor->callbacks->len; ++i ) ++ { ++ func = cb[ i ].callback; ++ func( monitor, evt.code, evt.filename, cb[ i ].user_data ); ++ } ++ } ++ break; ++ default: ++ return TRUE; /* Other events are not supported */ ++ } ++ } ++ } ++ return TRUE; ++#else ++ return TRUE; ++#endif ++} ++ +diff -urNd ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.h pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.h +--- ../pcmanfm-0.3.0.1-r0/pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.h 2006-04-03 00:38:33.000000000 +0100 ++++ pcmanfm-0.3.0.1/src/vfs/vfs-file-monitor.h 2006-08-20 20:47:00.000000000 +0100 +@@ -20,7 +20,16 @@ + #define _VFS_FILE_MONITOR_H_ + + #include <glib.h> ++#ifdef HAVE_FAM_H + #include <fam.h> ++#else ++# define FAMCreated 0 ++# define FAMDeleted 1 ++# define FAMChanged 2 ++typedef struct { ++ int reqnum; ++} FAMRequest; ++#endif + + G_BEGIN_DECLS + diff --git a/packages/pcmanfm/files/no-warnings.patch b/packages/pcmanfm/files/no-warnings.patch new file mode 100644 index 0000000000..2e0d92bd7b --- /dev/null +++ b/packages/pcmanfm/files/no-warnings.patch @@ -0,0 +1,47 @@ +--- pcmanfm-0.3.2-beta/src/main.c.old 2006-09-25 11:51:51.000000000 +0100 ++++ pcmanfm-0.3.2-beta/src/main.c 2006-09-25 11:51:55.000000000 +0100 +@@ -173,7 +173,7 @@ + gtk_widget_show ( GTK_WIDGET( main_window ) ); + return main_window; + } +- ++#if 0 + static void check_icon_theme() + { + GtkSettings * settings; +@@ -212,7 +212,7 @@ + } + g_free( theme ); + } +- ++#endif + int + main ( int argc, char *argv[] ) + { +@@ -274,7 +274,7 @@ + vfs_file_info_set_thumbnail_size( appSettings.bigIconSize, + appSettings.smallIconSize ); + +- check_icon_theme(); ++/* check_icon_theme();*/ + + if( appSettings.showDesktop ) + fm_desktop_init(); +--- pcmanfm-0.3.2-beta/src/main-window.c.old 2006-09-25 11:47:45.000000000 +0100 ++++ pcmanfm-0.3.2-beta/src/main-window.c 2006-09-25 11:50:32.000000000 +0100 +@@ -496,6 +496,7 @@ + gtk_window_add_accel_group ( GTK_WINDOW ( main_window ), main_window->accel_group ); + gtk_widget_grab_focus ( GTK_WIDGET( main_window->address_bar ) ); + ++#if 0 + /* Create warning bar for super user */ + if ( geteuid() == 0 ) /* Run as super user! */ + { +@@ -510,6 +511,7 @@ + gtk_box_pack_start ( GTK_BOX ( main_window->main_vbox ), + main_window->status_bar, FALSE, FALSE, 2 ); + } ++#endif + + /* Create client area */ + main_window->notebook = GTK_NOTEBOOK( gtk_notebook_new () ); diff --git a/packages/pcmanfm/pcmanfm_0.1.9.8.bb b/packages/pcmanfm/pcmanfm_0.3.0.1.bb index b5cb3d6e5c..019d1c6c67 100644 --- a/packages/pcmanfm/pcmanfm_0.1.9.8.bb +++ b/packages/pcmanfm/pcmanfm_0.3.0.1.bb @@ -5,24 +5,20 @@ PRIORITY = "optional" DEPENDS = "gtk+" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ - file://pcmanfm.desktop \ - file://pcmanfm.png \ file://gnome-fs-directory.png \ file://gnome-fs-regular.png \ file://gnome-mime-text-plain.png \ file://emblem-symbolic-link.png \ - file://no-fam-gtk2.6.patch;patch=1;pnum=1" + file://no-fam.patch;patch=1" inherit autotools pkgconfig do_install_append () { install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications install -d ${D}/${datadir}/pixmaps/ install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/pcmanfm.desktop ${D}/${datadir}/applications } -FILES_${PN} += "${datadir}/applications/pcmanfm.desktop ${datadir}/pixmaps/*.png" +FILES_${PN} += "${datadir}/pixmaps/*.png" diff --git a/packages/pcmanfm/pcmanfm_0.3.2-beta.bb b/packages/pcmanfm/pcmanfm_0.3.2-beta.bb new file mode 100644 index 0000000000..ebbcb32f8a --- /dev/null +++ b/packages/pcmanfm/pcmanfm_0.3.2-beta.bb @@ -0,0 +1,27 @@ +LICENSE = "GPL" +DESCRIPTION = "procfs tools" +SECTION = "x11" +PRIORITY = "optional" +DEPENDS = "gtk+" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ + file://gnome-fs-directory.png \ + file://gnome-fs-regular.png \ + file://gnome-mime-text-plain.png \ + file://emblem-symbolic-link.png \ + file://desktop.patch;patch=1 \ + file://no-warnings.patch;patch=1" + +EXTRA_OECONF = "--enable-inotify --disable-hal" + +inherit autotools pkgconfig + +do_install_append () { + install -d ${D}/${datadir} + install -d ${D}/${datadir}/pixmaps/ + + install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps +} + +FILES_${PN} += "${datadir}/pixmaps/*.png" + diff --git a/packages/perl/libalgorithm-diff-perl-native_1.1902.bb b/packages/perl/libalgorithm-diff-perl-native_1.1902.bb index cf7847d783..220c1554b6 100644 --- a/packages/perl/libalgorithm-diff-perl-native_1.1902.bb +++ b/packages/perl/libalgorithm-diff-perl-native_1.1902.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libalgorithm-diff-perl_${PV}.bb diff --git a/packages/perl/libarchive-tar-perl-native_1.30.bb b/packages/perl/libarchive-tar-perl-native_1.30.bb index cf7847d783..e1abf26dbe 100644 --- a/packages/perl/libarchive-tar-perl-native_1.30.bb +++ b/packages/perl/libarchive-tar-perl-native_1.30.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libarchive-tar-perl_${PV}.bb diff --git a/packages/perl/libcache-cache-perl-native_1.05.bb b/packages/perl/libcache-cache-perl-native_1.05.bb index cf7847d783..e7b95551ad 100644 --- a/packages/perl/libcache-cache-perl-native_1.05.bb +++ b/packages/perl/libcache-cache-perl-native_1.05.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libcache-cache-perl_${PV}.bb diff --git a/packages/perl/libclass-container-perl-native_0.12.bb b/packages/perl/libclass-container-perl-native_0.12.bb index cf7847d783..c3e740bfab 100644 --- a/packages/perl/libclass-container-perl-native_0.12.bb +++ b/packages/perl/libclass-container-perl-native_0.12.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libclass-container-perl_${PV}.bb diff --git a/packages/perl/libclass-data-inheritable-perl-native_0.06.bb b/packages/perl/libclass-data-inheritable-perl-native_0.06.bb index cf7847d783..94660e4f8b 100644 --- a/packages/perl/libclass-data-inheritable-perl-native_0.06.bb +++ b/packages/perl/libclass-data-inheritable-perl-native_0.06.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libclass-data-inheritable-perl_${PV}.bb diff --git a/packages/perl/libcompress-zlib-perl-native_1.42.bb b/packages/perl/libcompress-zlib-perl-native_1.42.bb index cf7847d783..c52f5f33f5 100644 --- a/packages/perl/libcompress-zlib-perl-native_1.42.bb +++ b/packages/perl/libcompress-zlib-perl-native_1.42.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libcompress-zlib-perl_${PV}.bb diff --git a/packages/perl/libdata-optlist-perl-native_0.101.bb b/packages/perl/libdata-optlist-perl-native_0.101.bb index cf7847d783..9142a67327 100644 --- a/packages/perl/libdata-optlist-perl-native_0.101.bb +++ b/packages/perl/libdata-optlist-perl-native_0.101.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libdata-optlist-perl_${PV}.bb diff --git a/packages/perl/libdevel-stacktrace-perl-native_1.13.bb b/packages/perl/libdevel-stacktrace-perl-native_1.13.bb index cf7847d783..728537fd23 100644 --- a/packages/perl/libdevel-stacktrace-perl-native_1.13.bb +++ b/packages/perl/libdevel-stacktrace-perl-native_1.13.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libdevel-stacktrace-perl_${PV}.bb diff --git a/packages/perl/libdigest-sha1-perl-native_2.11.bb b/packages/perl/libdigest-sha1-perl-native_2.11.bb index cf7847d783..2d6d3e908f 100644 --- a/packages/perl/libdigest-sha1-perl-native_2.11.bb +++ b/packages/perl/libdigest-sha1-perl-native_2.11.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libdigest-sha1-perl_${PV}.bb diff --git a/packages/perl/liberror-perl-native_0.17004.bb b/packages/perl/liberror-perl-native_0.17004.bb index cf7847d783..7e448b08d5 100644 --- a/packages/perl/liberror-perl-native_0.17004.bb +++ b/packages/perl/liberror-perl-native_0.17004.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require liberror-perl_${PV}.bb diff --git a/packages/perl/libexception-class-perl-native_1.23.bb b/packages/perl/libexception-class-perl-native_1.23.bb index cf7847d783..b87dadeebf 100644 --- a/packages/perl/libexception-class-perl-native_1.23.bb +++ b/packages/perl/libexception-class-perl-native_1.23.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libexception-class-perl_${PV}.bb diff --git a/packages/perl/libextutils-cbuilder-perl-native_0.18.bb b/packages/perl/libextutils-cbuilder-perl-native_0.18.bb index cf7847d783..991de50fca 100644 --- a/packages/perl/libextutils-cbuilder-perl-native_0.18.bb +++ b/packages/perl/libextutils-cbuilder-perl-native_0.18.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libextutils-cbuilder-perl_${PV}.bb diff --git a/packages/perl/libextutils-parsexs-perl-native_2.16.bb b/packages/perl/libextutils-parsexs-perl-native_2.16.bb index cf7847d783..c3fbf43416 100644 --- a/packages/perl/libextutils-parsexs-perl-native_2.16.bb +++ b/packages/perl/libextutils-parsexs-perl-native_2.16.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libextutils-parsexs-perl_${PV}.bb diff --git a/packages/perl/libintl-perl-native_1.11.bb b/packages/perl/libintl-perl-native_1.11.bb index cf7847d783..f588246799 100644 --- a/packages/perl/libintl-perl-native_1.11.bb +++ b/packages/perl/libintl-perl-native_1.11.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libintl-perl_${PV}.bb diff --git a/packages/perl/libintl-perl-native_1.16.bb b/packages/perl/libintl-perl-native_1.16.bb index cf7847d783..f588246799 100644 --- a/packages/perl/libintl-perl-native_1.16.bb +++ b/packages/perl/libintl-perl-native_1.16.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libintl-perl_${PV}.bb diff --git a/packages/perl/libio-zlib-perl-native_1.04.bb b/packages/perl/libio-zlib-perl-native_1.04.bb index cf7847d783..d75e0f51bd 100644 --- a/packages/perl/libio-zlib-perl-native_1.04.bb +++ b/packages/perl/libio-zlib-perl-native_1.04.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libio-zlib-perl_${PV}.bb diff --git a/packages/perl/libipc-sharelite-perl-native_0.09.bb b/packages/perl/libipc-sharelite-perl-native_0.09.bb index cf7847d783..fa4f95aba1 100644 --- a/packages/perl/libipc-sharelite-perl-native_0.09.bb +++ b/packages/perl/libipc-sharelite-perl-native_0.09.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libipc-sharelite-perl_${PV}.bb diff --git a/packages/perl/liblocale-gettext-perl-native_1.05.bb b/packages/perl/liblocale-gettext-perl-native_1.05.bb index cf7847d783..d4ab1231c3 100644 --- a/packages/perl/liblocale-gettext-perl-native_1.05.bb +++ b/packages/perl/liblocale-gettext-perl-native_1.05.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require liblocale-gettext-perl_${PV}.bb diff --git a/packages/perl/liblog-dispatch-perl-native_2.13.bb b/packages/perl/liblog-dispatch-perl-native_2.13.bb index cf7847d783..386d0eb667 100644 --- a/packages/perl/liblog-dispatch-perl-native_2.13.bb +++ b/packages/perl/liblog-dispatch-perl-native_2.13.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require liblog-dispatch-perl_${PV}.bb diff --git a/packages/perl/liblog-log4perl-perl-native_1.06.bb b/packages/perl/liblog-log4perl-perl-native_1.06.bb index cf7847d783..405b01e7fa 100644 --- a/packages/perl/liblog-log4perl-perl-native_1.06.bb +++ b/packages/perl/liblog-log4perl-perl-native_1.06.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require liblog-log4perl-perl_${PV}.bb diff --git a/packages/perl/libmodule-build-perl-native_0.2805.bb b/packages/perl/libmodule-build-perl-native_0.2805.bb index cf7847d783..6715a8f726 100644 --- a/packages/perl/libmodule-build-perl-native_0.2805.bb +++ b/packages/perl/libmodule-build-perl-native_0.2805.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libmodule-build-perl_${PV}.bb diff --git a/packages/perl/libnet-ip-perl-native_1.25.bb b/packages/perl/libnet-ip-perl-native_1.25.bb index cf7847d783..22ebc965a4 100644 --- a/packages/perl/libnet-ip-perl-native_1.25.bb +++ b/packages/perl/libnet-ip-perl-native_1.25.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libnet-ip-perl_${PV}.bb diff --git a/packages/perl/libparams-util-perl-native_0.20.bb b/packages/perl/libparams-util-perl-native_0.20.bb index cf7847d783..74c0302948 100644 --- a/packages/perl/libparams-util-perl-native_0.20.bb +++ b/packages/perl/libparams-util-perl-native_0.20.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libparams-util-perl_${PV}.bb diff --git a/packages/perl/libparams-validate-perl-native_0.86.bb b/packages/perl/libparams-validate-perl-native_0.86.bb index cf7847d783..afd6c5ab2e 100644 --- a/packages/perl/libparams-validate-perl-native_0.86.bb +++ b/packages/perl/libparams-validate-perl-native_0.86.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libparams-validate-perl_${PV}.bb diff --git a/packages/perl/libsub-exporter-perl-native_0.970.bb b/packages/perl/libsub-exporter-perl-native_0.970.bb index cf7847d783..c87100e21e 100644 --- a/packages/perl/libsub-exporter-perl-native_0.970.bb +++ b/packages/perl/libsub-exporter-perl-native_0.970.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libsub-exporter-perl_${PV}.bb diff --git a/packages/perl/libsub-install-perl-native_0.922.bb b/packages/perl/libsub-install-perl-native_0.922.bb index cf7847d783..44554841d6 100644 --- a/packages/perl/libsub-install-perl-native_0.922.bb +++ b/packages/perl/libsub-install-perl-native_0.922.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libsub-install-perl_${PV}.bb diff --git a/packages/perl/libsub-uplevel-perl-native_0.13.bb b/packages/perl/libsub-uplevel-perl-native_0.13.bb index cf7847d783..607f0ba29e 100644 --- a/packages/perl/libsub-uplevel-perl-native_0.13.bb +++ b/packages/perl/libsub-uplevel-perl-native_0.13.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libsub-uplevel-perl_${PV}.bb diff --git a/packages/perl/libtext-diff-perl-native_0.35.bb b/packages/perl/libtext-diff-perl-native_0.35.bb index cf7847d783..a386d814bc 100644 --- a/packages/perl/libtext-diff-perl-native_0.35.bb +++ b/packages/perl/libtext-diff-perl-native_0.35.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libtext-diff-perl_${PV}.bb diff --git a/packages/perl/libversion-perl-native_0.6701.bb b/packages/perl/libversion-perl-native_0.6701.bb index cf7847d783..867c0e6586 100644 --- a/packages/perl/libversion-perl-native_0.6701.bb +++ b/packages/perl/libversion-perl-native_0.6701.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libversion-perl_${PV}.bb diff --git a/packages/perl/libxml-parser-perl-native_2.34.bb b/packages/perl/libxml-parser-perl-native_2.34.bb index 5398563f2e..8932656171 100644 --- a/packages/perl/libxml-parser-perl-native_2.34.bb +++ b/packages/perl/libxml-parser-perl-native_2.34.bb @@ -2,7 +2,7 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libxml-parser-perl_${PV}.bb DEPENDS = "perl-native expat-native" EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'" diff --git a/packages/perl/libyaml-perl-native_0.62.bb b/packages/perl/libyaml-perl-native_0.62.bb index cf7847d783..631a4de896 100644 --- a/packages/perl/libyaml-perl-native_0.62.bb +++ b/packages/perl/libyaml-perl-native_0.62.bb @@ -2,4 +2,4 @@ SECTION = "libs" inherit native -require ${@bb.data.getVar('P', d , 1).replace('-native-', '_')}.bb +require libyaml-perl_${PV}.bb diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index 06e173a5c4..97bc253aff 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "virtual/db libpcre postfix-native" LICENSE = "IPL" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ file://${FILESDIR}/makedefs.patch;patch=1 \ @@ -64,7 +64,7 @@ pkg_postinst () { rm -f /var/tmp/main_cf.sh chmod 644 /etc/postfix/main.cf [ -d /var/spool/postfix ] && rmdir /var/spool/postfix - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update touch /etc/aliases newaliases update-alternatives --install sendmail sendmail ${sbindir}/sendmail.${PN} 40 diff --git a/packages/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb deleted file mode 100644 index 41a6e808ab..0000000000 --- a/packages/puzzles/puzzles_r6712.bb +++ /dev/null @@ -1,50 +0,0 @@ - -DEPENDS = "gtk+ perl-native" - -SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \ - file://game.png" - -S = "${WORKDIR}/puzzles/" - -do_configure() { - cd ${S} && perl mkfiles.pl -} - -do_compile_prepend = " \ - export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \ - export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; " - -FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" - -do_install () { - 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 <<STOP > ${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_r6505.bb b/packages/puzzles/puzzles_r6727.bb index c3725ac8f7..f8ffcb7d01 100644 --- a/packages/puzzles/puzzles_r6505.bb +++ b/packages/puzzles/puzzles_r6727.bb @@ -10,19 +10,21 @@ do_compile_prepend = " \ export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/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 + 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 -d ${D}/${datadir}/ + install -d ${D}/${datadir}/applications/ + install -d ${D}/${datadir}/pixmaps/ - install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps + install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ cd ${D}/${prefix}/games for prog in *; do diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 6cb2355bcb..27a1a45928 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -74,7 +74,7 @@ SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ #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_h4000 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -#SRC_URI_append_h5xxx = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +#SRC_URI_append_h5000 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_h6300 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_hx2000 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " #SRC_URI_append_hx4700 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " @@ -112,7 +112,7 @@ EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h4000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h5xxx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_h5000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h6300 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx2000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx4700 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" diff --git a/packages/refdbg/.mtn2git_empty b/packages/refdbg/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/refdbg/.mtn2git_empty diff --git a/packages/refdbg/refdbg_1.2.bb b/packages/refdbg/refdbg_1.2.bb new file mode 100644 index 0000000000..8001872ef8 --- /dev/null +++ b/packages/refdbg/refdbg_1.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "RefDbg is a GObject Reference Count Debugger" +HOMEPAGE = "http://refdbg.sourceforge.net/index.html" +LICENSE = "GPL" +SECTION = "devel" +DEPENDS = "binutils" + +SRC_URI = "${SOURCEFORGE_MIRROR}/refdbg/refdbg-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/rsync/rsync_2.6.7.bb b/packages/rsync/rsync_2.6.7.bb deleted file mode 100644 index e349a6eb4a..0000000000 --- a/packages/rsync/rsync_2.6.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A file-synchronization tool" -SECTION = "console/network" -PRIORITY = "optional" -PR = "r1" - -SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \ - file://rsyncd.conf" - -inherit autotools - -do_install_append() { - install -d ${D}/etc - install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc -} - -EXTRA_OEMAKE='STRIP=""' diff --git a/packages/rsync/rsync_2.6.8.bb b/packages/rsync/rsync_2.6.9.bb index 78e2d6eef7..78e2d6eef7 100644 --- a/packages/rsync/rsync_2.6.8.bb +++ b/packages/rsync/rsync_2.6.9.bb diff --git a/packages/scratchbox/sbrsh_7.1.bb b/packages/scratchbox/sbrsh_7.1.bb index e692d2f242..43ff0178d6 100644 --- a/packages/scratchbox/sbrsh_7.1.bb +++ b/packages/scratchbox/sbrsh_7.1.bb @@ -5,8 +5,7 @@ DEPENDS = "fakeroot" PR = "r1" RRECOMMENDS = "kernel-module-nfs" - -SRC_URI = "http://scratchbox.org/download/files/sbox-releases/apophis/src/${P}.tar.gz" +SRC_URI = "http://scratchbox.org/download/files/sbox-releases/1.0/src/${P}.tar.gz" do_install() { install -d ${D}${sbindir} diff --git a/packages/spca5xx/spca5xx-20060501/.mtn2git_empty b/packages/spca5xx/spca5xx-20060501/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/spca5xx/spca5xx-20060501/.mtn2git_empty diff --git a/packages/spca5xx/spca5xx-20060202/Makefile.patch b/packages/spca5xx/spca5xx-20060501/Makefile.patch index 8053858ee1..8053858ee1 100644 --- a/packages/spca5xx/spca5xx-20060202/Makefile.patch +++ b/packages/spca5xx/spca5xx-20060501/Makefile.patch diff --git a/packages/spca5xx/spca5xx_20060202.bb b/packages/spca5xx/spca5xx_20060202.bb deleted file mode 100644 index b0fcb0f95e..0000000000 --- a/packages/spca5xx/spca5xx_20060202.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "USB Webcam driver for spca5xx chipset family supporting \ -over 100 models of camera"" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://mxhaard.free.fr/spca50x/Download/spca5xx-20060202.tar.gz \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/spca5xx-20060202" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake 'KERNELDIR=${STAGING_KERNEL_DIR}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/packages/spca5xx/spca5xx_20050419.bb b/packages/spca5xx/spca5xx_20060501.bb index f5c2821c9a..1a9b528178 100644 --- a/packages/spca5xx/spca5xx_20050419.bb +++ b/packages/spca5xx/spca5xx_20060501.bb @@ -1,13 +1,13 @@ DESCRIPTION = "USB Webcam driver for spca5xx chipset family supporting \ -over 100 models of camera"" +over 100 models of camera" PRIORITY = "optional" SECTION = "kernel/modules" LICENSE = "GPL" -PR = "r0" -SRC_URI = "http://mxhaard.free.fr/spca50x/Download/spca5xx-20050419.tar.gz" +SRC_URI = "http://mxhaard.free.fr/spca50x/Download/spca5xx-${PV}.tar.gz \ + file://Makefile.patch;patch=1" -S = "${WORKDIR}/spca5xx-20050419" +S = "${WORKDIR}/spca5xx-${PV}" inherit module @@ -22,4 +22,3 @@ do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media } - diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb index fbd4f11864..e2b50058f9 100644 --- a/packages/tasks/task-ossie.bb +++ b/packages/tasks/task-ossie.bb @@ -1,17 +1,14 @@ -PACKAGES = "task-ossie" DESCRIPTION = "Meta-package for OSSIE Software Defined Radio (SDR)" -ALLOW_EMPTY = "1" +LICENSE = "MIT" +RDEPENDS = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}" PR = "r0" -OSSIE_BASE = "screen procps xerces-c omniorb usrp" - -OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader" - -OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-soundout-device ossie-demo ossie-channeldemo ossie-rxdemo" - +PACKAGES = "task-ossie" -RDEPENDS = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}" +ALLOW_EMPTY = "1" IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}" -LICENSE = "MIT" +OSSIE_BASE = "screen procps xerces-c omniorb usrp" +OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader" +OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-soundout-device ossie-demo ossie-channeldemo ossie-rxdemo" diff --git a/packages/tslib/tslib-maemo/nokia770/ts.conf b/packages/tslib/tslib-maemo/nokia770/ts.conf deleted file mode 100644 index 8eed62f7b9..0000000000 --- a/packages/tslib/tslib-maemo/nokia770/ts.conf +++ /dev/null @@ -1,2 +0,0 @@ -module pressure -module linear diff --git a/packages/tslib/tslib-maemo/ts.conf b/packages/tslib/tslib-maemo/ts.conf deleted file mode 100644 index dc5c4ded09..0000000000 --- a/packages/tslib/tslib-maemo/ts.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Uncomment if you wish to use the linux input layer event interface -# module_raw input - -# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d -# module_raw collie - -# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 -# module_raw corgi - -# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface -# module_raw ucb1x00 - -# Uncomment if you're using an HP iPaq h3600 or similar -# module_raw h3600 - -# Uncomment if you're using a Hitachi Webpad -# module_raw mk712 - -# Uncomment if you're using an IBM Arctic II -# module_raw arctic2 - -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb deleted file mode 100644 index e303b40841..0000000000 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." -SECTION = "GPL" -LICENSE = "LGPL" -PROVIDES = "tslib" -PR = "r3" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ - file://ts.conf \ - file://tslib.sh" -S = "${WORKDIR}/tslib" - -inherit autotools - -EXTRA_OECONF = "--enable-shared" - -do_stage () { - autotools_stage_all -} - - -do_install_prepend () { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" -PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" - -RDEPENDS_libts-maemo = "tslib-maemo-conf" - -RPROVIDES_tslib-maemo-conf = "tslib-conf" -RPROVIDES_libts-maemo = "libts" -RPROVIDES_libts-maemo-dev = "libts-dev" -RPROVIDES_tslib-maemo-calibrate = "tslib-calibrate" -RPROVIDES_tslib-maemo-tests = "tslib-tests" - -FILES_tslib-maemo-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_libts-maemo = "${libdir}/*.so.* ${datadir}/ts/plugins/*.so*" -FILES_libts-maemo-dev = "${FILES_tslib-maemo-dev}" -FILES_tslib-maemo-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-maemo-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/packages/tslib/tslib/h5000/.mtn2git_empty b/packages/tslib/tslib/h5000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/h5000/.mtn2git_empty diff --git a/packages/tslib/tslib/h5xxx/tslib.sh b/packages/tslib/tslib/h5000/tslib.sh index b096bfb96e..b096bfb96e 100644 --- a/packages/tslib/tslib/h5xxx/tslib.sh +++ b/packages/tslib/tslib/h5000/tslib.sh diff --git a/packages/tslib/tslib/nokia770/.mtn2git_empty b/packages/tslib/tslib/nokia770/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/nokia770/.mtn2git_empty diff --git a/packages/tslib/tslib-maemo/nokia770/tslib.sh b/packages/tslib/tslib/nokia770/tslib.sh index b7acc274c0..b7acc274c0 100644 --- a/packages/tslib/tslib-maemo/nokia770/tslib.sh +++ b/packages/tslib/tslib/nokia770/tslib.sh diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb index 3d2e3cd79e..d7ff81daaa 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -33,7 +33,7 @@ do_install_append() { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ case ${MACHINE} in - a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 |blueangel | h4000) + a780 | e680 | h3600 | h3900 | h5000 | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000) install -d ${D}${datadir}/tslib install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/ ;; diff --git a/packages/util-linux/files/glibc-fix.patch b/packages/util-linux/files/glibc-fix.patch new file mode 100644 index 0000000000..d72c1701ef --- /dev/null +++ b/packages/util-linux/files/glibc-fix.patch @@ -0,0 +1,62 @@ +--- /tmp/llseek.c 2006-11-21 11:31:31.000000000 +0100 ++++ util-linux-2.12r/fdisk/llseek.c 2006-11-21 11:33:21.218554000 +0100 +@@ -31,9 +31,18 @@ + + #ifdef __NR__llseek + ++#ifdef _syscall5 ++ + static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high, + unsigned long, offset_low,long long *,result, + unsigned int, origin) ++#else ++static int _llseek (unsigned int fd, unsigned long oh, ++ unsigned long ol, long long *result, ++ unsigned int origin) { ++ return syscall (__NR__llseek, fd, oh, ol, result, origin); ++} ++#endif /* _syscall5 */ + + #else + +--- /tmp/sfdisk.c 2006-11-21 11:36:13.000000000 +0100 ++++ util-linux-2.12r/fdisk/sfdisk.c 2006-11-21 11:37:17.678554000 +0100 +@@ -177,9 +177,16 @@ + #endif + + #ifndef use_lseek ++#ifdef _syscall5 + static __attribute__used + _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, + loff_t *, res, unsigned int, wh); ++#else ++int _llseek (unsigned int fd, ulong hi, ulong lo, ++ loff_t *res, unsigned int wh) { ++ return syscall (__NR__llseek, fd, hi, lo, res, wh); ++} ++#endif /* _syscall5 */ + #endif + + static int +--- /tmp/cmos.c 2006-11-21 11:38:55.000000000 +0100 ++++ util-linux-2.12r/hwclock/cmos.c 2006-11-21 11:41:45.458554000 +0100 +@@ -46,15 +46,16 @@ + + #include <unistd.h> /* for geteuid() */ + #include <fcntl.h> /* for O_RDWR */ ++#include <linux/version.h> + #include <errno.h> + #include "../defines.h" /* for HAVE_sys_io_h */ + #include "nls.h" + + #if defined(__i386__) +-#ifdef HAVE_sys_io_h +-#include <sys/io.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) ++#include <asm/io.h> + #else +-#include <asm/io.h> /* for inb, outb */ ++#include <sys/io.h> /* for inb, outb */ + #endif + #elif defined(__alpha__) + /* <asm/io.h> fails to compile, probably because of u8 etc */ diff --git a/packages/util-linux/files/util-linux_2.12r-12.diff.gz b/packages/util-linux/files/util-linux_2.12r-12.diff.gz Binary files differnew file mode 100644 index 0000000000..a00cedeb15 --- /dev/null +++ b/packages/util-linux/files/util-linux_2.12r-12.diff.gz diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index bb874d9573..32cbadae64 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -1,3 +1,6 @@ require util-linux.inc -PR = "r8" +SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1" +SRC_URI += "file://glibc-fix.patch;patch=1" + +PR = "r10" diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb index 07a5659300..d633a9c6d1 100644 --- a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb +++ b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb @@ -6,6 +6,6 @@ S="${WORKDIR}/font-util-${PV}" DEPENDS = "bdftopcf-native" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz" inherit native autotools pkgconfig |