github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-01 01:33:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #243 from marcov/packaging-golang

Browse Source 
golang version requirements for OBS packaging
This commit is contained in:
James O. D. Hunt 2018-11-20 13:57:53 +00:00 committed by GitHub
commit 5eda4b1020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obs-packaging/gen_versions_txt.sh
View File

@ -5,6 +5,7 @@
# #
[ -z "${DEBUG}" ] || set -x [ -z "${DEBUG}" ] || set -x
set -e
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
@ -40,7 +41,6 @@ gen_version_file() {
kernel_version=${kernel_version#v} kernel_version=${kernel_version#v}
golang_version=$(get_from_kata_deps "languages.golang.meta.newest-version" "${kata_version}") golang_version=$(get_from_kata_deps "languages.golang.meta.newest-version" "${kata_version}")
golang_version="1.10.2"
golang_sha256=$(curl -s -L "https://storage.googleapis.com/golang/go${golang_version}.linux-${ARCH}.tar.gz.sha256") golang_sha256=$(curl -s -L "https://storage.googleapis.com/golang/go${golang_version}.linux-${ARCH}.tar.gz.sha256")
# - is not a valid char for rpmbuild # - is not a valid char for rpmbuild

8
obs-packaging/runtime/debian.rules-template
View File

@ -27,7 +27,10 @@ override_dh_auto_build:
tar xzf /usr/src/packages/SOURCES/go$(GO_VERSION).linux-@GO_ARCH@.tar.gz -C /usr/src/packages/BUILD/local tar xzf /usr/src/packages/SOURCES/go$(GO_VERSION).linux-@GO_ARCH@.tar.gz -C /usr/src/packages/BUILD/local
ln -s /usr/src/packages/BUILD /usr/src/packages/BUILD/go/src/$(IMPORTNAME) ln -s /usr/src/packages/BUILD /usr/src/packages/BUILD/go/src/$(IMPORTNAME)
cd $(GOPATH)/src/$(IMPORTNAME)/; \ cd $(GOPATH)/src/$(IMPORTNAME)/; \
make QEMUPATH=/usr/bin/$(DEFAULT_QEMU) COMMIT=@HASH@ make \
QEMUPATH=/usr/bin/$(DEFAULT_QEMU) \
COMMIT=@HASH@ \
SKIP_GO_VERSION_CHECK=1
override_dh_auto_install: override_dh_auto_install:
mkdir -p debian/$(PKG_NAME) mkdir -p debian/$(PKG_NAME)
@ -37,6 +40,7 @@ override_dh_auto_install:
DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \ DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \
PREFIX=/usr \ PREFIX=/usr \
COMMIT=@HASH@ \ COMMIT=@HASH@ \
QEMUPATH=/usr/bin/$(DEFAULT_QEMU) QEMUPATH=/usr/bin/$(DEFAULT_QEMU) \
SKIP_GO_VERSION_CHECK=1
sed -i -e '/^initrd =/d' $(shell pwd)/debian/$(PKG_NAME)/usr/share/defaults/kata-containers/configuration.toml sed -i -e '/^initrd =/d' $(shell pwd)/debian/$(PKG_NAME)/usr/share/defaults/kata-containers/configuration.toml

6
obs-packaging/runtime/kata-runtime.spec-template
View File

@ -69,7 +69,10 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/
mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG} mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG}
ln -s $HOME/rpmbuild/BUILD/kata-runtime-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} ln -s $HOME/rpmbuild/BUILD/kata-runtime-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
make QEMUPATH=/usr/bin/%{DEFAULT_QEMU} COMMIT=@HASH@ make \
QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \
COMMIT=@HASH@ \
SKIP_GO_VERSION_CHECK=1
%check %check
export http_proxy=http://127.0.0.1:9/ export http_proxy=http://127.0.0.1:9/
@ -88,6 +91,7 @@ make \
PREFIX=/usr \ PREFIX=/usr \
QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \ QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \
COMMIT=@HASH@ \ COMMIT=@HASH@ \
SKIP_GO_VERSION_CHECK=1 \
install install
sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configuration.toml sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configuration.toml