PR#12: Adopt SPDX license, correct a Requires name, and update newrelease.sh - rpms/kubernetes

rpms / kubernetes

#12 Adopt SPDX license, correct a Requires name, and update newrelease.sh

Merged 2 months ago by buckaroogeek. Opened 2 months ago by buckaroogeek.

rpms/ buckaroogeek/kubernetes rawhide into rawhide

Change license to SPDX standards

Bradley G Smith • 2 months ago

f493c6e

Correct requires naming for kubeadm

Bradley G Smith • 2 months ago

f7d1115

Remove other spec files

Bradley G Smith • 2 months ago

7a44c19

Modify SOURCE_DATE_EPOCH to handle missing value

Bradley G Smith • 2 months ago

71bf7b1

kubernetes.spec

file modified

+8 -10

		`@@ -236,21 +236,20 @@`
		`# GOLDFLAGS - see Makefile (make help) for more information`
		`export GOFLAGS="-buildmode=pie -compiler=gc -tags=rpm_crashtraceback${BUILDTAGS:+,}${BUILDTAGS:-}"`

		`- # define temporary linker options for use in GOLDFLAGS`
		`- GLINK="-compressdwarf=false -linkmode=external -extldflags '%{build_ldflags}'"`
		`+ export GOLDFLAGS="%{?currentgoldflags} -B 0x$(echo '%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}' \| sha1sum \| cut -d ' ' -f1) -compressdwarf=false -linkmode=external -extldflags '%{build_ldflags} %{?__golang_extldflags}'"`

		`# macro that executes make all for given cmd argument`
		`%define makecmd(o:) make all WHAT="cmd/%1" GOLDFLAGS="-B 0x$(head -c20 /dev/urandom\|od -An -tx1\|tr -d ' \\n') $GLINK"`

		`# Build each binary separately to generate a unique build-id.`
		`# Otherwise: Duplicate build-ids /builddir/build/BUILDROOT/.../usr/bin/kube-apiserver and /builddir/build/BUILDROOT/.../usr/bin/kubeadm`
		`- %makecmd kube-proxy`
		`- %makecmd kube-apiserver`
		`- %makecmd kube-controller-manager`
		`- %makecmd kubelet`
		`- %makecmd kubeadm`
		`- %makecmd kube-scheduler`
		`- %makecmd kubectl`
		`+ make WHAT="cmd/kube-proxy"`
		`+ make WHAT="cmd/kube-apiserver"`
		`+ make WHAT="cmd/kube-controller-manager"`
		`+ make WHAT="cmd/kubelet"`
		`+ make WHAT="cmd/kubeadm"`
		`+ make WHAT="cmd/kube-scheduler"`
		`+ make WHAT="cmd/kubectl"`

		`# Gen docs`
		`make WHAT="cmd/gendocs"`
		`@@ -401,7 +400,6 @@`
		`%{zsh_completions_dir}/_kubectl`

		`##############################################`
		`-`
		`%files systemd`
		`%license LICENSE`
		`%doc *.md`

newrelease.sh

file modified

+6 -1

		`@@ -114,9 +114,14 @@`
		`# basic clean up - remove spec if they exist`
		`if [ -f "./${SPEC}" ]; then`
		`rm "./${SPEC}"`
		`- echo "removed old spec file"`
		`+ echo "removed old spec file - ${SPEC}"`
		`fi`

		`+ # basic clean up - remove other spec file(s) if they exist`
		`+ if [ -f "./*.spec" ]; then`
		`+ rm "./*.spec"`
		`+ echo "removed other spec file(s)"`
		`+ fi`
		`# create spec file from template using variables from`
		`# configuration file`
		`# inspiration: https://blog.tratif.com/2023/01/27/bash-tips-3-templating-in-bash-scripts/`

template/kubernetes-template.spec

file modified

+10 -15

		`@@ -40,7 +40,7 @@`
		`Version: %{k8s_ver}`
		`Release: %autorelease`
		`Summary: Open Source Production-Grade Container Scheduling And Management Platform`
		`- License: ASL 2.0`
		`+ License: Apache-2.0`
		`URL: https://%{import_path}`
		`ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}`
		`Source0: https://%{provider_prefix}/archive/%{gittag}/%{repo}-%{tar_ver}.tar.gz`
		`@@ -115,7 +115,7 @@`
		`##############################################`
		`%package kubeadm`
		`Summary: Kubernetes tool for standing up clusters`
		`- Requires: kubernetes = %{version}-%{release}`
		`+ Requires: %{name} = %{version}-%{release}`

		`BuildRequires: golang >= %{golangver}`
		`BuildRequires: systemd`
		`@@ -236,21 +236,17 @@`
		`# GOLDFLAGS - see Makefile (make help) for more information`
		`export GOFLAGS="-buildmode=pie -compiler=gc -tags=rpm_crashtraceback${BUILDTAGS:+,}${BUILDTAGS:-}"`

		`- # define temporary linker options for use in GOLDFLAGS`
		`- GLINK="-compressdwarf=false -linkmode=external -extldflags '%{build_ldflags}'"`
		`-`
		`- # macro that executes make all for given cmd argument`
		`- %define makecmd(o:) make all WHAT="cmd/%1" GOLDFLAGS="-B 0x$(head -c20 /dev/urandom\|od -An -tx1\|tr -d ' \\n') $GLINK"`
		`+ export GOLDFLAGS="%{?currentgoldflags} -B 0x$(echo '%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}' \| sha1sum \| cut -d ' ' -f1) -compressdwarf=false -linkmode=external -extldflags '%{build_ldflags} %{?__golang_extldflags}'"`

		`# Build each binary separately to generate a unique build-id.`
		`# Otherwise: Duplicate build-ids /builddir/build/BUILDROOT/.../usr/bin/kube-apiserver and /builddir/build/BUILDROOT/.../usr/bin/kubeadm`
		`- %makecmd kube-proxy`
		`- %makecmd kube-apiserver`
		`- %makecmd kube-controller-manager`
		`- %makecmd kubelet`
		`- %makecmd kubeadm`
		`- %makecmd kube-scheduler`
		`- %makecmd kubectl`
		`+ make WHAT="cmd/kube-proxy"`
		`+ make WHAT="cmd/kube-apiserver"`
		`+ make WHAT="cmd/kube-controller-manager"`
		`+ make WHAT="cmd/kubelet"`
		`+ make WHAT="cmd/kubeadm"`
		`+ make WHAT="cmd/kube-scheduler"`
		`+ make WHAT="cmd/kubectl"`

		`# Gen docs`
		`make WHAT="cmd/gendocs"`
		`@@ -401,7 +397,6 @@`
		`%{zsh_completions_dir}/_kubectl`

		`##############################################`
		`-`
		`%files systemd`
		`%license LICENSE`
		`%doc *.md`