diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-02-12 18:12:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-13 16:52:29 +0000 |
commit | 5bb362a0ba97687029b3aef76b7e789570a4d728 (patch) | |
tree | 40d753aa370df5ba3d793ca5943f91ae41916f91 /meta/classes/rootfs_deb.bbclass | |
parent | 6cca7efa6f7b61523913eace3f44ca2235d4e9ac (diff) | |
download | poky-5bb362a0ba97687029b3aef76b7e789570a4d728.tar.gz |
rootfs_(ipk|deb|rpm).bbclass: check package installation status after ROOTFS_POSTPROCESS_COMMAND
Since the intercept fall-back procedure will change the package
installation status, do the checking after ROOTFS_POSTPROCESS_COMMAND
ends.
(From OE-Core rev: 414c3918baccc2166bba536c956eebaeb49aace3)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs_deb.bbclass')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 99979961ea..92a65791dc 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -70,13 +70,6 @@ fakeroot rootfs_deb_do_rootfs () { | |||
70 | 70 | ||
71 | set -e | 71 | set -e |
72 | 72 | ||
73 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | ||
74 | if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}/var/lib/dpkg/status; then | ||
75 | bberror "Some packages could not be configured offline and rootfs is read-only." | ||
76 | exit 1 | ||
77 | fi | ||
78 | fi | ||
79 | |||
80 | install -d ${IMAGE_ROOTFS}/${sysconfdir} | 73 | install -d ${IMAGE_ROOTFS}/${sysconfdir} |
81 | echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version | 74 | echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version |
82 | 75 | ||
@@ -91,6 +84,13 @@ fakeroot rootfs_deb_do_rootfs () { | |||
91 | 84 | ||
92 | ${ROOTFS_POSTPROCESS_COMMAND} | 85 | ${ROOTFS_POSTPROCESS_COMMAND} |
93 | 86 | ||
87 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | ||
88 | if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}/var/lib/dpkg/status; then | ||
89 | bberror "Some packages could not be configured offline and rootfs is read-only." | ||
90 | exit 1 | ||
91 | fi | ||
92 | fi | ||
93 | |||
94 | log_check rootfs | 94 | log_check rootfs |
95 | } | 95 | } |
96 | 96 | ||