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:16 +0000 |
| commit | 44902f7550e490a9d4d2e2bcdf8c577329b4af75 (patch) | |
| tree | 5688163e8175704eb2dfbded96da8d368b1597f4 | |
| parent | f41f1b263438e19e2209876798bbcbbcee646f34 (diff) | |
| download | openembedded-core-contrib-44902f7550e490a9d4d2e2bcdf8c577329b4af75.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]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 |
2 files changed, 23 insertions, 9 deletions
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts index 08cfa9e59f..f547a7b7bd 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts @@ -8,9 +8,29 @@ # The following script will run all the scriptlets found in #SYSCONFDIR#/deb-postinsts, # #SYSCONFDIR#/ipk-postinsts or #SYSCONFDIR#/rpm-posinsts. -pm=#IMAGE_PKGTYPE# -pm_installed=#PM_INSTALLED# -pi_dir=#SYSCONFDIR#/${pm}-postinsts +# the order of this list is important, do not change! +backend_list="rpm deb ipk" + +pm_installed=false + +for pm in $backend_list; do + pi_dir="#SYSCONFDIR#/$pm-postinsts" + + [ -d $pi_dir ] && break + + case $pm in + "deb") + if [ -s "/var/lib/dpkg/status" ]; then + pm_installed=true + break + fi + ;; + + "ipk") + pm_installed=true + ;; + esac +done remove_rcsd_link () { if [ -n "`which update-rc.d`" ]; then @@ -56,10 +76,6 @@ if $pm_installed; then "deb") eval dpkg --configure -a $append_log ;; - - "rpm") - exec_postinst_scriptlets - ;; esac else exec_postinst_scriptlets 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() { 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 } |