From cbefaa3e3160aed390722b301e909f72b22dbbb8 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Thu, 27 Mar 2014 14:43:57 +0200 Subject: run-postinsts: fix issue with checking IMAGE_FEATURES The old implementation was wrong. It was not very generic and it checked IMAGE_FEATURES while building the recipe, which led to various issues with the generation of the final script. That is, the run-postinsts script was generated once, while building the package for the first time. Hence, any other changes to IMAGE_FEATURES, like removing/adding 'package-management' did not reflect in the final script. This commit makes run-postinsts script autodetect the backend used for creating the image, making it generic. [YOCTO #5666] [YOCTO #5972] (From OE-Core rev: 44902f7550e490a9d4d2e2bcdf8c577329b4af75) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb') diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index e990c67..64f85c2 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb @@ -37,8 +37,6 @@ do_install() { sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ -e 's:#SBINDIR#:${sbindir}:g' \ -e 's:#BASE_BINDIR#:${base_bindir}:g' \ - -e 's:#IMAGE_PKGTYPE#:${IMAGE_PKGTYPE}:g' \ - -e 's:#PM_INSTALLED#:${@base_contains("IMAGE_FEATURES", "package-management", "true", "false", d)}:g' \ ${D}${sbindir}/run-postinsts \ ${D}${systemd_unitdir}/system/run-postinsts.service } -- cgit v1.1