Commit 9b7e1a39 authored by David Johnson's avatar David Johnson

To build clientside on Debian sid, try redirect to newest Ubuntu release.

parent bb9466e6
# #
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -29,7 +29,7 @@ SYSTEM := $(shell $(SRCDIR)/../../../tmcc/osstuff.sh -o) ...@@ -29,7 +29,7 @@ SYSTEM := $(shell $(SRCDIR)/../../../tmcc/osstuff.sh -o)
IPERFVERSION = 2.0.2 IPERFVERSION = 2.0.2
ifeq ($(SYSTEM),Linux) ifeq ($(SYSTEM),Linux)
OSTAG=$(shell $(SRCDIR)/../../../tmcc/osstuff.sh -t) OSTAG=$(shell $(SRCDIR)/../../../tmcc/osstuff.sh -t)
ifneq (,$(filter $(OSTAG),alpine debian9)) ifneq (,$(filter $(OSTAG),alpine debian9 debianS))
IPERFVERSION = 2.0.10 IPERFVERSION = 2.0.10
# If 2.0.10, we have to disable 64-bit seq numbers; they mess up the # If 2.0.10, we have to disable 64-bit seq numbers; they mess up the
# client_hdr size in a backwards-incompat way. # client_hdr size in a backwards-incompat way.
......
...@@ -112,6 +112,11 @@ endif ...@@ -112,6 +112,11 @@ endif
ifeq ($(MDSUBDIR),debian9) ifeq ($(MDSUBDIR),debian9)
MDSUBDIR = ubuntu16 MDSUBDIR = ubuntu16
endif endif
# Just point debian sid to the latest Ubuntu supported and hope for
# the best.
ifeq ($(MDSUBDIR),debianS)
MDSUBDIR = ubuntu16
endif
# We don't want to have a dir named "arch"; that would be confusing. # We don't want to have a dir named "arch"; that would be confusing.
# Hence archlinux. # Hence archlinux.
ifeq ($(MDSUBDIR),arch) ifeq ($(MDSUBDIR),arch)
......
#!/bin/sh #!/bin/sh
# #
# Copyright (c) 2007-2016 University of Utah and the Flux Group. # Copyright (c) 2007-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -100,6 +100,12 @@ Linux) ...@@ -100,6 +100,12 @@ Linux)
if [ -n "$trel" ]; then if [ -n "$trel" ]; then
dist="Debian" dist="Debian"
rel=$trel rel=$trel
else
grep PRETTY_NAME /etc/os-release | grep -q sid
if [ $? -eq 0 ]; then
rel=S
tag=debianS
fi
fi fi
fi fi
fi fi
......
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