projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 11823-collection-lifecycle-doc
[arvados.git]
/
build
/
package-build-dockerfiles
/
Makefile
diff --git
a/build/package-build-dockerfiles/Makefile
b/build/package-build-dockerfiles/Makefile
index 624d5f242d942846299348705f5442513e878e16..34e909580f698d43a6c1f041660ac30bbebe16ad 100644
(file)
--- a/
build/package-build-dockerfiles/Makefile
+++ b/
build/package-build-dockerfiles/Makefile
@@
-1,8
+1,4
@@
-all: centos6/generated centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
-
-centos6/generated: common-generated-all
- test -d centos6/generated || mkdir centos6/generated
- cp -rlt centos6/generated common-generated/*
+all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated ubuntu1604/generated
centos7/generated: common-generated-all
test -d centos7/generated || mkdir centos7/generated
centos7/generated: common-generated-all
test -d centos7/generated || mkdir centos7/generated
@@
-20,7
+16,11
@@
ubuntu1404/generated: common-generated-all
test -d ubuntu1404/generated || mkdir ubuntu1404/generated
cp -rlt ubuntu1404/generated common-generated/*
test -d ubuntu1404/generated || mkdir ubuntu1404/generated
cp -rlt ubuntu1404/generated common-generated/*
-GOTARBALL=go1.7.1.linux-amd64.tar.gz
+ubuntu1604/generated: common-generated-all
+ test -d ubuntu1604/generated || mkdir ubuntu1604/generated
+ cp -rlt ubuntu1604/generated common-generated/*
+
+GOTARBALL=go1.8.3.linux-amd64.tar.gz
common-generated-all: common-generated/$(GOTARBALL)
common-generated-all: common-generated/$(GOTARBALL)