Commit bf59f7b7 authored by Elijah Grubb's avatar Elijah Grubb

Included more patches necessary to build the emulab clientside

parent e3a2fb83
......@@ -18,7 +18,8 @@ apk update
apk add git ca-certificates tcsh@testing \
gcc make libc-dev byacc libtool openssl-dev 'g++' \
sudo python python-dev libpcap-dev boost-dev wget patch flex
sudo python python-dev libpcap-dev boost-dev wget patch flex \
bsd-compat-headers libtirpc-dev
ln -s /bin/tcsh /bin/csh
......@@ -26,19 +27,21 @@ if [ -z "$EMULABTMPSRC" ]; then
echo "WARNING: missing EMULABSRC environment variable pointer to src; cloning!"
export EMULABSRC=/tmp/emulab-devel
cd /tmp
git clone https://gitlab.flux.utah.edu/emulab/emulab-devel $EMULABSRC
git clone https://gitlab.flux.utah.edu/emulab/emulab-devel.git $EMULABSRC
cd $EMULABSRC
cp $DIRNAME/alpine3/noimagezip.patch .
git apply noimagezip.patch
cp $DIRNAME/alpine3/iperf-alpine.patch .
git apply iperf-alpine.patch
cp $DIRNAME/alpine3/delay-agent.patch .
git apply delay-agent.patch
[ ! $? -eq 0 ] && exit 1
fi
if [ -z "$PUBSUBSRC" ]; then
echo "WARNING: missing PUBSUBSRC environment variable pointer to src; cloning!"
export PUBSUBSRC=/tmp/pubsub
cd /tmp
git clone https://gitlab.flux.utah.edu/emulab/pubsub $PUBSUBSRC
git clone https://gitlab.flux.utah.edu/emulab/pubsub.git $PUBSUBSRC
[ ! $? -eq 0 ] && exit 1
fi
......
diff --git a/clientside/event/delay-agent/main.h b/clientside/event/delay-agent/main.h
index 0929a31ff..2affb40cc 100644
--- a/clientside/event/delay-agent/main.h
+++ b/clientside/event/delay-agent/main.h
@@ -36,7 +36,6 @@
/* for setsockopt and stuff */
#include <sys/param.h>
#include <sys/socket.h>
-#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/wait.h>
#ifndef linux
diff --git a/clientside/tmcc/findif.c b/clientside/tmcc/findif.c
index 4e3ac4280..91b422f77 100644
--- a/clientside/tmcc/findif.c
+++ b/clientside/tmcc/findif.c
@@ -71,7 +71,6 @@
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/sysctl.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <net/ethernet.h>
diff --git a/clientside/os/GNUmakefile.in b/clientside/os/GNUmakefile.in
index a20822e85..f6dab3d2c 100644
index a20822e85..e8819376e 100644
--- a/clientside/os/GNUmakefile.in
+++ b/clientside/os/GNUmakefile.in
@@ -42,6 +42,13 @@ ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
......@@ -9,10 +9,23 @@ index a20822e85..f6dab3d2c 100644
+ifeq ($(SYSTEM),Linux)
+OSTAG=$(shell $(SRCDIR)/../tmcc/osstuff.sh -t)
+ifeq ($(OSTAG),alpine)
+SUBDIRS := $(filter-out capture imagezip frisbee.redux,$(SUBDIRS))
+SUBDIRS := $(filter-out imagezip frisbee.redux capture,$(SUBDIRS))
+endif
+endif
+
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
@@ -72,10 +79,12 @@ client-install: client
$(MAKE) -C syncd client-install
$(MAKE) -C dijkstra client-install
ifneq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) # Filter out again...
+ifneq ($(OSTAG),alpine)
$(MAKE) -C imagezip client-install
$(MAKE) -C frisbee.redux client-install
$(MAKE) -C capture client-install
endif
+endif
$(MAKE) -C genhostsfile client-install
ifeq ($(SYSTEM),FreeBSD)
$(MAKE) -C growdisk client-install
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment