Changeset 1564 in ProjectBuilder

Timestamp:

May 22, 2012, 11:46:10 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix typo n rpmbootstrap preventing it to run
• Fix the detection of setarch call with a more correct regexp
• New mageia mirror used (similar as mandriva)
• Add a test script to have a full regression suite before publishing a new version

Location:

devel

Files:

• pb-doc/SECURITY (modified) (3 diffs)
• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)
• pb/t (added)
• pb/t/pbtest (added)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

devel/pb-doc/SECURITY

@@ -4 +4 @@
 This is done by calls to sudo.
 However, by default all actions are performed with an unpriviledge user (the one using pb or the pb user if working on VM/VE/RM)
-Security is not considered a constaint when pb is generating the build environment itself, such as for VM and VE. So, in these cases, the sudo configuration allows the pb user to do all commands without password in the VM or to perform locally all actions for the VE management, by geing granted full local access. 
+Security is not considered a constaint when pb is generating the build environment itself, such as for VM and VE. So, in these cases, the sudo configuration allows the pb user to do all commands without password in the VM or to perform locally all actions for the VE management, by being granted full local access. 
 However, when using pb with RM, as the systems may pre-exist and be used for other tasks, a strict analysis of the actions performed is required, in order to restrict precisely the commands called with sudo priviledges, as these are done without password request to automate generation.
 
-In the Distributions.pm module there are sudo calls, corresponding to the abilty to configure automatically additional repositories. That feature may not be used on RM and solved manually without problem. In case this is used, and sudo isn't configured accordingly, then the additional repo will NOT be added and the build will probably fail.
+In the Distributions.pm module there are sudo calls, corresponding to the abilty to configure automatically additional repositories. That feature may not be used on RM or solved manually without problem. In case this is used, and sudo isn't configured accordingly, then the additional repo will NOT be added and the build will probably fail.
 
-In the default pb.conf main configuration files, parameters for osupd and osins for the various distributions call sudo to make the installation of missing packages. These calls are done as 'pb' user' by default (or the account configured as rmlogin in the configuration file). In case this is used, and sudo isn't configured accordingly, then the additional required packages will NOT be added and the build will probably fail.
+In the default pb.conf main configuration files, parameters for osupd and osins for the various distributions call sudo to make the installation of missing packages. These calls are done as 'pb' user by default (or the account configured as rmlogin in the configuration file). In case this is used, and sudo isn't configured accordingly, then the additional required packages will NOT be added and the build will probably fail.
 For RM, we may consider that all required packages for the build are already installed on the system, or give rpm/yum/apt/urpmi/zypper... sudo rights to the build account manually.
 Recommended for a manual setup (not using rmsetup): Add manually to your system sudo access for the pb account to the local package install and update command such as /bin/rpm e.g:
@@ -20 +20 @@
 
 All: 
-sudo $vntpcmd $vntp (Commande extraite d'un fichier de conf local => Potential Security issue for RM)
+sudo $vntpcmd $vntp (Command extracted from a local conf file => Potential Security issue for RM)
 sudo /bin/date
 
@@ -46 +46 @@
 sudo rm -f $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz
 
-Here is a list of commands called locally to build in some Linux distributins special cases:
+Here is a list of commands called locally to build on some Linux distributions special cases:
 For gentoo: sudo sh -c 'echo PORTDIR_OVERLAY=\"$ENV{'HOME'}/portage\" >> /etc/make.conf'
 For Slackware (TBC): sudo /sbin/makepkg -p -l y -c y $pbpkg

devel/pb-modules/etc/pb.conf

@@ -407 +407 @@
 # pbos->{'arch'} == i586 for i386 repo
 rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$pbos->{'version'}/$pbos->{'arch'}/media/main/release/
-rbsmirrorsrv mageia = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
+rbsmirrorsrv mageia = http://mirrors.kernel.org/mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
+#rbsmirrorsrv mageia = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -425 +425 @@
 my $arch = `uname -m`;
 chomp($arch);
-$arch =~ s/i.86/i386/;
+$arch =~ s/i[3456]86/i386/;
 # For Solaris
 $arch =~ s/i86pc/i386/;

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -108 +108 @@
         }
     }
+
     # Handle cross arch on Intel based platforms
-    $sudocmd = "setarch i386 $sudocmd" if (($pbos->{arch} =~ /i?86/) && ($arch eq 'x86_64'));
+    $sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
 
     my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});

devel/pb/bin/pb

@@ -2259 +2259 @@
             $shcmd = "schroot $tp -u $mac -- ";
         }
-        $shcmd = "setarch i386 $shcmd" if (($pbos->{'arch'} =~ /i?86/) && ($arch eq 'x86_64'));
+        $shcmd = "setarch i386 $shcmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
         $cpcmd = "sudo /bin/cp -r ";
         # We need to get the home dir of the target account to deliver in the right place

devel/rpmbootstrap/bin/rpmbootstrap

@@ -472 +472 @@
 #
 pb_mkdir_p("$vepath/proc");
-pb_system("mount -o bind /proc $vepath/proc","Mounting /proc") unless (-d "$vepath/proc/$$";);
+pb_system("mount -o bind /proc $vepath/proc","Mounting /proc") unless (-d "$vepath/proc/$$");
 
 #