diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-02-23 13:19:19 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-02-23 13:19:19 -0800 |
| commit | 8c2955ce84aa2dacfacdfa96b8d2bfaf08f985d2 (patch) | |
| tree | 01b120afb41cf6fe91c0a093ac38ad7864bb862f /classes | |
| parent | 0773447006cd2aa0b2c3ac364ce6e1c151215087 (diff) | |
| parent | 0f5b41fdc74c6b18d482cab683a7fb2d53b6e3a2 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image.bbclass | 30 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 5 |
2 files changed, 18 insertions, 17 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 e752449305..f5714bd1a3 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -21,7 +21,10 @@ ONLINE_PACKAGE_MANAGEMENT ?= "full" # Which packages to not install on the basis of a recommendation BAD_RECOMMENDATIONS ?= "" -DISTRO_EXTRA_RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "opkg opkg-collateral", d)}" +IPKG_VARIANT ?= "opkg" + +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 |