diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-16 11:50:47 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-16 11:53:39 +0100 |
commit | cac1ca451a303cf4e234629fed0588fdbd669c69 (patch) | |
tree | feebcdb60a49f84faf1867789fb9530e451054ea /meta-oe/recipes-core | |
parent | a5eae966b971c2fd34356df324dcef2d7eb37c7f (diff) | |
download | meta-openembedded-cac1ca451a303cf4e234629fed0588fdbd669c69.tar.gz |
task-boot: leave packagemanagement decisions to image recipes
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/tasks/task-boot.bb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/tasks/task-boot.bb index d46188892..6c27ffe44 100644 --- a/meta-oe/recipes-core/tasks/task-boot.bb +++ b/meta-oe/recipes-core/tasks/task-boot.bb | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic task to get a device booting" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
4 | 4 | ||
5 | PR = "r56" | 5 | PR = "r57" |
6 | 6 | ||
7 | inherit task | 7 | inherit task |
8 | 8 | ||
@@ -16,12 +16,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
16 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" | 16 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" |
17 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | 17 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" |
18 | 18 | ||
19 | # update-alternatives script installed in rootfs needs to be the same as | ||
20 | # u-a script used for building image which is defined with | ||
21 | # PREFERRED_PROVIDER_virtual/update-alternatives-native | ||
22 | |||
23 | DISTRO_UPDATE_ALTERNATIVES ?= "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${PREFERRED_PROVIDER_virtual/update-alternatives}", d)}" | ||
24 | |||
25 | # Make sure we build the kernel | 19 | # Make sure we build the kernel |
26 | DEPENDS = "virtual/kernel" | 20 | DEPENDS = "virtual/kernel" |
27 | 21 | ||
@@ -34,7 +28,6 @@ RDEPENDS_${PN} = "\ | |||
34 | busybox \ | 28 | busybox \ |
35 | netbase \ | 29 | netbase \ |
36 | ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ | 30 | ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ |
37 | ${DISTRO_UPDATE_ALTERNATIVES} \ | ||
38 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ | 31 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ |
39 | " | 32 | " |
40 | 33 | ||