Drop dependency of dist target on ChangeLog

Message ID 20200108085326.93010-1-siddhesh@sourceware.org
State Committed
Headers

Commit Message

Siddhesh Poyarekar Jan. 8, 2020, 8:53 a.m. UTC
  We no longer write manual ChangeLog entries since they are
auto-generated at release time.  Drop dependency of the `make dist`
target on the file and document the fact that the latest ChangeLog
entries can be read in the highest numbered ChangeLog.N file in
ChangeLog.old.

The ChangeLog.old/ChangeLog.20 file for 2.31 will thus be generated
just before tagging a release.
---
 Makefile        | 2 +-
 NEWS            | 4 ++++
 timezone/README | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
  

Patch

diff --git a/Makefile b/Makefile
index 3dafcec2b2..8f0a93aceb 100644
--- a/Makefile
+++ b/Makefile
@@ -673,7 +673,7 @@  TAGS:
 
 generated := $(generated) stubs.h
 
-files-for-dist := README INSTALL configure ChangeLog NEWS
+files-for-dist := README INSTALL configure NEWS
 
 # Regenerate stuff, then error if these things are not committed yet.
 dist-prepare: $(files-for-dist)
diff --git a/NEWS b/NEWS
index b85989ec3d..0ecee6c13b 100644
--- a/NEWS
+++ b/NEWS
@@ -104,6 +104,10 @@  Changes to build and runtime requirements:
 * It is no longer necessary to have recent Linux kernel headers to build
   working (non-stub) system call wrappers.
 
+* The ChangeLog file is no longer present in the toplevel directory of the
+  source tree.  ChangeLog files are located in the ChangeLog.old directory as
+  ChangeLog.N where the highest N has the latest entries.
+
 Security related changes:
 
   CVE-2019-19126: ld.so failed to ignore the LD_PREFER_MAP_32BIT_EXEC
diff --git a/timezone/README b/timezone/README
index fc50f1399f..fdfdcd9403 100644
--- a/timezone/README
+++ b/timezone/README
@@ -9,8 +9,8 @@  The files
 	iso3166.tab zone.tab leapseconds yearistype
 come from the tzdata package by Arthur David Olson et.al.
 
-Please check the ChangeLog files in the top level directory for the
-version of the tzcode and tzdata packages.
+Please check the ChangeLog files in ChangeLog.old directory at the top level
+for the version of the tzcode and tzdata packages.
 
 Please also see: https://sourceware.org/glibc/wiki/SharedSourceFiles