Updates, new system - Fedora 16.

diff --git a/fed-16-x86_64.cfg.template b/fed-16-x86_64.cfg.template
new file mode 100644 (file)
index 0000000..9489020
--- /dev/null
+++ b/fed-16-x86_64.cfg.template
@@ -0,0 +1,47 @@
+config_opts['root'] = 'fed-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['macros']['%__arch_install_post'] = '%{nil}'
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+reposdir=/dev/null
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+
+# repos
+
+[fedora]
+name=Fedora 16 - $basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-16&arch=$basearch
+
+[update]
+name=Fedora 16 - $basearch - Updates
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f16&arch=$basearch
+
+[EGI-trustanchors]
+name=EGI-trustanchors
+baseurl=http://repository.egi.eu/sw/production/cas/1/current/
+gpgkey=http://repository.egi.eu/sw/production/cas/1/GPG-KEY-EUGridPMA-RPM-3
+
+[EMI-2-third-party]
+name=EMI 2 Third-Party Repository
+baseurl=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/sl6/$basearch/third-party
+gpgkey=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/RPM-GPG-KEY-emi
+protect=1
+enabled=1
+
+[main]
+[local]
+name=Local
+baseurl=file://@PWD@/@REPO@
+"""

diff --git a/mock.sh b/mock.sh
index 0db44fd..74bfd7b 100755 (executable)
--- a/mock.sh
+++ b/mock.sh
@@ -1,6 +1,27 @@
 #! /bin/bash -e
 
-CONF=sl-5-x86_64
+OS=`cat /etc/issue | head -n 1`
+ARCH=`uname -i`
+
+case $OS in
+Debian*)
+       CONF=pbuilder
+       ;;
+Scientific*5)
+       CONF=sl-5-$ARCH
+       ;;
+Scientific*6)
+       CONF=sl-6-$ARCH
+       ;;
+Fedora*16*)
+       CONF=fed-16-$ARCH
+       ;;
+*)
+       echo "Unknown OS '$OS'"
+       exit 1
+       ;;
+esac
+#CONF=sl-5-x86_64
 #CONF=sl-5-i386
 #CONF=sl-6-x86_64
 
@@ -12,9 +33,11 @@ if ! test -d mock; then
        ln -s /etc/mock/logging.ini mock/
        touch mock/site-defaults.cfg
 fi
-test -s mock/$CONF.cfg || sed "s,@PWD@,`pwd`," `dirname $0`/$CONF.cfg.template > mock/$CONF.cfg
+if test ! -s mock/$CONF.cfg -o `dirname $0`/$CONF.cfg.template -nt mock/$CONF.cfg; then
+       sed -e "s,@PWD@,`pwd`," -e "s,@REPO@,results," `dirname $0`/$CONF.cfg.template > mock/$CONF.cfg
+fi
 
-mkdir $REPORTS  2>/dev/null || :
+mkdir -p $REPORTS  2>/dev/null || :
 createrepo results
 
 build() {
@@ -41,8 +64,14 @@ build() {
 
 
 package() {
-       local file=`find $1/dist -maxdepth 1 -type f -name $2-\*.src.rpm | head -n 1`
-       build $file
+       local file
+
+       if test -d $1/dist; then
+               file=`find $1/dist -maxdepth 1 -type f -name $2-\*.src.rpm | head -n 1`
+               build $file
+       else
+               echo "==== Skipping $1 ===="
+       fi
 }
 
 

diff --git a/sl-5-i386.cfg.template b/sl-5-i386.cfg.template
index 90ad4ac..31f8e1c 100644 (file)
--- a/sl-5-i386.cfg.template
+++ b/sl-5-i386.cfg.template
@@ -51,5 +51,5 @@ enabled=1
 [main]
 [local]
 name=Local
-baseurl=file://@PWD@/repo
+baseurl=file://@PWD@/@REPO@
 """

diff --git a/sl-5-x86_64.cfg.template b/sl-5-x86_64.cfg.template
index e11ec9d..076b95e 100644 (file)
--- a/sl-5-x86_64.cfg.template
+++ b/sl-5-x86_64.cfg.template
@@ -51,5 +51,5 @@ enabled=1
 [main]
 [local]
 name=Local
-baseurl=file://@PWD@/repo
+baseurl=file://@PWD@/@REPO@
 """

diff --git a/sl-6-x86_64.cfg.template b/sl-6-x86_64.cfg.template
index c589848..9c36565 100644 (file)
--- a/sl-6-x86_64.cfg.template
+++ b/sl-6-x86_64.cfg.template
@@ -51,5 +51,5 @@ enabled=1
 [main]
 [local]
 name=Local
-baseurl=file://@PWD@/repo
+baseurl=file://@PWD@/@REPO@
 """