Changeset 1645 in ProjectBuilder

Timestamp:

Sep 26, 2012, 2:26:13 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds support for a RedHat 6.2 VE by first making newve work, and rpmbootstrap support non-yum type of install with a full list of deps.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (7 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -232 +232 @@
 osupd opensuse-11.1 = sudo /usr/bin/zypper -n update
 osupd opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n update
+osupd redhat = /bin/true
 osupd sol = /bin/true
 osupd lsb = /bin/true
@@ -248 +249 @@
 osins opensuse-11.1 = sudo /usr/bin/zypper -n install
 osins opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n install --auto-agree-with-licenses
+osins redhat = sudo /bin/rpm -i --ignorearch
 osins sol = sudo pkgadd -d
 osins lsb = /bin/true
@@ -292 +294 @@
 # These deps are needed before setupvm|ve can be run. 
 # Install them with your distribution in VM or automatically in VE
+# On RedHat 6.2 we do not give any package here to avoid problems to add them as there is no repo nor yum mecanism
+osmindep redhat =
+osmindep redhat-6.2 =
 osmindep default = perl,sudo,wget,tar,make,gzip
 
 # These deps are needed for rpmbootstrap to install a base distribution
 # Originally reuse from rinse conf files
+rbsmindep redhat-6.2 = MAKEDEV,SysVinit,authconfig,basesystem,bash,binutils,bzip2,chkconfig,console-tools,cracklib,cracklib-dicts,dev,dev86,diffutils,dhcpcd,e2fsprogs,file,filesystem,fileutils,findutils,gawk,gdbm,glib,glibc,gmp,grep,gzip,info,initscripts,iproute,iputils,kernel,krb5-configs,krb5-libs,ldconfig,ld.so,libc,libelf,libstdc++,libtermcap,logrotate,make,mingetty,mktemp,modutils,mount,newt,ncurses,net-tools,pam,passwd,perl,popt,procps,psmisc,pwdb,python,readline,rpm,rpm-python,sed,setup,shadow-utils,sh-utils,slang,sysklogd,tar,tcsh,termcap,textutils,util-linux,vim-common,vim-minimal,vixie-cron,which,wget,zlib
+#
 rbsmindep fedora-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,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++,libtermcap,libxml2,libxml2-python,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,zlib
 #
@@ -395 +402 @@
 # $pbos->{'arch'}: architecture of the distribution
 # You need an http based mirror for the moment
+rbsmirrorsrv redhat-6.2 = http://localhost/rh62/RedHat/RPMS
 #rbsmirrorsrv fedora = http://download.fedora.redhat.com/pub/fedora/linux/releases/$pbos->{'version'}/Everything/$pbos->{'arch'}/os/Packages/
 rbsmirrorsrv fedora = http://mirrors.kernel.org/fedora/releases/$pbos->{'version'}/Everything/$pbos->{'arch'}/os/Packages
@@ -603 +611 @@
 
 # Where is the keyboard config file
-ospathcmd-keyfile default = /etc/rc.config
 ospathcmd-keyfile rpm = /etc/sysconfig/keyboard
 ospathcmd-keyfile slackware = /etc/rc.d/rc.keymap
@@ -610 +617 @@
 ospathcmd-keyfile arch = /etc/rc.conf
 ospathcmd-keyfile gentoo = /etc/conf.d/keymaps
+ospathcmd-keyfile default = /etc/rc.config
 # Where is the keyboard directory
 ospathcmd-keymapdir default = /usr/lib/kbd/keymaps
@@ -621 +629 @@
 
 # Some path for commands may defer from one system to another
+ospathcmd-halt solaris = /usr/sbin/halt
 ospathcmd-halt default = /sbin/halt
-ospathcmd-halt solaris = /usr/sbin/halt
 
 # Do you want pb to create a dedicated SSH key pair to dialog with VM|RM

devel/rpmbootstrap/bin/rpmbootstrap

@@ -449 +449 @@
         unlink("$vepath/tmp/$p1");
     }
+# RedHat 6.2 has a buggy termcap setup
+} elsif ($pbos->{'name'} =~ /redhat/) {
+    pb_system("chroot $vepath ldconfig","Forcing ldconfig on $pbos->{'name'} $pbos->{'version'}");
 }
 #
@@ -533 +536 @@
     # TODO here too ?
     $minipkglist = "ldconfig urpmi passwd vim-minimal dhcp-client";
+} elsif ($pbos->{'install'} =~ /\/rpm/) {
+    opendir(CDIR,$cachedir) || die "Unable to open directory $cachedir: $!";
+    foreach my $p (@installed_packages) {
+        foreach my $f (readdir(CDIR)) {
+    # find an rpm package ref name-ver-tag.arch.rpm
+        next if ($f =~ /^\./);
+            if ($f =~ /^$p-([^-]+)-([^-]+)\.(noarch|$parch)\.rpm$/) {
+                # Copy it to the chroot and reference it
+                copy("$cachedir/$f","$vepath/var/cache");
+                $minipkglist .= " /var/cache/$f"; 
+                last;
+            }
+        }
+        rewinddir(CDIR);
+    }
+    closedir(CDIR);
 }