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>
This commit is contained in:
Laurentiu Palcu 2014-03-27 14:43:57 +02:00 committed by Richard Purdie
parent ad1447d652
commit cbefaa3e31
2 changed files with 23 additions and 9 deletions

View File

@ -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

View File

@ -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
}