- Timestamp:
- May 27, 2012, 1:49:49 AM (12 years ago)
- Location:
- devel
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.conf
r1601 r1603 378 378 rbsmindep mageia-1-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm1,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal 379 379 # 380 rbsmindep mageia-2-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm2,librpmbuild2,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux g,vim-minimal381 rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm2,lib64rpmbuild2,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils, udev,urpmi,util-linux,systemd,vim-minimal380 rbsmindep mageia-2-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm2,librpmbuild2,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux,vim-minimal 381 rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm2,lib64rpmbuild2,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux,vim-minimal 382 382 383 383 # Where to store packages downloaded temporarily by rpmbootstrap -
devel/pb-modules/lib/ProjectBuilder/Base.pm
r1602 r1603 166 166 pb_log(0,"OK\n") if ($res == 0); 167 167 return($res) 168 168 } 169 169 170 170 my $cwd = getcwd; … … 181 181 } else { 182 182 pb_log(0,"ERROR running command ($cmd) with cwd=$cwd, pid=$$"); 183 } 183 184 } else { 184 185 pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet")); -
devel/pb/bin/pb
r1601 r1603 2332 2332 pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $src $cptarget 2> /dev/null","$cmt delivery in $cptarget"); 2333 2333 2334 my $chowncommand = pb_check_req("chown",0); 2334 2335 # For VE we need to change the owner manually 2335 2336 if ($cmt =~ /^VE/) { 2336 2337 pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers"); 2337 pb_system("$shcmd \"sudo chown-R $mac $tdir\"","Adapt owner in $tdir to $mac");2338 pb_system("$shcmd \"sudo $chowncommand -R $mac $tdir\"","Adapt owner in $tdir to $mac"); 2338 2339 } 2339 2340 … … 2359 2360 # Get back info on pkg produced, compute their name and get them from the VM/RM 2360 2361 pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$ 2> /dev/null","Get package names in $cp2target"); 2361 # For VE we need to change the owner manually2362 if ($cmt eq "VEbuild") {2363 my $command = pb_check_req("chown",0);2364 pb_system("sudo $command $UID $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$","Adapt owner in $tdir to $UID");2365 }2366 2362 if (not -f "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") { 2367 pb_log(0," Problem with VM/RM $v on$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");2363 pb_log(0,"ERROR with VM/RM $v on getting $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$"); 2368 2364 } else { 2369 2365 open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$"; … … 3323 3319 # Sync date 3324 3320 # do it after sudoers is setup 3325 print SCRIPT "pb_system(\"$ntpline\" );\n";3321 print SCRIPT "pb_system(\"$ntpline\",\"Updating time with $ntpline\",\"mayfail\");\n"; 3326 3322 } 3327 3323 # We may need a proxy configuration. Get it from the local env … … 3429 3425 # For VE we need to umount some FS at the end 3430 3426 3431 pb_system("umount /proc","Unmounting /proc ,"mayfail");3427 pb_system("umount /proc","Unmounting /proc","mayfail"); 3432 3428 3433 3429 # Create a basic network file if not already there -
devel/pb/t/pbtest
r1601 r1603 12 12 13 13 # You may have multiple distros here 14 TESTVEDIST="debian-6 -x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2010.0-i386"14 TESTVEDIST="debian-6.0-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2011.0-i386" 15 15 # Only one VM is tested for now. 16 16 TESTVMDIST="fedora-16-i386" … … 27 27 msg=$2 28 28 29 echo " " 29 30 if [ _"$cmd" == _"/tmp/pbtestcmd" ]; then 30 31 echo "INFO (as $PBUSER): Now running `head -1 $cmd` [$msg]" … … 39 40 echo "================================" 40 41 fi 41 echo " "42 42 } 43 43 … … 45 45 cmd=$1 46 46 47 echo " " 47 48 echo "INFO (as root): Now running $cmd" 48 49 sudo -n $cmd … … 53 54 echo "================================" 54 55 fi 55 echo " "56 56 } 57 57 58 58 59 for d in $TESTVEDIST; do 60 # umount /proc in VE in case 61 dd=`echo $d | cut -d'-' -f1` 62 vv=`echo $d | cut -d'-' -f2` 63 aa=`echo $d | cut -d'-' -f3` 64 if [ -f "$PBTEST/ve/$dd/$vv/$aa/proc/cpuinfo" ]; then 65 sudocmd "umount $PBTEST/ve/$dd/$vv/$aa/proc" 66 fi 67 done 59 68 sudocmd "rm -rf $PBTEST/* $PBTEST/.??*" 69 sudocmd "rmdir $PBTEST" 60 70 sudocmd "killall -u $PBUSER" 61 71 sudocmd "userdel $PBUSER" … … 230 240 filter PBGRP = utils 231 241 filter PBLIC = Afio 242 filter PBBDEP = gcc 232 243 EOF 233 244 sudocmd "mv /tmp/deb.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/deb.pbf" -
devel/rpmbootstrap/bin/rpmbootstrap
r1595 r1603 504 504 } 505 505 $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig"; 506 # TODO507 # $minipkglist = join(" ", "ldconfig yum passwd vim-minimal dhclient authconfig", @installed_packages);508 506 } elsif ($pbos->{'install'} =~ /zypper/) { 509 507 pb_mkdir_p("$vepath/etc/zypp/repos.d"); … … 514 512 pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper"); 515 513 } else { 516 pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper","mayfail"); # don't care if remove fails if add succeeds. 514 # don't care if remove fails if add succeeds. 515 pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper","mayfail"); 517 516 pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper ar $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper"); 518 517 } … … 526 525 #EOF 527 526 close(REPO); 528 $minipkglist = "zypper ";527 $minipkglist = "zypper aaa_base"; 529 528 # TODO: Re-installing packages missing and necessary on opensuse 11.4 to get /etc/passwd created. 530 # $minipkglist = join(" ", "zypper", @installed_packages);531 529 } elsif ($pbos->{'install'} =~ /urpmi/) { 532 530 # Setup the repo
Note:
See TracChangeset
for help on using the changeset viewer.