diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-06-10 22:54:49 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-10 22:54:49 +0200 |
| commit | 904d13d886c317ff6e6ffb3df73cc76445bedbca (patch) | |
| tree | bf18fc8fc9b93794481cc80eaa1e48b4298dd3ba | |
| parent | 51d6c1a9c9178e7489829dd3201e60ddbc1624bf (diff) | |
| download | jenkins.debian.net-904d13d886c317ff6e6ffb3df73cc76445bedbca.tar.xz | |
reproducible fedora: use mock 1.2.3-2~bpo8+1 to build RPMs
| -rwxr-xr-x | update_jdn.sh | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/update_jdn.sh b/update_jdn.sh index 122bdf5c..5317b178 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -227,7 +227,6 @@ if [ -f /etc/debian_version ] ; then kgb-client m4 make - mock python3-yaml subversion sysvinit-core @@ -314,7 +313,6 @@ if [ -f /etc/debian_version ] ; then libvpx1 libxslt1-dev linux-image-amd64 - mock moreutils mr mtr-tiny @@ -367,6 +365,10 @@ if [ -f /etc/debian_version ] ; then sudo apt-get install -t jessie-backports \ pbuilder lintian || echo "this should only fail on the first install" # botch + # we need mock from bpo to build current fedora + if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then + sudo apt-get install -t jessie-backports mock + fi # for varying kernels # we use bpo kernels on pb-build5+6 (and i386 kernel on pb-build2-i386) if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ]; then @@ -385,19 +387,6 @@ if [ -f /etc/debian_version ] ; then fi # -# prepare mock to build rpms -# -if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then - if ! grep mock /etc/group ; then - # these 4 commands are obsolete with mock 1.2.3-1 (=stretch) - sudo groupadd --system mock - sudo usermod -a -G mock jenkins - sudo chgrp mock /var/lib/mock/ /var/cache/mock/ - sudo chmod 2775 /var/lib/mock/ /var/cache/mock/ - fi -fi - -# # deploy package configuration in /etc and /usr/local/ # cd $BASEDIR |