From b40843a54c33cc12516ec14e0e26b5f38b06fbe9 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 5 Jun 2013 12:16:50 +0300 Subject: [PATCH] package_rpm.bbclass: handle pre/post remove scriptlets Currently the scriptlet_wrapper is designed to handle only pre/post install scriptlets. This patch will slightly change the wrapper script to handle also pre/post remove scriptlets when we want to remove packages from the final image. (From OE-Core rev: aea47c77d69407b2e62f151cabba35293d179f0c) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 648327f..c654cdb 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -382,12 +382,16 @@ export NATIVE_ROOT=${STAGING_DIR_NATIVE} \$2 \$1/\$3 \$4 if [ \$? -ne 0 ]; then - mkdir -p \$1/etc/rpm-postinsts - name=\`head -1 \$1/\$3 | cut -d' ' -f 2\` - echo "#!\$2" > \$1/etc/rpm-postinsts/\${name} - echo "# Arg: \$4" >> \$1/etc/rpm-postinsts/\${name} - cat \$1/\$3 >> \$1/etc/rpm-postinsts/\${name} - chmod +x \$1/etc/rpm-postinsts/\${name} + if [ \$4 -eq 1 ]; then + mkdir -p \$1/etc/rpm-postinsts + name=\`head -1 \$1/\$3 | cut -d' ' -f 2\` + echo "#!\$2" > \$1/etc/rpm-postinsts/\${name} + echo "# Arg: \$4" >> \$1/etc/rpm-postinsts/\${name} + cat \$1/\$3 >> \$1/etc/rpm-postinsts/\${name} + chmod +x \$1/etc/rpm-postinsts/\${name} + else + echo "Error: pre/post remove scriptlet failed" + fi fi EOF -- 2.7.4