[BACK]Return to build-strongswan CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / strongswan / testing / scripts

Diff for /embedaddon/strongswan/testing/scripts/build-strongswan between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2020/06/03 09:46:49 version 1.1.1.2, 2021/03/17 00:20:15
Line 4  DIR=$(dirname `readlink -f $0`) Line 4  DIR=$(dirname `readlink -f $0`)
 . $DIR/../testing.conf  . $DIR/../testing.conf
 . $DIR/function.sh  . $DIR/function.sh
   
 SWANDIR=${1:+$(readlink -f $1)}  
 : ${SWANDIR:=$(readlink -f $DIR/../..)}  
   
 [ `id -u` -eq 0 ] || die "You must be root to run $0"  [ `id -u` -eq 0 ] || die "You must be root to run $0"
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"  [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
 [ -f "$ROOTIMG" ] || die "Root image $ROOTIMG not found"  
 running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"  running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
   
 [ -f $SWANDIR/src/libstrongswan/asn1/oid.txt ] || die "strongSwan not found in $SWANDIR"  
   
 SRCUID=${SUDO_UID:-$(id -u)}  SRCUID=${SUDO_UID:-$(id -u)}
 SRCGID=${SUDO_GID:-$(id -g)}  SRCGID=${SUDO_GID:-$(id -g)}
   
check_commands partprobe qemu-img qemu-nbd bindfscheck_commands partprobe qemu-img qemu-nbd
   
 load_qemu_nbd  load_qemu_nbd
   
 mkdir -p $LOOPDIR  mkdir -p $LOOPDIR
 mkdir -p $IMGDIR  mkdir -p $IMGDIR
   
case "$2" inusage() {
 cat << EOF
 Usage:
   ${0##*/} [--all] [--guest NAME|--no-guests] [--replace] [--clean] [SRCDIR]
   ${0##*/} [--all] [--guest NAME|--no-guests] [--replace] [--tarball VERSION]
     --help            (-h)  show usage information
     --all             (-a)  build/install all software, not only strongSwan
     --clean           (-c)  use a new strongSwan build directory
     --guest NAME      (-g)  only install in a specific guest image
     --no-guests       (-n)  don't build any guest images after the root image
     --replace         (-r)  replace the root image (implies --all)
     --tarball         (-t)  build strongSwan from a release tarball
 EOF
 }
 
 ALL_RECIPES=
 CLEAN=
 GUEST=
 NO_GUESTS=
 REPLACE=
 TARBALL=
 
 while :; do
         case $1 in
         -h|--help)
                 usage
                 exit
                 ;;
         -a|--all)
                 ALL_RECIPES=1
                 ;;
         -c|--clean)
                 CLEAN=1
                 ;;
         -g|--guest)
                 if [ "$2" ]; then
                         GUEST=$2
                         shift
                 else
                         die "Guest name missing"
                 fi
                 ;;
         -n|--no-guests)
                 NO_GUESTS=1
                 ;;
         -r|--replace)
                 REPLACE=1
                 ;;
         -t|--tarball)
                 if [ "$2" ]; then
                         TARBALL=$2
                         shift
                 else
                         die "Release version missing"
                 fi
                 ;;
         *)
                 break
         esac
 
         shift
 done
 
 SWANDIR=
 
 if [ -z "$TARBALL" ]; then
         check_commands bindfs
 
         SWANDIR=${1:+$(readlink -f $1)}
         : ${SWANDIR:=$(readlink -f $DIR/../..)}
 
         [ -f $SWANDIR/src/libstrongswan/asn1/oid.txt ] || die "strongSwan not found in $SWANDIR"
 fi
 
 case "$GUEST" in
 "")  "")
           if [ ! -f "$ROOTIMG" -o "$REPLACE" ]; then
                   log_action "Creating root image $ROOTIMG"
                   execute "qemu-img create -b $BASEIMG -f $IMGEXT -F $IMGEXT $ROOTIMG"
                   ALL_RECIPES=1
           fi
         log_action "Connecting root image to NBD device $NBDEV"          log_action "Connecting root image to NBD device $NBDEV"
           [ -f "$ROOTIMG" ] || die "Root image $ROOTIMG not found"
         execute "qemu-nbd -c $NBDEV $ROOTIMG"          execute "qemu-nbd -c $NBDEV $ROOTIMG"
         ;;          ;;
 *)  *)
        echo $STRONGSWANHOSTS | grep -q "\b$2\b" || die "Guest $2 not found"        echo $STRONGSWANHOSTS | grep -q "\b$GUEST\b" || die "Guest $GUEST not found"
        GUESTIMG="$IMGDIR/$2.$IMGEXT"        GUESTIMG="$IMGDIR/$GUEST.$IMGEXT"
         [ -f "$GUESTIMG" ] || die "Guest image $GUESTIMG not found"          [ -f "$GUESTIMG" ] || die "Guest image $GUESTIMG not found"
         log_action "Connecting guest image to NBD device $NBDEV"          log_action "Connecting guest image to NBD device $NBDEV"
         execute "qemu-nbd -c $NBDEV $GUESTIMG"          execute "qemu-nbd -c $NBDEV $GUESTIMG"
Line 54  log_action "Mounting $SHAREDDIR as /root/shared" Line 128  log_action "Mounting $SHAREDDIR as /root/shared"
 execute "mount -o bind $SHAREDDIR $LOOPDIR/root/shared"  execute "mount -o bind $SHAREDDIR $LOOPDIR/root/shared"
 do_on_exit umount $LOOPDIR/root/shared  do_on_exit umount $LOOPDIR/root/shared
   
 mkdir -p $LOOPDIR/root/strongswan  
 log_action "Mounting $SWANDIR as /root/strongswan"  
 execute "bindfs -u $SRCUID -g $SRCGID --create-for-user=$SRCUID --create-for-group=$SRCGID $SWANDIR $LOOPDIR/root/strongswan"  
 do_on_exit umount $LOOPDIR/root/strongswan  
   
 log_action "Copy /etc/resolv.conf"  log_action "Copy /etc/resolv.conf"
 execute "cp /etc/resolv.conf $LOOPDIR/etc/resolv.conf"  execute "cp /etc/resolv.conf $LOOPDIR/etc/resolv.conf"
 do_on_exit rm $LOOPDIR/etc/resolv.conf  do_on_exit rm $LOOPDIR/etc/resolv.conf
   
log_action "Remove SWID tags of previous versions"log_action "Remove SWID tags of previous strongSwan versions"
 execute_chroot "find /usr/local/share -path '*strongswan*' -name *.swidtag -delete"  execute_chroot "find /usr/local/share -path '*strongswan*' -name *.swidtag -delete"
   
echo "Building and installing strongSwan"if [ -z "$TARBALL" ]; then
         mkdir -p $LOOPDIR/root/strongswan
         log_action "Mounting $SWANDIR as /root/strongswan"
         execute "bindfs -u $SRCUID -g $SRCGID --create-for-user=$SRCUID --create-for-group=$SRCGID $SWANDIR $LOOPDIR/root/strongswan"
         do_on_exit umount $LOOPDIR/root/strongswan
   
log_action "Determine strongSwan version"        log_action "Determine strongSwan version"
desc=`git -C $SWANDIR describe --dirty`        desc=`git -C $SWANDIR describe --dirty`
if [ $? -eq 0 ]; then        if [ $? -eq 0 ]; then
        SWANVERSION="$desc (`git -C $SWANDIR rev-parse --abbrev-ref HEAD`)"                version="$desc (`git -C $SWANDIR rev-parse --abbrev-ref HEAD`)"
else        else
        SWANVERSION="`cat $SWANDIR/configure.ac | sed -n '/^AC_INIT/{ s/.*,\[\(.*\)\])$/\1/p }'`"                version="`cat $SWANDIR/configure.ac | sed -n '/^AC_INIT/{ s/.*,\[\(.*\)\])$/\1/p }'`"
         fi
         echo "$version" > $SHAREDDIR/.strongswan-version
         log_status 0
 
         log_action "Preparing source tree"
         execute_chroot 'autoreconf -i /root/strongswan'
 fi  fi
 echo "$SWANVERSION" > $SHAREDDIR/.strongswan-version  
 log_status 0  
   
 log_action "Preparing source tree"  
 execute_chroot 'autoreconf -i /root/strongswan'  
   
 RECPDIR=$DIR/recipes  RECPDIR=$DIR/recipes
RECIPE=`ls $RECPDIR/*strongswan.mk | xargs -n1 basename`if [ "$ALL_RECIPES" ]; then
         echo "Building and installing strongSwan and all other software"
         if [ -d "$RECPDIR/patches" ]
         then
                 execute "cp -r $RECPDIR/patches $LOOPDIR/root/shared/compile" 0
         fi
         RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename`
 else
         echo "Building and installing strongSwan"
         RECIPES=`ls $RECPDIR/*strongswan.mk | xargs -n1 basename`
 fi
 
 if [ "$CLEAN" ]; then
         rm -rf $SHAREDDIR/build-strongswan
 fi
 mkdir -p $SHAREDDIR/build-strongswan  mkdir -p $SHAREDDIR/build-strongswan
cp $RECPDIR/$RECIPE $SHAREDDIR/build-strongswanmkdir -p $SHAREDDIR/compile
log_action "Installing from recipe $RECIPE" 
execute_chroot "make SRCDIR=/root/strongswan BUILDDIR=/root/shared/build-strongswan -f /root/shared/build-strongswan/$RECIPE" 
   
   for r in $RECIPES
   do
           log_action "Installing from recipe $r"
           if [[ $r == *strongswan.mk && -z "$TARBALL" ]]; then
                   cp $RECPDIR/$r $SHAREDDIR/build-strongswan
                   execute_chroot "make SRCDIR=/root/strongswan BUILDDIR=/root/shared/build-strongswan -f /root/shared/build-strongswan/$r"
           else
                   cp $RECPDIR/$r ${LOOPDIR}/root/shared/compile
                   execute_chroot "make SWANVERSION=$TARBALL -C /root/shared/compile -f $r"
           fi
   done
   
 # rebuild the guest images after we modified the root image  # rebuild the guest images after we modified the root image
if [ -z "$2" ]; thenif [ -z "$GUEST" -a -z "$NO_GUESTS" ]; then
         # cleanup before mounting guest images          # cleanup before mounting guest images
         on_exit          on_exit
         # building the guest images without certificates fails on winnetou          # building the guest images without certificates fails on winnetou
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>