Hello community,
here is the log from the commit of package kubevirt for openSUSE:Factory
checked in at 2020-11-15 15:26:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kubevirt (Old)
and /work/SRC/openSUSE:Factory/.kubevirt.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubevirt"
Sun Nov 15 15:26:15 2020 rev:8 rq:848441 version:0.35.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kubevirt/kubevirt.changes 2020-11-11
20:46:30.495653419 +0100
+++ /work/SRC/openSUSE:Factory/.kubevirt.new.24930/kubevirt.changes
2020-11-15 15:27:35.635528670 +0100
@@ -1,0 +2,6 @@
+Fri Nov 13 23:32:52 UTC 2020 - James Fehlig <jfeh...@suse.com>
+
+- Fix -buildmode=pie
+ fix-goflags-overwrite.patch, dont-build-virtctl-darwin.patch
+
+-------------------------------------------------------------------
New:
----
dont-build-virtctl-darwin.patch
fix-goflags-overwrite.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kubevirt.spec ++++++
--- /var/tmp/diff_new_pack.wIFFpB/_old 2020-11-15 15:27:36.151529223 +0100
+++ /var/tmp/diff_new_pack.wIFFpB/_new 2020-11-15 15:27:36.155529227 +0100
@@ -26,6 +26,8 @@
Source0: %{name}-%{version}.tar.gz
Source1: kubevirt-psp-caasp.yaml
Source100: %{name}-rpmlintrc
+Patch0: fix-goflags-overwrite.patch
+Patch1: dont-build-virtctl-darwin.patch
BuildRequires: glibc-devel-static
BuildRequires: golang-packaging
BuildRequires: pkgconfig
++++++ dont-build-virtctl-darwin.patch ++++++
Don't build virtctl for darwin and windows
Noticed the following build failure when specifying '-buildmode=pie'
in GOFLAGS
/usr/lib64/go/1.13/pkg/tool/linux_amd64/link: running gcc failed: exit status 1
/usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld:
cannot
find 1144: No such file or directory
The failure was encountered when building virtctl for darwin and windows.
Remove the builds for these OSes.
Signed-off-by: Jim Fehlig <jfeh...@suse.com>
Index: kubevirt-0.35.0/hack/build-go.sh
===================================================================
--- kubevirt-0.35.0.orig/hack/build-go.sh
+++ kubevirt-0.35.0/hack/build-go.sh
@@ -114,15 +114,6 @@ for arg in $args; do
kubevirt::version::get_version_vars
echo "$KUBEVIRT_GIT_VERSION" >${CMD_OUT_DIR}/${BIN_NAME}/.version
-
- # build virtctl also for darwin and windows
- if [ "${BIN_NAME}" = "virtctl" ]; then
- GOOS=darwin GOARCH=amd64 go_build -i -o
${CMD_OUT_DIR}/${BIN_NAME}/${ARCH_BASENAME}-darwin-amd64 -ldflags
"$(kubevirt::version::ldflags)" $(pkg_dir darwin amd64)
- GOOS=windows GOARCH=amd64 go_build -i -o
${CMD_OUT_DIR}/${BIN_NAME}/${ARCH_BASENAME}-windows-amd64.exe -ldflags
"$(kubevirt::version::ldflags)" $(pkg_dir windows amd64)
- # Create symlinks to the latest binary of each architecture
- (cd ${CMD_OUT_DIR}/${BIN_NAME} && ln -sf
${ARCH_BASENAME}-darwin-amd64 ${BIN_NAME}-darwin)
- (cd ${CMD_OUT_DIR}/${BIN_NAME} && ln -sf
${ARCH_BASENAME}-windows-amd64.exe ${BIN_NAME}-windows.exe)
- fi
)
else
(
++++++ fix-goflags-overwrite.patch ++++++
Don't overwrite user-provided GOFLAGS
Signed-off-by: Jim Fehlig <jfeh...@suse.com>
Index: kubevirt-0.35.0/hack/common.sh
===================================================================
--- kubevirt-0.35.0.orig/hack/common.sh
+++ kubevirt-0.35.0/hack/common.sh
@@ -4,7 +4,7 @@ if [ -f cluster-up/hack/common.sh ]; the
source cluster-up/hack/common.sh
fi
-export GOFLAGS=-mod=vendor
+export GOFLAGS="$GOFLAGS -mod=vendor"
KUBEVIRT_DIR="$(
cd "$(dirname "$BASH_SOURCE[0]")/../"
@@ -23,7 +23,7 @@ ARCHITECTURE=$(uname -m)
function build_func_tests() {
mkdir -p "${TESTS_OUT_DIR}/"
- GOPROXY=off GOFLAGS=-mod=vendor \
+ GOPROXY=off GOFLAGS="$GOFLAGS -mod=vendor" \
go test -c "${KUBEVIRT_DIR}/tests" -o "${TESTS_OUT_DIR}/tests.test"
}
@@ -62,7 +62,7 @@ function kubevirt_version() {
KUBEVIRT_VERSION="$(kubevirt_version)"
function go_build() {
- GOPROXY=off GOFLAGS=-mod=vendor go build "$@"
+ GOPROXY=off GOFLAGS="$GOFLAGS -mod=vendor" go build "$@"
}
# Use this environment variable to set a local path to a custom CA certificate
for
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
