mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 23:47:49 +00:00
go-based packages: use go_configure(); GOPATH cleanup
This commit is contained in:
MilhouseVH
Matthias Reichl
parent
4d15490c67
commit
97c5d8d057
@ -16,46 +16,20 @@ PKG_TOOLCHAIN="manual"
|
|||||||
PKG_GIT_COMMIT="a4bc1d432a2c33aa2eed37f338dceabb93641310"
|
PKG_GIT_COMMIT="a4bc1d432a2c33aa2eed37f338dceabb93641310"
|
||||||
|
|
||||||
pre_make_target() {
|
pre_make_target() {
|
||||||
case ${TARGET_ARCH} in
|
|
||||||
x86_64)
|
|
||||||
export GOARCH=amd64
|
|
||||||
;;
|
|
||||||
arm)
|
|
||||||
export GOARCH=arm
|
|
||||||
|
|
||||||
case ${TARGET_CPU} in
|
go_configure
|
||||||
arm1176jzf-s)
|
|
||||||
export GOARM=6
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export GOARM=7
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
export GOARCH=arm64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
export GOOS=linux
|
|
||||||
export CGO_ENABLED=1
|
|
||||||
export CGO_NO_EMULATION=1
|
|
||||||
export CGO_CFLAGS=${CFLAGS}
|
|
||||||
export CONTAINERD_VERSION=${PKG_VERSION}
|
export CONTAINERD_VERSION=${PKG_VERSION}
|
||||||
export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
|
export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
|
||||||
export CONTAINERD_PKG=github.com/containerd/containerd
|
export CONTAINERD_PKG=github.com/containerd/containerd
|
||||||
export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC"
|
export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC"
|
||||||
export GOLANG=${TOOLCHAIN}/lib/golang/bin/go
|
|
||||||
export GOPATH=${PKG_BUILD}/.gopath
|
|
||||||
export GOROOT=${TOOLCHAIN}/lib/golang
|
|
||||||
export PATH=${PATH}:${GOROOT}/bin
|
|
||||||
|
|
||||||
mkdir -p ${PKG_BUILD}/.gopath
|
mkdir -p ${GOPATH}
|
||||||
if [ -d ${PKG_BUILD}/vendor ]; then
|
if [ -d ${PKG_BUILD}/vendor ]; then
|
||||||
mv ${PKG_BUILD}/vendor ${PKG_BUILD}/.gopath/src
|
mv ${PKG_BUILD}/vendor ${GOPATH}/src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -fs ${PKG_BUILD} ${PKG_BUILD}/.gopath/src/github.com/containerd/containerd
|
ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd
|
||||||
}
|
}
|
||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
|
|||||||
@ -13,43 +13,17 @@ PKG_LONGDESC="A native Go implementation for connecting containers."
|
|||||||
PKG_TOOLCHAIN="manual"
|
PKG_TOOLCHAIN="manual"
|
||||||
|
|
||||||
pre_make_target() {
|
pre_make_target() {
|
||||||
case $TARGET_ARCH in
|
go_configure
|
||||||
x86_64)
|
|
||||||
export GOARCH=amd64
|
|
||||||
;;
|
|
||||||
arm)
|
|
||||||
export GOARCH=arm
|
|
||||||
|
|
||||||
case $TARGET_CPU in
|
|
||||||
arm1176jzf-s)
|
|
||||||
export GOARM=6
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export GOARM=7
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
export GOARCH=arm64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
export GOOS=linux
|
|
||||||
export CGO_ENABLED=0
|
export CGO_ENABLED=0
|
||||||
export CGO_NO_EMULATION=1
|
|
||||||
export CGO_CFLAGS=$CFLAGS
|
|
||||||
export LDFLAGS="-extld $CC"
|
export LDFLAGS="-extld $CC"
|
||||||
export GOLANG=$TOOLCHAIN/lib/golang/bin/go
|
|
||||||
export GOPATH=$PKG_BUILD/.gopath
|
|
||||||
export GOROOT=$TOOLCHAIN/lib/golang
|
|
||||||
export PATH=$PATH:$GOROOT/bin
|
|
||||||
|
|
||||||
mkdir -p $PKG_BUILD/.gopath
|
mkdir -p ${GOPATH}
|
||||||
if [ -d $PKG_BUILD/vendor ]; then
|
if [ -d $PKG_BUILD/vendor ]; then
|
||||||
mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
|
mv $PKG_BUILD/vendor ${GOPATH}/src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/docker/libnetwork
|
ln -fs $PKG_BUILD ${GOPATH}/src/github.com/docker/libnetwork
|
||||||
}
|
}
|
||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
|
|||||||
@ -16,43 +16,16 @@ PKG_TOOLCHAIN="manual"
|
|||||||
PKG_GIT_COMMIT="425e105d5a03fabd737a126ad93d62a9eeede87f"
|
PKG_GIT_COMMIT="425e105d5a03fabd737a126ad93d62a9eeede87f"
|
||||||
|
|
||||||
pre_make_target() {
|
pre_make_target() {
|
||||||
case $TARGET_ARCH in
|
go_configure
|
||||||
x86_64)
|
|
||||||
export GOARCH=amd64
|
|
||||||
;;
|
|
||||||
arm)
|
|
||||||
export GOARCH=arm
|
|
||||||
|
|
||||||
case $TARGET_CPU in
|
|
||||||
arm1176jzf-s)
|
|
||||||
export GOARM=6
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export GOARM=7
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
export GOARCH=arm64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
export GOOS=linux
|
|
||||||
export CGO_ENABLED=1
|
|
||||||
export CGO_NO_EMULATION=1
|
|
||||||
export CGO_CFLAGS=$CFLAGS
|
|
||||||
export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld $CC"
|
export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld $CC"
|
||||||
export GOLANG=$TOOLCHAIN/lib/golang/bin/go
|
|
||||||
export GOPATH=$PKG_BUILD/.gopath
|
|
||||||
export GOROOT=$TOOLCHAIN/lib/golang
|
|
||||||
export PATH=$PATH:$GOROOT/bin
|
|
||||||
|
|
||||||
mkdir -p $PKG_BUILD/.gopath
|
mkdir -p ${GOPATH}
|
||||||
if [ -d $PKG_BUILD/vendor ]; then
|
if [ -d $PKG_BUILD/vendor ]; then
|
||||||
mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
|
mv $PKG_BUILD/vendor ${GOPATH}/src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/opencontainers/runc
|
ln -fs $PKG_BUILD ${GOPATH}/src/github.com/opencontainers/runc
|
||||||
}
|
}
|
||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
|
|||||||
@ -23,86 +23,63 @@ PKG_IS_ADDON="yes"
|
|||||||
PKG_ADDON_NAME="Docker"
|
PKG_ADDON_NAME="Docker"
|
||||||
PKG_ADDON_TYPE="xbmc.service"
|
PKG_ADDON_TYPE="xbmc.service"
|
||||||
|
|
||||||
|
PKG_DOCKER_BUILDTAGS="daemon \
|
||||||
|
autogen \
|
||||||
|
exclude_graphdriver_devicemapper \
|
||||||
|
exclude_graphdriver_aufs \
|
||||||
|
exclude_graphdriver_btrfs \
|
||||||
|
journald"
|
||||||
|
|
||||||
configure_target() {
|
configure_target() {
|
||||||
export DOCKER_BUILDTAGS="daemon \
|
go_configure
|
||||||
autogen \
|
|
||||||
exclude_graphdriver_devicemapper \
|
|
||||||
exclude_graphdriver_aufs \
|
|
||||||
exclude_graphdriver_btrfs \
|
|
||||||
journald"
|
|
||||||
|
|
||||||
case ${TARGET_ARCH} in
|
PKG_GOPATH_ENGINE=${GOPATH}
|
||||||
x86_64)
|
PKG_GOPATH_CLI=${GOPATH}_cli
|
||||||
export GOARCH=amd64
|
export GOPATH=${PKG_GOPATH_CLI}:${PKG_GOPATH_ENGINE}
|
||||||
;;
|
|
||||||
arm)
|
|
||||||
export GOARCH=arm
|
|
||||||
|
|
||||||
case ${TARGET_CPU} in
|
|
||||||
arm1176jzf-s)
|
|
||||||
export GOARM=6
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export GOARM=7
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
export GOARCH=arm64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
export GOOS=linux
|
|
||||||
export CGO_ENABLED=1
|
|
||||||
export CGO_NO_EMULATION=1
|
|
||||||
export CGO_CFLAGS=${CFLAGS}
|
|
||||||
export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
|
export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
|
||||||
export GOLANG=${TOOLCHAIN}/lib/golang/bin/go
|
|
||||||
export GOPATH=${PKG_BUILD}/.gopath_cli:${PKG_BUILD}/.gopath
|
|
||||||
export GOROOT=${TOOLCHAIN}/lib/golang
|
|
||||||
export PATH=${PATH}:${GOROOT}/bin
|
|
||||||
|
|
||||||
mkdir -p ${PKG_BUILD}/.gopath
|
mkdir -p ${PKG_GOPATH_ENGINE}
|
||||||
mkdir -p ${PKG_BUILD}/.gopath_cli
|
mkdir -p ${PKG_GOPATH_CLI}
|
||||||
|
|
||||||
PKG_ENGINE_PATH=${PKG_BUILD}/components/engine
|
PKG_ENGINE_PATH=${PKG_BUILD}/components/engine
|
||||||
PKG_CLI_PATH=${PKG_BUILD}/components/cli
|
PKG_CLI_PATH=${PKG_BUILD}/components/cli
|
||||||
|
|
||||||
if [ -d ${PKG_ENGINE_PATH}/vendor ]; then
|
if [ -d ${PKG_ENGINE_PATH}/vendor ]; then
|
||||||
mv ${PKG_ENGINE_PATH}/vendor ${PKG_BUILD}/.gopath/src
|
mv ${PKG_ENGINE_PATH}/vendor ${PKG_GOPATH_ENGINE}/src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d ${PKG_CLI_PATH}/vendor ]; then
|
if [ -d ${PKG_CLI_PATH}/vendor ]; then
|
||||||
mv ${PKG_CLI_PATH}/vendor ${PKG_BUILD}/.gopath_cli/src
|
mv ${PKG_CLI_PATH}/vendor ${PKG_GOPATH_CLI}/src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Fix missing/incompatible .go files
|
# Fix missing/incompatible .go files
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/moby/buildkit/frontend/* ${PKG_BUILD}/.gopath_cli/src/github.com/moby/buildkit/frontend
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/moby/buildkit/frontend/* ${PKG_GOPATH_CLI}/src/github.com/moby/buildkit/frontend
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/moby/buildkit/frontend/gateway/* ${PKG_BUILD}/.gopath_cli/src/github.com/moby/buildkit/frontend/gateway
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/moby/buildkit/frontend/gateway/* ${PKG_GOPATH_CLI}/src/github.com/moby/buildkit/frontend/gateway
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/moby/buildkit/solver/* ${PKG_BUILD}/.gopath_cli/src/github.com/moby/buildkit/solver
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/moby/buildkit/solver/* ${PKG_GOPATH_CLI}/src/github.com/moby/buildkit/solver
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/moby/buildkit/util/progress/* ${PKG_BUILD}/.gopath_cli/src/github.com/moby/buildkit/util/progress
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/moby/buildkit/util/progress/* ${PKG_GOPATH_CLI}/src/github.com/moby/buildkit/util/progress
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/docker/swarmkit/manager/* ${PKG_BUILD}/.gopath_cli/src/github.com/docker/swarmkit/manager
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/docker/swarmkit/manager/* ${PKG_GOPATH_CLI}/src/github.com/docker/swarmkit/manager
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/coreos/etcd/raft/* ${PKG_BUILD}/.gopath_cli/src/github.com/coreos/etcd/raft
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/coreos/etcd/raft/* ${PKG_GOPATH_CLI}/src/github.com/coreos/etcd/raft
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/golang.org/x/* ${PKG_BUILD}/.gopath_cli/src/golang.org/x
|
cp -rf ${PKG_GOPATH_ENGINE}/src/golang.org/x/* ${PKG_GOPATH_CLI}/src/golang.org/x
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/opencontainers/runtime-spec/specs-go/* ${PKG_BUILD}/.gopath_cli/src/github.com/opencontainers/runtime-spec/specs-go
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/opencontainers/runtime-spec/specs-go/* ${PKG_GOPATH_CLI}/src/github.com/opencontainers/runtime-spec/specs-go
|
||||||
|
|
||||||
rm -rf ${PKG_BUILD}/.gopath_cli/src/github.com/containerd/containerd
|
rm -rf ${PKG_GOPATH_CLI}/src/github.com/containerd/containerd
|
||||||
mkdir -p ${PKG_BUILD}/.gopath_cli/src/github.com/containerd/containerd
|
mkdir -p ${PKG_GOPATH_CLI}/src/github.com/containerd/containerd
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/containerd/containerd/* ${PKG_BUILD}/.gopath_cli/src/github.com/containerd/containerd
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/containerd/containerd/* ${PKG_GOPATH_CLI}/src/github.com/containerd/containerd
|
||||||
|
|
||||||
rm -rf ${PKG_BUILD}/.gopath_cli/src/github.com/containerd/continuity
|
rm -rf ${PKG_GOPATH_CLI}/src/github.com/containerd/continuity
|
||||||
mkdir -p ${PKG_BUILD}/.gopath_cli/src/github.com/containerd/continuity
|
mkdir -p ${PKG_GOPATH_CLI}/src/github.com/containerd/continuity
|
||||||
cp -rf ${PKG_BUILD}/.gopath/src/github.com/containerd/continuity/* ${PKG_BUILD}/.gopath_cli/src/github.com/containerd/continuity
|
cp -rf ${PKG_GOPATH_ENGINE}/src/github.com/containerd/continuity/* ${PKG_GOPATH_CLI}/src/github.com/containerd/continuity
|
||||||
|
|
||||||
mkdir -p ${PKG_BUILD}/.gopath_cli/src/github.com/docker/docker/builder
|
mkdir -p ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder
|
||||||
cp -rf ${PKG_ENGINE_PATH}/builder/* ${PKG_BUILD}/.gopath_cli/src/github.com/docker/docker/builder
|
cp -rf ${PKG_ENGINE_PATH}/builder/* ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder
|
||||||
|
|
||||||
if [ ! -L ${PKG_BUILD}/.gopath/src/github.com/docker/docker ];then
|
if [ ! -L ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker ];then
|
||||||
ln -fs ${PKG_ENGINE_PATH} ${PKG_BUILD}/.gopath/src/github.com/docker/docker
|
ln -fs ${PKG_ENGINE_PATH} ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -L ${PKG_BUILD}/.gopath_cli/src/github.com/docker/cli ];then
|
if [ ! -L ${PKG_GOPATH_CLI}/src/github.com/docker/cli ];then
|
||||||
ln -fs ${PKG_CLI_PATH} ${PKG_BUILD}/.gopath_cli/src/github.com/docker/cli
|
ln -fs ${PKG_CLI_PATH} ${PKG_GOPATH_CLI}/src/github.com/docker/cli
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# used for docker version
|
# used for docker version
|
||||||
@ -120,8 +97,8 @@ make_target() {
|
|||||||
PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli/version.Version=${VERSION}'"
|
PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli/version.Version=${VERSION}'"
|
||||||
PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'"
|
PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'"
|
||||||
PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'"
|
PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'"
|
||||||
${GOLANG} build -v -o bin/docker -a -tags "${DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS} ${PKG_CLI_FLAGS}" ./components/cli/cmd/docker
|
${GOLANG} build -v -o bin/docker -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS} ${PKG_CLI_FLAGS}" ./components/cli/cmd/docker
|
||||||
${GOLANG} build -v -o bin/dockerd -a -tags "${DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS}" ./components/engine/cmd/dockerd
|
${GOLANG} build -v -o bin/dockerd -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS}" ./components/engine/cmd/dockerd
|
||||||
}
|
}
|
||||||
|
|
||||||
makeinstall_target() {
|
makeinstall_target() {
|
||||||
|
|||||||
@ -21,35 +21,9 @@ PKG_ADDON_TYPE="xbmc.service"
|
|||||||
PKG_MAINTAINER="Anton Voyl (awiouy)"
|
PKG_MAINTAINER="Anton Voyl (awiouy)"
|
||||||
|
|
||||||
configure_target() {
|
configure_target() {
|
||||||
export CGO_CFLAGS=${CFLAGS}
|
go_configure
|
||||||
export CGO_ENABLED=1
|
|
||||||
export CGO_NO_EMULATION=1
|
|
||||||
export GOLANG=${TOOLCHAIN}/lib/golang/bin/go
|
|
||||||
export GOOS=linux
|
|
||||||
export GOROOT=${TOOLCHAIN}/lib/golang
|
|
||||||
export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC} \
|
export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC} \
|
||||||
-X github.com/syncthing/syncthing/lib/build.Version=v${PKG_VERSION}"
|
-X github.com/syncthing/syncthing/lib/build.Version=v${PKG_VERSION}"
|
||||||
export PATH=${PATH}:${GOROOT}/bin
|
|
||||||
|
|
||||||
case $TARGET_ARCH in
|
|
||||||
x86_64)
|
|
||||||
export GOARCH=amd64
|
|
||||||
;;
|
|
||||||
aarch64)
|
|
||||||
export GOARCH=arm64
|
|
||||||
;;
|
|
||||||
arm)
|
|
||||||
export GOARCH=arm
|
|
||||||
case $TARGET_CPU in
|
|
||||||
arm1176jzf-s)
|
|
||||||
export GOARM=6
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export GOARM=7
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
}
|
||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user