X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=maint%2Frelease;h=9c2521b6f45106dc2c7b363332f740242d1648be;hb=9a07a7f5ca8dd2c89fd41387fcd0aa761554d25f;hp=7c4ac51c950d812eb5f00a74293b71c0c9b41adc;hpb=a2bf30a4fd407c55e8172e2f6fd158725ccb90b6;p=pciutils.git

diff --git a/maint/release b/maint/release
index 7c4ac51..9c2521b 100755
--- a/maint/release
+++ b/maint/release
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 # A simple script for making releases of the pciutils
-# (c) 2003--2006 Martin Mares <mj@ucw.cz>
+# (c) 2003--2012 Martin Mares <mj@ucw.cz>
 
 use strict;
 use warnings;
-require "maint/release.pm";
+require "./maint/release.pm";
 
 # Check API version
 my $apiver = "???";
@@ -14,8 +14,8 @@ while (<X>) {
 }
 print "API version is $apiver ... <confirm> "; <STDIN>;
 
-print "Updating public GIT tree\n";
-`cg-push 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=(.*)");
@@ -29,14 +29,10 @@ if ($ver =~ /-/) {
 	$r->{"conditions"}->{"ALPHA_VERSION"} = -1;
 }
 push @{$r->{"uploads"}}, {
-	"url" => "scp://atrey.karlin.mff.cuni.cz/~ftp/pub/linux/pci/" . $r->{"ALPHADIR"}
-	},{
-	"url" => "scp://master.kernel.org/pub/software/utils/pciutils/" . $r->{"ALPHADIR"}
+	"url" => "scp://jabberwock.ucw.cz/home/ftp/pub/mj/linux/pci/" . $r->{"ALPHADIR"}
+##	},{
+##	"url" => "scp://master.kernel.org/pub/software/utils/pciutils/" . $r->{"ALPHADIR"}
 	};
-push @{$r->{"uploads"}}, {
-	"url" => "ftp://metalab.unc.edu/incoming/linux/",
-	"filter" => '(\.tar\.gz|\.lsm)$'
-	} if $r->{"ALPHADIR"} eq "";
 $r->ParseOptions;
 $r->InitDist("maint/dist");
 my $reldir = $r->GenPackage;
@@ -48,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 $?;
+}