On 11/9/11 6:05 AM, Paul Eggleton wrote:
> Our current assumption (based on the behaviour of opkg) when writing
> recipes is that prerm and postrm do not get called during an upgrade.
> When using rpm however, these are mapped to the rpm "preun" and "postun"
> events which occur after postinst for upgrades, and when these contain
> removal type operations (such as update-alternatives --remove) this
> causes problems.
>
> This patch wraps each preun and postun script for rpm in a check that
> determines whether or not the script is being called during an upgrade,
> and skips the entire script if it is, which mimics the behaviour of opkg
> under the same conditions.
>
> Fixes [YOCTO #1760]
>
> Signed-off-by: Paul Eggleton <paul.eggle...@linux.intel.com>
Looks like the right solution to me. (Paul and I previously discussed how to
correct this.)
Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
> ---
> meta/classes/package_rpm.bbclass | 18 ++++++++++++++++--
> 1 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/package_rpm.bbclass
> b/meta/classes/package_rpm.bbclass
> index df5a2db..2679e9f 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -471,6 +471,16 @@ python write_specfile () {
> else:
> target.append(path + "/" + file)
>
> + # Prevent the prerm/postrm scripts from being run during an upgrade
> + def wrap_uninstall(scriptvar):
> + scr = scriptvar.strip()
> + if scr.startswith("#!"):
> + pos = scr.find("\n") + 1
> + else:
> + pos = 0
> + scr = scr[:pos] + 'if [ "$1" = "0" ] ; then\n' + scr[pos:] +
> '\nfi'
> + return scr
> +
> packages = bb.data.getVar('PACKAGES', d, True)
> if not packages or packages == '':
> bb.debug(1, "No packages; nothing to do")
> @@ -671,8 +681,10 @@ python write_specfile () {
> spec_scriptlets_bottom.append('%%post -n %s' %
> splitname)
> elif script == 'prerm':
> spec_scriptlets_bottom.append('%%preun -n %s' %
> splitname)
> + scriptvar = wrap_uninstall(scriptvar)
> elif script == 'postrm':
> spec_scriptlets_bottom.append('%%postun -n %s'
> % splitname)
> + scriptvar = wrap_uninstall(scriptvar)
> spec_scriptlets_bottom.append(scriptvar)
> spec_scriptlets_bottom.append('')
>
> @@ -758,11 +770,13 @@ python write_specfile () {
> spec_scriptlets_top.append('')
> if srcprerm:
> spec_scriptlets_top.append('%preun')
> - spec_scriptlets_top.append(srcprerm)
> + scriptvar = wrap_uninstall(srcprerm)
> + spec_scriptlets_top.append(scriptvar)
> spec_scriptlets_top.append('')
> if srcpostrm:
> spec_scriptlets_top.append('%postun')
> - spec_scriptlets_top.append(srcpostrm)
> + scriptvar = wrap_uninstall(srcpostrm)
> + spec_scriptlets_top.append(scriptvar)
> spec_scriptlets_top.append('')
>
> # Write the SPEC file
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
