From 04607b0cd496837f10ef78cf43597ec1d2e13f2e Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Mon, 25 Feb 2013 10:57:24 +0800 Subject: rootfs_rpm: move run-postinsts scripts to rpm recipe Move run-postinsts scripts from rootfs_rpm.bbclass to rpm recipe. That is the same way for dpkg and opkg to deal the post install scripts. Signed-off-by: Kang Kai Signed-off-by: Saul Wold --- meta/classes/rootfs_rpm.bbclass | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 9dc2bf997c..3442d48363 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -29,11 +29,6 @@ do_rootfs[vardepsexclude] += "BUILDNAME" RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; " RPM_POSTPROCESS_COMMANDS = "rpm_setup_smart_target_config; " -# -# Allow distributions to alter when [postponed] package install scripts are run -# -POSTINSTALL_INITPOSITION ?= "98" - rpmlibdir = "/var/lib/rpm" opkglibdir = "${localstatedir}/lib/opkg" @@ -114,24 +109,6 @@ fakeroot rootfs_rpm_do_rootfs () { fi done - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d - # Stop $i getting expanded below... - i=\$i - cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF -#!/bin/sh -for i in \`ls /etc/rpm-postinsts/\`; do - i=/etc/rpm-postinsts/$i - echo "Running postinst $i..." - if [ -f $i ] && $i; then - rm $i - else - echo "ERROR: postinst $i failed." - fi -done -rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts -EOF - chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts - install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version -- cgit v1.2.3