summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-01-08 21:07:10 (GMT)
committerRichard Purdie <richard@openedhand.com>2007-01-08 21:07:10 (GMT)
commit81fc6532fbe12fd97f0bdc9f6b8ccd902b538531 (patch)
tree010d5bd1fb4612210d5b37c04a1848ea6e8b291e
parentb30afa242b13e84585501cd0f0171a8cafb0bac3 (diff)
downloadpoky-81fc6532fbe12fd97f0bdc9f6b8ccd902b538531.tar.gz
image.bbclass: Sync minor changes with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1125 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/image.bbclass17
1 files changed, 11 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index b926792..f9e7fca 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -4,7 +4,7 @@ PACKAGES = ""
4 4
5# We need to recursively follow RDEPENDS and RRECOMMENDS for images 5# We need to recursively follow RDEPENDS and RRECOMMENDS for images
6BUILD_ALL_DEPS = "1" 6BUILD_ALL_DEPS = "1"
7do_rootfs[recrdeptask] = "do_package_write" 7do_rootfs[recrdeptask] = "do_package_write do_deploy"
8 8
9# Images are generally built explicitly, do not need to be part of world. 9# Images are generally built explicitly, do not need to be part of world.
10EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
@@ -37,9 +37,9 @@ LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVa
37 37
38ROOTFS_POSTPROCESS_COMMAND ?= "" 38ROOTFS_POSTPROCESS_COMMAND ?= ""
39 39
40do_rootfs[nostamp] = 1 40do_rootfs[nostamp] = "1"
41do_rootfs[dirs] = ${TOPDIR} 41do_rootfs[dirs] = "${TOPDIR}"
42do_build[nostamp] = 1 42do_build[nostamp] = "1"
43 43
44# Must call real_do_rootfs() from inside here, rather than as a separate 44# Must call real_do_rootfs() from inside here, rather than as a separate
45# task, so that we have a single fakeroot context for the whole process. 45# task, so that we have a single fakeroot context for the whole process.
@@ -114,8 +114,13 @@ remove_init_link () {
114 fi 114 fi
115} 115}
116 116
117make_zimage_symlink_relative () {
118 if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then
119 (cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done)
120 fi
121}
122
117# export the zap_root_password, create_etc_timestamp and remote_init_link 123# export the zap_root_password, create_etc_timestamp and remote_init_link
118EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs 124EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative
119 125
120addtask rootfs before do_build after do_install 126addtask rootfs before do_build after do_install
121