From 5f82c7bcec4604ae402f3ec0d7cb2adf6bc046c2 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@google.com>
Date: Sat, 18 Jan 2014 09:35:36 -0800
Subject: Kill DKMS mode, it should be a list of packages to rebuild on kernel
 upload, outside iurt

---
 iurt | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

(limited to 'iurt')

diff --git a/iurt b/iurt
index a03b151..147ebd0 100755
--- a/iurt
+++ b/iurt
@@ -36,7 +36,6 @@ use RPM4::Header;
 use Iurt::Config qw(config_usage get_date get_prefix config_init get_maint check_arch %arch_comp get_package_prefix);
 use Data::Dumper;
 use URPM;
-use Iurt::DKMS;
 
 use Iurt::Urpmi;
 use Iurt::Chroot qw(add_local_user create_temp_chroot remove_chroot create_build_chroot clean_chroot);
@@ -98,7 +97,7 @@ $run{todo} = [];
  	    [--upload [--markrelease] [--source]] [--dir] [--help foo?] [--log filename] [--status]
 	    [--repository <distribution path>]
 	    [--rpmmacros <macro definition> [<macro definition>...]]
- 	    {--config_help | --dkms {--media <media regexp>}
+	    {--config_help}
 	    --chroot --arch {i586|x86_64|ppc} --distro {cauldron|2006.0|community/2006.0|...} } |
  	    --build-user <user> --rebuild {cauldron|2006.0|community/2006.0|...} {i586|x86_64|ppc|...} {filename1.src.rpm} {filename2.src.rpm} ... {filenamen.src.rpm} }", 
     "$program_name is a perl script to rebuild automatically several rpm in chroot, given a sourcerpm repository, and mail authors or rebuilder when problems occurs.
@@ -108,33 +107,6 @@ $run{todo} = [];
     [ "", "distro", 1, "<distro>", 
     "Set the distribution",
     sub { ($run{distro}) = @_; 1 }, "Setting the distribution" ],
-    [ "", "dkms", [                                                                                                                                     
-        ["", "dkms", 0, "",                                  
-	"Set the DKMS rebuild mode",
-        sub {    
-            my ($tmp, @arg) = @_; 
-            $tmp->[0] ||= {}; 
-            push @$tmp, @arg; 
-            1;
-        }, "Setting auto mode arguments"], 
-        ["k", "kmedia", 1, "<kernel media regexp>",  
-        "Media Regexp to limit the kernel search to",  
-        sub { my ($tmp, $kmedia) = @_; $tmp->[0]{kmedia} = $kmedia; 1 }, "Limiting rebuild to the kernel in the given media regexp"], 
-        ["m", "media", 1, "<media regexp>",  
-        "Media Regexp to limit rebuild to",  
-        sub { my ($tmp, $media) = @_; $tmp->[0]{media} = $media; 1 }, "Limiting rebuild to the given media regexp"], 
-        ["u", "umedia", 1, "<upload media>",
-        "Media where rebuilt DKMS packages will be uploaded",
-        sub { my ($tmp, $media) = @_; $tmp->[0]{umedia} = $media; 1 }, "Uploading rebuilt DKMS packages to the given media"], 
-        ["v", "kversion", 1, "<kernel version>",
-        "kernel for which DKMS packages should be rebuilt",
-        sub { my ($tmp, $kversion) = @_; $tmp->[0]{kversion} = $kversion; 1 }, "Rebuilding only for given kernel version"],
-        ["p", "package", 1, "<package>",
-        "DKMS package which should be rebuilt",
-        sub { my ($tmp, $package) = @_; $tmp->[0]{package} = $package; 1 }, "Rebuilding only given DKMS packages"],
-], "[options]",  
-    "Set the DKMS rebuild mode",
-    sub { my ($opt) = @_; $run{dkms} = $opt; 1 }, "Running a DKMS rebuild run" ],
     [ "a", "arch", 1, "<architecture>", 
     "Set the architecture",
     sub { ($run{my_arch}) = @_; 1 }, "Setting architecture" ],
@@ -588,9 +560,6 @@ my $lock = $run{media};
 if (!$lock && $run{chroot}) {
     $lock = 'chroot';
 }
-if (!$lock && $run{dkms}) {
-    $lock = 'dkms';
-}
 $run{lock} = $lock;
 
 if (!$run{debug} && $run{media} || $run{chroot}) {
@@ -638,11 +607,6 @@ $to_compile += check_media(\%run, $cache, $config, \%srpm_version,
 $to_compile += search_packages(1, $cache, \%provides, \%run, \%maint,
 	\%srpm_version, @{$run{extra_dir}}) if $run{extra};
 
-my $dkms;
-if ($run{dkms}) {
-    $dkms = Iurt::DKMS->new(run => \%run, config => $config);
-    $to_compile += $dkms->search_dkms;
-}
 $run{to_compile} = $to_compile;
 
 plog("Packages to build: $to_compile");
@@ -751,10 +715,6 @@ if ($config->{rsync_to} && !$run{no_rsync}) {
 	system('rsync', '--delete', '-alHPe', 'ssh -xc arcfour', "$local_spool/log/", "$config->{rsync_to}/$run{distro_tag}/$run{my_arch}/$run{media}/log/");
 }
 
-if ($run{dkms} && $run{dkms_todo}) {
-    $done += $dkms->dkms_compile($local_spool, $done);
-}
-
 # The next loop should be moved in a module someday
 
 # FIXME: (tv) kill this dead code or use it!!
-- 
cgit v1.2.1