summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2011-01-31 13:29:40 +0000
committerAntoine Ginies <aginies@mandriva.com>2011-01-31 13:29:40 +0000
commitabc15d3a2d2916412e4c2583420f5c37376601b0 (patch)
treea1528e427e45b7e6c80617f3d316b36472ce6ea4
parent7e11b4fe1eca20de3fdc7495614c015fd030e115 (diff)
downloaddrakx-abc15d3a2d2916412e4c2583420f5c37376601b0.tar
drakx-abc15d3a2d2916412e4c2583420f5c37376601b0.tar.gz
drakx-abc15d3a2d2916412e4c2583420f5c37376601b0.tar.bz2
drakx-abc15d3a2d2916412e4c2583420f5c37376601b0.tar.xz
drakx-abc15d3a2d2916412e4c2583420f5c37376601b0.zip
various fix
-rw-r--r--perl-install/Makefile3
-rw-r--r--perl-install/install/share/symlinks1
-rw-r--r--perl-install/run_program.pm3
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 954e930f9..17e4d3790 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -55,8 +55,7 @@ mo_files : $(MOFILES)
localcopy: clean
rm -rf $(PACKAGE)-$(PKGVERSION)*
mkdir -p $(PACKAGE)-$(PKGVERSION)/tools
- cp -avf ../perl-install $(PACKAGE)-$(PKGVERSION)/
- #svn export -q -rBASE . $(PACKAGE)-$(PKGVERSION)/perl-install
+ svn export -q -rBASE . $(PACKAGE)-$(PKGVERSION)/perl-install
for i in $(OTHERS); do svn export -q ../$$i $(PACKAGE)-$(PKGVERSION)/$$i; done
rm -rf $(PACKAGE)-$(PKGVERSION)/perl-install/{install,unused,list_modules.pm}
cp -f ../kernel/list_modules.pm $(PACKAGE)-$(PKGVERSION)/perl-install
diff --git a/perl-install/install/share/symlinks b/perl-install/install/share/symlinks
index d953175d8..29d18cfb9 100644
--- a/perl-install/install/share/symlinks
+++ b/perl-install/install/share/symlinks
@@ -10,4 +10,5 @@
/lib
/lib64
/usr
+/firmware /lib/firmware
/tmp /var/run
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index 6f932acf5..796694a80 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -76,7 +76,8 @@ sub raw {
$pid;
} else {
my $ok;
- add2hash_($options, { timeout => 10 * 60 });
+ # increase timeout to avoid kvm error
+ add2hash_($options, { timeout => 30 * 60 });
eval {
local $SIG{ALRM} = sub { die "ALARM" };
my $remaining = $options->{timeout} && $options->{timeout} ne 'never' && alarm($options->{timeout});