diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-04-17 16:46:42 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-04-17 16:46:42 +0200 |
| commit | 535c9b0b5e07e9d62a840d703e3cbd940ccf9fb6 (patch) | |
| tree | 6afbd545929d21d5e2df5892c6a6536372be2f7b | |
| parent | 5576c102a2b0c0304eba3dda096af1946cfeba08 (diff) | |
| download | jenkins.debian.net-535c9b0b5e07e9d62a840d703e3cbd940ccf9fb6.tar.xz | |
dvswitch.yaml: also install build-depends from d/control as its in git
| -rwxr-xr-x | bin/chroot-run.sh | 1 | ||||
| -rw-r--r-- | job-cfg/dvswitch.yaml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh index 7145f5f8..ac84614c 100755 --- a/bin/chroot-run.sh +++ b/bin/chroot-run.sh @@ -100,7 +100,6 @@ if [ -f debian/control ] ; then echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/23jenkins apt-get install build-essential devscripts mk-build-deps -ir - rm /etc/apt/apt.conf.d/23jenkins fi $@ EOF diff --git a/job-cfg/dvswitch.yaml b/job-cfg/dvswitch.yaml index 17b99338..676be7bc 100644 --- a/job-cfg/dvswitch.yaml +++ b/job-cfg/dvswitch.yaml @@ -87,5 +87,5 @@ - '{name}_against_libav_git': my_distro: 'sid' - my_shell: '"apt-get -y build-dep dvswitch libav ; ./configure ; make ; make install ; cd .. ; git clone git://anonscm.debian.org/dvswitch/dvswitch.git ; cd dvswitch ; ./debian/rules build"' + my_shell: '"apt-get -y build-dep dvswitch libav ; ./configure ; make ; make install ; cd .. ; git clone git://anonscm.debian.org/dvswitch/dvswitch.git ; cd dvswitch ; mk-build-deps -ir ; ./debian/rules build"' my_description: 'Build the dvswitch git master branch on sid.' |