Author: wade
Date: 2008-02-15 12:24:31 -0500 (Fri, 15 Feb 2008)
New Revision: 95767
Modified:
trunk/release/packaging/build
trunk/release/packaging/do-rpm-build
Log:
do-rpm-build:
-only ignore unpackaged files in HEAD
This will help catch errors on release
build:
-correctly set HEAD_or_RELEASE (leftover setting from step tests.
This may break other things, but we can fix that later, they should
be minor)
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2008-02-15 17:14:15 UTC (rev 95766)
+++ trunk/release/packaging/build 2008-02-15 17:24:31 UTC (rev 95767)
@@ -298,7 +298,7 @@
conf.buildenv.copy_to(support_files_to_copy, conf.env_vars['build_location'],
compress=0)
# Set up env for the build and for tests
-conf.env_vars['HEAD_or_RELEASE'] = "HEAD"
+conf.env_vars['HEAD_or_RELEASE'] = HEAD_or_RELEASE
conf.env_vars['DISTRO'] = distro
conf.env_vars['BUILD_OS'] = conf.info['os']
conf.env_vars['BUILD_ARCH'] = conf.info['arch']
Modified: trunk/release/packaging/do-rpm-build
===================================================================
--- trunk/release/packaging/do-rpm-build 2008-02-15 17:14:15 UTC (rev
95766)
+++ trunk/release/packaging/do-rpm-build 2008-02-15 17:24:31 UTC (rev
95767)
@@ -65,6 +65,11 @@
if p == "centos-release":
version_macro = "%%rhel_version\t%s" % output
+# Ignore unpackaged files for HEAD, but not for RELEASE
+if os.environ['HEAD_or_RELEASE'] == 'RELEASE':
+ unpack_term_build = 1
+else:
+ unpack_term_build = 0
# need to set some rpmrc macros to be able to build in this directory
# can't use $build_arch in rpmfilename, need to find out why some distros
build as i686
@@ -75,10 +80,10 @@
%%_rpmdir %%{_topdir}/built-packages
%%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
%%buildroot %s/buildroot
-%%_unpackaged_files_terminate_build 0
+%%_unpackaged_files_terminate_build %s
%%monobuild 1
%s
-""" % (temp_build_dir, temp_build_dir, version_macro) )
+""" % (temp_build_dir, temp_build_dir, unpack_term_build, version_macro) )
for d in "BUILD built-packages".split():
if os.path.exists(d): shutil.rmtree(d) # normall won't have to be
cleaned up, but do it so we can rerun builds inside jail
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
