diff options
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 119bf92cd7..5651243090 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -87,15 +87,6 @@ fakeroot rootfs_rpm_do_rootfs () { | |||
87 | 87 | ||
88 | ${ROOTFS_POSTINSTALL_COMMAND} | 88 | ${ROOTFS_POSTINSTALL_COMMAND} |
89 | 89 | ||
90 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | ||
91 | if [ -d ${IMAGE_ROOTFS}/etc/rpm-postinsts ] ; then | ||
92 | if [ "`ls -A ${IMAGE_ROOTFS}/etc/rpm-postinsts`" != "" ] ; then | ||
93 | bberror "Some packages could not be configured offline and rootfs is read-only." | ||
94 | exit 1 | ||
95 | fi | ||
96 | fi | ||
97 | fi | ||
98 | |||
99 | # Report delayed package scriptlets | 90 | # Report delayed package scriptlets |
100 | for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do | 91 | for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do |
101 | if [ -f $i ]; then | 92 | if [ -f $i ]; then |
@@ -126,7 +117,16 @@ EOF | |||
126 | 117 | ||
127 | ${RPM_POSTPROCESS_COMMANDS} | 118 | ${RPM_POSTPROCESS_COMMANDS} |
128 | ${ROOTFS_POSTPROCESS_COMMAND} | 119 | ${ROOTFS_POSTPROCESS_COMMAND} |
129 | 120 | ||
121 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | ||
122 | if [ -d ${IMAGE_ROOTFS}/etc/rpm-postinsts ] ; then | ||
123 | if [ "`ls -A ${IMAGE_ROOTFS}/etc/rpm-postinsts`" != "" ] ; then | ||
124 | bberror "Some packages could not be configured offline and rootfs is read-only." | ||
125 | exit 1 | ||
126 | fi | ||
127 | fi | ||
128 | fi | ||
129 | |||
130 | rm -rf ${IMAGE_ROOTFS}/var/cache2/ | 130 | rm -rf ${IMAGE_ROOTFS}/var/cache2/ |
131 | rm -rf ${IMAGE_ROOTFS}/var/run2/ | 131 | rm -rf ${IMAGE_ROOTFS}/var/run2/ |
132 | rm -rf ${IMAGE_ROOTFS}/var/log2/ | 132 | rm -rf ${IMAGE_ROOTFS}/var/log2/ |