From patchwork Fri Jan 27 17:15:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 3/6] rootfs_ipk: remove runtime_script_required usage Date: Fri, 27 Jan 2012 17:15:46 -0000 From: Saul Wold X-Patchwork-Id: 20257 Message-Id: <77edb307a9a6a7d5b203490a9535458131f0c071.1327684299.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Martin Jansa * it was introduced in 87780fc09b066525e47d0f50ee5497db54d304cd * then partially removed in 2feba313c991170747381c7cf821a45c2cd04632 * so remove this use too as runtime_script_required is not initialized anymore and results in run.do_rootfs.6328: line 235: [: -eq: unary operator expected Signed-off-by: Martin Jansa --- meta/classes/rootfs_ipk.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 48fb2fb..5342035 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -90,7 +90,7 @@ fakeroot rootfs_ipk_do_rootfs () { rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/* if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then - if [ $runtime_script_required -eq 0 ]; then + if ! grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}${opkglibdir}status; then # All packages were successfully configured. # update-rc.d, base-passwd are no further use, remove them now opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true