summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-02-19 11:35:13 +0100
committerKoen Kooi <koen@openembedded.org>2009-02-19 15:03:54 +0100
commit9752b780ae9cbe8b36507890d8ee55c439eb2b35 (patch)
tree9fee7f6bfb0ca8504b616064e86f1ec74909d129 /conf
parenta0699a732b06f6a6200d6cb936d6be907788607f (diff)
task-boot: rename DISTRO_ vars to IMAGE_ vars and move to image.bbclass * update users as well
Acked-By: Marcin Juszkiewicz <hrw@openembedded.org>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/kaeilos.conf2
-rw-r--r--conf/distro/openmoko.conf2
-rw-r--r--conf/distro/openprotium.conf6
-rw-r--r--conf/machine/mx31moboard.conf2
4 files changed, 6 insertions, 6 deletions
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index fac86c8667..a65bbff2c8 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -21,7 +21,7 @@ require conf/distro/include/preferred-opie-versions-1.2.4.inc
PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
PREFERRED_VERSION_busybox = "1.13.2"
-DISTRO_DEV_MANAGER = "busybox-mdev"
+IMAGE_DEV_MANAGER = "busybox-mdev"
#Images built can have to modes:
# 'debug': empty rootpassword, strace included
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index c038096231..cb1513de4b 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -30,7 +30,7 @@ DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
AB_DEPLOY_EXTRA ?= ""
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
-DISTRO_INITSCRIPTS = "initscripts-openmoko"
+IMAGE_INITSCRIPTS = "initscripts-openmoko"
# We try to minimize the distro features in the default image.
DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index b794d4a4ec..633e3bcaef 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -8,10 +8,10 @@ TARGET_OS = "linux"
#
# Basic configuration
#
-DISTRO_DEV_MANAGER = "udev"
+IMAGE_DEV_MANAGER = "udev"
DISTRO_SSH_DAEMON = "dropbear"
-DISTRO_INIT_MANAGER = "sysvinit"
-DISTRO_LOGIN_MANAGER = "tinylogin"
+IMAGE_INIT_MANAGER = "sysvinit"
+IMAGE_LOGIN_MANAGER = "tinylogin"
MACHINE_TASK_PROVIDER = "task-openprotium"
#
diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf
index a00a9b1be3..a1a5212ee9 100644
--- a/conf/machine/mx31moboard.conf
+++ b/conf/machine/mx31moboard.conf
@@ -20,7 +20,7 @@ module_conf_g_ether = "alias usb0 g_ether"
module_conf_rt2570-k2wrlz = "alias rausb0 rt2570"
# tinylogin is broken for our speeds
-DISTRO_LOGIN_MANAGER = "busybox"
+IMAGE_LOGIN_MANAGER = "busybox"
# used by sysvinit_2
SERIAL_CONSOLE = "-Lh 921600 ttymxc0 vt100"