merge of '0b0e5efd590cdcc1847caa5505a008258f7a2e45'

     and 'b95778d4aa9b6135b43b0d0a7b8b4f0d28d0be95'

6 files changed, 58 insertions, 24 deletions

diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
index f7fdfb5466..2e63347f18 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
@@ -6,8 +6,8 @@ MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 SECTION = "net"
 LICENSE = "MIT"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_6 \
-	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_6 \
+SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_10 \
+	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_10 \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name
diff --git a/packages/linux/linux-omap1-2.6.x+git/defconfig b/packages/linux/linux-omap1-2.6.x+git/defconfig
index ca2ac4ebd5..5edb8f25b1 100644
--- a/packages/linux/linux-omap1-2.6.x+git/defconfig
+++ b/packages/linux/linux-omap1-2.6.x+git/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc4-omap1
-# Wed Aug 30 10:58:22 2006
+# Linux kernel version: 2.6.18-omap1
+# Wed Sep 27 11:56:19 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -31,14 +31,14 @@ CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -46,12 +46,12 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -141,6 +141,10 @@ CONFIG_OMAP_LL_DEBUG_UART1=y
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
 # CONFIG_OMAP_LL_DEBUG_UART3 is not set
 CONFIG_OMAP_SERIAL_WAKE=y
+CONFIG_OMAP_DSP=y
+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set
+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set
+# CONFIG_OMAP_DSP_FBEXPORT is not set
 
 #
 # OMAP Core Type
@@ -170,7 +174,6 @@ CONFIG_OMAP_ARM_192MHZ=y
 # CONFIG_OMAP_ARM_120MHZ is not set
 # CONFIG_OMAP_ARM_60MHZ is not set
 # CONFIG_OMAP_ARM_30MHZ is not set
-# CONFIG_OMAP_DSP is not set
 
 #
 # Processor Type
@@ -339,7 +342,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -889,6 +891,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB is not set
 
 #
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb
index 9bc1b7c0a9..42bfa341d2 100644
--- a/packages/linux/linux-omap1_2.6.x+git.bb
+++ b/packages/linux/linux-omap1_2.6.x+git.bb
@@ -9,12 +9,14 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 S = "${WORKDIR}/git"
 
 KERNEL_IMAGETYPE = "vmlinux"
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
 
 DEPENDS = "u-boot"
 
 inherit kernel
 
+KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}"
+KERNEL_RELEASE = "2.6.18-omap1"
+
 COMPATIBLE_HOST = 'arm.*-linux'
 
 do_configure_prepend() {
@@ -28,7 +30,7 @@ do_configure_prepend() {
 do_deploy() {
         if [ "${MACHINE}" == "omap5912osk" ]; then
                 install -d ${DEPLOY_DIR_IMAGE}
-                arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
+                arm-linux-objcopy -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/linux.bin
                 gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
                 mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
                 rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 24f3929498..2e23d7f33d 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r0"
+PR = "r5"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -16,8 +16,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # kernel24
 # kernel26
 # apm
+# keyboard
+# touchscreen
 
-# Valid only in DISTO_FEATURES:
+# Valid only in DISTRO_FEATURES:
 #
 # nfs
 # smbfs
@@ -67,10 +69,12 @@ RDEPENDS_task-base = "\
     kernel \
     ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
@@ -89,6 +93,7 @@ RRECOMMENDS_task-base = "\
     ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
     ${MACHINE_EXTRA_RRECOMMENDS} \
@@ -131,17 +136,17 @@ RDEPENDS_task-base-core-default = '\
 
 
 RRECOMMENDS_task-base-core-default = '\
-    dropbear \
-    portmap'
-
+    dropbear '
 
 
 task-base-kernel26-rdepends = "\
     udev \
-    keymaps \
     sysfsutils \
     module-init-tools"
 
+task-base-keyboard-rdepends = "\
+    keymaps"
+
 task-base-kernel26-extras-rrecommends = "\
     kernel-module-input \
     kernel-module-uinput"
@@ -178,8 +183,8 @@ task-base-pcmcia-rrecommends = "\
     kernel-module-airo-cs \
     kernel-module-pcnet-cs \
     kernel-module-serial-cs \
-    kernel-module-hostap-cs \
     kernel-module-ide-cs \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}"
 
@@ -192,6 +197,7 @@ task-base-bluetooth-rrecommends = "\
     kernel-module-hidp \
     kernel-module-hci-uart \
     kernel-module-sco \
+    ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
@@ -209,7 +215,7 @@ task-base-irda-rrecommends = "\
     kernel-module-irnet \
     kernel-module-irport \
     kernel-module-irtty \
-    kernel-module-ir-usb"
+    ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} "
 
 task-base-usbgadget-rrecommends = "\
     kernel-module-gadgetfs \
@@ -226,10 +232,8 @@ task-base-usbhost-rrecommends = "\
     kernel-module-scsi-mod \
     kernel-module-usbmouse \
     kernel-module-mousedev \
-    kernel-module-hci-usb \
     kernel-module-usbserial \
-    kernel-module-usb-storage \
-    kernel-module-ir-usb"
+    kernel-module-usb-storage "
 
 task-distro-ppp-rdepends = "\
     ppp \
@@ -251,12 +255,25 @@ task-distro-wifi-rdepends = "\
     hostap-utils \
     wpa-supplicant-nossl"
 
+task-distro-wifi-rrecommends = "\
+    kernel-module-ieee80211-crypt \
+    kernel-module-ieee80211-crypt-ccmp \
+    kernel-module-ieee80211-crypt-tkip \
+    kernel-module-ieee80211-crypt-wep \
+    kernel-module-arc4 \
+    kernel-module-michael-mic \
+    kernel-module-aes"
+
 task-distro-smbfs-rrecommends = "\
+    kernel-module-cifs \
     kernel-module-smbfs"
 
 task-distro-cramfs-rrecommends = "\
     kernel-module-cramfs"
 
+task-distro-nfs-rdepends = "\
+    portmap"
+
 task-distro-nfs-rrecommends = "\
     kernel-module-nfs \
     kernel-module-lockd \
@@ -265,7 +282,6 @@ task-distro-nfs-rrecommends = "\
 
 # Tosort
 # kernel-module-ipv6 
-# kernel-module-ipsec
 # kernel-module-nvrd
 # kernel-module-mip6-mn
 # kernel-module-tun
@@ -274,7 +290,6 @@ task-distro-nfs-rrecommends = "\
 # kernel-module-loop
 # kernel-module-vfat 
 # kernel-module-ext2
-# kernel-module-nfs
 # kernel-module-sco 
 # kernel-module-af_packet
 # kernel-module-ip-gre 
diff --git a/packages/tuxnes/.mtn2git_empty b/packages/tuxnes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tuxnes/.mtn2git_empty
diff --git a/packages/tuxnes/tuxnes_0.75.bb b/packages/tuxnes/tuxnes_0.75.bb
new file mode 100644
index 0000000000..f542f73ac4
--- /dev/null
+++ b/packages/tuxnes/tuxnes_0.75.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Tuxnes Nintendo (8bit) Emulator"
+HOMEPAGE = "http://prdownloads.sourceforge.net/tuxnes/tuxnes-0.75.tar.gz"
+LICENSE = "GPLv2"
+SECTION = "x/games"
+PRIORITY = "optional"
+PR ="r1"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/tuxnes/tuxnes-0.75.tar.gz"
+
+inherit autotools
+