diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-02-22 20:05:12 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-02-22 20:05:12 +0100 |
| commit | aff23a2028d1b48d8e9a26c4656ae48cd0016cfc (patch) | |
| tree | a509350ddc3b1ebeeabb956f0dd5c0c1edb427be /classes | |
| parent | dc5457b68bfccca1f7a3be247b0af7500422e8a3 (diff) | |
| download | openembedded-aff23a2028d1b48d8e9a26c4656ae48cd0016cfc.tar.gz | |
image.bbclass: install stuff listed in IMAGE_INSTALL as well
rootfs_ipk: task-boot change fixes
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image.bbclass | 30 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 4 |
2 files changed, 16 insertions, 18 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 2ed0ee1de7..fd0df4df08 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -2,19 +2,6 @@ inherit rootfs_${IMAGE_PKGTYPE} LICENSE = "MIT" PACKAGES = "" -RDEPENDS += "${IMAGE_INSTALL}" - -# "export IMAGE_BASENAME" not supported at this time -IMAGE_BASENAME[export] = "1" -export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" - -# We need to recursively follow RDEPENDS and RRECOMMENDS for images -do_rootfs[recrdeptask] += "do_deploy do_populate_staging" - -# Images are generally built explicitly, do not need to be part of world. -EXCLUDE_FROM_WORLD = "1" - -USE_DEVFS ?= "0" # # udev, devfsd, busybox-mdev (from busybox) or none @@ -28,15 +15,26 @@ IMAGE_INITSCRIPTS ?= "initscripts" # # tinylogin, getty # -IMAGE_LOGIN_MANAGER ?= "tinylogin" +IMAGE_LOGIN_MANAGER ?= "tinylogin" IMAGE_VARS = "${IMAGE_INITSCRIPTS} \ ${IMAGE_DEV_MANAGER} \ ${IMAGE_INIT_MANAGER} \ ${IMAGE_LOGIN_MANAGER} " -RDEPENDS += "${IMAGE_VARS}" -PACKAGE_INSTALL += "${IMAGE_VARS}" +RDEPENDS += "${IMAGE_INSTALL} ${IMAGE_VARS}" + +# "export IMAGE_BASENAME" not supported at this time +IMAGE_BASENAME[export] = "1" +export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_VARS}" + +# We need to recursively follow RDEPENDS and RRECOMMENDS for images +do_rootfs[recrdeptask] += "do_deploy do_populate_staging" + +# Images are generally built explicitly, do not need to be part of world. +EXCLUDE_FROM_WORLD = "1" + +USE_DEVFS ?= "0" PID = "${@os.getpid()}" diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 10a532e0a9..f5714bd1a3 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -23,8 +23,8 @@ BAD_RECOMMENDATIONS ?= "" IPKG_VARIANT ?= "opkg" -RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}" -PACKAGE_INSTALL += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}" +RDEPENDS_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}" +PACKAGE_INSTALL_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}" fakeroot rootfs_ipk_do_rootfs () { set -x |