]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.bbclass: run postinst scripts once, at rootfs time
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Tue, 18 Sep 2012 15:39:49 +0000 (18:39 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 6 Dec 2012 12:30:33 +0000 (12:30 +0000)
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 <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/classes/image.bbclass

index 7b24e4e2853028a55a90859511c8c85d5f6b0d82..719d871bcad374955a835ecd0a82a8bb9617f0fc 100644 (file)
@@ -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