Patchwork [2/2] package_rpm.bbclass: name postinst files with package name

login
register
mail settings
Submitter Kang Kai
Date March 1, 2013, 10:02 a.m.
Message ID <1482f3856c694c4010a2b526a9d436e9eafb3e2c.1362123438.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/45349/
State Accepted
Commit 9b2a008c25a7a3152ae2d8c64ae8de2534471d47
Headers show

Comments

Kang Kai - March 1, 2013, 10:02 a.m.
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]

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/classes/package_rpm.bbclass |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 99c4d1a..c0ba54d 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