diff options
| -rw-r--r-- | buildfct | 7 | ||||
| -rwxr-xr-x | getmock | 4 | ||||
| -rwxr-xr-x | mkallrepo | 31 | ||||
| -rwxr-xr-x | mkrepo | 24 | ||||
| -rw-r--r-- | mock/fc26i.cfg | 120 | ||||
| -rw-r--r-- | mock/fc26x.cfg | 125 |
6 files changed, 289 insertions, 22 deletions
@@ -50,6 +50,9 @@ alias mockfc25xscl56=" mock --configdir=$mocketc -r fc25xscl56 alias mockfc25xscl70=" mock --configdir=$mocketc -r fc25xscl70 rebuild " alias mockfc25xscl71=" mock --configdir=$mocketc -r fc25xscl71 rebuild " +alias mockfc26i=" setarch i686 mock --configdir=$mocketc -r fc26i --arch i686 rebuild " +alias mockfc26x=" mock --configdir=$mocketc -r fc26x rebuild " + #alias mockel4i="setarch i686 mock --configdir=$mocketc -r el4i --arch i386 rebuild " #alias mockel4it="setarch i686 mock --configdir=$mocketc -r el4it --arch i386 rebuild " #alias mockel4x=" mock --configdir=$mocketc -r el4x rebuild " @@ -110,7 +113,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 25 24 23 22 + for i in 25 26 24 23 22 do echo -n "$(date +%X) fc$i " setarch i686 mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !" @@ -268,7 +271,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 25 23 24 22 + for i in 25 26 23 24 22 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !" @@ -184,7 +184,7 @@ if [ $1 = devs -o $1 = dev ]; then fi if [ $1 = all ]; then - for i in 22 23 24 25 + for i in 22 23 24 25 26 do getOneMock fc${i}i $opt done @@ -268,7 +268,7 @@ elif [ $1 = for55 ]; then done elif [ $1 = allx ]; then - for i in 22 23 24 25 + for i in 22 23 24 25 26 do getOneMock fc${i}x $opt done @@ -2,11 +2,12 @@ TMPSIG=$(mktemp) TMPLNK=$(mktemp) +TMPSIG2=$(mktemp) cd /home/rpmbuild/site/rpms #for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64} -for dep in fedora/{22,23,24,25}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64} +for dep in fedora/{22,23,24,25,26}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64} do arch=${dep##*/} @@ -27,12 +28,26 @@ done find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG -if [ -s $TMPSIG ] -then echo "À signer:"; sort < $TMPSIG - echo "== Signature des $(cat $TMPSIG | wc -l) nouveaux RPM ==" - if rpmsign --addsign $(cat $TMPSIG) - then echo done. - else exit 1 +if [ -s $TMPSIG ]; then + echo "À signer:"; sort < $TMPSIG + + grep fc26 $TMPSIG > $TMPSIG2 + grep src.rpm $TMPSIG >> $TMPSIG2 + if [ -s $TMPSIG2 ]; then + echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (new) ==" + if rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2) + then echo done. + else exit 1 + fi + fi + + grep -v fc26 $TMPSIG | grep -v src.rpm > $TMPSIG2 + if [ -s $TMPSIG2 ]; then + echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (old) ==" + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG2) + then echo done. + else exit 1 + fi fi else echo "Rien à signer." fi @@ -51,7 +66,7 @@ else echo "Rien à lier." fi #for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64} -for dep in SRPMS fedora/{22,23,24,25}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64} +for dep in SRPMS fedora/{22,23,24,25,26}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64} do if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ] then echo "== Actualisation de $dep ==" @@ -2,20 +2,11 @@ #set -x TMP=/tmp/liste.$(basename $PWD) -if [ ${1:-check} != nocheck ]; then - echo "+ Controle des signatures" - rpm -K *.rpm | grep -v 'gpg OK' | cut -d: -f1 | tee $TMP - if [ -s $TMP ] - then rpmsign --addsign $(cat $TMP) - else echo OK. - fi -fi - nom=${PWD#/home/rpmbuild/site/rpms/} if [ "$nom" = "SRPMS" ] then dis=fedora - ver=17 + ver=26 old=5 else dis=${nom%%/*} @@ -24,6 +15,19 @@ else old=2 fi +if [ ${1:-check} != nocheck ]; then + echo "+ Controle des signatures" + rpm -K *.rpm | grep -v 'gpg OK' | cut -d: -f1 | tee $TMP + if [ -s $TMP ] + then + if [ $dis == fedora -a $ver -ge 26 ] + then rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP) + else rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMP) + fi + else echo OK. + fi +fi + echo "+ Nettoyage des anciens ($old)" dnf repomanage --old --keep=$old . | tee $TMP diff --git a/mock/fc26i.cfg b/mock/fc26i.cfg new file mode 100644 index 0000000..5affcc6 --- /dev/null +++ b/mock/fc26i.cfg @@ -0,0 +1,120 @@ +config_opts['root'] = 'fc26i' +config_opts['target_arch'] = 'i686' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc26' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '26' +config_opts['package_manager'] = 'dnf' + +config_opts['plugin_conf']['ccache_enable'] = True +config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G' +config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc26i/" + +config_opts['basedir'] = '/dev/shm/' +config_opts['resultdir'] = "/var/lib/mock/fc26i" +config_opts['cleanup_on_success'] = True +config_opts['cleanup_on_failure'] = False + +config_opts['createrepo_on_rpms'] = True +config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm' + +config_opts['macros']['%_topdir']="/builddir/build" +config_opts['macros']['%_smp_mflags']="-j6" +config_opts['macros']['%vendor']="Remi Collet" +config_opts['macros']['%packager']="https://blog.remirepo.net/" +config_opts['macros']['%bugurl']="https://forum.remirepo.net/" +config_opts['macros']['%dist']=".fc26.remi" +config_opts['macros']['%fedora']="26" +config_opts['macros']['%_with_ibase']="1" +config_opts['macros']['%_with_oci8']="1" +config_opts['macros']['%runselftest']="1" + + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +metadata_expire=80000 +fastestmirror=1 +max_parallel_downloads=6 + +# repos + +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority +metadata_expire=800000 +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-26&arch=i386 +#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/26/Everything/i386/os/ +# http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/26/Everything/i386/os/ + +[updates-released] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f26&arch=i386 +#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/26/i386/ +# http://mirrors.ircam.fr/pub/fedora/linux/updates/26/i386/ +# http://fr2.rpmfind.net/linux/fedora/updates/26/i386/ +enabled=1 + +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f26&arch=i386 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/26/i386 +enabled=1 + +[remi] +name=remi public +baseurl=file:/home/rpmbuild/site/rpms/fedora/26/remi/i386/ +enabled=1 +metadata_expire=1 + +[remi-priv] +name=remi prive +baseurl=file:/home/rpmbuild/site/rpms/priv/i386/ +enabled=1 +metadata_expire=1 + +[remi-test] +name=remi test +baseurl=file:/home/rpmbuild/site/rpms/fedora/26/test/i386/ +enabled=0 + +[rpmfusion-free] +name=rpmfusion-free +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-26&arch=i386 +enabled=0 + +[rpmfusion-free-updates] +name=rpmfusion-free +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-26&arch=i386 +enabled=0 + +[rpmfusion-nonfree] +name=rpmfusion-nonfree +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-26&arch=i386 +enabled=0 + +[rpmfusion-nonfree-updates] +name=rpmfusion-nonfree +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-26&arch=i386 +enabled=0 + +[result-fc26i] +name=resultfc26i +baseurl=file:/var/lib/mock/fc26i/ +enabled=1 +metadata_expire=1 + +""" + diff --git a/mock/fc26x.cfg b/mock/fc26x.cfg new file mode 100644 index 0000000..1a6889a --- /dev/null +++ b/mock/fc26x.cfg @@ -0,0 +1,125 @@ +config_opts['root'] = 'fc26x' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc26' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '26' +config_opts['package_manager'] = 'dnf' + +config_opts['plugin_conf']['ccache_enable'] = True +config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G' +config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc26x/" + +config_opts['basedir'] = '/dev/shm/' +config_opts['resultdir'] = "/var/lib/mock/fc26x" +config_opts['cleanup_on_success'] = True +config_opts['cleanup_on_failure'] = False + +config_opts['createrepo_on_rpms'] = True +config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm' + +config_opts['macros']['%_topdir']="/builddir/build" +config_opts['macros']['%_smp_mflags']="-j6" +config_opts['macros']['%vendor']="Remi Collet" +config_opts['macros']['%packager']="https://blog.remirepo.net/" +config_opts['macros']['%bugurl']="https://forum.remirepo.net/" +config_opts['macros']['%dist']=".fc26.remi" +config_opts['macros']['%fedora']="26" +config_opts['macros']['%_with_ibase']="1" +config_opts['macros']['%_with_oci8']="1" +config_opts['macros']['%runselftest']="1" + + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +metadata_expire=80000 +fastestmirror=1 +max_parallel_downloads=6 + +# repos + +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority +metadata_expire=800000 +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-26&arch=x86_64 +#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/26/Everything/x86_64/os/ +# http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/26/Everything/x86_64/os/ + +[updates-released] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f26&arch=x86_64 +#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/ +# http://mirrors.ircam.fr/pub/fedora/linux/updates/26/x86_64/ +# http://fr2.rpmfind.net/linux/fedora/updates/26/x86_64/ +enabled=1 + +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f26&arch=x86_64 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/26/x86_64/ +enabled=0 + +[remi] +name=remi public +baseurl=file:/home/rpmbuild/site/rpms/fedora/26/remi/x86_64/ +enabled=1 +metadata_expire=1 + +[remi-priv] +name=remi prive +baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/ +enabled=1 +metadata_expire=1 + +[remi-test] +name=remi test +baseurl=file:/home/rpmbuild/site/rpms/fedora/26/test/x86_64/ +enabled=0 + +[remi-dev] +name=remi dev +baseurl=file:/home/rpmbuild/site/rpms/fedora/26/devs/x86_64/ +enabled=0 + +[rpmfusion-free] +name=rpmfusion-free +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-26&arch=x86_64 +enabled=0 + +[rpmfusion-free-updates] +name=rpmfusion-free +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-26&arch=x86_64 +enabled=0 + +[rpmfusion-nonfree] +name=rpmfusion-nonfree +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-26&arch=x86_64 +enabled=0 + +[rpmfusion-nonfree-updates] +name=rpmfusion-nonfree +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-26&arch=x86_64 +enabled=0 + +[resultfc26x] +name=resultfc26x +baseurl=file:/var/lib/mock/fc26x/ +metadata_expire=1 +enabled=1 + +""" + |