Commit 8564e185 authored by Mike Hibler's avatar Mike Hibler
Browse files

Linktest now works on ARM boxen.

parent 5c7de5b3
...@@ -29,10 +29,7 @@ ARCH := $(shell uname -m) ...@@ -29,10 +29,7 @@ ARCH := $(shell uname -m)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = program-agent link-agent tevc proxy bs-agent SUBDIRS = program-agent link-agent tevc proxy bs-agent linktest
ifneq ($(ARCH),aarch64)
SUBDIRS += linktest
endif
ifeq ($(SYSTEM),Linux) ifeq ($(SYSTEM),Linux)
SUBDIRS += disk-agent SUBDIRS += disk-agent
endif endif
......
...@@ -85,7 +85,7 @@ main(int argc, char **argv) { ...@@ -85,7 +85,7 @@ main(int argc, char **argv) {
char *pidfile = NULL; char *pidfile = NULL;
char *logfile = NULL; char *logfile = NULL;
char *progname; char *progname;
char c; int c;
char buf[BUFSIZ]; char buf[BUFSIZ];
extern char build_info[]; extern char build_info[];
pideid = NULL; pideid = NULL;
...@@ -127,11 +127,14 @@ main(int argc, char **argv) { ...@@ -127,11 +127,14 @@ main(int argc, char **argv) {
break; break;
default: default:
usage(progname); usage(progname);
break;
} }
} }
if (!pideid) if (!pideid) {
usage(progname); fprintf(stderr, "Must specify a pid/eid via -e\n");
usage(progname);
}
if (debug) if (debug)
loginit(0, 0); loginit(0, 0);
......
...@@ -75,7 +75,6 @@ common-install: dir-install ...@@ -75,7 +75,6 @@ common-install: dir-install
bin-install: dir-install bin-install: dir-install
(cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) bin-install) (cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) bin-install)
$(INSTALL) -m 755 $(SRCDIR)/findcnet $(BINDIR)/findcnet $(INSTALL) -m 755 $(SRCDIR)/findcnet $(BINDIR)/findcnet
rm -f $(BINDIR)/rc/rc.linktest
etc-install: dir-install common-sysetc-install etc-install: dir-install common-sysetc-install
$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group $(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
......
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