diff options
| author |   Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org> | 2015-04-10 15:15:29 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-13 22:28:35 +0100 |
| commit | a880669f767532ce3c39eb160fa9deb9fce29677 (patch) | |
| tree | 4fd01f7733a2c48b1fe4e01014a5db29bff9aff7 | |
| parent | dd65ee47d04f3f8e51a7abec02d564b9e46626ae (diff) | |
| download | openembedded-core-contrib-a880669f767532ce3c39eb160fa9deb9fce29677.tar.gz | |
package_manager: RpmPM: Fix scriptlet for rpm 4
Path of rpm post install script is different between rpm 4 and 5
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/package_manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index ed0c9a7d3d..0460415699 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -937,8 +937,10 @@ class RpmPM(PackageManager): # if self.rpm_version == 4: scriptletcmd = "$2 $3 $4\n" + scriptpath = "$3" else: scriptletcmd = "$2 $1/$3 $4\n" + scriptpath = "$1/$3" SCRIPTLET_FORMAT = "#!/bin/bash\n" \ "\n" \ @@ -956,10 +958,10 @@ class RpmPM(PackageManager): " mkdir -p $1/etc/rpm-postinsts\n" \ " num=100\n" \ " while [ -e $1/etc/rpm-postinsts/${num}-* ]; do num=$((num + 1)); done\n" \ - " name=`head -1 $1/$3 | cut -d\' \' -f 2`\n" \ + " name=`head -1 " + scriptpath + " | cut -d\' \' -f 2`\n" \ ' echo "#!$2" > $1/etc/rpm-postinsts/${num}-${name}\n' \ ' echo "# Arg: $4" >> $1/etc/rpm-postinsts/${num}-${name}\n' \ - " cat $1/$3 >> $1/etc/rpm-postinsts/${num}-${name}\n" \ + " cat " + scriptpath + " >> $1/etc/rpm-postinsts/${num}-${name}\n" \ " chmod +x $1/etc/rpm-postinsts/${num}-${name}\n" \ " else\n" \ ' echo "Error: pre/post remove scriptlet failed"\n' \ |