diff options
21 files changed, 114 insertions, 53 deletions
diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 01dec648c3..30a285e5f3 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,6 +1,6 @@ -STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${TARGET_OS}/kernel" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index 71690ac62f..4502422021 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -33,3 +33,5 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.4" +# We want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs pcmcia usbhost" diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index aad664deea..6b6e5a8ea9 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard" + ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 0358864c70..e14efa76a0 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf IPKG_EXTRA_ARCHS += "iwmmxt" IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 4b1d8edb80..893378f569 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 8345ff5fd8..35cb1d2070 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -17,5 +17,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" +MACHINE_FEATURES = "kernel26 usbhost ext2" + require conf/machine/include/tune-athlonmp.conf diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 45eda7251f..65f27085f4 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,6 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" + + BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 008bfb252f..2ab9775419 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -18,7 +18,7 @@ EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index eff0ad4c7c..01a06b7c27 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1 +1 @@ -require conf/machine/include/zaurus-clamshell-2.6.conf +require conf/machine/include/zaurus-2.6.conf diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf index 6831b0ea91..f3591b4b75 100644 --- a/conf/machine/include/tosa-2.6.conf +++ b/conf/machine/include/tosa-2.6.conf @@ -1,4 +1,4 @@ -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf # wlan-ng Modules MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-2.6.conf index e0a9e38e91..ce9b44c9fe 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -6,10 +6,10 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" -MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost" -MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2" - +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen" +MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " +MACHINE_FEATURES_append_akita = " usbhost " +MACHINE_FEATURES_append_spitz = " usbhost ext2 " MACHINE_EXTRA_RDEPENDS = "zaurusd" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" @@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 84380a49d0..b361b2bf6d 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES ?= "jffs2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index fb8b521a3c..c480cf4ebf 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,6 +15,8 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost" + #ship in rootfs: NBP_MODULES = " apm \ pcmcia-core \ diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index fc17985233..ea86d0c5cc 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -17,25 +17,41 @@ PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" PREFERRED_VERSION_linux-omap1 = "2.6.x+git" #PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2" -BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" - SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" +MACHINE_FEATURES = "kernel26 pcmcia usbhost" + +MACHINE_TASK_PROVIDER = "task-base" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ + kernel-module-ide-disk \ + kernel-module-ide-core \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-cp437 \ + kernel-module-nls-base \ + kernel-module-vfat" + +include conf/machine/include/tune-arm926ejs.conf + +# old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS + # PCMCIA Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf" + # IDE modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core" + # DOS and VFAT modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat" + # Video er LCD Driver -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea" -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor" -# DSP Interface -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea" +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor" -include conf/machine/include/tune-arm926ejs.conf +# DSP Interface +##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index af50217e0f..5434efbaf6 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 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 + |