Skip to contentSkip to conversation

Name rpm package postinstll files with their package names

PATCH New Kang Kai 1 participant 3 messages Mar 1, 2013

lore
Share & tools
lore

Kang Kai

author
#0 lore raw

cover Name rpm package postinstll files with their package names

[YOCTO #3218]

The following changes since commit 0bedc0b80d9b46cbbf4a2c5e120a6aa52cbc7c2e:

sudo : upgrade to 1.8.6p6 (2013-02-28 23:15:52 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kaikang/name-rpm-postinst
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kaikang/name-rpm-postinst

Kang Kai (2):
package_rpm.bbclass: add more description for pre/post scriptlets package_rpm.bbclass: name postinst files with package name

 meta/classes/package_rpm.bbclass |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/2 package_rpm.bbclass: add more description for pre/post scriptlets

When write rpm spec file, one description line

"# pkgname - script_type"

is added to pre/post scriptlets for base package but no such line writted for subpackage.

Add similiar line to subpackage to facilitate handling the pre/post scriptlets.

---
 meta/classes/package_rpm.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
meta/classes/package_rpm.bbclass +4 -0
index 7a1da33..99c4d1a 100644
@@ -778,19 +778,23 @@ python write_specfile () {
         # Now process scriptlets
         if splitrpreinst:
             spec_scriptlets_bottom.append('%%pre -n %s' % splitname)
+            spec_scriptlets_bottom.append('# %s - preinst' % splitname)
             spec_scriptlets_bottom.append(splitrpreinst)
             spec_scriptlets_bottom.append('')
         if splitrpostinst:
             spec_scriptlets_bottom.append('%%post -n %s' % splitname)
+            spec_scriptlets_bottom.append('# %s - postinst' % splitname)
             spec_scriptlets_bottom.append(splitrpostinst)
             spec_scriptlets_bottom.append('')
         if splitrprerm:
             spec_scriptlets_bottom.append('%%preun -n %s' % splitname)
+            spec_scriptlets_bottom.append('# %s - prerm' % splitname)
             scriptvar = wrap_uninstall(splitrprerm)
             spec_scriptlets_bottom.append(scriptvar)
             spec_scriptlets_bottom.append('')
         if splitrpostrm:
             spec_scriptlets_bottom.append('%%postun -n %s' % splitname)
+            spec_scriptlets_bottom.append('# %s - postrm' % splitname)
             scriptvar = wrap_uninstall(splitrpostrm)
             spec_scriptlets_bottom.append(scriptvar)
             spec_scriptlets_bottom.append('')
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/2 package_rpm.bbclass: name postinst files with package name

In reply to Kang Kai

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]

---
 meta/classes/package_rpm.bbclass |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
meta/classes/package_rpm.bbclass +5 -6
index 99c4d1a..c0ba54d 100644
@@ -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
 
Signature · 1 line
1.7.5.4