Commit c0eda4aa authored by Leigh Stoller's avatar Leigh Stoller

Move bootinfoclient to clientside.

parent a063e10c
...@@ -4639,6 +4639,7 @@ outfiles="Makeconf GNUmakefile setversion \ ...@@ -4639,6 +4639,7 @@ outfiles="Makeconf GNUmakefile setversion \
os/frisbee.redux/GNUmakefile \ os/frisbee.redux/GNUmakefile \
os/capture/GNUmakefile \ os/capture/GNUmakefile \
os/growdisk/GNUmakefile \ os/growdisk/GNUmakefile \
os/bootinfo/GNUmakefile \
os/zapdisk/GNUmakefile \ os/zapdisk/GNUmakefile \
os/imagezip/GNUmakefile \ os/imagezip/GNUmakefile \
os/imagezip/libndz/GNUmakefile \ os/imagezip/libndz/GNUmakefile \
......
# #
# Copyright (c) 2000-2017 University of Utah and the Flux Group. # Copyright (c) 2000-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -327,6 +327,7 @@ outfiles="Makeconf GNUmakefile setversion \ ...@@ -327,6 +327,7 @@ outfiles="Makeconf GNUmakefile setversion \
os/frisbee.redux/GNUmakefile \ os/frisbee.redux/GNUmakefile \
os/capture/GNUmakefile \ os/capture/GNUmakefile \
os/growdisk/GNUmakefile \ os/growdisk/GNUmakefile \
os/bootinfo/GNUmakefile \
os/zapdisk/GNUmakefile \ os/zapdisk/GNUmakefile \
os/imagezip/GNUmakefile \ os/imagezip/GNUmakefile \
os/imagezip/libndz/GNUmakefile \ os/imagezip/libndz/GNUmakefile \
......
# #
# Copyright (c) 2000-2017 University of Utah and the Flux Group. # Copyright (c) 2000-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -32,7 +32,7 @@ SYSTEM := $(shell uname -s) ...@@ -32,7 +32,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = syncd dijkstra genhostsfile imagezip frisbee.redux capture SUBDIRS = syncd dijkstra genhostsfile imagezip frisbee.redux capture bootinfo
ifeq ($(SYSTEM),FreeBSD) ifeq ($(SYSTEM),FreeBSD)
SUBDIRS += growdisk SUBDIRS += growdisk
endif endif
......
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
all: bootinfoclient
include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -Wall -I${OBJDIR} \
-DFALLBACK_HOST='"$(BOSSNODE)"' -DBOSSNODE='"$(BOSSNODE)"'
bootinfoclient: bootinfoclient.o bootinfo_version.o bootwhat.h
$(CC) $(LDSTATIC) $(CFLAGS) $(INCS) $(LIBS) \
-o bootinfoclient bootinfoclient.o bootinfo_version.o
bootinfo_version.c: bootinfoclient.c
echo >$@ "char build_info[] = \"Built `date +%d-%b-%Y` by `id -nu`@`hostname | sed 's/\..*//'`:`pwd`\";"
install:
subboss:
subboss-install:
client: all
client-install: client
$(INSTALL_PROGRAM) bootinfoclient $(DESTDIR)$(CLIENT_BINDIR)
clean:
rm -f *.o bootinfoclient
/* /*
* Copyright (c) 2000-2012 University of Utah and the Flux Group. * Copyright (c) 2000-2018 University of Utah and the Flux Group.
* *
* {{{EMULAB-LICENSE * {{{EMULAB-LICENSE
* *
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include "bootwhat.h" #include "bootwhat.h"
#include "bootinfo.h"
#include "config.h" #include "config.h"
int debug = 0; int debug = 0;
......
...@@ -7197,6 +7197,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \ ...@@ -7197,6 +7197,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/plab/GNUmakefile clientside/tmcc/cygwinseven/GNUmakefile \ clientside/tmcc/plab/GNUmakefile clientside/tmcc/cygwinseven/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile \ clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile \
clientside/os/growdisk/GNUmakefile \ clientside/os/growdisk/GNUmakefile \
clientside/os/bootinfo/GNUmakefile \
clientside/os/zapdisk/GNUmakefile \ clientside/os/zapdisk/GNUmakefile \
clientside/os/frisbee.redux/GNUmakefile \ clientside/os/frisbee.redux/GNUmakefile \
clientside/os/imagezip/GNUmakefile \ clientside/os/imagezip/GNUmakefile \
......
...@@ -1526,6 +1526,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \ ...@@ -1526,6 +1526,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/plab/GNUmakefile clientside/tmcc/cygwinseven/GNUmakefile \ clientside/tmcc/plab/GNUmakefile clientside/tmcc/cygwinseven/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile \ clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile \
clientside/os/growdisk/GNUmakefile \ clientside/os/growdisk/GNUmakefile \
clientside/os/bootinfo/GNUmakefile \
clientside/os/zapdisk/GNUmakefile \ clientside/os/zapdisk/GNUmakefile \
clientside/os/frisbee.redux/GNUmakefile \ clientside/os/frisbee.redux/GNUmakefile \
clientside/os/imagezip/GNUmakefile \ clientside/os/imagezip/GNUmakefile \
......
# #
# Copyright (c) 2000-2016 University of Utah and the Flux Group. # Copyright (c) 2000-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -35,7 +35,10 @@ include $(OBJDIR)/Makeconf ...@@ -35,7 +35,10 @@ include $(OBJDIR)/Makeconf
# Force dependencies on the scripts so that they will be rerun through # Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed. # configure if the .in file is changed.
# #
all: bootinfo bootinfosend bootinfo.restart bootinfoclient all: bootinfo bootinfosend bootinfo.restart
# For VPATH.
MOSTLY_SRCDIRS = ${TESTBED_SRCDIR}/clientside/os/bootinfo
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
...@@ -51,6 +54,7 @@ ifeq ($(EVENTSYS),1) ...@@ -51,6 +54,7 @@ ifeq ($(EVENTSYS),1)
INCS += -I$(TESTBED_LIBSRCDIR)/event INCS += -I$(TESTBED_LIBSRCDIR)/event
endif endif
INCS += -I$(TESTBED_LIBSRCDIR)/libtb -I/usr/local/include INCS += -I$(TESTBED_LIBSRCDIR)/libtb -I/usr/local/include
INCS += -I${TESTBED_SRCDIR}/clientside/os/bootinfo
CFLAGS += -Wall \ CFLAGS += -Wall \
$(INCS) $(DBFLAG) -DSOLARIS -DHAVE_SOCKADDR_SA_LEN -DUSE_RECVMSG \ $(INCS) $(DBFLAG) -DSOLARIS -DHAVE_SOCKADDR_SA_LEN -DUSE_RECVMSG \
...@@ -84,10 +88,6 @@ bootinfosend: bootinfosend.o bootinfo.h bootinfo_version.o bootwhat.h $(BI_DBOBJ ...@@ -84,10 +88,6 @@ bootinfosend: bootinfosend.o bootinfo.h bootinfo_version.o bootwhat.h $(BI_DBOBJ
-o bootinfosend bootinfosend.o bootinfo_version.o $(BI_DBOBJ) \ -o bootinfosend bootinfosend.o bootinfo_version.o $(BI_DBOBJ) \
$(LFLAGS) -L/usr/local/lib/mysql -lmysqlclient $(LFLAGS) -L/usr/local/lib/mysql -lmysqlclient
bootinfoclient: bootinfoclient.o bootinfo.h bootinfo_version.o bootwhat.h
cc $(LDSTATIC) $(CFLAGS) $(DBFLAG) $(INCS) \
-o bootinfoclient bootinfoclient.o bootinfo_version.o
bootinfo_mysql.o: bootinfo.h bootwhat.h bootinfo_mysql.o: bootinfo.h bootwhat.h
main.o: bootinfo.h bootwhat.h main.o: bootinfo.h bootwhat.h
...@@ -110,8 +110,7 @@ install: $(INSTALL_SBINDIR)/bootinfo \ ...@@ -110,8 +110,7 @@ install: $(INSTALL_SBINDIR)/bootinfo \
$(INSTALL_SBINDIR)/bootinfosend \ $(INSTALL_SBINDIR)/bootinfosend \
$(INSTALL_ETCDIR)/bootinfo.conf $(INSTALL_ETCDIR)/bootinfo.conf
client-install: bootinfoclient client-install:
$(INSTALL_PROGRAM) bootinfoclient $(DESTDIR)$(CLIENT_BINDIR)
clean: clean:
rm -f *.o core bootinfo bootinfosend bootinfoclient testmysql bootinfo_version.c rm -f *.o core bootinfo bootinfosend testmysql bootinfo_version.c
# #
# Copyright (c) 2000-2017 University of Utah and the Flux Group. # Copyright (c) 2000-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -41,6 +41,7 @@ include $(TESTBED_SRCDIR)/GNUmakerules ...@@ -41,6 +41,7 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -O -g -Wall -DUDP \ CFLAGS += -O -g -Wall -DUDP \
-I${OBJDIR} -I/usr/local/include \ -I${OBJDIR} -I/usr/local/include \
-I${TESTBED_LIBSRCDIR}/libtb -I${TESTBED_SRCDIR}/pxe \ -I${TESTBED_LIBSRCDIR}/libtb -I${TESTBED_SRCDIR}/pxe \
-I${TESTBED_SRCDIR}/clientside/os/bootinfo \
-I${TESTBED_LIBSRCDIR}/tmcd -I${TESTBED_LIBSRCDIR}/tmcd
TMLIBS = ${TESTBED_LIBOBJDIR}/libtb/libtb.a TMLIBS = ${TESTBED_LIBOBJDIR}/libtb/libtb.a
BOOTINFO = ${OBJDIR}/pxe/bootinfo.o ${OBJDIR}/pxe/bootinfo_mysql.o BOOTINFO = ${OBJDIR}/pxe/bootinfo.o ${OBJDIR}/pxe/bootinfo_mysql.o
......
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