pld-builder.new: PLD_Builder/install.py Use target string and kernel condit...
arekm
arekm at pld-linux.org
Tue Feb 14 18:56:18 CET 2012
Author: arekm Date: Tue Feb 14 17:56:18 2012 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Use target string and kernel conditionals when checking BR.
---- Files affected:
pld-builder.new/PLD_Builder:
install.py (1.25 -> 1.26)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.25 pld-builder.new/PLD_Builder/install.py:1.26
--- pld-builder.new/PLD_Builder/install.py:1.25 Sat Oct 1 20:54:51 2011
+++ pld-builder.new/PLD_Builder/install.py Tue Feb 14 18:56:13 2012
@@ -126,8 +126,8 @@
tmpdir = "/tmp/BR." + b.b_id[0:6]
chroot.run("install -m 700 -d %s" % tmpdir)
- cmd = "cd rpm/SPECS; TMPDIR=%s rpmbuild --nobuild %s %s 2>&1" \
- % (tmpdir, b.bconds_string(), b.spec)
+ cmd = "cd rpm/SPECS; TMPDIR=%s rpmbuild --nobuild %s %s %s %s 2>&1" \
+ % (tmpdir, b.target_string(), b.kernel_string(), b.bconds_string(), b.spec)
f = chroot.popen(cmd)
rx = re.compile(r"^\s*(?P<name>[^\s]+) .*is needed by")
needed = {}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/install.py?r1=1.25&r2=1.26&f=u
More information about the pld-cvs-commit
mailing list