Changeset 1601


Ignore:
Timestamp:
May 26, 2012, 3:53:52 PM (8 years ago)
Author:
Bruno Cornec
Message:
  • pb correctly now differentiate PBDEP and BPBDEP (in Env.pm for template generation
  • pbtest uses now this feature
  • Fix mageia 1 and 2 deps for VE
  • remove a detail given in a generated pb_system as it creates errors in the built script
Location:
devel
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1597 r1601  
    376376#
    377377rbsmindep mageia-1-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,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm1,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,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
    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,systemd,udev,urpmi,util-linux,vim-minimal
    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,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
     378rbsmindep 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#
     380rbsmindep 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-linuxg,vim-minimal
    381381rbsmindep 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-minimal
    382382
  • devel/pb-modules/lib/ProjectBuilder/Env.pm

    r1597 r1601  
    648648#filter PBDEP =
    649649
     650# PBBDEP is replaced by the list of build dependencies
     651#filter PBBDEP =
     652
    650653# PBSUF is replaced by the package suffix (\$pb->{'suf'} in code)
    651654filter PBSUF = \$pb->{'suf'}
     
    680683#filter PBDEP =
    681684
     685# PBBDEP is replaced by the list of build dependencies
     686#filter PBBDEP =
     687
    682688# PBSUF is replaced by the package suffix (\$pb->{'suf'} in code)
    683689filter PBSUF = %{dist}
     
    719725# PBDEP is replaced by the list of dependencies
    720726#filter PBDEP =
     727
     728# PBBDEP is replaced by the list of build dependencies
     729#filter PBBDEP =
    721730
    722731# PBSUG is replaced by the list of suggestions
     
    878887Priority: optional
    879888Maintainer: PBPACKAGER
    880 Build-Depends: debhelper (>= 4.2.20), PBDEP
     889Build-Depends: debhelper (>= 4.2.20), PBBDEP
    881890Standards-Version: PBDEBSTD
    882891Vcs-Svn: svn://svn.PBPROJ.org/svn/PBVER/PBPKG
     
    11101119BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    11111120#Requires:       PBDEP
     1121#BuildRequires:       PBBDEP
    11121122
    11131123%description
  • devel/pb/bin/pb

    r1600 r1601  
    33233323        # Sync date
    33243324        # do it after sudoers is setup
    3325         print SCRIPT "pb_system(\"$ntpline\",\"Setting up time\",\"mayfail\");\n";
     3325        print SCRIPT "pb_system(\"$ntpline\");\n";
    33263326    }
    33273327    # We may need a proxy configuration. Get it from the local env
  • devel/pb/t/pbtest

    r1599 r1601  
    222222filter PBGRP = Applications/Archiving
    223223filter PBLIC = Afio
    224 filter PBDEP = gcc
     224filter PBBDEP = gcc
    225225EOF
    226226sudocmd "mv /tmp/rpm.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf"
    227227sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf "
    228228
    229 cat >> /tmp/deb.pbf << EOF
     229cat > /tmp/deb.pbf << EOF
    230230filter PBGRP = utils
    231231filter PBLIC = Afio
     
    244244perl -pi -e 's|%doc ChangeLog|%doc HISTORY PORTING README SCRIPTS ANNOUNCE-2.5 perl.artistic.license|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    245245perl -pi -e 's|%doc INSTALL COPYING README AUTHORS NEWS|%doc afio.lsm script1 script2 script3 script4\n%{_bindir}/%{name}\n%{_mandir}/man1/%{name}.1*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    246 perl -pi -e 's|^#Requires:|Requires:|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     246perl -pi -e 's|^#BuildRequires:|BuildRequires:|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    247247EOF
    248248chmod 755 /tmp/pbtestcmd
     
    294294perl -pi -e 's|config.status: configure|config.status: Makefile|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
    295295perl -pi -e 's|dh_installchangelogs ChangeLog|dh_installchangelogs debian/changelog|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
    296 perl -pi -e 's|\\\$(MAKE) install.*|mkdir -p \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
    297 perl -pi -e 's|# - copy html manual to temporary location for renaming|install -p -m 755 afio \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin ; install -p -m 644 afio.1 \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     296perl -pi -e 's|# - copy html manual to temporary location for renaming|mkdir -p \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1 ; install -p -m 755 afio \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin ; install -p -m 644 afio.1 \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
    298297sed -i -e '/\.\/configure /d' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     298sed -i -e '/ install prefix=/d' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
    299299EOF
    300300chmod 755 /tmp/pbtestcmd
     
    330330sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb"
    331331sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 -V 2.6 newver"
     332sudopbtest "pb -r 2.6 sbx2pkg"
    332333sudopbtest "pb clean"
    333334
     
    340341sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G"
    341342sudopbtest "qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -redir tcp:2200:10.0.2.15:22"
    342 sudopbtest "pb -p pb -m $d sbx2setupvm"
     343sudopbtest "pb -p pb -r devel -m $d sbx2setupvm"
    343344sudopbtest "pb -p pb -m $d snapvm"
    344345sudopbtest "pb -m $d sbx2vm"
    345346
    346347
    347 # test also with MOndoRescue
     348# test also with MondoRescue
    348349pb -p mondorescue -r branches/3.0 cms2pkg
    349350
Note: See TracChangeset for help on using the changeset viewer.