Changeset 1299 in ProjectBuilder

Timestamp:

Apr 16, 2011, 2:25:30 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Working VVE for opensuse-11.4
• some corresponding fixes for rpmbootstrap that would also need backward checks now

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -210 +210 @@
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
 osupd md = sudo /usr/bin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --auto-select --no-suggests
-osupd opensuse = sudo /usr/bin/zypper -n update
+osupd opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n update
 osupd sol = /bin/true
 osupd lsb = /bin/true
@@ -225 +225 @@
 osins novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo /sbin/yast2 -i 
 osins opensuse-10.2 = yes | sudo /usr/bin/zypper install
-osins opensuse = sudo /usr/bin/zypper -n install
+osins opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n install
 osins sol = sudo pkgadd -d
 osins lsb = /bin/true
@@ -308 +308 @@
 #
 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 opensuse-11.3 = 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 opensuse-11.4 = ConsoleKit,cracklib-dict-small,PolicyKit,aaa_base,bash,bzip2,coreutils,cpio,cracklib,cyrus-sasl,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glib2-branding-upstream,glibc,gpg2,grep,gzip,hal,info,insserv,keyutils-libs,krb5,libacl,libassuan0,libattr,libaugeas0,libbz2-1,libcap2,libcom_err2,libcurl4,libdb-4_5,libelf1,libexpat1,libgcc45,libgcrypt11,libglib-2_0-0,libgobject-2_0-0,libgthread-2_0-0,libgpg-error0,libidn,libksba,libldap-2_4-2,liblua5_1,liblzma5,libmodman1,libncurses5,libnscd,libopenssl1_0_0,libpopt0,libproxy1,libreadline6,libreiserfs,libselinux1,libsepol1,libsmbios2,libssh2-1,libstdc++45,libudev0,libusb-0_1-4,libuuid1,libxcrypt,libxml2,libxml2-python,libzio,libzypp,login,mingetty,module-init-tools,ncurses-utils,net-tools,openSUSE-release,openSUSE-release-ftp,openslp,pam,pam-config,pam-modules,parted,pciutils,perl-base,permissions,pinentry,pm-utils,procps,psmisc,pwdutils,python,rpm,rpm-python,satsolver-tools,sed,setserial,sysvinit,termcap,terminfo-base,udev,util-linux,zlib,zypper
 #
 rbsmindep mandriva-2009.1-i386 = makedev,consolekit,basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glib2.0-common,glibc,gnupg2,grep,info,initscripts,iproute2,iputils,keyutils,krb5,libacl1,libattr1,libbzip2_1,libdb4.6,libelfutils1,libext2fs2,libidn11,liblua5.1,libmagic1,libncurses5,libnspr4,libnss3,libopenssl0.9.8,libpopt0,libreadline6,librpm4.6,libsqlite3_0,libtermcap2,liblzma2,libgcc1,logrotate,lua,mandriva-release-common,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,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-ng,vim-minimal,wget,zlib1

devel/rpmbootstrap/bin/rpmbootstrap

@@ -478 +478 @@
     my $baseurl = dirname(dirname($mirror));
     # Setup the repo
-    print REPO << 'EOF';
-[opensuse]
-name=$pbos->{'name'}-$pbos->{'version'}
-baseurl=$baseurl
-enabled=1
-gpgcheck=1
-
-EOF
-    close(REPO);
-    $minipkglist = "zypper vim-minimal dhclient";
-    # Bootstraping zypper
     if ($pbos->{'version'} eq "10.2") {
         pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
-    }
+    } else {
+        pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper ar $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
+    }
+    #print REPO << "EOF";
+#[opensuse]
+#name=$pbos->{'name'}-$pbos->{'version'}
+#baseurl=$baseurl
+#enabled=1
+#gpgcheck=1
+#
+#EOF
+    close(REPO);
+    $minipkglist = "zypper";
 } elsif ($pbos->{'install'} =~ /urpmi/) {
     # Setup the repo