diff --git a/DEVELOPERS.md b/BUILDDEPS.md similarity index 100% rename from DEVELOPERS.md rename to BUILDDEPS.md diff --git a/CONTRIB.md b/CONTRIB.md deleted file mode 100644 index cbb90a741..000000000 --- a/CONTRIB.md +++ /dev/null @@ -1,17 +0,0 @@ -### Contribution Guidelines -We welcome your contributions. To make the process as seamless as possible, we ask for the following: -* Go ahead and fork the project and make your changes. We encourage pull requests to discuss code changes. - - Fork it - - Create your feature branch (git checkout -b my-new-feature) - - Commit your changes (git commit -am 'Add some feature') - - Push to the branch (git push origin my-new-feature) - - Create new Pull Request -* If you have additional dependencies for ``minio``, ``minio`` manages its depedencies using [godep](https://github.com/tools/godep) - - Run `go get foo/bar` - - Edit your code to import foo/bar - - Run `make save` from top-level directory (or `godep restore && godep save ./...`). -* When you're ready to create a pull request, be sure to: - - Have test cases for the new code. If you have questions about how to do it, please ask in your pull request. - - Run go fmt - - Squash your commits into a single commit. git rebase -i. It's okay to force update your pull request. - - Make sure go test -race ./... passes, and go build completes. diff --git a/DEVELOPER.md b/DEVELOPER.md new file mode 100644 index 000000000..0a96e3e77 --- /dev/null +++ b/DEVELOPER.md @@ -0,0 +1,40 @@ +### Setup your Minio Github Repository +Fork [Minio upstream](https://github.com/Minio-io/minio/fork) source repository to your own personal repository. Copy the URL and pass it to ``go get`` command. Go uses git to clone a copy into your project workspace folder. +```sh +$ git clone https://github.com/$USER_ID/minio +$ cd minio +$ mkdir -p ${GOPATH}/src/github.com/minio-io +$ ln -s ${PWD} $GOPATH/src/github.com/minio-io/ +``` + +### Compiling Minio from source +Minio uses ``Makefile`` to wrap around some of the limitations of ``go build``. To compile Minio source, simply change to your workspace folder and type ``make``. +```sh +$ cd $GOPATH/src/github.com/$USER_ID/minio/ +$ make +Checking if proper environment variables are set.. Done +... +Checking dependencies for Minio.. Done +... +... +Installed minio into /home/userid/work/minio/gopath/bin +Installed new-cmd into /home/userid/work/minio/gopath/bin +``` +### Developer Guidelines + +``minio`` community welcomes your contribution. To make the process as seamless as possible, we ask for the following: +* Go ahead and fork the project and make your changes. We encourage pull requests to discuss code changes. + - Fork it + - Create your feature branch (git checkout -b my-new-feature) + - Commit your changes (git commit -am 'Add some feature') + - Push to the branch (git push origin my-new-feature) + - Create new Pull Request +* If you have additional dependencies for ``minio``, ``minio`` manages its depedencies using [godep](https://github.com/tools/godep) + - Run `go get foo/bar` + - Edit your code to import foo/bar + - Run `make save` from top-level directory (or `godep restore && godep save ./...`). +* When you're ready to create a pull request, be sure to: + - Have test cases for the new code. If you have questions about how to do it, please ask in your pull request. + - Run go fmt + - Squash your commits into a single commit. git rebase -i. It's okay to force update your pull request. + - Make sure go test -race ./... passes, and go build completes. diff --git a/Makefile b/Makefile index cf18f04d9..7cc7b985e 100644 --- a/Makefile +++ b/Makefile @@ -11,54 +11,54 @@ getdeps: checkdeps @go get golang.org/x/tools/cmd/cover && echo "Installed cover" build-erasure: - @$(MAKE) $(MAKE_OPTIONS) -C pkgs/erasure/isal lib - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/erasure + @$(MAKE) $(MAKE_OPTIONS) -C pkg/erasure/isal lib + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/erasure build-signify: - @$(MAKE) $(MAKE_OPTIONS) -C pkgs/signify + @$(MAKE) $(MAKE_OPTIONS) -C pkg/signify build-cpu: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/cpu + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/cpu build-md5: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/crypto/md5/ - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/crypto/md5c/ + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/md5/ + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/md5c/ build-sha1: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/crypto/sha1/ + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/sha1/ build-sha256: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/crypto/sha256/ + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/sha256/ build-sha512: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/crypto/sha512/ + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/sha512/ build-crc32c: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/checksum/crc32c + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/checksum/crc32c build-scsi: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/scsi + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/scsi build-split: build-strbyteconv - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/split + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/split build-strbyteconv: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/strbyteconv + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/strbyteconv build-storage: build-storage-append build-storage-encoded build-storage-append: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/storage/appendstorage + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/appendstorage build-storage-encoded: - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/storage/encodedstorage + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/encodedstorage cover: build-erasure build-signify build-split build-crc32c build-cpu build-scsi build-storage build-md5 build-sha1 build-sha256 build-sha512 - @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/gateway + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/gateway install: build-erasure @godep go install github.com/minio-io/minio/cmd/minio && echo "Installed minio into ${GOPATH}/bin" - @godep go install github.com/minio-io/minio/cmd/minio-cli && echo "Installed minio-cli into ${GOPATH}/bin" + @godep go install github.com/minio-io/minio/cmd/new-cmd && echo "Installed new-cmd into ${GOPATH}/bin" @godep go install github.com/minio-io/minio/cmd/crypto && echo "Installed crypto into ${GOPATH}/bin" save: restore diff --git a/README.md b/README.md index bb2638918..2f97cf15e 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,21 @@ ## Introduction -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Minio-io/minio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - Minio is an open source object storage released under [Apache license v2](./LICENSE) . It uses ``Rubberband Erasure`` coding to dynamically protect the data. Minio's design is inspired by Amazon's S3 for its API and Facebook's Haystack for its immutable data structure. -### Install BUILD dependencies +### Download -[Build Dependencies](./DEVELOPERS.md) - -### Setup your Minio Github Repository -Fork [Minio upstream](https://github.com/Minio-io/minio/fork) source repository to your own personal repository. Copy the URL and pass it to ``go get`` command. Go uses git to clone a copy into your project workspace folder. -```sh -$ go get -u github.com/$USER_ID/minio -$ cd $GOPATH/src/github.com/$USER_ID/minio/ -$ git remote add upstream https://github.com/Minio-io/minio.git -``` - -### Compiling Minio from source -Minio uses ``Makefile`` to wrap around some of the limitations of ``go build``. To compile Minio source, simply change to your workspace folder and type ``make``. -```sh -$ cd $GOPATH/src/github.com/$USER_ID/minio/ -$ make -Checking dependencies for Minio.. SUCCESS -... -... -Installed minio into /home/harsha/.gvm/pkgsets/go1.4/global/bin -Installed minio-cli into /home/harsha/.gvm/pkgsets/go1.4/global/bin -``` +-- No releases have been made yet -- ### Join Community - -* [Howto Contribute](./CONTRIB.md) +* [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Minio-io/minio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) * IRC join channel #minio @ irc.freenode.net * Google Groups - minio-dev@googlegroups.com +### Developers + +* [Get Source](./DEVELOPER.md) +* [Build Dependencies](./BUILDDEPS.md) +* [Development Workflow](./DEVELOPER.md#developer-guidelines) + [![Analytics](https://ga-beacon.appspot.com/UA-56860620-3/minio/readme)](https://github.com/igrigorik/ga-beacon) diff --git a/checkdeps.sh b/checkdeps.sh index 1c92aed5a..2c6a71b4b 100755 --- a/checkdeps.sh +++ b/checkdeps.sh @@ -1,5 +1,26 @@ #!/bin/sh +echo -n "Checking if proper environment variables are set.. " + +echo ${GOROOT:?} 2>&1 >/dev/null +if [ $? -eq 1 ]; then + echo "ERROR" + echo "GOROOT environment variable missing, please refer to Go installation document" + echo "https://github.com/Minio-io/minio/blob/master/BUILDDEPS.md#install-go-13" + exit 1 +fi + +echo ${GOPATH:?} 2>&1 >/dev/null +if [ $? -eq 1 ]; then + echo "ERROR" + echo "GOPATH environment variable missing, please refer to Go installation document" + echo "https://github.com/Minio-io/minio/blob/master/BUILDDEPS.md#install-go-13" + exit 1 +fi + +echo "Done" +echo "Using GOPATH=${GOPATH} and GOROOT=${GOROOT}" + echo -n "Checking dependencies for Minio.. " ## Check all dependencies are present @@ -28,4 +49,4 @@ if [ "x${MISSING}" != "x" ]; then echo exit 1 fi -echo "SUCCESS" +echo "Done" diff --git a/cmd/crypto/crypto-options.go b/cmd/crypto/crypto-options.go index 4a07456eb..9567f4d1f 100644 --- a/cmd/crypto/crypto-options.go +++ b/cmd/crypto/crypto-options.go @@ -25,10 +25,10 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/minio-io/minio/pkgs/crypto/md5" - "github.com/minio-io/minio/pkgs/crypto/sha1" - "github.com/minio-io/minio/pkgs/crypto/sha256" - "github.com/minio-io/minio/pkgs/crypto/sha512" + "github.com/minio-io/minio/pkg/crypto/md5" + "github.com/minio-io/minio/pkg/crypto/sha1" + "github.com/minio-io/minio/pkg/crypto/sha256" + "github.com/minio-io/minio/pkg/crypto/sha512" ) var Options = []cli.Command{ diff --git a/cmd/minio/common.go b/cmd/minio/common.go index dbc4a853f..9449e6a9b 100644 --- a/cmd/minio/common.go +++ b/cmd/minio/common.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/codegangsta/cli" - "github.com/minio-io/minio/pkgs/strbyteconv" + "github.com/minio-io/minio/pkg/strbyteconv" ) // config representing cli input diff --git a/cmd/minio/erasure.go b/cmd/minio/erasure.go index eecbceece..fec3c6114 100644 --- a/cmd/minio/erasure.go +++ b/cmd/minio/erasure.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/minio-io/minio/pkgs/storage" - es "github.com/minio-io/minio/pkgs/storage/encodedstorage" + "github.com/minio-io/minio/pkg/storage" + es "github.com/minio-io/minio/pkg/storage/encodedstorage" ) func erasureGetList(config inputConfig, objectPath string) (io.Reader, error) { diff --git a/cmd/minio-cli/.gitignore b/cmd/new-cmd/.gitignore similarity index 100% rename from cmd/minio-cli/.gitignore rename to cmd/new-cmd/.gitignore diff --git a/cmd/minio-cli/README.md b/cmd/new-cmd/README.md similarity index 100% rename from cmd/minio-cli/README.md rename to cmd/new-cmd/README.md diff --git a/cmd/minio-cli/formatter.go b/cmd/new-cmd/formatter.go similarity index 100% rename from cmd/minio-cli/formatter.go rename to cmd/new-cmd/formatter.go diff --git a/cmd/minio-cli/minio-cli.go b/cmd/new-cmd/minio-cli.go similarity index 96% rename from cmd/minio-cli/minio-cli.go rename to cmd/new-cmd/minio-cli.go index 14860d851..83432f8c6 100644 --- a/cmd/minio-cli/minio-cli.go +++ b/cmd/new-cmd/minio-cli.go @@ -9,7 +9,7 @@ import ( "text/template" "time" - "github.com/minio-io/minio/pkgs/utils" + "github.com/minio-io/minio/pkg/utils" ) type source struct { @@ -19,7 +19,7 @@ type source struct { const ( // Relative path from GOPATH default - TEMPLATEREPO = "/src/github.com/minio-io/minio/templates/" + TEMPLATEREPO = "/src/github.com/minio-io/minio/cmd/minio-cli/templates/" ) type option struct { diff --git a/templates/README.tmpl b/cmd/new-cmd/templates/README.tmpl similarity index 100% rename from templates/README.tmpl rename to cmd/new-cmd/templates/README.tmpl diff --git a/templates/main.tmpl b/cmd/new-cmd/templates/main.tmpl similarity index 100% rename from templates/main.tmpl rename to cmd/new-cmd/templates/main.tmpl diff --git a/templates/options.tmpl b/cmd/new-cmd/templates/options.tmpl similarity index 100% rename from templates/options.tmpl rename to cmd/new-cmd/templates/options.tmpl diff --git a/isal b/isal index 64719d5f0..9cb25139b 120000 --- a/isal +++ b/isal @@ -1 +1 @@ -pkgs/erasure/isal \ No newline at end of file +pkg/erasure/isal \ No newline at end of file diff --git a/pkgs/checksum/crc32c/Makefile b/pkg/checksum/crc32c/Makefile similarity index 100% rename from pkgs/checksum/crc32c/Makefile rename to pkg/checksum/crc32c/Makefile diff --git a/pkgs/checksum/crc32c/asm.S b/pkg/checksum/crc32c/asm.S similarity index 100% rename from pkgs/checksum/crc32c/asm.S rename to pkg/checksum/crc32c/asm.S diff --git a/pkgs/checksum/crc32c/crc32c.go b/pkg/checksum/crc32c/crc32c.go similarity index 100% rename from pkgs/checksum/crc32c/crc32c.go rename to pkg/checksum/crc32c/crc32c.go diff --git a/pkgs/checksum/crc32c/crc32c_amd64.S b/pkg/checksum/crc32c/crc32c_amd64.S similarity index 100% rename from pkgs/checksum/crc32c/crc32c_amd64.S rename to pkg/checksum/crc32c/crc32c_amd64.S diff --git a/pkgs/checksum/crc32c/crc32c_test.go b/pkg/checksum/crc32c/crc32c_test.go similarity index 100% rename from pkgs/checksum/crc32c/crc32c_test.go rename to pkg/checksum/crc32c/crc32c_test.go diff --git a/pkgs/checksum/crc32c/doc.go b/pkg/checksum/crc32c/doc.go similarity index 100% rename from pkgs/checksum/crc32c/doc.go rename to pkg/checksum/crc32c/doc.go diff --git a/pkgs/cpu/Makefile b/pkg/cpu/Makefile similarity index 100% rename from pkgs/cpu/Makefile rename to pkg/cpu/Makefile diff --git a/pkgs/cpu/cpu.go b/pkg/cpu/cpu.go similarity index 100% rename from pkgs/cpu/cpu.go rename to pkg/cpu/cpu.go diff --git a/pkgs/cpu/cpu.h b/pkg/cpu/cpu.h similarity index 100% rename from pkgs/cpu/cpu.h rename to pkg/cpu/cpu.h diff --git a/pkgs/cpu/cpu_amd64.S b/pkg/cpu/cpu_amd64.S similarity index 100% rename from pkgs/cpu/cpu_amd64.S rename to pkg/cpu/cpu_amd64.S diff --git a/pkgs/cpu/cpu_test.go b/pkg/cpu/cpu_test.go similarity index 100% rename from pkgs/cpu/cpu_test.go rename to pkg/cpu/cpu_test.go diff --git a/pkgs/cpu/doc.go b/pkg/cpu/doc.go similarity index 100% rename from pkgs/cpu/doc.go rename to pkg/cpu/doc.go diff --git a/pkgs/crypto/md5/md5.go b/pkg/crypto/md5/md5.go similarity index 100% rename from pkgs/crypto/md5/md5.go rename to pkg/crypto/md5/md5.go diff --git a/pkgs/crypto/md5/md5_test.go b/pkg/crypto/md5/md5_test.go similarity index 100% rename from pkgs/crypto/md5/md5_test.go rename to pkg/crypto/md5/md5_test.go diff --git a/pkgs/crypto/md5c/md5.c b/pkg/crypto/md5c/md5.c similarity index 100% rename from pkgs/crypto/md5c/md5.c rename to pkg/crypto/md5c/md5.c diff --git a/pkgs/crypto/md5c/md5.h b/pkg/crypto/md5c/md5.h similarity index 100% rename from pkgs/crypto/md5c/md5.h rename to pkg/crypto/md5c/md5.h diff --git a/pkgs/crypto/md5c/md5_test.go b/pkg/crypto/md5c/md5_test.go similarity index 100% rename from pkgs/crypto/md5c/md5_test.go rename to pkg/crypto/md5c/md5_test.go diff --git a/pkgs/crypto/md5c/md5c.go b/pkg/crypto/md5c/md5c.go similarity index 100% rename from pkgs/crypto/md5c/md5c.go rename to pkg/crypto/md5c/md5c.go diff --git a/pkgs/crypto/sha1/asm.S b/pkg/crypto/sha1/asm.S similarity index 100% rename from pkgs/crypto/sha1/asm.S rename to pkg/crypto/sha1/asm.S diff --git a/pkgs/crypto/sha1/sha1.go b/pkg/crypto/sha1/sha1.go similarity index 98% rename from pkgs/crypto/sha1/sha1.go rename to pkg/crypto/sha1/sha1.go index c9c142baf..9af8b0bcd 100644 --- a/pkgs/crypto/sha1/sha1.go +++ b/pkg/crypto/sha1/sha1.go @@ -28,7 +28,7 @@ import ( "io" "unsafe" - "github.com/minio-io/minio/pkgs/cpu" + "github.com/minio-io/minio/pkg/cpu" ) const ( diff --git a/pkgs/crypto/sha1/sha1_amd64.S b/pkg/crypto/sha1/sha1_amd64.S similarity index 100% rename from pkgs/crypto/sha1/sha1_amd64.S rename to pkg/crypto/sha1/sha1_amd64.S diff --git a/pkgs/crypto/sha1/sha1_test.go b/pkg/crypto/sha1/sha1_test.go similarity index 100% rename from pkgs/crypto/sha1/sha1_test.go rename to pkg/crypto/sha1/sha1_test.go diff --git a/pkgs/crypto/sha256/TODO b/pkg/crypto/sha256/TODO similarity index 100% rename from pkgs/crypto/sha256/TODO rename to pkg/crypto/sha256/TODO diff --git a/pkgs/crypto/sha256/asm.S b/pkg/crypto/sha256/asm.S similarity index 100% rename from pkgs/crypto/sha256/asm.S rename to pkg/crypto/sha256/asm.S diff --git a/pkgs/crypto/sha256/sha256-avx-asm.S b/pkg/crypto/sha256/sha256-avx-asm.S similarity index 100% rename from pkgs/crypto/sha256/sha256-avx-asm.S rename to pkg/crypto/sha256/sha256-avx-asm.S diff --git a/pkgs/crypto/sha256/sha256-avx2-asm.S b/pkg/crypto/sha256/sha256-avx2-asm.S similarity index 100% rename from pkgs/crypto/sha256/sha256-avx2-asm.S rename to pkg/crypto/sha256/sha256-avx2-asm.S diff --git a/pkgs/crypto/sha256/sha256-ssse3-asm.S b/pkg/crypto/sha256/sha256-ssse3-asm.S similarity index 100% rename from pkgs/crypto/sha256/sha256-ssse3-asm.S rename to pkg/crypto/sha256/sha256-ssse3-asm.S diff --git a/pkgs/crypto/sha256/sha256.go b/pkg/crypto/sha256/sha256.go similarity index 100% rename from pkgs/crypto/sha256/sha256.go rename to pkg/crypto/sha256/sha256.go diff --git a/pkgs/crypto/sha256/sha256_test.go b/pkg/crypto/sha256/sha256_test.go similarity index 100% rename from pkgs/crypto/sha256/sha256_test.go rename to pkg/crypto/sha256/sha256_test.go diff --git a/pkgs/crypto/sha512/TODO b/pkg/crypto/sha512/TODO similarity index 100% rename from pkgs/crypto/sha512/TODO rename to pkg/crypto/sha512/TODO diff --git a/pkgs/crypto/sha512/asm.S b/pkg/crypto/sha512/asm.S similarity index 100% rename from pkgs/crypto/sha512/asm.S rename to pkg/crypto/sha512/asm.S diff --git a/pkgs/crypto/sha512/sha512-avx-asm.S b/pkg/crypto/sha512/sha512-avx-asm.S similarity index 100% rename from pkgs/crypto/sha512/sha512-avx-asm.S rename to pkg/crypto/sha512/sha512-avx-asm.S diff --git a/pkgs/crypto/sha512/sha512-avx2-asm.S b/pkg/crypto/sha512/sha512-avx2-asm.S similarity index 100% rename from pkgs/crypto/sha512/sha512-avx2-asm.S rename to pkg/crypto/sha512/sha512-avx2-asm.S diff --git a/pkgs/crypto/sha512/sha512-ssse3-asm.S b/pkg/crypto/sha512/sha512-ssse3-asm.S similarity index 100% rename from pkgs/crypto/sha512/sha512-ssse3-asm.S rename to pkg/crypto/sha512/sha512-ssse3-asm.S diff --git a/pkgs/crypto/sha512/sha512.go b/pkg/crypto/sha512/sha512.go similarity index 100% rename from pkgs/crypto/sha512/sha512.go rename to pkg/crypto/sha512/sha512.go diff --git a/pkgs/crypto/sha512/sha512_test.go b/pkg/crypto/sha512/sha512_test.go similarity index 100% rename from pkgs/crypto/sha512/sha512_test.go rename to pkg/crypto/sha512/sha512_test.go diff --git a/pkgs/erasure/.gitignore b/pkg/erasure/.gitignore similarity index 100% rename from pkgs/erasure/.gitignore rename to pkg/erasure/.gitignore diff --git a/pkgs/erasure/Makefile b/pkg/erasure/Makefile similarity index 100% rename from pkgs/erasure/Makefile rename to pkg/erasure/Makefile diff --git a/pkgs/erasure/cauchy_test.go b/pkg/erasure/cauchy_test.go similarity index 100% rename from pkgs/erasure/cauchy_test.go rename to pkg/erasure/cauchy_test.go diff --git a/pkgs/erasure/common.h b/pkg/erasure/common.h similarity index 100% rename from pkgs/erasure/common.h rename to pkg/erasure/common.h diff --git a/pkgs/erasure/ctypes.go b/pkg/erasure/ctypes.go similarity index 100% rename from pkgs/erasure/ctypes.go rename to pkg/erasure/ctypes.go diff --git a/pkgs/erasure/decode.c b/pkg/erasure/decode.c similarity index 100% rename from pkgs/erasure/decode.c rename to pkg/erasure/decode.c diff --git a/pkgs/erasure/decode.go b/pkg/erasure/decode.go similarity index 100% rename from pkgs/erasure/decode.go rename to pkg/erasure/decode.go diff --git a/pkgs/erasure/doc.go b/pkg/erasure/doc.go similarity index 100% rename from pkgs/erasure/doc.go rename to pkg/erasure/doc.go diff --git a/pkgs/erasure/encode.c b/pkg/erasure/encode.c similarity index 100% rename from pkgs/erasure/encode.c rename to pkg/erasure/encode.c diff --git a/pkgs/erasure/encode.go b/pkg/erasure/encode.go similarity index 100% rename from pkgs/erasure/encode.go rename to pkg/erasure/encode.go diff --git a/pkgs/erasure/isal/.gitignore b/pkg/erasure/isal/.gitignore similarity index 100% rename from pkgs/erasure/isal/.gitignore rename to pkg/erasure/isal/.gitignore diff --git a/pkgs/erasure/isal/LICENSE b/pkg/erasure/isal/LICENSE similarity index 100% rename from pkgs/erasure/isal/LICENSE rename to pkg/erasure/isal/LICENSE diff --git a/pkgs/erasure/isal/LICENSE.INTEL b/pkg/erasure/isal/LICENSE.INTEL similarity index 100% rename from pkgs/erasure/isal/LICENSE.INTEL rename to pkg/erasure/isal/LICENSE.INTEL diff --git a/pkgs/erasure/isal/Makefile b/pkg/erasure/isal/Makefile similarity index 100% rename from pkgs/erasure/isal/Makefile rename to pkg/erasure/isal/Makefile diff --git a/pkgs/erasure/isal/Makefile.nmake b/pkg/erasure/isal/Makefile.nmake similarity index 100% rename from pkgs/erasure/isal/Makefile.nmake rename to pkg/erasure/isal/Makefile.nmake diff --git a/pkgs/erasure/isal/README.md b/pkg/erasure/isal/README.md similarity index 100% rename from pkgs/erasure/isal/README.md rename to pkg/erasure/isal/README.md diff --git a/pkgs/erasure/isal/RELEASE-NOTES.INTEL b/pkg/erasure/isal/RELEASE-NOTES.INTEL similarity index 100% rename from pkgs/erasure/isal/RELEASE-NOTES.INTEL rename to pkg/erasure/isal/RELEASE-NOTES.INTEL diff --git a/pkgs/erasure/isal/docs/isa-l_open_src_2.10.pdf b/pkg/erasure/isal/docs/isa-l_open_src_2.10.pdf similarity index 100% rename from pkgs/erasure/isal/docs/isa-l_open_src_2.10.pdf rename to pkg/erasure/isal/docs/isa-l_open_src_2.10.pdf diff --git a/pkgs/erasure/isal/include/ec-base.h b/pkg/erasure/isal/include/ec-base.h similarity index 100% rename from pkgs/erasure/isal/include/ec-base.h rename to pkg/erasure/isal/include/ec-base.h diff --git a/pkgs/erasure/isal/include/erasure-code.h b/pkg/erasure/isal/include/erasure-code.h similarity index 100% rename from pkgs/erasure/isal/include/erasure-code.h rename to pkg/erasure/isal/include/erasure-code.h diff --git a/pkgs/erasure/isal/include/erasure/tests.h b/pkg/erasure/isal/include/erasure/tests.h similarity index 100% rename from pkgs/erasure/isal/include/erasure/tests.h rename to pkg/erasure/isal/include/erasure/tests.h diff --git a/pkgs/erasure/isal/include/erasure/types.h b/pkg/erasure/isal/include/erasure/types.h similarity index 100% rename from pkgs/erasure/isal/include/erasure/types.h rename to pkg/erasure/isal/include/erasure/types.h diff --git a/pkgs/erasure/isal/include/gf-vect-mul.h b/pkg/erasure/isal/include/gf-vect-mul.h similarity index 100% rename from pkgs/erasure/isal/include/gf-vect-mul.h rename to pkg/erasure/isal/include/gf-vect-mul.h diff --git a/pkgs/erasure/isal/include/reg-sizes.asm b/pkg/erasure/isal/include/reg-sizes.asm similarity index 100% rename from pkgs/erasure/isal/include/reg-sizes.asm rename to pkg/erasure/isal/include/reg-sizes.asm diff --git a/pkgs/erasure/isal/make.inc b/pkg/erasure/isal/make.inc similarity index 100% rename from pkgs/erasure/isal/make.inc rename to pkg/erasure/isal/make.inc diff --git a/pkgs/erasure/isal/src/Makefile b/pkg/erasure/isal/src/Makefile similarity index 100% rename from pkgs/erasure/isal/src/Makefile rename to pkg/erasure/isal/src/Makefile diff --git a/pkgs/erasure/isal/src/ec-base.c b/pkg/erasure/isal/src/ec-base.c similarity index 100% rename from pkgs/erasure/isal/src/ec-base.c rename to pkg/erasure/isal/src/ec-base.c diff --git a/pkgs/erasure/isal/src/ec-highlevel-func.c b/pkg/erasure/isal/src/ec-highlevel-func.c similarity index 100% rename from pkgs/erasure/isal/src/ec-highlevel-func.c rename to pkg/erasure/isal/src/ec-highlevel-func.c diff --git a/pkgs/erasure/isal/src/ec-multibinary.asm b/pkg/erasure/isal/src/ec-multibinary.asm similarity index 100% rename from pkgs/erasure/isal/src/ec-multibinary.asm rename to pkg/erasure/isal/src/ec-multibinary.asm diff --git a/pkgs/erasure/isal/src/erasure-code-base-perf.c b/pkg/erasure/isal/src/erasure-code-base-perf.c similarity index 100% rename from pkgs/erasure/isal/src/erasure-code-base-perf.c rename to pkg/erasure/isal/src/erasure-code-base-perf.c diff --git a/pkgs/erasure/isal/src/erasure-code-base-test.c b/pkg/erasure/isal/src/erasure-code-base-test.c similarity index 100% rename from pkgs/erasure/isal/src/erasure-code-base-test.c rename to pkg/erasure/isal/src/erasure-code-base-test.c diff --git a/pkgs/erasure/isal/src/erasure-code-perf.c b/pkg/erasure/isal/src/erasure-code-perf.c similarity index 100% rename from pkgs/erasure/isal/src/erasure-code-perf.c rename to pkg/erasure/isal/src/erasure-code-perf.c diff --git a/pkgs/erasure/isal/src/erasure-code-sse-perf.c b/pkg/erasure/isal/src/erasure-code-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/erasure-code-sse-perf.c rename to pkg/erasure/isal/src/erasure-code-sse-perf.c diff --git a/pkgs/erasure/isal/src/erasure-code-sse-test.c b/pkg/erasure/isal/src/erasure-code-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/erasure-code-sse-test.c rename to pkg/erasure/isal/src/erasure-code-sse-test.c diff --git a/pkgs/erasure/isal/src/erasure-code-test.c b/pkg/erasure/isal/src/erasure-code-test.c similarity index 100% rename from pkgs/erasure/isal/src/erasure-code-test.c rename to pkg/erasure/isal/src/erasure-code-test.c diff --git a/pkgs/erasure/isal/src/gf-2vect-dot-prod-avx.asm b/pkg/erasure/isal/src/gf-2vect-dot-prod-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-2vect-dot-prod-avx.asm rename to pkg/erasure/isal/src/gf-2vect-dot-prod-avx.asm diff --git a/pkgs/erasure/isal/src/gf-2vect-dot-prod-avx2.asm b/pkg/erasure/isal/src/gf-2vect-dot-prod-avx2.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-2vect-dot-prod-avx2.asm rename to pkg/erasure/isal/src/gf-2vect-dot-prod-avx2.asm diff --git a/pkgs/erasure/isal/src/gf-2vect-dot-prod-sse-perf.c b/pkg/erasure/isal/src/gf-2vect-dot-prod-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-2vect-dot-prod-sse-perf.c rename to pkg/erasure/isal/src/gf-2vect-dot-prod-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-2vect-dot-prod-sse-test.c b/pkg/erasure/isal/src/gf-2vect-dot-prod-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-2vect-dot-prod-sse-test.c rename to pkg/erasure/isal/src/gf-2vect-dot-prod-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-2vect-dot-prod-sse.asm b/pkg/erasure/isal/src/gf-2vect-dot-prod-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-2vect-dot-prod-sse.asm rename to pkg/erasure/isal/src/gf-2vect-dot-prod-sse.asm diff --git a/pkgs/erasure/isal/src/gf-3vect-dot-prod-avx.asm b/pkg/erasure/isal/src/gf-3vect-dot-prod-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-3vect-dot-prod-avx.asm rename to pkg/erasure/isal/src/gf-3vect-dot-prod-avx.asm diff --git a/pkgs/erasure/isal/src/gf-3vect-dot-prod-avx2.asm b/pkg/erasure/isal/src/gf-3vect-dot-prod-avx2.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-3vect-dot-prod-avx2.asm rename to pkg/erasure/isal/src/gf-3vect-dot-prod-avx2.asm diff --git a/pkgs/erasure/isal/src/gf-3vect-dot-prod-sse-perf.c b/pkg/erasure/isal/src/gf-3vect-dot-prod-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-3vect-dot-prod-sse-perf.c rename to pkg/erasure/isal/src/gf-3vect-dot-prod-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-3vect-dot-prod-sse-test.c b/pkg/erasure/isal/src/gf-3vect-dot-prod-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-3vect-dot-prod-sse-test.c rename to pkg/erasure/isal/src/gf-3vect-dot-prod-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-3vect-dot-prod-sse.asm b/pkg/erasure/isal/src/gf-3vect-dot-prod-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-3vect-dot-prod-sse.asm rename to pkg/erasure/isal/src/gf-3vect-dot-prod-sse.asm diff --git a/pkgs/erasure/isal/src/gf-4vect-dot-prod-avx.asm b/pkg/erasure/isal/src/gf-4vect-dot-prod-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-4vect-dot-prod-avx.asm rename to pkg/erasure/isal/src/gf-4vect-dot-prod-avx.asm diff --git a/pkgs/erasure/isal/src/gf-4vect-dot-prod-avx2.asm b/pkg/erasure/isal/src/gf-4vect-dot-prod-avx2.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-4vect-dot-prod-avx2.asm rename to pkg/erasure/isal/src/gf-4vect-dot-prod-avx2.asm diff --git a/pkgs/erasure/isal/src/gf-4vect-dot-prod-sse-perf.c b/pkg/erasure/isal/src/gf-4vect-dot-prod-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-4vect-dot-prod-sse-perf.c rename to pkg/erasure/isal/src/gf-4vect-dot-prod-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-4vect-dot-prod-sse-test.c b/pkg/erasure/isal/src/gf-4vect-dot-prod-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-4vect-dot-prod-sse-test.c rename to pkg/erasure/isal/src/gf-4vect-dot-prod-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-4vect-dot-prod-sse.asm b/pkg/erasure/isal/src/gf-4vect-dot-prod-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-4vect-dot-prod-sse.asm rename to pkg/erasure/isal/src/gf-4vect-dot-prod-sse.asm diff --git a/pkgs/erasure/isal/src/gf-5vect-dot-prod-avx.asm b/pkg/erasure/isal/src/gf-5vect-dot-prod-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-5vect-dot-prod-avx.asm rename to pkg/erasure/isal/src/gf-5vect-dot-prod-avx.asm diff --git a/pkgs/erasure/isal/src/gf-5vect-dot-prod-avx2.asm b/pkg/erasure/isal/src/gf-5vect-dot-prod-avx2.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-5vect-dot-prod-avx2.asm rename to pkg/erasure/isal/src/gf-5vect-dot-prod-avx2.asm diff --git a/pkgs/erasure/isal/src/gf-5vect-dot-prod-sse-perf.c b/pkg/erasure/isal/src/gf-5vect-dot-prod-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-5vect-dot-prod-sse-perf.c rename to pkg/erasure/isal/src/gf-5vect-dot-prod-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-5vect-dot-prod-sse-test.c b/pkg/erasure/isal/src/gf-5vect-dot-prod-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-5vect-dot-prod-sse-test.c rename to pkg/erasure/isal/src/gf-5vect-dot-prod-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-5vect-dot-prod-sse.asm b/pkg/erasure/isal/src/gf-5vect-dot-prod-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-5vect-dot-prod-sse.asm rename to pkg/erasure/isal/src/gf-5vect-dot-prod-sse.asm diff --git a/pkgs/erasure/isal/src/gf-6vect-dot-prod-avx.asm b/pkg/erasure/isal/src/gf-6vect-dot-prod-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-6vect-dot-prod-avx.asm rename to pkg/erasure/isal/src/gf-6vect-dot-prod-avx.asm diff --git a/pkgs/erasure/isal/src/gf-6vect-dot-prod-avx2.asm b/pkg/erasure/isal/src/gf-6vect-dot-prod-avx2.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-6vect-dot-prod-avx2.asm rename to pkg/erasure/isal/src/gf-6vect-dot-prod-avx2.asm diff --git a/pkgs/erasure/isal/src/gf-6vect-dot-prod-sse-perf.c b/pkg/erasure/isal/src/gf-6vect-dot-prod-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-6vect-dot-prod-sse-perf.c rename to pkg/erasure/isal/src/gf-6vect-dot-prod-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-6vect-dot-prod-sse-test.c b/pkg/erasure/isal/src/gf-6vect-dot-prod-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-6vect-dot-prod-sse-test.c rename to pkg/erasure/isal/src/gf-6vect-dot-prod-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-6vect-dot-prod-sse.asm b/pkg/erasure/isal/src/gf-6vect-dot-prod-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-6vect-dot-prod-sse.asm rename to pkg/erasure/isal/src/gf-6vect-dot-prod-sse.asm diff --git a/pkgs/erasure/isal/src/gf-inverse-test.c b/pkg/erasure/isal/src/gf-inverse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-inverse-test.c rename to pkg/erasure/isal/src/gf-inverse-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-1tbl.c b/pkg/erasure/isal/src/gf-vect-dot-prod-1tbl.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-1tbl.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-1tbl.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-avx-perf.c b/pkg/erasure/isal/src/gf-vect-dot-prod-avx-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-avx-perf.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-avx-perf.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-avx-test.c b/pkg/erasure/isal/src/gf-vect-dot-prod-avx-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-avx-test.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-avx-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-avx.asm b/pkg/erasure/isal/src/gf-vect-dot-prod-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-avx.asm rename to pkg/erasure/isal/src/gf-vect-dot-prod-avx.asm diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-avx2.asm b/pkg/erasure/isal/src/gf-vect-dot-prod-avx2.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-avx2.asm rename to pkg/erasure/isal/src/gf-vect-dot-prod-avx2.asm diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-base-test.c b/pkg/erasure/isal/src/gf-vect-dot-prod-base-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-base-test.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-base-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-perf.c b/pkg/erasure/isal/src/gf-vect-dot-prod-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-perf.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-perf.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-sse-perf.c b/pkg/erasure/isal/src/gf-vect-dot-prod-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-sse-perf.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-sse-test.c b/pkg/erasure/isal/src/gf-vect-dot-prod-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-sse-test.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-sse.asm b/pkg/erasure/isal/src/gf-vect-dot-prod-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-sse.asm rename to pkg/erasure/isal/src/gf-vect-dot-prod-sse.asm diff --git a/pkgs/erasure/isal/src/gf-vect-dot-prod-test.c b/pkg/erasure/isal/src/gf-vect-dot-prod-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-dot-prod-test.c rename to pkg/erasure/isal/src/gf-vect-dot-prod-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-avx-perf.c b/pkg/erasure/isal/src/gf-vect-mul-avx-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-avx-perf.c rename to pkg/erasure/isal/src/gf-vect-mul-avx-perf.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-avx-test.c b/pkg/erasure/isal/src/gf-vect-mul-avx-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-avx-test.c rename to pkg/erasure/isal/src/gf-vect-mul-avx-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-avx.asm b/pkg/erasure/isal/src/gf-vect-mul-avx.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-avx.asm rename to pkg/erasure/isal/src/gf-vect-mul-avx.asm diff --git a/pkgs/erasure/isal/src/gf-vect-mul-base-test.c b/pkg/erasure/isal/src/gf-vect-mul-base-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-base-test.c rename to pkg/erasure/isal/src/gf-vect-mul-base-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-perf.c b/pkg/erasure/isal/src/gf-vect-mul-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-perf.c rename to pkg/erasure/isal/src/gf-vect-mul-perf.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-sse-perf.c b/pkg/erasure/isal/src/gf-vect-mul-sse-perf.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-sse-perf.c rename to pkg/erasure/isal/src/gf-vect-mul-sse-perf.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-sse-test.c b/pkg/erasure/isal/src/gf-vect-mul-sse-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-sse-test.c rename to pkg/erasure/isal/src/gf-vect-mul-sse-test.c diff --git a/pkgs/erasure/isal/src/gf-vect-mul-sse.asm b/pkg/erasure/isal/src/gf-vect-mul-sse.asm similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-sse.asm rename to pkg/erasure/isal/src/gf-vect-mul-sse.asm diff --git a/pkgs/erasure/isal/src/gf-vect-mul-test.c b/pkg/erasure/isal/src/gf-vect-mul-test.c similarity index 100% rename from pkgs/erasure/isal/src/gf-vect-mul-test.c rename to pkg/erasure/isal/src/gf-vect-mul-test.c diff --git a/pkgs/erasure/stdint.go b/pkg/erasure/stdint.go similarity index 100% rename from pkgs/erasure/stdint.go rename to pkg/erasure/stdint.go diff --git a/pkgs/erasure/vandermonde_test.go b/pkg/erasure/vandermonde_test.go similarity index 100% rename from pkgs/erasure/vandermonde_test.go rename to pkg/erasure/vandermonde_test.go diff --git a/pkgs/gateway/gateway.go b/pkg/gateway/gateway.go similarity index 99% rename from pkgs/gateway/gateway.go rename to pkg/gateway/gateway.go index 4e48c7195..4fd3c0b22 100644 --- a/pkgs/gateway/gateway.go +++ b/pkg/gateway/gateway.go @@ -25,7 +25,7 @@ import ( "path" "github.com/gorilla/mux" - "github.com/minio-io/minio/pkgs/storage/encodedstorage" + "github.com/minio-io/minio/pkg/storage/encodedstorage" "github.com/tchap/go-patricia/patricia" ) diff --git a/pkgs/gateway/gateway_test.go b/pkg/gateway/gateway_test.go similarity index 99% rename from pkgs/gateway/gateway_test.go rename to pkg/gateway/gateway_test.go index 6e52389a0..53f9a918b 100644 --- a/pkgs/gateway/gateway_test.go +++ b/pkg/gateway/gateway_test.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/minio-io/minio/pkgs/utils" + "github.com/minio-io/minio/pkg/utils" . "gopkg.in/check.v1" ) diff --git a/pkgs/scsi/.gitignore b/pkg/scsi/.gitignore similarity index 100% rename from pkgs/scsi/.gitignore rename to pkg/scsi/.gitignore diff --git a/pkgs/scsi/constants.go b/pkg/scsi/constants.go similarity index 100% rename from pkgs/scsi/constants.go rename to pkg/scsi/constants.go diff --git a/pkgs/scsi/scsi.go b/pkg/scsi/scsi.go similarity index 100% rename from pkgs/scsi/scsi.go rename to pkg/scsi/scsi.go diff --git a/pkgs/scsi/scsi_test.go b/pkg/scsi/scsi_test.go similarity index 100% rename from pkgs/scsi/scsi_test.go rename to pkg/scsi/scsi_test.go diff --git a/pkgs/scsi/utils.go b/pkg/scsi/utils.go similarity index 100% rename from pkgs/scsi/utils.go rename to pkg/scsi/utils.go diff --git a/pkgs/signify/Makefile b/pkg/signify/Makefile similarity index 100% rename from pkgs/signify/Makefile rename to pkg/signify/Makefile diff --git a/pkgs/signify/libsignify/.gitignore b/pkg/signify/libsignify/.gitignore similarity index 100% rename from pkgs/signify/libsignify/.gitignore rename to pkg/signify/libsignify/.gitignore diff --git a/pkgs/signify/libsignify/BACKGROUND b/pkg/signify/libsignify/BACKGROUND similarity index 100% rename from pkgs/signify/libsignify/BACKGROUND rename to pkg/signify/libsignify/BACKGROUND diff --git a/pkgs/signify/libsignify/HOWTO b/pkg/signify/libsignify/HOWTO similarity index 100% rename from pkgs/signify/libsignify/HOWTO rename to pkg/signify/libsignify/HOWTO diff --git a/pkgs/signify/libsignify/INSTALL b/pkg/signify/libsignify/INSTALL similarity index 100% rename from pkgs/signify/libsignify/INSTALL rename to pkg/signify/libsignify/INSTALL diff --git a/pkgs/signify/libsignify/Makefile b/pkg/signify/libsignify/Makefile similarity index 100% rename from pkgs/signify/libsignify/Makefile rename to pkg/signify/libsignify/Makefile diff --git a/pkgs/signify/libsignify/README b/pkg/signify/libsignify/README similarity index 100% rename from pkgs/signify/libsignify/README rename to pkg/signify/libsignify/README diff --git a/pkgs/signify/libsignify/arc4random.c b/pkg/signify/libsignify/arc4random.c similarity index 100% rename from pkgs/signify/libsignify/arc4random.c rename to pkg/signify/libsignify/arc4random.c diff --git a/pkgs/signify/libsignify/base64.c b/pkg/signify/libsignify/base64.c similarity index 100% rename from pkgs/signify/libsignify/base64.c rename to pkg/signify/libsignify/base64.c diff --git a/pkgs/signify/libsignify/bcrypt_pbkdf.c b/pkg/signify/libsignify/bcrypt_pbkdf.c similarity index 100% rename from pkgs/signify/libsignify/bcrypt_pbkdf.c rename to pkg/signify/libsignify/bcrypt_pbkdf.c diff --git a/pkgs/signify/libsignify/blowfish.c b/pkg/signify/libsignify/blowfish.c similarity index 100% rename from pkgs/signify/libsignify/blowfish.c rename to pkg/signify/libsignify/blowfish.c diff --git a/pkgs/signify/libsignify/bsd-compat/blf.h b/pkg/signify/libsignify/bsd-compat/blf.h similarity index 100% rename from pkgs/signify/libsignify/bsd-compat/blf.h rename to pkg/signify/libsignify/bsd-compat/blf.h diff --git a/pkgs/signify/libsignify/bsd-compat/chacha_private.h b/pkg/signify/libsignify/bsd-compat/chacha_private.h similarity index 100% rename from pkgs/signify/libsignify/bsd-compat/chacha_private.h rename to pkg/signify/libsignify/bsd-compat/chacha_private.h diff --git a/pkgs/signify/libsignify/bsd-compat/readpassphrase.h b/pkg/signify/libsignify/bsd-compat/readpassphrase.h similarity index 100% rename from pkgs/signify/libsignify/bsd-compat/readpassphrase.h rename to pkg/signify/libsignify/bsd-compat/readpassphrase.h diff --git a/pkgs/signify/libsignify/bsd-compat/sha2.h b/pkg/signify/libsignify/bsd-compat/sha2.h similarity index 100% rename from pkgs/signify/libsignify/bsd-compat/sha2.h rename to pkg/signify/libsignify/bsd-compat/sha2.h diff --git a/pkgs/signify/libsignify/crypto_api.c b/pkg/signify/libsignify/crypto_api.c similarity index 100% rename from pkgs/signify/libsignify/crypto_api.c rename to pkg/signify/libsignify/crypto_api.c diff --git a/pkgs/signify/libsignify/crypto_api.h b/pkg/signify/libsignify/crypto_api.h similarity index 100% rename from pkgs/signify/libsignify/crypto_api.h rename to pkg/signify/libsignify/crypto_api.h diff --git a/pkgs/signify/libsignify/explicit_bzero.c b/pkg/signify/libsignify/explicit_bzero.c similarity index 100% rename from pkgs/signify/libsignify/explicit_bzero.c rename to pkg/signify/libsignify/explicit_bzero.c diff --git a/pkgs/signify/libsignify/fe25519.c b/pkg/signify/libsignify/fe25519.c similarity index 100% rename from pkgs/signify/libsignify/fe25519.c rename to pkg/signify/libsignify/fe25519.c diff --git a/pkgs/signify/libsignify/fe25519.h b/pkg/signify/libsignify/fe25519.h similarity index 100% rename from pkgs/signify/libsignify/fe25519.h rename to pkg/signify/libsignify/fe25519.h diff --git a/pkgs/signify/libsignify/ge25519.h b/pkg/signify/libsignify/ge25519.h similarity index 100% rename from pkgs/signify/libsignify/ge25519.h rename to pkg/signify/libsignify/ge25519.h diff --git a/pkgs/signify/libsignify/ge25519_base.data b/pkg/signify/libsignify/ge25519_base.data similarity index 100% rename from pkgs/signify/libsignify/ge25519_base.data rename to pkg/signify/libsignify/ge25519_base.data diff --git a/pkgs/signify/libsignify/helpers.c b/pkg/signify/libsignify/helpers.c similarity index 100% rename from pkgs/signify/libsignify/helpers.c rename to pkg/signify/libsignify/helpers.c diff --git a/pkgs/signify/libsignify/mod_ed25519.c b/pkg/signify/libsignify/mod_ed25519.c similarity index 100% rename from pkgs/signify/libsignify/mod_ed25519.c rename to pkg/signify/libsignify/mod_ed25519.c diff --git a/pkgs/signify/libsignify/mod_ge25519.c b/pkg/signify/libsignify/mod_ge25519.c similarity index 100% rename from pkgs/signify/libsignify/mod_ge25519.c rename to pkg/signify/libsignify/mod_ge25519.c diff --git a/pkgs/signify/libsignify/ohash.c b/pkg/signify/libsignify/ohash.c similarity index 100% rename from pkgs/signify/libsignify/ohash.c rename to pkg/signify/libsignify/ohash.c diff --git a/pkgs/signify/libsignify/ohash.h b/pkg/signify/libsignify/ohash.h similarity index 100% rename from pkgs/signify/libsignify/ohash.h rename to pkg/signify/libsignify/ohash.h diff --git a/pkgs/signify/libsignify/passphrase-20140902.diff b/pkg/signify/libsignify/passphrase-20140902.diff similarity index 100% rename from pkgs/signify/libsignify/passphrase-20140902.diff rename to pkg/signify/libsignify/passphrase-20140902.diff diff --git a/pkgs/signify/libsignify/provide_signify_as_library-20141025.diff b/pkg/signify/libsignify/provide_signify_as_library-20141025.diff similarity index 100% rename from pkgs/signify/libsignify/provide_signify_as_library-20141025.diff rename to pkg/signify/libsignify/provide_signify_as_library-20141025.diff diff --git a/pkgs/signify/libsignify/readpassphrase.c b/pkg/signify/libsignify/readpassphrase.c similarity index 100% rename from pkgs/signify/libsignify/readpassphrase.c rename to pkg/signify/libsignify/readpassphrase.c diff --git a/pkgs/signify/libsignify/sc25519.c b/pkg/signify/libsignify/sc25519.c similarity index 100% rename from pkgs/signify/libsignify/sc25519.c rename to pkg/signify/libsignify/sc25519.c diff --git a/pkgs/signify/libsignify/sc25519.h b/pkg/signify/libsignify/sc25519.h similarity index 100% rename from pkgs/signify/libsignify/sc25519.h rename to pkg/signify/libsignify/sc25519.h diff --git a/pkgs/signify/libsignify/sha2.c b/pkg/signify/libsignify/sha2.c similarity index 100% rename from pkgs/signify/libsignify/sha2.c rename to pkg/signify/libsignify/sha2.c diff --git a/pkgs/signify/libsignify/signify.1 b/pkg/signify/libsignify/signify.1 similarity index 100% rename from pkgs/signify/libsignify/signify.1 rename to pkg/signify/libsignify/signify.1 diff --git a/pkgs/signify/libsignify/signify.c b/pkg/signify/libsignify/signify.c similarity index 100% rename from pkgs/signify/libsignify/signify.c rename to pkg/signify/libsignify/signify.c diff --git a/pkgs/signify/libsignify/smult_curve25519_ref.c b/pkg/signify/libsignify/smult_curve25519_ref.c similarity index 100% rename from pkgs/signify/libsignify/smult_curve25519_ref.c rename to pkg/signify/libsignify/smult_curve25519_ref.c diff --git a/pkgs/signify/libsignify/strlcpy.c b/pkg/signify/libsignify/strlcpy.c similarity index 100% rename from pkgs/signify/libsignify/strlcpy.c rename to pkg/signify/libsignify/strlcpy.c diff --git a/pkgs/signify/libsignify/timingsafe_bcmp.c b/pkg/signify/libsignify/timingsafe_bcmp.c similarity index 100% rename from pkgs/signify/libsignify/timingsafe_bcmp.c rename to pkg/signify/libsignify/timingsafe_bcmp.c diff --git a/pkgs/signify/libsignify/util.h b/pkg/signify/libsignify/util.h similarity index 100% rename from pkgs/signify/libsignify/util.h rename to pkg/signify/libsignify/util.h diff --git a/pkgs/signify/signify.go b/pkg/signify/signify.go similarity index 100% rename from pkgs/signify/signify.go rename to pkg/signify/signify.go diff --git a/pkgs/split/.gitignore b/pkg/split/.gitignore similarity index 100% rename from pkgs/split/.gitignore rename to pkg/split/.gitignore diff --git a/pkgs/split/Makefile b/pkg/split/Makefile similarity index 100% rename from pkgs/split/Makefile rename to pkg/split/Makefile diff --git a/pkgs/split/TESTFILE b/pkg/split/TESTFILE similarity index 100% rename from pkgs/split/TESTFILE rename to pkg/split/TESTFILE diff --git a/pkgs/split/split.go b/pkg/split/split.go similarity index 99% rename from pkgs/split/split.go rename to pkg/split/split.go index 63cea5d10..451429f75 100644 --- a/pkgs/split/split.go +++ b/pkg/split/split.go @@ -22,7 +22,7 @@ import ( "bufio" "bytes" "errors" - "github.com/minio-io/minio/pkgs/strbyteconv" + "github.com/minio-io/minio/pkg/strbyteconv" "io" "io/ioutil" "os" diff --git a/pkgs/split/split_test.go b/pkg/split/split_test.go similarity index 100% rename from pkgs/split/split_test.go rename to pkg/split/split_test.go diff --git a/pkgs/storage/appendstorage/Makefile b/pkg/storage/appendstorage/Makefile similarity index 100% rename from pkgs/storage/appendstorage/Makefile rename to pkg/storage/appendstorage/Makefile diff --git a/pkgs/storage/appendstorage/append_storage.go b/pkg/storage/appendstorage/append_storage.go similarity index 97% rename from pkgs/storage/appendstorage/append_storage.go rename to pkg/storage/appendstorage/append_storage.go index 27fc32f03..dbf8542f0 100644 --- a/pkgs/storage/appendstorage/append_storage.go +++ b/pkg/storage/appendstorage/append_storage.go @@ -27,8 +27,8 @@ import ( "strconv" "strings" - "github.com/minio-io/minio/pkgs/checksum/crc32c" - "github.com/minio-io/minio/pkgs/storage" + "github.com/minio-io/minio/pkg/checksum/crc32c" + "github.com/minio-io/minio/pkg/storage" ) type appendStorage struct { diff --git a/pkgs/storage/appendstorage/append_storage_test.go b/pkg/storage/appendstorage/append_storage_test.go similarity index 97% rename from pkgs/storage/appendstorage/append_storage_test.go rename to pkg/storage/appendstorage/append_storage_test.go index b79ada26e..cebb28fe3 100644 --- a/pkgs/storage/appendstorage/append_storage_test.go +++ b/pkg/storage/appendstorage/append_storage_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/minio-io/minio/pkgs/storage" - "github.com/minio-io/minio/pkgs/utils" + "github.com/minio-io/minio/pkg/storage" + "github.com/minio-io/minio/pkg/utils" . "gopkg.in/check.v1" ) diff --git a/pkgs/storage/encodedstorage/encoded_storage.go b/pkg/storage/encodedstorage/encoded_storage.go similarity index 97% rename from pkgs/storage/encodedstorage/encoded_storage.go rename to pkg/storage/encodedstorage/encoded_storage.go index 637c3754a..0706b5688 100644 --- a/pkgs/storage/encodedstorage/encoded_storage.go +++ b/pkg/storage/encodedstorage/encoded_storage.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/minio-io/minio/pkgs/erasure" - "github.com/minio-io/minio/pkgs/split" - "github.com/minio-io/minio/pkgs/storage" - "github.com/minio-io/minio/pkgs/storage/appendstorage" + "github.com/minio-io/minio/pkg/erasure" + "github.com/minio-io/minio/pkg/split" + "github.com/minio-io/minio/pkg/storage" + "github.com/minio-io/minio/pkg/storage/appendstorage" "github.com/spaolacci/murmur3" ) diff --git a/pkgs/storage/encodedstorage/encoded_storage_test.go b/pkg/storage/encodedstorage/encoded_storage_test.go similarity index 96% rename from pkgs/storage/encodedstorage/encoded_storage_test.go rename to pkg/storage/encodedstorage/encoded_storage_test.go index 9fb3581dd..d72f7d381 100644 --- a/pkgs/storage/encodedstorage/encoded_storage_test.go +++ b/pkg/storage/encodedstorage/encoded_storage_test.go @@ -7,8 +7,8 @@ import ( "strconv" "testing" - "github.com/minio-io/minio/pkgs/storage" - "github.com/minio-io/minio/pkgs/utils" + "github.com/minio-io/minio/pkg/storage" + "github.com/minio-io/minio/pkg/utils" . "gopkg.in/check.v1" ) diff --git a/pkgs/storage/storage.go b/pkg/storage/storage.go similarity index 100% rename from pkgs/storage/storage.go rename to pkg/storage/storage.go diff --git a/pkgs/strbyteconv/Makefile b/pkg/strbyteconv/Makefile similarity index 100% rename from pkgs/strbyteconv/Makefile rename to pkg/strbyteconv/Makefile diff --git a/pkgs/strbyteconv/strbyteconv.go b/pkg/strbyteconv/strbyteconv.go similarity index 100% rename from pkgs/strbyteconv/strbyteconv.go rename to pkg/strbyteconv/strbyteconv.go diff --git a/pkgs/strbyteconv/strbyteconv_test.go b/pkg/strbyteconv/strbyteconv_test.go similarity index 100% rename from pkgs/strbyteconv/strbyteconv_test.go rename to pkg/strbyteconv/strbyteconv_test.go diff --git a/pkgs/sysctl/sysctl_linux.go b/pkg/sysctl/sysctl_linux.go similarity index 96% rename from pkgs/sysctl/sysctl_linux.go rename to pkg/sysctl/sysctl_linux.go index f8eb3cca3..332b09ca9 100644 --- a/pkgs/sysctl/sysctl_linux.go +++ b/pkg/sysctl/sysctl_linux.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "github.com/minio-io/minio/pkgs/utils" + "github.com/minio-io/minio/pkg/utils" ) type Sysctl struct { diff --git a/pkgs/sysctl/sysctl_test.go b/pkg/sysctl/sysctl_test.go similarity index 100% rename from pkgs/sysctl/sysctl_test.go rename to pkg/sysctl/sysctl_test.go diff --git a/pkgs/utils/execpipe.go b/pkg/utils/execpipe.go similarity index 100% rename from pkgs/utils/execpipe.go rename to pkg/utils/execpipe.go diff --git a/pkgs/utils/execpipe_test.go b/pkg/utils/execpipe_test.go similarity index 100% rename from pkgs/utils/execpipe_test.go rename to pkg/utils/execpipe_test.go diff --git a/pkgs/utils/helpers.go b/pkg/utils/helpers.go similarity index 100% rename from pkgs/utils/helpers.go rename to pkg/utils/helpers.go