From f80426677b9e1409576320fd95354d5facdcca6c Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Thu, 17 May 2012 04:01:34 -0400 Subject: [PATCH] maint: added deb-libtar target to all Ubuntu bm builds Ubuntu has FORTIFY_SOURCE checks, at least in Ubuntu 12.04, and its libtar is not yet upgraded to the latest libtar release. So we need to support it ourselves. --- maintainer/bmchroots | 8 ++++---- maintainer/bmremote | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/maintainer/bmchroots b/maintainer/bmchroots index ce139cb0..a1c78071 100644 --- a/maintainer/bmchroots +++ b/maintainer/bmchroots @@ -47,15 +47,15 @@ function do_fedora() { } do_ubuntu ubuntu1004 "$BMBUILDDIR/dists/ubuntu1004/main/binary-i386" "" \ - "make -j2 debian-all" + "make -j2 debian-all deb-libtar" # Ubuntu 11.04 (Natty) is also good for Mint 11 do_ubuntu ubuntu1104 "$BMBUILDDIR/dists/ubuntu1104/main/binary-i386" "" \ - "make -j2 debian-all" + "make -j2 debian-all deb-libtar" # Ubuntu 11.10 (Oneiric) should also be good for Mint 12 do_ubuntu ubuntu1110 "$BMBUILDDIR/dists/ubuntu1110/main/binary-i386" "" \ - "make -j2 debian-all deb-evo3-latest" + "make -j2 debian-all deb-evo3-latest deb-libtar" do_ubuntu ubuntu1204 "$BMBUILDDIR/dists/ubuntu1204/main/binary-i386" "" \ - "make -j2 debian-all deb-evo3-latest" + "make -j2 debian-all deb-evo3-latest deb-libtar" # Fedora and openSUSE use make 3.82, which is buggy and doesn't handle # parallel builds safely all cases. So we can't use any -j options here. diff --git a/maintainer/bmremote b/maintainer/bmremote index 2a66e062..2f2d35c4 100644 --- a/maintainer/bmremote +++ b/maintainer/bmremote @@ -72,15 +72,15 @@ function do_fedora() { } do_ubuntu ubuntu1004 "$BMBUILDDIR/dists/ubuntu1004/main/binary-amd64" "" \ - "make -j16 debian-all" + "make -j16 debian-all deb-libtar" # Ubuntu 11.04 (Natty) is also good for Mint 11 do_ubuntu ubuntu1104 "$BMBUILDDIR/dists/ubuntu1104/main/binary-amd64" "" \ - "make -j16 debian-all" + "make -j16 debian-all deb-libtar" # Ubuntu 11.10 (Oneric) should also be good for Mint 12 do_ubuntu ubuntu1110 "$BMBUILDDIR/dists/ubuntu1110/main/binary-amd64" "" \ - "make -j16 debian-all deb-evo3-latest" + "make -j16 debian-all deb-evo3-latest deb-libtar" do_ubuntu ubuntu1204 "$BMBUILDDIR/dists/ubuntu1204/main/binary-amd64" "" \ - "make -j16 debian-all deb-evo3-latest" + "make -j16 debian-all deb-evo3-latest deb-libtar" do_debian # Fedora and openSUSE use make 3.82, which is buggy and doesn't handle -- 2.11.4.GIT