aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMika Laitio <lamikr@cc.jyu.fi>2006-04-19 22:37:23 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-19 22:37:23 +0000
commit6a229cf706cb02eec25a80867e7f1da2e3679a22 (patch)
treebfabedfb9cbe95c5c0647effd6a76f15d5f565af /conf
parent037f03de83391a9d5dba8dc9de7113bea2d511bb (diff)
downloadopenembedded-6a229cf706cb02eec25a80867e7f1da2e3679a22.tar.gz
h6300.conf: remove modutils-collateral to get the update-modules to create /etc/modules correctly during the first boot.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/h6300.conf15
1 files changed, 10 insertions, 5 deletions
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index afdd9b8791..99769eff05 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -10,6 +10,11 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+#Enable the pre-building of glibc locale config files. See glibc-package.bbclass
+ENABLE_BINARY_LOCALE_GENERATION = "1"
+#Assume that qemu is already installed (that's because qemu install will fail with gcc)
+ASSUME_PROVIDED += "qemu-native"
+
H6300_MODULES = "omapts i2c-omap pca9535 omap-keypad bluetooth rfcomm bnep l2cap hci_uart h6300_bt"
module_autoload_omapts = "omapts"
@@ -20,25 +25,25 @@ module_autoload_hci_uart = "hci_uart"
module_autoload_h6300_bt = "h6300_bt"
module_autoload_l2cap = "l2cap"
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils console-tools modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils console-tools module-init-tools"
BOOTSTRAP_EXTRA_DEPENDS += "apmd alsa-utils"
BOOTSTRAP_EXTRA_DEPENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
BOOTSTRAP_EXTRA_DEPENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-amixer alsa-utils-aplay"
BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-GPE_EXTRA_DEPENDS += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator mplayer gpe-tetris gpe-othello gpe-go gstreamer"
-GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator mplayer gpe-tetris gpe-othello gpe-go gstreamer"
+GPE_EXTRA_DEPENDS += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
+GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
SERIAL_CONSOLE ?= "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/tune-arm9tdmi.conf
+include conf/machine/include/tune-arm9tdmi.conf
INHERIT += "linux_modules"