Changeset 171

Timestamp:

10/04/07 23:44:59 (6 years ago)

Author:

bruno

Message:

Mandrakelinux 2006.0 has a mandrakeliux-release file which is a link. So creation of a new entry for a mandrakelinux ddir which is then modified in mandrake after detection

Location:

devel/pb

Files:

• contrib/pbsetupqemu (modified) (6 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (7 diffs)

devel/pb/contrib/pbsetupqemu

@@ -21 +21 @@
 chmod 0644,$file;
 
-# Sync date
-system "/usr/sbin/ntpdate ntp.home.musique-ancienne.org";
-
 $file="/etc/passwd";
 open(PBFILE,$file) || die "Unable to open $file";
@@ -36 +33 @@
         mkdir "/home";
     }
-    system "useradd pb";
+    system "useradd pb -d /home/pb";
 }
+
+chdir "/home/pb";
+mkdir ".ssh",0700;
+system 'cp /tmp/pbkey .ssh/authorized_keys';
+chmod 0600,".ssh/authorized_keys";
+system 'chown -R pb:pb .ssh';
 
 # No passwd for pb only keys
@@ -68 +71 @@
 chmod 0440,$file;
 
-system 'su - pb -c "mkdir -p .ssh ; chmod 700 .ssh ; cp /tmp/pbkey .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys"';
 unlink "/tmp/pbkey";
 
@@ -83 +85 @@
         $opt="--exclude=*.i?86";
     }
+
+    my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+    chomp($topbuilddir);
+
+    my $p = `rpm -q afio`;
+    chomp($p);
+    if ($p !~ /^afio/) {
+        system "rm -f afio-* ; wget ftp://ftp.mondorescue.org/src/afio-2.4.7-1.src.rpm ; rpm -ivh afio-2.4.7-1.src.rpm ; rpmbuild -ba $topbuilddir/SPECS/afio.spec ; chmod 644 $topbuilddir/RPMS/*/*.rpm";
+    }
+    $p = `rpm -q buffer`;
+    chomp($p);
+    if ($p !~ /^buffer/) {
+        system "rm -f buffer-* ; wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm ; rpm -ivh buffer-1.19-1.src.rpm ; rpmbuild -ba $topbuilddir/SPECS/buffer.spec ; chmod 644 $topbuilddir/RPMS/*/*.rpm";
+    }
     if ( $dver <= 4 ) {
-        # FC4
+        # FC4 - AppConfig unavailable
         system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
     } else {
@@ -91 +107 @@
     }
 } elsif ( $dfam eq "md" ) {
-    system "urpmi --auto-select neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+    if (( $dver eq "2006.0" ) || ( $dver eq "10.2" ) || ( $dver eq "10.1" )) {
+        # mondo not available
+        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+    } else {
+        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mondo mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+    }
 } elsif ( $dfam eq "du" ) {
     system "apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev ntp-client libncurses5-dev";
@@ -99 +120 @@
     print "No pkg to install\n";
 }
+
+# Sync date
+system "/usr/sbin/ntpdate ntp.home.musique-ancienne.org";
 
 # Patch AppConfig 

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -19 +19 @@
 ($ddir,$dver) = pb_get_distro() if ((not defined $ddir) || (not defined $dver));
 
-# There shold be unicity of names between ddir dfam and dtype
+# There should be unicity of names between ddir dfam and dtype
 # In case of duplicate, bad things can happen
 if (($ddir =~ /debian/) ||
@@ -60 +60 @@
     }
 } elsif (($ddir =~ /mandrake/) ||
+        ($ddir =~ /mandrakelinux/) ||
         ($ddir =~ /mandriva/)) {
     $dfam="md";
     $dtype="rpm";
+    if ($ddir =~ /mandrakelinux/) {
+        $ddir = "mandrake";
+    }
     if ($ddir =~ /mandrake/) {
         my $dver1 = $dver;
@@ -100 +104 @@
     'slackware'         =>  'slackware-version',    # >= 10.2
     'mandriva'          =>  'mandriva-release',     # >=2006.0
+    'mandrakelinux'     =>  'mandrakelinux-release',# = 10.2
     'fedora'            =>  'fedora-release',       # >= 4
     'vmware'            =>  'vmware-release',       # >= 3
@@ -133 +138 @@
 # List of files that ambiguously indicates what distro we have
 my %ambiguous_rel_files = (
-    'mandrake'          =>  'mandrake-release',     # >= 10.1
+    'mandrake'          =>  'mandrake-release',     # <= 10.1
     'suse'              =>  'SuSE-release',         # >= 10.0
     'redhat'            =>  'redhat-release',       # >= 7.3
@@ -142 +147 @@
 # If ambiguity, which other distributions should be checked
 my %distro_similar = (
-    'mandrake'          => ['mandrake'],
+    'mandrake'          => ['mandrake', 'mandrakelinux'],
     'suse'              => ['suse', 'sles'],
     'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake', 'vmware'],
@@ -154 +159 @@
     'slackware'             => 'S[^ ]* (.+)$',
 # There should be no ambiguity between potential ambiguous distro
+    'mandrakelinux'         => 'Mandrakelinux release (.+) \(',
     'mandrake'              => 'Mandr[^ ]* release (.+) \(',
     'mandriva'              => 'Mandr[^ ]* [^ ]* release (.+) \(',
@@ -177 +183 @@
 my ($d,$r);
 while (($d,$r) = each %single_rel_files) {
-    if (-f "$base/$r" && !-l "$base/$r") {
+    if (-f "$base/$r" && ! -l "$base/$r") {
         my $tmp=pb_get_content("$base/$r");
         # Found the only possibility.