merge of 'e7b51cdff552f8acee23869051f6d9ddf9b5cb85'

     and 'ff4945554f42e9be0ee0cf9d1a222718ac61d4b6'

4 files changed, 96 insertions, 75 deletions

diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
new file mode 100644
index 0000000000..85ca5d106a
--- /dev/null
+++ b/conf/machine/asus730.conf
@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: Asus MyPal A730
+#@DESCRIPTION: Machine configuration for the asus730 with a pxa27x CPU
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#require conf/machine/include/tune-iwmmxt.conf
+
+ROOT_FLASH_SIZE = "64"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+MODUTILS = "26"	
+XSERVER = "xserver-kdrive"
+
+PREFERRED_VERSION_orinoco-modules = "0.15rc1"
+
+
+#
+# Modules autoload and other boot properties
+#
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/packages/mc/mc.inc b/packages/mc/mc.inc
new file mode 100644
index 0000000000..039fea6a61
--- /dev/null
+++ b/packages/mc/mc.inc
@@ -0,0 +1,52 @@
+DESCRIPTION = "GNU Midnight Commander is a file \
+manager for free operating systems."
+HOMEPAGE = "http://www.ibiblio.org/mc/"
+LICENSE = "GPLv2"
+SECTION = "console/utils"
+PRIORITY = "optional"
+DEPENDS = "ncurses glib-2.0"
+RDEPENDS = "ncurses-terminfo"
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
+--without-nfs --without-gpm-mouse --with-screen=ncurses"
+
+PACKAGES += "${PN}-extfs ${PN}-hilite"
+FILES_${PN} = "${bindir}/ ${libdir}/ ${datadir}/mc/*.*"
+FILES_${PN}-extfs = "${datadir}/mc/extfs/"
+FILES_${PN}-hilite = "${datadir}/mc/syntax/"
+RRECOMMENDS_${PN} += "${PN}-extfs ${PN}-hilite"
+RDEPENDS_${PN}-extfs = "${PN}"
+RDEPENDS_${PN}-hilite = "${PN}"
+PACKAGE_ARCH_${PN}-extfs = "all"
+PACKAGE_ARCH_${PN}-hilite = "all"
+
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_install() {
+	cd src
+	oe_runmake 'DESTDIR=${D}' install
+	cd ../syntax
+	oe_runmake 'DESTDIR=${D}' install
+	cd ../po
+	oe_runmake 'DESTDIR=${D}' install
+	cd ../vfs
+	oe_runmake 'DESTDIR=${D}' install
+	cd ..
+
+        install -m 0644 lib/cedit.menu ${D}${datadir}/mc/
+        install -m 0644 lib/edit.indent.rc ${D}${datadir}/mc/
+        install -m 0644 lib/edit.spell.rc ${D}${datadir}/mc/
+        install -m 0644 lib/mc.charsets ${D}${datadir}/mc/
+        install -m 0644 lib/mc.ext ${D}${datadir}/mc/
+        install -m 0644 lib/mc.lib ${D}${datadir}/mc/
+        install -m 0644 lib/mc.menu ${D}${datadir}/mc/
+        install -m 0644 lib/mc.menu.sr ${D}${datadir}/mc/
+}
diff --git a/packages/mc/mc_4.6.0.bb b/packages/mc/mc_4.6.0.bb
index 74d5d8d191..e5c18784be 100644
--- a/packages/mc/mc_4.6.0.bb
+++ b/packages/mc/mc_4.6.0.bb
@@ -1,33 +1,2 @@
-DESCRIPTION = "GNU Midnight Commander is a file \
-manager for free operating systems."
-HOMEPAGE = "http://www.ibiblio.org/mc/"
-LICENSE = "GPLv2"
-SECTION = "console/utils"
-PRIORITY = "optional"
-DEPENDS = "ncurses glib-2.0"
-RDEPENDS = "ncurses-terminfo"
-PR ="r1"
-
-SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
---without-nfs --without-gpm-mouse --with-screen=ncurses"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
-do_install() {
-	cd src
-	oe_runmake 'DESTDIR=${D}' install
-	cd ../syntax
-	oe_runmake 'DESTDIR=${D}' install
-	cd ../po
-	oe_runmake 'DESTDIR=${D}' install
-	cd ../vfs
-	oe_runmake 'DESTDIR=${D}' install
-	cd ..
-}
+require mc.inc
+PR = "r2"
diff --git a/packages/mc/mc_4.6.1.bb b/packages/mc/mc_4.6.1.bb
index 58a8fdf51b..e5c18784be 100644
--- a/packages/mc/mc_4.6.1.bb
+++ b/packages/mc/mc_4.6.1.bb
@@ -1,42 +1,2 @@
-DESCRIPTION = "GNU Midnight Commander is a file \
-manager for free operating systems."
-HOMEPAGE = "http://www.ibiblio.org/mc/"
-LICENSE = "GPLv2"
-SECTION = "console/utils"
-PRIORITY = "optional"
-DEPENDS = "ncurses glib-2.0"
-RDEPENDS = "ncurses-terminfo"
-PR ="r1"
-
-SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
---without-nfs --without-gpm-mouse --with-screen=ncurses"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
-do_install() {
-	cd src
-	oe_runmake 'DESTDIR=${D}' install
-	cd ../syntax
-	oe_runmake 'DESTDIR=${D}' install
-	cd ../po
-	oe_runmake 'DESTDIR=${D}' install
-	cd ../vfs
-	oe_runmake 'DESTDIR=${D}' install
-	cd ..
-
-        install -m 0644 lib/cedit.menu ${D}${datadir}/mc/
-        install -m 0644 lib/edit.indent.rc ${D}${datadir}/mc/
-        install -m 0644 lib/edit.spell.rc ${D}${datadir}/mc/
-        install -m 0644 lib/mc.charsets ${D}${datadir}/mc/
-        install -m 0644 lib/mc.ext ${D}${datadir}/mc/
-        install -m 0644 lib/mc.lib ${D}${datadir}/mc/
-        install -m 0644 lib/mc.menu ${D}${datadir}/mc/
-        install -m 0644 lib/mc.menu.sr ${D}${datadir}/mc/
-}
+require mc.inc
+PR = "r2"