Changeset 620 in ProjectBuilder
- Timestamp:
- Nov 29, 2008, 7:17:54 PM (15 years ago)
- Location:
- devel
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/bin/pbdistrocheck
r495 r620 28 28 pb_log_init($pbdebug, $pbLOG); 29 29 30 my ($ddir, $dver, $dfam, $dtype, $pbsuf ) = pb_distro_init();31 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf ))."\n";30 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init(); 31 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n"; -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r591 r620 73 73 my $dtype = "unknown"; 74 74 my $dsuf = "unknown"; 75 my $dupd = "unknown"; 75 76 76 77 # If we don't know which distribution we're on, then guess it … … 84 85 $dtype="deb"; 85 86 $dsuf=".$ddir$dver"; 87 $dupd="apt-get -y install "; 86 88 } elsif ($ddir =~ /gentoo/) { 87 89 $dfam="gen"; … … 89 91 $dver="nover"; 90 92 $dsuf=".$ddir"; 93 $dupd="emerge "; 91 94 } elsif ($ddir =~ /slackware/) { 92 95 $dfam="slack"; … … 101 104 $dtype="rpm"; 102 105 $dsuf=".$ddir$dver"; 106 $dupd="yast2 -y "; 103 107 } elsif (($ddir =~ /redhat/) || 104 108 ($ddir =~ /rhel/) || … … 110 114 my $dver1 = $dver; 111 115 $dver1 =~ s/\.//; 116 117 # By defaut propose yum 118 my $arch=`uname -m`; 119 my $opt = ""; 120 chomp($arch); 121 if ($arch eq "x86_64") { 122 $opt="--exclude=*.i?86"; 123 } 124 $dupd="yum -y $opt install "; 112 125 if ($ddir =~ /fedora/) { 113 126 $dsuf=".fc$dver1"; 114 127 } elsif ($ddir =~ /redhat/) { 115 128 $dsuf=".rh$dver1"; 129 $dupd="unknown"; 116 130 } elsif ($ddir =~ /vmware/) { 117 131 $dsuf=".vwm$dver1"; 132 $dupd="unknown"; 118 133 } else { 134 # older versions of rhel and centos ran up2date 135 if (($dver eq "2.1") || ($dver eq "3") || ($dver eq "4")) { 136 $dupd="up2date -y "; 137 } 119 138 $dsuf=".$ddir$dver1"; 120 139 } … … 134 153 $dsuf=".mdv$dver"; 135 154 } 155 $dupd="urpmi --auto "; 136 156 } elsif ($ddir =~ /freebsd/) { 137 157 $dfam="bsd"; … … 142 162 } else { 143 163 $dfam="unknown"; 144 $dtype="unknown"; 145 $dsuf="unknown"; 146 } 147 148 return($ddir, $dver, $dfam, $dtype, $dsuf); 164 } 165 166 return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd); 149 167 } 150 168 -
devel/pb/bin/pb
r619 r620 587 587 chomp($arch); 588 588 my ($ddir, $dver, $dfam); 589 ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'} ) = pb_distro_init($name,$ver);589 ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}) = pb_distro_init($name,$ver); 590 590 pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n"); 591 591 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n"); … … 785 785 786 786 # Get the running distro to build on 787 my ($ddir, $dver, $dfam, $dtype, $pbsuf ) = pb_distro_init();788 pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf ))."\n");787 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init(); 788 pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n"); 789 789 790 790 # Get list of packages to build … … 1028 1028 ($odir,$over,$oarch) = split(/-/,$v); 1029 1029 } 1030 ($ddir, $dver, $dfam, $dtype, $pbsuf ) = pb_distro_init($odir,$over);1030 ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($odir,$over); 1031 1031 pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n"); 1032 1032 … … 1449 1449 my ($name,$ver,$darch) = split(/-/,$v); 1450 1450 chomp($darch); 1451 my ($ddir, $dver, $dfam, $dtype, $pbsuf ) = pb_distro_init($name,$ver);1451 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver); 1452 1452 1453 1453 if ($vetype eq "chroot") { … … 1919 1919 # We need to have that pb_distro_init function 1920 1920 # Get it from Project-Builder::Distribution 1921 my ($ddir, $dver, $dfam, $dtype, $pbsuf ) = pb_distro_init();1921 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init(); 1922 1922 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n"; 1923 1923 … … 1939 1939 if ( $ddir eq "fedora" ) { 1940 1940 pb_system("yum clean all","Cleaning yum env"); 1941 #system "yum update -y";1942 my $arch=`uname -m`;1943 my $opt = "";1944 chomp($arch);1945 if ($arch eq "x86_64") {1946 $opt="--exclude=*.i?86";1947 }1948 1949 1941 if ($dver == 4) { 1950 pb_system(" yum -y $opt installrpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker",$cmtall);1942 pb_system("$pbupd rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker",$cmtall); 1951 1943 pb_system("$insmb","$cmtmb"); 1952 1944 pb_system("$insfm","$cmtfm"); … … 1955 1947 pb_system("$inslg","$cmtlg"); 1956 1948 } else { 1957 pb_system(" yum -y $opt installrpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail",$cmtall);1949 pb_system("$pbupd rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail",$cmtall); 1958 1950 if ($dver > 9) { 1959 pb_system(" yum -y $opt installperl-gettext",$cmtall);1951 pb_system("$pbupd perl-gettext",$cmtall); 1960 1952 } else { 1961 1953 pb_system("$inslg","$cmtlg"); … … 1977 1969 pb_system("$insfb","$cmtfb"); 1978 1970 pb_system("$insms","$cmtms"); 1979 pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i\$liste ; fi","$cmtall");1971 pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then $pbupd \$liste ; fi","$cmtall"); 1980 1972 } elsif ( $dfam eq "md" ) { 1981 pb_system("urpmi.update -a ; urpmi --autorpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext","$cmtall");1973 pb_system("urpmi.update -a ; $pbupd rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext","$cmtall"); 1982 1974 if (($ddir eq "mandrake") && ($dver eq "10.1")) { 1983 1975 pb_system("$insdm","$cmtdm"); 1984 1976 pb_system("$inslg","$cmtlg"); 1985 1977 } else { 1986 pb_system(" urpmi --autoperl-DateManip","$cmtdm");1987 pb_system(" urpmi --autoperl-Locale-gettext","$cmtdm");1978 pb_system("$pbupd perl-DateManip","$cmtdm"); 1979 pb_system("$pbupd perl-Locale-gettext","$cmtdm"); 1988 1980 } 1989 1981 } elsif ( $dfam eq "du" ) { … … 1998 1990 } elsif ( $dfam eq "gen" ) { 1999 1991 #system "emerge -u system"; 2000 pb_system(" emergewget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");1992 pb_system("$pbudp wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall"); 2001 1993 } else { 2002 1994 pb_log(0,"No pkg to install\n");
Note:
See TracChangeset
for help on using the changeset viewer.