Changeset 984 in ProjectBuilder for devel

Timestamp:

Feb 20, 2010, 5:33:25 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix fedora 12: now installing in VE with rpmbootstrap
• First fully rpmbootstrap working version. Now needs more testing with other fedora versions, and opensuse/mandriva adaptation

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (8 diffs)

devel/pb-modules/etc/pb.conf

@@ -244 +244 @@
 rbsmindep fedora-10 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
 #
-rbsmindep fedora-11 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,liblzma,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
-#
-rbsmindep fedora-12 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,libselinux,libsepol,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,lzma-libs,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
+rbsmindep fedora-11 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libblkid,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+#
+rbsmindep fedora-12 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
 #
 rbsmindep centos-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib

devel/rpmbootstrap/bin/rpmbootstrap

@@ -15 +15 @@
 use English;
 use LWP::UserAgent;
-#use File::Basename;
-#use File::Copy;
+use File::Basename;
+use File::Copy;
+use File::Find;
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
@@ -82 +83 @@
 
 Name of the script you want to execute on the related VEs after the installation.
+It is executed in host environment. You can use the chroot command to execute actions in the VE.
 
 =item B<-i|--iso iso_image>
@@ -138 +140 @@
 
 pb_syntax_init("$appname Version $projectbuilderver-$projectbuilderrev\n");
+pb_temp_init();
 
 GetOptions("help|?|h" => \$opts{'h'}, 
@@ -188 +191 @@
 # Initialize distribution info from pb conf file
 #
+pb_log(0,"Starting VE build for $ENV{'PBV'}\n");
 my ($name,$ver,$darch) = split(/-/,$ENV{'PBV'});
 chomp($darch);
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dsuf, $dupd) = pb_distro_init($name,$ver,$darch);
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
 
 #
@@ -238 +242 @@
 $ua->env_proxy;
 
+pb_log(0,"Downloading package list from $mirror ...\n");
 my $response = $ua->get($mirror);
 if (! $response->is_success) {
@@ -267 +272 @@
 }
 
+#
+# Prepare early the yum cache env for the VE in order to copy in it packages on the fly
+#
+if ($pbupd =~ /yum/) {
+    pb_log(1,"Setting up YUM cache in VE\n");
+    pb_mkdir_p("$vepath/var/cache/yum/core/packages/");
+    pb_mkdir_p("$vepath/var/cache/yum/updates-released/packages/");
+}
 
 # For each package to process, get it, put it in the cache dir 
@@ -277 +290 @@
     pb_log(1,"Processing package $p ...\n");
     # Just print packages names if asked so. 
-    if ($opts{'p'}) {
-        if (defined $url{$p}) {
+    if (defined $url{$p}) {
+        if ($opts{'p'}) {
             pb_log(0,"$url{$p}\n");
+            next;
         } else {
-            pb_log(0,"WARNING: unable to find URL for $p\n");
-            $warning++;
-            $lwpkg .= " $p";
+            # Now download if not already in cache
+            my $p1 = basename($url{$p});
+            if (! -f "$cachedir/$p1") {
+                pb_system("wget --quiet -O $cachedir/$p1 $url{$p}","Downloading package $p1 ...");
+            } else {
+                pb_log(1,"Package $p1 already in cache\n");
+            }
+            
+            # End if download only
+            if ($opts{'d'}) {
+                next;
+            }
+
+            #
+            # Copy the cached .RPM files into the yum directory, so that yum doesn't need to make them again.
+            #
+            if ($pbupd =~ /yum/) {
+                pb_log(1,"Link package into $vepath/var/cache/yum/core/packages\n");
+                link("$cachedir/$p1","$vepath/var/cache/yum/core/packages/");
+                link("$cachedir/$p1","$vepath/var/cache/yum/$darch/$dver/");
+                symlink("$vepath/var/cache/yum/core/packages/$p1","$vepath/var/cache/yum/updates-released/packages/");
+            }
+
+            # And extract it to the finale dir
+            pb_system("cd $vepath ; rpm2cpio $cachedir/$p1 | cpio -ivdum","Extracting package $p1 into $vepath");
+
+            # Remove cached package if not asked to keep
+            if (! $opts{'k'}) {
+                unlink("$cachedir/$p1");
+            }
+
         }
-        next;
+    } else {
+        pb_log(0,"WARNING: unable to find URL for $p\n");
+        $warning++;
+        $lwpkg .= " $p";
     }
 }
@@ -293 +338 @@
 }
 
-# We Just printed packages names so now end
+# Stop here if we just print
 if ($opts{'p'}) {
     exit(0);
 }
+
+# Now executes the VE finalization steps required for it to work correctly
+pb_log(0,"VE post configuration\n");
+
+# yum needs that distro-release package be installed, so force it
+
+foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
+    copy("$cachedir/$p1","$vepath/tmp");
+    pb_system("chroot $vepath rpm -ivh --force --nodeps /tmp/$p1","Forcing RPM installation of $p1");
+    unlink("$vepath/tmp/$p1");
+}
+#
+# Make sure there is a resolv.conf file present, such that DNS lookups succeed.
+#
+pb_log(1,"Creating resolv.conf\n");
+pb_mkdir_p("$vepath/etc");
+copy("/etc/resolv.conf","$vepath/etc/");
+
+#
+# BUGFIX:
+#
+if (($ddir eq "centos") && ($dver eq "5")) {
+    pb_log(1,"BUGFIX for centos-5\n");
+    pb_mkdir_p("$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx");
+    foreach my $i (<$vepath/usr/lib/python2.4/site-packages/urlgrabber/keepalive.*>) {
+        move($i,"$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx/");
+    }
+}
+
+#
+# /proc needed
+#
+pb_mkdir_p("$vepath/proc");
+pb_system("mount -o bind /proc $vepath/proc","Mounting /proc");
+
+#
+# Some devices may be needed
+#
+pb_system("mknod -m 644 $vepath/dev/random c 1 8","Creating $vepath/dev/random") if (! -c "$vepath/dev/random");
+pb_system("mknod -m 644 $vepath/dev/urandom c 1 9","Creating $vepath/dev/urandom") if (! -c "$vepath/dev/urandom");
+pb_system("mknod -m 666 $vepath/dev/zero c 1 5","Creating $vepath/dev/zero") if (! -c "$vepath/dev/zero");
+
+if ($pbupd =~ /yum/) {
+    #
+    # Force the architecture for yum
+    # The goal is to allow i386 chroot on x86_64
+    #
+    # FIX: Not sufficient to have yum working
+    # mirrorlist is not usable
+    # $releasever also needs to be filtered
+    # yum.conf as well
+    foreach my $i (<$vepath/etc/yum.repos.d/*>,"$vepath/etc/yum.conf") {
+        pb_system("sed -i -e 's/\$basearch/$darch/g' $i","","quiet");
+        pb_system("sed -i -e 's/\$releasever/$dver/g' $i","","quiet");
+        pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
+        pb_system("sed -i -e 's/^#baseurl/baseurl/' $i","","quiet");
+    }
+
+    #
+    # Run "yum install the necessary modules".
+    # No need for sudo here
+    #
+    $pbupd =~ s/sudo//g;
+    pb_system("chroot $vepath /bin/bash -c \"$pbupd ldconfig yum passwd vim-minimal dhclient authconfig\"","Bootstrapping yum");
+}
+
+#
+# make 'passwd' work.
+#
+pb_log(1,"Authfix\n");
+pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update; fi\"","Calling authconfig");
+
+#
+# Clean up
+#
+pb_log(1,"Cleaning up\n");
+if ($pbupd =~ /yum/) {
+    pb_system("chroot $vepath /usr/bin/yum clean all","Cleaning yum");
+}
+pb_system("umount $vepath/proc","Unmounting /proc");
+find(\&unlink_old_conf, $vepath);
+
+# Add additional packages if asked for
+
+# Executes post-install step if asked for
+if ($opts{'s'}) {
+    pb_system("$opts{'s'} $vepath","Executing the post-install script: $opts{'s'} $vepath");
+}
+
+# Function for File::Find
+sub unlink_old_conf {
+
+    unlink($_) if ($_ =~ /\.rpmorig$/);
+    unlink($_) if ($_ =~ /\.rpmnew$/);
+}
+
+