knowing that the v* flavours will hopefully go down the sewer soon
12 files changed:
$(foreach module,$(ALL.modules),$(eval $(call target_extract_module,$(module))))
### the tests area
$(foreach module,$(ALL.modules),$(eval $(call target_extract_module,$(module))))
### the tests area
-# use this makefile to extract tests rather than extracting manually in vbuild-nightly
build-clean:
rm -rf MODULES/build
.PHONY: build-clean
build-clean:
rm -rf MODULES/build
.PHONY: build-clean
=====
* install a vserver-enabled kernel and util-vserver on your build box
* create a local fedora mirror - see vbuild-fedora-mirror.sh
=====
* install a vserver-enabled kernel and util-vserver on your build box
* create a local fedora mirror - see vbuild-fedora-mirror.sh
-* create a vserver - see vbuild-init-vserver.sh
-* enter the vserver and svn export this build module into /build
+* create a vserver - see vbuild-initvm.sh
+* enter the vserver and retrieve this build module into /build using git
* cd /build and run
# make stage1=true PLDISTRO=<yourdistro>
# make help
* cd /build and run
# make stage1=true PLDISTRO=<yourdistro>
# make help
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux64
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux64
-COMMAND_VBUILD="vbuild-init-lxc.sh"
-COMMAND_MYPLC="vtest-init-lxc.sh"
+COMMAND_LBUILD="lbuild-initvm.sh"
+COMMAND_LTEST="ltest-initvm.sh"
# for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper
# just mention 'none' as the repo url
# for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper
# just mention 'none' as the repo url
- if [ -n "$MYPLC_MODE" -a "$REPO_URL" != "none" ] ; then
+ if [ -n "$TEST_MODE" -a "$REPO_URL" != "none" ] ; then
if [ ! -d $rootfs_path/etc/yum.repos.d ] ; then
echo "WARNING : cannot create myplc repo"
else
if [ ! -d $rootfs_path/etc/yum.repos.d ] ; then
echo "WARNING : cannot create myplc repo"
else
pkg_method=$(package_method $fcdistro)
# check for .pkgs file based on pldistro
pkg_method=$(package_method $fcdistro)
# check for .pkgs file based on pldistro
- if [ -n "$VBUILD_MODE" ] ; then
+ if [ -n "$BUILD_MODE" ] ; then
pkgsname=devel.pkgs
else
pkgsname=vtest.pkgs
pkgsname=devel.pkgs
else
pkgsname=vtest.pkgs
}
function post_install () {
}
function post_install () {
- if [ -n "$VBUILD_MODE" ] ; then
- post_install_vbuild "$@"
+ if [ -n "$BUILD_MODE" ] ; then
+ post_install_build "$@"
else
post_install_myplc "$@"
fi
else
post_install_myplc "$@"
fi
cp /etc/localtime $rootfs_path/etc/localtime
}
cp /etc/localtime $rootfs_path/etc/localtime
}
-function post_install_vbuild () {
+function post_install_build () {
function usage () {
set +x
function usage () {
set +x
- echo "Usage: $COMMAND_VBUILD [options] lxc-name"
- echo "Usage: $COMMAND_MYPLC [options] lxc-name repo-url [ -- lxc-options ]"
+ echo "Usage: $COMMAND_LBUILD [options] lxc-name"
+ echo "Usage: $COMMAND_LTEST [options] lxc-name repo-url [ -- lxc-options ]"
echo "Description:"
echo " This command creates a fresh lxc instance, for building, or running, myplc"
echo "Supported options"
echo "Description:"
echo " This command creates a fresh lxc instance, for building, or running, myplc"
echo "Supported options"
echo " --netdev : interface to be defined inside lxc"
echo " --interface : IP to be defined for the lxc"
echo " --hostname : Hostname to be defined for the lxc"
echo " --netdev : interface to be defined inside lxc"
echo " --interface : IP to be defined for the lxc"
echo " --hostname : Hostname to be defined for the lxc"
- echo "With $COMMAND_MYPLC you can give 'none' as the URL, in which case"
+ echo "With $COMMAND_LTEST you can give 'none' as the URL, in which case"
echo " myplc.repo does not get created"
exit 1
}
echo " myplc.repo does not get created"
exit 1
}
#trap failure ERR INT
case "$COMMAND" in
#trap failure ERR INT
case "$COMMAND" in
- $COMMAND_VBUILD)
- VBUILD_MODE=true ;;
- $COMMAND_MYPLC)
- MYPLC_MODE=true;;
+ $COMMAND_LBUILD)
+ BUILD_MODE=true ;;
+ $COMMAND_LTEST)
+ TEST_MODE=true;;
# parse fixed arguments
[[ -z "$@" ]] && usage
lxc=$1 ; shift
# parse fixed arguments
[[ -z "$@" ]] && usage
lxc=$1 ; shift
- if [ -n "$MYPLC_MODE" ] ; then
+ if [ -n "$TEST_MODE" ] ; then
[[ -z "$@" ]] && usage
REPO_URL=$1 ; shift
fi
[[ -z "$@" ]] && usage
REPO_URL=$1 ; shift
fi
- if [ -n "$VBUILD_MODE" ] ; then
+ if [ -n "$BUILD_MODE" ] ; then
[ -z "$IFNAME" ] && IFNAME=$DEFAULT_IFNAME
[ -z "$HOSTNAME" ] && HOSTNAME=$lxc
fi
[ -z "$IFNAME" ] && IFNAME=$DEFAULT_IFNAME
[ -z "$HOSTNAME" ] && HOSTNAME=$lxc
fi
# need bridge installed
prepare_host
# need bridge installed
prepare_host
- if [ -n "$VBUILD_MODE" ] ; then
+ if [ -n "$BUILD_MODE" ] ; then
# Bridge IP affectation
x=$(echo $personality | cut -dx -f2)
# Bridge IP affectation
x=$(echo $personality | cut -dx -f2)
if test -z "$WEBLOG" ; then
WEBHOST=$(hostname)
WEBPATH=/tmp
if test -z "$WEBLOG" ; then
WEBHOST=$(hostname)
WEBPATH=/tmp
- WEBBASE=/tmp/vbuild-early-$(date +%Y-%m-%d)
- WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
+ WEBBASE=/tmp/lbuild-early-$(date +%Y-%m-%d)
+ WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
fi
webpublish mkdir -p $WEBBASE ||:
webpublish_cp_local_to_remote $LOG $WEBLOG ||:
fi
webpublish mkdir -p $WEBBASE ||:
webpublish_cp_local_to_remote $LOG $WEBLOG ||:
if test -z "$WEBLOG" ; then
WEBHOST=$(hostname)
WEBPATH=/tmp
if test -z "$WEBLOG" ; then
WEBHOST=$(hostname)
WEBPATH=/tmp
- WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
+ WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
fi
webpublish mkdir -p $WEBBASE
webpublish_cp_local_to_remote $LOG $WEBLOG
fi
webpublish mkdir -p $WEBBASE
webpublish_cp_local_to_remote $LOG $WEBLOG
# Create lxc vm
cd $tmpdir
# Create lxc vm
cd $tmpdir
- ./vbuild-init-lxc.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE}
+ ./lbuild-initvm.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE}
# cleanup
cd -
rm -rf $tmpdir
# cleanup
cd -
rm -rf $tmpdir
--- /dev/null
+lbuild-initvm.sh
\ No newline at end of file
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
lxc-userspace-GITPATH := git://git.planet-lab.org/lxc-userspace.git@master
transforward-GITPATH := git://git.planet-lab.org/transforward.git@transforward-0.1-4
procprotect-GITPATH := git://git.planet-lab.org/procprotect.git@master
lxc-userspace-GITPATH := git://git.planet-lab.org/lxc-userspace.git@master
transforward-GITPATH := git://git.planet-lab.org/transforward.git@transforward-0.1-4
procprotect-GITPATH := git://git.planet-lab.org/procprotect.git@master
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
linux-2.6-BRANCH := 32 # This line is not so defunct
linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@rhel6-mlab
mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
linux-2.6-BRANCH := 32 # This line is not so defunct
linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@rhel6-mlab
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
###
linux-2.6-BRANCH := 32
linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-36
###
linux-2.6-BRANCH := 32
linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-36
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
linux-2.6-BRANCH := 32
linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@32
mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
linux-2.6-BRANCH := 32
linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@32
DEFAULT_PERSONALITY=linux64
DEFAULT_IFNAME=eth0
DEFAULT_PERSONALITY=linux64
DEFAULT_IFNAME=eth0
-COMMAND_VBUILD="vbuild-init-vserver.sh"
-COMMAND_MYPLC="vtest-init-vserver.sh"
+COMMAND_VBUILD="vbuild-initvm.sh"
+COMMAND_MYPLC="vtest-initvm.sh"
function failure () {
echo "$COMMAND : Bailing out"
function failure () {
echo "$COMMAND : Bailing out"
+++ /dev/null
-vbuild-init-lxc.sh
\ No newline at end of file
+++ /dev/null
-vbuild-init-vserver.sh
\ No newline at end of file