| 1 |
commit: 71507545eec3031ade9b4f9a314c53216f2c97f2 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 2 17:15:07 2012 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 2 17:18:45 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=71507545 |
| 7 |
|
| 8 |
Move to autogenerated ChangeLog. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
.gitignore | 1 + |
| 14 |
ChangeLog => ChangeLog.old | 4 +++- |
| 15 |
HACKING | 5 ++--- |
| 16 |
Makefile | 9 ++++++--- |
| 17 |
4 files changed, 12 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/.gitignore b/.gitignore |
| 20 |
index 3f8cb55..5d43ffd 100644 |
| 21 |
--- a/.gitignore |
| 22 |
+++ b/.gitignore |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
/genkernel.8 |
| 25 |
/genkernel-*.tar.bz2 |
| 26 |
+/ChangeLog |
| 27 |
|
| 28 |
diff --git a/ChangeLog b/ChangeLog.old |
| 29 |
similarity index 99% |
| 30 |
rename from ChangeLog |
| 31 |
rename to ChangeLog.old |
| 32 |
index 7902101..9128565 100644 |
| 33 |
--- a/ChangeLog |
| 34 |
+++ b/ChangeLog.old |
| 35 |
@@ -1,9 +1,11 @@ |
| 36 |
+# After 2012/11/01, the changelog is now auto-generated. |
| 37 |
+# This file is for historical purposes only. |
| 38 |
# ChangeLog for genkernel |
| 39 |
# Copyright: |
| 40 |
# - 2003-2008 Gentoo Foundation |
| 41 |
# - 2008-2012 Various authors (see AUTHORS) |
| 42 |
# Distributed under the GPL v2 |
| 43 |
-# $Id$ |
| 44 |
+# $Id: 7902101f65eb47fdc5ed4b116ee234aa23686e1b $ |
| 45 |
|
| 46 |
19 Oct 2012; Robin H. Johnson <robbat2@g.o> gen_bootloader.sh: |
| 47 |
Missing then keyword. |
| 48 |
|
| 49 |
diff --git a/HACKING b/HACKING |
| 50 |
index 479f1aa..7ac0a60 100644 |
| 51 |
--- a/HACKING |
| 52 |
+++ b/HACKING |
| 53 |
@@ -17,10 +17,9 @@ Testing things: |
| 54 |
|
| 55 |
Rolling a release: |
| 56 |
- Bump the version in the main genkernel file. |
| 57 |
-- echangelog "Bump version to ${PV}" |
| 58 |
-- git commit -a -m "Bump version to ${PV}" |
| 59 |
+- git commit -s -a -m "Bump version to ${PV}" |
| 60 |
- make dist |
| 61 |
-- git tag -a -m "Tag release v${PV}" v${PV} |
| 62 |
+- git tag -s -a -m "Tag release v${PV}" v${PV} |
| 63 |
- git push ${REMOTE} master --tags |
| 64 |
- upload genkernel-${PV}.tar.bz2 to the hosting: |
| 65 |
scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/ |
| 66 |
|
| 67 |
diff --git a/Makefile b/Makefile |
| 68 |
index 751bb46..8e31a06 100644 |
| 69 |
--- a/Makefile |
| 70 |
+++ b/Makefile |
| 71 |
@@ -2,20 +2,23 @@ PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"` |
| 72 |
distdir = genkernel-$(PACKAGE_VERSION) |
| 73 |
|
| 74 |
# Add off-Git/generated files here that need to be shipped with releases |
| 75 |
-EXTRA_DIST = genkernel.8 |
| 76 |
+EXTRA_DIST = genkernel.8 ChangeLog |
| 77 |
|
| 78 |
genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel |
| 79 |
a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \ |
| 80 |
--format=manpage -D . "$<" |
| 81 |
|
| 82 |
+ChangeLog: |
| 83 |
+ git log >$@ |
| 84 |
+ |
| 85 |
clean: |
| 86 |
- rm -f genkernel.8 |
| 87 |
+ rm -f $(EXTRA_DIST) |
| 88 |
|
| 89 |
check-git-repository: |
| 90 |
git diff --quiet || { echo 'STOP, you have uncommitted changes in the working directory' ; false ; } |
| 91 |
git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; } |
| 92 |
|
| 93 |
-dist: check-git-repository genkernel.8 |
| 94 |
+dist: check-git-repository $(EXTRA_DIST) |
| 95 |
rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.bz2 |
| 96 |
mkdir "$(distdir)" |
| 97 |
git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \ |
Archives