[oe-commits] Richard Purdie : package_rpm.bbclass: Add support for postinst and preinst scripts (from Poky)

[GIT User account]

Module: openembedded.git
Branch: hrw/poky-rpm
Commit: 052f5101d681388bd3dff4de5c40e9cf1b34e36d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=052f5101d681388bd3dff4de5c40e9cf1b34e36d

Author: Richard Purdie <richard at openedhand.com>
Date:   Wed Sep  3 20:59:09 2008 +0000

package_rpm.bbclass: Add support for postinst and preinst scripts (from Poky)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5131 311d38ba-8fff-0310-9ca6-ca027cbcb966

---

 classes/package_rpm.bbclass |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index f6cb2c6..93429ea 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -24,6 +24,8 @@ python write_specfile() {
 		"ROOT": "BuildRoot",
 		"LICENSE": "License",
 		"SECTION": "Group",
+		"pkg_postinst": "%post",
+		"pkg_preinst": "%pre",
 	}
 
 	root = bb.data.getVar('ROOT', d)
@@ -67,7 +69,8 @@ python write_specfile() {
 		if out_vartranslate[var][0] == "%":
 			continue
 		val = bb.data.getVar(var, d, 1)
-		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
+		if val:
+			fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
 
 	fd.write("AutoReqProv: no\n")
 
@@ -110,8 +113,10 @@ python write_specfile() {
 	for var in out_vartranslate.keys():
 		if out_vartranslate[var][0] != "%":
 			continue
-		fd.write(out_vartranslate[var] + "\n")
-		fd.write(bb.data.getVar(var, d) + "\n\n")
+		val = bb.data.getVar(var, d)
+		if val:
+			fd.write(out_vartranslate[var] + "\n")
+			fd.write(val + "\n\n")
 
 	fd.write("%files\n")
 	for file in files: