From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 13B781381F3 for ; Mon, 5 Nov 2012 18:31:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1693E05A5; Mon, 5 Nov 2012 18:30:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE22F21C037 for ; Mon, 5 Nov 2012 18:30:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F40C833D8BB for ; Mon, 5 Nov 2012 18:30:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 30382E545F for ; Mon, 5 Nov 2012 18:30:30 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1351876725.71507545eec3031ade9b4f9a314c53216f2c97f2.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: .gitignore ChangeLog ChangeLog.old HACKING Makefile X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 71507545eec3031ade9b4f9a314c53216f2c97f2 X-VCS-Branch: ryao Date: Mon, 5 Nov 2012 18:30:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 442d095e-d7ca-4f89-a760-5f28cf1f5216 X-Archives-Hash: a078c182d2292f958e38e1356130da24 commit: 71507545eec3031ade9b4f9a314c53216f2c97f2 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Nov 2 17:15:07 2012 +0000 Commit: Richard Yao gentoo org> CommitDate: Fri Nov 2 17:18:45 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=71507545 Move to autogenerated ChangeLog. Signed-off-by: Robin H. Johnson gentoo.org> --- .gitignore | 1 + ChangeLog => ChangeLog.old | 4 +++- HACKING | 5 ++--- Makefile | 9 ++++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3f8cb55..5d43ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /genkernel.8 /genkernel-*.tar.bz2 +/ChangeLog diff --git a/ChangeLog b/ChangeLog.old similarity index 99% rename from ChangeLog rename to ChangeLog.old index 7902101..9128565 100644 --- a/ChangeLog +++ b/ChangeLog.old @@ -1,9 +1,11 @@ +# After 2012/11/01, the changelog is now auto-generated. +# This file is for historical purposes only. # ChangeLog for genkernel # Copyright: # - 2003-2008 Gentoo Foundation # - 2008-2012 Various authors (see AUTHORS) # Distributed under the GPL v2 -# $Id$ +# $Id: 7902101f65eb47fdc5ed4b116ee234aa23686e1b $ 19 Oct 2012; Robin H. Johnson gen_bootloader.sh: Missing then keyword. diff --git a/HACKING b/HACKING index 479f1aa..7ac0a60 100644 --- a/HACKING +++ b/HACKING @@ -17,10 +17,9 @@ Testing things: Rolling a release: - Bump the version in the main genkernel file. -- echangelog "Bump version to ${PV}" -- git commit -a -m "Bump version to ${PV}" +- git commit -s -a -m "Bump version to ${PV}" - make dist -- git tag -a -m "Tag release v${PV}" v${PV} +- git tag -s -a -m "Tag release v${PV}" v${PV} - git push ${REMOTE} master --tags - upload genkernel-${PV}.tar.bz2 to the hosting: scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/ diff --git a/Makefile b/Makefile index 751bb46..8e31a06 100644 --- a/Makefile +++ b/Makefile @@ -2,20 +2,23 @@ PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"` distdir = genkernel-$(PACKAGE_VERSION) # Add off-Git/generated files here that need to be shipped with releases -EXTRA_DIST = genkernel.8 +EXTRA_DIST = genkernel.8 ChangeLog genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \ --format=manpage -D . "$<" +ChangeLog: + git log >$@ + clean: - rm -f genkernel.8 + rm -f $(EXTRA_DIST) check-git-repository: git diff --quiet || { echo 'STOP, you have uncommitted changes in the working directory' ; false ; } git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; } -dist: check-git-repository genkernel.8 +dist: check-git-repository $(EXTRA_DIST) rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.bz2 mkdir "$(distdir)" git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \