Vendor in latest code.
Add support for vendoring in containers/storage and ran dep ensure Need to get default storage for containers to include and default to overlay2. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
parent
37f118d73a
commit
549d734da9
35 changed files with 136 additions and 1105 deletions
1
vendor/github.com/containers/storage/hack/make/gccgo
generated
vendored
1
vendor/github.com/containers/storage/hack/make/gccgo
generated
vendored
|
@ -7,6 +7,7 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
|
|||
|
||||
source "${MAKEDIR}/.go-autogen"
|
||||
|
||||
export GCCGO=${SCRIPTDIR}/../vagrant/gccgo-wrapper.sh
|
||||
# gccgo require explicit flag -pthread to allow goroutines to work.
|
||||
go build -compiler=gccgo \
|
||||
-o "$DEST/$BINARY_FULLNAME" \
|
||||
|
|
2
vendor/github.com/containers/storage/hack/make/validate-lint
generated
vendored
2
vendor/github.com/containers/storage/hack/make/validate-lint
generated
vendored
|
@ -8,7 +8,7 @@ unset IFS
|
|||
|
||||
errors=()
|
||||
for f in "${files[@]}"; do
|
||||
failedLint=$(golint "$f")
|
||||
failedLint=$(golint "$f")
|
||||
if [ "$failedLint" ]; then
|
||||
errors+=( "$failedLint" )
|
||||
fi
|
||||
|
|
27
vendor/github.com/containers/storage/hack/make/validate-vendor
generated
vendored
27
vendor/github.com/containers/storage/hack/make/validate-vendor
generated
vendored
|
@ -1,27 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
source "${MAKEDIR}/.validate"
|
||||
|
||||
IFS=$'\n'
|
||||
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'hack/vendor.sh' 'hack/.vendor-helpers.sh' 'vendor/' || true) )
|
||||
unset IFS
|
||||
|
||||
if [ ${#files[@]} -gt 0 ]; then
|
||||
# We run vendor.sh to and see if we have a diff afterwards
|
||||
./hack/vendor.sh >/dev/null
|
||||
# Let see if the working directory is clean
|
||||
diffs="$(git status --porcelain -- vendor 2>/dev/null)"
|
||||
if [ "$diffs" ]; then
|
||||
{
|
||||
echo 'The result of ./hack/vendor.sh differs'
|
||||
echo
|
||||
echo "$diffs"
|
||||
echo
|
||||
echo 'Please vendor your package with ./hack/vendor.sh.'
|
||||
echo
|
||||
} >&2
|
||||
false
|
||||
else
|
||||
echo 'Congratulations! All vendoring changes are done the right way.'
|
||||
fi
|
||||
fi
|
Loading…
Add table
Add a link
Reference in a new issue