From e2f9e1a4aa15ace73ec174aa24dd0db1a0924148 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Nov 2006 23:21:06 +0000 Subject: Factor common code out of rootfs_xxx.bbclass into image.bbclass. Add error detection code for roofs_deb.bbclass git-svn-id: https://svn.o-hand.com/repos/poky/trunk@936 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/classes/image.bbclass | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 752b2de0b..8375d7133 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,5 +1,7 @@ inherit rootfs_${IMAGE_PKGTYPE} +PACKAGES = "" + # We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" do_rootfs[recrdeptask] = "do_package_write" @@ -9,6 +11,8 @@ EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" +PID = "${@os.getpid()}" + DEPENDS += "makedevs-native" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -26,6 +30,17 @@ DEPENDS += "${@get_image_deps(d)}" IMAGE_DEVICE_TABLE ?= "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-minimal.txt')}" IMAGE_POSTPROCESS_COMMAND ?= "" +# some default locales +IMAGE_LINGUAS ?= "de-de fr-fr en-gb" + +LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}" + +ROOTFS_POSTPROCESS_COMMAND ?= "" + +do_rootfs[nostamp] = 1 +do_rootfs[dirs] = ${TOPDIR} +do_build[nostamp] = 1 + # Must call real_do_rootfs() from inside here, rather than as a separate # task, so that we have a single fakeroot context for the whole process. fakeroot do_rootfs () { @@ -56,3 +71,50 @@ fakeroot do_rootfs () { ${IMAGE_POSTPROCESS_COMMAND} } + +log_check() { + set +x + for target in $* + do + lf_path="${WORKDIR}/temp/log.do_$target.${PID}" + + echo "log_check: Using $lf_path as logfile" + + if test -e "$lf_path" + then + rootfs_${IMAGE_PKGTYPE}_log_check $target $lf_path + else + echo "Cannot find logfile [$lf_path]" + fi + echo "Logfile is clean" + done + + set -x +} + +# set '*' as the rootpassword so the images +# can decide if they want it or not + +zap_root_password () { + sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new + mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd +} + +create_etc_timestamp() { + date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp +} + +# Turn any symbolic /sbin/init link into a file +remove_init_link () { + if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then + LINKFILE=${IMAGE_ROOTFS}`readlink ${IMAGE_ROOTFS}/sbin/init` + rm ${IMAGE_ROOTFS}/sbin/init + cp $LINKFILE ${IMAGE_ROOTFS}/sbin/init + fi +} + +# export the zap_root_password, create_etc_timestamp and remote_init_link +EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs + +addtask rootfs before do_build after do_install + -- cgit v1.2.3