diff --git a/rpm/build_rpms.bsh b/rpm/build_rpms.bsh index 5dc151b3..70e07e36 100755 --- a/rpm/build_rpms.bsh +++ b/rpm/build_rpms.bsh @@ -42,23 +42,6 @@ $SUDO yum install -y make curl rpm-build tar bison perl-Digest-SHA mkdir -p ${CURDIR}/{BUILD,BUILDROOT,SOURCES,RPMS,SRPMS} -if ! command -v go; then - echo "Installing go... one way or another" - if [[ ${VERSION_ID[0]} == 5 ]]; then - $SUDO yum install -y curl.x86_64 glibc gcc - ${CURDIR}/golang_patch.bsh - "${RPMBUILD[@]}" -ba ${CURDIR}/SPECS/golang.spec - $SUDO yum install -y --nogpgcheck ${CURDIR}/RPMS/noarch/golang-1*.rpm \ - ${CURDIR}/RPMS/noarch/golang-pkg-bin-linux-amd64-1*.rpm \ - ${CURDIR}/RPMS/noarch/golang-src-1*.noarch.rpm \ - ${CURDIR}/RPMS/noarch/golang-pkg-linux-amd64-1*.noarch.rpm \ - ${CURDIR}/RPMS/noarch/golang-pkg-linux-386-1*.noarch.rpm - else - $SUDO yum install -y epel-release - $SUDO yum install -y golang - fi -fi - if command -v ruby > /dev/null 2>&1; then IFS_OLD=${IFS} IFS=. diff --git a/rpm/golang_patch.bsh b/rpm/golang_patch.bsh deleted file mode 100755 index 66734c2e..00000000 --- a/rpm/golang_patch.bsh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -set -eu - -cd $(dirname ${BASH_SOURCE[0]})/SOURCES - -#Get EPEL full list -curl -L -O https://dl.fedoraproject.org/pub/epel/fullfilelist -#Get latest golang src rpm -curl -L -O https://dl.fedoraproject.org/pub/epel/$(grep '^6/SRPMS/golang-[0-9].*src.rpm' fullfilelist) -rpm2cpio golang-*.src.rpm | cpio -diuv -#Patch the spec file to patch the build to work on CentOS 5 -sed -ri 's|(^%build)|\1\nsed -i '"'"'s:.*--build-id.*::'"'"' ./src/cmd/go/build.go|' golang*.spec -#Make SPEC CentOS 5 compliant -sed -ri 's|(^Name:.*)|\1\nGroup: Software|' golang.spec -sed -ri 's|(^Name:.*)|\1\nBuildRoot: %(echo %{_topdir}/BUILDROOT/%{name}-%{version})|' golang.spec -sed -ri 's|(^%package\s.*)|\1\nGroup: Software|' golang.spec -sed -i 's|%ifarch %{ix86}|%if %_arch == i686|' golang.spec -sed -i 's|%ifarch %{arm}|%if %_arch == armv6l|' golang.spec -sed -i 's|%ifarch|%if %_arch ==|' golang.spec -#The test WILL fail, so make the rpm not fail -sed -ri 's;(.*run.bash.*);\1|true;' golang.spec -mv golang.spec ../SPECS/ -