From 0d239328b1c6b9e4afadad75972d359181fbe1a5 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 18 Sep 2012 18:39:49 +0300 Subject: image.bbclass: run postinst scripts once, at rootfs time This patch will allow the repeating postinst scriptlets to be run only once, on host, at do_rootfs time. This will lower the time for rootfs generation and, also, instead of running some time consuming scriptlets at target's first boot, we will do on the host. Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold --- meta/classes/image.bbclass | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7b24e4e285..719d871bca 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -156,7 +156,7 @@ inherit ${IMAGE_CLASSES} IMAGE_POSTPROCESS_COMMAND ?= "" MACHINE_POSTPROCESS_COMMAND ?= "" -ROOTFS_POSTPROCESS_COMMAND ?= "" +ROOTFS_POSTPROCESS_COMMAND_prepend = "run_intercept_scriptlets; " # some default locales IMAGE_LINGUAS ?= "de-de fr-fr en-gb" @@ -166,15 +166,29 @@ LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IM PSEUDO_PASSWD = "${IMAGE_ROOTFS}" do_rootfs[nostamp] = "1" -do_rootfs[dirs] = "${TOPDIR}" +do_rootfs[dirs] = "${TOPDIR} ${WORKDIR}/intercept_scripts" do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock" -do_rootfs[cleandirs] += "${S}" +do_rootfs[cleandirs] += "${S} ${WORKDIR}/intercept_scripts" 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. do_rootfs[umask] = "022" + +run_intercept_scriptlets () { + if [ -d ${WORKDIR}/intercept_scripts ]; then + cd ${WORKDIR}/intercept_scripts + echo "Running intercept scripts:" + for script in *; do + if [ "$script" = "*" ]; then break; fi + echo "> Executing $script" + chmod +x $script + ./$script + done + fi +} + fakeroot do_rootfs () { #set -x # When use the rpm incremental image generation, don't remove the rootfs -- cgit 1.2.3-korg