*** ltib 18 Jan 2011 05:34:13 -0500 1.72 --- ltib 28 Jan 2011 11:13:47 -0500 *************** *** 767,775 **** --- 767,783 ---- || ( $tok->{version} eq 'local' && $cf->{mode} eq 'buildrpms' && $rpms[0] && -f $rpms[0]); + # If its an SVN package, force prep + my $svn_bld = 0; + if ($tok->{version} eq 'svn') { + $svn_bld = 1; + $dir_bld = 0; + } + my $spec_upd = @rpms && (-M $spec < -M $rpms[0]) && ! $cf->{hostinst}; my $r = ''; $r .= "directory build, " if $dir_bld; + $r .= "SVN build, " if $svn_bld; $r .= "force set, " if $cf->{force}; $r .= "build key set, " if $$key->{build}; $r .= "dltest mode, " if $cf->{dltest}; *************** *** 1546,1551 **** --- 1554,1561 ---- $ENV{INITTAB_LINE} = $pcf->{INITTAB_LINE} || ""; $ENV{SOFT_FP_ARCH} = $pcf->{SOFT_FP_ARCH} || ""; $ENV{GLIBC_WANT_KERNEL_HEADERS} = $pcf->{GLIBC_WANT_KERNEL_HEADERS} || ""; + $ENV{KERNEL_REPOSITORY} = $pcf->{KERNEL_REPOSITORY} || ""; + $ENV{KERNEL_SCM_SKIP_UPDATE} = $pcf->{KERNEL_SCM_SKIP_UPDATE} || ""; if($cf->{enrootn}) { $ENV{DISTCC_HOSTS} = $cf->{DISTCC_HOSTS} *************** *** 3072,3078 **** opendir(DIR, $dir) or die("can't open $dir: $!"); while( defined($ent = readdir(DIR)) ) { next unless -d "$dir/$ent"; ! next if $ent eq 'CVS' || $ent eq '.' || $ent eq '..' || $ent eq 'host'; $p->{$ent} = 0; } closedir(DIR); --- 3082,3088 ---- opendir(DIR, $dir) or die("can't open $dir: $!"); while( defined($ent = readdir(DIR)) ) { next unless -d "$dir/$ent"; ! next if $ent eq 'CVS' || $ent eq '.svn' || $ent eq '.' || $ent eq '..' || $ent eq 'host'; $p->{$ent} = 0; } closedir(DIR);