Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-stable
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
emulab
emulab-stable
Commits
9b7e1a39
Commit
9b7e1a39
authored
May 09, 2018
by
David Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
To build clientside on Debian sid, try redirect to newest Ubuntu release.
parent
bb9466e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
clientside/event/linktest/iperf/GNUmakefile.in
clientside/event/linktest/iperf/GNUmakefile.in
+2
-2
clientside/tmcc/GNUmakefile.in
clientside/tmcc/GNUmakefile.in
+5
-0
clientside/tmcc/osstuff.sh
clientside/tmcc/osstuff.sh
+7
-1
No files found.
clientside/event/linktest/iperf/GNUmakefile.in
View file @
9b7e1a39
#
#
# Copyright (c) 2000-201
1
University of Utah and the Flux Group.
# Copyright (c) 2000-201
8
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.
...
...
clientside/tmcc/GNUmakefile.in
View file @
9b7e1a39
...
@@ -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)
...
...
clientside/tmcc/osstuff.sh
View file @
9b7e1a39
#!/bin/sh
#!/bin/sh
#
#
# Copyright (c) 2007-201
6
University of Utah and the Flux Group.
# Copyright (c) 2007-201
8
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment