summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-07-22 21:57:42 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-07-22 21:57:42 +0000
commit00d75f8f1dbb64d872f57b3ccc4f423524bb0718 (patch)
treeda6fdfb7055a4f24b26881d9f1a2603b1d3b3bda /conf/machine
parente5f119730e8bc5fc7b5fb5fc773490d393b6b6b2 (diff)
Remove references to imaginary variables. BOOTSTRAP_EXTRA_DEPENDS is no longer required/exists. Ditto GPE_EXTRA_DEPENDS.
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/h4000.conf2
-rw-r--r--conf/machine/h6300.conf6
-rw-r--r--conf/machine/htcuniversal.conf2
3 files changed, 1 insertions, 9 deletions
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 8fa440e155..bf653d9e97 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
ROOT_FLASH_SIZE = "32"
-BOOTSTRAP_EXTRA_DEPENDS_append = " mtd-utils virtual/kernel udev module-init-tools"
-
BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils kernel udev module-init-tools"
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 33855e3a66..42eabeb588 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -28,11 +28,6 @@ module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-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 module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
@@ -40,7 +35,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-a
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 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"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0e377a151f..8ce77e7449 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -47,4 +47,4 @@ module_autoload_htcuniversal-acx = "htcuniversal_acx"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
-#GPE_EXTRA_DEPENDS += " gomunicator"
+#GPE_EXTRA_INSTALL += " gomunicator"