Maintenance scripts now upload to kernel.org automatically

3 files changed, 28 insertions, 6 deletions

diff --git a/maint/KORG-NOTES b/maint/KORG-NOTES
deleted file mode 100644
index 786ef42..0000000
--- a/maint/KORG-NOTES
+++ /dev/null
@@ -1,4 +0,0 @@
-# Notes for uploading on kernel.org
-gzip -d <pciutils-3.1.10.tar.gz >pciutils-3.1.10.tar
-gpg --armor --detach-sign -o pciutils-3.1.10.tar.sig pciutils-3.1.10.tar
-~/tree/kup/kup put pciutils-3.1.10.tar.gz pciutils-3.1.10.tar.sig /pub/software/utils/pciutils/pciutils-3.1.10.tar.gz
diff --git a/maint/RELEASE b/maint/RELEASE
new file mode 100644
index 0000000..a36e264
--- /dev/null
+++ b/maint/RELEASE
@@ -0,0 +1,14 @@
+How to release pciutils
+~~~~~~~~~~~~~~~~~~~~~~~
+(a couple of hints for the forgetful maintainer)
+
+Check version numbers in Makefile and lib/pci.h.
+
+ssh-add ~/.ssh/id_korg
+
+maint/tag-release vX.Y.Z
+git push --tags
+
+maint/release
+
+Update progs/pciutils at Jabberwock.
diff --git a/maint/release b/maint/release
index 6dc1f09..a64618f 100755
--- a/maint/release
+++ b/maint/release
@@ -14,8 +14,8 @@ while (<X>) {
 }
 print "API version is $apiver ... <confirm> "; <STDIN>;
 
-print "Updating public GIT tree\n";
-`git push --tags public`; die if $?;
+#print "Updating public GIT tree\n";
+#`git push --tags public`; die if $?;
 
 my $r = new UCW::Release("pciutils");
 my $ver = $r->GetVersionFromFile("Makefile", "VERSION=(.*)");
@@ -44,3 +44,15 @@ if ($r->{"do_upload"}) {
 	`scp -C pci.ids pciids\@jabberwock.ucw.cz:05-pciutils.new`; die if $?;
 	`ssh pciids\@jabberwock.ucw.cz mv 05-pciutils.new origs/05-pciutils`; die if $?;
 }
+
+# Hacks for kernel.org
+print "Preparing kernel.org package\n";
+my $dd = $r->{"DISTDIR"};
+my $pkg = $r->{"PKG"};
+`gzip -d <$dd/$pkg.tar.gz >$dd/$pkg.tar`; die if $?;
+system "gpg", "--armor", "--detach-sig", "-o", "$dd/$pkg.tar.sig", "$dd/$pkg.tar"; die if $?;
+if ($r->{"do_upload"}) {
+	print "Uploading to kernel.org\n";
+	print "<confirm> "; <STDIN>;
+	system '/home/mj/tree/kup/kup', 'put', "$dd/$pkg.tar", "$dd/$pkg.tar.sig", "/pub/software/utils/pciutils/$pkg.tar.gz"; die if $?;
+}