summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/ezx.conf2
-rw-r--r--conf/distro/include/angstrom.inc1
-rw-r--r--conf/distro/jlime-donkey.conf4
-rw-r--r--conf/machine/h4000.conf2
-rw-r--r--conf/machine/h6300.conf6
-rw-r--r--conf/machine/htcuniversal.conf2
6 files changed, 3 insertions, 14 deletions
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 5a24d22a8c..1e156dd363 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -57,7 +57,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
#
# Utilities
#
-BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native"
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
#
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 13ac2b16bf..8203c000f7 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -37,7 +37,6 @@ BUILD_OPTIMIZATION = "-Os"
TARGET_FPU_arm = "soft"
#Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
#Name the generated images in a sane way
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index b3be297e53..c44f352872 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -77,9 +77,7 @@ TARGET_OS = "linux"
#<>What we want on the bootstrap image (extra)
#<>
#<>
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
- e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
#<>
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"