diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-03-27 14:43:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-27 15:44:43 +0000 |
commit | cbefaa3e3160aed390722b301e909f72b22dbbb8 (patch) | |
tree | a99ee31169e86eb11ea49bec695d95f893aea579 /meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | |
parent | ad1447d6526ace1d8e635fc8a3d15098426f5a6b (diff) | |
download | poky-cbefaa3e3160aed390722b301e909f72b22dbbb8.tar.gz |
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 <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb')
-rw-r--r-- | meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 |
1 files changed, 0 insertions, 2 deletions
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 e990c670c0..64f85c262d 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() { | |||
37 | sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ | 37 | sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ |
38 | -e 's:#SBINDIR#:${sbindir}:g' \ | 38 | -e 's:#SBINDIR#:${sbindir}:g' \ |
39 | -e 's:#BASE_BINDIR#:${base_bindir}:g' \ | 39 | -e 's:#BASE_BINDIR#:${base_bindir}:g' \ |
40 | -e 's:#IMAGE_PKGTYPE#:${IMAGE_PKGTYPE}:g' \ | ||
41 | -e 's:#PM_INSTALLED#:${@base_contains("IMAGE_FEATURES", "package-management", "true", "false", d)}:g' \ | ||
42 | ${D}${sbindir}/run-postinsts \ | 40 | ${D}${sbindir}/run-postinsts \ |
43 | ${D}${systemd_unitdir}/system/run-postinsts.service | 41 | ${D}${systemd_unitdir}/system/run-postinsts.service |
44 | } | 42 | } |