diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-09 18:40:02 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:55 +0100 |
| commit | 345dba0de42450627ca0e643f30ab6330964bc3a (patch) | |
| tree | 176984ebdc4c9c52eb2879cdb8ae293ddb0df981 /testing/scripts | |
| parent | 74c0839ad6e0da6f299b65ed39fe2f21fa19caf9 (diff) | |
| download | strongswan-345dba0de42450627ca0e643f30ab6330964bc3a.tar.bz2 strongswan-345dba0de42450627ca0e643f30ab6330964bc3a.tar.xz | |
Exclude iptables from debootstrap
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-baseimage | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index a555d2cb6..915d1102a 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -8,10 +8,14 @@ echo "Building base image" check_commands debootstrap mkfs.ext3 partprobe qemu-img qemu-nbd sfdisk -# additional packages -EXTRAS=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core +# package includes/excludes +INC=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev +INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc +INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev +INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core SERVICES="isc-dhcp-server apache2 slapd" -PACKAGES=$EXTRAS,${SERVICES// /,} +INC=$INC,${SERVICES// /,} +EXC=iptables CACHEDIR=$BUILDDIR/cache APTCACHE=$LOOPDIR/var/cache/apt/archives @@ -58,7 +62,7 @@ execute "mount -o bind $CACHEDIR $APTCACHE" do_on_exit graceful_umount $APTCACHE log_action "Running debootstrap ($ROOTFSSUITE, $ROOTFSARCH)" -execute "debootstrap --arch=$ROOTFSARCH --include=$PACKAGES $ROOTFSSUITE $LOOPDIR $ROOTFSMIRROR" +execute "debootstrap --arch=$ROOTFSARCH --include=$INC --exclude $EXC $ROOTFSSUITE $LOOPDIR $ROOTFSMIRROR" for service in $SERVICES do |