pld-builder.new: PLD_Builder/request.py, PLD_Builder/rpm_builder.p...

[glen]

Author: glen                         Date: Sun Feb 24 13:54:35 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- target hacking

---- Files affected:
pld-builder.new/PLD_Builder:
   request.py (1.43 -> 1.44) , rpm_builder.py (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.43 pld-builder.new/PLD_Builder/request.py:1.44
--- pld-builder.new/PLD_Builder/request.py:1.43	Wed Dec 26 18:41:42 2007
+++ pld-builder.new/PLD_Builder/request.py	Sun Feb 24 14:54:30 2008
@@ -123,6 +123,7 @@
         self.builders = []
         self.builders_status = {}
         self.kernel = ""
+        self.target = []
         self.branch = ""
         self.src_rpm = ""
         self.info = ""
@@ -149,6 +150,8 @@
                 self.info = text(c)
             elif c.nodeName == "kernel":
                 self.kernel = text(c)
+            elif c.nodeName == "target":
+                self.target.append(text(c))
             elif c.nodeName == "branch":
                 self.branch = text(c)
             elif c.nodeName == "builder":
@@ -173,6 +176,7 @@
         f.write("  batch: %s/%s\n" % (self.src_rpm, self.spec))
         f.write("    info: %s\n" % self.info)
         f.write("    kernel: %s\n" % self.kernel)
+        f.write("    target: %s\n" % self.target_string())
         f.write("    branch: %s\n" % self.branch)
         f.write("    bconds: %s\n" % self.bconds_string())
         builders = []
@@ -188,8 +192,8 @@
         if self.is_command():
             desc = "SH: %s [%s]" % (self.command, ' '.join(self.command_flags))
         else:
-            desc = "%s (%s -r %s %s %s)" \
-                % (self.src_rpm, self.spec, self.branch, self.bconds_string(), self.kernel_string())
+            desc = "%s (%s -r %s %s %s %s)" \
+                % (self.src_rpm, self.spec, self.branch, self.bconds_string(), self.kernel_string(), self.target_string())
         f.write("%s <small>[" % desc)
         builders = []
         for b in self.builders:
@@ -228,6 +232,15 @@
             r = " --define 'alt_kernel " + self.kernel + "'"
         return r
 
+    def target_string(self):
+        if len(self.target) > 0:
+            return " --target " + ",".join(self.target)
+        else:
+            return ""
+
+    def default_target(self, arch):
+        self.target.append("--target %s-pld-linux" % config.arch)
+
     def bconds_string(self):
         r = ""
         for b in self.bconds_with:
@@ -252,6 +265,8 @@
             f.write("           <kernel>%s</kernel>\n" % escape(self.kernel))
         for b in self.bconds_with:
             f.write("           <with>%s</with>\n" % escape(b))
+        for b in self.target:
+            f.write("           <target>%s</target>\n" % escape(b))
         for b in self.bconds_without:
             f.write("           <without>%s</without>\n" % escape(b))
         for b in self.builders:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.52 pld-builder.new/PLD_Builder/rpm_builder.py:1.53
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.52	Sun Nov 11 18:39:11 2007
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Sun Feb 24 14:54:30 2008
@@ -103,7 +103,9 @@
     else:
         prepare_env()
         chroot.run("install -m 700 -d %s" % tmpdir)
-        rpmbuild_opt = "%s %s --target %s-pld-linux" % (b.kernel_string(), b.bconds_string(), config.arch)
+
+        b.default_target(config.arch)
+        rpmbuild_opt = "%s %s %s" % (b.kernel_string(), b.bconds_string(), b.target_string())
         # check for build arch before filling BR
         cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bp --short-circuit --nodeps --define 'prep exit 0' %s %s" % \
             (tmpdir, config.nice, rpmbuild_opt, b.spec)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request.py?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.52&r2=1.53&f=u