pld-builder.new: PLD_Builder/srpm_builder.py, PLD_Builder/rpm_buil...

[hawk]

Author: hawk                         Date: Sun Nov 11 17:39:16 2007 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- added kernel_string() to rpm options, if request had specified
  kernel name it will contain --define alt_kernel kernel_name

---- Files affected:
pld-builder.new/PLD_Builder:
   srpm_builder.py (1.47 -> 1.48) , rpm_builder.py (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.47 pld-builder.new/PLD_Builder/srpm_builder.py:1.48
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.47	Sun Mar 25 03:14:58 2007
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Sun Nov 11 18:39:11 2007
@@ -91,9 +91,9 @@
                     tag_test=""
     else:
                     tag_test=" -Tp %s -tt" % (config.tag_prefixes[0],)
-    cmd = ("cd rpm/SPECS; nice -n %s ./builder %s -bs %s -r %s %s %s 2>&1" %
+    cmd = ("cd rpm/SPECS; nice -n %s ./builder %s -bs %s -r %s %s %s %s 2>&1" %
              (config.nice, builder_opts, b.bconds_string(), b.branch, 
-              tag_test, b.spec))
+              tag_test, b.kernel_string(), b.spec))
     util.append_to(b.logfile, "request from: %s" % r.requester)
     util.append_to(b.logfile, "started at: %s" % time.asctime())
     util.append_to(b.logfile, "building SRPM using: %s\n" % cmd)

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.51 pld-builder.new/PLD_Builder/rpm_builder.py:1.52
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.51	Wed Aug 22 08:18:26 2007
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Sun Nov 11 18:39:11 2007
@@ -103,7 +103,7 @@
     else:
         prepare_env()
         chroot.run("install -m 700 -d %s" % tmpdir)
-        rpmbuild_opt = "%s --target %s-pld-linux" % (b.bconds_string(), config.arch)
+        rpmbuild_opt = "%s %s --target %s-pld-linux" % (b.kernel_string(), b.bconds_string(), config.arch)
         # 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/srpm_builder.py?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.51&r2=1.52&f=u