From f8e11cb4f973830bf326d6f2a47d2a4220d0b9b5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 24 Sep 2006 19:19:44 +0000 Subject: ftpd-topfield: Update to latest version. --- packages/ftpd-topfield/ftpd-topfield_0.6.10.bb | 35 ++++++++++++++++++++++++++ packages/ftpd-topfield/ftpd-topfield_0.6.6.bb | 35 -------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) create mode 100755 packages/ftpd-topfield/ftpd-topfield_0.6.10.bb delete mode 100755 packages/ftpd-topfield/ftpd-topfield_0.6.6.bb diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb new file mode 100755 index 0000000000..2e63347f18 --- /dev/null +++ b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb @@ -0,0 +1,35 @@ +# This package builds the ftpd-topfield program +PR = "r0" +DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" +HOMEPAGE = "http://sourceforge.net/projects/puppy" +MAINTAINER = "NSLU2 Linux " +SECTION = "net" +LICENSE = "MIT" + +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 +S = "${WORKDIR}/ftpd-topfield" + +inherit update-rc.d + +INITSCRIPT_NAME = "ftpd-topfield" +INITSCRIPT_PARAMS = "defaults" + +# Just the one package at present +PACKAGES = "${PN}" + +inherit autotools + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield +} diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb deleted file mode 100755 index f7fdfb5466..0000000000 --- a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb +++ /dev/null @@ -1,35 +0,0 @@ -# This package builds the ftpd-topfield program -PR = "r0" -DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" -HOMEPAGE = "http://sourceforge.net/projects/puppy" -MAINTAINER = "NSLU2 Linux " -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 \ - file://init" - -# The source will end up in the subdirectory 'ftpd-topfield' - no release name -S = "${WORKDIR}/ftpd-topfield" - -inherit update-rc.d - -INITSCRIPT_NAME = "ftpd-topfield" -INITSCRIPT_PARAMS = "defaults" - -# Just the one package at present -PACKAGES = "${PN}" - -inherit autotools - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield -} -- cgit v1.2.3 From c2ea72d6e94e4658eeabaca413ebfb2a542d8088 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 08:41:44 +0000 Subject: multimachine.bbclass: include TARGET_VENDOR, closes #1440 --- classes/multimachine.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 01dec648c3..6c5384cedc 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_VEDNOR}-${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. -- cgit v1.2.3 From 96287adbd0bb2bf9fcd982e1f4f5e337d0d1a525 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 09:33:32 +0000 Subject: multimachine.bbclass: fix typo spotted by mr Leemans --- classes/multimachine.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 6c5384cedc..d89a4bbcbf 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,4 +1,4 @@ -STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VEDNOR}-${TARGET_OS}/${PF}" +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" -- cgit v1.2.3 From 696ad54999f0ff0e8f3a9ae291cf3b1f0c6e24b6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 12:28:34 +0000 Subject: guinness: add MACHINE_FEATURES --- conf/machine/guinness.conf | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3 From 66ce72fe9457ea462fe3b4c7f912e6691f451ded Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:38:12 +0000 Subject: zaurus machines: renamed zaurus-clamshell-2.6.conf into zaurus-2.6.conf as it is used in all 2.6 powered models --- conf/machine/akita.conf | 2 +- conf/machine/c7x0.conf | 2 +- conf/machine/include/poodle-2.6.conf | 2 +- conf/machine/include/tosa-2.6.conf | 2 +- conf/machine/include/zaurus-2.6.conf | 20 ++++++++++++++++++++ conf/machine/include/zaurus-clamshell-2.6.conf | 20 -------------------- conf/machine/spitz.conf | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 conf/machine/include/zaurus-2.6.conf delete mode 100644 conf/machine/include/zaurus-clamshell-2.6.conf 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/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-2.6.conf b/conf/machine/include/zaurus-2.6.conf new file mode 100644 index 0000000000..e426011d77 --- /dev/null +++ b/conf/machine/include/zaurus-2.6.conf @@ -0,0 +1,20 @@ +# Zaurus Clamshell specific configuration for kernel 2.6 +# Don't forget to include zaurus-clamshell.conf as well + +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +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_EXTRA_RDEPENDS = "zaurusd" +MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" +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" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf deleted file mode 100644 index e0a9e38e91..0000000000 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.conf as well - -PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -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_EXTRA_RDEPENDS = "zaurusd" -MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" -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 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}" -- cgit v1.2.3 From 69de8096736a271e00843833a55b6685148d31d9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:40:27 +0000 Subject: zaurus-2.6.conf: added keyboard, touchscreen into features, added tosa info --- conf/machine/include/zaurus-2.6.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index e426011d77..ce9b44c9fe 100644 --- a/conf/machine/include/zaurus-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" -- cgit v1.2.3 From 194e9539227c960636ef5b6332aede195c32b2c9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 13:49:49 +0000 Subject: multimachine: remove spurious hyphen in staging-kernel-dir --- classes/multimachine.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index d89a4bbcbf..30a285e5f3 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,6 +1,6 @@ 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" +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. -- cgit v1.2.3 From be0f0ae61525a8d589231e2a800d917f78e48f4d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:52:12 +0000 Subject: task-base: added support for keyboard feature --- packages/tasks/task-base.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 24f3929498..1239ce870d 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -67,6 +67,7 @@ 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)} \ @@ -138,10 +139,12 @@ RRECOMMENDS_task-base-core-default = '\ 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" -- cgit v1.2.3 From de650e9b9b304b48c997055d331d8a457184cde8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:55:41 +0000 Subject: task-base: bumped PR --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 1239ce870d..049a283c4b 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 " -PR = "r0" +PR = "r1" PACKAGES = "task-base \ task-base-minimal \ -- cgit v1.2.3 From e9ccb91df38214f6b40d062d016413092a527af5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 13:58:32 +0000 Subject: task-base: portmap is needed for NFS not for core system --- packages/tasks/task-base.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 049a283c4b..b65d75750b 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 " -PR = "r1" +PR = "r2" 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 @@ -132,9 +134,7 @@ RDEPENDS_task-base-core-default = '\ RRECOMMENDS_task-base-core-default = '\ - dropbear \ - portmap' - + dropbear ' task-base-kernel26-rdepends = "\ -- cgit v1.2.3 From 322d1520787da0382de1be0c898931de6295c12d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:00:06 +0000 Subject: task-base: hostap-cs only if DISTRO has wifi in features --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b65d75750b..c3eeda5726 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -181,8 +181,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)}" -- cgit v1.2.3 From af818f029cb4e4f74a29c30df82c89c774927e2c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:01:51 +0000 Subject: task-base: if there are usbhost and bluetooth supported then add module for USB BT --- packages/tasks/task-base.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index c3eeda5726..6d54471865 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -195,6 +195,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)} \ -- cgit v1.2.3 From 2ff2762ae0cba93d544551958600246481d4c7b6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 14:02:09 +0000 Subject: h2200, h5xxx, ipaq-pxa270, netbook-pro: add MACHINE_FEATURES --- conf/machine/h2200.conf | 3 +++ conf/machine/h5xxx.conf | 2 +- conf/machine/ipaq-pxa270.conf | 2 +- conf/machine/netbook-pro.conf | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) 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/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 \ -- cgit v1.2.3 From 611a8a3554163276723ef69e1bf056911a81bb02 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:02:54 +0000 Subject: task-base: if there are usbhost and irda supported then add module for USB Irda --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 6d54471865..f016ff5ca8 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -213,7 +213,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 \ -- cgit v1.2.3 From 88137005393a43a9974c3cb467b1526add9f5ba8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:03:56 +0000 Subject: task-base: do not add USB BT/Irda into usbhost list - they are part of bt/irda already --- packages/tasks/task-base.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index f016ff5ca8..0182a6969c 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -230,10 +230,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 \ -- cgit v1.2.3 From e682c920024719209a58509a0c84fd3914293cf5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 14:06:38 +0000 Subject: a780: add MACHINE_FEATURES, the 'keyboard' one might be a bit misplaced --- conf/machine/a780.conf | 2 ++ 1 file changed, 2 insertions(+) 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" -- cgit v1.2.3 From 0731ae660f6d7ec3b74ed4c6b9de087e4c484367 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:06:48 +0000 Subject: task-base: added portmap into task-distro-nfs, added cifs into smbfs --- packages/tasks/task-base.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 0182a6969c..1a66f0ace1 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -74,6 +74,7 @@ RDEPENDS_task-base = "\ ${@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)} \ @@ -254,11 +255,15 @@ task-distro-wifi-rdepends = "\ wpa-supplicant-nossl" 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 \ @@ -267,7 +272,6 @@ task-distro-nfs-rrecommends = "\ # Tosort # kernel-module-ipv6 -# kernel-module-ipsec # kernel-module-nvrd # kernel-module-mip6-mn # kernel-module-tun @@ -276,7 +280,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 -- cgit v1.2.3 From f164f042147410afc1aa9ca1bddee8cb8959e749 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:08:52 +0000 Subject: task-base: bump PR --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 1a66f0ace1..5c375537b4 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 " -PR = "r2" +PR = "r3" PACKAGES = "task-base \ task-base-minimal \ -- cgit v1.2.3 From 2762aacc9217d6b0ccbdb95027d0a5c9e84f4a6a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Sep 2006 14:16:42 +0000 Subject: task-base: include tslib for 'touchscreen' --- packages/tasks/task-base.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 5c375537b4..048db28c85 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 " -PR = "r3" +PR = "r4" PACKAGES = "task-base \ task-base-minimal \ @@ -70,6 +70,7 @@ RDEPENDS_task-base = "\ ${@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("MACHINE_FEATURES", "touchscreen", "${task-base-touchscreen-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)} \ @@ -146,6 +147,11 @@ task-base-kernel26-rdepends = "\ task-base-keyboard-rdepends = "\ keymaps" +task-base-touchscreen-rdepends = "\ + tslib \ + tslib-conf" + + task-base-kernel26-extras-rrecommends = "\ kernel-module-input \ kernel-module-uinput" -- cgit v1.2.3 From a95e0d2f5471d006422a26ce4982d42f76b53b74 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:49:52 +0000 Subject: disapproval of revision '4b32a45f45bd0328a8607e52c07b92d6efd62e6a' --- packages/tasks/task-base.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 048db28c85..5c375537b4 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 " -PR = "r4" +PR = "r3" PACKAGES = "task-base \ task-base-minimal \ @@ -70,7 +70,6 @@ RDEPENDS_task-base = "\ ${@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("MACHINE_FEATURES", "touchscreen", "${task-base-touchscreen-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)} \ @@ -147,11 +146,6 @@ task-base-kernel26-rdepends = "\ task-base-keyboard-rdepends = "\ keymaps" -task-base-touchscreen-rdepends = "\ - tslib \ - tslib-conf" - - task-base-kernel26-extras-rrecommends = "\ kernel-module-input \ kernel-module-uinput" -- cgit v1.2.3 From d8cad41d92b08997af3cf390467ad360ebc55c5c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 14:53:58 +0000 Subject: task-base: added modules needed for WEP/WPA support into wifi section --- packages/tasks/task-base.bb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 048db28c85..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 " -PR = "r4" +PR = "r5" PACKAGES = "task-base \ task-base-minimal \ @@ -70,7 +70,6 @@ RDEPENDS_task-base = "\ ${@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("MACHINE_FEATURES", "touchscreen", "${task-base-touchscreen-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)} \ @@ -94,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} \ @@ -147,11 +147,6 @@ task-base-kernel26-rdepends = "\ task-base-keyboard-rdepends = "\ keymaps" -task-base-touchscreen-rdepends = "\ - tslib \ - tslib-conf" - - task-base-kernel26-extras-rrecommends = "\ kernel-module-input \ kernel-module-uinput" @@ -260,6 +255,15 @@ 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" -- cgit v1.2.3 From 1adb774adc699c9e0700394325c27ae0e35480ab Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 27 Sep 2006 17:37:35 +0000 Subject: omap5912osk.conf : prepare for task-base stuff defconfig : Update defconfig to follow git and enable dsp gateway linux-omap1_2.6.x+git.bb : Fix problems in build process --- conf/machine/omap5912osk.conf | 2 ++ packages/linux/linux-omap1-2.6.x+git/defconfig | 20 +++++++++++++------- packages/linux/linux-omap1_2.6.x+git.bb | 6 ++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index fc17985233..3ae0064c46 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -7,6 +7,8 @@ IPKG_EXTRA_ARCHS = "armv5te" HOTPLUG = "udev" +#MACHINE_TASK_PROVIDER = "task-bootstrap" + PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" 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 @@ -888,6 +890,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_ARCH_HAS_EHCI is not set # 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 -- cgit v1.2.3 From 0d2a8c0b6056cb54386a0b92d0d59500907eccc8 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Wed, 27 Sep 2006 19:47:59 +0000 Subject: packages/tuxnes : Addition of skeleton tuxnes.bb * Addition of Tuxnes (Nintendo 8bit Emulator) into OE. * Needs fixing to compile. --- packages/tuxnes/.mtn2git_empty | 0 packages/tuxnes/tuxnes_0.75.bb | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 packages/tuxnes/.mtn2git_empty create mode 100644 packages/tuxnes/tuxnes_0.75.bb diff --git a/packages/tuxnes/.mtn2git_empty b/packages/tuxnes/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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 + -- cgit v1.2.3 From 12ccaa08c41a76debd4f792db8d4704d3737ee5a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 20:35:23 +0000 Subject: omap5912osk.conf: transformed into task-base format (old config commented as part of it will probably need to be added into MACHINE_EXTRA_RRECOMMENDS) --- conf/machine/omap5912osk.conf | 46 ++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 3ae0064c46..ea86d0c5cc 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -7,8 +7,6 @@ IPKG_EXTRA_ARCHS = "armv5te" HOTPLUG = "udev" -#MACHINE_TASK_PROVIDER = "task-bootstrap" - PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" @@ -19,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" -- cgit v1.2.3 From 22b656431dcda856942c7100ca74a9c62b440d57 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 27 Sep 2006 20:36:14 +0000 Subject: openomap distro: switch to task-base format --- conf/distro/openomap.conf | 2 ++ 1 file changed, 2 insertions(+) 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" -- cgit v1.2.3