diff --git a/.gitignore b/.gitignore index b7753d4..38e9726 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /origin-1.3.0.tar.gz /origin-1.3.1.tar.gz /origin-1.4.0.tar.gz +/origin-1.4.1.tar.gz diff --git a/origin-1.4.0-build-platform.patch b/origin-1.4.0-build-platform.patch deleted file mode 100644 index 3ec89f2..0000000 --- a/origin-1.4.0-build-platform.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/Makefile b/Makefile -index 56db39c..5f66311 100644 ---- a/Makefile -+++ b/Makefile -@@ -234,6 +234,15 @@ build-cross: clean - hack/build-cross.sh - .PHONY: build-cross - -+# Build the release binaries for only the platform of the build host -+# (no cross compile) -+# -+# Example: -+# make build-platform -+build-platform: clean -+ hack/build-platform.sh -+.PHONY: build-platform -+ - # Install travis dependencies - # - # Example: -diff --git a/hack/build-platform.sh b/hack/build-platform.sh -new file mode 100755 -index 0000000..8f7312a ---- /dev/null -+++ b/hack/build-platform.sh -@@ -0,0 +1,54 @@ -+#!/bin/bash -+ -+# Build all compile targets and the base binaries for only the platform of the -+# host it's building on. (i.e. - no cross compile) -+STARTTIME=$(date +%s) -+source "$(dirname "${BASH_SOURCE}")/lib/init.sh" -+ -+source <(go env) -+platforms=( "${GOHOSTOS}/${GOARCH}" ) -+if [[ -n "${OS_ONLY_BUILD_PLATFORMS:-}" ]]; then -+ filtered=() -+ for platform in "${platforms[@]}"; do -+ if [[ "${platform}" =~ "${OS_ONLY_BUILD_PLATFORMS}" ]]; then -+ filtered+=("${platform}") -+ fi -+ done -+ platforms=("${filtered[@]}") -+fi -+ -+# Build the primary client/server for the host platform -+OS_BUILD_PLATFORMS=("${platforms[@]}") -+case "${GOHOSTOS}/${GOARCH}" in -+ "linux/amd64") -+ OS_GOFLAGS_LINUX_AMD64="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" -+ ;; -+ "linux/arm64") -+ OS_GOFLAGS_LINUX_ARM64="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" -+ ;; -+ "linux/386") -+ OS_GOFLAGS_LINUX_386="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" -+ ;; -+ "linux/arm") -+ OS_GOFLAGS_LINUX_ARM="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" -+ ;; -+ "linux/ppc64") -+ OS_GOFLAGS_LINUX_PPC64="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" -+ ;; -+ "linux/ppc64le") -+ OS_GOFLAGS_LINUX_PPC64LE="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" -+ ;; -+esac -+ -+# Pass the necessary tags -+OS_GOFLAGS="${OS_GOFLAGS:-} ${OS_IMAGE_COMPILE_GOFLAGS}" os::build::build_static_binaries "${OS_IMAGE_COMPILE_TARGETS[@]:-}" "${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]:-}" -+ -+# Make the primary client/server release. -+OS_RELEASE_ARCHIVE="openshift-origin" -+os::build::place_bins "${OS_CROSS_COMPILE_BINARIES[@]}" -+ -+# Make the image binaries release. -+OS_RELEASE_ARCHIVE="openshift-origin-image" -+os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}" -+ -+ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret" -diff --git a/origin.spec b/origin.spec -index f225228..b5e13da 100644 ---- a/origin.spec -+++ b/origin.spec -@@ -207,7 +207,11 @@ of docker. Exclude those versions of docker. - - %build - # Create Binaries -+%if 0%{?make_redistributable} - %{os_git_vars} hack/build-cross.sh -+%else -+%{os_git_vars} hack/build-go.sh -+%endif - - %if 0%{build_tests} - # Create extended.test -@@ -549,12 +553,12 @@ fi - /usr/sbin/%{name}-docker-excluder - - %post docker-excluder --# we always want to run this, since the -+# we always want to run this, since the - # package-list may be different with each version - %{name}-docker-excluder exclude - - %preun docker-excluder --# we always want to clear this out, since the -+# we always want to clear this out, since the - # package-list may be different with each version - /usr/sbin/%{name}-docker-excluder unexclude - diff --git a/origin-1.4.1-platform-compile.patch b/origin-1.4.1-platform-compile.patch new file mode 100644 index 0000000..3cd00a4 --- /dev/null +++ b/origin-1.4.1-platform-compile.patch @@ -0,0 +1,79 @@ +diff --git a/hack/build-cross.sh b/hack/build-cross.sh +index 6a1a572..dec7a6d 100755 +--- a/hack/build-cross.sh ++++ b/hack/build-cross.sh +@@ -20,7 +20,15 @@ OS_BUILD_PLATFORMS=("${platforms[@]}") + host_platform=$(os::build::host_platform) + if [[ $host_platform == "linux/ppc64le" ]]; then + OS_GOFLAGS_LINUX_PPC64LE="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" +-else ++elif [[ $host_platform == "linux/ppc64" ]]; then ++ OS_GOFLAGS_LINUX_PPC64="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" ++elif [[ $host_platform == "linux/arm" ]]; then ++ OS_GOFLAGS_LINUX_ARM="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" ++elif [[ $host_platform == "linux/arm64" ]]; then ++ OS_GOFLAGS_LINUX_ARM64="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" ++elif [[ $host_platform == "linux/386" ]]; then ++ OS_GOFLAGS_LINUX_386="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" ++elif [[ $host_platform == "linux/amd64" ]]; then + OS_GOFLAGS_LINUX_AMD64="-tags=gssapi" os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}" + fi + +diff --git a/hack/common.sh b/hack/common.sh +index 463ef9c..33a904d 100755 +--- a/hack/common.sh ++++ b/hack/common.sh +@@ -52,6 +52,21 @@ if [[ "$(os::build::host_platform)" == "linux/ppc64le" ]]; then + "linux/ppc64le" + ) + fi ++if [[ "$(os::build::host_platform)" == "linux/ppc64" ]]; then ++ OS_CROSS_COMPILE_PLATFORMS+=( ++ "linux/ppc64" ++ ) ++fi ++if [[ "$(os::build::host_platform)" == "linux/arm" ]]; then ++ OS_CROSS_COMPILE_PLATFORMS+=( ++ "linux/arm" ++ ) ++fi ++if [[ "$(os::build::host_platform)" == "linux/arm64" ]]; then ++ OS_CROSS_COMPILE_PLATFORMS+=( ++ "linux/arm64" ++ ) ++fi + + readonly OS_IMAGE_COMPILE_PLATFORMS + +@@ -468,14 +483,31 @@ function os::build::place_bins() { + elif [[ $platform == "linux/ppc64le" ]]; then + platform="linux/ppc64le" OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive_tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}" + platform="linux/ppc64le" OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive_tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}" ++ elif [[ $platform == "linux/ppc64" ]]; then ++ platform="linux/ppc64" OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive_tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}" ++ platform="linux/ppc64" OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive_tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}" ++ elif [[ $platform == "linux/arm" ]]; then ++ platform="linux/arm" OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive_tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}" ++ platform="linux/arm" OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive_tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}" ++ elif [[ $platform == "linux/arm64" ]]; then ++ platform="linux/arm64" OS_RELEASE_ARCHIVE="openshift-origin-client-tools" os::build::archive_tar "${OS_BINARY_RELEASE_CLIENT_LINUX[@]}" ++ platform="linux/arm64" OS_RELEASE_ARCHIVE="openshift-origin-server" os::build::archive_tar "${OS_BINARY_RELEASE_SERVER_LINUX[@]}" + else + echo "++ ERROR: No release type defined for $platform" + fi + else + if [[ $platform == "linux/amd64" ]]; then + platform="linux/64bit" os::build::archive_tar "./*" ++ elif [[ $platform == "linux/386" ]]; then ++ platform="linux/386" os::build::archive_tar "./*" + elif [[ $platform == "linux/ppc64le" ]]; then + platform="linux/ppc64le" os::build::archive_tar "./*" ++ elif [[ $platform == "linux/ppc64" ]]; then ++ platform="linux/ppc64" os::build::archive_tar "./*" ++ elif [[ $platform == "linux/arm" ]]; then ++ platform="linux/arm" os::build::archive_tar "./*" ++ elif [[ $platform == "linux/arm64" ]]; then ++ platform="linux/arm64" os::build::archive_tar "./*" + else + echo "++ ERROR: No release type defined for $platform" + fi diff --git a/origin.spec b/origin.spec index a78d75c..b99bfdb 100644 --- a/origin.spec +++ b/origin.spec @@ -21,12 +21,12 @@ # %commit and %os_git_vars are intended to be set by tito custom builders provided # in the .tito/lib directory. The values in this spec file will not be kept up to date. %{!?commit: -%global commit 208f05369554aed88b0ba8736a865cde2fa2097b +%global commit 3f9807ab8282e1af64128834b246c41ce50172d4 } %global shortcommit %(c=%{commit}; echo ${c:0:7}) # os_git_vars needed to run hack scripts during rpm builds %{!?os_git_vars: -%global os_git_vars OS_GIT_TREE_STATE=clean OS_GIT_VERSION=v1.4.0 OS_GIT_COMMIT=%{shortcommit} OS_GIT_MAJOR=1 OS_GIT_MINOR=3 +%global os_git_vars OS_GIT_TREE_STATE=clean OS_GIT_VERSION=v1.4.1 OS_GIT_COMMIT=%{shortcommit} OS_GIT_MAJOR=1 OS_GIT_MINOR=3 } %if 0%{?fedora} || 0%{?epel} @@ -49,7 +49,7 @@ Name: %{package_name} # Version is not kept up to date and is intended to be set by tito custom # builders provided in the .tito/lib directory of this project -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Open Source Container Management by Red Hat License: ASL 2.0 @@ -62,19 +62,13 @@ URL: https://%{import_path} #ExclusiveArch: x86_64 aarch64 ppc64le #%endif -# There's a bug in golang 1.6.x and 1.7.x compiler that is causing a build -# failure for armv7hl. Exclude it for now. -# https://bugzilla.redhat.com/show_bug.cgi?id=1378972 - -# ExclusiveArch: x86_64 aarch64 %{ix86} %{power64} - # As of golang 1.7.4-2.fc26, this fails for ppc64 (but not for ppc64le) -ExclusiveArch: x86_64 aarch64 %{ix86} ppc64le +ExcludeArch: ppc64 ppc64p7 Source0: https://%{import_path}/archive/%{commit}/%{name}-%{version}.tar.gz -# Submitted upstream https://github.com/openshift/origin/pull/10997 -Patch0: origin-1.4.0-build-platform.patch +# Patch to enable all build architectures +Patch0: origin-1.4.1-platform-compile.patch BuildRequires: systemd BuildRequires: bsdtar @@ -1463,11 +1457,13 @@ Provides: bundled(golang(k8s.io/kubernetes/third_party/forked/golang/template)) %description -Origin is a distribution of Kubernetes optimized for enterprise application -development and deployment, used by OpenShift 3 and Atomic Enterprise. Origin -adds developer and operational centric tools on top of Kubernetes to enable -rapid application development, easy deployment and scaling, and long-term -lifecycle maintenance for small and large teams and applications. +OpenShift Origin is a distribution of Kubernetes optimized for application +development and deployment. OpenShift Origin adds developer and operational +centric tools on top of Kubernetes to enable rapid application development, easy +deployment and scaling, and long-term lifecycle maintenance for small and large +teams and applications. It provides a secure and multi-tenant configuration for +Kubernetes allowing you to safely host many different applications and workloads +on a unified cluster. %package master Summary: %{product_name} Master @@ -1583,18 +1579,39 @@ of docker. Exclude those versions of docker. %prep %setup -q -n %{name}-%{commit} -%if ! 0%{?make_redistributable} %patch0 -p1 -chmod +x hack/build-platform.sh -%endif %build +echo "GOLANG DEBUG OUTPUT" +go version -%if 0%{?make_redistributable} -# Create Binaries -%{os_git_vars} hack/build-cross.sh +%if 0%{make_redistributable} +# Create Binaries for all supported arches + %{os_git_vars} hack/build-cross.sh %else -%{os_git_vars} hack/build-platform.sh +# Create Binaries only for building arch +%ifarch x86_64 + BUILD_PLATFORM="linux/amd64" +%endif +%ifarch %{ix86} + BUILD_PLATFORM="linux/386" +%endif +%ifarch ppc64le + BUILD_PLATFORM="linux/ppc64le" +%endif +%ifarch ppc64 ppc64p7 + BUILD_PLATFORM="linux/ppc64" +%endif +%ifarch aarch64 + BUILD_PLATFORM="linux/arm64" +%endif +%ifarch %{arm} + BUILD_PLATFORM="linux/arm" +%endif +%ifarch s390x + BUILD_PLATFORM="linux/s390x" +%endif +OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-cross.sh %endif %if 0%{build_tests} @@ -1950,8 +1967,14 @@ fi /usr/sbin/%{name}-docker-excluder unexclude %changelog +* Thu Feb 16 2017 Adam Miller - 1.4.1-1 +- Update to latest upstream - 1.4.1 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 23 2017 Adam Miller - 1.4.0-1 -- Update to latest upestream - 1.4.0 +- Update to latest upstream - 1.4.0 * Tue Oct 25 2016 Adam Miller - 1.3.1-1 - Update to latest upstream - 1.3.1 diff --git a/sources b/sources index aa032ee..5a54a86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (origin-1.4.0.tar.gz) = e92684fe37a8a327113f012407564314aab2acd89d9febc548499718ddd49dc42f44c271e9d285722e4e74e67c4e72c4a2245dfdc1582a5f7e205248f0a3a75f +SHA512 (origin-1.4.1.tar.gz) = 3f007c93c2f7dbb591ecb1b9745dcb67faa8b7de5eeeedc29c01a345b3cbb1a6b2ac3bfe7a14c44a801b9ad75628669244f56e380375c4e82865ebbf548c10b2