rpms/ignition
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop Git commit hash from Release

Browse Source 
We've been using a release + patches workflow for a while now.
This commit is contained in:
Benjamin Gilbert 2021-02-05 17:39:51 -05:00
parent 0332d11d03
commit 053eaac99b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -52,3 +52,4 @@
/ignition-db4d30d.tar.gz /ignition-db4d30d.tar.gz
/ignition-c733d23.tar.gz /ignition-c733d23.tar.gz
/ignition-1d56dc8.tar.gz /ignition-1d56dc8.tar.gz
/ignition-2.9.0.tar.gz

12
ignition.spec
View File

@ -49,8 +49,6 @@
# https://github.com/coreos/ignition # https://github.com/coreos/ignition
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}/v2 %global import_path %{provider_prefix}/v2
%global commit 1d56dc8e717a10c1a8b392050bcb3d269cd42154
%global shortcommit %(c=%{commit}; echo ${c:0:7})
# define ldflags, buildflags, testflags here. The ldflags were # define ldflags, buildflags, testflags here. The ldflags were
# taken from ./build. We will need to periodically check these # taken from ./build. We will need to periodically check these
# for consistency # for consistency
@ -61,11 +59,11 @@
Name: ignition Name: ignition
Version: 2.9.0 Version: 2.9.0
Release: 4.git%{shortcommit}%{?dist} Release: 4%{?dist}
Summary: First boot installer and configuration tool Summary: First boot installer and configuration tool
License: ASL 2.0 License: ASL 2.0
URL: https://%{provider_prefix} URL: https://%{provider_prefix}
Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz
# Fix AWS probing by using the IMDS token URL to ensure that networking is up # Fix AWS probing by using the IMDS token URL to ensure that networking is up
# https://github.com/coreos/ignition/pull/1161 # https://github.com/coreos/ignition/pull/1161
Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch
@ -445,9 +443,8 @@ building binaries to sign by Fedora release engineering and include on the
Ignition project's Github releases page. Ignition project's Github releases page.
%prep %prep
# setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html
# unpack source0 and apply patches # unpack source0 and apply patches
%setup -T -b 0 -q -n %{repo}-%{commit} %setup -q
%patch0 -p1 %patch0 -p1
%build %build
@ -610,7 +607,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%endif %endif
%changelog %changelog
* Fri Feb 05 2021 Benjamin Gilbert <bgilbert@redhat.com> - 2.9.0-4.git1d56dc8 * Fri Feb 05 2021 Benjamin Gilbert <bgilbert@redhat.com> - 2.9.0-4
- Drop Git commit hash from Release
- Correctly enable IMDS patch - Correctly enable IMDS patch
- Set ExclusiveArch from %%go_arches - Set ExclusiveArch from %%go_arches

2
sources
View File

@ -1 +1 @@
SHA512 (ignition-1d56dc8.tar.gz) = 44e334128443f79f7b814a27df80288a204f2f24cb449fe43836bcb5e0c5e27f8065193d4a934cafc04221b2237f9a55695a1a7bd22158317fad1050321717c8 SHA512 (ignition-2.9.0.tar.gz) = 714ae90fb32a45e1b21e0b0671e7933ce302cdd943cd02cfc221e8bf88269fb464ff5f740d54b444e5c341a3877bf2943ca6f2c2f1374df904386400d73ebe97