denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Update base image to Debian jessie

Browse Source 
Several packages got renamed/updated, libgcrypt was apparently installed
by default previously.

Since most libraries changed we have to completely rebuild all the tools
installed in the root image.  We currently don't provide a clean target in
the recipes, and even if we did we'd have to track which base image we
last built for.  It's easier to just use a different build directory for
each base image, at the cost of some additional disk space (if not manually
cleaned).  However, that's also the case when updating kernel or
software versions.
This commit is contained in:
Tobias Brunner
2016-06-15 17:58:24 +02:00
parent 0889628957
commit 257e5db0d0
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-baseimage
+17 -6
View File
@@ -12,16 +12,27 @@ running_any $STRONGSWANHOSTS && die "Please stop test environment before running
check_commands debootstrap mkfs.ext3 partprobe qemu-img qemu-nbd sfdisk
# package includes/excludes
INC=automake,autoconf,libtool,bison,flex,gperf,pkg-config,gettext
INC=automake,autoconf,libtool,bison,flex,gperf,pkg-config,gettext,less
INC=$INC,build-essential,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,ethtool
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,iperf
INC=$INC,less,acpid,acpi-support-base,libldns-dev,libunbound-dev,dnsutils,screen
INC=$INC,gnat,gprbuild,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev,htop
INC=$INC,libalog0.4.1-base-dev,hostapd,libsoup2.4-dev,ca-certificates,unzip
INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libltdl-dev,liblog4cxx10-dev
INC=$INC,libboost-thread-dev,libboost-system-dev,git-core,iperf,htop,screen
INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev
INC=$INC,dnsutils,hostapd,libsoup2.4-dev,ca-certificates,unzip
INC=$INC,python,python-setuptools,python-dev,python-pip
INC=$INC,libjson0-dev,libxslt1-dev,libapache2-mod-wsgi,iptables-dev
case "$BASEIMGSUITE" in
wheezy)
INC=$INC,libxerces-c2-dev,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev
INC=$INC,libalog0.4.1-base-dev
;;
jessie)
INC=$INC,libxerces-c-dev,libahven4-dev,libxmlada5-dev,libgmpada5-dev
INC=$INC,libalog1-dev,libgcrypt20-dev
;;
*)
echo_warn "Package list for '$BASEIMGSUITE' might has to be updated"
esac
SERVICES="apache2 dbus isc-dhcp-server slapd bind9"
INC=$INC,${SERVICES// /,}
testing/scripts/function.sh
+8
View File
@@ -17,6 +17,7 @@
export TERM=xterm
RED=$(tput setaf 1)
GREEN=$(tput setaf 2)
YELLOW=$(tput setaf 3)
NORMAL=$(tput op)
# exit with given error message
@@ -66,6 +67,13 @@ echo_failed()
echo -e "${RED}$1${NORMAL}"
}
# write yellow status message to console
# $1 - msg
echo_warn()
{
echo -e "${YELLOW}$1${NORMAL}"
}
# log an action
# $1 - current action description
log_action()
testing/testing.conf
+5 -4
View File
@@ -35,8 +35,6 @@ fi
# Build directory where the guest kernel and images will be built
: ${BUILDDIR=$TESTDIR/build}
# Directory shared between host and guests
: ${SHAREDDIR=$BUILDDIR/shared}
# Logfile
: ${LOGFILE=$BUILDDIR/testing.log}
@@ -50,12 +48,15 @@ fi
# Base image settings
# The base image is a pristine OS installation created using debootstrap.
: ${BASEIMGSIZE=1400}
: ${BASEIMGSUITE=wheezy}
: ${BASEIMGSIZE=1600}
: ${BASEIMGSUITE=jessie}
: ${BASEIMGARCH=amd64}
: ${BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT}
: ${BASEIMGMIRROR=http://http.debian.net/debian}
# Directory shared between host and guests
: ${SHAREDDIR=$BUILDDIR/shared/$BASEIMGSUITE}
# Root image settings
# The root image is the origin of all guest images. It is a clone of the base
# image and contains additional test-specific software and patches.