Commit c2570cfc authored by Mike Hibler's avatar Mike Hibler

The paint wasn't even dry on the last plab tarball before I have moved on...

Rev 20 of the tarball has no new function, it is just slimmed down.
I replaced our large statically linked binaries with dynamically linked ones.
Also found and stripped a couple of other binaries.

The resulting tarball goes from 5.7MB to 0.9MB.

The Makefile changes are to incorporate the NOSTATIC=1 environment hack
to enable building the dynamic binaries above.
parent 99d6dc71
......@@ -53,7 +53,7 @@ ARCHIVESUPPORT=1
OPSDBSUPPORT=1
PELABSUPPORT=1
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-19.tar.bz2"
PLAB_ROOTBALL="plabroot-20.tar.bz2"
#
# SSL Certificate stuff. Used to customize config files in ssl directory.
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -14,6 +14,13 @@ PROGRAMS = program-agent
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -30,9 +37,13 @@ LIBS += `$(ELVIN_CONFIG) --libs vin4c`
ifeq ($(host_cpu),arm)
else
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
ifeq ($(SYSTEM),Linux)
ifeq ($(NOSTATIC),)
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
else
NEEDKERB := 1
endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -17,6 +17,13 @@ endif
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -50,10 +57,14 @@ CPPC = g++
ifeq ($(host_cpu),arm)
else
LDFLAGS += -static
PLDFLAGS += -static
LDFLAGS += $(LDSTATIC)
PLDFLAGS += $(LDSTATIC)
ifeq ($(SYSTEM),Linux)
ifeq ($(NOSTATIC),)
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
else
NEEDKERB := 1
endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
LIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
......@@ -88,7 +99,7 @@ evproxyplab.o: evproxyplab.cc
evproxyplab: evproxyplab.o ../lib/libevent.a ../lib/event.h
$(CPPC) $(LDFLAGS) -o $@ evproxyplab.o $(LIBS)
elvindtest: elvindtest.o
elvindtest-debug: elvindtest.o
$(CC) $(LDFLAGS) -o $@ elvindtest.o $(LIBS)
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -16,8 +16,15 @@ CFLAGS = -Wall -O2 -g \
LIBS = ${OBJDIR}/lib/libtb/libtb.a
LDFLAGS =
ifeq ($(NOSTATIC),)
# for now we link everything static
LDSTATIC = -static
else
LDSTATIC =
endif
ifneq ($(host_cpu),arm)
LDFLAGS += -static
LDFLAGS += $(LDSTATIC)
endif
TESTS = $(SRCDIR)/syncd_test.sh
......
#!/usr/bin/perl
#
# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
......
......@@ -41,7 +41,11 @@ SSLOBJ = ssl.o
ifeq ($(SYSTEM),Linux)
RHLVERSION := $(shell cat /etc/redhat-release | sed -e 's/Red Hat Linux release \([0-9]\).*/Linux\1/')
ifeq ($(NOSTATIC),)
NEEDKERB := $(shell nm /usr/lib/libssl.a | grep -q krb; echo $$?)
else
NEEDKERB := 1
endif
ifeq ($(NEEDKERB),0)
CFLAGS += `/usr/kerberos/bin/krb5-config --cflags`
TMLIBS += `/usr/kerberos/bin/krb5-config --libs krb5`
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005, 2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2003, 2005, 2006, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -13,6 +13,15 @@ RHLVERSION := $(shell cat /etc/redhat-release | sed -e 's/Red Hat Linux rele
include $(OBJDIR)/Makeconf
ifeq ($(NOSTATIC),)
# for now we link everything static
CCSTATIC = -static
LDSTATIC = -static
else
CCSTATIC =
LDSTATIC =
endif
all: pcapper
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -31,10 +40,10 @@ TBLIBS = $(EVENTOBJS) $(OBJDIR)/lib/libtb/libtb.a $(EVENTLIBS)
PCAPLIBS=-lpcap
CFLAGS = -Wall -static $(PTHREADCFLAGS) \
CFLAGS = -Wall $(CCSTATIC) $(PTHREADCFLAGS) \
-DEMULAB -g -DDROPROOT -DBOSSNODE=\"@BOSSNODE@\" \
-DCLIENT_BINDIR='"$(CLIENT_BINDIR)"'
LDFLAGS = -static
LDFLAGS = $(LDSTATIC)
CFLAGS_FBSD = $(CFLAGS) $(TBCFLAGS)
CFLAGS_FBSD_NE = $(CFLAGS)
......
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