Changeset 1027 in ProjectBuilder for devel/pb-modules

Timestamp:

May 21, 2010, 3:29:59 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds rbsopt parameter + doc to allow for passing options to rpmbootstrap such as -k now by default.
• Mandriva VE are now working (tested with 2010.0 + package list fixed)

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (2 diffs)
• etc/pb.conf.pod (modified) (2 diffs)
• lib/ProjectBuilder/Conf.pm (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -47 +47 @@
 # Asianux >= 2.2
 osrelfile asianux = /etc/asianux-release
-
-# LSB
-osrelfile lsb = /etc/lsb-release
 
 # Solaris 10
@@ -270 +267 @@
 rbsmindep opensuse-11.2 = ConsoleKit,cracklib-dict-small,PolicyKit,aaa_base,audit-libs,bash,boost-license,bzip2,coreutils,coreutils-lang,cpio,cpio-lang,cracklib,cyrus-sasl,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glib2,glib2-branding-upstream,glib2-lang,glibc,gpg2,gpg2-lang,grep,gzip,hal,info,insserv,keyutils-libs,krb5,libacl,libattr,libboost_signals1_36_0,libbz2-1,libcom_err2,libcurl4,libdb-4_5,libexpat1,libgcc43,libgcrypt11,libglib-2_0-0,libgobject-2_0-0,libgthread-2_0-0,libgpg-error0,libidn,libksba,libldap-2_4-2,libncurses5,libnscd,libopenssl0_9_8,libreadline5,libreiserfs,libselinux1,libsepol1,libsmbios2,libstdc++43,libusb-0_1-4,libuuid1,libvolume_id1,libxcrypt,libxml2,libxml2-python,libzio,libzypp,login,mingetty,module-init-tools,ncurses-utils,neon,net-tools,openSUSE-release,openSUSE-release-ftp,openslp,pam,pam-config,pam-modules,parted,pciutils,pcre,perl-base,permissions,pinentry,pm-utils,pmtools,popt,procps,psmisc,pth,pwdutils,python,python-urlgrabber,rpm,rpm-python,satsolver-tools,sed,setserial,sysvinit,termcap,terminfo-base,udev,util-linux,uuid-runtime,zlib,zypper
 #
-rbsmindep mandriva-2009.1 = 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,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,urpmi,util-linux-ng,vim-minimal,zlib
-#
-rbsmindep mandriva-2010.0 = 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.7,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma2,libmagic1,libncurses5,libnspr4,libnss3,libopenssl0.9.8,libpopt0,libreadline6,librpm4,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,logrotate,lua,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,zlib1
+rbsmindep mandriva-2009.1-i386 = 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,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,mandriva-release-common,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,urpmi,util-linux-ng,vim-minimal,zlib
+rbsmindep mandriva-2009.1-x86_64 = 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,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,lib64acl,lib64attr,lib64cap,lib64curl,lib64gcc,lib64gcrypt,lib64gpg-error,lib64idn,lib64ksba,lib64lzma,lib64selinux,lib64sepol,lib64stdc++,lib64usb,lib64volume_id,lib64xml2,linux-atm-libs,logrotate,lua,mandriva-release-common,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,urpmi,util-linux-ng,vim-minimal,zlib
+#
+rbsmindep mandriva-2010.0-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.7,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma2,lib64magic1,lib64ncurses5,lib64nspr4,lib64nss3,lib64openssl0.9.8,lib64popt0,lib64readline6,lib64rpm4.6,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,libgcc1,logrotate,lua,mandriva-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,zlib1
+rbsmindep mandriva-2010.0-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.7,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma2,libmagic1,libncurses5,libnspr4,libnss3,libopenssl0.9.8,libpopt0,libreadline6,librpm4.6,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,logrotate,lua,mandriva-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,zlib1
 
 # Where to store packages downloaded temporarily by rpmbootstrap
 rbscachedir default = /var/cache/rpmbootstrap
+
+# Options to pass to rpmbootstrap command. By default keep downloaded packages
+rbsopt rpmbootstrap = -k
 
 # URL of the directory containing the packages mentioned in rbsmindep. 

devel/pb-modules/etc/pb.conf.pod

@@ -304 +304 @@
  Example: rbsb4pi centos = /home/rinse/bin/before-post-install.sh
 
+=item B<rbsopt>
+
+ Nature: Optional
+ Key: tool used for rpm based VE. Could be one of rpmbootstrap, rinse, mock, ...
+ Value: Additional option to pass to the command
+ Conffile: ve
+ Example: rbsopt rpmbootstrap = -k
+
 =item B<rbspi>
 
@@ -310 +318 @@
  Value: for mock it's not used. For rinse it's the script to call after doing installation for customization. For rpmbootstrap it's the script to call after doing installation for customization.
  Conffile: ve
- Example: pbrpi centos = /home/rinse/bin/post-install.sh
+ Example: rbspi centos = /home/rinse/bin/post-install.sh
 
 =item B<supfiles>

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

@@ -216 +216 @@
 =item B<pb_conf_fromfile_if>
 
-This function returns a pointer on a table, corresponding to a merge of values querried in the conf file and the pointer on another table passed as parameter. It takes a table of keys as last input parameter.
+This function returns a pointer on a table, corresponding to a merge of values queried in the conf file and the pointer on another table passed as parameter. It takes a table of keys as last input parameter.
 
   my ($k1) = pb_conf_fromfile_if("$HOME/.pbrc",undef,"pbver","pblist");

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

@@ -167 +167 @@
 my ($d,$r);
 while (($d,$r) = each %$single_rel_files) {
+    if (defined $ambiguous_rel_files->{$d}) {
+        print STDERR "The key $d is considered as both unambiguous and ambigous.\n";
+        print STDERR "Please fix your configuration file.\n";
+    }
     if (-f "$r" && ! -l "$r") {
         my $tmp=pb_get_content("$r");
@@ -183 +187 @@
 
 # Now look at ambiguous files
-# Ubuntu includes a /etc/debian_version file that creates an ambiguity with debian
+# Ubuntu before 10.04 includes a /etc/debian_version file that creates an ambiguity with debian
 # So we need to look at distros in reverse alphabetic order to treat ubuntu always first via lsb
 foreach $d (reverse keys %$ambiguous_rel_files) {