Compare commits

..

No commits in common. "rawhide" and "f32" have entirely different histories.

7 changed files with 62 additions and 210 deletions

17
.gitignore vendored
View file

@ -1,18 +1 @@
/butane-0.11.0.tar.gz
/butane-0.12.0.tar.gz
/butane-0.12.1.tar.gz
/butane-0.13.0.tar.gz
/butane-0.13.1.tar.gz
/butane-0.14.0.tar.gz
/butane-0.15.0.tar.gz
/butane-0.16.0.tar.gz
/butane-0.17.0.tar.gz
/butane-0.18.0.tar.gz
/butane-0.19.0.tar.gz
/butane-0.20.0.tar.gz
/butane-0.21.0.tar.gz
/butane-0.22.0.tar.gz
/butane-0.23.0.tar.gz
/butane-0.24.0.tar.gz
/butane-0.25.0.tar.gz
/butane-0.25.1.tar.gz

View file

@ -0,0 +1,17 @@
Fix test failure on 386
https://github.com/coreos/vcontext/pull/14
diff --git a/vendor/github.com/coreos/vcontext/report/report.go b/vendor/github.com/coreos/vcontext/report/report.go
index 5378e84..618bc75 100644
--- a/vendor/github.com/coreos/vcontext/report/report.go
+++ b/vendor/github.com/coreos/vcontext/report/report.go
@@ -131,7 +131,7 @@ func (r *Report) AddOn(c path.ContextPath, err error, k EntryKind) {
}
r.Entries = append(r.Entries, Entry{
Message: err.Error(),
- Context: c,
+ Context: c.Copy(),
Kind: k,
})
}

View file

@ -1,11 +0,0 @@
# Butane sources (including vendored sources) have duplicate files because
# of how spec versioning is implemented
addFilter("butane-debugsource.x86_64: W: files-duplicate")
addFilter("butane-debugsource.x86_64: E: files-duplicated-waste")
# -redistributable is supposed to have binaries in it
addFilter("butane-redistributable.noarch: E: arch-independent-package-contains-binary-or-object")
# This is documented as optional
# https://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages#Do_I_need_to_Provide_my_old_package_names.3F
addFilter("butane-redistributable.noarch: W: obsolete-not-provided butane-nonlinux")

View file

@ -1,33 +1,31 @@
# Originally generated by go2rpm 1.3
%if 0%{?fedora}
%bcond_without check
%else
# %%gocheck isn't currently provided on CentOS/RHEL
# https://bugzilla.redhat.com/show_bug.cgi?id=1982298
%bcond_with check
%endif
# https://github.com/coreos/butane
%global goipath github.com/coreos/butane
%global gomodulesmode GO111MODULE=on
Version: 0.25.1
Version: 0.11.0
%gometa -f
%gometa
%global common_description %{expand:
Butane translates human-readable Butane Configs into machine-readable Ignition
configs for provisioning operating systems that use Ignition.}
%global golicenses LICENSE
%global godocs docs README.md
%global godocs docs README.md NEWS
Name: butane
Release: 2%{?dist}
Release: 1%{?dist}
Summary: Butane config transpiler
License: Apache-2.0
# Upstream license specification: Apache-2.0
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
# Fix test failure on 32-bit
# https://github.com/coreos/vcontext/pull/14
Patch0: butane-0.11.0-fix-vcontext-report-copy.patch
# Upgrade path from old FCCT package; can be dropped in Fedora 36
Provides: fedora-coreos-config-transpiler = %{version}-%{release}
@ -36,54 +34,46 @@ Obsoletes: fedora-coreos-config-transpiler < 0.10.0-2
Provides: fcct = %{version}-%{release}
# Generated by go-mods-to-bundled-provides.py
Provides: bundled(golang(github.com/clarketm/json)) = 1.17.1
Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1
Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.5.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/doc)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/merge)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/parse)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_5/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_6_experimental/types)) = 2.23.0
Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.23.0
Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/yaml)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.7
Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.10.0
Provides: bundled(golang(github.com/stretchr/testify/assert/yaml)) = 1.10.0
Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0
Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
Provides: bundled(golang(github.com/clarketm/json)) = 1.14.1
Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0
Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = 0.0.0-20190321100706.git95778dfbb74e
Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 0.0.0-20190321100706.git95778dfbb74e
Provides: bundled(golang(github.com/coreos/ignition/v2/config/merge)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3_experimental/types)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.9.1-20210304043908.git47da4066daa8
Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20201120045928.gitb0e13dab675c
Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20201120045928.gitb0e13dab675c
Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20201120045928.gitb0e13dab675c
Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20201120045928.gitb0e13dab675c
Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20201120045928.gitb0e13dab675c
Provides: bundled(golang(github.com/coreos/vcontext/yaml)) = 0.0.0-20201120045928.gitb0e13dab675c
Provides: bundled(golang(github.com/davecgh/go-spew/spew)) = 1.1.1
Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5
Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.5.1
Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb
Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.0-20191010095647.gitfc94e3f71652
%description
%{common_description}
%package redistributable
Summary: Statically built Butane for Linux, macOS and Windows
License: Apache-2.0
%package nonlinux
Summary: Butane for macOS and Windows
License: ASL 2.0
BuildArch: noarch
# In case someone has this subpackage installed, obsolete the old name
# Drop in Fedora 38
Obsoletes: butane-nonlinux < 0.13.1-3
%description redistributable
%description nonlinux
%{common_description}
This package contains statically linked Linux, macOS and Windows Butane
binaries built through cross-compilation. Do not install it. It is only
used for building release binaries to be signed by Fedora release
engineering and uploaded to the Butane GitHub releases page.
This package contains macOS and Windows Butane binaries built through
cross-compilation. Do not install it. It is only used for building release
binaries to be signed by Fedora release engineering and uploaded to the
Butane GitHub releases page.
%prep
%goprep -k
@ -96,17 +86,10 @@ export GOFLAGS="-mod=vendor"
echo "Building butane..."
%gobuild -o ./butane internal/main.go
%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c8 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x
echo "Building Linux Butane with static linking..."
CGO_ENABLED=0 GOARCH=arm64 GOOS=linux %gocrossbuild -o butane-aarch64-unknown-linux-gnu-static internal/main.go
CGO_ENABLED=0 GOARCH=ppc64le GOOS=linux %gocrossbuild -o butane-ppc64le-unknown-linux-gnu-static internal/main.go
CGO_ENABLED=0 GOARCH=s390x GOOS=linux %gocrossbuild -o butane-s390x-unknown-linux-gnu-static internal/main.go
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux %gocrossbuild -o butane-x86_64-unknown-linux-gnu-static internal/main.go
%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x
echo "Building macOS Butane..."
GOARCH=amd64 GOOS=darwin %gocrossbuild -o butane-x86_64-apple-darwin internal/main.go
GOARCH=arm64 GOOS=darwin %gocrossbuild -o butane-aarch64-apple-darwin internal/main.go
echo "Building Windows Butane..."
GOARCH=amd64 GOOS=windows %gocrossbuild -o butane-x86_64-pc-windows-gnu.exe internal/main.go
@ -116,13 +99,8 @@ install -d -p %{buildroot}%{_bindir}
install -p -m 0755 ./butane %{buildroot}%{_bindir}
ln -s butane %{buildroot}%{_bindir}/fcct
install -d -p %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-aarch64-apple-darwin %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-aarch64-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-ppc64le-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-s390x-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-x86_64-apple-darwin %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/butane
install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
%if %{with check}
%check
@ -135,123 +113,12 @@ install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datad
%{_bindir}/butane
%{_bindir}/fcct
%files redistributable
%files nonlinux
%license %{golicenses}
%dir %{_datadir}/butane
%{_datadir}/butane/butane-aarch64-apple-darwin
%{_datadir}/butane/butane-aarch64-unknown-linux-gnu-static
%{_datadir}/butane/butane-ppc64le-unknown-linux-gnu-static
%{_datadir}/butane/butane-s390x-unknown-linux-gnu-static
%{_datadir}/butane/butane-x86_64-apple-darwin
%{_datadir}/butane/butane-x86_64-pc-windows-gnu.exe
%{_datadir}/butane/butane-x86_64-unknown-linux-gnu-static
%changelog
* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 0.25.1-2
- rebuild
* Wed Sep 24 2025 Tiago Bueno <tiago.bueno@gmail.com> - 0.25.1-1
- New release
* Mon Sep 08 2025 Tiago Bueno <tiago.bueno@gmail.com> - 0.25.0-1
- New release
* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 0.24.0-3
- Rebuild for golang-1.25.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue May 27 2025 Steven Presti <spresti@redhat.com> - 0.24.0-1
- New release
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Dec 05 2024 Steven Presti <spresti@redhat.com> - 0.23.0-1
- New release
* Fri Sep 20 2024 Yasmin de Souza <ydesouza@redhat.com> - 0.22.0-1
- New release
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jun 6 2024 Yasmin de Souza <ydesouza@redhat.com> - 0.21.0-1
- New release
* Wed Apr 24 2024 Timothée Ravier <tim@siosm.fr> - 0.20.0-2
- Exclude ix86
* Mon Feb 19 2024 Steven Presti <spresti@redhat.com> - 0.20.0-1
- New release
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0.19.0-4
- Rebuild for golang 1.22.0
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Oct 03 2023 Steven Presti <spresti@redhat.com> - 0.19.0-1
- New release
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Mar 28 2023 Steven Presti <spresti@redhat.com> - 0.18.0-1
- New release
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 4 2023 Sohan Kunkerkar <skunkerk@redhat.com> - 0.17.0-1
- New release
* Fri Oct 14 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.16.0-1
- New release
- Switch License tags to SPDX
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 27 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.15.0-2
- Add macOS aarch64 binary to -redistributable
* Mon Jun 27 2022 Steven Presti <spresti@redhat.com> - 0.15.0-1
- New release
* Fri Jun 17 2022 Robert-André Mauchin <zebob.m@gmail.com> - 0.14.0-2
- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
CVE-2022-29526, CVE-2022-30629
* Thu Jan 27 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.14.0-1
- New release
* Tue Jan 25 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.1-3
- Rename -nonlinux subpackage to -redistributable
- Add static Linux binaries to -redistributable
- Enable %%gocheck only on Fedora
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Aug 04 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.1-1
- New release
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 14 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.0-1
- New release
* Thu Jun 10 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.12.1-1
- New release
* Tue Jun 08 2021 Sohan Kunkerkar <skunkerk@redhat.com> - 0.12.0-1
- New release
* Tue Apr 06 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.11.0-1
- Initial package

View file

@ -51,7 +51,7 @@ def go_mod_tag_to_rpm_provides_version(tag):
tag = tag[1:]
# is this a pseudo-version? e.g. v0.0.0-20181031085051-9002847aa142
m = re.match("(.*)-([0-9.]+)-([a-f0-9]{12})", tag)
m = re.match("(.*)-([0-9]{14})-([a-f0-9]{12})", tag)
if m:
# rpm doesn't like multiple dashes in the version, so just merge the
# timestamp and the commit checksum into the "release" field

View file

@ -1,4 +0,0 @@
---
debuginfo:
ignore:
- /usr/share/butane/butane-*-unknown-linux-gnu-static

View file

@ -1 +1 @@
SHA512 (butane-0.25.1.tar.gz) = 602f0075381cb98096b7a7cb1d7df8542f86f1391b2071029a72193237b0596063c758b989e118a0eef5ae9d070f98c36811bb92bb03a99dfc86832995e291bb
SHA512 (butane-0.11.0.tar.gz) = c3c6a86fd953f51bba5188ade762250f32419513797b67f12081f15e56a2a0e505527f4d9841fbe5ae81d86b160e42458b077a41f9392ec7f9049b539364de81