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 948F0138A1F for ; Thu, 10 Apr 2014 15:37:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 588E5E09B2; Thu, 10 Apr 2014 15:37:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7681E09B2 for ; Thu, 10 Apr 2014 15:37:41 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B109A340108 for ; Thu, 10 Apr 2014 15:37:40 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2195) id 60EBB2004B; Thu, 10 Apr 2014 15:37:39 +0000 (UTC) To: gentoo-commits@lists.gentoo.org From: "Mike Pagano (mpagano)" Subject: [gentoo-commits] linux-patches r2745 - genpatches-2.6-misc/web X-VCS-Repository: linux-patches X-VCS-Revision: 2745 X-VCS-Files: genpatches-2.6-misc/web/gentoo_sources_web.pm genpatches-2.6-misc/web/makesite.pl X-VCS-Directories: genpatches-2.6-misc/web X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20140410153739.60EBB2004B@flycatcher.gentoo.org> Date: Thu, 10 Apr 2014 15:37:39 +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: de0b6c0f-9dec-4e8a-8f7a-28c6a82aa15f X-Archives-Hash: b59e38d71d3fb32cb4d8c542c622591b Author: mpagano Date: 2014-04-10 15:37:39 +0000 (Thu, 10 Apr 2014) New Revision: 2745 Modified: genpatches-2.6-misc/web/gentoo_sources_web.pm genpatches-2.6-misc/web/makesite.pl Log: Updates for creating kernels.html Modified: genpatches-2.6-misc/web/gentoo_sources_web.pm =================================================================== --- genpatches-2.6-misc/web/gentoo_sources_web.pm 2014-04-09 14:12:52 UTC (rev 2744) +++ genpatches-2.6-misc/web/gentoo_sources_web.pm 2014-04-10 15:37:39 UTC (rev 2745) @@ -1,16 +1,19 @@ # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 use LWP::Simple; +use Encode; # Detect which svn server and username to use # (broken with >=svn-1.7 due to an extra line added to svn info) -$subversion_scheme=`svn info | awk '/^URL: / { print $2 }'`; -$subversion_uri = $subversion_scheme; +my $subversion_scheme=`svn info | awk '/^URL: / { print $2 }'`; +my $subversion_uri = $subversion_scheme; chomp $subversion_uri; -$subversion_scheme =~ s|^URL: ([a-z][a-z0-9+-.]*)://.*|\1|s; +my $subversion_scheme =~ s|^URL: ([a-z][a-z0-9+-.]*)://.*|\1|s; +my $subversion_midpart=""; +my $cmd=""; if ($subversion_scheme == "svn+ssh") { - $trimmed = substr($subversion_uri, 15); + my $trimmed = substr($subversion_uri, 15); if ($trimmed =~ m/^([a-zA-Z]+)@/) { $subversion_midpart = "$1\@svn.gentoo.org/var/svnroot"; } else { @@ -20,14 +23,14 @@ } else { $subversion_midpart = 'anonsvn.gentoo.org'; } -$subversion_root = $subversion_scheme.'://'.$subversion_midpart.'/linux-patches/genpatches-2.6'; -$webscript_path = &Cwd::cwd(); +my $subversion_root = $subversion_scheme.'://'.$subversion_midpart.'/linux-patches/genpatches-2.6'; +my $webscript_path = &Cwd::cwd(); $output_path = $webscript_path.'/output'; -$website_base = 'http://dev.gentoo.org/~mpagano/genpatches'; +my $website_base = 'http://dev.gentoo.org/~mpagano/genpatches'; -$ebuild_base = '/usr/local/gentoo-x86'; # /usr/portage -@kernels = ('sys-kernel/ck-sources','sys-kernel/gentoo-sources','sys-kernel/hardened-sources','sys-kernel/openvz-sources','sys-kernel/tuxonice-sources','sys-kernel/vserver-sources','sys-kernel/zen-sources'); +my $ebuild_base = '/usr/local/gentoo-x86'; # /usr/portage +my @kernels = ('sys-kernel/ck-sources','sys-kernel/gentoo-sources','sys-kernel/hardened-sources','sys-kernel/openvz-sources','sys-kernel/tuxonice-sources','sys-kernel/vserver-sources','sys-kernel/zen-sources'); sub html_header { local *FD = shift; @@ -260,37 +263,41 @@ -e $webscript_path.'/generated/'.$tag.'-info.htm'; } -sub _get_genpatches_kernels { +sub _get_genpatches_kernels2 { my (%gp_kernels, $kernel); foreach $kernel (@kernels) { $kernel =~ m/^([a-z-]+)\/([a-z0-9-]+)$/; my $cat = $1; my $pkg = $2; + my @out = (""); $cmd = 'egrep "^(K_GENPATCHES_VER|K_WANT_GENPATCHES)" '.$ebuild_base.'/'.$kernel.'/*.ebuild'; - my @out = `$cmd`; + @out = `$cmd`; foreach (@out) { - chomp; + chomp; my $res = substr($_, length($ebuild_base) + length($kernel) + 2); - $res =~ m/^$pkg-([\d\w\.-]+)\.ebuild:(.*)$/; + my $test = substr($_, 2); + my($ver) = $res =~ /(\d+\.\d+\.\d+)/; my $ver = $1; - my $var = $2; + my $ebuild = $pkg.'-'.$ver; - + #$ver =~ m/^(2\.6\.\d+)/; my ($major,$minor) = split(/\./, $ver); my $orig_ver = $1; - if ($var =~ /^K_WANT_GENPATCHES="(.*)"$/) { +# $res =~ (/.*K_WANT_GENPATCHES=(.*)/); + if ($res =~ /.*K_WANT_GENPATCHES=(.*)/) { $gp_kernels{$ebuild}{'pkg'} = $pkg; $gp_kernels{$ebuild}{'ver'} = $ver; $gp_kernels{$ebuild}{'wanted'} = $1; } - if ($var =~ /^K_GENPATCHES_VER="(\d+)"$/) { + if ($res =~ /^K_GENPATCHES_VER="(\d+)"$/) { #$gp_kernels{$ebuild}{'gprev'} = $orig_ver .'-'. $1; $gp_kernels{$ebuild}{'gprev'} = $major . '.' . $minor .'-'. $1; } + print "END\n"; } } @@ -312,5 +319,41 @@ } -1; +sub _get_genpatches_kernels { + my (%gp_kernels, $kernel); + foreach $kernel (@kernels) { + $kernel =~ m/^([a-z-]+)\/([a-z0-9-]+)$/; + my $cat = $1; + my $pkg = $2; + $cmd = 'egrep --color=never "^(K_GENPATCHES_VER|K_WANT_GENPATCHES)" '.$ebuild_base.'/'.$kernel.'/*.ebuild'; + my @out = `$cmd`; + + foreach (@out) { + chomp; + my $res = substr($_, length($ebuild_base) + length($kernel) + 2); + $res =~ m/^$pkg-([\d\w\.-]+)\.ebuild:(.*)$/; + + my $ver = $1; + my $var = $2; + my $ebuild = $pkg.'-'.$ver; + + #$ver =~ m/^(2\.6\.\d+)/; + my ($major,$minor) = split(/\./, $ver); + my $orig_ver = $1; + + if ($var =~ /^K_WANT_GENPATCHES="(.*)"$/) { + $gp_kernels{$ebuild}{'pkg'} = $pkg; + $gp_kernels{$ebuild}{'ver'} = $ver; + $gp_kernels{$ebuild}{'wanted'} = $1; + } + if ($var =~ /^K_GENPATCHES_VER="(\d+)"$/) { + #$gp_kernels{$ebuild}{'gprev'} = $orig_ver .'-'. $1; + $gp_kernels{$ebuild}{'gprev'} = $major . '.' . $minor .'-'. $1; + } + } + } + + return %gp_kernels; +} + Modified: genpatches-2.6-misc/web/makesite.pl =================================================================== --- genpatches-2.6-misc/web/makesite.pl 2014-04-09 14:12:52 UTC (rev 2744) +++ genpatches-2.6-misc/web/makesite.pl 2014-04-10 15:37:39 UTC (rev 2745) @@ -191,9 +191,11 @@ print FD ''.$kernel->{'gprev'}.' '.$kernel->{'wanted'}.''; print FD ''; } + print FD ''; html_footer *FD; close(FD); + exit(); }