summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-12 18:12:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-13 16:52:29 +0000
commit5bb362a0ba97687029b3aef76b7e789570a4d728 (patch)
tree40d753aa370df5ba3d793ca5943f91ae41916f91 /meta
parent6cca7efa6f7b61523913eace3f44ca2235d4e9ac (diff)
downloadpoky-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')
-rw-r--r--meta/classes/rootfs_deb.bbclass14
-rw-r--r--meta/classes/rootfs_ipk.bbclass13
-rw-r--r--meta/classes/rootfs_rpm.bbclass20
3 files changed, 23 insertions, 24 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
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index fadec4d90d..135bb6026b 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -80,7 +80,12 @@ fakeroot rootfs_ipk_do_rootfs () {
80 80
81 ${OPKG_POSTPROCESS_COMMANDS} 81 ${OPKG_POSTPROCESS_COMMANDS}
82 ${ROOTFS_POSTINSTALL_COMMAND} 82 ${ROOTFS_POSTINSTALL_COMMAND}
83 83
84 install -d ${IMAGE_ROOTFS}/${sysconfdir}
85 echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
86
87 ${ROOTFS_POSTPROCESS_COMMAND}
88
84 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then 89 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
85 if grep Status:.install.ok.unpacked ${STATUS}; then 90 if grep Status:.install.ok.unpacked ${STATUS}; then
86 bberror "Some packages could not be configured offline and rootfs is read-only." 91 bberror "Some packages could not be configured offline and rootfs is read-only."
@@ -88,11 +93,6 @@ fakeroot rootfs_ipk_do_rootfs () {
88 fi 93 fi
89 fi 94 fi
90 95
91 install -d ${IMAGE_ROOTFS}/${sysconfdir}
92 echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
93
94 ${ROOTFS_POSTPROCESS_COMMAND}
95
96 rm -f ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/lists/* 96 rm -f ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/lists/*
97 if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then 97 if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
98 if ! grep Status:.install.ok.unpacked ${STATUS}; then 98 if ! grep Status:.install.ok.unpacked ${STATUS}; then
@@ -114,7 +114,6 @@ fakeroot rootfs_ipk_do_rootfs () {
114 remove_packaging_data_files 114 remove_packaging_data_files
115 fi 115 fi
116 fi 116 fi
117 set +x
118 log_check rootfs 117 log_check rootfs
119} 118}
120 119
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/