| Submitter | Martin Jansa |
|---|---|
| Date | Jan. 25, 2012, 8:05 a.m. |
| Message ID | <1327478715-11214-1-git-send-email-Martin.Jansa@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/20111/ |
| State | Accepted |
| Commit | 6d3eac57bdba8e2582c210a2f82a3a4546f68581 |
| Headers | show |
Comments
On 01/25/2012 12:05 AM, Martin Jansa wrote: > * 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<Martin.Jansa@gmail.com> > --- > 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 Merged into OE-core Thanks Sau!
Patch
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
* 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 <Martin.Jansa@gmail.com> --- meta/classes/rootfs_ipk.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)