beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix ubuntu packaging to build from a clean checkout of the correct git tag

Browse source
This commit is contained in:
Solomon Hykes 2013-04-19 12:39:40 -07:00
parent bfb84b564c
commit 152a9f77b4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/ubuntu/Makefile
View file

@ -14,6 +14,7 @@ GITHUB_PATH=github.com/dotcloud/docker
DOCKER_VERSION=${PKG_NAME}_${VERSION} DOCKER_VERSION=${PKG_NAME}_${VERSION}
DOCKER_FVERSION=${PKG_NAME}_$(shell head -1 changelog | sed 's/^.\+(\(.\+\)).\+$$/\1/') DOCKER_FVERSION=${PKG_NAME}_$(shell head -1 changelog | sed 's/^.\+(\(.\+\)).\+$$/\1/')
BUILD_SRC=${CURDIR}/../../build_src BUILD_SRC=${CURDIR}/../../build_src
VERSION_TAG=v$(shell head -1 changelog | sed 's/^.\+(\(.\+\)-[0-9]\+).\+$$/\1/')
all: all:
# Compile docker. Used by dpkg-buildpackage. # Compile docker. Used by dpkg-buildpackage.
@ -33,7 +34,8 @@ ubuntu:
# This Makefile will compile the github master branch of dotcloud/docker # This Makefile will compile the github master branch of dotcloud/docker
# Retrieve docker project and its go structure from internet # Retrieve docker project and its go structure from internet
rm -rf ${BUILD_SRC} rm -rf ${BUILD_SRC}
GOPATH=${BUILD_SRC} go get ${GITHUB_PATH} git clone $(shell git rev-parse --show-toplevel) ${BUILD_SRC}/${GITHUB_PATH}
cd ${BUILD_SRC}/${GITHUB_PATH}; git checkout ${VERSION_TAG} && GOPATH=${BUILD_SRC} go get -d
# Add debianization # Add debianization
mkdir ${BUILD_SRC}/debian mkdir ${BUILD_SRC}/debian
cp Makefile ${BUILD_SRC} cp Makefile ${BUILD_SRC}