diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-04-16 21:23:46 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-04-16 21:23:46 +0200 |
| commit | c6fb09460fbff4ee9185cc57cbbb355e6882f405 (patch) | |
| tree | ec54e69e7840ca0549d32507d811ddfde42519bf | |
| parent | 6c9a814bac7296a224002c88c478ce1c2d83ca67 (diff) | |
| download | jenkins.debian.net-c6fb09460fbff4ee9185cc57cbbb355e6882f405.tar.xz | |
dvswitch_against_libav: make install libav from upstream source
| -rwxr-xr-x | bin/chroot-run.sh | 2 | ||||
| -rw-r--r-- | job-cfg/dvswitch.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh index 3f3793b1..b5a23e10 100755 --- a/bin/chroot-run.sh +++ b/bin/chroot-run.sh @@ -97,7 +97,7 @@ if [ -f debian/control ] ; then cat debian/control # install build-depends echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/23jenkins - apt-get install build-essential devscripts + apt-get install build-essential devscripts git mk-build-deps -ir rm /etc/apt/apt.conf.d/23jenkins fi diff --git a/job-cfg/dvswitch.yaml b/job-cfg/dvswitch.yaml index 7a28c0fd..1f998282 100644 --- a/job-cfg/dvswitch.yaml +++ b/job-cfg/dvswitch.yaml @@ -87,5 +87,5 @@ - '{name}_against_libav_git': my_distro: 'sid' - my_shell: 'debian/rules build ; cd .. ; dpkg -i -O *.deb ; 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 ; ./debian/rules build' my_description: 'Build the dvswitch git master branch on sid.' |