This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-1215-ge3aa699


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  e3aa6999d7f59324dfca6131268825bc73ee0375 (commit)
      from  088de7d0091bdfac4b702ab2060289affc85d6a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e3aa6999d7f59324dfca6131268825bc73ee0375

commit e3aa6999d7f59324dfca6131268825bc73ee0375
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Mon Jan 29 13:59:33 2018 +0000

    Make build-many-glibcs.py clean git source directories.
    
    With the git checkouts of Hurd components in build-many-glibcs.py
    involving running autoreconf, there's a risk that generated files
    could be left behind by an old autoreconf run (if an old version of
    the sources generates those files in the source directory but a new
    version does not).
    
    This patch avoids that by using git clean -dxfq when updating git
    checkouts.  In this patch, that's conditional on --replace-sources, to
    avoid removing any local not-checked-in files someone may have in
    their checkout unless the option has been specifically passed that
    says it's OK to blow old checkouts away, complete with any local
    changes to them.
    
    	* scripts/build-many-glibcs.py (Context.git_checkout): Use git
    	clean -dxfq for git updates when replacing sources.

diff --git a/ChangeLog b/ChangeLog
index 14e71d5..5a930a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-01-29  Joseph Myers  <joseph@codesourcery.com>
 
+	* scripts/build-many-glibcs.py (Context.git_checkout): Use git
+	clean -dxfq for git updates when replacing sources.
+
 	* scripts/build-many-glibcs.py (Config.build_gcc): Use
 	--disable-libcilkrts unconditionally, not just for the final GCC
 	build for Hurd.
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 0c2ea85..baa6704 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -816,6 +816,9 @@ class Context(object):
         if update:
             subprocess.run(['git', 'remote', 'prune', 'origin'],
                            cwd=self.component_srcdir(component), check=True)
+            if self.replace_sources:
+                subprocess.run(['git', 'clean', '-dxfq'],
+                               cwd=self.component_srcdir(component), check=True)
             subprocess.run(['git', 'pull', '-q'],
                            cwd=self.component_srcdir(component), check=True)
         else:

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    3 +++
 scripts/build-many-glibcs.py |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]