diff options
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 95e9455e5c..b3875a437c 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -20,8 +20,6 @@ do_rootfs[depends] += "opkg-native:do_populate_sysroot" | |||
20 | 20 | ||
21 | do_rootfs[recrdeptask] += "do_package_write_rpm" | 21 | do_rootfs[recrdeptask] += "do_package_write_rpm" |
22 | 22 | ||
23 | AWKPOSTINSTSCRIPT = "${COREBASE}/scripts/rootfs_rpm-extract-postinst.awk" | ||
24 | |||
25 | RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; package_generate_rpm_conf; " | 23 | RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; package_generate_rpm_conf; " |
26 | RPM_POSTPROCESS_COMMANDS = "" | 24 | RPM_POSTPROCESS_COMMANDS = "" |
27 | 25 | ||
@@ -108,19 +106,9 @@ EOF | |||
108 | 106 | ||
109 | ${ROOTFS_POSTINSTALL_COMMAND} | 107 | ${ROOTFS_POSTINSTALL_COMMAND} |
110 | 108 | ||
111 | mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/ | 109 | # Report delayed package scriptlets |
112 | ${RPM} --root ${IMAGE_ROOTFS} -D '_dbpath ${rpmlibdir}' -qa \ | 110 | for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do |
113 | -D "__dbi_txn create nofsync private" \ | 111 | echo "Delayed package scriptlet: `head -n 3 $i | tail -n 1`" |
114 | --qf 'Name: %{NAME}\n%|POSTIN?{postinstall scriptlet%|POSTINPROG?{ (using %{POSTINPROG})}|:\n%{POSTIN}\n}:{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|' \ | ||
115 | > ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined | ||
116 | awk -f ${AWKPOSTINSTSCRIPT} < ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined | ||
117 | rm ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined | ||
118 | |||
119 | for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*.sh; do | ||
120 | if [ -f $i ] && sh $i; then | ||
121 | # rm $i | ||
122 | mv $i $i.done | ||
123 | fi | ||
124 | done | 112 | done |
125 | 113 | ||
126 | install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d | 114 | install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d |
@@ -128,11 +116,10 @@ EOF | |||
128 | i=\$i | 116 | i=\$i |
129 | cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF | 117 | cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF |
130 | #!/bin/sh | 118 | #!/bin/sh |
131 | for i in /etc/rpm-postinsts/*.sh; do | 119 | for i in /etc/rpm-postinsts/*; do |
132 | echo "Running postinst $i..." | 120 | echo "Running postinst $i..." |
133 | if [ -f $i ] && sh $i; then | 121 | if [ -f $i ] && $i; then |
134 | # rm $i | 122 | rm $i |
135 | mv $i $i.done | ||
136 | else | 123 | else |
137 | echo "ERROR: postinst $i failed." | 124 | echo "ERROR: postinst $i failed." |
138 | fi | 125 | fi |