From b7cb3809309d2093990f8b6f930e96c7db827cee Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Fri, 1 Mar 2013 18:02:14 +0800 Subject: [PATCH] package_rpm.bbclass: name postinst files with package name When create rootfs, some post install scripts need be run on device. They are saved under directory /etc/rpm-postinst and named with numbers such as 100, 101 etc. Update to name the postinst script file with its package name instead of just number. That may be more easy to debug when there is a error. [YOCTO #3218] (From OE-Core rev: 9b2a008c25a7a3152ae2d8c64ae8de2534471d47) Signed-off-by: Kang Kai Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 7a1da33ead..225fc70f2f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -383,12 +383,11 @@ export NATIVE_ROOT=${STAGING_DIR_NATIVE} \$2 \$1/\$3 \$4 if [ \$? -ne 0 ]; then mkdir -p \$1/etc/rpm-postinsts - num=100 - while [ -e \$1/etc/rpm-postinsts/\${num} ]; do num=\$((num + 1)); done - echo "#!\$2" > \$1/etc/rpm-postinsts/\${num} - echo "# Arg: \$4" >> \$1/etc/rpm-postinsts/\${num} - cat \$1/\$3 >> \$1/etc/rpm-postinsts/\${num} - chmod +x \$1/etc/rpm-postinsts/\${num} + 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} fi EOF