diff options
76 files changed, 2543 insertions, 764 deletions
diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass index 6d867eab48..e973bf7cf5 100644 --- a/classes/nylon-image.bbclass +++ b/classes/nylon-image.bbclass @@ -9,11 +9,10 @@ nylon_create_imgz() { # copy the kernel (for mips on flash) into tmp FLASH_BIN=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin - test -f ${FLASH_BIN} && \ cp ${FLASH_BIN} ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash # copy rootfs.jffs (or so) into tmp - cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type} + cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/tmp/rootfs.jffs2 # make an imgz out of tmp ( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * ) diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass index 02fddc01ba..11cc45ca0c 100644 --- a/classes/nylon-mirrors.bbclass +++ b/classes/nylon-mirrors.bbclass @@ -1,6 +1,6 @@ MIRRORS_append () { -ftp://.*/.* http://meshcube.org/nylon/stable/sources/ -https?://.*/.* http://meshcube.org/nylon/stable/sources/ -ftp://.*/.* http://meshcube.org/nylon/unstable/sources/ -https?://.*/.* http://meshcube.org/nylon/unstable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ }
\ No newline at end of file diff --git a/conf/checksums.ini b/conf/checksums.ini index 03624c2661..7d2ac2cb28 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3434,6 +3434,10 @@ sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21 md5=09b2019e926d5ef42d52edb2dd33ceae sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602 +[http://pub.risujin.org/cellwriter/cellwriter-1.3.4.tar.gz] +md5=72b4e552a32d6acd888da0b88aeebbdd +sha256=6ab6fa697938af0fc8b587ccd7c5889087800569e558b97797963c6ee2fada0c + [http://centericq.de/archive/source/releases/centericq-4.11.0.tar.bz2] md5=bed5e7eeb60b5ac0045f201f13130964 sha256=4f0f769a6e1cc7d76b527829deef34861ed8f79ae07e29d49566df3594308380 @@ -8190,6 +8194,10 @@ sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d md5=d4c9de56f77f5cd86ac67ab53e027181 sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef +[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.5.tar.gz] +md5=02d01f1cca7ff3af511c59198f3c35a7 +sha256=4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7 + [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz] md5=eb12e6eea8413d35c033aedee61b89ee sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0 @@ -9402,6 +9410,10 @@ sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c md5=7f4e11d04e369391de27fca82ee60f11 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c +[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz] +md5=4e327db531133ffeb650392042341443 +sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9 + [http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz] md5=75c8832f90e445ff361d767c8a2c3ece sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61 @@ -11410,6 +11422,14 @@ sha256=c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534 md5=cd1eb1ce62a52cf69f4df9041a886794 sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576 +[http://clayo.org/kanatest/kanatest-0.4.8.tar.gz] +md5=b97b0521314f634e454354cb7ba2013d +sha256=a31682604bc6db9c0cb2e15429b8a5b64c04f1ed96df912cab71d4337567c513 + +[ftp://ftp.debian.org/debian/pool/main/k/kanatest/kanatest_0.3.6.orig.tar.gz] +md5=cd1eb1ce62a52cf69f4df9041a886794 +sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576 + [http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz] md5=bdfe75534322840b3ff566e0a91c472d sha256=28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1 @@ -22642,6 +22662,10 @@ sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013 md5=17f91175a32827e9c9f45dc7a20a0c2b sha256=6ae8157bbec2b36957bbee6895b4cd3f82406fa90fa7d597235c58ea19307be7 +[http://kernel.org/pub/software/network/tftp/tftp-hpa-5.0.tar.bz2] +md5=28beef704a4ef62bc2dead005198ef4c +sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734 + [http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz] md5=190f08ce6839aecb0fa0ce8d5ddd09ee sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a11c1d5691..3b7905c284 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,6 +11,7 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_hal = "0.5.12" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" @@ -24,6 +25,6 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_udev = "124" +PREFERRED_VERSION_udev = "141" PREFERRED_VERSION_wpa-supplicant = "0.6.7" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 1be3dabc2b..15a8c00127 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,8 +46,8 @@ SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" -SRCDATE_yamonenv ?= "20060814" -SRCDATE_zaurusd ?= "20060628" +SRCDATE_yamonenv ?= "20051022" +SRCDATE_zaurusd ?= "20090501" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index f1f04e5e6a..c05676cb50 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -13,7 +13,7 @@ DISTRO_NAME ?= "minimal" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" #DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE ?= "debug" # Ensure some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 3670f725de..99cab2bcbb 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -1,40 +1,73 @@ +############################################################################# #@TYPE: Distribution #@NAME: Nylon Linux #@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution +############################################################################# -# this distribution is mainly for wireless networking devices and includes -# packages necessary for wireless LAN access point, routing, encryption and -# especially mesh routing applications -# -# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other -# mipsel based platforms -# -# Bruno Randolf <bruno.randolf@4g-systems.biz> +require conf/distro/angstrom-2008.1.conf -TARGET_OS = "linux" +############################################################################# +# NAME and VERSION +############################################################################# +DISTRO_NAME = "nylon" +DISTRO = ${DISTRO_NAME} +DISTRO_VERSION = "${NYLON_VERSION}" +BUILDNAME := "${NYLON_VERSION}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +TARGET_FPU = "soft" +SRCDATE := "20050527" +TARGET_VENDOR = "-nylon" + +# Ensure some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") + +############################################################################# +# PACKAGING +############################################################################# +# Chose the packaging system +INHERIT += "nylon-mirrors" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" +KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" -INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux-kernel-base" +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel24" +MACHINE_KERNEL_VERSION = "2.4" -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/libx11:diet-x11" -PREFERRED_PROVIDERS += " python:python-curses" -PREFERRED_PROVIDER_classpath = "classpath-minimal" +############################################################################# +# TOOLCHAIN +############################################################################# +fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}" +CXXFLAGS := ${fixedCxxflags} -TARGET_FPU = "soft" +# we're not supporting pcmcia right now +DISTRO_FEATURES = "nfs smbfs wifi pcmcia ppp ext2 vfat usbhost pci" -SRCDATE := "20050527" +# FIXME: cannot build linux-libc-headers unless this is set. +IPKGBUILDCMD = "stage-manager-ipkg-build -o 0 -g 0" +############################################################################# +# PREFERRED VERSIONS +############################################################################# +PREFERRED_VERSION_busybox = "1.7.2" PREFERRED_VERSION_glibc = "2.3.3" +PREFERRED_VERSION_glibc-initial = "2.3.2" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223" +PREFERRED_VERSION_mtd-utils = "1.0.0+git" PREFERRED_VERSION_kismet = "2005-01-R1" +PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_netperf = "2.3" +PREFERRED_PROVIDER_hotplug = "linux-hotplug" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4" @@ -45,67 +78,8 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_linux-libc-headers = "2.6.18" - PREFERRED_VERSION_prism54-firmware = "1.0.3.0" - -KERNEL_VERSION_mtx-1 = "2.4.27" -KERNEL_VERSION_mtx-2 = "2.4.27" - -#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3 = "2.16" +#PREFERRED_VERSION_udev = "089" +PREFERRED_VERSION_udev = "100" PREFERRED_VERSION_madwifi-modules = "0.9.3" PREFERRED_VERSION_madwifi-tools = "0.9.3" - -PREFERRED_VERSION_udev = "089" - -KERNEL_VERSION_mtx-3 = "2.6.15.4" -PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" - - -#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3a = "2.16" - -PREFERRED_VERSION_udev = "100" - -KERNEL_VERSION_mtx-3a = "2.6.16.6" - - -# usually overrrided from local.conf -NYLON_RELEASE = "unstable" - -# use meshcub.org mirrors for CVS sources -CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/" - -export FEED_URIS = " \ - nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \ - nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" - -# image names -DISTRO_VERSION = "${NYLON_VERSION}" -BUILDNAME := "${NYLON_VERSION}" -#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" -KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" - diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf index 5131488577..b83cca5487 100644 --- a/conf/machine/dm355-leopard.conf +++ b/conf/machine/dm355-leopard.conf @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "1.2.0" -UBOOT_MACHINE = "dm355_leopard_config" +UBOOT_MACHINE = "davinci_leopard_config" UBOOT_ENTRYPOINT = "0x80008000" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf index 33a69f45b3..7db19696fa 100644 --- a/conf/machine/mtx-1.conf +++ b/conf/machine/mtx-1.conf @@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel" PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1" +KERNEL_VERSION_mtx-1 = "2.4.27" +MACHINE_FEATURES = "kernel24 usbhost vfat" # md: is the --pad=.. necessary? I believe not. # EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-2.conf b/conf/machine/mtx-2.conf index 438c1fed79..67cc5bf185 100644 --- a/conf/machine/mtx-2.conf +++ b/conf/machine/mtx-2.conf @@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel" PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2" +KERNEL_VERSION_mtx-2 = "2.4.27" +MACHINE_FEATURES = "kernel24 usbhost vfat" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf index d6d14d86df..f6e9e8aad5 100644 --- a/conf/machine/mtx-3.conf +++ b/conf/machine/mtx-3.conf @@ -10,8 +10,21 @@ TARGET_ARCH = "arm" require conf/machine/include/tune-arm926ejs.inc - +# begin overrides mtx-3 +#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" +PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" +PREFERRED_VERSION_binutils_mtx-3 = "2.16" + +KERNEL_VERSION_mtx-3 = "2.6.15.4" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3" +PREFERRED_PROVIDER_hotplug_mtx-3 = "udev" +MACHINE_FEATURES = "kernel26 usbhost vfat" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf index cb1b129660..d3adce325b 100644 --- a/conf/machine/mtx-3a.conf +++ b/conf/machine/mtx-3a.conf @@ -4,8 +4,21 @@ include conf/machine/mtx-3.conf -TARGET_ARCH = "arm" +#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" +PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" +PREFERRED_VERSION_binutils_mtx-3a = "2.16" + PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a" +KERNEL_VERSION_mtx-3a = "2.6.16.6" +PREFERRED_PROVIDER_hotplug_mtx-3a = "udev" + +TARGET_ARCH = "arm" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/recipes/base-files/base-files/mtx-2/fstab b/recipes/base-files/base-files/mtx-2/fstab deleted file mode 100644 index 8b9ad0f308..0000000000 --- a/recipes/base-files/base-files/mtx-2/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/fstab: static file system information. mtx-2 -# -# <file system> <mount pt> <type> <options> <dump> <pass> -rootfs / auto defaults 1 1 -tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/recipes/base-files/base-files/mtx-2/profile b/recipes/base-files/base-files/mtx-2/profile deleted file mode 100644 index bedf2fc7d8..0000000000 --- a/recipes/base-files/base-files/mtx-2/profile +++ /dev/null @@ -1,25 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" - -if [ "`id -u`" -eq 0 ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in `ls /etc/profile.d/`; do - . /etc/profile.d/$i - done - unset i -fi - -export PATH PS1 - -umask 022 - -alias ll="ls -lah"
\ No newline at end of file diff --git a/recipes/base-files/base-files/mtx-1/fstab b/recipes/base-files/base-files/nylon/fstab index 5c0e2b39d5..5c0e2b39d5 100644 --- a/recipes/base-files/base-files/mtx-1/fstab +++ b/recipes/base-files/base-files/nylon/fstab diff --git a/recipes/base-files/base-files/mtx-1/profile b/recipes/base-files/base-files/nylon/profile index bedf2fc7d8..04b6037ccf 100644 --- a/recipes/base-files/base-files/mtx-1/profile +++ b/recipes/base-files/base-files/nylon/profile @@ -8,7 +8,16 @@ if [ "`id -u`" -eq 0 ]; then fi if [ "$PS1" ]; then # works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + if [ "$UID" = "0" -o "$USER" = "root" ]; then + B='# ' + else + B='$ ' + fi + if [ -n "$BASH" ]; then + PS1="\u@\h:\w\$B" + else + PS1="$B" + fi fi if [ -d /etc/profile.d ]; then @@ -22,4 +31,4 @@ export PATH PS1 umask 022 -alias ll="ls -lah"
\ No newline at end of file +alias ll="ls -lah" diff --git a/recipes/busybox/busybox-1.13.2/xargs-double-size.patch b/recipes/busybox/busybox-1.13.2/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/recipes/busybox/busybox-1.3.1/xargs-double-size.patch b/recipes/busybox/busybox-1.3.1/xargs-double-size.patch index df64554ffc..ef1e5df7a1 100644 --- a/recipes/busybox/busybox-1.3.1/xargs-double-size.patch +++ b/recipes/busybox/busybox-1.3.1/xargs-double-size.patch @@ -1,5 +1,5 @@ ---- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 -+++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +--- busybox-1.3.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.3.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 @@ -466,8 +466,8 @@ have it at 1 meg). Things will work fine with a large ARG_MAX but it will probably hurt the system more than it needs to; an array of this diff --git a/recipes/busybox/busybox-1.7.2/nylon/defconfig b/recipes/busybox/busybox-1.7.2/nylon/defconfig new file mode 100644 index 0000000000..271732f2d1 --- /dev/null +++ b/recipes/busybox/busybox-1.7.2/nylon/defconfig @@ -0,0 +1,568 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_NITPICK is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_LFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Archival Utilities +# +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +# CONFIG_FEATURE_TAR_BZIP2 is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +CONFIG_FEATURE_TAR_COMPRESS=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_UNCOMPRESS=y +# CONFIG_UNLZMA is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Common options for dpkg and dpkg_deb +# +CONFIG_FEATURE_DEB_TAR_GZ=y +CONFIG_FEATURE_DEB_TAR_BZ2=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAL=y +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_BINARY is not set +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_COMM is not set +# CONFIG_CKSUM is not set +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_CMP=y +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_DF=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +# CONFIG_TEST is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls and more +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +CONFIG_DUMPKMAP=y +CONFIG_GETKEY=y +# CONFIG_LOADFONT is not set +CONFIG_LOADKMAP=y +# CONFIG_OPENVT is not set +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=n + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +# CONFIG_VI is not set +#CONFIG_FEATURE_VI_COLON=y +#CONFIG_FEATURE_VI_YANKMARK=y +#CONFIG_FEATURE_VI_SEARCH=y +#CONFIG_FEATURE_VI_USE_SIGNALS=y +#CONFIG_FEATURE_VI_DOT_CMD=y +#CONFIG_FEATURE_VI_READONLY=y +#CONFIG_FEATURE_VI_SETOPTS=y +#CONFIG_FEATURE_VI_SET=y +#CONFIG_FEATURE_VI_WIN_RESIZE=y +#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_U_W_TMP=y +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +CONFIG_CROND=y +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +CONFIG_WATCHDOG=y + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set +# CONFIG_RMMOD is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_WITHOUT_INETD=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +CONFIG_NAMEIF=y +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_ZCIP=y + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y +CONFIG_SYSCTL=y + +# +# Another Bourne-like Shell +# +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_ASH is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HWCLOCK is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +# CONFIG_MORE is not set +CONFIG_PIVOT_ROOT=y +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_MOUNT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_MOUNT_FORCE=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +CONFIG_DEBUG_YANK_SUSv2=y diff --git a/recipes/busybox/busybox-1.7.2/nylon/xargs-double-size.patch b/recipes/busybox/busybox-1.7.2/nylon/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/recipes/busybox/busybox-1.7.2/nylon/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/recipes/cellwriter/cellwriter_1.3.3.bb b/recipes/cellwriter/cellwriter_1.3.4.bb index 12ec70a48f..12ec70a48f 100644 --- a/recipes/cellwriter/cellwriter_1.3.3.bb +++ b/recipes/cellwriter/cellwriter_1.3.4.bb diff --git a/recipes/dsplink/ti-paths.inc b/recipes/dsplink/ti-paths.inc index 2f1a0e5005..20a453f3de 100644 --- a/recipes/dsplink/ti-paths.inc +++ b/recipes/dsplink/ti-paths.inc @@ -9,7 +9,7 @@ TITOOLSDIR ?= "/OE/TI" # Path under TITOOLSDIR where dspbios is unpacked TIBIOSDIR ?= "bios_5_33_02" -TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_03" +TIXDCTOOLSDIR ?= "xdctools_3_10_03" # Path under TITOOLSDIR where the dsp toolchain is unpacked TICGTOOLSDIR ?= "cg6x_6_0_16" @@ -20,7 +20,7 @@ TICGTOOLSDIR ?= "cg6x_6_0_16" # export some more variable to point to external TI tools # information is duplicated between the js and make based tools export CE_INSTALL_DIR=${S} -export XDC_INSTALL_DIR=${TIXDCTOOLSDIR} +export XDC_INSTALL_DIR=${TITOOLSDIR}/${TIXDCTOOLSDIR} export BIOS_INSTALL_DIR=${TITOOLSDIR}/${TIBIOSDIR} # needed for configuro: export CGTOOLS_V5T="${CROSS_DIR}" diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc new file mode 100644 index 0000000000..15808a11b4 --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration" +AUTHOR = "Kevin DeKorte <kdekorte@gmail.com>" +HOMEPAGE = "http://code.google.com/p/gnome-mplayer/" +SECTION = "x11/multimedia" +LICENSE = "GPL" +DEPENDS = "gtk+ gconf dbus-glib" +RDEPENDS = "mplayer" + +inherit autotools pkgconfig gconf + +SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz" diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb index c01152cfb8..81031d0ba2 100644 --- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb +++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb @@ -1,14 +1,3 @@ -DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration" -HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/" -LICENSE = "GPL" -DEPENDS = "gtk+ gconf dbus-glib" -RDEPENDS = "mplayer" -PR = "r3" +require gnome-mplayer.inc -inherit autotools pkgconfig gconf - -SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \ - file://ac-gthread.patch;patch=1 \ - file://1.patch;patch=1 \ - file://uchar-for-utf8-check.patch;patch=1 \ - file://non-utf8-id3-fallback.patch;patch=1" +PR = "r5" diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb new file mode 100644 index 0000000000..81031d0ba2 --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb @@ -0,0 +1,3 @@ +require gnome-mplayer.inc + +PR = "r5" diff --git a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb deleted file mode 100644 index 5b0cb41707..0000000000 --- a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration" -HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/" -LICENSE = "GPL" -DEPENDS = "gtk+ gconf dbus-glib" -RDEPENDS = "mplayer" -SRCDATE = "20080101" -PV = "0.5.3+cvs${SRCDATE}" -PR = "r5" - -inherit autotools pkgconfig gconf - -S = "${WORKDIR}/${PN}" - -SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \ - file://ac-gthread.patch;patch=1 \ - file://1.patch;patch=1 \ - file://uchar-for-utf8-check.patch;patch=1 \ - file://non-utf8-id3-fallback.patch;patch=1" - -do_install_append() { - sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop -} - diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb new file mode 100644 index 0000000000..fa270f674e --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb @@ -0,0 +1,17 @@ +require gnome-mplayer.inc + +SRCDATE = "20080101" +PV = "0.9.5+svn${SRCDATE}" +PR = "r6" +S = "${WORKDIR}/trunk" + +SRC_URI = "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http \ + file://ac-gthread.patch;patch=1 \ + file://1.patch;patch=1 \ + file://uchar-for-utf8-check.patch;patch=1 \ + file://non-utf8-id3-fallback.patch;patch=1" + +do_install_append() { + sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop +} + diff --git a/recipes/gnome/zenity/fingerscroll.patch b/recipes/gnome/zenity/fingerscroll.patch deleted file mode 100644 index 785d179f03..0000000000 --- a/recipes/gnome/zenity/fingerscroll.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff --git a/src/tree.c b/src/tree.c -index 6dd3f64..32e4826 100644 ---- a/src/tree.c -+++ b/src/tree.c -@@ -46,6 +46,9 @@ static gboolean zenity_tree_column_is_hidden (gint column_index); - static void zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data); - static void zenity_tree_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path, - GtkTreeViewColumn *tree_col, gpointer data); -+static void zenity_tree_drag_start (GtkWidget *widget, GdkEventButton *event, gpointer data); -+static void zenity_tree_drag (GtkWidget *widget, GdkEventMotion *event, gpointer data); -+static void zenity_tree_drag_stop (GtkWidget *widget, GdkEventButton *event, gpointer data); - - static gboolean - zenity_tree_dialog_untoggle (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) -@@ -353,7 +356,12 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) - if (!(tree_data->radiobox || tree_data->checkbox)) - g_signal_connect (G_OBJECT (tree_view), "row-activated", - G_CALLBACK (zenity_tree_row_activated), data); -- -+ -+ /* Connect drag-drop signals for finger scrolling */ -+ tree_data->is_scrolling=FALSE; -+ g_signal_connect (G_OBJECT (tree_view), "motion-notify-event", -+ G_CALLBACK (zenity_tree_drag), tree_data); -+ - /* Create an empty list store */ - model = g_object_new (GTK_TYPE_LIST_STORE, NULL); - -@@ -685,3 +693,56 @@ zenity_tree_extract_column_indexes (char *indexes, int n_columns) - - return result; - } -+void -+zenity_tree_drag_start (GtkWidget *widget, GdkEventButton *event, gpointer data) -+{ -+ ZenityTreeData *zen_data=data; -+ zen_data->is_scrolling=TRUE; -+ zen_data->start_scroll_x=event->x; -+ zen_data->start_scroll_y=event->y; -+ -+ GtkTreeView *tree_view=GTK_TREE_VIEW(widget); -+ zen_data->start_scroll_v_adjustment= -+ gtk_adjustment_get_value (gtk_tree_view_get_vadjustment(tree_view)); -+ zen_data->start_scroll_h_adjustment= -+ gtk_adjustment_get_value (gtk_tree_view_get_hadjustment(tree_view)); -+ zen_data->last_scroll_time=event->time; -+} -+ -+void -+zenity_tree_drag (GtkWidget *widget, GdkEventMotion *event, gpointer data) -+{ -+ ZenityTreeData *zen_data=data; -+ -+ if ((event->state & GDK_BUTTON1_MASK) && -+ (event->time-zen_data->last_scroll_time>50)) -+ { -+ if (!zen_data->is_scrolling) -+ zenity_tree_drag_start(widget,event,data) ; -+ -+ -+ gint dy=event->y-zen_data->start_scroll_y; -+ gint dx=event->x-zen_data->start_scroll_x; -+ -+ GtkTreeView *tree_view=GTK_TREE_VIEW(widget); -+ GtkAdjustment *vAdjustment = gtk_tree_view_get_vadjustment(tree_view); -+ GtkAdjustment *hAdjustment = gtk_tree_view_get_hadjustment(tree_view); -+ gtk_adjustment_set_value (vAdjustment, -+ CLAMP (zen_data->start_scroll_v_adjustment-dy, -+ vAdjustment->lower, -+ vAdjustment->upper - vAdjustment->page_size)); -+ gtk_adjustment_set_value (hAdjustment, -+ CLAMP (zen_data->start_scroll_h_adjustment-dx, -+ hAdjustment->lower, -+ hAdjustment->upper - hAdjustment->page_size)); -+ zen_data->last_scroll_time=event->time; -+ } -+ if (zen_data->is_scrolling && !(event->state & GDK_BUTTON1_MASK)) -+ zenity_tree_drag_stop(widget,event,data); -+} -+void -+zenity_tree_drag_stop (GtkWidget *widget, GdkEventButton *event, gpointer data) -+{ -+ ZenityTreeData *zen_data=data; -+ zen_data->is_scrolling=FALSE; -+} -diff --git a/src/zenity.h b/src/zenity.h -index ac6c4f8..d40d8df 100644 ---- a/src/zenity.h -+++ b/src/zenity.h -@@ -113,6 +113,12 @@ typedef struct { - gboolean editable; - gchar *print_column; - gchar *hide_column; -+ gint start_scroll_x; -+ gint start_scroll_y; -+ gdouble start_scroll_v_adjustment; -+ gdouble start_scroll_h_adjustment; -+ gboolean is_scrolling; -+ guint32 last_scroll_time; - const gchar **data; - } ZenityTreeData; - diff --git a/recipes/gnome/zenity/makefile.patch b/recipes/gnome/zenity/makefile.patch deleted file mode 100644 index 9bdd5dd08e..0000000000 --- a/recipes/gnome/zenity/makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -c -r patcher_original/zenity-2.20.1/src/Makefile.am zenity-2.20.1/src/Makefile.am -*** patcher_original/zenity-2.20.1/src/Makefile.am Mon Nov 26 22:57:40 2007 ---- zenity-2.20.1/src/Makefile.am Thu Apr 2 00:31:39 2009 -*************** -*** 21,27 **** - zenity.h - - zenity_CPPFLAGS = \ -- -I$(includedir) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DZENITY_DATADIR=\""$(pkgdatadir)"\" \ - $(AM_CPPFLAGS) ---- 21,26 ---- diff --git a/recipes/gnome/zenity/no-gnome-doc.patch b/recipes/gnome/zenity/no-gnome-doc.patch deleted file mode 100644 index 6b2e2bd4b8..0000000000 --- a/recipes/gnome/zenity/no-gnome-doc.patch +++ /dev/null @@ -1,69 +0,0 @@ -*** patcher_original/zenity-2.20.1/configure.in 2007-11-26 22:57:45.000000000 +0100 ---- zenity-2.20.1/configure.in 2009-04-10 23:08:11.000000000 +0200 -*************** -*** 8,14 **** - AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) - - GNOME_COMMON_INIT -! GNOME_DOC_INIT - - AM_MAINTAINER_MODE - ---- 8,14 ---- - AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) - - GNOME_COMMON_INIT -! #GNOME_DOC_INIT - - AM_MAINTAINER_MODE - -*** patcher_original/zenity-2.20.1/Makefile.am 2007-11-26 22:57:45.000000000 +0100 ---- zenity-2.20.1/Makefile.am 2009-04-10 23:30:20.000000000 +0200 -*************** -*** 1,8 **** - SUBDIRS = \ - src \ - po \ -! data \ -! help - - EXTRA_DIST = \ - autogen.sh \ ---- 1,8 ---- - SUBDIRS = \ - src \ - po \ -! data -! # help - - EXTRA_DIST = \ - autogen.sh \ -*************** -*** 16,28 **** - ChangeLog \ - NEWS \ - README \ -! AUTHORS \ -! gnome-doc-utils.make - - DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ -! intltool-update \ -! gnome-doc-utils.make - - DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper ---- 16,28 ---- - ChangeLog \ - NEWS \ - README \ -! AUTHORS -! # gnome-doc-utils.make - - DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ -! intltool-update -! # gnome-doc-utils.make - - DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff --git a/recipes/granule/granule.inc b/recipes/granule/granule.inc index ba32d489f4..71ac55db2d 100644 --- a/recipes/granule/granule.inc +++ b/recipes/granule/granule.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-${MINVER}.tar.gz" inherit autotools pkgconfig diff --git a/recipes/granule/granule_1.2.4.bb b/recipes/granule/granule_1.2.4.bb deleted file mode 100644 index cb01eb0388..0000000000 --- a/recipes/granule/granule_1.2.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require granule.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-1.tar.gz" - diff --git a/recipes/granule/granule_1.4.0.bb b/recipes/granule/granule_1.4.0.bb new file mode 100644 index 0000000000..109a3b4c97 --- /dev/null +++ b/recipes/granule/granule_1.4.0.bb @@ -0,0 +1,4 @@ +require granule.inc + +MINVER = "7" +S = "${WORKDIR}/${P}-${MINVER}" diff --git a/recipes/images/nylon-image-base.bb b/recipes/images/nylon-image-base.bb index 27dc165800..416be1fae5 100644 --- a/recipes/images/nylon-image-base.bb +++ b/recipes/images/nylon-image-base.bb @@ -1,25 +1,36 @@ inherit image inherit nylon-image +IMAGE_FSTYPES = "jffs2 tar.gz" + export IMAGE_BASENAME = "nylon-base" NYLON_BASE = "base-files base-passwd bash busybox \ ipkg initscripts less \ + madwifi-modules \ mtd-utils \ + nylon-scripts \ nano ncurses netbase \ - openssh sysvinit \ - tzdata tinylogin udev" + openssh \ + pciutils \ + sysvinit \ + tinylogin \ + tzdata \ + wireless-tools wlan-ng-utils" DEPENDS += "virtual/kernel less nano" -IMAGE_INSTALL = "kernel less nano elvis-tiny \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" ## kernel 2.4 ## -RDEPENDS_append_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" -RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" ## kernel 2.6 ## -RDEPENDS_append_mtx-3 = " module-init-tools udev" -RDEPENDS_append_mtx-3a = " module-init-tools" +NYLON_IMAGE_RDEPENDS_mtx-3 = " module-init-tools udev" +NYLON_IMAGE_RDEPENDS_mtx-3a = " module-init-tools" + +RDEPENDS_append = ${NYLON_IMAGE_RDEPENDS} + +IMAGE_INSTALL = "kernel less nano elvis-tiny \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS} ${NYLON_IMAGE_RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/recipes/images/nylon-image-extended.bb b/recipes/images/nylon-image-extended.bb index 7a4e5b6c88..4fb324d52f 100644 --- a/recipes/images/nylon-image-extended.bb +++ b/recipes/images/nylon-image-extended.bb @@ -61,7 +61,6 @@ KERNEL_MODULES = " \ kernel-module-ds \ kernel-module-fat \ kernel-module-mii \ - kernel-module-pcmcia-core \ kernel-module-scsi-mod \ kernel-module-sd-mod \ kernel-module-usb-storage \ diff --git a/recipes/images/nylon-image-standard.bb b/recipes/images/nylon-image-standard.bb index 5f79402c99..9238b0f8b2 100644 --- a/recipes/images/nylon-image-standard.bb +++ b/recipes/images/nylon-image-standard.bb @@ -3,15 +3,21 @@ require nylon-image-base.bb export IMAGE_BASENAME = "nylon-standard" NYLON_STANDARD = "\ - hostap-utils \ + dash \ + dnsmasq \ + hostap-daemon hostap-utils \ linux-hotplug \ ifplugd \ + iproute2 \ + madwifi-modules \ + nylon-config \ olsrd \ ppp \ rp-pppoe \ - shorewall \ + simple-firewall \ tcpdump \ - wpa-supplicant" + wpa-supplicant \ + yamonenv" DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" diff --git a/recipes/kanatest/kanatest.inc b/recipes/kanatest/kanatest.inc index 254091c60c..64f87616c2 100644 --- a/recipes/kanatest/kanatest.inc +++ b/recipes/kanatest/kanatest.inc @@ -1,14 +1,19 @@ -SECTION = "gpe/games" DESCRIPTION = "Hiragana and Katakana drill tool" +HOMEPAGE = "http://clayo.org/kanatest/ +SECTION = "gpe/games" LICENSE = "GPL" - DEPENDS = "gtk+" -FILES_${PN} = "${bindir}/${PN} ${datadir}/${PN} ${datadir}/pixmaps ${datadir}/applications" +SRC_URI = "http://clayo.org/kanatest/${PN}-${PV}.tar.gz \ + file://${PN}.desktop" inherit autotools gettext +CFLAGS += "-D_GNU_SOURCE" + do_install_append () { install -d ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/${PN}.desktop ${D}${datadir}/applications/${PN}.desktop } + +FILES_${PN} = "${bindir}/${PN} ${datadir}/${PN} ${datadir}/pixmaps ${datadir}/applications" diff --git a/recipes/kanatest/kanatest_0.3.6.bb b/recipes/kanatest/kanatest_0.3.6.bb index f0b17a2af9..809812f1ce 100644 --- a/recipes/kanatest/kanatest_0.3.6.bb +++ b/recipes/kanatest/kanatest_0.3.6.bb @@ -1,8 +1,5 @@ -PR = "r0" - -SRC_URI = "http://clay.ll.pl/download/${PN}-${PV}.tar.gz file://${PN}.desktop" - require kanatest.inc -CFLAGS += "-D_GNU_SOURCE" - +PR = "r1" +SRC_URI = "${DEBIAN_MIRROR}/main/k/kanatest/${PN}_${PV}.orig.tar.gz \ + file://${PN}.desktop" diff --git a/recipes/kanatest/kanatest_0.4.8.bb b/recipes/kanatest/kanatest_0.4.8.bb new file mode 100644 index 0000000000..1d71e27db2 --- /dev/null +++ b/recipes/kanatest/kanatest_0.4.8.bb @@ -0,0 +1,3 @@ +require kanatest.inc + +PR = "r0" diff --git a/recipes/kexec/files/kexec2-klibc.patch b/recipes/kexec/files/kexec2-klibc.patch index b80848d291..a7dbe61d13 100644 --- a/recipes/kexec/files/kexec2-klibc.patch +++ b/recipes/kexec/files/kexec2-klibc.patch @@ -55,19 +55,16 @@ Index: kexec-tools-2.0.0/kexec/ifdown.c #include <netinet/in.h> Index: kexec-tools-2.0.0/purgatory/Makefile =================================================================== ---- kexec-tools-2.0.0.orig/purgatory/Makefile 2009-04-24 14:15:34.037827479 +0100 -+++ kexec-tools-2.0.0/purgatory/Makefile 2009-04-24 14:15:47.022825503 +0100 -@@ -55,9 +54,7 @@ - -I$(srcdir)/purgatory/arch/$(ARCH)/include \ - -I$(srcdir)/util_lib/include \ - -I$(shell $(CC) -print-file-name=include) --$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ -- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ -- -e purgatory_start -r -+$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) +--- kexec-tools-2.0.0.orig/purgatory/Makefile 2009-05-19 14:15:34.037827479 +0100 ++++ kexec-tools-2.0.0/purgatory/Makefile 2009-05-19 14:15:47.022825503 +0100 +@@ -47,6 +47,7 @@ + $(PURGATORY): CC=$(TARGET_CC) + $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -Os -fno-builtin -ffreestanding \ ++ -nostdinc \ + -fno-zero-initialized-in-bss - $(PURGATORY): $(PURGATORY_OBJS) - $(MKDIR) -p $(@D) + $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ Index: kexec-tools-2.0.0/purgatory/purgatory.c =================================================================== --- kexec-tools-2.0.0.orig/purgatory/purgatory.old 2009-05-16 13:28:19.000000000 +0200 diff --git a/recipes/linux/linux-davinci/update-mach-types.patch b/recipes/linux/linux-davinci/update-mach-types.patch index 43d16a563c..f72836bf41 100644 --- a/recipes/linux/linux-davinci/update-mach-types.patch +++ b/recipes/linux/linux-davinci/update-mach-types.patch @@ -155,6 +155,6 @@ +rd78x00_masa MACH_RD78X00_MASA RD78X00_MASA 2135 +smallogger MACH_SMALLOGGER SMALLOGGER 2136 +ccw9p9215 MACH_CCW9P9215 CCW9P9215 2137 -+dm355_leopard MACH_DM355_LEOPARD DM355_LEOPARD 1381 ++dm355_leopard MACH_DM355_LEOPARD DM355_LEOPARD 2138 +ts219 MACH_TS219 TS219 2139 +tny_a9263 MACH_TNY_A9263 TNY_A9263 2140 diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index 332aeb6e04..fb60707219 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "486afa37130356662213cc1a2199a285b4fd72af" PV = "2.6.29+2.6.29-rc7-${PR}+gitr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ file://update-mach-types.patch;patch=1 \ diff --git a/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch b/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch index 4e8a7576bd..f4a8754228 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch +++ b/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch @@ -1,6 +1,15 @@ diff -Naru linux/arch/mips/Makefile linux.spi/arch/mips/Makefile --- linux/arch/mips/Makefile 2004-05-06 15:23:41.000000000 -0400 +++ linux.spi/arch/mips/Makefile 2004-05-11 23:19:24.000000000 -0400 +@@ -17,7 +17,7 @@ + # Select the object file format to substitute into the linker script. + # + ifdef CONFIG_CPU_LITTLE_ENDIAN +-tool-prefix = mipsel-linux- ++tool-prefix = mipsel-nylon-linux- + ld-emul = elf32ltsmip + else + tool-prefix = mips-linux- @@ -29,6 +29,8 @@ endif diff --git a/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff b/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff index bfc1af9db9..1651bd5678 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff +++ b/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff @@ -1,5 +1,5 @@ ---- linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 -+++ linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 +--- linux-old/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 ++++ linux/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 @@ -499,6 +499,19 @@ /* get_usb_serial checks port->tty, so cannot be used */ serial = port->serial; diff --git a/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff b/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff index e615a92fa4..91690057e2 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff +++ b/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff @@ -1,5 +1,53 @@ ---- linux/drivers/usb/serial/usbserial.c~33-usbserial-bulk_in_size-4096.diff 2006-03-31 15:05:46.674445000 +0200 -+++ linux/drivers/usb/serial/usbserial.c 2006-04-07 12:23:56.970400500 +0200 +--- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 ++++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 +@@ -155,6 +155,11 @@ + unsigned char clocal; /* termios CLOCAL */ + }; + ++/* global params controlling max sizes for read, write, control */ ++static int maxszr = 0; ++static int maxszw = 0; ++static int maxszc = 0; ++ + static struct usb_driver acm_driver; + static struct tty_driver acm_tty_driver; + static struct acm *acm_table[ACM_TTY_MINORS]; +@@ -573,9 +578,13 @@ + } + memset(acm, 0, sizeof(struct acm)); + +- ctrlsize = epctrl->wMaxPacketSize; +- readsize = epread->wMaxPacketSize; +- acm->writesize = epwrite->wMaxPacketSize; ++ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? ++ epctrl->wMaxPacketSize: maxszc; ++ readsize = (epread->wMaxPacketSize > maxszr)? ++ epread->wMaxPacketSize: maxszr; ++ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? ++ epwrite->wMaxPacketSize: maxszw; ++ + acm->iface = cfacm->interface + j; + acm->minor = minor; + acm->dev = dev; +@@ -740,6 +749,16 @@ + module_init(acm_init); + module_exit(acm_exit); + ++ ++MODULE_PARM(maxszr, "i"); ++MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); ++ ++MODULE_PARM(maxszw, "i"); ++MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); ++ ++MODULE_PARM(maxszc, "i"); ++MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); ++ + MODULE_AUTHOR( DRIVER_AUTHOR ); + MODULE_DESCRIPTION( DRIVER_DESC ); + MODULE_LICENSE("GPL"); +--- linux/drivers/usb/serial/usbserial.c-orig 2009-02-27 23:34:48.000000000 +0100 ++++ linux/drivers/usb/serial/usbserial.c 2009-02-27 23:34:54.000000000 +0100 @@ -332,6 +332,9 @@ static __u16 vendor = 0x05f9; static __u16 product = 0xffff; @@ -7,7 +55,7 @@ +static int count_smaller64 = 0; +static int count_bigger64 = 0; + - static struct usb_device_id generic_device_ids[5]; /* Initially all zeroes. */ + static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ /* All of the device info needed for the Generic Serial Converter */ @@ -396,6 +399,10 @@ @@ -66,7 +114,7 @@ port->interrupt_in_endpointAddress = endpoint->bEndpointAddress; port->interrupt_in_buffer = kmalloc (buffer_size, GFP_KERNEL); if (!port->interrupt_in_buffer) { -@@ -1807,6 +1825,7 @@ +@@ -1798,6 +1816,7 @@ static void __exit usb_serial_exit(void) { @@ -74,7 +122,7 @@ #ifdef CONFIG_USB_SERIAL_GENERIC /* remove our generic driver */ -@@ -1874,6 +1893,15 @@ +@@ -1865,6 +1884,15 @@ MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug enabled or not"); @@ -90,51 +138,3 @@ #ifdef CONFIG_USB_SERIAL_GENERIC MODULE_PARM(vendor, "h"); MODULE_PARM_DESC(vendor, "User specified USB idVendor"); ---- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 -+++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 -@@ -155,6 +155,11 @@ - unsigned char clocal; /* termios CLOCAL */ - }; - -+/* global params controlling max sizes for read, write, control */ -+static int maxszr = 0; -+static int maxszw = 0; -+static int maxszc = 0; -+ - static struct usb_driver acm_driver; - static struct tty_driver acm_tty_driver; - static struct acm *acm_table[ACM_TTY_MINORS]; -@@ -573,9 +578,13 @@ - } - memset(acm, 0, sizeof(struct acm)); - -- ctrlsize = epctrl->wMaxPacketSize; -- readsize = epread->wMaxPacketSize; -- acm->writesize = epwrite->wMaxPacketSize; -+ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? -+ epctrl->wMaxPacketSize: maxszc; -+ readsize = (epread->wMaxPacketSize > maxszr)? -+ epread->wMaxPacketSize: maxszr; -+ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? -+ epwrite->wMaxPacketSize: maxszw; -+ - acm->iface = cfacm->interface + j; - acm->minor = minor; - acm->dev = dev; -@@ -740,6 +749,16 @@ - module_init(acm_init); - module_exit(acm_exit); - -+ -+MODULE_PARM(maxszr, "i"); -+MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); -+ -+MODULE_PARM(maxszw, "i"); -+MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); -+ -+MODULE_PARM(maxszc, "i"); -+MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); -+ - MODULE_AUTHOR( DRIVER_AUTHOR ); - MODULE_DESCRIPTION( DRIVER_DESC ); - MODULE_LICENSE("GPL"); diff --git a/recipes/linux/linux-mtx-1-2.4.27/43-usbserial-27-32-backport.diff b/recipes/linux/linux-mtx-1-2.4.27/43-usbserial-27-32-backport.diff new file mode 100644 index 0000000000..6a98f76c7a --- /dev/null +++ b/recipes/linux/linux-mtx-1-2.4.27/43-usbserial-27-32-backport.diff @@ -0,0 +1,33 @@ +--- linux/drivers/usb/serial/usbserial.c-27 2006-06-27 10:26:06.294476250 +0200 ++++ linux/drivers/usb/serial/usbserial.c 2006-06-27 10:30:31.011020000 +0200 +@@ -528,8 +528,18 @@ + down(&port->sem); + dbg("%s - port %d len %d backlog %d", __FUNCTION__, + port->number, job->len, port->write_backlog); +- if (port->tty != NULL) +- __serial_write(port, 0, job->buff, job->len); ++ if (port->tty != NULL) { ++ int rc; ++ int sent = 0; ++ while (sent < job->len) { ++ rc = __serial_write(port, 0, job->buff + sent, job->len - sent); ++ if ((rc < 0) || signal_pending(current)) ++ break; ++ sent += rc; ++ if ((sent < job->len) && current->need_resched) ++ schedule(); ++ } ++ } + up(&port->sem); + + spin_lock_irqsave(&post_lock, flags); +@@ -725,6 +735,9 @@ + struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data; + int rc; + ++ if (!port) ++ return -ENODEV; ++ + if (!in_interrupt()) { + /* + * Run post_list to reduce a possiblity of reordered writes. diff --git a/recipes/linux/linux-mtx-1-2.4.27/45-acm-tty-and-sb2.patch b/recipes/linux/linux-mtx-1-2.4.27/45-acm-tty-and-sb2.patch new file mode 100644 index 0000000000..4561facb73 --- /dev/null +++ b/recipes/linux/linux-mtx-1-2.4.27/45-acm-tty-and-sb2.patch @@ -0,0 +1,721 @@ +--- linux/drivers/usb/acm.c-orig 2007-04-13 18:32:16.352672105 +0200 ++++ linux/drivers/usb/acm.c 2007-04-13 18:33:21.063526545 +0200 +@@ -124,6 +124,9 @@ + #define ACM_CTRL_PARITY 0x20 + #define ACM_CTRL_OVERRUN 0x40 + ++// some devices don't have one comm and one data interface, but only one interface with endpoints for comm and data ++#define SINGLE_IF_ACM 0x01 ++ + /* + * Line speed and caracter encoding. + */ +@@ -139,6 +142,8 @@ + * Internal driver structures. + */ + ++#define TD_SIZE 16384 ++ + struct acm { + struct usb_device *dev; /* the coresponding usb device */ + struct usb_interface *iface; /* the interfaces - +0 control +1 data */ +@@ -153,12 +158,23 @@ + unsigned int minor; /* acm minor number */ + unsigned char throttle; /* throttled by tty layer */ + unsigned char clocal; /* termios CLOCAL */ ++ unsigned long throttle_start; ++ unsigned char resubmit_to_unthrottle; /* Leftover data from last operation */ ++ unsigned char *throttle_data; ++ int td_len; ++ int td_busy; ++ unsigned char used_interfaces; ++ struct semaphore mutex; + }; + ++#define mutex_lock(x) down(x) ++#define mutex_unlock(x) up(x) ++ + /* global params controlling max sizes for read, write, control */ + static int maxszr = 0; + static int maxszw = 0; + static int maxszc = 0; ++static int nonlegacy = 0; + + static struct usb_driver acm_driver; + static struct tty_driver acm_tty_driver; +@@ -167,6 +183,95 @@ + #define ACM_READY(acm) (acm && acm->dev && acm->used) + + /* ++ * Helper functions to optimize throttleing ++ */ ++static int ++acm_fill_tty(struct urb *urb, struct tty_struct *tty, unsigned char *data, int length) ++{ ++ struct acm *acm = urb->context; ++ int n = 0; ++ /*printk("acm_fill_tty: %d bytes\n", length);*/ ++ if (!urb->status && !acm->throttle) { ++ for (n = 0; n < length && !acm->throttle; n++) { ++ /* if we insert more than TTY_FLIPBUF_SIZE characters, ++ * we drop them. */ ++ if (tty->flip.count >= TTY_FLIPBUF_SIZE) { ++ tty_flip_buffer_push(tty); ++ } ++ tty_insert_flip_char(tty, data[n], 0); ++ } ++ tty_flip_buffer_push(tty); ++ } ++ /*printk("copied %d bytes.\n", n);*/ ++ return n; ++} ++ ++static int ++acm_shift_if_throttle(unsigned char *data, int *length, int shift_by) ++{ ++ if (shift_by < *length) { ++ dbg("need to shift uncopied %d bytes to front.", *length - shift_by); ++ memmove(data, data + shift_by, *length - shift_by); ++ *length -= shift_by; ++ return 1; ++ } ++ return 0; ++} ++ ++static int ++acm_buffer_if_thottle(struct acm *acm, unsigned char *data, int start, int *length) ++{ ++ int copied = *length; ++ if (start < *length) { ++ int space = TD_SIZE - acm->td_len; ++ int needed = *length - start; ++ copied = (space < needed)? space: needed; ++ dbg("need to push %d to throttle buffer, can copy %d.", ++ needed, copied); ++ memcpy(acm->throttle_data + acm->td_len, data, copied); ++ acm->td_len += copied; ++ *length -= copied; ++ } ++ return copied; ++} ++ ++static int ++acm_empty_throttle(struct urb *urb, struct tty_struct *tty) ++{ ++ unsigned long flags; ++ struct acm *acm = urb->context; ++ ++ save_flags(flags); ++ cli(); ++ ++ if (acm->td_busy) { ++ restore_flags(flags); ++ return 0; ++ } ++ acm->td_busy = 1; ++ restore_flags(flags); ++ ++ if (acm->td_len > 0) { ++ ++ dbg("acm_empty_throttle: trying to empty throttle buffer: %d bytes.", ++ acm->td_len); ++ ++ /* if there has been something left from previous operations ++ * we try to complete this before looking at the urb */ ++ int copied = acm_fill_tty(urb, tty, acm->throttle_data, acm->td_len); ++ if (acm_shift_if_throttle(acm->throttle_data, &acm->td_len, copied)) { ++ /* we were unable to empty the throttle data, so we can't ++ * copy anything more now */ ++ acm->td_busy = 0; ++ return 0; ++ } ++ acm->td_len = 0; ++ } ++ acm->td_busy = 0; ++ return 1; ++} ++ ++/* + * Functions for ACM control messages. + */ + +@@ -174,7 +279,10 @@ + { + int retval = usb_control_msg(acm->dev, usb_sndctrlpipe(acm->dev, 0), + request, USB_RT_ACM, value, acm->iface[0].altsetting[0].bInterfaceNumber, buf, len, HZ * 5); +- dbg("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval); ++ if (retval < 0) ++ err("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval); ++ else ++ dbg("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval); + return retval < 0 ? retval : 0; + } + +@@ -191,10 +299,12 @@ + struct acm *acm = urb->context; + struct usb_ctrlrequest *dr = urb->transfer_buffer; + unsigned char *data = (unsigned char *)(dr + 1); +- int newctrl; ++ int newctrl, s1, s2; + + if (!ACM_READY(acm)) return; + ++ //err("acm_ctrl_irq %p %i", urb, dr->bRequestType); ++ + if (urb->status < 0) { + dbg("nonzero ctrl irq status received: %d", urb->status); + return; +@@ -226,8 +336,15 @@ + + return; + ++ case 0x2a: ++ s1 = le32_to_cpup((__u32 *) data); ++ s2 = le32_to_cpup((__u32 *) (data+4)); ++ ++ dbg("acm.c: ctrl 0x2a: idx %i len %i speed %i %i", dr->wIndex, dr->wLength, s1, s2); ++ return; ++ + default: +- dbg("unknown control event received: request %d index %d len %d data0 %d data1 %d", ++ err("unknown control event received: request %d index %d len %d data0 %d data1 %d", + dr->bRequest, dr->wIndex, dr->wLength, data[0], data[1]); + return; + } +@@ -238,36 +355,39 @@ + struct acm *acm = urb->context; + struct tty_struct *tty = acm->tty; + unsigned char *data = urb->transfer_buffer; +- int i = 0; ++ int copied = 0; ++ int buffered = 0; + + if (!ACM_READY(acm)) return; + +- if (urb->status) +- dbg("nonzero read bulk status received: %d", urb->status); ++ if (urb->status) { ++ err("nonzero read bulk status received: %d", urb->status); ++ } + +- if (!urb->status && !acm->throttle) { +- for (i = 0; i < urb->actual_length && !acm->throttle; i++) { +- /* if we insert more than TTY_FLIPBUF_SIZE characters, +- * we drop them. */ +- if (tty->flip.count >= TTY_FLIPBUF_SIZE) { +- tty_flip_buffer_push(tty); +- } +- tty_insert_flip_char(tty, data[i], 0); +- } +- tty_flip_buffer_push(tty); ++ if (!acm_empty_throttle(urb, tty)) { ++ dbg("could not empty throttle buffer, entering throttle state, acm->td_busy: %d.", acm->td_busy); + } + ++ /* got here, either there was nothing in the throttle data or it could ++ * all be copied without throttleing again */ ++ copied = acm_fill_tty(urb, tty, data, urb->actual_length); + if (acm->throttle) { +- memmove(data, data + i, urb->actual_length - i); +- urb->actual_length -= i; +- return; ++ int length = urb->actual_length; ++ buffered = acm_buffer_if_thottle(acm, data, copied, &urb->actual_length); ++ if (buffered < length - copied ++ && acm_shift_if_throttle(data, &urb->actual_length, copied + buffered)) { ++ dbg("need to resubmit to unthrottle\n"); ++ acm->resubmit_to_unthrottle = 1; ++ return; ++ } + } + + urb->actual_length = 0; + urb->dev = acm->dev; + +- if (usb_submit_urb(urb)) ++ if (usb_submit_urb(urb)) { + dbg("failed resubmitting read urb"); ++ } + } + + static void acm_write_bulk(struct urb *urb) +@@ -283,6 +403,9 @@ + mark_bh(IMMEDIATE_BH); + } + ++static int unlinking_in_progress=0; ++static int closing=0; ++ + static void acm_softint(void *private) + { + struct acm *acm = private; +@@ -306,34 +429,57 @@ + + if (!acm || !acm->dev) return -EINVAL; + ++ mutex_lock (&acm->mutex); ++ + tty->driver_data = acm; + acm->tty = tty; + + MOD_INC_USE_COUNT; + +- lock_kernel(); ++ if ( closing ) ++ err("acm_tty_open: potential possibility of race condition detected"); ++ ++ if ( unlinking_in_progress ) { ++ err("acm_tty_open: cannot open because unlinking_in_progress %i", acm->used); ++ mutex_unlock (&acm->mutex); ++ return -1; ++ } + +- if (acm->used++) { +- unlock_kernel(); +- return 0; +- } ++ if (acm->used) { ++ acm->used++; ++ mutex_unlock (&acm->mutex); ++ return 0; ++ } + +- unlock_kernel(); ++ unlinking_in_progress=1; ++ err("acm_tty_open: %i %p !!", acm->used, tty); ++ ++ acm->resubmit_to_unthrottle = 0; ++ acm->td_len = 0; ++ acm->td_busy = 0; + + acm->ctrlurb.dev = acm->dev; + if (usb_submit_urb(&acm->ctrlurb)) +- dbg("usb_submit_urb(ctrl irq) failed"); ++ dbg("acm open: usb_submit_urb(ctrl irq) failed"); ++ else ++ dbg("acm open: ctrlurb %p submitted", &acm->ctrlurb); ++ ++ acm->used++; ++ acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS); + + acm->readurb.dev = acm->dev; + if (usb_submit_urb(&acm->readurb)) +- dbg("usb_submit_urb(read bulk) failed"); +- +- acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS); ++ dbg("acm open: usb_submit_urb(read bulk) failed"); ++ else ++ dbg("acm open: readurb %p submitted", &acm->readurb); + +- /* force low_latency on so that our tty_push actually forces the data through, ++ /* force low_latency on so that our tty_push actually forces the data through, + otherwise it is scheduled, and with high data rates data can get lost. */ + tty->low_latency = 1; + ++ unlinking_in_progress=0; ++ mutex_unlock (&acm->mutex); ++ + return 0; + } + +@@ -343,19 +489,35 @@ + + if (!acm || !acm->used) return; + +- if (!--acm->used) { +- if (acm->dev) { +- acm_set_control(acm, acm->ctrlout = 0); +- usb_unlink_urb(&acm->ctrlurb); +- usb_unlink_urb(&acm->writeurb); +- usb_unlink_urb(&acm->readurb); +- } else { +- tty_unregister_devfs(&acm_tty_driver, acm->minor); +- acm_table[acm->minor] = NULL; +- kfree(acm); +- } ++ mutex_lock (&acm->mutex); ++ ++ closing = 1; ++ if (--acm->used) { ++ closing=0; ++ MOD_DEC_USE_COUNT; ++ mutex_unlock (&acm->mutex); ++ return; ++ } ++ unlinking_in_progress = 1; ++ ++ err("acm_tty_close: %i %p", acm->used, tty); ++ ++ if (acm->dev) { ++ acm_set_control(acm, acm->ctrlout = 0); ++ usb_unlink_urb(&acm->ctrlurb); ++ usb_unlink_urb(&acm->writeurb); ++ usb_unlink_urb(&acm->readurb); ++ } else { ++ tty_unregister_devfs(&acm_tty_driver, acm->minor); ++ acm_table[acm->minor] = NULL; ++ kfree(acm->throttle_data); ++ kfree(acm); + } ++ ++ closing=0; ++ unlinking_in_progress = 0; + MOD_DEC_USE_COUNT; ++ mutex_unlock (&acm->mutex); + } + + static int acm_tty_write(struct tty_struct *tty, int from_user, const unsigned char *buf, int count) +@@ -363,8 +525,16 @@ + struct acm *acm = tty->driver_data; + + if (!ACM_READY(acm)) return -EINVAL; +- if (acm->writeurb.status == -EINPROGRESS) return 0; +- if (!count) return 0; ++ ++ if (acm->writeurb.status == -EINPROGRESS) { ++ dbg("tty_write in progress"); ++ return 0; ++ } ++ ++ if (!count) { ++ dbg("tty_write: nothing to write"); ++ return 0; ++ } + + count = (count > acm->writesize) ? acm->writesize : count; + +@@ -401,22 +571,44 @@ + { + struct acm *acm = tty->driver_data; + if (!ACM_READY(acm)) return; ++ dbg("acm_tty_throttle ON %ld ---> %ld", jiffies-acm->throttle_start, jiffies); + acm->throttle = 1; ++ acm->throttle_start = jiffies; + } + + static void acm_tty_unthrottle(struct tty_struct *tty) + { + struct acm *acm = tty->driver_data; + if (!ACM_READY(acm)) return; ++ dbg("acm_tty_throttle OFF %ld ---> %ld", jiffies, jiffies-acm->throttle_start); + acm->throttle = 0; +- if (acm->readurb.status != -EINPROGRESS) ++ ++ if (!acm_empty_throttle(&acm->readurb, tty)) { ++ if (acm->td_busy) { ++ printk("***** pending acm_empty_throttle!\n"); ++ } else { ++ dbg("throttle not emptied.\n"); ++ } ++ } ++ ++ if (acm->resubmit_to_unthrottle != 0) { ++ dbg("resubmit_to_unthrottle: acm_read_bulk"); ++ acm->resubmit_to_unthrottle = 0; + acm_read_bulk(&acm->readurb); ++ } + } + + static void acm_tty_break_ctl(struct tty_struct *tty, int state) + { + struct acm *acm = tty->driver_data; ++ + if (!ACM_READY(acm)) return; ++ ++ if (nonlegacy) { ++ err("non-legacy port, skipping acm_tty_break_ctl"); ++ return; ++ } ++ + if (acm_send_break(acm, state ? 0xffff : 0)) + dbg("send break failed"); + } +@@ -455,7 +647,19 @@ + case TIOCMBIC: newctrl &= ~mask; break; + } + +- if (acm->ctrlout == newctrl) return 0; ++ if (acm->ctrlout == newctrl) { ++ dbg("acm_tty_ioctl: set old state %x", newctrl); ++ return 0; ++ } ++ ++ err("acm_tty_ioctl: %s%s%s -> dtr%s rts%s (%lx)", ++ cmd==TIOCMBIC?"Clear":(cmd==TIOCMBIS?"Set":"SET"), ++ mask & ACM_CTRL_DTR ? " DTR":"", ++ mask & ACM_CTRL_RTS ? " RTS":"", ++ newctrl & ACM_CTRL_DTR ? "+":"-", ++ newctrl & ACM_CTRL_RTS ? "+":"-", ++ arg); ++ + return acm_set_control(acm, acm->ctrlout = newctrl); + } + +@@ -483,6 +687,12 @@ + + if (!ACM_READY(acm)) return; + ++ if (nonlegacy) { ++ acm->clocal = ((termios->c_cflag & CLOCAL) != 0); ++ dbg("non-legacy port, skipping acm_tty_set_termios"); ++ return; ++ } ++ + newline.speed = cpu_to_le32p(acm_tty_speed + + (termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0)); + newline.stopbits = termios->c_cflag & CSTOPB ? 2 : 0; +@@ -518,34 +727,64 @@ + struct usb_config_descriptor *cfacm; + struct usb_interface_descriptor *ifcom, *ifdata; + struct usb_endpoint_descriptor *epctrl, *epread, *epwrite; +- int readsize, ctrlsize, minor, i, j; ++ int readsize, ctrlsize, minor, i; + unsigned char *buf; ++ unsigned char used_interfaces=2; + + for (i = 0; i < dev->descriptor.bNumConfigurations; i++) { + + cfacm = dev->config + i; + +- dbg("probing config %d", cfacm->bConfigurationValue); ++ ifcom = cfacm->interface[ifnum].altsetting + 0; ++ ++ if (id->driver_info == SINGLE_IF_ACM) { ++ printk("using single_if_acm\n"); ++ struct usb_endpoint_descriptor *ep=ifcom->endpoint; ++ int k; ++ ++ if (ifcom->bNumEndpoints != 3) { ++ continue; ++ } ++ ++ epctrl = epread = epwrite = NULL; ++ for (k=0; k<3; ++k, ++ep) { ++ if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT && ++ (ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) { ++ epctrl = ep; ++ } else if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK && ++ (ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) { ++ epread = ep; ++ } else if ( (ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) { ++ epwrite = ep; ++ } ++ } + +- for (j = 0; j < cfacm->bNumInterfaces - 1; j++) { ++ if ( !epctrl || !epread || !epwrite ) { ++ dbg("SINGLE_IF_ACM acm_probe inv eps epctrl %s epread %s epwrite %s", epctrl?"ok":"missing", ++ epread?"ok":"missing", epwrite?"ok":"missing"); ++ dbg("SINGLE_IF_ACM Invalid enpoint configuration"); ++ continue; ++ } + +- if (usb_interface_claimed(cfacm->interface + j) || +- usb_interface_claimed(cfacm->interface + j + 1)) ++ used_interfaces = 1; ++ } else { ++ if ((ifnum+1)>=cfacm->bNumInterfaces || usb_interface_claimed(cfacm->interface + ifnum + 1)) { ++ // no data interface available + continue; ++ } + +- ifcom = cfacm->interface[j].altsetting + 0; +- ifdata = cfacm->interface[j + 1].altsetting + 0; ++ ifdata = cfacm->interface[ifnum + 1].altsetting + 0; + + if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2) { +- ifcom = cfacm->interface[j + 1].altsetting + 0; +- ifdata = cfacm->interface[j].altsetting + 0; ++ ifcom = cfacm->interface[ifnum + 1].altsetting + 0; ++ ifdata = cfacm->interface[ifnum].altsetting + 0; + if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2) + continue; + } + + if (ifcom->bInterfaceClass != 2 || ifcom->bInterfaceSubClass != 2 || +- ifcom->bInterfaceProtocol < 1 || ifcom->bInterfaceProtocol > 6 || +- ifcom->bNumEndpoints < 1) ++ ifcom->bInterfaceProtocol < 1 || ifcom->bInterfaceProtocol > 6 || ++ ifcom->bNumEndpoints < 1) + continue; + + epctrl = ifcom->endpoint + 0; +@@ -553,76 +792,86 @@ + epwrite = ifdata->endpoint + 1; + + if ((epctrl->bEndpointAddress & 0x80) != 0x80 || (epctrl->bmAttributes & 3) != 3 || +- (epread->bmAttributes & 3) != 2 || (epwrite->bmAttributes & 3) != 2 || +- ((epread->bEndpointAddress & 0x80) ^ (epwrite->bEndpointAddress & 0x80)) != 0x80) ++ (epread->bmAttributes & 3) != 2 || (epwrite->bmAttributes & 3) != 2 || ++ ((epread->bEndpointAddress & 0x80) ^ (epwrite->bEndpointAddress & 0x80)) != 0x80) + continue; + +- dbg("using interface %d\n", j); +- + if ((epread->bEndpointAddress & 0x80) != 0x80) { + epread = ifdata->endpoint + 1; + epwrite = ifdata->endpoint + 0; + } ++ } + +- usb_set_configuration(dev, cfacm->bConfigurationValue); ++ usb_set_configuration(dev, cfacm->bConfigurationValue); + +- for (minor = 0; minor < ACM_TTY_MINORS && acm_table[minor]; minor++); +- if (acm_table[minor]) { +- err("no more free acm devices"); +- return NULL; +- } ++ for (minor = 0; minor < ACM_TTY_MINORS && acm_table[minor]; minor++); ++ if (acm_table[minor]) { ++ err("no more free acm devices"); ++ return NULL; ++ } + +- if (!(acm = kmalloc(sizeof(struct acm), GFP_KERNEL))) { +- err("out of memory"); +- return NULL; +- } +- memset(acm, 0, sizeof(struct acm)); ++ if (!(acm = kmalloc(sizeof(struct acm), GFP_KERNEL))) { ++ err("out of memory"); ++ return NULL; ++ } ++ memset(acm, 0, sizeof(struct acm)); + +- ctrlsize = (epctrl->wMaxPacketSize > maxszc)? +- epctrl->wMaxPacketSize: maxszc; +- readsize = (epread->wMaxPacketSize > maxszr)? +- epread->wMaxPacketSize: maxszr; +- acm->writesize = (epwrite->wMaxPacketSize > maxszw)? +- epwrite->wMaxPacketSize: maxszw; +- +- acm->iface = cfacm->interface + j; +- acm->minor = minor; +- acm->dev = dev; +- +- acm->tqueue.routine = acm_softint; +- acm->tqueue.data = acm; +- +- if (!(buf = kmalloc(ctrlsize + readsize + acm->writesize, GFP_KERNEL))) { +- err("out of memory"); +- kfree(acm); +- return NULL; +- } ++ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? ++ epctrl->wMaxPacketSize: maxszc; ++ readsize = (epread->wMaxPacketSize > maxszr)? ++ epread->wMaxPacketSize: maxszr; ++ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? ++ epwrite->wMaxPacketSize: maxszw; ++ ++ init_MUTEX (&acm->mutex); ++ if (!(acm->throttle_data = kmalloc(TD_SIZE * sizeof (*acm->throttle_data), GFP_KERNEL))) { ++ err("out of memory (throttle_data)"); ++ kfree(acm); ++ return NULL; ++ } ++ acm->iface = cfacm->interface + ifnum; ++ acm->minor = minor; ++ acm->dev = dev; + +- FILL_INT_URB(&acm->ctrlurb, dev, usb_rcvintpipe(dev, epctrl->bEndpointAddress), +- buf, ctrlsize, acm_ctrl_irq, acm, epctrl->bInterval); ++ acm->used_interfaces = used_interfaces; + +- FILL_BULK_URB(&acm->readurb, dev, usb_rcvbulkpipe(dev, epread->bEndpointAddress), +- buf += ctrlsize, readsize, acm_read_bulk, acm); +- acm->readurb.transfer_flags |= USB_NO_FSBR; ++ acm->tqueue.routine = acm_softint; ++ acm->tqueue.data = acm; + +- FILL_BULK_URB(&acm->writeurb, dev, usb_sndbulkpipe(dev, epwrite->bEndpointAddress), +- buf += readsize, acm->writesize, acm_write_bulk, acm); +- acm->writeurb.transfer_flags |= USB_NO_FSBR; ++ if (!(buf = kmalloc(ctrlsize + readsize + acm->writesize, GFP_KERNEL))) { ++ err("out of memory (urb buf)"); ++ kfree(acm); ++ return NULL; ++ } + +- printk(KERN_INFO "ttyACM%d: USB ACM device\n", minor); ++ FILL_INT_URB(&acm->ctrlurb, dev, usb_rcvintpipe(dev, epctrl->bEndpointAddress), ++ buf, ctrlsize, acm_ctrl_irq, acm, epctrl->bInterval); + +- acm_set_control(acm, acm->ctrlout); ++ FILL_BULK_URB(&acm->readurb, dev, usb_rcvbulkpipe(dev, epread->bEndpointAddress), ++ buf += ctrlsize, readsize, acm_read_bulk, acm); ++ acm->readurb.transfer_flags |= USB_NO_FSBR; + +- acm->line.speed = cpu_to_le32(9600); +- acm->line.databits = 8; +- acm_set_line(acm, &acm->line); ++ FILL_BULK_URB(&acm->writeurb, dev, usb_sndbulkpipe(dev, epwrite->bEndpointAddress), ++ buf += readsize, acm->writesize, acm_write_bulk, acm); ++ acm->writeurb.transfer_flags |= USB_NO_FSBR; + +- usb_driver_claim_interface(&acm_driver, acm->iface + 0, acm); +- usb_driver_claim_interface(&acm_driver, acm->iface + 1, acm); ++ printk(KERN_INFO "ttyACM%d: USB ACM device C %p W %p R %p %x\n", minor, &acm->ctrlurb, ++ &acm->writeurb, &acm->readurb, acm->ctrlout); ++ ++ acm_set_control(acm, acm->ctrlout); + +- tty_register_devfs(&acm_tty_driver, 0, minor); +- return acm_table[minor] = acm; ++ acm->line.speed = cpu_to_le32(9600); ++ acm->line.databits = 8; ++ acm_set_line(acm, &acm->line); ++ ++ if ( acm->used_interfaces == 2 ) { ++ // only just checked interface is claimed automatically, so claim data interface too ++ usb_driver_claim_interface(&acm_driver, acm->iface + 1, acm); + } ++ ++ tty_register_devfs(&acm_tty_driver, 0, minor); ++ ++ return acm_table[minor] = acm; + } + + return NULL; +@@ -646,7 +895,9 @@ + kfree(acm->ctrlurb.transfer_buffer); + + usb_driver_release_interface(&acm_driver, acm->iface + 0); +- usb_driver_release_interface(&acm_driver, acm->iface + 1); ++ if ( acm->used_interfaces == 2 ) { ++ usb_driver_release_interface(&acm_driver, acm->iface + 1); ++ } + + if (!acm->used) { + tty_unregister_devfs(&acm_tty_driver, acm->minor); +@@ -665,6 +916,9 @@ + + static struct usb_device_id acm_ids[] = { + { USB_DEVICE(0x22B8, 0x1005) }, /* Motorola TimePort 280 */ ++ { USB_DEVICE(0x05C6, 0x7001), driver_info: SINGLE_IF_ACM }, /* Siemens HC15/HC25 */ ++ { USB_DEVICE(0x0681, 0x003e), driver_info: SINGLE_IF_ACM }, /* Siemens HC15/HC25 */ ++ { USB_DEVICE(0x22B8, 0x1006) }, + { USB_DEVICE_INFO(USB_CLASS_COMM, 0, 0) }, + { USB_DEVICE_INFO(USB_CLASS_COMM, 2, 0) }, + { } +@@ -735,7 +989,7 @@ + return -1; + } + +- info(DRIVER_VERSION ":" DRIVER_DESC); ++ info(DRIVER_VERSION ":" DRIVER_DESC "(non-legacy %d)", nonlegacy); + + return 0; + } +@@ -759,7 +1013,9 @@ + MODULE_PARM(maxszc, "i"); + MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); + ++MODULE_PARM(nonlegacy, "i"); ++MODULE_PARM_DESC(nonlegacy, "Set this to 1 to for use with non-legacy device"); ++ + MODULE_AUTHOR( DRIVER_AUTHOR ); + MODULE_DESCRIPTION( DRIVER_DESC ); + MODULE_LICENSE("GPL"); +- diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb index 5815a570ee..6dd7121bae 100644 --- a/recipes/linux/linux-mtx-1_2.4.27.bb +++ b/recipes/linux/linux-mtx-1_2.4.27.bb @@ -35,7 +35,11 @@ SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_ file://26-usbd-amd-pb1x00-kit-23may2003-update.diff;patch=1 \ file://27-usbd-amd-pb1x00-kit-23may2003-usbd.diff;patch=1 \ file://29-au1000-pci-config-clear-errors.diff;patch=1 \ + file://32-usbserial-stalled-hack.diff;patch=1 \ + file://33-usbserial-bulk_in_size-4096.diff;patch=1 \ file://42-usb-ohci-fixes.patch;patch=1 \ + file://43-usbserial-27-32-backport.diff;patch=1 \ + file://45-acm-tty-and-sb2.patch;patch=1 \ file://48-pptp.patch;patch=1 \ file://defconfig-mtx-1" @@ -74,8 +78,8 @@ fi FILES_kernel += " /tmp" do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin - install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec - install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec + install -d 0755 ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin + install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec + install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec } diff --git a/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch b/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch index 48495b5e5f..b4cb9fef9d 100644 --- a/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch +++ b/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch @@ -1,6 +1,15 @@ diff -Naru linux/arch/mips/Makefile linux.spi/arch/mips/Makefile --- linux/arch/mips/Makefile 2004-05-06 15:23:41.000000000 -0400 +++ linux.spi/arch/mips/Makefile 2004-05-11 23:19:24.000000000 -0400 +@@ -17,7 +17,7 @@ + # Select the object file format to substitute into the linker script. + # + ifdef CONFIG_CPU_LITTLE_ENDIAN +-tool-prefix = mipsel-linux- ++tool-prefix = mipsel-nylon-linux- + ld-emul = elf32ltsmip + else + tool-prefix = mips-linux- @@ -29,6 +29,8 @@ endif diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb index 66ce06c6ca..5b26903ec0 100644 --- a/recipes/linux/linux-mtx-2_2.4.27.bb +++ b/recipes/linux/linux-mtx-2_2.4.27.bb @@ -86,8 +86,8 @@ fi FILES_kernel += " /tmp" do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/mips/zboot/images/mtx-2.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin - install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec - install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec + install -d 0755 ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/mips/zboot/images/mtx-2.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin + install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec + install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec } diff --git a/recipes/meta/nylon-feed.inc b/recipes/meta/nylon-feed.inc index d7b83e8edb..f20bcec824 100644 --- a/recipes/meta/nylon-feed.inc +++ b/recipes/meta/nylon-feed.inc @@ -36,6 +36,7 @@ ncurses \ netbase \ netperf \ ntp \ +nylon-config \ nylon-scripts \ nylon-statistics \ olsrd \ @@ -48,7 +49,7 @@ ppp \ pptp-linux \ rrdtool \ ser \ -shorewall \ +simple-firewall \ stunnel \ sysvinit \ tcl \ diff --git a/recipes/netcat/netcat_0.7.1.bb b/recipes/netcat/netcat_0.7.1.bb index c7ceccddf2..7c4dfc5375 100644 --- a/recipes/netcat/netcat_0.7.1.bb +++ b/recipes/netcat/netcat_0.7.1.bb @@ -2,8 +2,17 @@ DESCRIPTION = "GNU Netcat" HOMEPAGE = "http://netcat.sourceforge.net" SECTION = "console/network" LICENSE = "GPLv2" -PR = "r1" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2" -inherit autotools +inherit autotools update-alternatives + +do_install_append() { + mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN} +} + +ALTERNATIVE_NAME = "nc" +ALTERNATIVE_LINK = "${bindir}/nc" +ALTERNATIVE_PATH = "${bindir}/nc.${PN}" +ALTERNATIVE_PRIORITY = "100" diff --git a/recipes/nylon/files/firewall-bash.diff b/recipes/nylon/files/firewall-bash.diff new file mode 100644 index 0000000000..044f8d813c --- /dev/null +++ b/recipes/nylon/files/firewall-bash.diff @@ -0,0 +1,8 @@ +--- nylon-scripts/etc/init.d/firewall-orig 2009-04-25 13:46:25.000000000 +0200 ++++ nylon-scripts/etc/init.d/firewall 2009-04-25 13:46:28.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # this is a meta firewall start script: + # it either starts a local firewall script or shorewall diff --git a/recipes/nylon/files/simple-firewall-bash.diff b/recipes/nylon/files/simple-firewall-bash.diff new file mode 100644 index 0000000000..dc6cf0dd87 --- /dev/null +++ b/recipes/nylon/files/simple-firewall-bash.diff @@ -0,0 +1,8 @@ +--- simple-firewall/etc/init.d/simple-firewall-orig 2009-04-25 13:42:10.000000000 +0200 ++++ simple-firewall/etc/init.d/simple-firewall 2009-04-25 13:42:16.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + #$HeadURL: http://gruen.4g/svn/branches/stable-1.0/application/simple-firewall/etc/init.d/simple-firewall $ $Rev: 2593 $ + + if [ -f /etc/firewall/firewall.conf ]; then diff --git a/recipes/nylon/nylon-config.bb b/recipes/nylon/nylon-config.bb new file mode 100644 index 0000000000..76f78a97f7 --- /dev/null +++ b/recipes/nylon/nylon-config.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "nylon preliminary web configuration interface" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" +LICENSE = "closed" +DEPENDS = "perl virtual/kernel hostap-daemon busybox" +RDEPENDS = "perl perl-module-exporter perl-module-posix perl-module-autoloader perl-module-strict perl-module-xsloader perl-module-data-dumper perl-module-carp perl-module-bytes perl-module-overload perl-module-warnings-register perl-module-warnings kernel-module-aes madwifi-modules hostap-daemon simple-firewall wlan-ng-utils busybox-httpd" +CVSDATE = "20051026" +PV = "cvs${CVSDATE}" + +SRC_URI = "http://br1.einfach.org/nylon/stable/sources/nylon-config_gruen.4g__20051026.tar.gz" +S = "${WORKDIR}/${PN}" + +do_install() { + (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - + # chmod 600 ${D}/etc/certs/stunnel.key + chmod a+x ${D}/srv/www/cgi-bin/* +} + +pkg_postinst() { +#!/bin/sh +if test "x$D" != "x"; then + exit 1 +fi + +# Create resolv.conf-link to ppp-file +rm /etc/resolv.conf +ln -s /etc/ppp/resolv.conf /etc/resolv.conf + +# enable factorydefaults +update-rc.d factorydefaults start 90 2 . + +# "fix" /etc/network/interfaces +perl -I /srv/www/cgi-bin -MConfig::IFace -e '$w=new Config::IFace(); $v = $w->read(); $v->{auto} = {0=>"lo",1=>eth0,2=>"wlan0",3=>"wlan1",4=>"ath0",5=>"ath1"}; $w->write($v)' + +update-rc.d busybox-httpd start 40 2 3 4 5 . +/etc/init.d/busybox-httpd restart +} + +FILES_${PN} += "/srv" + diff --git a/recipes/nylon/nylon-scripts_cvs.bb b/recipes/nylon/nylon-scripts_cvs.bb index 650bd1a8e8..d87e2c11e1 100644 --- a/recipes/nylon/nylon-scripts_cvs.bb +++ b/recipes/nylon/nylon-scripts_cvs.bb @@ -4,12 +4,14 @@ DEPENDS = "hostap-utils" SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" -SRCDATE = "20060923" +#SRCDATE = "20060923" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" PR = "r2" RDEPENDS = "bash" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz \ + file://firewall-bash.diff;patch=1" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/nylon/nylon-statistics.bb b/recipes/nylon/nylon-statistics.bb index ef79bc6d31..c9b790cda0 100644 --- a/recipes/nylon/nylon-statistics.bb +++ b/recipes/nylon/nylon-statistics.bb @@ -3,11 +3,12 @@ RDEPENDS = "rrdtool" SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" -SRCDATE = "20050909" +#SRCDATE = "20050909" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" PR = "r1" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/nylon/simple-firewall.bb b/recipes/nylon/simple-firewall.bb new file mode 100644 index 0000000000..d9e6974480 --- /dev/null +++ b/recipes/nylon/simple-firewall.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "simple firewall configuratiopn script" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Bruno Randolf <br1@einfach.org>" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +# these kernel modules are needed if the functionality is not hard-built into the kernel: +# kernel-module-ip-tables kernel-module-iptable-filter kernel-module-iptable-nat kernel-module-ipt-state kernel-module-ipt-reject kernel-module-ipt-masquerade +RDEPENDS = "kernel-module-ipt-limit kernel-module-ipt-tcpmss" +PV = "cvs20051022" + +SRC_URI = "http://br1.einfach.org/nylon/stable/sources/simple-firewall_gruen.4g__20051022.tar.gz \ + file://simple-firewall-bash.diff;patch=1" +S = "${WORKDIR}/${PN}" + +do_install() { + (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - +} diff --git a/recipes/nylon/yamonenv.bb b/recipes/nylon/yamonenv.bb index e963d913ee..1db737f042 100644 --- a/recipes/nylon/yamonenv.bb +++ b/recipes/nylon/yamonenv.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Reads YAMON environment-variables" SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" -SRCDATE = "20050909" +#SRCDATE = "20050909" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/recipes/pciutils/pciutils-3.1.2/gcc-3-compatibility.patch b/recipes/pciutils/pciutils-3.1.2/gcc-3-compatibility.patch new file mode 100644 index 0000000000..3a10209323 --- /dev/null +++ b/recipes/pciutils/pciutils-3.1.2/gcc-3-compatibility.patch @@ -0,0 +1,11 @@ +--- pciutils-3.1.2/lib/Makefile-orig 2009-02-27 11:31:24.000000000 +0100 ++++ pciutils-3.1.2/lib/Makefile 2009-02-27 11:31:32.000000000 +0100 +@@ -50,7 +50,7 @@ + $(AR) rcs $@ $^ + $(RANLIB) $@ + else +-CFLAGS += -fPIC -fvisibility=hidden ++CFLAGS += -fPIC + $(PCILIB): $(addsuffix .o,$(OBJS)) + $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) + endif diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb index 25782a5549..d7458a1c7a 100644 --- a/recipes/pciutils/pciutils_3.1.2.bb +++ b/recipes/pciutils/pciutils_3.1.2.bb @@ -8,6 +8,7 @@ DEPENDS = "zlib" SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://pciutils.patch;patch=1 " +SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 " PARALLEL_MAKE = "" diff --git a/recipes/ser/ser_0.9.0.bb b/recipes/ser/ser_0.9.0.bb index 25e5936248..010b1528fb 100644 --- a/recipes/ser/ser_0.9.0.bb +++ b/recipes/ser/ser_0.9.0.bb @@ -21,3 +21,5 @@ do_install() { install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/ser oe_runmake bin-target=${sbindir} doc-target=${docdir}/ser modules-target=${libdir}/ser/modules/ cfg-target=${sysconfdir}/ser/ prefix=${D}/usr cfg-prefix=${D} LD='${CC}' install } + +FILES_${PN}-dbg += "${libdir}/ser/modules/.debug ${sbindir}/.debug" diff --git a/recipes/tasks/task-proper-tools.bb b/recipes/tasks/task-proper-tools.bb index c5045a13f5..056109ef86 100644 --- a/recipes/tasks/task-proper-tools.bb +++ b/recipes/tasks/task-proper-tools.bb @@ -1,31 +1,36 @@ DESCRIPTION = "Full versions of tools provided by busybox" -PR = "r9" +PR = "r10" inherit task RDEPENDS_${PN} = "\ + binutils-symlinks \ coreutils \ + cpio \ + debianutils \ + diffutils \ + e2fsprogs \ + e2fsprogs-fsck \ + fbset \ findutils \ - util-linux-ng \ - grep \ gawk \ - sed \ - wget \ - patch \ - tar \ - diffutils \ + grep \ + gzip \ + iproute2 \ + iputils \ less \ - vim \ - e2fsprogs \ - binutils-symlinks \ module-init-tools \ + netcat \ net-tools \ - iproute2 \ - iputils \ + patch \ + procps \ psmisc \ - debianutils \ + sed \ + tar \ tcptraceroute \ - fbset \ + util-linux-ng \ + vim \ + wget \ " # # binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info diff --git a/recipes/tftp-hpa/files/default b/recipes/tftp-hpa/files/default new file mode 100644 index 0000000000..de2ed18202 --- /dev/null +++ b/recipes/tftp-hpa/files/default @@ -0,0 +1,3 @@ +#Defaults for tftpd-hpa +RUN_DAEMON="yes" +OPTIONS="-l -s /srv/tftpboot" diff --git a/recipes/tftp-hpa/files/init b/recipes/tftp-hpa/files/init new file mode 100644 index 0000000000..2a24884550 --- /dev/null +++ b/recipes/tftp-hpa/files/init @@ -0,0 +1,104 @@ +#! /bin/sh +# +# Author: Jaakko Niemi <liiwi@iki.fi> +# Modified from skeleton file in sarge + +### BEGIN INIT INFO +# Provides: tftp-hpa +# Required-Start: $local_fs $remote_fs $syslog $network +# Required-Stop: $local_fs $remote_fs $syslog $network +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: HPA's tftp client +# Description: tftp server to allow booting clients which support +# the PXE protocol. +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="HPA's tftpd" +NAME=in.tftpd +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/tftpd-hpa + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# Read config file if it is present. +if [ -r /etc/default/tftpd-hpa ] +then + . /etc/default/tftpd-hpa +fi + +if [ "$RUN_DAEMON" != "yes" ] ; then + echo "tftpd-hpa disabled in /etc/default/tftpd-hpa" + exit 0 +fi + +# +# Function that starts the daemon/service. +# +d_start() { + start-stop-daemon --start --quiet --exec $DAEMON -- $OPTIONS +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --quiet --name $NAME +} + +# +# Function that sends a SIGHUP to the daemon/service. +# +d_reload() { + start-stop-daemon --stop --quiet --name $NAME --signal 1 +} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME" + d_start + echo "." + ;; + stop) + echo -n "Stopping $DESC: $NAME" + d_stop + echo "." + ;; + #reload) + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this an "exit 0". + # + # echo -n "Reloading $DESC configuration..." + # d_reload + # echo "done." + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: $NAME" + d_stop + sleep 1 + d_start + echo "." + ;; + *) + # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/tftp-hpa/tftp-hpa_5.0.bb b/recipes/tftp-hpa/tftp-hpa_5.0.bb new file mode 100644 index 0000000000..4137bf0bab --- /dev/null +++ b/recipes/tftp-hpa/tftp-hpa_5.0.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "HPA's tftp server" +DEPENDS = "tcp-wrappers readline" +SECTION = "network" +LICENSE = "BSD" + +SRC_URI = "${KERNELORG_MIRROR}/pub/software/network/tftp/tftp-hpa-${PV}.tar.bz2 \ + file://default \ + file://init" + +inherit autotools update-alternatives + +# configure.in has errors +do_configure() { + oe_runconf +} + +do_install() { + oe_runmake install INSTALLROOT=${D} + + mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN} + + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/init.d + + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftp-hpa + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftp-hpa +} + + +INITSCRIPT_NAME = "${PN}" +INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." + +PACKAGES += "tftpd-hpa" + +FILES_${PN} = "${bindir}" +FILES_tftpd-hpa = "${sbindir} ${sysconfdir}" +CONFFILES_tftpd-hpa = "${sysconfdir}/default/${PN}" + +ALTERNATIVE_NAME = "tftp" +ALTERNATIVE_LINK = "${bindir}/tftp" +ALTERNATIVE_PATH = "${bindir}/tftp.${PN}" +ALTERNATIVE_PRIORITY = "50" + + +# This is taken from update-rc.d.bbclass which works only for $PN package +# so I had to do that way + +postinst_tftpd-hpa() { +if test "x$D" != "x"; then + OPT="-r $D" +else + OPT="-s" +fi +update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +} + +prerm_tftpd-hpa() { +if test "x$D" = "x"; then + ${sysconfdir}/init.d/${INITSCRIPT_NAME} stop +fi +} + +postrm_tftpd-hpa() { +if test "x$D" != "x"; then + OPT="-r $D" +else + OPT="" +fi +update-rc.d $OPT ${INITSCRIPT_NAME} remove +} + diff --git a/recipes/u-boot/u-boot-git/leopardboard-support.patch b/recipes/u-boot/u-boot-git/leopardboard-support.patch new file mode 100644 index 0000000000..fced0c10ea --- /dev/null +++ b/recipes/u-boot/u-boot-git/leopardboard-support.patch @@ -0,0 +1,365 @@ +From: s-paulraj at ti.com (s-paulraj at ti.com) +Date: Wed, 13 May 2009 10:32:40 -0400 +Subject: [U-Boot] [PATCH] ARM DaVinci Leopard Board Support +Message-ID: <1242225160-26706-1-git-send-email-s-paulraj@ti.com> + +The patch applies to arm/next. It was tested on a leopard board. +After testing had to change the MACH TYPE as this board is not present +in the list of mach types at the moment. So the patch itself is going +to give a compilation failure. + +Further details on this board can be found at www.leopardboard.org + +This patch does not do the NAND initialization yet. Will send an update +to this patch after David Brownell's NAND updates get merged + +Jean-Christophe can you please do a new sync for this board + +Signed-off-by: Sandeep Paulraj <s-paulraj at ti.com> +--- + Makefile | 3 + + board/davinci/leopard/Makefile | 52 +++++++++++++++ + board/davinci/leopard/config.mk | 11 +++ + board/davinci/leopard/leopard.c | 36 ++++++++++ + include/configs/davinci_leopard.h | 130 +++++++++++++++++++++++++++++++++++++ + 5 files changed, 232 insertions(+), 0 deletions(-) + create mode 100644 board/davinci/leopard/Makefile + create mode 100644 board/davinci/leopard/config.mk + create mode 100644 board/davinci/leopard/leopard.c + create mode 100644 include/configs/davinci_leopard.h + +diff --git a/Makefile b/Makefile +index b7d5bd9..5fb126a 100644 +--- a/Makefile ++++ b/Makefile +@@ -2793,6 +2793,9 @@ davinci_sonata_config : unconfig + davinci_dm355evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355evm davinci davinci + ++davinci_leopard_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs leopard davinci davinci ++ + lpd7a400_config \ + lpd7a404_config: unconfig + @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x +diff --git a/board/davinci/leopard/Makefile b/board/davinci/leopard/Makefile +new file mode 100644 +index 0000000..26b0705 +--- /dev/null ++++ b/board/davinci/leopard/Makefile +@@ -0,0 +1,52 @@ ++# ++# (C) Copyright 2000, 2001, 2002 ++# Wolfgang Denk, DENX Software Engineering, wd at denx.de. ++# ++# Copyright (C) 2007 Sergey Kubushyn <ksi at koi8.net> ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = $(obj)lib$(BOARD).a ++ ++COBJS := $(BOARD).o ++SOBJS := ++ ++SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) ++OBJS := $(addprefix $(obj),$(COBJS)) ++SOBJS := $(addprefix $(obj),$(SOBJS)) ++ ++$(LIB): $(obj).depend $(OBJS) $(SOBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak $(obj).depend ++ ++######################################################################### ++# This is for $(obj).depend target ++include $(SRCTREE)/rules.mk ++ ++sinclude $(obj).depend ++ ++######################################################################### +diff --git a/board/davinci/leopard/config.mk b/board/davinci/leopard/config.mk +new file mode 100644 +index 0000000..c4e6e07 +--- /dev/null ++++ b/board/davinci/leopard/config.mk +@@ -0,0 +1,11 @@ ++# ++# Spectrum Digital DM355 EVM board ++# dm355evm board has 1 bank of 128 MB DDR RAM ++# Physical Address: 8000'0000 to 8800'0000 ++# ++# Linux Kernel is expected to be at 8000'8000, entry 8000'8000 ++# (mem base + reserved) ++# ++ ++#Provide at least 16MB spacing between us and the Linux Kernel image ++TEXT_BASE = 0x81080000 +diff --git a/board/davinci/leopard/leopard.c b/board/davinci/leopard/leopard.c +new file mode 100644 +index 0000000..282368d +--- /dev/null ++++ b/board/davinci/leopard/leopard.c +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (C) 2009 Texas Instruments ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <common.h> ++#include <nand.h> ++#include <asm/io.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/emif_defs.h> ++#include <asm/arch/nand_defs.h> ++#include "../common/misc.h" ++ ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++int board_init(void) ++{ ++ gd->bd->bi_arch_number = MACH_TYPE_DM355_LEOPARD; ++ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; ++ ++ return 0; ++} +diff --git a/include/configs/davinci_leopard.h b/include/configs/davinci_leopard.h +new file mode 100644 +index 0000000..87160f1 +--- /dev/null ++++ b/include/configs/davinci_leopard.h +@@ -0,0 +1,130 @@ ++/* ++ * Copyright (C) 2009 Texas Instruments ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++#include <asm/sizes.h> ++ ++ ++#define DAVINCI_LEOPARD ++ ++#define CONFIG_SKIP_LOWLEVEL_INIT ++#define CONFIG_SKIP_RELOCATE_UBOOT ++#define CONFIG_SYS_NO_FLASH /* no *NOR* flash */ ++#define CONFIG_SYS_CONSOLE_INFO_QUIET ++#define CONFIG_DISPLAY_CPUINFO ++ ++/* SoC Configuration */ ++#define CONFIG_ARM926EJS /* arm926ejs CPU */ ++#define CONFIG_SYS_TIMERBASE 0x01c21400 /* use timer 0 */ ++#define CONFIG_SYS_HZ_CLOCK 24000000 /* TIMER 0 */ ++#define CONFIG_SYS_HZ 1000 ++#define CONFIG_SOC_DM355 ++ ++/* Memory Info */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM_1 0x80000000 ++#define PHYS_SDRAM_1_SIZE SZ_128M ++ ++/* Serial Driver info: UART0 for console */ ++#define CONFIG_SYS_NS16550 ++#define CONFIG_SYS_NS16550_SERIAL ++#define CONFIG_SYS_NS16550_REG_SIZE -4 ++#define CONFIG_SYS_NS16550_COM1 0x01c20000 ++#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_HZ_CLOCK ++#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } ++#define CONFIG_CONS_INDEX 1 ++#define CONFIG_BAUDRATE 115200 ++ ++/* Ethernet: external DM9000 just like DM355 EVM */ ++#define CONFIG_DRIVER_DM9000 1 ++#define CONFIG_DM9000_BASE 0x04000000 ++#define DM9000_IO CONFIG_DM9000_BASE ++#define DM9000_DATA (CONFIG_DM9000_BASE + 16) ++ ++/* I2C */ ++#define CONFIG_HARD_I2C ++#define CONFIG_DRIVER_DAVINCI_I2C ++#define CONFIG_SYS_I2C_SPEED 400000 ++#define CONFIG_SYS_I2C_SLAVE 0x10 ++ ++/* NYET -- #define CONFIG_NAND_DAVINCI */ ++#define CONFIG_SYS_NAND_HW_ECC ++#define CONFIG_SYS_NAND_USE_FLASH_BBT ++ ++#define CONFIG_SYS_NAND_SMALLPAGE ++#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, } ++#define CONFIG_SYS_MAX_NAND_DEVICE 1 ++#define CONFIG_SYS_NAND_MAX_CHIPS 1 ++ ++/* U-Boot command configuration */ ++#include <config_cmd_default.h> ++ ++#undef CONFIG_CMD_BDI ++#undef CONFIG_CMD_FLASH ++#undef CONFIG_CMD_FPGA ++#undef CONFIG_CMD_SETGETDCR ++#define CONFIG_CMD_ASKENV ++#define CONFIG_CMD_DHCP ++#define CONFIG_CMD_I2C ++#define CONFIG_CMD_PING ++#define CONFIG_CMD_SAVES ++ ++/* TEMPORARY -- no safe place to save env, yet */ ++#define CONFIG_ENV_IS_NOWHERE ++#undef CONFIG_CMD_SAVEENV ++ ++#define CONFIG_CRC32_VERIFY ++#define CONFIG_MX_CYCLIC ++ ++/* U-Boot general configuration */ ++#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ ++#define CONFIG_BOOTFILE "uImage" /* Boot file name */ ++#define CONFIG_SYS_PROMPT "LEOPARD EVM # " ++#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ ++#define CONFIG_SYS_PBSIZE /* Print buffer size */ \ ++ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) ++#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ ++#define CONFIG_SYS_HUSH_PARSER ++#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " ++#define CONFIG_SYS_LONGHELP ++ ++#define CONFIG_ENV_SIZE SZ_16K ++ ++#define CONFIG_BOOTDELAY 3 ++#define CONFIG_CMDLINE_EDITING ++#define CONFIG_VERSION_VARIABLE ++#define CONFIG_TIMESTAMP ++ ++#define CONFIG_NET_RETRY_COUNT 10 ++ ++/* U-Boot memory configuration */ ++#define CONFIG_STACKSIZE SZ_256K /* regular stack */ ++#define CONFIG_SYS_MALLOC_LEN SZ_512K /* malloc() arena */ ++#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */ ++#define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ ++#define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */ ++ ++/* Linux interfacing */ ++#define CONFIG_CMDLINE_TAG ++#define CONFIG_SETUP_MEMORY_TAGS ++#define CONFIG_SYS_BARGSIZE 1024 /* bootarg Size */ ++#define CONFIG_SYS_LOAD_ADDR 0x80700000 /* kernel address */ ++ ++#endif /* __CONFIG_H */ +--- /tmp/mach-types.h 2009-05-19 15:48:59.000000000 +0200 ++++ git/include/asm-arm/mach-types.h 2009-05-19 15:51:03.000000000 +0200 +@@ -2120,6 +2120,10 @@ + #define MACH_TYPE_FMZWEBMODUL 2134 + #define MACH_TYPE_RD78X00_MASA 2135 + #define MACH_TYPE_SMALLOGGER 2136 ++#define MACH_TYPE_CCW9P9215 2137 ++#define MACH_TYPE_DM355_LEOPARD 2138 ++#define MACH_TYPE_TS219 2139 ++#define MACH_TYPE_TNY_A9263 2140 + + #ifdef CONFIG_ARCH_EBSA110 + # ifdef machine_arch_type +@@ -27417,6 +27421,54 @@ + # define machine_is_smallogger() (0) + #endif + ++#ifdef CONFIG_MACH_CCW9P9215 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CCW9P9215 ++# endif ++# define machine_is_ccw9p9215() (machine_arch_type == MACH_TYPE_CCW9P9215) ++#else ++# define machine_is_ccw9p9215() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DM355_LEOPARD ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DM355_LEOPARD ++# endif ++# define machine_is_dm355_leopard() (machine_arch_type == MACH_TYPE_DM355_LEOPARD) ++#else ++# define machine_is_dm355_leopard() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TS219 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TS219 ++# endif ++# define machine_is_ts219() (machine_arch_type == MACH_TYPE_TS219) ++#else ++# define machine_is_ts219() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TNY_A9263 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TNY_A9263 ++# endif ++# define machine_is_tny_a9263() (machine_arch_type == MACH_TYPE_TNY_A9263) ++#else ++# define machine_is_tny_a9263() (0) ++#endif ++ + /* + * These have not yet been registered + */ diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 8e0eb2e6e9..3bf2b34df2 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -38,6 +38,12 @@ SRC_URI_overo = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev; SRCREV_overo = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170" PV_overo = "2009.03+${PR}+gitr${SRCREV}" +SRC_URI_dm355-leopard = "git://www.denx.de/git/u-boot-arm.git;protocol=git;branch=next \ + file://leopardboard-support.patch;patch=1 \ +" +SRCREV_dm355-leopard = "86d5c98d3d97d631b1d3a5f5e6a17e87c99b42cf" +PV_dm355-leopard = "2009.05+2009.06-rc2+gitr${SRCREV}" + SRC_URI_neuros-osd2 = "git://github.com/neuros/u-boot.git;protocol=git;branch=neuros" SRCREV_neuros-osd2 = "8de979d346624c0e4cfe2e5c0f08ce20ca4b5d14" diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb index fdd911a07a..6ba26304c0 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.14.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb @@ -1,7 +1,6 @@ require util-linux-ng.inc PR = "r5" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \ file://util-linux-ng-replace-siginterrupt.patch;patch=1 \ diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb index c4971b1404..773db28b9c 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.15.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb @@ -6,8 +6,6 @@ SRC_URI += "file://fix-make-c.patch;patch=1 \ file://optional-uuid.patch;patch=1 \ " -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.15', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - LDFLAGS_append = " -luuid" LDFLAGS_append_libc-uclibc = " -luuid -lintl" diff --git a/recipes/zaurusd/files/add-poodle.patch b/recipes/zaurusd/files/add-poodle.patch index 4f91413668..3793fafa0a 100644 --- a/recipes/zaurusd/files/add-poodle.patch +++ b/recipes/zaurusd/files/add-poodle.patch @@ -1,16 +1,10 @@ -diff -Nur zaurusd.orig/config/mach-config/mach-poodle-functions zaurusd/config/mach-config/mach-poodle-functions ---- zaurusd.orig/config/mach-config/mach-poodle-functions 1970-01-01 01:00:00.000000000 +0100 -+++ zaurusd/config/mach-config/mach-poodle-functions 2006-05-14 12:43:01.000000000 +0200 -@@ -0,0 +1,3 @@ -+#HAVE_INPUT_SWITCHES=1 -+#HAVE_ALSA_MIXER=1 -+ -diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-config/mach-poodle-vars ---- zaurusd.orig/config/mach-config/mach-poodle-vars 1970-01-01 01:00:00.000000000 +0100 -+++ zaurusd/config/mach-config/mach-poodle-vars 2006-05-14 12:42:42.000000000 +0200 -@@ -0,0 +1,9 @@ -+MACHINE=poodle -+ +--- zaurusd/config/mach-config/mach-poodle-vars.in (revision 418) ++++ zaurusd/config/mach-config/mach-poodle-vars.in (working copy) +@@ -1,3 +1,9 @@ + MACHINE=poodle + +-ALSA_MIXER_INIT=@appconfdir@/alsa/5600-default.state +\ No newline at end of file +export SWITCH_EVENT_ZMIXER=1 +SWITCH_EVENT_DEVICE=/dev/input/event0 + @@ -18,17 +12,4 @@ diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-c +#TSKEYS_DEVICE=/dev/input/event1 + +ALSA_MIXER_INIT=@appconfdir@/alsa/poodle-default.state -\ Kein Zeilenumbruch am Dateiende. -diff -Nur zaurusd.orig/scripts/detect-machine zaurusd/scripts/detect-machine ---- zaurusd.orig/scripts/detect-machine 2006-05-07 13:39:11.000000000 +0200 -+++ zaurusd/scripts/detect-machine 2006-05-14 12:40:38.000000000 +0200 -@@ -27,6 +27,9 @@ - "SHARP Tosa") - MACHINE=tosa - ;; -+ "SHARP Poodle") -+ MACHINE=poodle -+ ;; - "Simpad") - ;; - "HP iPAQ H2200") +\ No newline at end of file diff --git a/recipes/zaurusd/files/alsa-6000x-default.state.patch b/recipes/zaurusd/files/alsa-6000x-default.state.patch index 857b8c8b62..29c98f7879 100644 --- a/recipes/zaurusd/files/alsa-6000x-default.state.patch +++ b/recipes/zaurusd/files/alsa-6000x-default.state.patch @@ -1,6 +1,28 @@ ---- zaurusd/config/alsa/6000x-default.state.old 2008-03-21 02:21:47.000000000 -0500 -+++ zaurusd/config/alsa/6000x-default.state 2008-03-30 07:48:06.000000000 -0500 -@@ -37,13 +37,23 @@ state.Tosa { +--- zaurusd/config/alsa/6000x-default.state 2009-04-25 22:57:30.000000000 +0100 ++++ zaurusd/config/alsa/6000x-default.state 2009-05-14 10:41:29.000000000 +0100 +@@ -6,8 +6,8 @@ + comment.range '0 - 31' + iface MIXER + name 'Speaker Playback Volume' +- value.0 27 +- value.1 27 ++ value.0 25 ++ value.1 25 + } + control.2 { + comment.access 'read write' +@@ -24,8 +24,8 @@ + comment.range '0 - 31' + iface MIXER + name 'Headphone Playback Volume' +- value.0 26 +- value.1 26 ++ value.0 20 ++ value.1 20 + } + control.4 { + comment.access 'read write' +@@ -37,13 +37,23 @@ } control.5 { comment.access 'read write' @@ -25,7 +47,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -51,7 +61,7 @@ state.Tosa { +@@ -51,7 +61,7 @@ name 'Speaker Playback Invert Switch' value true } @@ -34,7 +56,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -59,7 +69,7 @@ state.Tosa { +@@ -59,7 +69,7 @@ name 'Headphone Playback ZC Switch' value true } @@ -43,7 +65,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -67,7 +77,7 @@ state.Tosa { +@@ -67,7 +77,7 @@ name 'Mono Playback ZC Switch' value false } @@ -52,7 +74,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -76,7 +86,7 @@ state.Tosa { +@@ -76,7 +86,7 @@ name 'Mono Playback Volume' value 0 } @@ -61,7 +83,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -85,16 +95,16 @@ state.Tosa { +@@ -85,16 +95,16 @@ name 'ALC Target Volume' value 11 } @@ -81,7 +103,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -103,7 +113,7 @@ state.Tosa { +@@ -103,7 +113,7 @@ name 'ALC Decay Time' value 3 } @@ -90,7 +112,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -112,7 +122,7 @@ state.Tosa { +@@ -112,7 +122,7 @@ name 'ALC Attack Time' value 2 } @@ -99,7 +121,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -124,7 +134,7 @@ state.Tosa { +@@ -124,7 +134,7 @@ name 'ALC Function' value None } @@ -108,7 +130,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -133,7 +143,7 @@ state.Tosa { +@@ -133,16 +143,16 @@ name 'ALC Max Volume' value 7 } @@ -117,16 +139,18 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -142,7 +152,7 @@ state.Tosa { + comment.range '0 - 3' + iface MIXER name 'ALC ZC Timeout' - value 0 +- value 1 ++ value 0 } - control.17 { + control.18 { comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -150,7 +160,7 @@ state.Tosa { +@@ -150,7 +160,7 @@ name 'ALC ZC Switch' value false } @@ -135,7 +159,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -158,7 +168,7 @@ state.Tosa { +@@ -158,7 +168,7 @@ name 'ALC NG Switch' value false } @@ -144,7 +168,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -168,7 +178,7 @@ state.Tosa { +@@ -168,7 +178,7 @@ name 'ALC NG Type' value 'Constant Gain' } @@ -153,7 +177,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -177,16 +187,16 @@ state.Tosa { +@@ -177,16 +187,16 @@ name 'ALC NG Threshold' value 31 } @@ -173,7 +197,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -195,7 +205,7 @@ state.Tosa { +@@ -195,7 +205,7 @@ name 'ALC Headphone Volume' value 5 } @@ -182,7 +206,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -203,7 +213,7 @@ state.Tosa { +@@ -203,7 +213,7 @@ name 'Out3 Switch' value false } @@ -191,7 +215,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -211,7 +221,7 @@ state.Tosa { +@@ -211,7 +221,7 @@ name 'Out3 ZC Switch' value true } @@ -200,7 +224,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -220,7 +230,7 @@ state.Tosa { +@@ -220,7 +230,7 @@ name 'Out3 Volume' value 0 } @@ -209,7 +233,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -229,7 +239,7 @@ state.Tosa { +@@ -229,7 +239,7 @@ name 'PCBeep Bypass Headphone Volume' value 0 } @@ -218,7 +242,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -238,7 +248,7 @@ state.Tosa { +@@ -238,7 +248,7 @@ name 'PCBeep Bypass Speaker Volume' value 0 } @@ -227,7 +251,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -247,16 +257,16 @@ state.Tosa { +@@ -247,16 +257,16 @@ name 'PCBeep Bypass Phone Volume' value 0 } @@ -247,7 +271,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -265,7 +275,7 @@ state.Tosa { +@@ -265,7 +275,7 @@ name 'Aux Playback Speaker Volume' value 0 } @@ -256,7 +280,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -274,7 +284,7 @@ state.Tosa { +@@ -274,7 +284,7 @@ name 'Aux Playback Phone Volume' value 0 } @@ -265,7 +289,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -283,7 +293,7 @@ state.Tosa { +@@ -283,7 +293,7 @@ name 'Phone Volume' value 0 } @@ -274,7 +298,7 @@ comment.access 'read write' comment.type INTEGER comment.count 2 -@@ -293,7 +303,7 @@ state.Tosa { +@@ -293,7 +303,7 @@ value.0 23 value.1 23 } @@ -283,7 +307,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -301,7 +311,7 @@ state.Tosa { +@@ -301,7 +311,7 @@ name 'Capture 20dB Boost Switch' value true } @@ -292,7 +316,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -309,7 +319,7 @@ state.Tosa { +@@ -309,7 +319,7 @@ name 'Capture to Phone 20dB Boost Switch' value true } @@ -301,7 +325,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -317,7 +327,7 @@ state.Tosa { +@@ -317,7 +327,7 @@ name '3D Upper Cut-off Switch' value false } @@ -310,7 +334,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -325,7 +335,7 @@ state.Tosa { +@@ -325,7 +335,7 @@ name '3D Lower Cut-off Switch' value false } @@ -319,7 +343,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -334,7 +344,7 @@ state.Tosa { +@@ -334,7 +344,7 @@ name '3D Playback Volume' value 0 } @@ -328,7 +352,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -344,7 +354,7 @@ state.Tosa { +@@ -344,7 +354,7 @@ name 'Bass Control' value 'Adaptive Boost' } @@ -337,7 +361,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -352,7 +362,7 @@ state.Tosa { +@@ -352,7 +362,7 @@ name 'Bass Cut-off Switch' value true } @@ -346,7 +370,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -360,7 +370,7 @@ state.Tosa { +@@ -360,7 +370,7 @@ name 'Tone Cut-off Switch' value false } @@ -355,7 +379,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -368,7 +378,7 @@ state.Tosa { +@@ -368,7 +378,7 @@ name 'Playback Attenuate (-6dB) Switch' value false } @@ -364,7 +388,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -377,7 +387,7 @@ state.Tosa { +@@ -377,7 +387,7 @@ name 'Bass Volume' value 8 } @@ -373,7 +397,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -386,7 +396,7 @@ state.Tosa { +@@ -386,7 +396,7 @@ name 'Treble Volume' value 5 } @@ -382,7 +406,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -394,7 +404,7 @@ state.Tosa { +@@ -394,7 +404,7 @@ name 'Capture ADC Switch' value false } @@ -391,7 +415,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 2 -@@ -405,17 +415,17 @@ state.Tosa { +@@ -405,17 +415,17 @@ value.0 '+0.75dB Steps' value.1 '+0.75dB Steps' } @@ -413,7 +437,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -423,7 +433,7 @@ state.Tosa { +@@ -423,7 +433,7 @@ name 'Capture ZC Switch' value false } @@ -422,7 +446,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -432,7 +442,7 @@ state.Tosa { +@@ -432,7 +442,7 @@ name 'Mic 1 Volume' value 23 } @@ -431,7 +455,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -441,7 +451,7 @@ state.Tosa { +@@ -441,7 +451,7 @@ name 'Mic 2 Volume' value 23 } @@ -440,7 +464,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -449,7 +459,7 @@ state.Tosa { +@@ -449,7 +459,7 @@ name 'Mic 20dB Boost Switch' value false } @@ -449,7 +473,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -457,7 +467,7 @@ state.Tosa { +@@ -457,7 +467,7 @@ name 'Speaker Mixer PCBeep Bypass Swi' value false } @@ -458,7 +482,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -465,7 +475,7 @@ state.Tosa { +@@ -465,7 +475,7 @@ name 'Speaker Mixer Aux Playback Swit' value false } @@ -467,7 +491,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -473,7 +483,7 @@ state.Tosa { +@@ -473,7 +483,7 @@ name 'Speaker Mixer Phone Bypass Swit' value false } @@ -476,7 +500,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -481,7 +491,7 @@ state.Tosa { +@@ -481,7 +491,7 @@ name 'Speaker Mixer Line Bypass Switc' value false } @@ -485,7 +509,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -489,7 +499,7 @@ state.Tosa { +@@ -489,7 +499,7 @@ name 'Speaker Mixer PCM Playback Swit' value true } @@ -494,7 +518,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -497,7 +507,7 @@ state.Tosa { +@@ -497,7 +507,7 @@ name 'Phone Mixer PCBeep Bypass Switc' value false } @@ -503,7 +527,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -505,7 +515,7 @@ state.Tosa { +@@ -505,7 +515,7 @@ name 'Phone Mixer Aux Playback Switch' value false } @@ -512,7 +536,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -513,7 +523,7 @@ state.Tosa { +@@ -513,7 +523,7 @@ name 'Phone Mixer Line Bypass Switch' value false } @@ -521,7 +545,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -521,7 +531,7 @@ state.Tosa { +@@ -521,7 +531,7 @@ name 'Phone Mixer PCM Playback Switch' value false } @@ -530,7 +554,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -529,7 +539,7 @@ state.Tosa { +@@ -529,7 +539,7 @@ name 'Phone Mixer Mic 1 Sidetone Swit' value false } @@ -539,7 +563,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -537,55 +547,103 @@ state.Tosa { +@@ -537,7 +547,7 @@ name 'Phone Mixer Mic 2 Sidetone Swit' value false } @@ -548,9 +572,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer PCBeep Bypass Switch' -+ name 'Right HP Mixer PCBeep Bypass Sw' +@@ -545,7 +555,7 @@ + name 'Right HP Mixer PCBeep Bypass Sw' value false } - control.64 { @@ -558,9 +581,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Aux Playback Switch' -+ name 'Right HP Mixer Aux Playback Swi' +@@ -553,7 +563,7 @@ + name 'Right HP Mixer Aux Playback Swi' value false } - control.65 { @@ -568,9 +590,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Phone Bypass Switch' -+ name 'Right HP Mixer Phone Bypass Swi' +@@ -561,7 +571,7 @@ + name 'Right HP Mixer Phone Bypass Swi' value false } - control.66 { @@ -578,9 +599,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Line Bypass Switch' -+ name 'Right HP Mixer Line Bypass Swit' +@@ -569,7 +579,7 @@ + name 'Right HP Mixer Line Bypass Swit' value false } - control.67 { @@ -588,9 +608,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer PCM Playback Switch' -+ name 'Right HP Mixer PCM Playback Swi' +@@ -577,7 +587,7 @@ + name 'Right HP Mixer PCM Playback Swi' value true } - control.68 { @@ -598,159 +617,153 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Mic Sidetone Switch' -+ name 'Right HP Mixer Mic Sidetone Swi' +@@ -585,7 +595,7 @@ + name 'Right HP Mixer Mic Sidetone Swi' value false } - control.69 { + control.70 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer PCBeep Bypass Swi' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -593,7 +603,7 @@ + name 'Left HP Mixer PCBeep Bypass Swi' + value false + } +- control.70 { + control.71 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Aux Playback Swit' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -601,7 +611,7 @@ + name 'Left HP Mixer Aux Playback Swit' + value false + } +- control.71 { + control.72 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Phone Bypass Swit' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -609,7 +619,7 @@ + name 'Left HP Mixer Phone Bypass Swit' + value false + } +- control.72 { + control.73 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Line Bypass Switc' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -617,7 +627,7 @@ + name 'Left HP Mixer Line Bypass Switc' + value false + } +- control.73 { + control.74 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer PCM Playback Swit' -+ value true -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -625,7 +635,7 @@ + name 'Left HP Mixer PCM Playback Swit' + value true + } +- control.74 { + control.75 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Mic Sidetone Swit' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -633,7 +643,7 @@ + name 'Left HP Mixer Mic Sidetone Swit' + value false + } +- control.75 { + control.76 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -595,7 +653,7 @@ state.Tosa { +@@ -641,9 +651,9 @@ + comment.item.1 Line + iface MIXER name 'Differential Source' - value Mic +- value Line ++ value Mic } -- control.70 { +- control.76 { + control.77 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -607,7 +665,7 @@ state.Tosa { +@@ -653,9 +663,9 @@ + comment.item.3 Stereo + iface MIXER name 'Mic Select Source' - value Differential +- value 'Mic 1' ++ value Differential } -- control.71 { +- control.77 { + control.78 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -623,7 +681,7 @@ state.Tosa { +@@ -671,7 +681,7 @@ name 'Right Capture Select' value Mic } -- control.72 { +- control.78 { + control.79 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -639,7 +697,7 @@ state.Tosa { +@@ -687,7 +697,7 @@ name 'Left Capture Select' value Mic } -- control.73 { +- control.79 { + control.80 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -651,7 +709,7 @@ state.Tosa { +@@ -699,7 +709,7 @@ name 'Capture Phone Mux' value Mute } -- control.74 { +- control.80 { + control.81 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -659,9 +717,9 @@ state.Tosa { - comment.item.1 'Headphone Mix' - iface MIXER +@@ -709,7 +719,7 @@ name 'Speaker Mux' -- value 'Headphone Mix' -+ value 'Speaker Mix' + value 'Speaker Mix' } -- control.75 { +- control.81 { + control.82 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -673,7 +731,7 @@ state.Tosa { +@@ -721,7 +731,7 @@ name 'Out3 Mux' value Left } -- control.76 { +- control.82 { + control.83 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -685,7 +743,7 @@ state.Tosa { +@@ -733,7 +743,7 @@ name 'ALC Sidetone Mux' value Stereo } -- control.77 { +- control.83 { + control.84 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -696,17 +754,16 @@ state.Tosa { - comment.item.4 Off - iface MIXER +@@ -746,7 +756,7 @@ name 'Jack Function' -- value Headphone -+ value Off + value Off } -- control.78 { +- control.84 { + control.85 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -- comment.item.0 Auto -- comment.item.1 On -- comment.item.2 Off -+ comment.item.0 On -+ comment.item.1 Off - iface MIXER - name 'Speaker Function' -- value Auto -+ value On - } - } diff --git a/recipes/zaurusd/files/alsa-cxx00-default.state.patch b/recipes/zaurusd/files/alsa-cxx00-default.state.patch index b7a149be00..d65ed4a5b9 100644 --- a/recipes/zaurusd/files/alsa-cxx00-default.state.patch +++ b/recipes/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,3 +1,6 @@ +NOTE: Patch slightly modified from original; unmodified comments from +original patch copied below. +============================================================================= http://bugs.openembedded.net/show_bug.cgi?id=2617 - Fixes default ALSA state for SL-Cxx00. * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24). @@ -13,10 +16,8 @@ http://bugs.openembedded.net/show_bug.cgi?id=2617 * Enabled Zero Cross volume changes. - Do not alter incorrect mixer levels by zaurus-mixer-callback. -Index: zaurusd/config/alsa/cxx00-default.state -=================================================================== ---- zaurusd.orig/config/alsa/cxx00-default.state 2006-06-28 08:45:07.000000000 +0000 -+++ zaurusd/config/alsa/cxx00-default.state 2007-11-27 23:06:43.000000000 +0000 +--- zaurusd/config/alsa/cxx00-default.state 2009-04-25 22:57:30.000000000 +0100 ++++ zaurusd/config/alsa/cxx00-default.state 2009-05-14 10:41:29.000000000 +0100 @@ -6,8 +6,8 @@ comment.range '0 - 63' iface MIXER @@ -39,7 +40,7 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.3 { comment.access 'read write' -@@ -24,26 +24,26 @@ +@@ -24,8 +24,8 @@ comment.count 2 iface MIXER name 'Capture Switch' @@ -50,25 +51,23 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.4 { comment.access 'read write' - comment.type BOOLEAN +@@ -33,8 +33,8 @@ comment.count 2 iface MIXER -- name 'Out1 Playback ZC Switch' + name 'Headphone Playback ZC Switch' - value.0 false - value.1 false -+ name 'Headphone Playback ZC Switch' + value.0 true + value.1 true } control.5 { comment.access 'read write' - comment.type BOOLEAN +@@ -42,8 +42,8 @@ comment.count 2 iface MIXER -- name 'Out2 Playback ZC Switch' + name 'Speaker Playback ZC Switch' - value.0 false - value.1 false -+ name 'Speaker Playback ZC Switch' + value.0 true + value.1 true } @@ -148,15 +147,6 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.34 { comment.access 'read write' -@@ -321,7 +321,7 @@ - comment.type BOOLEAN - comment.count 1 - iface MIXER -- name 'Right Out2 Playback Invert Switch' -+ name 'Right Speaker Playback Invert Switch' - value true - } - control.36 { @@ -331,8 +331,8 @@ comment.range '0 - 3' iface MIXER @@ -190,27 +180,23 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.40 { comment.access 'read write' -@@ -378,9 +378,9 @@ - comment.count 2 +@@ -379,8 +379,8 @@ comment.range '0 - 127' iface MIXER -- name 'Out1 Playback Volume' -- value.0 120 -- value.1 120 -+ name 'Headphone Playback Volume' + name 'Headphone Playback Volume' +- value.0 70 +- value.1 70 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' -@@ -388,9 +388,9 @@ - comment.count 2 +@@ -389,8 +389,8 @@ comment.range '0 - 127' iface MIXER -- name 'Out2 Playback Volume' -- value.0 119 -- value.1 119 -+ name 'Speaker Playback Volume' + name 'Speaker Playback Volume' +- value.0 70 +- value.1 70 + value.0 127 + value.1 127 } @@ -252,50 +238,3 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.50 { comment.access 'read write' -@@ -610,9 +610,8 @@ - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 -- comment.item.0 Auto -- comment.item.1 On -- comment.item.2 Off -+ comment.item.0 On -+ comment.item.1 Off - iface MIXER - name 'Speaker Function' - value On -Index: zaurusd/scripts/zaurus-mixer-callback.in -=================================================================== ---- zaurusd.orig/scripts/zaurus-mixer-callback.in 2007-11-27 23:32:45.000000000 +0000 -+++ zaurusd/scripts/zaurus-mixer-callback.in 2007-11-27 23:36:54.000000000 +0000 -@@ -16,8 +16,6 @@ - JACK="$1" - SPK="$2" - LEFT="true" --RLPLAYBACK="false" --RLBYPASS="false" - - case $SPK in - "On") -@@ -37,8 +35,6 @@ - ;; - "Headset" | "Mic" | "Line") - LEFT="false" -- RLPLAYBACK="true" -- RLBYPASS="true" - SPK="Off" - ;; - *) -@@ -58,12 +54,6 @@ - }; /Speaker Function/ { - N - s:\(Speaker Function.*\n.*value \).*$:\1$SPK: --}; /Right Mixer Left Playback/ { --N --s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK: --}; /Right Mixer Left Bypass/ { --N --s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS: - }; /Left Mixer Playback/ { - N - s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT: diff --git a/recipes/zaurusd/files/tslib-1.diff b/recipes/zaurusd/files/tslib-1.diff deleted file mode 100644 index 8df1b83b3a..0000000000 --- a/recipes/zaurusd/files/tslib-1.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/configure.ac 2007-08-04 10:09:46.000000000 +0200 -+++ zaurusd/configure.ac 2007-08-04 10:10:35.308400000 +0200 -@@ -45,7 +45,7 @@ - # - # Checks for tslib - # -- PKG_CHECK_MODULES(TSLIB, "tslib-0.0", :, AC_MSG_ERROR([TSKeys requires tslib.])) -+ PKG_CHECK_MODULES(TSLIB, "tslib-1.0", :, AC_MSG_ERROR([TSKeys requires tslib.])) - AC_SUBST(TSLIB_CFLAGS) - AC_SUBST(TSLIB_LIBS) - fi diff --git a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff index b49a21fe61..9c418ec5f9 100644 --- a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff +++ b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff @@ -42,8 +42,8 @@ ALSA_MIXER_INIT=@appconfdir@/alsa/c7x0-default.state \ No newline at end of file ---- /tmp/mach-poodle-vars 2009-04-28 16:39:58.000000000 +0200 -+++ zaurusd/config/mach-config/mach-poodle-vars 2009-04-28 16:40:06.000000000 +0200 +--- /tmp/mach-poodle-vars.in 2009-04-28 16:39:58.000000000 +0200 ++++ zaurusd/config/mach-config/mach-poodle-vars.in 2009-04-28 16:40:06.000000000 +0200 @@ -4,6 +4,6 @@ SWITCH_EVENT_DEVICE=/dev/input/event0 diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb index b2b16224fa..6240492a61 100644 --- a/recipes/zaurusd/zaurusd_svn.bb +++ b/recipes/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r19" +PR = "r20" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ @@ -14,7 +14,6 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://disable-alsa-handling.patch;patch=1 \ file://zaurus-hinge.matchbox-portrait \ file://zaurus-hinge.matchbox-landscape \ - file://tslib-1.diff;patch=1 \ file://zaurus-hinge.bl-on \ file://zaurus-hinge.bl-off \ file://01-check-toggle-landscape \ |