From 4a6ac907a9d6a444004a4384b53581b9ca09e090 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 1 Jan 2007 17:50:31 +0000 Subject: image.bbclass rootfs_ipk.bbclass: Move common functionality into image.bbclass to prepare for rootfs_deb/bbclass (from poky) --- classes/image.bbclass | 72 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index 2beb137aef..bcf9bef13c 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -1,4 +1,6 @@ -inherit rootfs_ipk +inherit rootfs_${IMAGE_PKGTYPE} + +PACKAGES = "" # We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" @@ -9,6 +11,8 @@ EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" +PID = "${@os.getpid()}" + DEPENDS += "makedevs-native" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -46,6 +50,17 @@ def get_devtable_list(d): 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 () { @@ -59,7 +74,7 @@ fakeroot do_rootfs () { done fi - real_do_rootfs + rootfs_${IMAGE_PKGTYPE}_do_rootfs insert_feed_uris @@ -68,6 +83,7 @@ fakeroot do_rootfs () { ${IMAGE_PREPROCESS_COMMAND} export TOPDIR=${TOPDIR} + export MACHINE=${MACHINE} for type in ${IMAGE_FSTYPES}; do if test -z "$FAKEROOTKEY"; then @@ -97,3 +113,55 @@ insert_feed_uris () { echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf done } + +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 +} + +make_zimage_symlink_relative () { + if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then + (cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done) + 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 make_zimage_symlink_relative + +addtask rootfs before do_build after do_install -- cgit 1.2.3-korg