diff options
200 files changed, 5445 insertions, 2820 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 5d670ccadc..09357acbe8 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -14,6 +14,7 @@ CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" +LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib " # Overrides for paths diff --git a/classes/native.bbclass b/classes/native.bbclass index fea8048fe5..011e48cf62 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -34,6 +34,7 @@ CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" +LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib " # Path prefixes base_prefix = "${exec_prefix}" diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index f82af18d74..f03564c607 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -2,11 +2,9 @@ # Sanity check the users setup for common misconfigurations # -BB_MIN_VERSION = "1.3.3" - def raise_sanity_error(msg): import bb - bb.fatal("Openembedded's config sanity checker detected a potential misconfiguration.\nEither fix cause of this error or at your own risk disable the checker (see sanity.conf).\n%s" % msg) + bb.fatal("Openembedded's config sanity checker detected a potential misconfiguration.\nEither fix the cause of this error or at your own risk disable the checker (see sanity.conf).\n%s" % msg) def check_conf_exists(fn, data): import bb, os @@ -22,37 +20,41 @@ def check_conf_exists(fn, data): return True return False -addhandler check_sanity_eventhandler -python check_sanity_eventhandler() { +def check_app_exists(app, d): + from bb import which, data + + app = data.expand(app, d) + path = data.getVar('PATH', d) + return len(which(path, app)) != 0 + + +def check_sanity(e): from bb import note, error, data, __version__ from bb.event import Handled, NotHandled, getName from distutils.version import LooseVersion import os - sanity_checked = bb.data.getVar('SANITY_CHECKED', e.data) - if sanity_checked == "1": - return - # Check the bitbake version meets minimum requirements - minversion = bb.data.getVar('BB_MIN_VERSION', e.data , True) + minversion = data.getVar('BB_MIN_VERSION', e.data , True) if not minversion: # Hack: BB_MIN_VERSION hasn't been parsed yet so return # and wait for the next call + print "Foo %s" % minversion return - if (LooseVersion(bb.__version__) < LooseVersion(minversion)): - raise_sanity_error('Bitbake version %s is required and version %s was found' % (minversion, bb.__version__)) + if (LooseVersion(__version__) < LooseVersion(minversion)): + raise_sanity_error('Bitbake version %s is required and version %s was found' % (minversion, __version__)) # Check TARGET_ARCH is set - if bb.data.getVar('TARGET_ARCH', e.data, True) == 'INVALID': + if data.getVar('TARGET_ARCH', e.data, True) == 'INVALID': raise_sanity_error('Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.') # Check TARGET_OS is set - if bb.data.getVar('TARGET_OS', e.data, True) == 'INVALID': + if data.getVar('TARGET_OS', e.data, True) == 'INVALID': raise_sanity_error('Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.') # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf - if "diffstat-native" not in bb.data.getVar('ASSUME_PROVIDED', e.data, True).split(): + if "diffstat-native" not in data.getVar('ASSUME_PROVIDED', e.data, True).split(): raise_sanity_error('Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf') # Check the MACHINE is valid @@ -62,8 +64,32 @@ python check_sanity_eventhandler() { # Check the distro is valid if not check_conf_exists("conf/distro/${DISTRO}.conf", e.data): raise_sanity_error('Please set a valid DISTRO in your local.conf') - - bb.data.setVar('SANITY_CHECKED', "1", e.data) - return -} + if not check_app_exists("${MAKE}", e.data): + raise_sanity_error('GNU make missing. Please install GNU make') + + if not check_app_exists('${BUILD_PREFIX}gcc', e.data): + raise_sanity_error('C Host-Compiler is missing, please install one' ) + + if not check_app_exists('${BUILD_PREFIX}g++', e.data): + raise_sanity_error('C++ Host-Compiler is missing, please install one' ) + + if not check_app_exists('patch', e.data): + raise_sanity_error('Please install the patch utility, preferable GNU patch.') + + if not check_app_exists('diffstat', e.data): + raise_sanity_error('Please install the diffstat utilits') + + if not check_app_exists('texi2html', e.data): + raise_sanity_error('Please install the texi2html binary') + +addhandler check_sanity_eventhandler +python check_sanity_eventhandler() { + from bb import note, error, data, __version__ + from bb.event import getName + + if getName(e) == "BuildStarted": + check_sanity(e) + + return NotHandled +} diff --git a/packages/base-files/base-files/borzoi/.mtn2git_empty b/conf/build/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/base-files/base-files/borzoi/.mtn2git_empty +++ b/conf/build/.mtn2git_empty diff --git a/conf/build/Power Macintosh-darwin.conf b/conf/build/Power Macintosh-darwin.conf new file mode 100644 index 0000000000..f56c09243e --- /dev/null +++ b/conf/build/Power Macintosh-darwin.conf @@ -0,0 +1 @@ +BUILD_ARCH="powerpc" diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4159d99962..6ca56971ab 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -49,14 +49,14 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.0" -PREFERRED_VERSION_gcc-cross ?= "4.1.0" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" -PREFERRED_VERSION_binutils ?= "2.16.91.0.6" -PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +PREFERRED_VERSION_gcc = "4.1.0" +PREFERRED_VERSION_gcc-cross = "4.1.0" +PREFERRED_VERSION_gcc-cross-initial = "4.1.0" +PREFERRED_VERSION_binutils = "2.16.91.0.6" +PREFERRED_VERSION_binutils-cross = "2.16.91.0.6" +PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" @@ -74,7 +74,6 @@ PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PCMCIA_MANAGER_c7x0 = "pcmciautils" PCMCIA_MANAGER_akita = "pcmciautils" PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_borzoi = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" @@ -90,6 +89,5 @@ GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" #GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" #GPE_EXTRA_INSTALL_append_akita = " libgtkinput" #GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" -#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index c8f246ff69..5126876278 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -30,6 +30,6 @@ PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" -PREFERRED_VERSION_gnome-vfs-dbus = "svn" +#PREFERRED_VERSION_gnome-vfs-dbus = "svn" -PREFERRED_VERSION_gcc = "3.4.4" +#PREFERRED_VERSION_gcc = "3.4.4" diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 1e578c48ba..b89d5728f7 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -1,6 +1,7 @@ BBFILES := "\ ${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/apr/*.bb \ +${PKGDIR}/packages/asterisk/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/aumix/*.bb \ diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 9ea8897bff..4417b67862 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -89,8 +89,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ASSUME_PROVIDED += "qemu-native" # Uncomment this to select a particular kernel version if supported by -# your MACHINE setting. Currently only supported on Zaurus Clamshells. -# KERNEL_VERSION = "2.6" +# your MACHINE setting. Currently only supported by poodle and tosa. +# ZKERNEL_VERSION = "2.6" # Uncomment one of these to build packages during the build process. # This is done automatically if you set DISTRO (see above) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index da699e7258..89c0d031ee 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,9 +2,7 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf index 10ffb80c32..d037a1f779 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.conf @@ -1,21 +1,2 @@ -#@TYPE: Machine -#@NAME: Sharp Zaurus SL-C3100 -#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device - -KERNEL_VERSION ?= "2.6" - -include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf - -PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" -PIVOTBOOT_EXTRA_RRECOMMENDS += "" - -# Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" - -IMAGE_FSTYPES = "jffs2 tar.gz" - -ROOT_FLASH_SIZE = "100" -# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, -# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte - +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C3100,\n* because \ +its very similar to the SL-C3000. Use MACHINE = \"spitz\".\n*\n*\n')}" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index af1c9dad1c..0bd9623526 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index b1dcd7fe3b..9076355522 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 88df07cddb..068d8c4677 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index af66c7294e..b2ca8370e7 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -10,7 +10,7 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index e73028d7ee..97030e66a7 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -7,7 +7,7 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules @@ -46,5 +46,4 @@ BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-mod BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index a1bf5fbec3..8c83416919 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te poodle" -KERNEL_VERSION ?= "2.4" -include conf/machine/include/poodle-${KERNEL_VERSION}.conf +ZKERNEL_VERSION ?= "2.4" +include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 7a558a731d..f3edef9890 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -2,8 +2,6 @@ #@NAME: qemu ARM Emulator setup #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation -KERNEL_VERSION ?= "2.6" - TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te qemuarm" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 212da52587..f78dd7a3b9 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/terrier.conf b/conf/machine/terrier.conf new file mode 100644 index 0000000000..ca6a20daf5 --- /dev/null +++ b/conf/machine/terrier.conf @@ -0,0 +1,2 @@ +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C3200,\n* because \ +its very similar to the SL-C3000/SL-C3100. Use MACHINE = \"spitz\".\n*\n*\n')}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index b573f5721d..3485937186 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te tosa" -KERNEL_VERSION ?= "2.4" -include conf/machine/include/tosa-${KERNEL_VERSION}.conf +ZKERNEL_VERSION ?= "2.4" +include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" diff --git a/conf/sanity.conf b/conf/sanity.conf index df2ec3e82a..93700ef145 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" - +BB_MIN_VERSION = "1.3.3" INHERIT += "sanity" diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 2df0e16792..d146b2ab45 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r34" +PR = "r35" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/altboot_1.0.6-rc2.bb b/packages/altboot/altboot_1.0.6-rc2.bb new file mode 100644 index 0000000000..bb99fe31e5 --- /dev/null +++ b/packages/altboot/altboot_1.0.6-rc2.bb @@ -0,0 +1,82 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" + +###################################################################################### + +PR = "r0" + +###################################################################################### + +PACKAGE_ARCH = "${MACHINE}" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" + +SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" + +S = "${WORKDIR}/altboot/" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + + if test -d ${WORKDIR}/altboot/${MACHINE} + then + install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + else + install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + fi + + install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc + install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ + then + install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + else + install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + fi + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/ + then + install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + else + install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + + install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc +} + +###################################################################################### + +do_configure() { + cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ + mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot +} + +###################################################################################### + +pkg_postinst() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm() { + update-alternatives --remove init /sbin/init.altboot +} + diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index e01af7faad..e81526d251 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -30,12 +30,21 @@ run_module() { # After the PCMCIA service is started, an inserted WLAN card should automatically # activate itself. - /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia/start failed!" - + + if test -x /etc/init.d/pcmcia + then + /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!" + else + # With kernel 2.6.16+ udev is used + /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!" + fi + nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" + WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | awk '{print $1}'`" + if test -z "$nfs_host" then die "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" @@ -61,7 +70,8 @@ run_module() { then echo "Restarting udhcpc" killall udhcpc - udhcpc -i wlan0 -H `cat /etc/hostname` >/dev/null 2>&1 + + udhcpc -i "$WLAN_NIC" -H `cat /etc/hostname` >/dev/null 2>&1 else die "Failed to activate WLAN!" break diff --git a/packages/asterisk/asterisk_1.0.9.bb b/packages/asterisk/asterisk_1.0.9.bb index fa0daa7bf7..3ee67f4bac 100644 --- a/packages/asterisk/asterisk_1.0.9.bb +++ b/packages/asterisk/asterisk_1.0.9.bb @@ -2,8 +2,9 @@ DESCRIPTION="The Astersisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl" +PR = "r1" -SRC_URI="http://ftp.digium.com/pub/asterisk/asterisk-${PV}.tar.gz \ +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://gsm.patch;patch=1 \ file://makefile.patch;patch=1" diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab deleted file mode 100644 index 3d0e508dfd..0000000000 --- a/packages/base-files/base-files/borzoi/fstab +++ /dev/null @@ -1,28 +0,0 @@ -# don't mount /dev/mtdblock2 since Spitz uses pivot_root -# or 2.6 directly boots from the hdd -# /dev/mtdblock2 / jffs2 rw,noatime 1 1 -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -# we can use a normal var filesystem with a microdrive -# tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# Compact Flash memory cards -/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - -# -# USB -# -/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs noauto 0 0 - -# -# Harddisk -# -/dev/hda2 /home ext3 defaults 0 0 -/dev/hda3 /media/hdd vfat defaults 0 0 diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc index 60d1ce1bb8..cc7e615e93 100644 --- a/packages/efl++/efl++.inc +++ b/packages/efl++/efl++.inc @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" DEPENDS = "virtual/evas virtual/ecore edje libsigc++-2.0" PROVIDES = "virtual/efl++" -SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2" +SRC_URI = "http://www.Vanille.de/download/efl/efl++_${PV}.tar.bz2" S = "${WORKDIR}/efl++-${PV}" inherit qmake diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.025.bb index a7b1bd4029..7ccecabfb2 100644 --- a/packages/efl/evas-fb_0.9.9.025.bb +++ b/packages/efl/evas-fb_0.9.9.025.bb @@ -1,6 +1,6 @@ include evas.inc DEPENDS = "freetype libpng jpeg eet" -PR = "r2" +PR = "r3" EXTRA_OECONF = "--enable-fb \ --disable-directfb \ diff --git a/packages/efl/evas-fb_20060113.bb b/packages/efl/evas-fb_20060113.bb index 3162ab147a..1a889a2649 100644 --- a/packages/efl/evas-fb_20060113.bb +++ b/packages/efl/evas-fb_20060113.bb @@ -1,6 +1,6 @@ include evas.inc DEPENDS = "freetype libpng jpeg eet" -PR = "r0" +PR = "r1" SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV} \ file://pkg.m4" diff --git a/packages/efl/evas-x11_0.9.9.025.bb b/packages/efl/evas-x11_0.9.9.025.bb index 125dfb0c97..dc99b96761 100644 --- a/packages/efl/evas-x11_0.9.9.025.bb +++ b/packages/efl/evas-x11_0.9.9.025.bb @@ -1,6 +1,6 @@ include evas.inc DEPENDS += "libx11 libxext freetype" -PR = "r4" +PR = "r5" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ diff --git a/packages/efl/evas-x11_20060113.bb b/packages/efl/evas-x11_20060113.bb index 8925920fcf..c10bd77857 100644 --- a/packages/efl/evas-x11_20060113.bb +++ b/packages/efl/evas-x11_20060113.bb @@ -1,6 +1,6 @@ include evas.inc DEPENDS += "libx11 libxext freetype" -PR = "r4" +PR = "r5" SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV}" S = "${WORKDIR}/evas" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 3199453d31..bffd0668cb 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -20,7 +20,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" - do_configure_prepend() { if [ -e "${WORKDIR}/m4" ]; then install -d "${S}/m4" @@ -29,6 +28,16 @@ do_configure_prepend() { fi } +do_stage_append() { + cd src + modules=`find modules -name ".libs"` + for module in $modules + do + install -d ${STAGING_LIBDIR}/evas/`dirname $module` + install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/module.so + done +} + headers = "<override me>" libraries = "libevas" -FILES_${PN} += "/usr/lib/evas/"
\ No newline at end of file +FILES_${PN} += "/usr/lib/evas/" diff --git a/packages/gpe-wlancfg/.mtn2git_empty b/packages/elfutils/elfutils-0.108/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-wlancfg/.mtn2git_empty +++ b/packages/elfutils/elfutils-0.108/.mtn2git_empty diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.108/warnings.patch new file mode 100644 index 0000000000..9de027ee26 --- /dev/null +++ b/packages/elfutils/elfutils-0.108/warnings.patch @@ -0,0 +1,132 @@ +Index: elfutils-0.108/configure.ac +=================================================================== +--- elfutils-0.108.orig/configure.ac 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/configure.ac 2006-04-10 19:19:33.000000000 +0100 +@@ -49,6 +49,10 @@ + dnl Add all the languages for which translations are available. + ALL_LINGUAS= + ++if test X"$CFLAGS" = X; then ++ CFLAGS="-Wall -Werror -g -O2" ++fi ++ + AC_PROG_CC + AC_PROG_RANLIB + AC_PROG_YACC +Index: elfutils-0.108/lib/Makefile.am +=================================================================== +--- elfutils-0.108.orig/lib/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/lib/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -21,7 +21,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS) ++AM_CFLAGS += -fpic -Wshadow -Wunused $($(*F)_CFLAGS) + INCLUDES = -I$(srcdir)/../libelf -I.. + + noinst_LIBRARIES = libeu.a +Index: elfutils-0.108/libasm/Makefile.am +=================================================================== +--- elfutils-0.108.orig/libasm/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/libasm/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -18,7 +18,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 ++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 + INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ + -I$(top_srcdir)/lib + GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) +Index: elfutils-0.108/libcpu/Makefile.am +=================================================================== +--- elfutils-0.108.orig/libcpu/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/libcpu/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -13,7 +13,7 @@ + ## 3001 King Ranch Road, Ukiah, CA 95482. + ## + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused ++AM_CFLAGS = -Wshadow -Wformat=2 -Wunused + INCLUDES = -I$(srcdir) + + noinst_LIBRARIES = libcpu_i386.a +Index: elfutils-0.108/libdw/Makefile.am +=================================================================== +--- elfutils-0.108.orig/libdw/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/libdw/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -18,7 +18,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 ++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 + INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib + VERSION = 1 + +Index: elfutils-0.108/libebl/Makefile.am +=================================================================== +--- elfutils-0.108.orig/libebl/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/libebl/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -18,7 +18,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ ++AM_CFLAGS += -fpic -Wshadow -Wunused -Wformat=2 \ + -std=gnu99 + + INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I.. +Index: elfutils-0.108/libelf/Makefile.am +=================================================================== +--- elfutils-0.108.orig/libelf/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/libelf/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -21,7 +21,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ ++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 \ + $($(*F)_CFLAGS) + INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. + GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) +Index: elfutils-0.108/src/Makefile.am +=================================================================== +--- elfutils-0.108.orig/src/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/src/Makefile.am 2006-04-10 19:20:19.000000000 +0100 +@@ -15,14 +15,12 @@ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \ + -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" + if MUDFLAP +-AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \ ++AM_CFLAGS = -Wshadow -Wunused -std=gnu99 -fmudflap \ + $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \ + $(if $($(*F)_no_Wformat),,-Wformat=2) + else +-AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ +- $(if $($(*F)_no_Werror),,-Werror) \ +- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wformat),,-Wformat=2) ++AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \ ++ $(if $($(*F)_no_Werror),,-Werror) + endif + if MUDFLAP + libmudflap = -lmudflap +Index: elfutils-0.108/tests/Makefile.am +=================================================================== +--- elfutils-0.108.orig/tests/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.108/tests/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -14,10 +14,10 @@ + ## + DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE + if MUDFLAP +-AM_CFLAGS = -Wall -Werror -std=gnu99 -fmudflap\ ++AM_CFLAGS = -std=gnu99 -fmudflap\ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) + else +-AM_CFLAGS = -Wall -Werror -std=gnu99 \ ++AM_CFLAGS = -std=gnu99 \ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) + AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf + endif diff --git a/packages/elfutils/elfutils_0.108.bb b/packages/elfutils/elfutils_0.108.bb new file mode 100644 index 0000000000..83acc7dccb --- /dev/null +++ b/packages/elfutils/elfutils_0.108.bb @@ -0,0 +1,36 @@ +SECTION = "base" +LICENSE = "OSL" +DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects." +DEPENDS = "libtool" + +SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ + file://warnings.patch;patch=1" + +inherit autotools + +SOV = "${PV}" +do_stage () { + install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a + install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so + ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1 + ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so + install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a + install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so + ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1 + ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so + install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a + install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so + ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1 + ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so + install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a + install -d ${STAGING_LIBDIR}/elfutils/ + install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/ + + install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/ + install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/ + install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/ + install -d ${STAGING_INCDIR}/elfutils + install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/ + install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/ + install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/ +} diff --git a/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty b/packages/fakechroot/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty +++ b/packages/fakechroot/.mtn2git_empty diff --git a/packages/fakechroot/fakechroot-native_2.5.bb b/packages/fakechroot/fakechroot-native_2.5.bb new file mode 100644 index 0000000000..5af3e79467 --- /dev/null +++ b/packages/fakechroot/fakechroot-native_2.5.bb @@ -0,0 +1,12 @@ +SECTION = "base" +PR = "r0" +include fakechroot_${PV}.bb +inherit native + +S = "${WORKDIR}/fakechroot-${PV}" + +EXTRA_OECONF = " --program-prefix=" + +do_stage_append () { + oe_libinstall -so libfakechroot ${STAGING_LIBDIR}/libfakechroot/ +} diff --git a/packages/fakechroot/fakechroot_2.5.bb b/packages/fakechroot/fakechroot_2.5.bb new file mode 100644 index 0000000000..c791512185 --- /dev/null +++ b/packages/fakechroot/fakechroot_2.5.bb @@ -0,0 +1,7 @@ +SECTION = "base" +DESCRIPTION = "Gives a fake root environment which can support chroot" +LICENSE = "GPL" + +SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz" + +inherit autotools diff --git a/packages/flex/files/flex-lvalue.diff b/packages/flex/files/flex-lvalue.diff new file mode 100644 index 0000000000..56ae539a6c --- /dev/null +++ b/packages/flex/files/flex-lvalue.diff @@ -0,0 +1,36 @@ +Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi/flex-lvalue.diff?bug=194844;msg=10;att=1 + +according to posix 0,1,2 are already setup and this avoids +the issues with +| filter.c: In function 'filter_apply_chain': +| filter.c:161: error: invalid lvalue in assignment +| filter.c:163: error: invalid lvalue in assignment +| filter.c:184: error: invalid lvalue in assignment + + +diff -ur flex-2.5.31.ORIG/filter.c flex-2.5.31/filter.c +--- flex-2.5.31.ORIG/filter.c 2003-03-25 16:39:08.000000000 +0000 ++++ flex-2.5.31/filter.c 2003-05-27 17:00:26.000000000 +0000 +@@ -157,11 +157,8 @@ + if (chain->filter_func) { + int r; + +- /* setup streams again */ +- if ((stdin = fdopen (0, "r")) == NULL) +- flexfatal (_("fdopen(0) failed")); +- if ((stdout = fdopen (1, "w")) == NULL) +- flexfatal (_("fdopen(1) failed")); ++ /* POSIX says we inherit fd[0-2], so we don't need ++ to do anything to them here */ + + if ((r = chain->filter_func (chain)) == -1) + flexfatal (_("filter_func failed")); +@@ -181,8 +178,6 @@ + if (dup2 (pipes[1], 1) == -1) + flexfatal (_("dup2(pipes[1],1)")); + close (pipes[1]); +- if ((stdout = fdopen (1, "w")) == NULL) +- flexfatal (_("fdopen(1) failed")); + + return true; + } diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc index 6e605ac9be..d6affad226 100644 --- a/packages/flex/flex.inc +++ b/packages/flex/flex.inc @@ -3,6 +3,7 @@ SECTION = "devel" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2 \ + file://flex-lvalue.diff;patch=1 \ file://fix-gen.patch;patch=1" S = "${WORKDIR}/flex-${PV}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb index 48c80864e2..48c80864e2 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb diff --git a/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb index 48c80864e2..48c80864e2 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb diff --git a/packages/gcc/gcc-cross_csl-arm-20050603.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index e815b2f9e3..93c58aca53 100644 --- a/packages/gcc/gcc-cross_csl-arm-20050603.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -1,4 +1,4 @@ -include gcc_csl-arm-20050603.bb +include gcc_csl-arm-2005q3.bb # path mangling, needed by the cross packaging include gcc-paths-cross.inc inherit cross diff --git a/packages/gcc/gcc-cross_csl-arm-20050416.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb index e8df623aeb..f83de2598d 100644 --- a/packages/gcc/gcc-cross_csl-arm-20050416.bb +++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb @@ -1,10 +1,10 @@ -include gcc_csl-arm-20050416.bb +include gcc_csl-arm-cvs.bb # path mangling, needed by the cross packaging include gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r0" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_csl-arm-20050416.bb b/packages/gcc/gcc_csl-arm-20050416.bb deleted file mode 100644 index 58badbb8ab..0000000000 --- a/packages/gcc/gcc_csl-arm-20050416.bb +++ /dev/null @@ -1,11 +0,0 @@ -include gcc_csl-arm.bb - -SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1" - -PR = "r3" - -SRCDATE = "20050416" -OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" -DEFAULT_PREFERENCE_arm-linux = "-1" -DEFAULT_PREFERENCE_arm-linuxeabi = "1" - diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb new file mode 100644 index 0000000000..7fa23a2438 --- /dev/null +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The GNU cc and gcc C compilers." +HOMEPAGE = "http://www.gnu.org/software/gcc/" +SECTION = "devel" +LICENSE = "GPL" +BINV = "3.4.4" +PV = "3.4.4+csl-arm-2005q3" +PR = "r0" + +FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" + +inherit autotools gettext + +include gcc-package.inc + +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2" + +do_unpack2() { + cd ${WORKDIR} + tar -xvjf ./arm-2005q3-2-arm-none-linux-gnueabi/gcc-2005q3-2.tar.bz2 +} + +addtask unpack2 after do_unpack before do_patch + +include gcc3-build.inc + +S = "${WORKDIR}/gcc-2005q3" diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-cvs.bb index e322bba647..bc704d51db 100644 --- a/packages/gcc/gcc_csl-arm-20050603.bb +++ b/packages/gcc/gcc_csl-arm-cvs.bb @@ -7,7 +7,4 @@ SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch= PR = "r0" -SRCDATE = "20050603" -OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" - -DEFAULT_PREFERENCE_arm = "-1" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb index 03c6b8c19f..d437ece065 100644 --- a/packages/gcc/gcc_csl-arm.bb +++ b/packages/gcc/gcc_csl-arm.bb @@ -1,11 +1,12 @@ -PR = "r0" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PV = "3.4.3+csl-arm-${SRCDATE}" -BINV = "3.4.3" +BINV = "3.4.4" +PV = "3.4.4+csl-arm-${SRCDATE}" +PR = "r0" + FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-login/gpe-login_0.83.bb b/packages/gpe-login/gpe-login_0.83.bb index 2b50f4a103..6e6a0092b6 100644 --- a/packages/gpe-login/gpe-login_0.83.bb +++ b/packages/gpe-login/gpe-login_0.83.bb @@ -15,7 +15,6 @@ SRC_URI += "file://busybox-bad-perms.patch;patch=1" SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb index 093c291134..f6eb0c921a 100644 --- a/packages/gpe-login/gpe-login_0.86.bb +++ b/packages/gpe-login/gpe-login_0.86.bb @@ -13,7 +13,6 @@ PR = "r0" SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb index c57366399d..3b8f8a958f 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb @@ -18,7 +18,6 @@ SRC_URI += "file://matchbox-session \ SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/keylaunch/files/borzoi/.mtn2git_empty b/packages/gpe-windowlist/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/keylaunch/files/borzoi/.mtn2git_empty +++ b/packages/gpe-windowlist/.mtn2git_empty diff --git a/packages/gpe-windowlist/gpe-windowlist_cvs.bb b/packages/gpe-windowlist/gpe-windowlist_cvs.bb new file mode 100644 index 0000000000..94e6a72d8f --- /dev/null +++ b/packages/gpe-windowlist/gpe-windowlist_cvs.bb @@ -0,0 +1,17 @@ +DEPENDS = "libgpewidget libgpelaunch gtk+" +SECTION = "gpe" +DESCRIPTION = "GPE calendar" +LICENSE = "GPL" + +DEFAULT_PREFERENCE = "-1" + +PV = "0.1+cvs${SRCDATE}" +PR = "r1" + +inherit autotools gpe + +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +S = "${WORKDIR}/${PN}" + + + diff --git a/packages/gpe-wlancfg/gpe-wlancfg-makefile.patch b/packages/gpe-wlancfg/gpe-wlancfg-makefile.patch deleted file mode 100644 index 8a390f000b..0000000000 --- a/packages/gpe-wlancfg/gpe-wlancfg-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== -RCS file: /cvs/gpe/base/gpe-wlancfg2/Makefile,v -retrieving revision 1.20 -diff -r1.20 Makefile -62c62 -< $(CC) -o $@ $^ $(LDFLAGS) $(GPELIBS) -lfl -lXrender -lXinerama ---- -> $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) -72c72 -< install-program: all ---- -> install-program: all $(PACKAGE).desktop diff --git a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb b/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb deleted file mode 100644 index 0e752f48b8..0000000000 --- a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -PR = "r1" -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "libgpewidget flex" -SECTION = "gpe" -MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -RDEPENDS = "gpe-su" - -DESCRIPTION = "GPE wireless LAN configuration tool" -export CVSBUILD = "no" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ - file://${FILESDIR}/gpe-wlancfg-makefile.patch;patch=1;pnum=0" diff --git a/packages/groff/groff_1.19.1.bb b/packages/groff/groff_1.19.1.bb index 0a03dd2b75..2560bde92b 100644 --- a/packages/groff/groff_1.19.1.bb +++ b/packages/groff/groff_1.19.1.bb @@ -1,14 +1,16 @@ -LICENSE = "GPL" -SECTION = "base" DESCRIPTION = "GNU roff" +SECTION = "base" +LICENSE = "GPL" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" +PR = "r2" + SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://groff.patch;patch=1" -PR = "r1" +PARALLEL_MAKE = "" # prefix and exec-prefix are broken and the .in file is broken too # and can't be autoreconf'ed, so specify every dir -EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info" +EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" inherit autotools diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb index 4356de6a1d..24cc5eadea 100644 --- a/packages/groff/groff_1.19.2.bb +++ b/packages/groff/groff_1.19.2.bb @@ -1,16 +1,18 @@ -LICENSE = "GPL" -SECTION = "base" DESCRIPTION = "GNU roff" +SECTION = "base" +LICENSE = "GPL" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" +PR = "r2" + SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://Makefile.in.patch;patch=1 \ file://Makefile.sub.patch;patch=1 \ file://groff.patch;patch=1" -PR = "r1" +PARALLEL_MAKE = "" # prefix and exec-prefix are broken and the .in file is broken too # and can't be autoreconf'ed, so specify every dir -EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info" +EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" inherit autotools do_configure () { diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc index 231978df83..c95059efe8 100644 --- a/packages/hostap/hostap-daemon.inc +++ b/packages/hostap/hostap-daemon.inc @@ -4,7 +4,7 @@ SECTION = "kernel/userland" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -RDEPENDS = "virtual/kernel-hostap hostap-utils (${PV})" +RDEPENDS = "hostap-modules hostap-utils (${PV})" DEPENDS_mtx-1_append = "madwifi-modules" SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc index 72f2dc2da3..5ce5e0db67 100644 --- a/packages/hostap/hostap-modules.inc +++ b/packages/hostap/hostap-modules.inc @@ -3,13 +3,12 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PROVIDES = "hostap-conf" -RPROVIDES = "virtual/kernel-hostap" -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf" +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz" + SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" + SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " S = "${WORKDIR}/hostap-driver-${PV}" @@ -24,21 +23,17 @@ NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_cryp do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia for i in ${NET_MODULES} do install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ done install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf } PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" -RPROVIDES_hostap-modules-cs = "hostap-conf" +RDEPENDS_hostap-modules-cs = "hostap-modules (${PV}) hostap-conf" +RDEPENDS_hostap-modules-pci = "hostap-modules (${PV})" diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb index 2a09550772..d6bdd5ba37 100644 --- a/packages/hostap/hostap-modules_0.3.10.bb +++ b/packages/hostap/hostap-modules_0.3.10.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r7" +PR = "r8" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index 5980783840..c1ab69a6c9 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r7" +PR = "r8" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index 508c653230..cc09fd5952 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r9" +PR = "r10" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb index b3d0a8e949..399d60cc20 100644 --- a/packages/hostap/hostap-modules_0.4.4.bb +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -1,4 +1,4 @@ include hostap-modules.inc -PR = "r5" +PR = "r6" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb index e9efcb5617..21effc081b 100644 --- a/packages/hostap/hostap-modules_0.4.7.bb +++ b/packages/hostap/hostap-modules_0.4.7.bb @@ -1,4 +1,4 @@ include hostap-modules.inc -PR = "r3" +PR = "r4" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-utils.inc b/packages/hostap/hostap-utils.inc index c5c5d5b3f9..1e4362d0f7 100644 --- a/packages/hostap/hostap-utils.inc +++ b/packages/hostap/hostap-utils.inc @@ -4,7 +4,7 @@ SECTION = "kernel/userland" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -RRECOMMENDS = "virtual/kernel-hostap" +RRECOMMENDS = "hostap-modules" PR = "r3" SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ diff --git a/packages/initscripts/initscripts-1.0/borzoi/devices b/packages/initscripts/initscripts-1.0/borzoi/devices deleted file mode 100755 index 083090ecb9..0000000000 --- a/packages/initscripts/initscripts-1.0/borzoi/devices +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# Devfs handling script. Since we arent running devfsd due to various reasons -# which I will not lay out here, we need to create some links for compatibility. - -. /etc/default/rcS - -# exit without doing anything if udev is active -if test -e /dev/.udevdb; then - exit 0 -fi - -if test -e /dev/.devfsd -then - if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi - ln -s /dev/touchscreen/0 /dev/ts - ln -s /dev/touchscreen/0raw /dev/tsraw - ln -s /dev/vc/0 /dev/tty0 - ln -s /dev/vc/1 /dev/tty1 - ln -s /dev/vc/2 /dev/tty2 - ln -s /dev/vc/3 /dev/tty3 - ln -s /dev/vc/4 /dev/tty4 - ln -s /dev/vc/5 /dev/tty5 - ln -s /dev/fb/0 /dev/fb0 -# ln -s /dev/tts/0 /dev/ttySA0 -# ln -s /dev/tts/1 /dev/ttySA1 -# ln -s /dev/tts/2 /dev/ttySA2 - - ln -s /dev/sound/dsp /dev/dsp - ln -s /dev/sound/mixer /dev/mixer - - ln -s /dev/v4l/video0 /dev/video0 - ln -s /dev/v4l/video0 /dev/video - ln -s /dev/misc/rtc /dev/rtc - - ## need this so that ppp will autoload the ppp modules - mknod /dev/ppp c 108 0 - if test "$VERBOSE" != "no"; then echo "done"; fi -else - if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi - mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi - if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi - cd / - mkdir -p dev/msys - mkdir -p dev/pts - mkdir -p dev/input - mkdir -p dev/vc - for i in 0 1 2 3 4 5 6 7 8 9; do - ln -s /dev/tty$i /dev/vc/$i - done - ln -sf /dev/sharp_ts /dev/ts - ln -sf /dev/sharp_fl /dev/fl - ln -sf /proc/self/fd /dev/fd - ln -sf /proc/kcore /dev/core - /sbin/makedevs -r / -D /etc/device_table - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi -fi - -exit 0 diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map b/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map deleted file mode 100644 index 285b597c99..0000000000 --- a/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map +++ /dev/null @@ -1,393 +0,0 @@ -# Default kernel keymap. This uses 7 modifier combinations. -keymaps 0-2,4-5,8,12 -# Change the above line into -# keymaps 0-2,4-6,8,12 -# in case you want the entries -# altgr control keycode 83 = Boot -# altgr control keycode 111 = Boot -# below. -# -# In fact AltGr is used very little, and one more keymap can -# be saved by mapping AltGr to Alt (and adapting a few entries): -# keycode 100 = Alt -# -# Note: -# The way in which the modifiers are handled are quite different -# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel. -# -# Here, we simply pass up Fn as Control, and the german accent key -# as Altgr, and simply use a proper keymap. Said keymap is as -# follows. -# keymaps 0-2,4-5,8,12,20 -keycode 1 = Escape Escape - alt keycode 1 = Meta_Escape -keycode 2 = one exclam - alt keycode 2 = Meta_one -keycode 3 = two at at - control keycode 3 = nul - shift control keycode 3 = nul - alt keycode 3 = Meta_two -keycode 4 = three numbersign - control keycode 4 = Escape - alt keycode 4 = Meta_three -keycode 5 = four dollar dollar - control keycode 5 = Control_backslash - alt keycode 5 = Meta_four -keycode 6 = five percent - control keycode 6 = Control_bracketright - alt keycode 6 = Meta_five -keycode 7 = six asciicircum - control keycode 7 = Control_asciicircum - alt keycode 7 = Meta_six -keycode 8 = seven ampersand braceleft - control keycode 8 = Control_underscore - alt keycode 8 = Meta_seven -keycode 9 = eight asterisk bracketleft - control keycode 9 = Delete - alt keycode 9 = Meta_eight -keycode 10 = nine parenleft bracketright - alt keycode 10 = Meta_nine -keycode 11 = zero parenright braceright - alt keycode 11 = Meta_zero -keycode 12 = minus underscore backslash - control keycode 12 = Control_underscore - shift control keycode 12 = Control_underscore - alt keycode 12 = Meta_minus -keycode 13 = equal plus - alt keycode 13 = Meta_equal -keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete -keycode 14 = BackSpace - shift keycode 14 = BackSpace - control keycode 14 = Delete - shiftl control keycode 14 = bracketleft - control shiftr keycode 14 = bracketleft -keycode 15 = Tab Tab - alt keycode 15 = Meta_Tab - shift keycode 15 = backslash - control keycode 15 = Caps_Lock - shiftl control keycode 15 = Caps_Lock - control shiftr keycode 15 = Caps_Lock -keycode 16 = q - control keycode 16 = one - shiftl control keycode 16 = Control_q - control shiftr keycode 16 = Meta_q -keycode 17 = w -keycode 18 = e - altgr keycode 18 = Hex_E - control keycode 17 = two - shiftl control keycode 17 = Control_w - control shiftr keycode 17 = Meta_w -keycode 18 = e - control keycode 18 = three - shiftl control keycode 18 = Control_e - control shiftr keycode 18 = Meta_e -keycode 19 = r - control keycode 19 = four - shiftr control keycode 19 = Control_r - control shiftl keycode 19 = Meta_r -keycode 20 = t - control keycode 20 = five - shiftl control keycode 20 = Control_t - control shiftr keycode 20 = Meta_t -keycode 21 = y - control keycode 21 = six - shiftl control keycode 21 = Control_y - control shiftr keycode 21 = Meta_y -keycode 22 = u - control keycode 22 = seven - shiftl control keycode 22 = Control_u - control shiftr keycode 22 = Meta_u -keycode 23 = i - control keycode 23 = eight - shiftl control keycode 23 = Control_i - control shiftr keycode 23 = Meta_i -keycode 24 = o - control keycode 24 = nine - shiftl control keycode 24 = Control_o - control shiftr keycode 24 = Meta_o -keycode 25 = p -keycode 26 = bracketleft braceleft - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -keycode 27 = bracketright braceright asciitilde - control keycode 27 = Control_bracketright - alt keycode 27 = Meta_bracketright - control keycode 25 = zero - shiftl control keycode 25 = Control_p - control shiftr keycode 25 = Meta_p -keycode 28 = Return - alt keycode 28 = Meta_Control_m - control keycode 28 = greater - shiftl control keycode 28 = braceright - control shiftr keycode 28 = braceright -keycode 29 = Control -keycode 30 = a - altgr keycode 30 = Hex_A -keycode 30 = a - control keycode 30 = exclam - shiftl control keycode 30 = Control_a - control shiftr keycode 30 = Meta_a -keycode 31 = s -keycode 32 = d - altgr keycode 32 = Hex_D -keycode 33 = f - altgr keycode 33 = Hex_F - control keycode 31 = at - shiftl control keycode 31 = Control_s - control shiftr keycode 31 = Meta_s -keycode 32 = d - control keycode 32 = numbersign - shiftl control keycode 32 = Control_d - control shiftr keycode 32 = Meta_d -keycode 33 = f - control keycode 33 = dollar - shiftl control keycode 33 = Control_f - control shiftr keycode 33 = Meta_f -keycode 34 = g - control keycode 34 = percent - shiftl control keycode 34 = Control_g - control shiftr keycode 34 = Meta_g -keycode 35 = h - control keycode 35 = underscore - shiftl control keycode 35 = BackSpace - control shiftr keycode 35 = BackSpace -keycode 36 = j - control keycode 36 = ampersand - shiftl control keycode 36 = Linefeed - control shiftr keycode 36 = Linefeed -keycode 37 = k - control keycode 37 = asterisk - shiftl control keycode 37 = Control_k - control shiftr keycode 37 = Meta_k -keycode 38 = l -keycode 39 = semicolon colon - alt keycode 39 = Meta_semicolon -keycode 40 = apostrophe quotedbl - control keycode 40 = Control_g - alt keycode 40 = Meta_apostrophe -keycode 41 = grave asciitilde - control keycode 41 = nul - alt keycode 41 = Meta_grave - control keycode 38 = parenleft - shiftl control keycode 38 = Control_l - control shiftr keycode 38 = Meta_l -keycode 40 = apostrophe quotedbl - control keycode 40 = asciitilde - shiftl control keycode 40 = asciicircum - control shiftr keycode 40 = asciicircum -keycode 42 = Shift -keycode 43 = backslash bar - control keycode 43 = Control_backslash - alt keycode 43 = Meta_backslash -keycode 44 = z - control keycode 44 = Control_z - shiftl control keycode 44 = Control_z - control shiftr keycode 44 = Meta_z -keycode 45 = x -keycode 46 = c - altgr keycode 46 = Hex_C - control keycode 45 = Control_x - shiftl control keycode 45 = Control_x - control shiftr keycode 45 = Meta_x -keycode 46 = c - control keycode 46 = Control_c - shiftl control keycode 46 = Control_c - control shiftr keycode 46 = Meta_c -keycode 47 = v -keycode 48 = b - altgr keycode 48 = Hex_B - control keycode 47 = Control_v - shiftl control keycode 47 = Control_v - control shiftr keycode 47 = Meta_v -## current location ## -keycode 48 = b - control keycode 48 = minus - shiftl control keycode 48 = Control_b - control shiftr keycode 48 = Meta_b -keycode 49 = n - control keycode 49 = plus - shiftl control keycode 49 = Control_n - control shiftr keycode 49 = Meta_n -keycode 50 = m -keycode 51 = comma less - alt keycode 51 = Meta_comma -keycode 52 = period greater - control keycode 52 = Compose - alt keycode 52 = Meta_period -keycode 53 = slash question - control keycode 53 = Delete - alt keycode 53 = Meta_slash - control keycode 50 = equal - shiftl control keycode 50 = Control_m - control shiftr keycode 50 = Meta_m -keycode 51 = comma - shift keycode 51 = semicolon - control keycode 51 = parenright - shiftl control keycode 51 = bracketright - control shiftr keycode 51 = bracketright -keycode 52 = period - shift keycode 52 = colon - control keycode 52 = less - shiftl control keycode 52 = braceleft - control shiftr keycode 52 = braceleft -keycode 53 = slash - shift keycode 53 = question - control keycode 53 = Num_Lock - shiftl control keycode 53 = Num_Lock - control shiftr keycode 53 = Num_Lock -keycode 54 = Shift -keycode 55 = KP_Multiply -keycode 56 = Alt -keycode 57 = space space - control keycode 57 = nul - alt keycode 57 = Meta_space -keycode 58 = Caps_Lock -keycode 59 = F1 F11 Console_13 - control keycode 59 = F1 - alt keycode 59 = Console_1 - control alt keycode 59 = Console_1 -keycode 60 = F2 F12 Console_14 - control keycode 60 = F2 - alt keycode 60 = Console_2 - control alt keycode 60 = Console_2 -keycode 61 = F3 F13 Console_15 - control keycode 61 = F3 - alt keycode 61 = Console_3 - control alt keycode 61 = Console_3 -keycode 62 = F4 F14 Console_16 - control keycode 62 = F4 - alt keycode 62 = Console_4 - control alt keycode 62 = Console_4 -keycode 63 = F5 F15 Console_17 - control keycode 63 = F5 - alt keycode 63 = Console_5 - control alt keycode 63 = Console_5 -keycode 64 = F6 F16 Console_18 - control keycode 64 = F6 - alt keycode 64 = Console_6 - control alt keycode 64 = Console_6 -keycode 65 = F7 F17 Console_19 - control keycode 65 = F7 - alt keycode 65 = Console_7 - control alt keycode 65 = Console_7 -keycode 66 = F8 F18 Console_20 - control keycode 66 = F8 - alt keycode 66 = Console_8 - control alt keycode 66 = Console_8 -keycode 67 = F9 F19 Console_21 - control keycode 67 = F9 - alt keycode 67 = Console_9 - control alt keycode 67 = Console_9 -keycode 68 = F10 F20 Console_22 - control keycode 68 = F10 - alt keycode 68 = Console_10 - control alt keycode 68 = Console_10 -keycode 69 = Num_Lock - shift keycode 69 = Bare_Num_Lock -keycode 70 = Scroll_Lock Show_Memory Show_Registers - control keycode 70 = Show_State - alt keycode 70 = Scroll_Lock -keycode 71 = KP_7 - alt keycode 71 = Ascii_7 - altgr keycode 71 = Hex_7 -keycode 72 = KP_8 - alt keycode 72 = Ascii_8 - altgr keycode 72 = Hex_8 -keycode 73 = KP_9 - alt keycode 73 = Ascii_9 - altgr keycode 73 = Hex_9 -keycode 74 = KP_Subtract -keycode 75 = KP_4 - alt keycode 75 = Ascii_4 - altgr keycode 75 = Hex_4 -keycode 76 = KP_5 - alt keycode 76 = Ascii_5 - altgr keycode 76 = Hex_5 -keycode 77 = KP_6 - alt keycode 77 = Ascii_6 - altgr keycode 77 = Hex_6 -keycode 78 = KP_Add -keycode 79 = KP_1 - alt keycode 79 = Ascii_1 - altgr keycode 79 = Hex_1 -keycode 80 = KP_2 - alt keycode 80 = Ascii_2 - altgr keycode 80 = Hex_2 -keycode 81 = KP_3 - alt keycode 81 = Ascii_3 - altgr keycode 81 = Hex_3 -keycode 82 = KP_0 - alt keycode 82 = Ascii_0 - altgr keycode 82 = Hex_0 -keycode 83 = KP_Period -# altgr control keycode 83 = Boot - control alt keycode 83 = Boot -keycode 84 = Last_Console -keycode 85 = -keycode 86 = less greater bar - alt keycode 86 = Meta_less -keycode 87 = F11 F11 Console_23 - control keycode 87 = F11 - alt keycode 87 = Console_11 - control alt keycode 87 = Console_11 -keycode 88 = F12 F12 Console_24 - control keycode 88 = F12 - alt keycode 88 = Console_12 - control alt keycode 88 = Console_12 -keycode 89 = -keycode 90 = -keycode 91 = -keycode 92 = -keycode 93 = -keycode 94 = -keycode 95 = -keycode 96 = KP_Enter -keycode 57 = space - shift keycode 57 = bar - control keycode 57 = nul - shiftl control keycode 57 = grave - control shiftr keycode 57 = grave -keycode 97 = Control -keycode 98 = KP_Divide -keycode 99 = Control_backslash - control keycode 99 = Control_backslash - alt keycode 99 = Control_backslash -keycode 100 = AltGr -keycode 101 = Break -keycode 102 = Find -keycode 103 = Up -keycode 104 = Prior - shift keycode 104 = Scroll_Backward -keycode 105 = Left - alt keycode 105 = Decr_Console -keycode 106 = Right - alt keycode 106 = Incr_Console -keycode 107 = Select -keycode 108 = Down -keycode 109 = Next - shift keycode 109 = Scroll_Forward -keycode 110 = Insert -keycode 111 = Remove -# altgr control keycode 111 = Boot - control alt keycode 111 = Boot -keycode 112 = Macro -keycode 113 = F13 -keycode 114 = F14 -keycode 115 = Help -keycode 116 = Do -keycode 117 = F17 -keycode 118 = KP_MinPlus -keycode 119 = Pause -keycode 120 = -keycode 121 = -keycode 122 = -keycode 123 = -keycode 124 = -keycode 125 = -keycode 126 = -keycode 127 = -string F1 = "\033[[A" -string F2 = "\033[[B" -string F3 = "\033[[C" diff --git a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map b/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map deleted file mode 100644 index 285b597c99..0000000000 --- a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map +++ /dev/null @@ -1,393 +0,0 @@ -# Default kernel keymap. This uses 7 modifier combinations. -keymaps 0-2,4-5,8,12 -# Change the above line into -# keymaps 0-2,4-6,8,12 -# in case you want the entries -# altgr control keycode 83 = Boot -# altgr control keycode 111 = Boot -# below. -# -# In fact AltGr is used very little, and one more keymap can -# be saved by mapping AltGr to Alt (and adapting a few entries): -# keycode 100 = Alt -# -# Note: -# The way in which the modifiers are handled are quite different -# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel. -# -# Here, we simply pass up Fn as Control, and the german accent key -# as Altgr, and simply use a proper keymap. Said keymap is as -# follows. -# keymaps 0-2,4-5,8,12,20 -keycode 1 = Escape Escape - alt keycode 1 = Meta_Escape -keycode 2 = one exclam - alt keycode 2 = Meta_one -keycode 3 = two at at - control keycode 3 = nul - shift control keycode 3 = nul - alt keycode 3 = Meta_two -keycode 4 = three numbersign - control keycode 4 = Escape - alt keycode 4 = Meta_three -keycode 5 = four dollar dollar - control keycode 5 = Control_backslash - alt keycode 5 = Meta_four -keycode 6 = five percent - control keycode 6 = Control_bracketright - alt keycode 6 = Meta_five -keycode 7 = six asciicircum - control keycode 7 = Control_asciicircum - alt keycode 7 = Meta_six -keycode 8 = seven ampersand braceleft - control keycode 8 = Control_underscore - alt keycode 8 = Meta_seven -keycode 9 = eight asterisk bracketleft - control keycode 9 = Delete - alt keycode 9 = Meta_eight -keycode 10 = nine parenleft bracketright - alt keycode 10 = Meta_nine -keycode 11 = zero parenright braceright - alt keycode 11 = Meta_zero -keycode 12 = minus underscore backslash - control keycode 12 = Control_underscore - shift control keycode 12 = Control_underscore - alt keycode 12 = Meta_minus -keycode 13 = equal plus - alt keycode 13 = Meta_equal -keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete -keycode 14 = BackSpace - shift keycode 14 = BackSpace - control keycode 14 = Delete - shiftl control keycode 14 = bracketleft - control shiftr keycode 14 = bracketleft -keycode 15 = Tab Tab - alt keycode 15 = Meta_Tab - shift keycode 15 = backslash - control keycode 15 = Caps_Lock - shiftl control keycode 15 = Caps_Lock - control shiftr keycode 15 = Caps_Lock -keycode 16 = q - control keycode 16 = one - shiftl control keycode 16 = Control_q - control shiftr keycode 16 = Meta_q -keycode 17 = w -keycode 18 = e - altgr keycode 18 = Hex_E - control keycode 17 = two - shiftl control keycode 17 = Control_w - control shiftr keycode 17 = Meta_w -keycode 18 = e - control keycode 18 = three - shiftl control keycode 18 = Control_e - control shiftr keycode 18 = Meta_e -keycode 19 = r - control keycode 19 = four - shiftr control keycode 19 = Control_r - control shiftl keycode 19 = Meta_r -keycode 20 = t - control keycode 20 = five - shiftl control keycode 20 = Control_t - control shiftr keycode 20 = Meta_t -keycode 21 = y - control keycode 21 = six - shiftl control keycode 21 = Control_y - control shiftr keycode 21 = Meta_y -keycode 22 = u - control keycode 22 = seven - shiftl control keycode 22 = Control_u - control shiftr keycode 22 = Meta_u -keycode 23 = i - control keycode 23 = eight - shiftl control keycode 23 = Control_i - control shiftr keycode 23 = Meta_i -keycode 24 = o - control keycode 24 = nine - shiftl control keycode 24 = Control_o - control shiftr keycode 24 = Meta_o -keycode 25 = p -keycode 26 = bracketleft braceleft - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -keycode 27 = bracketright braceright asciitilde - control keycode 27 = Control_bracketright - alt keycode 27 = Meta_bracketright - control keycode 25 = zero - shiftl control keycode 25 = Control_p - control shiftr keycode 25 = Meta_p -keycode 28 = Return - alt keycode 28 = Meta_Control_m - control keycode 28 = greater - shiftl control keycode 28 = braceright - control shiftr keycode 28 = braceright -keycode 29 = Control -keycode 30 = a - altgr keycode 30 = Hex_A -keycode 30 = a - control keycode 30 = exclam - shiftl control keycode 30 = Control_a - control shiftr keycode 30 = Meta_a -keycode 31 = s -keycode 32 = d - altgr keycode 32 = Hex_D -keycode 33 = f - altgr keycode 33 = Hex_F - control keycode 31 = at - shiftl control keycode 31 = Control_s - control shiftr keycode 31 = Meta_s -keycode 32 = d - control keycode 32 = numbersign - shiftl control keycode 32 = Control_d - control shiftr keycode 32 = Meta_d -keycode 33 = f - control keycode 33 = dollar - shiftl control keycode 33 = Control_f - control shiftr keycode 33 = Meta_f -keycode 34 = g - control keycode 34 = percent - shiftl control keycode 34 = Control_g - control shiftr keycode 34 = Meta_g -keycode 35 = h - control keycode 35 = underscore - shiftl control keycode 35 = BackSpace - control shiftr keycode 35 = BackSpace -keycode 36 = j - control keycode 36 = ampersand - shiftl control keycode 36 = Linefeed - control shiftr keycode 36 = Linefeed -keycode 37 = k - control keycode 37 = asterisk - shiftl control keycode 37 = Control_k - control shiftr keycode 37 = Meta_k -keycode 38 = l -keycode 39 = semicolon colon - alt keycode 39 = Meta_semicolon -keycode 40 = apostrophe quotedbl - control keycode 40 = Control_g - alt keycode 40 = Meta_apostrophe -keycode 41 = grave asciitilde - control keycode 41 = nul - alt keycode 41 = Meta_grave - control keycode 38 = parenleft - shiftl control keycode 38 = Control_l - control shiftr keycode 38 = Meta_l -keycode 40 = apostrophe quotedbl - control keycode 40 = asciitilde - shiftl control keycode 40 = asciicircum - control shiftr keycode 40 = asciicircum -keycode 42 = Shift -keycode 43 = backslash bar - control keycode 43 = Control_backslash - alt keycode 43 = Meta_backslash -keycode 44 = z - control keycode 44 = Control_z - shiftl control keycode 44 = Control_z - control shiftr keycode 44 = Meta_z -keycode 45 = x -keycode 46 = c - altgr keycode 46 = Hex_C - control keycode 45 = Control_x - shiftl control keycode 45 = Control_x - control shiftr keycode 45 = Meta_x -keycode 46 = c - control keycode 46 = Control_c - shiftl control keycode 46 = Control_c - control shiftr keycode 46 = Meta_c -keycode 47 = v -keycode 48 = b - altgr keycode 48 = Hex_B - control keycode 47 = Control_v - shiftl control keycode 47 = Control_v - control shiftr keycode 47 = Meta_v -## current location ## -keycode 48 = b - control keycode 48 = minus - shiftl control keycode 48 = Control_b - control shiftr keycode 48 = Meta_b -keycode 49 = n - control keycode 49 = plus - shiftl control keycode 49 = Control_n - control shiftr keycode 49 = Meta_n -keycode 50 = m -keycode 51 = comma less - alt keycode 51 = Meta_comma -keycode 52 = period greater - control keycode 52 = Compose - alt keycode 52 = Meta_period -keycode 53 = slash question - control keycode 53 = Delete - alt keycode 53 = Meta_slash - control keycode 50 = equal - shiftl control keycode 50 = Control_m - control shiftr keycode 50 = Meta_m -keycode 51 = comma - shift keycode 51 = semicolon - control keycode 51 = parenright - shiftl control keycode 51 = bracketright - control shiftr keycode 51 = bracketright -keycode 52 = period - shift keycode 52 = colon - control keycode 52 = less - shiftl control keycode 52 = braceleft - control shiftr keycode 52 = braceleft -keycode 53 = slash - shift keycode 53 = question - control keycode 53 = Num_Lock - shiftl control keycode 53 = Num_Lock - control shiftr keycode 53 = Num_Lock -keycode 54 = Shift -keycode 55 = KP_Multiply -keycode 56 = Alt -keycode 57 = space space - control keycode 57 = nul - alt keycode 57 = Meta_space -keycode 58 = Caps_Lock -keycode 59 = F1 F11 Console_13 - control keycode 59 = F1 - alt keycode 59 = Console_1 - control alt keycode 59 = Console_1 -keycode 60 = F2 F12 Console_14 - control keycode 60 = F2 - alt keycode 60 = Console_2 - control alt keycode 60 = Console_2 -keycode 61 = F3 F13 Console_15 - control keycode 61 = F3 - alt keycode 61 = Console_3 - control alt keycode 61 = Console_3 -keycode 62 = F4 F14 Console_16 - control keycode 62 = F4 - alt keycode 62 = Console_4 - control alt keycode 62 = Console_4 -keycode 63 = F5 F15 Console_17 - control keycode 63 = F5 - alt keycode 63 = Console_5 - control alt keycode 63 = Console_5 -keycode 64 = F6 F16 Console_18 - control keycode 64 = F6 - alt keycode 64 = Console_6 - control alt keycode 64 = Console_6 -keycode 65 = F7 F17 Console_19 - control keycode 65 = F7 - alt keycode 65 = Console_7 - control alt keycode 65 = Console_7 -keycode 66 = F8 F18 Console_20 - control keycode 66 = F8 - alt keycode 66 = Console_8 - control alt keycode 66 = Console_8 -keycode 67 = F9 F19 Console_21 - control keycode 67 = F9 - alt keycode 67 = Console_9 - control alt keycode 67 = Console_9 -keycode 68 = F10 F20 Console_22 - control keycode 68 = F10 - alt keycode 68 = Console_10 - control alt keycode 68 = Console_10 -keycode 69 = Num_Lock - shift keycode 69 = Bare_Num_Lock -keycode 70 = Scroll_Lock Show_Memory Show_Registers - control keycode 70 = Show_State - alt keycode 70 = Scroll_Lock -keycode 71 = KP_7 - alt keycode 71 = Ascii_7 - altgr keycode 71 = Hex_7 -keycode 72 = KP_8 - alt keycode 72 = Ascii_8 - altgr keycode 72 = Hex_8 -keycode 73 = KP_9 - alt keycode 73 = Ascii_9 - altgr keycode 73 = Hex_9 -keycode 74 = KP_Subtract -keycode 75 = KP_4 - alt keycode 75 = Ascii_4 - altgr keycode 75 = Hex_4 -keycode 76 = KP_5 - alt keycode 76 = Ascii_5 - altgr keycode 76 = Hex_5 -keycode 77 = KP_6 - alt keycode 77 = Ascii_6 - altgr keycode 77 = Hex_6 -keycode 78 = KP_Add -keycode 79 = KP_1 - alt keycode 79 = Ascii_1 - altgr keycode 79 = Hex_1 -keycode 80 = KP_2 - alt keycode 80 = Ascii_2 - altgr keycode 80 = Hex_2 -keycode 81 = KP_3 - alt keycode 81 = Ascii_3 - altgr keycode 81 = Hex_3 -keycode 82 = KP_0 - alt keycode 82 = Ascii_0 - altgr keycode 82 = Hex_0 -keycode 83 = KP_Period -# altgr control keycode 83 = Boot - control alt keycode 83 = Boot -keycode 84 = Last_Console -keycode 85 = -keycode 86 = less greater bar - alt keycode 86 = Meta_less -keycode 87 = F11 F11 Console_23 - control keycode 87 = F11 - alt keycode 87 = Console_11 - control alt keycode 87 = Console_11 -keycode 88 = F12 F12 Console_24 - control keycode 88 = F12 - alt keycode 88 = Console_12 - control alt keycode 88 = Console_12 -keycode 89 = -keycode 90 = -keycode 91 = -keycode 92 = -keycode 93 = -keycode 94 = -keycode 95 = -keycode 96 = KP_Enter -keycode 57 = space - shift keycode 57 = bar - control keycode 57 = nul - shiftl control keycode 57 = grave - control shiftr keycode 57 = grave -keycode 97 = Control -keycode 98 = KP_Divide -keycode 99 = Control_backslash - control keycode 99 = Control_backslash - alt keycode 99 = Control_backslash -keycode 100 = AltGr -keycode 101 = Break -keycode 102 = Find -keycode 103 = Up -keycode 104 = Prior - shift keycode 104 = Scroll_Backward -keycode 105 = Left - alt keycode 105 = Decr_Console -keycode 106 = Right - alt keycode 106 = Incr_Console -keycode 107 = Select -keycode 108 = Down -keycode 109 = Next - shift keycode 109 = Scroll_Forward -keycode 110 = Insert -keycode 111 = Remove -# altgr control keycode 111 = Boot - control alt keycode 111 = Boot -keycode 112 = Macro -keycode 113 = F13 -keycode 114 = F14 -keycode 115 = Help -keycode 116 = Do -keycode 117 = F17 -keycode 118 = KP_MinPlus -keycode 119 = Pause -keycode 120 = -keycode 121 = -keycode 122 = -keycode 123 = -keycode 124 = -keycode 125 = -keycode 126 = -keycode 127 = -string F1 = "\033[[A" -string F2 = "\033[[B" -string F3 = "\033[[C" diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index 99a469d576..bf498084e4 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -85,8 +85,10 @@ apply_cfgfile() { echo "Cannot create link over existing -${TNAME}-." >&2 } || { TSOURCE=`echo ${LINE} | cut -d " " -f 6` - [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." - ln -s "${TSOURCE}" "${TNAME}" + [ -L "${TNAME}" ] || { + [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." + ln -s "${TSOURCE}" "${TNAME}" + } } continue } diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map deleted file mode 100644 index e6339979e8..0000000000 --- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map +++ /dev/null @@ -1,128 +0,0 @@ -keymaps 0-2,4-5,8 -keycode 1 = +a +A +a Control_a Control_a -keycode 2 = +b +B underscore Control_b Control_b -keycode 3 = +c +C +c Control_c Control_c -keycode 4 = +d +D +d Control_d Control_d -keycode 5 = +e +E equal Control_e Control_e -keycode 6 = +f +F backslash Control_f Control_f -keycode 7 = +g +G semicolon Control_g Control_g -keycode 8 = +h +H colon BackSpace BackSpace -keycode 9 = +i +I +i Tab Tab -keycode 10 = +j +J asterisk Linefeed Linefeed -keycode 11 = +k +K backslash Control_k Control_k -keycode 12 = +l +L bar Control_l Control_l -keycode 13 = +m +M +m Control_m Control_m -keycode 14 = +n +N +n Control_n Control_n -keycode 15 = +o +O +o Control_o Control_o -keycode 16 = +p +P +p Control_p Control_p -keycode 17 = +q +Q +q Control_q Control_q -keycode 18 = +r +R plus Control_r Control_r -keycode 19 = +s +S +s Control_s Control_s -keycode 20 = +t +T bracketleft Control_t Control_t -keycode 21 = +u +U +u Control_u Control_u -keycode 22 = +v +V +v Control_v Control_v -keycode 23 = +w +W asciicircum Control_w Control_w -keycode 24 = +x +X +x Control_x Control_x -keycode 25 = +y +Y bracketright Control_y Control_y -keycode 26 = +z +Z +z Control_z Control_z -keycode 27 = Shift Shift Shift Shift Shift -keycode 28 = Return Return Return Return Return -keycode 29 = F11 F11 F11 F11 F11 -keycode 30 = AltGr AltGr AltGr AltGr AltGr -keycode 31 = BackSpace BackSpace Delete BackSpace BackSpace -keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock -keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 34 = Escape Escape Escape Escape Escape -keycode 35 = Left Left Left Left Left Decr_Console -keycode 36 = Up Up PageUp Up Up -keycode 37 = Down Down PageDown Down Down -keycode 38 = Right Right Right Right Right Incr_Console -keycode 39 = Return Return Return Return Return -keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1 -keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2 -keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3 -keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4 -keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5 -keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol -keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol -keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol -keycode 49 = nine parenright VoidSymbol VoidSymbol VoidSymbol -keycode 50 = zero asciitilde VoidSymbol VoidSymbol VoidSymbol -keycode 51 = minus equal VoidSymbol VoidSymbol VoidSymbol -keycode 52 = asciicircum asciitilde VoidSymbol VoidSymbol VoidSymbol -keycode 53 = backslash bar VoidSymbol VoidSymbol VoidSymbol -keycode 54 = bracketleft braceleft VoidSymbol VoidSymbol VoidSymbol -keycode 55 = at grave VoidSymbol VoidSymbol VoidSymbol -keycode 56 = Control Control Control Control Control -keycode 57 = Alt Alt Alt Alt Alt -keycode 58 = Control Control Control Control Control -keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol -keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock -keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 63 = comma slash less VoidSymbol VoidSymbol -keycode 64 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 65 = Tab Tab Caps_Lock Tab Tab -keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1 -keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2 -keycode 73 = KP_3 KP_3 KP_3 KP_3 KP_3 -keycode 74 = KP_4 KP_4 KP_4 KP_4 KP_4 -keycode 75 = KP_5 KP_5 KP_5 KP_5 KP_5 -keycode 76 = KP_6 KP_6 KP_6 KP_6 KP_6 -keycode 77 = KP_7 KP_7 KP_7 KP_7 KP_7 -keycode 78 = KP_8 KP_8 KP_8 KP_8 KP_8 -keycode 79 = KP_9 KP_9 KP_9 KP_9 KP_9 -keycode 80 = KP_0 KP_0 KP_0 KP_0 KP_0 -keycode 81 = Delete Delete Delete Delete Delete -keycode 82 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide -keycode 83 = KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply -keycode 84 = Return Return Return Return Return -keycode 85 = KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract -keycode 86 = KP_Add KP_Add KP_Add KP_Add KP_Add -keycode 87 = KP_Enter KP_Enter KP_Enter KP_Enter KP_Enter -keycode 88 = F9 F9 F9 F9 F9 -keycode 89 = F10 F10 F10 F10 F10 -keycode 90 = F13 F13 F13 F13 F13 -keycode 91 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 92 = space space space space space -keycode 93 = KP_Period KP_Period KP_Period KP_Period KP_Period -keycode 94 = Escape Escape Escape Escape -keycode 95 = semicolon plus VoidSymbol VoidSymbol VoidSymbol -keycode 96 = colon asterisk VoidSymbol VoidSymbol VoidSymbol -keycode 97 = bracketright braceright VoidSymbol VoidSymbol VoidSymbol -keycode 98 = comma less VoidSymbol VoidSymbol VoidSymbol -keycode 99 = period greater VoidSymbol VoidSymbol VoidSymbol -keycode 100 = slash question VoidSymbol VoidSymbol VoidSymbol -keycode 101 = underscore underscore VoidSymbol VoidSymbol VoidSymbol -keycode 102 = F15 VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 103 = period question greater VoidSymbol VoidSymbol -keycode 104 = Find Find Find Find Find -keycode 105 = Select Select Select Select Select -keycode 106 = Prior Scroll_Backward Prior Prior Prior -keycode 107 = Next Scroll_Forward Next Next Next -keycode 108 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 109 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 110 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 111 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 112 = Shift Shift Shift Shift Shift -keycode 113 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 114 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 115 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 116 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 117 = Control Control Control Control Control -keycode 118 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 119 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 120 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 121 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 122 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 123 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 124 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -keycode 125 = Up Up Up Up -keycode 126 = Down Down Down Down -keycode 127 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map deleted file mode 100644 index 6fc3a9a9cf..0000000000 --- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map +++ /dev/null @@ -1,213 +0,0 @@ -# Default kernel keymap. This uses 7 modifier combinations. -keymaps 0-2,4-5,8,12 -# Change the above line into -# keymaps 0-2,4-6,8,12 -# in case you want the entries -# altgr control keycode 83 = Boot -# altgr control keycode 111 = Boot -# below. -# -keycode 1 = -keycode 2 = one exclam - control alt keycode 2 = Console_1 -keycode 3 = two quotedbl - control alt keycode 3 = Console_2 -keycode 4 = three numbersign - control alt keycode 4 = Console_3 -keycode 5 = four dollar - control alt keycode 5 = Console_4 -keycode 6 = five percent - control alt keycode 6 = Console_5 -keycode 7 = six ampersand - control alt keycode 7 = Console_6 -keycode 8 = seven apostrophe -keycode 9 = eight parenleft -keycode 10 = nine parenright -keycode 11 = zero asciitilde -keycode 12 = minus at - altgr keycode 12 = at -keycode 13 = -keycode 14 = BackSpace - altgr keycode 14 = Delete -keycode 15 = Tab - altgr keycode 15 = Caps_Lock -keycode 16 = q -keycode 17 = w - altgr keycode 17 = asciicircum -keycode 18 = e - altgr keycode 18 = equal -keycode 19 = r - altgr keycode 19 = plus -keycode 20 = t - altgr keycode 20 = bracketleft -keycode 21 = y - altgr keycode 21 = bracketright -keycode 22 = u - altgr keycode 22 = braceleft -keycode 23 = i - altgr keycode 23 = braceright -keycode 24 = o -keycode 25 = p -keycode 26 = -keycode 27 = -keycode 28 = Return -keycode 29 = Control -keycode 30 = a -keycode 31 = s -keycode 32 = d -keycode 33 = f - altgr keycode 33 = backslash -keycode 34 = g - altgr keycode 34 = semicolon -keycode 35 = h - altgr keycode 35 = colon -keycode 36 = j - altgr keycode 36 = asterisk -keycode 37 = k - altgr keycode 37 = backslash -keycode 38 = l - altgr keycode 38 = bar -keycode 39 = -keycode 40 = -keycode 41 = -keycode 42 = Shift -keycode 43 = -keycode 44 = z -keycode 45 = x -keycode 46 = c -keycode 47 = v -keycode 48 = b - altgr keycode 48 = underscore -keycode 49 = n -keycode 50 = m -keycode 51 = comma slash - altgr keycode 51 = less -keycode 52 = period question - altgr keycode 52 = greater -keycode 53 = -keycode 54 = Shift -keycode 55 = -keycode 56 = Alt -keycode 57 = space space - control keycode 57 = nul -keycode 59 = F9 -keycode 60 = F10 -keycode 61 = AltGr -keycode 62 = Escape -keycode 63 = Return -keycode 64 = Escape -keycode 65 = Down -keycode 66 = Up -keycode 67 = Control -keycode 68 = F13 -keycode 79 = F15 -keycode 80 = F16 -keycode 82 = F17 -keycode 87 = Return -keycode 88 = F11 -keycode 97 = Control -keycode 99 = F12 -keycode 103 = Up - altgr keycode 103 = PageUp -keycode 105 = Left - altgr keycode 105 = Decr_Console -keycode 106 = Right - altgr keycode 106 = Incr_Console -keycode 108 = Down - altgr keycode 108 = PageDown -string F1 = "\033[[A" -string F2 = "\033[[B" -string F3 = "\033[[C" -string F4 = "\033[[D" -string F5 = "\033[[E" -string F6 = "\033[17~" -string F7 = "\033[18~" -string F8 = "\033[19~" -string F9 = "\033[20~" -string F10 = "\033[21~" -string F11 = "\033[23~" -string F12 = "\033[24~" -string F13 = "\033[25~" -string F14 = "\033[26~" -string F15 = "\033[28~" -string F16 = "\033[29~" -string F17 = "\033[31~" -string F18 = "\033[32~" -string F19 = "\033[33~" -string F20 = "\033[34~" -string Find = "\033[1~" -string Insert = "\033[2~" -string Remove = "\033[3~" -string Select = "\033[4~" -string Prior = "\033[5~" -string Next = "\033[6~" -string Macro = "\033[M" -string Pause = "\033[P" -compose '`' 'A' to 'À' -compose '`' 'a' to 'à' -compose '\'' 'A' to 'Á' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Å' -compose 'o' 'a' to 'å' -compose '0' 'A' to 'Å' -compose '0' 'a' to 'å' -compose 'A' 'A' to 'Å' -compose 'a' 'a' to 'å' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'Ì' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Í' -compose '\'' 'i' to 'í' -compose '^' 'I' to 'Î' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ï' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ð' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ò' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ü' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ý' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index d9b93005f5..29886d0ac0 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r69" +PR = "r71" SRC_URI = "file://halt \ file://ramdisk \ @@ -31,18 +31,10 @@ SRC_URI = "file://halt \ file://sysfs.sh \ file://device_table.txt \ file://populate-volatile.sh \ - file://volatiles \ - file://keymap" + file://volatiles " SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" -SRC_URI_append_c7x0 = " file://keymap-*.map" -SRC_URI_append_tosa = " file://keymap-*.map" -SRC_URI_append_akita = " file://keymap-*.map" -SRC_URI_append_spitz = " file://keymap-*.map" -SRC_URI_append_borzoi = " file://keymap-*.map" -SRC_URI_append_collie = " file://keymap-*.map" -SRC_URI_append_poodle = " file://keymap-*.map" def read_kernel_version(d): import bb @@ -104,16 +96,6 @@ do_install () { ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S01version fi - case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle ) - install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d - ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap - install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} - ;; - *) - ;; - esac - install -m 0755 ${WORKDIR}/banner ${D}${sysconfdir}/init.d/banner install -m 0755 ${WORKDIR}/devices ${D}${sysconfdir}/init.d/devices install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index a0ffca6320..f5e1fd70be 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -8,3 +8,17 @@ key=....F11:-:~matchbox-remote -menu #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down key=...*4:-:~display-brightness.sh up + +# LCD Softkeys +# Please note that the space _between_ two softkeys can be used, too ;) +#key=....F5:-: +key=....F15:-:~matchbox-remote -next +#key=....F6:-: +key=....F16:-:sylpheed +#key=....F7:-: +key=....F17:-:gpe-contacts +#key=....F8:-: +key=....F18:-:gpe-calendar +#key=....F19:-: +#key=....F19:-: +#key=....F10:-: diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc deleted file mode 100644 index a0ffca6320..0000000000 --- a/packages/keylaunch/files/borzoi/keylaunchrc +++ /dev/null @@ -1,10 +0,0 @@ -key=....F9:-:gpe-contacts -key=....F10:-:gpe-calendar -key=....F13:-:sylpheed -key=....F12:-:~matchbox-remote -next -key=...*F12:-:~matchbox-remote -desktop -key=....F11:-:~matchbox-remote -menu -#key=...*1:-:~zoom out -#key=...*2:-:~zoom in -key=...*3:-:~display-brightness.sh down -key=...*4:-:~display-brightness.sh up diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index a0ffca6320..f5e1fd70be 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -8,3 +8,17 @@ key=....F11:-:~matchbox-remote -menu #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down key=...*4:-:~display-brightness.sh up + +# LCD Softkeys +# Please note that the space _between_ two softkeys can be used, too ;) +#key=....F5:-: +key=....F15:-:~matchbox-remote -next +#key=....F6:-: +key=....F16:-:sylpheed +#key=....F7:-: +key=....F17:-:gpe-contacts +#key=....F8:-: +key=....F18:-:gpe-calendar +#key=....F19:-: +#key=....F19:-: +#key=....F10:-: diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index a1c13188ca..26284f68ce 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r2" +PR = "r3" SRC_URI += " file://keylaunchrc" diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map deleted file mode 100644 index 0a43c8d107..0000000000 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.4-de.map +++ /dev/null @@ -1,8 +0,0 @@ -# German keymappings -shift altgr keycode 1 = +Adiaeresis -shift altgr keycode 15 = +Odiaeresis -shift altgr keycode 21 = +Udiaeresis -altgr keycode 1 = +adiaeresis -altgr keycode 15 = +odiaeresis -altgr keycode 21 = +udiaeresis -altgr keycode 19 = ssharp diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map deleted file mode 100644 index d33d4de1aa..0000000000 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map +++ /dev/null @@ -1,10 +0,0 @@ -# German keymapping -charset "iso-8859-1" -altgr keycode 24 = +odiaeresis -altgr keycode 30 = +adiaeresis -altgr keycode 22 = +udiaeresis -shift altgr keycode 24 = +Odiaeresis -shift altgr keycode 30 = +Adiaeresis -altgr shift keycode 22 = +Udiaeresis -altgr keycode 31 = ssharp - diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index e54fea1d2d..595faec89f 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -12,7 +12,6 @@ SRC_URI = "file://*.map" # be my guest =) PACKAGES_akita = "keymap-extension-de keymap-extension-fi" PACKAGES_spitz = "keymap-extension-de keymap-extension-fi" -PACKAGES_borzoi = "keymap-extension-de keymap-extension-fi" PACKAGES_c7x0 = "keymap-extension-de keymap-extension-fi" PACKAGES_collie = "keymap-extension-de keymap-extension-fi" diff --git a/packages/nonworking/pptp-linux/.mtn2git_empty b/packages/keymaps/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/pptp-linux/.mtn2git_empty +++ b/packages/keymaps/.mtn2git_empty diff --git a/packages/nonworking/pptp-linux/pptp-linux/.mtn2git_empty b/packages/keymaps/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/pptp-linux/pptp-linux/.mtn2git_empty +++ b/packages/keymaps/files/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/borzoi/.mtn2git_empty b/packages/keymaps/files/akita/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/borzoi/.mtn2git_empty +++ b/packages/keymaps/files/akita/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/keymaps/files/akita/keymap-2.4.map index e6339979e8..e6339979e8 100644 --- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map +++ b/packages/keymaps/files/akita/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map b/packages/keymaps/files/akita/keymap-2.6.map index 6fc3a9a9cf..11a0e8b4d3 100644 --- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map +++ b/packages/keymaps/files/akita/keymap-2.6.map @@ -115,6 +115,21 @@ keycode 106 = Right altgr keycode 106 = Incr_Console keycode 108 = Down altgr keycode 108 = PageDown + + +# LCD Softkeys as represented by zaurusd +keycode 82 = F5 +keycode 79 = F15 # Home +keycode 80 = F6 +keycode 81 = F16 # Email +keycode 75 = F7 +keycode 76 = F17 # Addresses +keycode 77 = F8 +keycode 71 = F18 # Calendar +keycode 72 = F9 +keycode 73 = F19 # Book +keycode 78 = F10 + string F1 = "\033[[A" string F2 = "\033[[B" string F3 = "\033[[C" diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty b/packages/keymaps/files/c7x0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty +++ b/packages/keymaps/files/c7x0/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map b/packages/keymaps/files/c7x0/keymap-2.6.map index 6fc3a9a9cf..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map +++ b/packages/keymaps/files/c7x0/keymap-2.6.map diff --git a/packages/prboom/prboom-devconfig/borzoi/.mtn2git_empty b/packages/keymaps/files/collie/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/prboom/prboom-devconfig/borzoi/.mtn2git_empty +++ b/packages/keymaps/files/collie/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map b/packages/keymaps/files/collie/keymap-2.4.map index 4cd8325bb0..4cd8325bb0 100644 --- a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map +++ b/packages/keymaps/files/collie/keymap-2.4.map diff --git a/packages/keymaps/files/collie/keymap-2.6.map b/packages/keymaps/files/collie/keymap-2.6.map new file mode 100644 index 0000000000..9aca5abb38 --- /dev/null +++ b/packages/keymaps/files/collie/keymap-2.6.map @@ -0,0 +1,262 @@ +# Note: +# The way in which the modifiers are handled are quite different +# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel. +# +# Here, we simply pass up Fn as Control, and the german accent key +# as Altgr, and simply use a proper keymap. Said keymap is as +# follows. +# keymaps 0-2,4-5,8,12,20 +keycode 1 = Escape Escape +keycode 14 = BackSpace + shift keycode 14 = BackSpace + control keycode 14 = Delete + shiftl control keycode 14 = bracketleft + control shiftr keycode 14 = bracketleft +keycode 15 = Tab Tab + shift keycode 15 = backslash + control keycode 15 = Caps_Lock + shiftl control keycode 15 = Caps_Lock + control shiftr keycode 15 = Caps_Lock +keycode 16 = q + control keycode 16 = one + shiftl control keycode 16 = Control_q + control shiftr keycode 16 = Meta_q +keycode 17 = w + control keycode 17 = two + shiftl control keycode 17 = Control_w + control shiftr keycode 17 = Meta_w +keycode 18 = e + control keycode 18 = three + shiftl control keycode 18 = Control_e + control shiftr keycode 18 = Meta_e +keycode 19 = r + control keycode 19 = four + shiftr control keycode 19 = Control_r + control shiftl keycode 19 = Meta_r +keycode 20 = t + control keycode 20 = five + shiftl control keycode 20 = Control_t + control shiftr keycode 20 = Meta_t +keycode 21 = y + control keycode 21 = six + shiftl control keycode 21 = Control_y + control shiftr keycode 21 = Meta_y +keycode 22 = u + control keycode 22 = seven + shiftl control keycode 22 = Control_u + control shiftr keycode 22 = Meta_u +keycode 23 = i + control keycode 23 = eight + shiftl control keycode 23 = Control_i + control shiftr keycode 23 = Meta_i +keycode 24 = o + control keycode 24 = nine + shiftl control keycode 24 = Control_o + control shiftr keycode 24 = Meta_o +keycode 25 = p + control keycode 25 = zero + shiftl control keycode 25 = Control_p + control shiftr keycode 25 = Meta_p +keycode 28 = Return + control keycode 28 = greater + shiftl control keycode 28 = braceright + control shiftr keycode 28 = braceright +keycode 29 = Control +keycode 30 = a + control keycode 30 = exclam + shiftl control keycode 30 = Control_a + control shiftr keycode 30 = Meta_a +keycode 31 = s + control keycode 31 = at + shiftl control keycode 31 = Control_s + control shiftr keycode 31 = Meta_s +keycode 32 = d + control keycode 32 = numbersign + shiftl control keycode 32 = Control_d + control shiftr keycode 32 = Meta_d +keycode 33 = f + control keycode 33 = dollar + shiftl control keycode 33 = Control_f + control shiftr keycode 33 = Meta_f +keycode 34 = g + control keycode 34 = percent + shiftl control keycode 34 = Control_g + control shiftr keycode 34 = Meta_g +keycode 35 = h + control keycode 35 = underscore + shiftl control keycode 35 = BackSpace + control shiftr keycode 35 = BackSpace +keycode 36 = j + control keycode 36 = ampersand + shiftl control keycode 36 = Linefeed + control shiftr keycode 36 = Linefeed +keycode 37 = k + control keycode 37 = asterisk + shiftl control keycode 37 = Control_k + control shiftr keycode 37 = Meta_k +keycode 38 = l + control keycode 38 = bracketleft + shiftl control keycode 51 = parenleft + control shiftr keycode 51 = parenleft +keycode 40 = apostrophe quotedbl + control keycode 40 = asciitilde + shiftl control keycode 40 = asciicircum + control shiftr keycode 40 = asciicircum +keycode 42 = Shift +keycode 44 = z + control keycode 44 = Control_z + shiftl control keycode 44 = Control_z + control shiftr keycode 44 = Meta_z +keycode 45 = x + control keycode 45 = Control_x + shiftl control keycode 45 = Control_x + control shiftr keycode 45 = Meta_x +keycode 46 = c + control keycode 46 = Control_c + shiftl control keycode 46 = Control_c + control shiftr keycode 46 = Meta_c +keycode 47 = v + control keycode 47 = Control_v + shiftl control keycode 47 = Control_v + control shiftr keycode 47 = Meta_v +## current location ## +keycode 48 = b + control keycode 48 = minus + shiftl control keycode 48 = Control_b + control shiftr keycode 48 = Meta_b +keycode 49 = n + control keycode 49 = plus + shiftl control keycode 49 = Control_n + control shiftr keycode 49 = Meta_n +keycode 50 = m + control keycode 50 = equal + shiftl control keycode 50 = Control_m + control shiftr keycode 50 = Meta_m +keycode 51 = comma + shift keycode 51 = semicolon + control keycode 51 = bracketright + shiftl control keycode 51 = parenright + control shiftr keycode 51 = parenright +keycode 52 = period + shift keycode 52 = colon + control keycode 52 = less + shiftl control keycode 52 = braceleft + control shiftr keycode 52 = braceleft +keycode 53 = slash + shift keycode 53 = question + control keycode 53 = Num_Lock + shiftl control keycode 53 = Num_Lock + control shiftr keycode 53 = Num_Lock +keycode 54 = Shift +keycode 55 = KP_Multiply +keycode 56 = Alt +keycode 57 = space + shift keycode 57 = bar + control keycode 57 = nul + shiftl control keycode 57 = grave + control shiftr keycode 57 = grave +keycode 97 = Control +keycode 99 = Control_backslash + control keycode 99 = Control_backslash +keycode 100 = AltGr +keycode 103 = Up +keycode 105 = Left +keycode 106 = Right +keycode 107 = Select +keycode 108 = Down +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/keymaps/files/keymap index 6ebc634266..6ebc634266 100755..100644 --- a/packages/initscripts/initscripts-1.0/keymap +++ b/packages/keymaps/files/keymap diff --git a/packages/prelink/prelink-20031029/.mtn2git_empty b/packages/keymaps/files/poodle/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/prelink/prelink-20031029/.mtn2git_empty +++ b/packages/keymaps/files/poodle/.mtn2git_empty diff --git a/packages/keymaps/files/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map new file mode 100644 index 0000000000..9aca5abb38 --- /dev/null +++ b/packages/keymaps/files/poodle/keymap-2.6.map @@ -0,0 +1,262 @@ +# Note: +# The way in which the modifiers are handled are quite different +# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel. +# +# Here, we simply pass up Fn as Control, and the german accent key +# as Altgr, and simply use a proper keymap. Said keymap is as +# follows. +# keymaps 0-2,4-5,8,12,20 +keycode 1 = Escape Escape +keycode 14 = BackSpace + shift keycode 14 = BackSpace + control keycode 14 = Delete + shiftl control keycode 14 = bracketleft + control shiftr keycode 14 = bracketleft +keycode 15 = Tab Tab + shift keycode 15 = backslash + control keycode 15 = Caps_Lock + shiftl control keycode 15 = Caps_Lock + control shiftr keycode 15 = Caps_Lock +keycode 16 = q + control keycode 16 = one + shiftl control keycode 16 = Control_q + control shiftr keycode 16 = Meta_q +keycode 17 = w + control keycode 17 = two + shiftl control keycode 17 = Control_w + control shiftr keycode 17 = Meta_w +keycode 18 = e + control keycode 18 = three + shiftl control keycode 18 = Control_e + control shiftr keycode 18 = Meta_e +keycode 19 = r + control keycode 19 = four + shiftr control keycode 19 = Control_r + control shiftl keycode 19 = Meta_r +keycode 20 = t + control keycode 20 = five + shiftl control keycode 20 = Control_t + control shiftr keycode 20 = Meta_t +keycode 21 = y + control keycode 21 = six + shiftl control keycode 21 = Control_y + control shiftr keycode 21 = Meta_y +keycode 22 = u + control keycode 22 = seven + shiftl control keycode 22 = Control_u + control shiftr keycode 22 = Meta_u +keycode 23 = i + control keycode 23 = eight + shiftl control keycode 23 = Control_i + control shiftr keycode 23 = Meta_i +keycode 24 = o + control keycode 24 = nine + shiftl control keycode 24 = Control_o + control shiftr keycode 24 = Meta_o +keycode 25 = p + control keycode 25 = zero + shiftl control keycode 25 = Control_p + control shiftr keycode 25 = Meta_p +keycode 28 = Return + control keycode 28 = greater + shiftl control keycode 28 = braceright + control shiftr keycode 28 = braceright +keycode 29 = Control +keycode 30 = a + control keycode 30 = exclam + shiftl control keycode 30 = Control_a + control shiftr keycode 30 = Meta_a +keycode 31 = s + control keycode 31 = at + shiftl control keycode 31 = Control_s + control shiftr keycode 31 = Meta_s +keycode 32 = d + control keycode 32 = numbersign + shiftl control keycode 32 = Control_d + control shiftr keycode 32 = Meta_d +keycode 33 = f + control keycode 33 = dollar + shiftl control keycode 33 = Control_f + control shiftr keycode 33 = Meta_f +keycode 34 = g + control keycode 34 = percent + shiftl control keycode 34 = Control_g + control shiftr keycode 34 = Meta_g +keycode 35 = h + control keycode 35 = underscore + shiftl control keycode 35 = BackSpace + control shiftr keycode 35 = BackSpace +keycode 36 = j + control keycode 36 = ampersand + shiftl control keycode 36 = Linefeed + control shiftr keycode 36 = Linefeed +keycode 37 = k + control keycode 37 = asterisk + shiftl control keycode 37 = Control_k + control shiftr keycode 37 = Meta_k +keycode 38 = l + control keycode 38 = bracketleft + shiftl control keycode 51 = parenleft + control shiftr keycode 51 = parenleft +keycode 40 = apostrophe quotedbl + control keycode 40 = asciitilde + shiftl control keycode 40 = asciicircum + control shiftr keycode 40 = asciicircum +keycode 42 = Shift +keycode 44 = z + control keycode 44 = Control_z + shiftl control keycode 44 = Control_z + control shiftr keycode 44 = Meta_z +keycode 45 = x + control keycode 45 = Control_x + shiftl control keycode 45 = Control_x + control shiftr keycode 45 = Meta_x +keycode 46 = c + control keycode 46 = Control_c + shiftl control keycode 46 = Control_c + control shiftr keycode 46 = Meta_c +keycode 47 = v + control keycode 47 = Control_v + shiftl control keycode 47 = Control_v + control shiftr keycode 47 = Meta_v +## current location ## +keycode 48 = b + control keycode 48 = minus + shiftl control keycode 48 = Control_b + control shiftr keycode 48 = Meta_b +keycode 49 = n + control keycode 49 = plus + shiftl control keycode 49 = Control_n + control shiftr keycode 49 = Meta_n +keycode 50 = m + control keycode 50 = equal + shiftl control keycode 50 = Control_m + control shiftr keycode 50 = Meta_m +keycode 51 = comma + shift keycode 51 = semicolon + control keycode 51 = bracketright + shiftl control keycode 51 = parenright + control shiftr keycode 51 = parenright +keycode 52 = period + shift keycode 52 = colon + control keycode 52 = less + shiftl control keycode 52 = braceleft + control shiftr keycode 52 = braceleft +keycode 53 = slash + shift keycode 53 = question + control keycode 53 = Num_Lock + shiftl control keycode 53 = Num_Lock + control shiftr keycode 53 = Num_Lock +keycode 54 = Shift +keycode 55 = KP_Multiply +keycode 56 = Alt +keycode 57 = space + shift keycode 57 = bar + control keycode 57 = nul + shiftl control keycode 57 = grave + control shiftr keycode 57 = grave +keycode 97 = Control +keycode 99 = Control_backslash + control keycode 99 = Control_backslash +keycode 100 = AltGr +keycode 103 = Up +keycode 105 = Left +keycode 106 = Right +keycode 107 = Select +keycode 108 = Down +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/prelink/prelink-20040304/.mtn2git_empty b/packages/keymaps/files/spitz/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/prelink/prelink-20040304/.mtn2git_empty +++ b/packages/keymaps/files/spitz/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/keymaps/files/spitz/keymap-2.4.map index e6339979e8..e6339979e8 100644 --- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map +++ b/packages/keymaps/files/spitz/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/keymaps/files/spitz/keymap-2.6.map index 6fc3a9a9cf..11a0e8b4d3 100755..100644 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/keymaps/files/spitz/keymap-2.6.map @@ -115,6 +115,21 @@ keycode 106 = Right altgr keycode 106 = Incr_Console keycode 108 = Down altgr keycode 108 = PageDown + + +# LCD Softkeys as represented by zaurusd +keycode 82 = F5 +keycode 79 = F15 # Home +keycode 80 = F6 +keycode 81 = F16 # Email +keycode 75 = F7 +keycode 76 = F17 # Addresses +keycode 77 = F8 +keycode 71 = F18 # Calendar +keycode 72 = F9 +keycode 73 = F19 # Book +keycode 78 = F10 + string F1 = "\033[[A" string F2 = "\033[[B" string F3 = "\033[[C" diff --git a/packages/qmake/qmake-native-2.00a/.mtn2git_empty b/packages/keymaps/files/tosa/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake-native-2.00a/.mtn2git_empty +++ b/packages/keymaps/files/tosa/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/keymaps/files/tosa/keymap-2.4.map index 31ca75b660..31ca75b660 100644 --- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map +++ b/packages/keymaps/files/tosa/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map index ac43471326..ac43471326 100644 --- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map +++ b/packages/keymaps/files/tosa/keymap-2.6.map diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb new file mode 100644 index 0000000000..350a7e0e08 --- /dev/null +++ b/packages/keymaps/keymaps_1.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Keyboard map" +SECTION = "base" +MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" +RDEPENDS = "initscripts console-tools" +LICENSE = "GPL" +PACKAGE_ARCH = "${MACHINE}" +PR = "r3" + +inherit update-rc.d + +SRC_URI = "file://keymap" + +SRC_URI_append_c7x0 = " file://keymap-*.map" +SRC_URI_append_tosa = " file://keymap-*.map" +SRC_URI_append_akita = " file://keymap-*.map" +SRC_URI_append_spitz = " file://keymap-*.map" +SRC_URI_append_collie = " file://keymap-*.map" +SRC_URI_append_poodle = " file://keymap-*.map" + +INITSCRIPT_NAME = "keymap" +INITSCRIPT_PARAMS = "start 00 S ." + +do_install () { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ + + case ${MACHINE} in + c7x0 | tosa | spitz | akita | collie | poodle ) + install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} + ;; + *) + ;; + esac +} diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_svn.bb index f032b9b587..c561af3b28 100644 --- a/packages/konqueror/konqueror-embedded_svn.bb +++ b/packages/konqueror/konqueror-embedded_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition SECTION = "opie/applications" PRIORITY = "optional" HOMEPAGE = "http://www.konqueror.org/" -DEPENDS = "openssl pcre libqte-mt-static dcopidl-native" +DEPENDS = "openssl pcre qte-mt-static dcopidl-native" LICENSE = "LGPL/GPL" DEFAULT_PREFERENCE = "-1" FILES_${PN} = "${palmtopdir} /usr/share" diff --git a/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.15/defconfig-akita index 65ad9227cc..65ad9227cc 100644 --- a/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-akita diff --git a/packages/linux/linux-openzaurus-2.6.15/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.15/defconfig-spitz new file mode 100644 index 0000000000..65ad9227cc --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-spitz @@ -0,0 +1,1602 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.15 +# Sun Feb 5 23:30:47 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_CLEAN_COMPILE=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_HOTPLUG=y +CONFIG_KOBJECT_UEVENT=y +# CONFIG_IKCONFIG is not set +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +CONFIG_PXA_SHARPSL=y +# CONFIG_MACH_HX2750 is not set +# CONFIG_PXA_SHARPSL_25x is not set +CONFIG_PXA_SHARPSL_27x=y +CONFIG_MACH_AKITA=y +CONFIG_MACH_SPITZ=y +CONFIG_MACH_BORZOI=y +CONFIG_PXA27x=y +# CONFIG_PXA_KEYS is not set +CONFIG_IWMMXT=y +CONFIG_PXA_SHARP_Cxx00=y +CONFIG_PXA_SSP=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y +CONFIG_SHARP_PARAM=y +CONFIG_SHARPSL_PM=y +CONFIG_SHARP_SCOOP=y + +# +# Bus support +# +CONFIG_ISA_DMA_API=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=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=y + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER 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 is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +# CONFIG_IP_NF_PPTP is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +CONFIG_IP_NF_MATCH_HELPER=m +CONFIG_IP_NF_MATCH_STATE=m +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_REALM=m +CONFIG_IP_NF_MATCH_SCTP=m +# CONFIG_IP_NF_MATCH_DCCP is not set +CONFIG_IP_NF_MATCH_COMMENT=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m +# CONFIG_IP_NF_MATCH_STRING is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_TARGET_NFQUEUE is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_TARGET_MASQUERADE is not set +# CONFIG_IP_NF_TARGET_REDIRECT is not set +# CONFIG_IP_NF_TARGET_NETMAP is not set +# CONFIG_IP_NF_TARGET_SAME is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_MANGLE=m +# CONFIG_IP_NF_TARGET_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +# CONFIG_IP_NF_TARGET_MARK is not set +# CONFIG_IP_NF_TARGET_CLASSIFY is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m +# CONFIG_IP_NF_TARGET_NOTRACK is not set +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_MULTIPORT=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_MARK=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AHESP=m +CONFIG_IP6_NF_MATCH_LENGTH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +# CONFIG_IP6_NF_TARGET_LOG is not set +# CONFIG_IP6_NF_TARGET_REJECT is not set +# CONFIG_IP6_NF_TARGET_NFQUEUE is not set +CONFIG_IP6_NF_MANGLE=m +# CONFIG_IP6_NF_TARGET_MARK is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_RAW=m + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP 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=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +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_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +# 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_VIA_FIR is not set +CONFIG_PXA_FICP=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +# CONFIG_BT_HCIUSB_SCO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_SHARP_SL=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_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 + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_SHARPSL=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +# 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_BLK_DEV_IDESCSI 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_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=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# 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=m +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_CS=m +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +CONFIG_PCMCIA_PCNET=m +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_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_PPP_MPPE is not set +# CONFIG_PPPOE 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 + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +CONFIG_INPUT_POWER=y + +# +# 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_CORGI is not set +CONFIG_KEYBOARD_SPITZ=y +# CONFIG_KEYBOARD_TOSA is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_CORGI=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_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# 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_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# 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 +# CONFIG_TELCLOCK 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_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C 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 + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# + +# +# Multi-Function Devices +# + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_SPITZ=y +# CONFIG_LEDS_TOSA is not set +CONFIG_LEDS_TRIGGER_TIMER=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_W100 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=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO 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_CORGI=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +# CONFIG_SND_SEQUENCER_OSS is not set +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_DETECT 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 +# +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# PCMCIA devices +# + +# +# SoC audio support +# +CONFIG_SND_SOC=m + +# +# Soc Platforms +# + +# +# SoC Audio for the Intel PXA2xx +# +CONFIG_SND_PXA2xx_SOC=m +CONFIG_SND_PXA2xx_SOC_I2S=m +# CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set +# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set +# CONFIG_SND_PXA2xx_SOC_CORGI is not set +CONFIG_SND_PXA2xx_SOC_SPITZ=m +# CONFIG_SND_PXA2xx_SOC_TOSA is not set + +# +# Soc Codecs +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_WM8731 is not set +CONFIG_SND_SOC_WM8750=m +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8772 is not set +# CONFIG_SND_SOC_WM8971 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=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_AIPTEK=m +CONFIG_USB_WACOM=m +# CONFIG_USB_ACECAD is not set +CONFIG_USB_KBTAB=m +CONFIG_USB_POWERMATE=m +CONFIG_USB_MTOUCH=m +# CONFIG_USB_ITMTOUCH is not set +CONFIG_USB_EGALAX=m +# CONFIG_USB_YEALINK is not set +CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB Multimedia devices +# +CONFIG_USB_DABUSB=m + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set +CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +# CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=m +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +# CONFIG_MMC_WBSD is not set + +# +# Real Time Clock +# +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST 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 is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG 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_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set + +# +# 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=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=m +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp437" +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=m + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.16/defconfig-akita index 794ff52a88..38281b7cd1 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-akita @@ -143,7 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y # CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y CONFIG_SHARP_SCOOP=y @@ -1307,7 +1307,7 @@ CONFIG_RTC_DRV_SA1100=y 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=m # CONFIG_EXT3_FS_XATTR is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 index 996fba9724..669efab8b5 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 @@ -144,7 +144,7 @@ CONFIG_CPU_TLB_V4WBI=y # CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y CONFIG_SHARP_SCOOP=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz new file mode 100644 index 0000000000..4256287c49 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz @@ -0,0 +1,1557 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16 +# Thu Mar 23 22:11:12 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +CONFIG_PXA_SHARPSL=y +# CONFIG_MACH_HX2750 is not set +# CONFIG_PXA_SHARPSL_25x is not set +CONFIG_PXA_SHARPSL_27x=y +CONFIG_MACH_AKITA=y +CONFIG_MACH_SPITZ=y +CONFIG_MACH_BORZOI=y +CONFIG_PXA27x=y +# CONFIG_PXA_KEYS is not set +CONFIG_IWMMXT=y +CONFIG_PXA_SHARP_Cxx00=y +CONFIG_PXA_SSP=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y +CONFIG_KEXEC=y +CONFIG_SHARP_PARAM=y +CONFIG_SHARPSL_PM=y +CONFIG_SHARP_SCOOP=y + +# +# 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 +# +CONFIG_PCMCIA_PXA2XX=y + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER 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 is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +# CONFIG_IP_NF_PPTP is not set +CONFIG_IP_NF_QUEUE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +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_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +CONFIG_PXA_FICP=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +# CONFIG_BT_HCIUSB_SCO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_SHARP_SL=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_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 + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_SHARPSL=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +# 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_BLK_DEV_IDESCSI 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_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=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# 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=m + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_CS=m +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +CONFIG_PCMCIA_PCNET=m +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_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_PPP_MPPE is not set +# CONFIG_PPPOE 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 + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +CONFIG_INPUT_POWER=y + +# +# 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_CORGI is not set +CONFIG_KEYBOARD_SPITZ=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_CORGI=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_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# 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_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG 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 +# CONFIG_TELCLOCK 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_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# + +# +# Multi-Function Devices +# + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_SPITZ=y +# CONFIG_LEDS_TOSA is not set +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_W100 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=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO 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_CORGI=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +# CONFIG_SND_SEQUENCER_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_DETECT is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +# 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 +# +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# PCMCIA devices +# + +# +# SoC audio support +# +CONFIG_SND_SOC=m + +# +# Soc Platforms +# + +# +# SoC Audio for the Intel PXA2xx +# +CONFIG_SND_PXA2xx_SOC=m +CONFIG_SND_PXA2xx_SOC_I2S=m +# CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set +# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set +# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9713 is not set +# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9712 is not set +# CONFIG_SND_PXA2xx_SOC_CORGI is not set +CONFIG_SND_PXA2xx_SOC_SPITZ=m +# CONFIG_SND_PXA2xx_SOC_TOSA is not set + +# +# Soc Codecs +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_WM8731 is not set +CONFIG_SND_SOC_WM8750=m +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8772 is not set +# CONFIG_SND_SOC_WM8971 is not set +# CONFIG_SND_SOC_WM9713 is not set +# CONFIG_SND_SOC_WM9712 is not set +# CONFIG_SND_SOC_UDA1380 is not set +# CONFIG_SND_SOC_AK4535 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=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_AIPTEK=m +CONFIG_USB_WACOM=m +# CONFIG_USB_ACECAD is not set +CONFIG_USB_KBTAB=m +CONFIG_USB_POWERMATE=m +CONFIG_USB_MTOUCH=m +# CONFIG_USB_ITMTOUCH is not set +CONFIG_USB_EGALAX=m +# CONFIG_USB_YEALINK is not set +CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +# 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=m +CONFIG_USB_MICROTEK=m + +# +# USB Multimedia devices +# +CONFIG_USB_DABUSB=m + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set +CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +# CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=m +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y + +# +# Real Time Clock +# +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST 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 is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG 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_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=m +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp437" +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=m + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_PREEMPT is not set +CONFIG_DEBUG_MUTEXES=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_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 74edea8df8..cdc5898be7 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -2,8 +2,9 @@ DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750." SECTION = "kernel" MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" -PROVIDES = "virtual/kernel-hostap" -RPROVIDES = "virtual/kernel-hostap" + +PACKAGES += "kernel-module-hostap" +RPROVIDES_kernel-module-hostap = "hostap-modules" DOSRC = "http://www.do13.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" @@ -25,7 +26,6 @@ COMPATIBLE_HOST = "arm.*-linux" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" -CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw" CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' @@ -38,7 +38,6 @@ export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"} CMDLINE_MEM_collie = "mem=${mem}M" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" -CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" CMDLINE_ROTATE_collie = "fbcon=rotate:1" CMDLINE_ROTATE_poodle = "fbcon=rotate:1" CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" @@ -55,19 +54,14 @@ module_autoload_pxaficp_ir = "pxaficp_ir" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" module_autoload_snd-soc-spitz_akita = "snd-soc-spitz" -module_autoload_snd-soc-spitz_borzoi = "snd-soc-spitz" module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz" do_configure() { + rm -f ${S}/.config - case ${MACHINE} in - akita | spitz | borzoi ) - install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available." - ;; - *) - install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." - ;; - esac + if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then + die "No default configuration for ${MACHINE} available." + fi if [ "${MACHINE}" == "collie" ]; then mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` @@ -89,24 +83,41 @@ do_configure() { echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - if [ "${ENABLE_ELPP}" == "yes" ]; then - echo "# Enhanced Linux Progress Patch" >> ${S}/.config - echo "CONFIG_FB_ELPP=y" >> ${S}/.config - echo "CONFIG_LOGO=y" >> ${S}/.config - echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config - else - echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config + #if [ "${ENABLE_ELPP}" == "yes" ]; then + # echo "# Enhanced Linux Progress Patch" >> ${S}/.config + # echo "CONFIG_FB_ELPP=y" >> ${S}/.config + # echo "CONFIG_LOGO=y" >> ${S}/.config + # echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config + #else + # echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config + #fi + + if [ "${TARGET_OS}" == "linux-gnueabi" ]; 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' \ + -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_MTD_MTDRAM_SA1100=/d' \ + -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \ + -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \ + -e '/CONFIG_MTDRAM_ABS_POS=/d' \ + '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config' + yes '' | oe_runmake oldconfig } -# Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii +# Check the kernel is below the 1264*1024 byte limit for the PXA Zaurii do_compile_append() { case ${MACHINE} in - c7x0 | akita | poodle | spitz | borzoi | tosa ) + c7x0 | akita | poodle | spitz | tosa ) size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge 1302000 ]; then + if [ $size -ge 1294336 ]; then rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} echo "Size is $size" die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular." diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index 298553e7bf..f76449bd1d 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -86,7 +86,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ file://defconfig-poodle \ - file://defconfig-cxx00 \ + file://defconfig-akita \ + file://defconfig-spitz \ file://defconfig-qemuarm \ file://defconfig-tosa " diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 0cf048ed72..1225eb5830 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,8 +1,6 @@ include linux-openzaurus.inc -PR = "r4" - -DEFAULT_PREFERENCE = "-1" +PR = "r5" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -81,7 +79,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ file://defconfig-poodle \ - file://defconfig-cxx00 \ + file://defconfig-akita \ + file://defconfig-spitz \ file://defconfig-qemuarm \ file://defconfig-tosa " diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb index 9c6e75b9a5..f99b818cb3 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb @@ -1,5 +1,5 @@ include matchbox-panel.inc - +DEFAULT_PREFERENCE = "-1" PR="r0" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://mb-applet-battery-repaint-093.patch;patch=1" diff --git a/packages/meta/bootstrap-image.bb b/packages/meta/bootstrap-image.bb index c7d3b5d52d..1791dd8f56 100644 --- a/packages/meta/bootstrap-image.bb +++ b/packages/meta/bootstrap-image.bb @@ -6,11 +6,6 @@ DEPENDS = "task-bootstrap" inherit image_ipk -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe \ - opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie \ - e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" - FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index a53c4d4dc0..92bed0dd5c 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -1,10 +1,6 @@ -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" -PR = "r19" +PR = "r20" export IMAGE_BASENAME = "gpe-image" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index b68995e2da..c786f67e0b 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -1,12 +1,10 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" -FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" -FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" LICENSE = "MIT" -PR = "r20" +PR = "r21" DEPENDS = "task-bootstrap task-opie" RDEPENDS = "${INSTALL_PACKAGES}" diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb index 0b8211cb8a..50634e0353 100644 --- a/packages/meta/pivotboot-image.bb +++ b/packages/meta/pivotboot-image.bb @@ -3,14 +3,10 @@ export IMAGE_LINGUAS = "" export IPKG_INSTALL = "task-pivotboot" DEPENDS = "task-pivotboot" +PR = "r1" inherit image_ipk -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe \ - opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie \ - e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" - FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb index 39109245f1..be7f28fb91 100644 --- a/packages/meta/sectest-gpe-image.bb +++ b/packages/meta/sectest-gpe-image.bb @@ -1,11 +1,7 @@ MAINTAINER = "Bob Davies <tyggerbob@rogers.com>" LICENSE = MIT -PR = "r5" +PR = "r6" -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" export IMAGE_BASENAME = "sectest-gpe-image" diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb index 0854cfd43a..b878701c61 100644 --- a/packages/meta/task-e-x11.bb +++ b/packages/meta/task-e-x11.bb @@ -1,10 +1,7 @@ DESCRIPTION = "Tasks for Enlightenment/X11" PACKAGES = "task-e-x11-core task-e-x11" PROVIDES = "task-e-x11-core task-e-x11" -PR = "r8" - -FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" +PR = "r9" PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11" diff --git a/packages/meta/task-opie.bb b/packages/meta/task-opie.bb index b8952a520f..f8e39b7ee0 100644 --- a/packages/meta/task-opie.bb +++ b/packages/meta/task-opie.bb @@ -48,7 +48,6 @@ RDEPENDS_task-opie-base-applets_append_mnci = " opie-vtapplet opie-logouta RDEPENDS_task-opie-base-applets_append_c7x0 = " opie-autorotateapplet" RDEPENDS_task-opie-base-applets_append_spitz = " opie-autorotateapplet" RDEPENDS_task-opie-base-applets_append_akita = " opie-autorotateapplet" -RDEPENDS_task-opie-base-applets_append_borzoi = " opie-autorotateapplet" RDEPENDS_task-opie-base-inputmethods = "opie-multikey opie-handwriting opie-handwriting-classicset" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index ffbe655b76..6ca4e12d78 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -21,7 +21,6 @@ PIXMAP_SIZE = "" PIXMAP_SIZE_c7x0 = "-640x480" PIXMAP_SIZE_spitz = "-640x480" PIXMAP_SIZE_akita = "-640x480" -PIXMAP_SIZE_borzoi = "-640x480" PIXMAP_SIZE_tosa = "-480x640" PIXMAP_SIZE_simpad = "-800x600" diff --git a/packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf b/packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/borzoi/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb index ad19539e6b..b679b4c380 100644 --- a/packages/otpkeygen/otpkeygen_1.3.0.bb +++ b/packages/otpkeygen/otpkeygen_1.3.0.bb @@ -5,7 +5,7 @@ AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>" MAINTANER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" APPTYPE="binary" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_${PV}.tar.gz" @@ -23,7 +23,7 @@ do_install() { install -d ${D}${palmtopdir}/bin/ install -d ${D}${palmtopdir}/pics/ - install -m 0755 ${WORKDIR}/bin/otpkeygen ${D}${palmtopdir}/bin/ + install -m 0755 ${WORKDIR}/src/src ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/apps/Applications/otpkeygen.desktop ${D}${palmtopdir}/apps/Applications/ install -m 0644 ${WORKDIR}/pics/otpkeygen.png ${D}${palmtopdir}/pics/ } diff --git a/packages/patcher/patcher_20040913.bb b/packages/patcher/patcher_20040913.bb index 9559f5cf72..af4d91217c 100644 --- a/packages/patcher/patcher_20040913.bb +++ b/packages/patcher/patcher_20040913.bb @@ -14,5 +14,3 @@ do_install() { install -d ${D}${bindir} install -m 0755 patcher.py ${D}${bindir}/patcher } - -DEPENDS_prepend_delete = "patcher " diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts b/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts deleted file mode 100644 index c67df8e348..0000000000 --- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts +++ /dev/null @@ -1,28 +0,0 @@ -# ATA/IDE drive adapter configuration -# -# The address format is "scheme,socket,serial_no[,part]". -# -# For multi-partition devices, first return list of partitions in -# $PARTS. Then, we'll get called for each partition. -# -case "$ADDRESS" in -*,1,*,*) - # Socket 1 is the internal HD; don't do anything clever as it's / - ;; -*,*,*,1) - #INFO="Sample IDE setup" - DO_FSTAB="n"; - #DO_FSCK="y" ; - DO_MOUNT="y" - #FSTYPE="msdos" - #FSTYPE="auto" - #OPTS="" - #MOUNTPT="/mnt/ide" - ;; -*,*,*) - PARTS="1" - # Card eject policy options - NO_CHECK=n - NO_FUSER=y - ;; -esac diff --git a/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty b/packages/pptp-linux/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty +++ b/packages/pptp-linux/.mtn2git_empty diff --git a/packages/tslib/tslib/borzoi/.mtn2git_empty b/packages/pptp-linux/pptp-linux/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/tslib/tslib/borzoi/.mtn2git_empty +++ b/packages/pptp-linux/pptp-linux/.mtn2git_empty diff --git a/packages/nonworking/pptp-linux/pptp-linux/makefile.patch b/packages/pptp-linux/pptp-linux/makefile.patch index ea2b5711a2..ea2b5711a2 100644 --- a/packages/nonworking/pptp-linux/pptp-linux/makefile.patch +++ b/packages/pptp-linux/pptp-linux/makefile.patch diff --git a/packages/nonworking/pptp-linux/pptp-linux/options.pptp b/packages/pptp-linux/pptp-linux/options.pptp index f446e22a6a..f446e22a6a 100644 --- a/packages/nonworking/pptp-linux/pptp-linux/options.pptp +++ b/packages/pptp-linux/pptp-linux/options.pptp diff --git a/packages/nonworking/pptp-linux/pptp-linux_1.5.0.bb b/packages/pptp-linux/pptp-linux_1.5.0.bb index d98478d780..d98478d780 100644 --- a/packages/nonworking/pptp-linux/pptp-linux_1.5.0.bb +++ b/packages/pptp-linux/pptp-linux_1.5.0.bb diff --git a/packages/prboom/prboom-devconfig/borzoi/prboom.cfg b/packages/prboom/prboom-devconfig/borzoi/prboom.cfg deleted file mode 100644 index cd17d0baff..0000000000 --- a/packages/prboom/prboom-devconfig/borzoi/prboom.cfg +++ /dev/null @@ -1,313 +0,0 @@ -# Doom config file -# Format: -# variable value - -# Misc settings -default_compatibility_level -1 -realtic_clock_rate 100 -max_player_corpse 32 -flashing_hom 0 -demo_insurance 2 -endoom_mode 0x5 -level_precache 0 - -# Files -wadfile_1 "prboom.wad" -wadfile_2 "" -dehfile_1 "" -dehfile_2 "" - -# Game settings -default_skill 2 -weapon_recoil 0 -doom_weapon_toggles 1 -player_bobbing 1 -monsters_remember 1 -monster_infighting 1 -monster_backing 0 -monster_avoid_hazards 1 -monkeys 0 -monster_friction 1 -help_friends 1 -player_helpers 0 -friend_distance 128 -dog_jumping 1 -sts_always_red 1 -sts_pct_always_gray 0 -sts_traditional_keys 0 -traditional_menu 1 -show_messages 1 -autorun 0 - -# Compatibility settings -comp_zombie 0 -comp_infcheat 0 -comp_stairs 0 -comp_telefrag 0 -comp_dropoff 0 -comp_falloff 0 -comp_staylift 0 -comp_doorstuck 0 -comp_pursuit 0 -comp_vile 0 -comp_pain 0 -comp_skull 0 -comp_blazing 0 -comp_doorlight 0 -comp_god 0 -comp_skymap 0 -comp_floors 0 -comp_model 0 -comp_zerotags 0 -comp_moveblock 0 -comp_sound 0 - -# Sound settings -sound_card -1 -music_card -1 -pitched_sounds 0 -samplerate 22050 -sfx_volume 8 -music_volume 8 -mus_pause_opt 2 -sounddev "/dev/dsp" -snd_channels 8 - -# Video settings -screen_width 540 -screen_height 380 -fake_contrast 1 -use_fullscreen 1 -use_doublebuffer 1 -translucency 1 -tran_filter_pct 66 -screenblocks 10 -usegamma 3 -X_options 0x0 - -# Mouse settings -use_mouse 1 -mouse_sensitivity_horiz 10 -mouse_sensitivity_vert 10 -mouseb_fire 0 -mouseb_strafe 1 -mouseb_forward 2 - -# Key bindings -key_right 0xae -key_left 0xac -key_up 0xad -key_down 0xaf -key_menu_right 0xae -key_menu_left 0xac -key_menu_up 0xad -key_menu_down 0xaf -key_menu_backspace 0x7f -key_menu_escape 0x1b -key_menu_enter 0x10d -key_strafeleft 0x2c -key_straferight 0x2e -key_fire 0x10d -key_use 0x20 -key_strafe 0xb8 -key_speed 0xb6 -key_savegame 0xbc -key_loadgame 0xbd -key_soundvolume 0xbe -key_hud 0xbf -key_quicksave 0xc0 -key_endgame 0xc1 -key_messages 0xc2 -key_quickload 0xc3 -key_quit 0xc4 -key_gamma 0xd7 -key_spy 0xd8 -key_pause 0xff -key_autorun 0xba -key_chat 0x74 -key_backspace 0x7f -key_enter 0xd -key_map 0x9 -key_map_right 0xae -key_map_left 0xac -key_map_up 0xad -key_map_down 0xaf -key_map_zoomin 0x3d -key_map_zoomout 0x2d -key_map_gobig 0x30 -key_map_follow 0x66 -key_map_mark 0x6d -key_map_clear 0x63 -key_map_grid 0x67 -key_map_rotate 0x72 -key_map_overlay 0x6f -key_reverse 0x2f -key_zoomin 0x3d -key_zoomout 0x2d -key_chatplayer1 0x67 -key_chatplayer2 0x69 -key_chatplayer3 0x62 -key_chatplayer4 0x72 -key_weapontoggle 0x30 -key_weapon1 0x31 -key_weapon2 0x32 -key_weapon3 0x33 -key_weapon4 0x34 -key_weapon5 0x35 -key_weapon6 0x36 -key_weapon7 0x37 -key_weapon8 0x38 -key_weapon9 0x39 -key_screenshot 0x2a - -# Joystick settings -use_joystick 0 -joy_left 0 -joy_right 0 -joy_up 0 -joy_down 0 -joyb_fire 0 -joyb_strafe 1 -joyb_speed 2 -joyb_use 3 - -# Chat macros -chatmacro0 "No" -chatmacro1 "I'm ready to kick butt!" -chatmacro2 "I'm OK." -chatmacro3 "I'm not looking too good!" -chatmacro4 "Help!" -chatmacro5 "You suck!" -chatmacro6 "Next time, scumbag..." -chatmacro7 "Come here!" -chatmacro8 "I'll take care of it." -chatmacro9 "Yes" - -# Automap settings -mapcolor_back 0xf7 -mapcolor_grid 0x68 -mapcolor_wall 0x17 -mapcolor_fchg 0x37 -mapcolor_cchg 0xd7 -mapcolor_clsd 0xd0 -mapcolor_rkey 0xaf -mapcolor_bkey 0xcc -mapcolor_ykey 0xe7 -mapcolor_rdor 0xaf -mapcolor_bdor 0xcc -mapcolor_ydor 0xe7 -mapcolor_tele 0x77 -mapcolor_secr 0xfc -mapcolor_exit 0x0 -mapcolor_unsn 0x68 -mapcolor_flat 0x58 -mapcolor_sprt 0x70 -mapcolor_item 0xe7 -mapcolor_hair 0xd0 -mapcolor_sngl 0xd0 -mapcolor_me 0x70 -mapcolor_frnd 0x70 -map_secret_after 0 -map_point_coord 0 -automapmode 0x0 - -# Heads-up display settings -hudcolor_titl 5 -hudcolor_xyco 3 -hudcolor_mesg 6 -hudcolor_chat 5 -hudcolor_list 5 -hud_msg_lines 1 -hud_list_bgon 0 -hud_distributed 0 -health_red 25 -health_yellow 50 -health_green 100 -armor_red 25 -armor_yellow 50 -armor_green 100 -ammo_red 25 -ammo_yellow 50 -hud_active 2 -hud_displayed 0 -hud_nosecrets 0 - -# Weapon preferences -weapon_choice_1 6 -weapon_choice_2 9 -weapon_choice_3 4 -weapon_choice_4 3 -weapon_choice_5 2 -weapon_choice_6 8 -weapon_choice_7 5 -weapon_choice_8 7 -weapon_choice_9 1 - -# Music -mus_e1m1 "e1m1.mp3" -mus_e1m2 "e1m2.mp3" -mus_e1m3 "e1m3.mp3" -mus_e1m4 "e1m4.mp3" -mus_e1m5 "e1m5.mp3" -mus_e1m6 "e1m6.mp3" -mus_e1m7 "e1m7.mp3" -mus_e1m8 "e1m8.mp3" -mus_e1m9 "e1m9.mp3" -mus_e2m1 "e2m1.mp3" -mus_e2m2 "e2m2.mp3" -mus_e2m3 "e2m3.mp3" -mus_e2m4 "e2m4.mp3" -mus_e2m5 "e1m7.mp3" -mus_e2m6 "e2m6.mp3" -mus_e2m7 "e2m7.mp3" -mus_e2m8 "e2m8.mp3" -mus_e2m9 "e3m1.mp3" -mus_e3m1 "e3m1.mp3" -mus_e3m2 "e3m2.mp3" -mus_e3m3 "e3m3.mp3" -mus_e3m4 "e1m8.mp3" -mus_e3m5 "e1m7.mp3" -mus_e3m6 "e1m6.mp3" -mus_e3m7 "e2m7.mp3" -mus_e3m8 "e3m8.mp3" -mus_e3m9 "e1m9.mp3" -mus_inter "e2m3.mp3" -mus_intro "intro.mp3" -mus_bunny "bunny.mp3" -mus_victor "victor.mp3" -mus_introa "intro.mp3" -mus_runnin "runnin.mp3" -mus_stalks "stalks.mp3" -mus_countd "countd.mp3" -mus_betwee "betwee.mp3" -mus_doom "doom.mp3" -mus_the_da "the_da.mp3" -mus_shawn "shawn.mp3" -mus_ddtblu "ddtblu.mp3" -mus_in_cit "in_cit.mp3" -mus_dead "dead.mp3" -mus_stlks2 "stalks.mp3" -mus_theda2 "the_da.mp3" -mus_doom2 "doom.mp3" -mus_ddtbl2 "ddtblu.mp3" -mus_runni2 "runnin.mp3" -mus_dead2 "dead.mp3" -mus_stlks3 "stalks.mp3" -mus_romero "romero.mp3" -mus_shawn2 "shawn.mp3" -mus_messag "messag.mp3" -mus_count2 "countd.mp3" -mus_ddtbl3 "ddtblu.mp3" -mus_ampie "ampie.mp3" -mus_theda3 "the_da.mp3" -mus_adrian "adrian.mp3" -mus_messg2 "messag.mp3" -mus_romer2 "romero.mp3" -mus_tense "tense.mp3" -mus_shawn3 "shawn.mp3" -mus_openin "openin.mp3" -mus_evil "evil.mp3" -mus_ultima "ultima.mp3" -mus_read_m "read_m.mp3" -mus_dm2ttl "dm2ttl.mp3" -mus_dm2int "dm2int.mp3" diff --git a/packages/prelink/prelink-20031029/Makefile.in.patch b/packages/prelink/prelink-20031029/Makefile.in.patch deleted file mode 100644 index 930ea5f9c4..0000000000 --- a/packages/prelink/prelink-20031029/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prelink-0.0.20030902.orig/src/Makefile.in 2003-07-01 14:38:41.000000000 +0000 -+++ prelink-0.0.20030902/src/Makefile.in 2003-09-16 23:26:16.000000000 +0000 -@@ -108,7 +108,7 @@ - $(prelink_SYSDEPS) - - prelink_LDADD = @LIBGELF@ --prelink_LDFLAGS = -all-static -+#prelink_LDFLAGS = -all-static - - extra_DIST = makecrc.c - subdir = src diff --git a/packages/prelink/prelink-20031029/dso.c.patch b/packages/prelink/prelink-20031029/dso.c.patch deleted file mode 100644 index 1be2f52961..0000000000 --- a/packages/prelink/prelink-20031029/dso.c.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- prelink-0.0.20030902.orig/src/dso.c 2003-08-11 11:55:11.000000000 +0000 -+++ prelink-0.0.20030902/src/dso.c 2003-09-16 23:26:16.000000000 +0000 -@@ -334,7 +334,13 @@ - } - else - sections[--k] = i; -+/* this fails for the statically linked upx executable - assert (j == k); -+*/ -+ if (j != k) { -+ printf("assert(j == k) at dso.c:311 has failed for file %s\n", name); -+ goto error_out; -+ } - - section_cmp_dso = dso; - qsort (sections + k, dso->ehdr.e_shnum - k, sizeof (*sections), section_cmp); diff --git a/packages/prelink/prelink-20031029/layout.c.patch b/packages/prelink/prelink-20031029/layout.c.patch deleted file mode 100644 index 3961d84d0b..0000000000 --- a/packages/prelink/prelink-20031029/layout.c.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- prelink-0.0.20030902.orig/src/layout.c 2003-06-13 15:12:26.000000000 +0000 -+++ prelink-0.0.20030902/src/layout.c 2003-09-16 23:26:16.000000000 +0000 -@@ -614,7 +614,23 @@ - < ((deps[j - 1]->end + max_page_size - 1) - & ~(max_page_size - 1)) - && (deps[j]->type == ET_DYN || deps[j - 1]->type == ET_DYN)) -+{ /* XXX some binaries cause a segfault but I do not know why -- Md*/ -+ fprintf(stderr, -+ "Unknown fatal error at src/layout.c:538\n" -+ "l.binlibs[i]->filename: %s\n" -+ "deps[j]->base: %lx\n" -+ "(deps[j - 1]->end + max_page_size - 1) & ~(max_page_size - 1): %ld\n" -+ "[deps[j - 1]->end: %lx max_page_size: %lu]\n" -+ "deps[j]->type: %x deps[j - 1]->type: %x\n" -+ , -+ l.binlibs[i]->filename, -+ deps[j]->base, -+ ((deps[j - 1]->end + max_page_size - 1) & ~(max_page_size - 1)), -+ deps[j - 1]->end, max_page_size, -+ deps[j]->type, deps[j - 1]->type -+ ); - abort (); -+} - } - #endif - } diff --git a/packages/prelink/prelink-20031029/prelink.conf b/packages/prelink/prelink-20031029/prelink.conf deleted file mode 100644 index 1777aa849e..0000000000 --- a/packages/prelink/prelink-20031029/prelink.conf +++ /dev/null @@ -1,21 +0,0 @@ ---- prelink-0.0.20040115.orig/debian/prelink.conf -+++ prelink-0.0.20040115/debian/prelink.conf -@@ -0,0 +1,18 @@ -+# This config file contains a list of directories both with binaries -+# and libraries prelink should consider by default. -+# If a directory name is prefixed with `-l ', the directory hierarchy -+# will be walked as long as filesystem boundaries are not crossed. -+# If a directory name is prefixed with `-h ', symbolic links in a -+# directory hierarchy are followed. -+-l /usr/local/sbin -+-l /sbin -+-l /usr/sbin -+-l /usr/local/bin -+-l /bin -+-l /usr/bin -+-l /usr/X11R6/bin -+-l /usr/games -+-l /usr/local/lib -+-l /lib -+-l /usr/lib -+-l /usr/X11R6/lib diff --git a/packages/prelink/prelink-20031029/prelink.cron.daily b/packages/prelink/prelink-20031029/prelink.cron.daily deleted file mode 100644 index 91983ee18b..0000000000 --- a/packages/prelink/prelink-20031029/prelink.cron.daily +++ /dev/null @@ -1,43 +0,0 @@ ---- prelink-0.0.20040115.orig/debian/prelink.cron.daily -+++ prelink-0.0.20040115/debian/prelink.cron.daily -@@ -0,0 +1,40 @@ -+#!/bin/sh -+ -+. /etc/default/prelink -+ -+renice +19 -p $$ >/dev/null 2>&1 -+ -+if [ "$PRELINKING" != yes ]; then -+ if [ -f /etc/prelink.cache ]; then -+ echo /usr/sbin/prelink -uav > /var/log/prelink.log -+ /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 -+ rm -f /etc/prelink.cache -+ # Restart init if needed -+ [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u -+ fi -+ exit 0 -+fi -+ -+if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \ -+ || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then -+ # If cache does not exist or is from older prelink versions or -+ # if we were asked to explicitely, force full prelinking -+ rm -f /etc/prelink.cache /var/lib/misc/prelink.force -+ PRELINK_OPTS="$PRELINK_OPTS -f" -+ date > /var/lib/misc/prelink.full -+elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \ -+ -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \ -+ = /var/lib/misc/prelink.full ]; then -+ # If prelink without -q has been run in the last -+ # PRELINK_FULL_TIME_INTERVAL days, just use quick mode -+ PRELINK_OPTS="$PRELINK_OPTS -q" -+else -+ date > /var/lib/misc/prelink.full -+fi -+ -+echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log -+/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1 -+# Restart init if needed -+[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u -+ -+exit 0 diff --git a/packages/prelink/prelink-20031029/prelink.default b/packages/prelink/prelink-20031029/prelink.default deleted file mode 100644 index d89649e49b..0000000000 --- a/packages/prelink/prelink-20031029/prelink.default +++ /dev/null @@ -1,25 +0,0 @@ ---- prelink-0.0.20040115.orig/debian/prelink.default -+++ prelink-0.0.20040115/debian/prelink.default -@@ -0,0 +1,22 @@ -+# Set this to no to disable prelinking altogether -+# or to yes to enable it. -+# (if you change this from yes to no prelink -ua -+# will be run next night to undo prelinking) -+PRELINKING=unknown -+ -+# Options to pass to prelink -+# -m Try to conserve virtual memory by allowing overlapping -+# assigned virtual memory slots for libraries which -+# never appear together in one binary -+# -R Randomize virtual memory slot assignments for libraries. -+# This makes it slightly harder for various buffer overflow -+# attacks, since library addresses will be different on each -+# host using -R. -+PRELINK_OPTS=-mR -+ -+# How often should full prelink be run (in days) -+# Normally, prelink will be run in quick mode, every -+# $PRELINK_FULL_TIME_INTERVAL days it will be run -+# in normal mode. Comment this line out if prelink -+# should be run in normal mode always. -+PRELINK_FULL_TIME_INTERVAL=14 diff --git a/packages/prelink/prelink-20031029/prelink.h.patch b/packages/prelink/prelink-20031029/prelink.h.patch deleted file mode 100644 index 3ca2930d3a..0000000000 --- a/packages/prelink/prelink-20031029/prelink.h.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- prelink-0.0.20030902.orig/src/prelink.h 2003-08-11 11:54:01.000000000 +0000 -+++ prelink-0.0.20030902/src/prelink.h 2003-09-16 23:26:16.000000000 +0000 -@@ -26,6 +26,45 @@ - #include <stdio.h> - #include <sys/stat.h> - -+/* http://gcc.gnu.org/ml/gcc/2003-01/msg00922.html */ -+#ifndef R_390_TLS_DTPMOD -+#define R_390_TLS_DTPMOD 54 -+#define R_390_TLS_DTPOFF 55 -+#define R_390_TLS_TPOFF 56 -+#endif -+ -+/* from http://www.cygwin.com/ml/libc-alpha/2003-02/msg00241.html */ -+#ifndef R_PPC_TLS -+#define R_PPC_TLS 67 -+#define R_PPC_DTPMOD32 68 -+#define R_PPC_TPREL16 69 -+#define R_PPC_TPREL16_LO 70 -+#define R_PPC_TPREL16_HI 71 -+#define R_PPC_TPREL16_HA 72 -+#define R_PPC_TPREL32 73 -+#define R_PPC_DTPREL16 74 -+#define R_PPC_DTPREL16_LO 75 -+#define R_PPC_DTPREL16_HI 76 -+#define R_PPC_DTPREL16_HA 77 -+#define R_PPC_DTPREL32 78 -+#define R_PPC_GOT_TLSGD16 79 -+#define R_PPC_GOT_TLSGD16_LO 80 -+#define R_PPC_GOT_TLSGD16_HI 81 -+#define R_PPC_GOT_TLSGD16_HA 82 -+#define R_PPC_GOT_TLSLD16 83 -+#define R_PPC_GOT_TLSLD16_LO 84 -+#define R_PPC_GOT_TLSLD16_HI 85 -+#define R_PPC_GOT_TLSLD16_HA 86 -+#define R_PPC_GOT_TPREL16 87 -+#define R_PPC_GOT_TPREL16_LO 88 -+#define R_PPC_GOT_TPREL16_HI 89 -+#define R_PPC_GOT_TPREL16_HA 90 -+#define R_PPC_GOT_DTPREL16 91 -+#define R_PPC_GOT_DTPREL16_LO 92 -+#define R_PPC_GOT_DTPREL16_HI 93 -+#define R_PPC_GOT_DTPREL16_HA 94 -+#endif -+ - #ifndef DT_GNU_LIBLIST - #define DT_GNU_LIBLIST 0x6ffffef9 - #define DT_GNU_LIBLISTSZ 0x6ffffdf7 diff --git a/packages/prelink/prelink-20031029/ts.Makefile.am.patch b/packages/prelink/prelink-20031029/ts.Makefile.am.patch deleted file mode 100644 index 6b8c3c5c38..0000000000 --- a/packages/prelink/prelink-20031029/ts.Makefile.am.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prelink-0.0.20031029.orig/testsuite/Makefile.am 2003-09-02 21:44:23.000000000 +0000 -+++ prelink-0.0.20031029/testsuite/Makefile.am 2003-10-31 20:28:02.000000000 +0000 -@@ -11,7 +11,7 @@ - shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \ - shuffle6.sh shuffle7.sh \ - layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \ -- cxx1.sh quick1.sh cycle1.sh cycle2.sh \ -+ cxx1.sh cycle1.sh cycle2.sh \ - undosyslibs.sh - TESTS_ENVIRONMENT = \ - PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \ diff --git a/packages/prelink/prelink-20031029/ts.Makefile.in.patch b/packages/prelink/prelink-20031029/ts.Makefile.in.patch deleted file mode 100644 index 4253badb65..0000000000 --- a/packages/prelink/prelink-20031029/ts.Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prelink-0.0.20031029.orig/testsuite/Makefile.in 2003-10-28 20:01:56.000000000 +0000 -+++ prelink-0.0.20031029/testsuite/Makefile.in 2003-10-31 20:28:10.000000000 +0000 -@@ -106,7 +106,7 @@ - shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \ - shuffle6.sh shuffle7.sh \ - layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \ -- cxx1.sh quick1.sh cycle1.sh cycle2.sh \ -+ cxx1.sh cycle1.sh cycle2.sh \ - undosyslibs.sh - - TESTS_ENVIRONMENT = \ diff --git a/packages/prelink/prelink-20040304/prelink.conf b/packages/prelink/prelink-20040304/prelink.conf deleted file mode 100644 index 1777aa849e..0000000000 --- a/packages/prelink/prelink-20040304/prelink.conf +++ /dev/null @@ -1,21 +0,0 @@ ---- prelink-0.0.20040115.orig/debian/prelink.conf -+++ prelink-0.0.20040115/debian/prelink.conf -@@ -0,0 +1,18 @@ -+# This config file contains a list of directories both with binaries -+# and libraries prelink should consider by default. -+# If a directory name is prefixed with `-l ', the directory hierarchy -+# will be walked as long as filesystem boundaries are not crossed. -+# If a directory name is prefixed with `-h ', symbolic links in a -+# directory hierarchy are followed. -+-l /usr/local/sbin -+-l /sbin -+-l /usr/sbin -+-l /usr/local/bin -+-l /bin -+-l /usr/bin -+-l /usr/X11R6/bin -+-l /usr/games -+-l /usr/local/lib -+-l /lib -+-l /usr/lib -+-l /usr/X11R6/lib diff --git a/packages/prelink/prelink-20040304/prelink.cron.daily b/packages/prelink/prelink-20040304/prelink.cron.daily deleted file mode 100644 index 91983ee18b..0000000000 --- a/packages/prelink/prelink-20040304/prelink.cron.daily +++ /dev/null @@ -1,43 +0,0 @@ ---- prelink-0.0.20040115.orig/debian/prelink.cron.daily -+++ prelink-0.0.20040115/debian/prelink.cron.daily -@@ -0,0 +1,40 @@ -+#!/bin/sh -+ -+. /etc/default/prelink -+ -+renice +19 -p $$ >/dev/null 2>&1 -+ -+if [ "$PRELINKING" != yes ]; then -+ if [ -f /etc/prelink.cache ]; then -+ echo /usr/sbin/prelink -uav > /var/log/prelink.log -+ /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 -+ rm -f /etc/prelink.cache -+ # Restart init if needed -+ [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u -+ fi -+ exit 0 -+fi -+ -+if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \ -+ || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then -+ # If cache does not exist or is from older prelink versions or -+ # if we were asked to explicitely, force full prelinking -+ rm -f /etc/prelink.cache /var/lib/misc/prelink.force -+ PRELINK_OPTS="$PRELINK_OPTS -f" -+ date > /var/lib/misc/prelink.full -+elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \ -+ -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \ -+ = /var/lib/misc/prelink.full ]; then -+ # If prelink without -q has been run in the last -+ # PRELINK_FULL_TIME_INTERVAL days, just use quick mode -+ PRELINK_OPTS="$PRELINK_OPTS -q" -+else -+ date > /var/lib/misc/prelink.full -+fi -+ -+echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log -+/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1 -+# Restart init if needed -+[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u -+ -+exit 0 diff --git a/packages/prelink/prelink-20040304/prelink.default b/packages/prelink/prelink-20040304/prelink.default deleted file mode 100644 index d89649e49b..0000000000 --- a/packages/prelink/prelink-20040304/prelink.default +++ /dev/null @@ -1,25 +0,0 @@ ---- prelink-0.0.20040115.orig/debian/prelink.default -+++ prelink-0.0.20040115/debian/prelink.default -@@ -0,0 +1,22 @@ -+# Set this to no to disable prelinking altogether -+# or to yes to enable it. -+# (if you change this from yes to no prelink -ua -+# will be run next night to undo prelinking) -+PRELINKING=unknown -+ -+# Options to pass to prelink -+# -m Try to conserve virtual memory by allowing overlapping -+# assigned virtual memory slots for libraries which -+# never appear together in one binary -+# -R Randomize virtual memory slot assignments for libraries. -+# This makes it slightly harder for various buffer overflow -+# attacks, since library addresses will be different on each -+# host using -R. -+PRELINK_OPTS=-mR -+ -+# How often should full prelink be run (in days) -+# Normally, prelink will be run in quick mode, every -+# $PRELINK_FULL_TIME_INTERVAL days it will be run -+# in normal mode. Comment this line out if prelink -+# should be run in normal mode always. -+PRELINK_FULL_TIME_INTERVAL=14 diff --git a/packages/zaurus-updater/borzoi/.mtn2git_empty b/packages/prelink/prelink-20050901/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zaurus-updater/borzoi/.mtn2git_empty +++ b/packages/prelink/prelink-20050901/.mtn2git_empty diff --git a/packages/prelink/prelink-20050901/arm_eabi.patch b/packages/prelink/prelink-20050901/arm_eabi.patch new file mode 100644 index 0000000000..b234af9b3f --- /dev/null +++ b/packages/prelink/prelink-20050901/arm_eabi.patch @@ -0,0 +1,286 @@ +Index: prelink-0.0.20050901/src/arch-arm.c +=================================================================== +--- prelink-0.0.20050901.orig/src/arch-arm.c 2004-09-30 17:07:57.000000000 +0100 ++++ prelink-0.0.20050901/src/arch-arm.c 2006-04-07 14:41:25.000000000 +0100 +@@ -145,6 +145,24 @@ + error (0, 0, "%s: R_ARM_PC24 relocs with non-zero addend should not be present in prelinked REL sections", + dso->filename); + return 1; ++ case R_ARM_TLS_DTPOFF32: ++ write_le32 (dso, rel->r_offset, value); ++ break; ++ /* DTPMOD32 and TPOFF32 is impossible to predict unless prelink ++ sets the rules. Also for TPOFF{32,} there is REL->RELA problem. */ ++ case R_ARM_TLS_DTPMOD32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ { ++ error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?", ++ dso->filename); ++ return 1; ++ } ++ break; ++ case R_ARM_TLS_TPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ error (0, 0, "%s: R_ARM_TLS_TPOFF32 relocs should not be present in prelinked ET_EXEC REL sections", ++ dso->filename); ++ break; + case R_ARM_COPY: + if (dso->ehdr.e_type == ET_EXEC) + /* COPY relocs are handled specially in generic code. */ +@@ -195,6 +213,24 @@ + write_le32 (dso, rela->r_offset, + (read_ule32 (dso, rela->r_offset) & 0xff000000) | val); + break; ++ case R_ARM_TLS_DTPOFF32: ++ write_le32 (dso, rela->r_offset, value + rela->r_addend); ++ break; ++ /* DTPMOD32 and TPOFF32 is impossible to predict unless prelink ++ sets the rules. */ ++ case R_ARM_TLS_DTPMOD32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ { ++ error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?", ++ dso->filename); ++ return 1; ++ } ++ break; ++ case R_ARM_TLS_TPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC && info->resolvetls) ++ write_le32 (dso, rela->r_offset, ++ -(value + rela->r_addend - info->resolvetls->offset)); ++ break; + case R_ARM_COPY: + if (dso->ehdr.e_type == ET_EXEC) + /* COPY relocs are handled specially in generic code. */ +@@ -315,6 +351,7 @@ + { + GElf_Addr value; + struct prelink_conflict *conflict; ++ struct prelink_tls *tls; + GElf_Rela *ret; + + if (GELF_R_TYPE (rel->r_info) == R_ARM_RELATIVE +@@ -324,8 +361,31 @@ + conflict = prelink_conflict (info, GELF_R_SYM (rel->r_info), + GELF_R_TYPE (rel->r_info)); + if (conflict == NULL) +- return 0; +- value = conflict_lookup_value (conflict); ++ { ++ if (info->curtls == NULL) ++ return 0; ++ switch (GELF_R_TYPE (rel->r_info)) ++ { ++ /* Even local DTPMOD and TPOFF relocs need conflicts. */ ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_TPOFF32: ++ break; ++ default: ++ return 0; ++ } ++ value = 0; ++ } ++ else ++ { ++ /* DTPOFF32 wants to see only real conflicts, not lookups ++ with reloc_class RTYPE_CLASS_TLS. */ ++ if (GELF_R_TYPE (rel->r_info) == R_ARM_TLS_DTPOFF32 ++ && conflict->lookup.tls == conflict->conflict.tls ++ && conflict->lookupval == conflict->conflictval) ++ return 0; ++ ++ value = conflict_lookup_value (conflict); ++ } + ret = prelink_conflict_add_rela (info); + if (ret == NULL) + return 1; +@@ -342,6 +402,33 @@ + error (0, 0, "%s: R_ARM_%s relocs should not be present in prelinked REL sections", + dso->filename, GELF_R_TYPE (rel->r_info) == R_ARM_ABS32 ? "ABS32" : "PC24"); + return 1; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ if (conflict != NULL ++ && (conflict->reloc_class != RTYPE_CLASS_TLS ++ || conflict->lookup.tls == NULL)) ++ { ++ error (0, 0, "%s: R_ARM_TLS not resolving to STT_TLS symbol", ++ dso->filename); ++ return 1; ++ } ++ tls = conflict ? conflict->lookup.tls : info->curtls; ++ ret->r_info = GELF_R_INFO (0, R_ARM_ABS32); ++ switch (GELF_R_TYPE (rel->r_info)) ++ { ++ case R_ARM_TLS_DTPMOD32: ++ ret->r_addend = tls->modid; ++ break; ++ case R_ARM_TLS_DTPOFF32: ++ ret->r_addend = value; ++ break; ++ case R_ARM_TLS_TPOFF32: ++ ret->r_addend = -(value + read_ule32 (dso, rel->r_offset) ++ - tls->offset); ++ break; ++ } ++ break; + case R_ARM_COPY: + error (0, 0, "R_ARM_COPY should not be present in shared libraries"); + return 1; +@@ -359,6 +446,7 @@ + { + GElf_Addr value; + struct prelink_conflict *conflict; ++ struct prelink_tls *tls; + GElf_Rela *ret; + Elf32_Sword val; + +@@ -369,8 +457,31 @@ + conflict = prelink_conflict (info, GELF_R_SYM (rela->r_info), + GELF_R_TYPE (rela->r_info)); + if (conflict == NULL) +- return 0; +- value = conflict_lookup_value (conflict); ++ { ++ if (info->curtls == NULL) ++ return 0; ++ switch (GELF_R_TYPE (rela->r_info)) ++ { ++ /* Even local DTPMOD and TPOFF relocs need conflicts. */ ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_TPOFF32: ++ break; ++ default: ++ return 0; ++ } ++ value = 0; ++ } ++ else ++ { ++ /* DTPOFF32 wants to see only real conflicts, not lookups ++ with reloc_class RTYPE_CLASS_TLS. */ ++ if (GELF_R_TYPE (rela->r_info) == R_ARM_TLS_DTPOFF32 ++ && conflict->lookup.tls == conflict->conflict.tls ++ && conflict->lookupval == conflict->conflictval) ++ return 0; ++ ++ value = conflict_lookup_value (conflict); ++ } + ret = prelink_conflict_add_rela (info); + if (ret == NULL) + return 1; +@@ -398,6 +509,32 @@ + case R_ARM_COPY: + error (0, 0, "R_ARM_COPY should not be present in shared libraries"); + return 1; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ if (conflict != NULL ++ && (conflict->reloc_class != RTYPE_CLASS_TLS ++ || conflict->lookup.tls == NULL)) ++ { ++ error (0, 0, "%s: R_386_TLS not resolving to STT_TLS symbol", ++ dso->filename); ++ return 1; ++ } ++ tls = conflict ? conflict->lookup.tls : info->curtls; ++ ret->r_info = GELF_R_INFO (0, R_ARM_ABS32); ++ switch (GELF_R_TYPE (rela->r_info)) ++ { ++ case R_ARM_TLS_DTPMOD32: ++ ret->r_addend = tls->modid; ++ break; ++ case R_ARM_TLS_DTPOFF32: ++ ret->r_addend += value; ++ break; ++ case R_ARM_TLS_TPOFF32: ++ ret->r_addend = -(value + rela->r_addend - tls->offset); ++ break; ++ } ++ break; + default: + error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, + (int) GELF_R_TYPE (rela->r_info)); +@@ -418,6 +555,7 @@ + abort (); + case R_ARM_RELATIVE: + case R_ARM_ABS32: ++ case R_ARM_TLS_TPOFF32: + rela->r_addend = (Elf32_Sword) read_ule32 (dso, rel->r_offset); + break; + case R_ARM_PC24: +@@ -426,6 +564,8 @@ + break; + case R_ARM_COPY: + case R_ARM_GLOB_DAT: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_DTPMOD32: + rela->r_addend = 0; + break; + } +@@ -445,6 +585,7 @@ + abort (); + case R_ARM_RELATIVE: + case R_ARM_ABS32: ++ case R_ARM_TLS_TPOFF32: + write_le32 (dso, rela->r_offset, rela->r_addend); + break; + case R_ARM_PC24: +@@ -453,6 +594,8 @@ + | ((rela->r_addend >> 2) & 0xffffff)); + break; + case R_ARM_GLOB_DAT: ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: + write_le32 (dso, rela->r_offset, 0); + break; + } +@@ -488,6 +631,13 @@ + /* FALLTHROUGH */ + case R_ARM_PC24: + return 1; ++ case R_ARM_TLS_TPOFF32: ++ /* In shared libraries TPOFF is changed always into ++ conflicts, for executables we need to preserve ++ original addend. */ ++ if (dso->ehdr.e_type == ET_EXEC) ++ return 1; ++ break; + } + } + } +@@ -612,6 +762,12 @@ + return 0; + error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename); + return 1; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ write_le32 (dso, rel->r_offset, 0); ++ break; ++ case R_ARM_TLS_TPOFF32: ++ break; + default: + error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, + (int) GELF_R_TYPE (rel->r_info)); +@@ -634,6 +790,10 @@ + { + case R_ARM_COPY: return RTYPE_CLASS_COPY; + case R_ARM_JUMP_SLOT: return RTYPE_CLASS_PLT; ++ case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: ++ case R_ARM_TLS_TPOFF32: ++ return RTYPE_CLASS_TLS; + default: return RTYPE_CLASS_VALID; + } + } +@@ -646,7 +806,7 @@ + .R_JMP_SLOT = R_ARM_JUMP_SLOT, + .R_COPY = R_ARM_COPY, + .R_RELATIVE = R_ARM_RELATIVE, +- .dynamic_linker = "/lib/ld-linux.so.2", ++ .dynamic_linker = "/lib/ld-linux.so.3", + .adjust_dyn = arm_adjust_dyn, + .adjust_rel = arm_adjust_rel, + .adjust_rela = arm_adjust_rela, diff --git a/packages/prelink/prelink-20050901/prelink.conf b/packages/prelink/prelink-20050901/prelink.conf new file mode 100644 index 0000000000..c5a4f4adc3 --- /dev/null +++ b/packages/prelink/prelink-20050901/prelink.conf @@ -0,0 +1,18 @@ +# This config file contains a list of directories both with binaries +# and libraries prelink should consider by default. +# If a directory name is prefixed with `-l ', the directory hierarchy +# will be walked as long as filesystem boundaries are not crossed. +# If a directory name is prefixed with `-h ', symbolic links in a +# directory hierarchy are followed. +-l /usr/local/sbin +-l /sbin +-l /usr/sbin +-l /usr/local/bin +-l /bin +-l /usr/bin +-l /usr/X11R6/bin +-l /usr/games +-l /usr/local/lib +-l /lib +-l /usr/lib +-l /usr/X11R6/lib diff --git a/packages/prelink/prelink-20050901/prelink.cron.daily b/packages/prelink/prelink-20050901/prelink.cron.daily new file mode 100644 index 0000000000..0b3c07322c --- /dev/null +++ b/packages/prelink/prelink-20050901/prelink.cron.daily @@ -0,0 +1,40 @@ +#!/bin/sh + +. /etc/default/prelink + +renice +19 -p $$ >/dev/null 2>&1 + +if [ "$PRELINKING" != yes ]; then + if [ -f /etc/prelink.cache ]; then + echo /usr/sbin/prelink -uav > /var/log/prelink.log + /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 + rm -f /etc/prelink.cache + # Restart init if needed + [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u + fi + exit 0 +fi + +if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \ + || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then + # If cache does not exist or is from older prelink versions or + # if we were asked to explicitely, force full prelinking + rm -f /etc/prelink.cache /var/lib/misc/prelink.force + PRELINK_OPTS="$PRELINK_OPTS -f" + date > /var/lib/misc/prelink.full +elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \ + -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \ + = /var/lib/misc/prelink.full ]; then + # If prelink without -q has been run in the last + # PRELINK_FULL_TIME_INTERVAL days, just use quick mode + PRELINK_OPTS="$PRELINK_OPTS -q" +else + date > /var/lib/misc/prelink.full +fi + +echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log +/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1 +# Restart init if needed +[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u + +exit 0 diff --git a/packages/prelink/prelink-20050901/prelink.default b/packages/prelink/prelink-20050901/prelink.default new file mode 100644 index 0000000000..901258ed2a --- /dev/null +++ b/packages/prelink/prelink-20050901/prelink.default @@ -0,0 +1,22 @@ +# Set this to no to disable prelinking altogether +# or to yes to enable it. +# (if you change this from yes to no prelink -ua +# will be run next night to undo prelinking) +PRELINKING=unknown + +# Options to pass to prelink +# -m Try to conserve virtual memory by allowing overlapping +# assigned virtual memory slots for libraries which +# never appear together in one binary +# -R Randomize virtual memory slot assignments for libraries. +# This makes it slightly harder for various buffer overflow +# attacks, since library addresses will be different on each +# host using -R. +PRELINK_OPTS=-mR + +# How often should full prelink be run (in days) +# Normally, prelink will be run in quick mode, every +# $PRELINK_FULL_TIME_INTERVAL days it will be run +# in normal mode. Comment this line out if prelink +# should be run in normal mode always. +PRELINK_FULL_TIME_INTERVAL=14 diff --git a/packages/prelink/prelink_20031029.bb b/packages/prelink/prelink_20031029.bb deleted file mode 100644 index 1788dd3342..0000000000 --- a/packages/prelink/prelink_20031029.bb +++ /dev/null @@ -1,26 +0,0 @@ -SECTION = "devel" -DEPENDS = "elfutils " -DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \ -and executables, so that far fewer relocations need to be resolved at \ -runtime and thus programs come up faster." -LICENSE = "GPL" -SRC_URI = "ftp://people.redhat.com/jakub/prelink/prelink-${PV}.tar.bz2 \ - file://dso.c.patch;patch=1 \ - file://layout.c.patch;patch=1 \ - file://Makefile.in.patch;patch=1 \ - file://prelink.h.patch;patch=1 \ - file://ts.Makefile.am.patch;patch=1 \ - file://ts.Makefile.in.patch;patch=1 \ - file://prelink.conf \ - file://prelink.cron.daily \ - file://prelink.default" -S = "${WORKDIR}/prelink" - -inherit autotools - -do_install_append () { - install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf - install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink - install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink -} diff --git a/packages/prelink/prelink_20040520.bb b/packages/prelink/prelink_20040520.bb deleted file mode 100644 index 922994ce3a..0000000000 --- a/packages/prelink/prelink_20040520.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "devel" -DEPENDS = "elfutils " -DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \ -and executables, so that far fewer relocations need to be resolved at \ -runtime and thus programs come up faster." -LICENSE = "GPL" -SRC_URI = "ftp://people.redhat.com/jakub/prelink/prelink-${PV}.tar.bz2" -S = "${WORKDIR}/prelink" - -EXTRA_OECONF = "--disable-64bit" - -inherit autotools - -do_install_append () { - install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default -} diff --git a/packages/prelink/prelink_20040304.bb b/packages/prelink/prelink_20050901.bb index bb134fe536..a83ff1b61f 100644 --- a/packages/prelink/prelink_20040304.bb +++ b/packages/prelink/prelink_20050901.bb @@ -1,15 +1,24 @@ SECTION = "devel" -DEPENDS = "elfutils " +DEPENDS = "elfutils" DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \ and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." -LICENSE = "PRELINK" +LICENSE = "GPL" +PR = "r2" + SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ file://prelink.conf \ file://prelink.cron.daily \ file://prelink.default" + +TARGET_OS_ORIG := "${TARGET_OS}" +OVERRIDES_append = ":${TARGET_OS_ORIG}" +SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch;patch=1" + S = "${WORKDIR}/prelink-0.0.${PV}" +EXTRA_OECONF = "--disable-64bit" + inherit autotools do_install_append () { @@ -18,3 +27,20 @@ do_install_append () { install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink } + +pkg_postinst_prelink() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +prelink -a +} + +pkg_postrm_prelink() { +#!/bin/sh + +prelink -au +} + diff --git a/packages/prism3-support/files/hostap-fw-load b/packages/prism3-support/files/hostap-fw-load index 0b2aec51a8..00df1ef848 100644 --- a/packages/prism3-support/files/hostap-fw-load +++ b/packages/prism3-support/files/hostap-fw-load @@ -1,11 +1,17 @@ #!/bin/sh +if test -e /sbin/cardctl; then + CARDCTL=/sbin/cardctl +elif test -e /sbin/pccardctl; then + CARDCTL=/sbin/pccardctl +else + exit 0 +fi + # Special case for prism3 cards needing firmware upload # Add more known manfids, if necessary - -test -x /sbin/cardctl || exit 0 -if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then +if [ `$CARDCTL info|grep "d601,0010\|d601,0101"` ]; then iwpriv "$IFACE" reset 1 hostap_fw_load "$IFACE" fi diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb index dfe3f5a9fb..85f1391ed4 100644 --- a/packages/prism3-support/prism3-support_1.0.0.bb +++ b/packages/prism3-support/prism3-support_1.0.0.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r1" PACKAGE_ARCH = "all" +PR = "r2" SRC_URI = "file://hostap-fw-load" diff --git a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch deleted file mode 100644 index 866864ad1f..0000000000 --- a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-embedded-opensource-4.0.0-b1/qmake/generators/makefile.cpp~old-moc-compatibility.patch -+++ qt-embedded-opensource-4.0.0-b1/qmake/generators/makefile.cpp -@@ -950,7 +950,7 @@ - deps += "$(MOC) "; - deps += (*it) + " " + findDependencies((m)).join(" "); - t << m << ": " << deps << "\n\t" -- << "$(MOC)" << " $(DEFINES) $(INCPATH) " << varGlue("QMAKE_COMPILER_DEFINES","-D"," -D"," ") -+ << "$(MOC) " /* << " $(DEFINES) $(INCPATH) " << varGlue("QMAKE_COMPILER_DEFINES","-D"," -D"," ") */ - << (*it) << " -o " << m << endl << endl; - } - } diff --git a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch deleted file mode 100644 index 3a985600fa..0000000000 --- a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf~old-uic-compatibility.patch -+++ qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf -@@ -13,8 +13,8 @@ - isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR - isEmpty(UI_HEADERS_DIR):UI_HEADERS_DIR = $$UI_DIR - --uic.commands = $$QMAKE_UIC -3 $$QMAKE_UIC3 ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} --uic.output = $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} -+uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -+uic.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic.input = FORMS - uic.variable_out = HEADERS - uic.CONFIG += no_link -@@ -24,9 +24,9 @@ - INCLUDEPATH += $$UI_HEADERS_DIR - - uic3 { -- uic3_decl.commands = $$QMAKE_UIC3 -decl ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -+ uic3_decl.commands = $$QMAKE_UIC3 -decl ${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic3_decl.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} -- uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} -+ uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_decl.input = FORMS - uic3_decl.CONFIG += no_link - uic3_decl.variable_out = HEADERS diff --git a/packages/zbedic/zbedic-0.9.6/.mtn2git_empty b/packages/qmake/qmake2-native-2.00a/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zbedic/zbedic-0.9.6/.mtn2git_empty +++ b/packages/qmake/qmake2-native-2.00a/.mtn2git_empty diff --git a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf index d803f036fc..d803f036fc 100644 --- a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf diff --git a/packages/qmake/qmake-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 31e8a0d755..41bc5c7755 100644 --- a/packages/qmake/qmake-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -4,11 +4,9 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r5" +PR = "r0" -DEFAULT_PREFERENCE = "-1" - -QTVER = "qt-x11-opensource-src-4.0.1" +QTVER = "qt-x11-opensource-src-4.1.1" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ file://linux-oe-qmake.conf" @@ -40,7 +38,7 @@ do_compile() { } do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR} + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 install -d ${QMAKE_MKSPEC_PATH} cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH} } diff --git a/packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty b/packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch b/packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch new file mode 100644 index 0000000000..ab943db1ff --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~configurable-cpu-extensions ++++ qt-x11-opensource-src-4.1.1/configure +@@ -564,6 +564,12 @@ + VAL=$1 + fi + ;; ++ -nosse) ++ CFG_SSE="no" ++ ;; ++ -sse) ++ CFG_SSE="yes" ++ ;; + -iwmmxt) + CFG_IWMMXT="yes" + ;; +@@ -1759,13 +1765,6 @@ + fi + fi + +-# detect sse support +-if $unixtests/sse.test $XQMAKESPEC $OPT_VERBOSE; then +- CFG_HAVE_SSE=no +-else +- CFG_HAVE_SSE=yes +-fi +- + # check iwmmxt support + if [ "$CFG_IWMMXT" = "yes" ]; then + if ! $unixtests/iwmmxt.test $XQMAKESPEC $OPT_VERBOSE; then diff --git a/packages/qt/qt-x11-free-4.1.1/cross-compile.patch b/packages/qt/qt4-x11-free-4.1.1/cross-compile.patch index 39d095d7a0..7c8665c9c1 100644 --- a/packages/qt/qt-x11-free-4.1.1/cross-compile.patch +++ b/packages/qt/qt4-x11-free-4.1.1/cross-compile.patch @@ -3,18 +3,18 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-x11-opensource-src-4.0.1/configure~cross-compile -+++ qt-x11-opensource-src-4.0.1/configure -@@ -477,7 +477,7 @@ +--- qt-x11-opensource-src-4.1.1/configure~cross-compile ++++ qt-x11-opensource-src-4.1.1/configure +@@ -534,7 +534,7 @@ UNKNOWN_ARG=yes fi ;; -- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) -+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-crossarch) +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-crossarch) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL=$1 -@@ -768,6 +768,9 @@ +@@ -845,6 +845,9 @@ xplatform) XPLATFORM="$VAL" ;; @@ -24,7 +24,7 @@ debug-and-release) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" -@@ -1649,100 +1652,7 @@ +@@ -1698,131 +1701,7 @@ echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" fi @@ -33,6 +33,9 @@ - x86) - ARCH=i386 - ;; +- x86_64) +- ARCH=x86_64 +- ;; - ipaq|sharp) - ARCH=arm - ;; @@ -48,23 +51,45 @@ - echo " SGI ($ARCH)" - fi - ;; -- SunOS:5*:sun4*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " Sun SPARC (sparc)" -- fi -- ARCH=sparc -- ;; -- Darwin:*:Power?Macintosh) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Apple PowerPC (powerpc)" -- fi -- ARCH=powerpc +- SunOS:5*:*) +- case "$UNAME_MACHINE" in +- sun4u) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- i86pc) +- case "$PLATFORM" in +- *-64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- ;; +- *) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- esac +- esac - ;; -- Darwin:*:x86) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Apple Intel (x86)" -- fi -- ARCH=i386 +- Darwin:*:*) +- case "$UNAME_MACHINE" in +- Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ;; +- x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ;; +- esac +- ARCH=macosx - ;; - AIX:*:00????????00) - if [ "$OPT_VERBOSE" = "yes" ]; then @@ -84,7 +109,7 @@ - fi - ARCH=i386 - ;; -- *:*:x86_64) +- *:*:x86_64|*:*:amd64) - if [ "$PLATFORM" = "linux-g++-32" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32 bit on 64-bit AMD 80x86 (i386)" @@ -103,6 +128,12 @@ - fi - ARCH=powerpc - ;; +- *:*:s390*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " IBM S/390 (s390)" +- fi +- ARCH=s390 +- ;; - *:*:*) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " Trying '$UNAME_MACHINE'..." diff --git a/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.1.1/fix-resinit-declaration.patch index bc30cab216..fcd5de6f97 100644 --- a/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch +++ b/packages/qt/qt4-x11-free-4.1.1/fix-resinit-declaration.patch @@ -3,14 +3,14 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration -+++ qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp +--- qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration ++++ qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp @@ -30,7 +30,7 @@ # include <netinet/in.h> # include <arpa/nameser.h> # include <resolv.h> -extern "C" int res_init(); -+extern "C" int res_init() throw (); ++extern "C" int res_init() throw(); #endif // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch b/packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch new file mode 100644 index 0000000000..392aaf4f5f --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch @@ -0,0 +1,50 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h +@@ -219,7 +219,7 @@ + inline const char toLatin1() const; + inline const ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- inline ushort &unicode() { return *(&ucs); } ++ inline ushort &unicode() { return *((ushort*)&ucs); } + #else + inline ushort &unicode() { return ucs; } + #endif +--- qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp +@@ -1193,6 +1193,18 @@ + } + } + ++static void getXDefault(const char *group, const char *key, float *val) ++{ ++ char *str = XGetDefault(X11->display, group, key); ++ if (str) { ++ char *end = 0; ++ float v = strtod(str, &end); ++ if (str != end) ++ *val = v; ++ } ++} ++ ++ + static void getXDefault(const char *group, const char *key, bool *val) + { + char *str = XGetDefault(X11->display, group, key); +--- qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h +@@ -720,8 +720,8 @@ + + #if defined(QT_COORD_TYPE) + typedef QT_COORD_TYPE qreal; +-#elif defined(__arm__) +-typedef float qreal; ++//#elif defined(__arm__) ++//typedef float qreal; + #else + typedef double qreal; + #endif diff --git a/packages/qt/qt4-x11-free-4.1.1/no-qmake.patch b/packages/qt/qt4-x11-free-4.1.1/no-qmake.patch new file mode 100644 index 0000000000..324f44303a --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.1/no-qmake.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~no-qmake ++++ qt-x11-opensource-src-4.1.1/configure +@@ -2548,7 +2548,7 @@ + fi + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= diff --git a/packages/qt/qt-x11-free-4.1.1/no-tools.patch b/packages/qt/qt4-x11-free-4.1.1/no-tools.patch index 75a146a838..2bda49c9c5 100644 --- a/packages/qt/qt-x11-free-4.1.1/no-tools.patch +++ b/packages/qt/qt4-x11-free-4.1.1/no-tools.patch @@ -3,14 +3,14 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-x11-opensource-src-4.0.1/src/src.pro~no-tools -+++ qt-x11-opensource-src-4.0.1/src/src.pro +--- qt-x11-opensource-src-4.1.1/src/src.pro~no-tools ++++ qt-x11-opensource-src-4.1.1/src/src.pro @@ -3,7 +3,7 @@ # this order is important win32:SUBDIRS += winmain --SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network -+SUBDIRS += corelib xml gui sql network +-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network svg ++SUBDIRS += corelib xml gui sql network svg !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, qt3support): SUBDIRS += qt3support !cross_compile { diff --git a/packages/qt/qt-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb index 32ddca6158..2b90cb9df0 100644 --- a/packages/qt/qt-x11-free_4.1.1.bb +++ b/packages/qt/qt4-x11-free_4.1.1.bb @@ -4,23 +4,20 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc4-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor mysql" +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -# FIXME: Make it use 'our' qmake -# DEPENDS += "qmake-native-2.00a" -PR = "r1" +PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://cross-compile.patch;patch=1 \ file://fix-resinit-declaration.patch;patch=1 \ - file://no-tools.patch;patch=1" + file://no-tools.patch;patch=1 \ + file://no-qmake.patch;patch=1 \ + file://gcc4_1.patch;patch=1 \ + file://configurable-cpu-extensions.patch;patch=1" S = "${WORKDIR}/qt-x11-opensource-src-${PV}" -# Not the prime time of Qt4 yet ... # TODO: make it not look in /usr and /usr/include for its tests! -DEFAULT_PREFERENCE = "-1" -BROKEN = "1" - PARALLEL_MAKE = "" inherit qmake-base qt4x11 pkgconfig @@ -31,12 +28,14 @@ export ARCH = "${TARGET_ARCH}" export ARCH_i686 = "x86" EXTRA_OEMAKE = "-e" -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -no-opengl -plugin-sql-mysql -verbose -stl" - -# EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ +# FIXME: add missing options +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ + -nosse \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -verbose -stl" -EXTRA_ENV = 'QMAKE="${S}/bin/qmake -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ AR="${TARGET_PREFIX}ar cqs" \ @@ -46,14 +45,15 @@ do_configure() { echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri echo "DEFINES += QT_NO_XIM" >>src/qbase.pri unset QMAKESPEC - echo yes | ./configure -prefix ${prefix} -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ + ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake + echo yes | ./configure -v -prefix ${prefix} -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql } # FIXME: Might want to compile the cross tools for the -dev packages as well... do_compile() { - unset CFLAGS CXXFLAGS + unset CFLAGS CXXFLAGS install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic @@ -61,7 +61,7 @@ do_compile() { oe_runmake ${EXTRA_ENV} } -PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Xml" +PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml" do_stage() { install -d ${STAGING_QT_DIR} @@ -92,15 +92,18 @@ do_install() { done } -PACKAGES =+ "libqtcore4 libqtxml4 libqtgui4 libqtnetwork4 libqtsql4 libqtdesigner4 libqtdesignercomponents4 \ +PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ + libqtdesigner4 libqtdesignercomponents4 \ qt4-assistant qt4-designer qt4-examples qt4-linguist \ qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" FILES_libqtcore4 = "${libdir}/libQtCore.so*" FILES_libqtgui4 = "${libdir}/libQtGui.so*" FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" -FILES_libqtxml4 = "${libdir}/libQtXml.so*" FILES_libqtsql4 = "${libdir}/libQtSql.so*" +FILES_libqtsvg4 = "${libdir}/libQtSvg.so*" +FILES_libqttest4 = "${libdir}/libQtTest.so*" +FILES_libqtxml4 = "${libdir}/libQtXml.so*" FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 083174ccad..dafccc0823 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -46,7 +46,6 @@ SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1;pnum=0 file:// file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_borzoi = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " @@ -102,7 +101,6 @@ EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_borzoi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" export SYSCONF_CC = "${CC}" diff --git a/packages/quilt/files/non-gnu.patch b/packages/quilt/files/non-gnu.patch new file mode 100644 index 0000000000..8b07bc2923 --- /dev/null +++ b/packages/quilt/files/non-gnu.patch @@ -0,0 +1,13 @@ +Index: quilt/Makefile.in +=================================================================== +--- quilt.orig/Makefile.in ++++ quilt/Makefile.in +@@ -216,7 +216,7 @@ + -e 's:@LOCALEDIR''@:$(localedir):g' \ + -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ + $< > $@ +- @chmod --reference=$< $@ ++ @chmod `stat -f "%p" $<` $@ + + Makefile : Makefile.in + @echo "Please run ./configure by hand" diff --git a/packages/quilt/quilt-native_0.42.bb b/packages/quilt/quilt-native_0.42.bb index 19b4a3b865..42bac04d20 100644 --- a/packages/quilt/quilt-native_0.42.bb +++ b/packages/quilt/quilt-native_0.42.bb @@ -7,7 +7,8 @@ RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native" SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/cvsroot/quilt;method=pserver;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \ file://install.patch;patch=1 \ file://nostrip.patch;patch=1 \ - file://autoreconf.patch;patch=1" + file://autoreconf.patch;patch=1 " +SRC_URI_append_build-darwin = " file://non-gnu.patch;patch=1 " S = "${WORKDIR}/quilt" inherit autotools native diff --git a/packages/quilt/quilt_0.42.bb b/packages/quilt/quilt_0.42.bb index 44a0d9529b..d5dd9255b8 100644 --- a/packages/quilt/quilt_0.42.bb +++ b/packages/quilt/quilt_0.42.bb @@ -2,7 +2,9 @@ include quilt.inc SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/cvsroot/quilt;method=pserver;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \ file://install.patch;patch=1 \ - file://nostrip.patch;patch=1" + file://nostrip.patch;patch=1 " + +SRC_URI_append_build-darwin = " file://non-gnu.patch;patch=1 " S = "${WORKDIR}/quilt" inherit autotools gettext diff --git a/packages/tslib/tslib/borzoi/tslib.sh b/packages/tslib/tslib/borzoi/tslib.sh deleted file mode 100644 index 218da0751b..0000000000 --- a/packages/tslib/tslib/borzoi/tslib.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_TSEVENTTYPE=CORGI - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -*) - TSLIB_TSDEVICE=/dev/input/event1 - TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf - ;; -esac - -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 02f0c555ae..78fd48e5fc 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -44,7 +44,7 @@ do_install_append() { done rm -f ${D}${sysconfdir}/ts.conf ;; - c7x0 | spitz | akita | tosa | borzoi ) + c7x0 | spitz | akita | tosa ) install -d ${D}${datadir}/tslib for f in ts-2.6.conf ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ diff --git a/packages/udev/udev-063/fix-alignment.patch b/packages/udev/files/fix-alignment.patch index 8c7b8b5ac5..8c7b8b5ac5 100644 --- a/packages/udev/udev-063/fix-alignment.patch +++ b/packages/udev/files/fix-alignment.patch diff --git a/packages/udev/udev-063/noasmlinkage.patch b/packages/udev/files/noasmlinkage.patch index 0d8e854c0e..0d8e854c0e 100644 --- a/packages/udev/udev-063/noasmlinkage.patch +++ b/packages/udev/files/noasmlinkage.patch diff --git a/packages/udev/udev-084/udevsynthesize.patch b/packages/udev/files/udevsynthesize.patch index 7811188485..7811188485 100644 --- a/packages/udev/udev-084/udevsynthesize.patch +++ b/packages/udev/files/udevsynthesize.patch diff --git a/packages/udev/udev-084/udevsynthesize.sh b/packages/udev/files/udevsynthesize.sh index d58217c144..d58217c144 100644 --- a/packages/udev/udev-084/udevsynthesize.sh +++ b/packages/udev/files/udevsynthesize.sh diff --git a/packages/udev/udev-065/fix-alignment.patch b/packages/udev/udev-065/fix-alignment.patch deleted file mode 100644 index 8c7b8b5ac5..0000000000 --- a/packages/udev/udev-065/fix-alignment.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/udev_rules_parse.c b/udev_rules_parse.c ---- a/udev_rules_parse.c -+++ b/udev_rules_parse.c -@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule - int valid; - char *linepos; - char *attr; -+ size_t padding; - int retval; - - /* get all the keys */ -@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule - - /* grow buffer and add rule */ - rule_size = sizeof(struct udev_rule) + rule->bufsize; -+ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t); -+ dbg("add %zi padding bytes", padding); -+ rule_size += padding; -+ rule->bufsize += padding; -+ - rules->buf = realloc(rules->buf, rules->bufsize + rule_size); - if (!rules->buf) { - err("realloc failed"); - diff --git a/packages/udev/udev-065/noasmlinkage.patch b/packages/udev/udev-065/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0e..0000000000 --- a/packages/udev/udev-065/noasmlinkage.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-062/udev.c~noasmlinkage.patch -+++ udev-062/udev.c -@@ -54,7 +54,7 @@ - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: ---- udev-062/udevd.c~noasmlinkage.patch -+++ udev-062/udevd.c -@@ -639,7 +639,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - int rc; - ---- udev-062/udevstart.c~noasmlinkage.patch -+++ udev-062/udevstart.c -@@ -323,7 +323,7 @@ - exec_list(&device_list); - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/packages/udev/udev-070/noasmlinkage.patch b/packages/udev/udev-070/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0e..0000000000 --- a/packages/udev/udev-070/noasmlinkage.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-062/udev.c~noasmlinkage.patch -+++ udev-062/udev.c -@@ -54,7 +54,7 @@ - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: ---- udev-062/udevd.c~noasmlinkage.patch -+++ udev-062/udevd.c -@@ -639,7 +639,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - int rc; - ---- udev-062/udevstart.c~noasmlinkage.patch -+++ udev-062/udevstart.c -@@ -323,7 +323,7 @@ - exec_list(&device_list); - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/packages/udev/udev-071/noasmlinkage.patch b/packages/udev/udev-071/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0e..0000000000 --- a/packages/udev/udev-071/noasmlinkage.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-062/udev.c~noasmlinkage.patch -+++ udev-062/udev.c -@@ -54,7 +54,7 @@ - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: ---- udev-062/udevd.c~noasmlinkage.patch -+++ udev-062/udevd.c -@@ -639,7 +639,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - int rc; - ---- udev-062/udevstart.c~noasmlinkage.patch -+++ udev-062/udevstart.c -@@ -323,7 +323,7 @@ - exec_list(&device_list); - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/packages/udev/udev-084/init b/packages/udev/udev-084/init index 3138e5554c..5a60d52a9a 100644 --- a/packages/udev/udev-084/init +++ b/packages/udev/udev-084/init @@ -204,12 +204,12 @@ case "$1" in stop) echo "Stopping the hotplug events dispatcher" "udevd" - start-stop-daemon --stop --name udevd --quiet --oknodo --retry 5 + start-stop-daemon --stop --name udevd --quiet ;; restart|force-reload) echo "Stopping the hotplug events dispatcher" "udevd" - if start-stop-daemon --stop --name udevd --quiet --oknodo --retry 5; then + if start-stop-daemon --stop --name udevd --quiet ; then exit 1 fi diff --git a/packages/udev/udev-084/noasmlinkage.patch b/packages/udev/udev-084/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0e..0000000000 --- a/packages/udev/udev-084/noasmlinkage.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-062/udev.c~noasmlinkage.patch -+++ udev-062/udev.c -@@ -54,7 +54,7 @@ - } - #endif - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: ---- udev-062/udevd.c~noasmlinkage.patch -+++ udev-062/udevd.c -@@ -639,7 +639,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - int rc; - ---- udev-062/udevstart.c~noasmlinkage.patch -+++ udev-062/udevstart.c -@@ -323,7 +323,7 @@ - exec_list(&device_list); - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/packages/udev/udev-089/.mtn2git_empty b/packages/udev/udev-089/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-089/.mtn2git_empty diff --git a/packages/udev/udev-089/flags.patch b/packages/udev/udev-089/flags.patch new file mode 100644 index 0000000000..492a39881c --- /dev/null +++ b/packages/udev/udev-089/flags.patch @@ -0,0 +1,51 @@ +--- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 ++++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 +@@ -117,28 +117,28 @@ + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ + -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ + -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes +-CFLAGS += $(WARNINGS) ++override CFLAGS += $(WARNINGS) + + LDFLAGS = -Wl,-warn-common + + OPTFLAGS = -Os +-CFLAGS += $(OPTFLAGS) ++override CFLAGS += $(OPTFLAGS) + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -DDEBUG ++ override CFLAGS += -DDEBUG + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS += -fprofile-arcs + endif + +@@ -151,11 +151,11 @@ + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux -lsepol +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/packages/udev/udev-089/init b/packages/udev/udev-089/init new file mode 100644 index 0000000000..5a60d52a9a --- /dev/null +++ b/packages/udev/udev-089/init @@ -0,0 +1,227 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountvirtfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Start udevd, populate /dev and load drivers. +### END INIT INFO + +# we need to unmount /dev/pts/ and remount it later over the tmpfs +unmount_devpts() { + if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ + fi + + if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ + fi +} + +# mount a tmpfs over /dev, if somebody did not already do it +mount_tmpfs() { + if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then + return + fi + + # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. + # /etc/udev/ is recycled as a temporary mount point because it's the only + # directory which is guaranteed to be available. + mount -n -o bind /dev /etc/udev + + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + umount /etc/udev + echo "udev requires tmpfs support, not started." + exit 1 + fi + + mkdir -p /dev/.static/dev + chmod 700 /dev/.static/ + # The mount options in busybox are non-standard... + if test -x /bin/mount.util-linux + then + /bin/mount.util-linux --move /etc/udev /dev/.static/dev + elif test -x /bin/busybox + then + busybox mount -n -o move /etc/udev /dev/.static/dev + else + echo "udev requires an identifiable mount command, not started." + umount /etc/udev + umount /dev + exit 1 + fi +} + +# I hate this hack. -- Md +make_extra_nodes() { + if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then + cp -a /lib/udev/devices/* /dev/ + fi + + [ -e /etc/udev/links.conf ] || return 0 + grep '^[^#]' /etc/udev/links.conf | \ + while read type name arg1; do + [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue + case "$type" in + L) ln -s $arg1 /dev/$name ;; + D) mkdir -p /dev/$name ;; + M) mknod -m 600 /dev/$name $arg1 ;; + *) echo "links.conf: unparseable line ($type $name $arg1)" ;; + esac + done +} + +supported_kernel() { + case "$(uname -r)" in + 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; + 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; + esac + return 0 +} + +set_hotplug_handler() { + case "$(uname -r)" in + 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; + esac + echo $HANDLER > /proc/sys/kernel/hotplug +} + +# shell version of /usr/bin/tty +my_tty() { + [ -x /bin/readlink ] || return 0 + [ -e /proc/self/fd/0 ] || return 0 + readlink --silent /proc/self/fd/0 || true +} + +warn_if_interactive() { + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + return + fi + + TTY=$(my_tty) + if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then + return + fi + + printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" + printf "has been run from an interactive shell.\n" + printf "It will probably not do what you expect, so this script will wait\n" + printf "60 seconds before continuing. Press ^C to stop it.\n" + printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" + sleep 60 +} + +############################################################################## + +PATH="/sbin:/bin:/usr/bin" + +[ -x /sbin/udevd ] || exit 0 + +# defaults +tmpfs_size="10M" +udev_root="/dev" +udevd_timeout=30 + +. /etc/udev/udev.conf + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.12, not started." + exit 1 +fi + +if [ ! -e /proc/filesystems ]; then + echo "udev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "udev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "udev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "udev requires hotplug support, not started." + exit 1 +fi + +############################################################################## + +# When modifying this script, do not forget that between the time that +# the new /dev has been mounted and udevsynthesize has been run there will be +# no /dev/null. This also means that you cannot use the "&" shell command. + +case "$1" in + start) + if [ -e "$udev_root/.udev/" ]; then + if mountpoint -q /dev/; then + TMPFS_MOUNTED=1 + else + echo ".udev/ already exists on the static $udev_root!" + fi + else + warn_if_interactive + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + + set_hotplug_handler + + if [ -z "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + fi + + # if this directory is not present /dev will not be updated by udev + mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/ + # /dev/null must be created before udevd is started + make_extra_nodes + + echo "Synthesizing the initial hotplug events" + udevsynthesize + + # wait for the udevd childs to finish + echo "Waiting for /dev to be fully populated" + while [ -d /dev/.udev/queue/ ]; do + sleep 1 + udevd_timeout=$(($udevd_timeout - 1)) + if [ $udevd_timeout -eq 0 ]; then + # ps axf + break + fi + done + if [ $udevd_timeout -eq 0 ]; then + echo 'timeout' + fi + ;; + + stop) + echo "Stopping the hotplug events dispatcher" "udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + + restart|force-reload) + echo "Stopping the hotplug events dispatcher" "udevd" + if start-stop-daemon --stop --name udevd --quiet ; then + exit 1 + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + ;; + + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/udev/udev-089/local.rules b/packages/udev/udev-089/local.rules new file mode 100644 index 0000000000..bb8459ba23 --- /dev/null +++ b/packages/udev/udev-089/local.rules @@ -0,0 +1,28 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL="rtc0", SYMLINK="rtc" + +# Try and modprobe for drivers for new hardware +ACTION="add", DEVPATH="/devices/*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" diff --git a/packages/udev/udev-089/udev.rules b/packages/udev/udev-089/udev.rules new file mode 100644 index 0000000000..7b4152c5bf --- /dev/null +++ b/packages/udev/udev-089/udev.rules @@ -0,0 +1,98 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# SCSI devices +BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", \ + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm", NAME="infiniband/%k" + +KERNEL=="buzzer", NAME="misc/buzzer" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 6bafa615d7..fc8a701684 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -13,7 +13,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r3" +PR = "r4" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" diff --git a/packages/udev/udev_089.bb b/packages/udev/udev_089.bb new file mode 100644 index 0000000000..28cda40f0f --- /dev/null +++ b/packages/udev/udev_089.bb @@ -0,0 +1,46 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ +/dev/, handles hotplug events and loads drivers at boot time. It replaces \ +the hotplug package and requires a kernel not older than 2.6.12." +RPROVIDES = "hotplug" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://udevsynthesize.patch;patch=1 \ + file://udevsynthesize.sh" + +include udev.inc + +INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." + +FILES_${PN} += "${base_libdir}" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" +EXTRA_OEMAKE += "libudevdir=/lib/udev" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + fi + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + install -d ${D}${base_libdir}/udev/ + install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize + install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize +} diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver-common/files/.mtn2git_empty diff --git a/packages/xserver-common/files/Xdefaults-200DPI.patch b/packages/xserver-common/files/Xdefaults-200DPI.patch new file mode 100644 index 0000000000..8931bfd0a9 --- /dev/null +++ b/packages/xserver-common/files/Xdefaults-200DPI.patch @@ -0,0 +1,7 @@ +--- xserver-common-1.8/X11/Xdefaults.orig 2006-04-08 11:08:35.158478256 +0200 ++++ xserver-common-1.8/X11/Xdefaults 2006-04-08 11:08:42.711330048 +0200 +@@ -1,3 +1,2 @@ + Rxvt*scrollBar_right: true +-Rxvt*font: xft:Mono:pixelsize=9 +-Xft.dpi: 100 ++Rxvt*font: xft:Mono:pixelsize=12 diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb index 125b138f02..19ae2ba851 100644 --- a/packages/xserver-common/xserver-common_1.8.bb +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -3,9 +3,14 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe + +SRC_URI_append_akita = " file://Xdefaults-200DPI.patch;patch=1" +SRC_URI_append_spitz = " file://Xdefaults-200DPI.patch;patch=1" +SRC_URI_append_c7x0 = " file://Xdefaults-200DPI.patch;patch=1" +SRC_URI_append_tosa = " file://Xdefaults-200DPI.patch;patch=1" diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index 73d57e93e1..21529a69d9 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -58,7 +58,6 @@ SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \ file://faster-rotated.patch;patch=1" SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1" SRC_URI_append_akita = " file://faster-rotated.patch;patch=1" -SRC_URI_append_borzoi = " file://faster-rotated.patch;patch=1" PACKAGE_ARCH_mnci = "mnci" PACKAGE_ARCH_collie = "collie" @@ -66,7 +65,6 @@ PACKAGE_ARCH_poodle = "poodle" PACKAGE_ARCH_h3600 = "h3600" PACKAGE_ARCH_spitz = "spitz" PACKAGE_ARCH_akita = "akita" -PACKAGE_ARCH_borzoi = "borzoi" S = "${WORKDIR}/xserver" diff --git a/packages/zaurus-updater/borzoi/updater.sh b/packages/zaurus-updater/borzoi/updater.sh deleted file mode 100644 index 0c18966fdb..0000000000 --- a/packages/zaurus-updater/borzoi/updater.sh +++ /dev/null @@ -1,283 +0,0 @@ -#!/bin/sh - -# -# Noodles' simpler update script. SL-C3000 only for the moment. -# - -DATAPATH=$1 -TMPPATH=/tmp/update -TMPDATA=$TMPPATH/tmpdata.bin -TMPHEAD=$TMPPATH/tmphead.bin - -WFLG_KERNEL=0 -WFLG_INITRD=0 -WFLG_HDD=0 - -RO_MTD_LINE=`cat /proc/mtd | grep "root" | tail -n 1` -if [ "$RO_MTD_LINE" = "" ]; then - RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1` -fi -RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2` -RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2` -RO_MTD=/dev/mtd$RO_MTD_NO -RO_MTDBLK=/dev/mtdblock$RO_MTD_NO -RO_MTD_SIZE=`dc 0x$RO_MTD_SIZE_HEX 1024 /` - -RW_MTD_LINE=`cat /proc/mtd | grep "home" | tail -n 1` -if [ "$RW_MTD_LINE" = "" ]; then - RW_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1` -fi -RW_MTD_NO=`echo $RW_MTD_LINE | cut -d: -f1 | cut -dd -f2` -RW_MTD_SIZE_HEX=`echo $RW_MTD_LINE | cut -d" " -f2` -RW_MTD=/dev/mtd$RW_MTD_NO -RW_MTDBLK=/dev/mtdblock$RW_MTD_NO -RW_MTD_SIZE=`dc 0x$RW_MTD_SIZE_HEX 1024 /` - -LOGOCAL_MTD=/dev/mtd1 - -VERBLOCK=0x48000 -MVRBLOCK=0x70000 - -RESULT=0 - -Cleanup(){ - rm -f $VTMPNAME > /dev/null 2>&1 - rm -f $MTMPNAME > /dev/null 2>&1 - rm $CTRLPATH/* > /dev/null 2>&1 - exit $1 -} -trap 'Cleanup 1' 1 15 -trap '' 2 3 - -get_dev_pcmcia() -{ -while read SOCKET CLASS DRIVER INSTANCE DEVS MAJOR MINOR; -do - echo $DEVS -done -} -get_dev_pcmcia_slot() -{ - grep "^$1" /var/lib/pcmcia/stab | get_dev_pcmcia -} -sleep 1 -IDE1=`get_dev_pcmcia_slot 1` -if [ "$IDE1" = "" ]; then - echo "Error!! There is no HDD. Now retrying..." - while [ "$IDE1" = "" ]; do - IDE1=`get_dev_pcmcia_slot 1` - done - echo "Found HDD!!" -fi - -#LINUXFMT=ext2 -LINUXFMT=ext3 -MKE2FSOPT= -if [ "$LINUXFMT" = "ext3" ]; then - MKE2FSOPT=-j -fi - - -### Check model ### -/sbin/writerominfo -MODEL=`cat /proc/deviceinfo/product` -if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ] -then - echo 'MODEL:'$MODEL - echo 'ERROR:Invalid model!' - echo 'Please reset' - while true - do - done -fi - -### Check that we have a valid tar -for TARNAME in gnu-tar GNU-TAR -do - if [ -e $DATAPATH/$TARNAME ] - then - TARBIN=$DATAPATH/$TARNAME - fi -done - -if [ ! -e $TARBIN ]; then - echo 'Please place a valid copy of tar as "gnu-tar" on your card' - echo 'Please reset' - while true - do - done -fi - -mkdir -p $TMPPATH > /dev/null 2>&1 - -cd $DATAPATH/ - -# -# First do the kernel. -# -for TARGETFILE in zImage.bin zimage.bin ZIMAGE.BIN -do - if [ -e $TARGETFILE -a $WFLG_KERNEL = 0 ] - then - # Get the size of the kernel. - DATASIZE=`wc -c $TARGETFILE` - DATASIZE=`echo $DATASIZE | cut -d' ' -f1` - - echo 'Updating kernel.' - echo $TARGETFILE':'$DATASIZE' bytes' - /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE \ - $TARGETFILE > /dev/null 2>&1 - - WFLG_KERNEL=1 - - fi -done - -# -# Now do the initrd. -# -for TARGETFILE in initrd.bin INITRD.BIN -do - if [ -e $TARGETFILE -a $WFLG_INITRD = 0 ] - then - rm -f $TMPPATH/*.bin > /dev/null 2>&1 - DATASIZE=`wc -c $TARGETFILE` - DATASIZE=`echo $DATASIZE | cut -d' ' -f1` - - WFLG_INITRD=1 - echo 'RO file system' - MODULEID=6 - MODULESIZE=0x500000 - ADDR=0 - TARGET_MTD=$RO_MTD - DATAPOS=16 - ONESIZE=1048576 - /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE - - echo -n 'Flash erasing...' - /sbin/eraseall $TARGET_MTD 2> /dev/null > /dev/null - echo 'done' - - echo '' - echo '0% 100%' - PROGSTEP=`expr $DATASIZE / $ONESIZE + 1` - PROGSTEP=`expr 28 / $PROGSTEP` - if [ $PROGSTEP = 0 ] - then - PROGSTEP=1 - fi - - #00 means header information - VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' - MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' - /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - - #echo 'found header' - /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1 - /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1 - - #loop - while [ $DATAPOS -lt $DATASIZE ] - do - #data create - bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE - TMPSIZE=`wc -c $TMPDATA` - TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` - DATAPOS=`expr $DATAPOS + $TMPSIZE` - - #handle data file - #echo 'ADDR='$ADDR - #echo 'SIZE='$TMPSIZE - next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1` - if [ "$next_addr" = "" ]; then - echo "ERROR:flash write" - rm $TMPDATA > /dev/null 2>&1 - RESULT=3 - break; - fi - ADDR=$next_addr - - rm $TMPDATA > /dev/null 2>&1 - - #progress - SPNUM=0 - while [ $SPNUM -lt $PROGSTEP ] - do - echo -n '.' - SPNUM=`expr $SPNUM + 1` - done - done - - echo '' - - #finish - rm -f $TMPPATH/*.bin > /dev/null 2>&1 - - if [ $RESULT = 0 ] - then - /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - - rm -f $VTMPNAME > /dev/null 2>&1 - rm -f $MTMPNAME > /dev/null 2>&1 - echo 'Success!' - else - echo 'Error!' - exit $RESULT - fi - fi -done - -## HDD image -for TARGETFILE in hdimage1.tgz HDIMAGE1.TGZ -do - if [ -e $TARGETFILE ]; then - if [ $WFLG_HDD != 0 ] - then - continue - fi - WFLG_HDD=1 - echo '' - echo 'HDD RO file system' - if [ ! -f /hdd1/NotAvailable ]; then - umount /hdd1 - fi - echo 'Now formatting...' - mke2fs $MKE2FSOPT /dev/${IDE1}1 2> /dev/null > /dev/null - e2fsck -p /dev/${IDE1}1 > /dev/null - if [ "$?" != "0" ]; then - echo "Error!" - exit "$?" - fi - - mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1 - if [ "$?" != "0" ]; then - echo "Error!" - exit "$?" - fi - - cd /hdd1 - - #This can be useful for debugging - #/bin/sh -i - - - echo 'Now extracting...' - gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf - - if [ "$?" != "0" ]; then - echo "Error!" - exit "$?" - fi - - echo 'Success!' - - - # remount as RO - cd / - umount /hdd1 - mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1 - fi -done - -exit 0 diff --git a/packages/zaurus-updater/tosa/updater.sh b/packages/zaurus-updater/tosa/updater.sh index 5adfa97a1e..6d30aba231 100644 --- a/packages/zaurus-updater/tosa/updater.sh +++ b/packages/zaurus-updater/tosa/updater.sh @@ -67,7 +67,7 @@ then ./consolescroll fi -for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN +for TARGETFILE in zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN mversion.bin MVERSION.BIN do if [ -e $TARGETFILE ] then diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 2aff497de1..21c15c7465 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r3" +PR = "r4" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -19,7 +19,7 @@ do_deploy() { install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE} case ${MACHINE} in - spitz | borzoi ) + spitz ) install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar ;; *) diff --git a/packages/zbedic/libbedic_0.9.6.bb b/packages/zbedic/libbedic_1.0.bb index 05f52ef1f6..8d0ead686d 100644 --- a/packages/zbedic/libbedic_0.9.6.bb +++ b/packages/zbedic/libbedic_1.0.bb @@ -5,9 +5,10 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/zbedic/misc" -PR = "r2" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz" + S = "${WORKDIR}" inherit palmtop @@ -17,7 +18,10 @@ export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS}" do_configure() { qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib -after \ INCLUDEPATH+=../include TARGET=bedic DESTDIR=${STAGING_LIBDIR} \ - HEADERS+=src/file.h SOURCES+=src/file.cpp SOURCES-=tools/xerox.cpp CXXFLAGS+=-fexceptions + HEADERS+=src/file.h SOURCES+=src/file.cpp SOURCES-=tools/xerox.cpp \ + SOURCES-=src/test_dynamic_dictionary.cpp \ + SOURCES-=src/test_dynamic_database.cpp \ + CXXFLAGS+=-fexceptions } do_stage() { diff --git a/packages/zbedic/zbedic/.mtn2git_empty b/packages/zbedic/zbedic/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zbedic/zbedic/.mtn2git_empty diff --git a/packages/zbedic/zbedic-0.9.6/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch index 7fbebd77b5..1e028d5210 100644 --- a/packages/zbedic/zbedic-0.9.6/opie-icons.patch +++ b/packages/zbedic/zbedic/opie-icons.patch @@ -1,6 +1,8 @@ ---- src/zbedic.cpp.orig 2005-06-22 22:31:49.000000000 +0200 -+++ src/zbedic.cpp 2005-06-28 13:27:34.000000000 +0200 -@@ -128,9 +128,9 @@ +Index: zbedic/src/zbedic.cpp +=================================================================== +--- zbedic.orig/src/zbedic.cpp 2006-03-15 11:24:12.000000000 +0100 ++++ zbedic/src/zbedic.cpp 2006-03-15 11:30:21.000000000 +0100 +@@ -129,9 +129,9 @@ // ========== create actions action[TB_SwitchDictionaries] = createAction( tr( "Switch dictionaries" ), "zbedic/switch_dictionary", SLOT(switchToPreviousDict()), CTRL+Key_S ); diff --git a/packages/zbedic/zbedic-0.9.6/qtopia17.patch b/packages/zbedic/zbedic/qtopia17.patch index 0c24974247..7b890aab8d 100644 --- a/packages/zbedic/zbedic-0.9.6/qtopia17.patch +++ b/packages/zbedic/zbedic/qtopia17.patch @@ -3,8 +3,8 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- src/main.cpp~compilefix -+++ src/main.cpp +--- zbedic/src/main.cpp~compilefix ++++ zbedic/src/main.cpp @@ -25,5 +25,13 @@ #include "zbedic.h" #include <qtopia/qpeapplication.h> diff --git a/packages/zbedic/zbedic/version.patch b/packages/zbedic/zbedic/version.patch new file mode 100644 index 0000000000..913e201dc7 --- /dev/null +++ b/packages/zbedic/zbedic/version.patch @@ -0,0 +1,13 @@ +Index: zbedic/src/settings.cpp +=================================================================== +--- zbedic.orig/src/settings.cpp 2006-03-15 11:24:11.000000000 +0100 ++++ zbedic/src/settings.cpp 2006-03-15 15:03:55.000000000 +0100 +@@ -117,7 +117,7 @@ + + ZBEDicSettings::ZBEDicSettings( QWidget *parent ): QTabDialog( parent, "options", true ) + { +- setCaption( tr( "ZBEDic Settings (v. " VERSION ")" ) ); ++ setCaption( tr( "ZBEDic Settings (v. 1.0)" ) ); + + } + diff --git a/packages/zbedic/zbedic_0.9.6.bb b/packages/zbedic/zbedic_1.0.bb index df811a7fcc..d7218a241d 100644 --- a/packages/zbedic/zbedic_0.9.6.bb +++ b/packages/zbedic/zbedic_1.0.bb @@ -6,20 +6,23 @@ LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r2" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ -file://qtopia17.patch;patch=1;pnum=0 \ -file://opie-icons.patch;patch=1;pnum=0 " + file://opie-icons.patch;patch=1 \ + file://version.patch;patch=1 \ + file://qtopia17.patch;patch=1" -S = "${WORKDIR}/" +S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" + do_configure() { cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \ - INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS LIBS+=-lqpe LIBS+=-lbedic DESTDIR=${S} TARGET=zbedic + INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \ + LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic } do_install() { @@ -27,7 +30,7 @@ do_install() { install -d ${D}${palmtopdir}/help/html/ # we copy small icons - in other way QVGA users will complain install -m 0644 ${S}/misc/small_icons/*.png ${D}${palmtopdir}/pics/zbedic/ - install -m 0644 ${S}/misc/zbedic.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/misc/large_icons/zbedic.png ${D}${palmtopdir}/pics/ install -m 0644 ${S}/doc/manual/*.html ${D}${palmtopdir}/help/html/ rm ${D}${palmtopdir}/pics/zbedic/zbedic.png diff --git a/site/powerpc-darwin b/site/powerpc-darwin new file mode 100644 index 0000000000..085f50b034 --- /dev/null +++ b/site/powerpc-darwin @@ -0,0 +1,7 @@ +# pkgconfig-native for OS X buid +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=4} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} |