diff --git a/0001-support-nestos-variant.patch b/0001-support-nestos-variant.patch new file mode 100644 index 0000000..252f707 --- /dev/null +++ b/0001-support-nestos-variant.patch @@ -0,0 +1,30 @@ +From 51bab9d7d655479085dcaf4faaea5fcb92701844 Mon Sep 17 00:00:00 2001 +From: jianli-97 +Date: Mon, 15 Jan 2024 17:51:31 +0800 +Subject: [PATCH] support nestos variant + +--- + config/config.go | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/config/config.go b/config/config.go +index 4d095b2..2518f31 100644 +--- a/config/config.go ++++ b/config/config.go +@@ -62,6 +62,13 @@ func init() { + RegisterTranslator("fcos", "1.4.0", fcos1_4.ToIgn3_3Bytes) + RegisterTranslator("fcos", "1.5.0", fcos1_5.ToIgn3_4Bytes) + RegisterTranslator("fcos", "1.6.0-experimental", fcos1_6_exp.ToIgn3_5Bytes) ++ RegisterTranslator("nestos", "1.0.0", fcos1_0.ToIgn3_0Bytes) ++ RegisterTranslator("nestos", "1.1.0", fcos1_0.ToIgn3_0Bytes) ++ RegisterTranslator("nestos", "1.2.0", fcos1_0.ToIgn3_0Bytes) ++ RegisterTranslator("nestos", "1.3.0", fcos1_0.ToIgn3_0Bytes) ++ RegisterTranslator("nestos", "1.4.0", fcos1_0.ToIgn3_0Bytes) ++ RegisterTranslator("nestos", "1.5.0", fcos1_0.ToIgn3_0Bytes) ++ RegisterTranslator("nestos", "1.6.0-experimental", fcos1_6_exp.ToIgn3_5Bytes) + RegisterTranslator("flatcar", "1.0.0", flatcar1_0.ToIgn3_3Bytes) + RegisterTranslator("flatcar", "1.1.0", flatcar1_1.ToIgn3_4Bytes) + RegisterTranslator("flatcar", "1.2.0-experimental", flatcar1_2_exp.ToIgn3_5Bytes) +-- +2.33.0 + diff --git a/butane-0.14.0.tar.gz b/butane-0.14.0.tar.gz deleted file mode 100644 index 27b8cd5..0000000 Binary files a/butane-0.14.0.tar.gz and /dev/null differ diff --git a/butane.spec b/butane.spec index 6f20d30..057818a 100644 --- a/butane.spec +++ b/butane.spec @@ -17,56 +17,55 @@ 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 NEWS +%global godocs docs README.md Name: butane -Version: 0.14.0 -Release: 3 +Version: 0.18.0 +Release: 1 Summary: Butane config transpiler -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/coreos/butane -Source0: butane-0.14.0.tar.gz -Patch0: support-nestos-variant.patch +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +Patch0: 0001-support-nestos-variant.patch BuildRequires: golang Provides: nestos-config-transpiler = %{version}-%{release} Obsoletes: nestos-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.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.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4_experimental/types)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.13.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/yaml)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/davecgh/go-spew/spew)) = 1.1.1 +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/merge)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/parse)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4/types)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_5_experimental/types)) = 2.15.0 +Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.15.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.6-0.20210604193023.gitd5e0c0615ace -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.7.0 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.2 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0 -Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.0-20210107192922.git496545a6307b +Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description %{common_description} %package redistributable Summary: Statically built Butane for Linux, macOS and Windows -License: ASL 2.0 +License: Apache-2.0 BuildArch: noarch Obsoletes: butane-nonlinux < 0.13.1-3 @@ -89,10 +88,13 @@ echo "Building butane..." 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 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 @@ -102,7 +104,10 @@ 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 @@ -121,12 +126,18 @@ install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datad %files redistributable %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 +* Mon Jan 15 2024 lijian - 0.18.0-1 +- Upgrade to 0.18.0 + * Fri Dec 01 2023 chendexi - 0.14.0-3 - Delete the compilation of ppc64 and s390 architecture diff --git a/butane.yaml b/butane.yaml new file mode 100644 index 0000000..bde2cfd --- /dev/null +++ b/butane.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: coreos/butane +tag_prefix: "^v" +separator: "." \ No newline at end of file diff --git a/support-nestos-variant.patch b/support-nestos-variant.patch deleted file mode 100644 index 04b86d6..0000000 --- a/support-nestos-variant.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- butane-0.14.0/config/config.go 2022-01-28 05:32:23.000000000 +0800 -+++ butane-0.14.0-new/config/config.go 2022-10-26 11:15:02.844757275 +0800 -@@ -52,6 +52,12 @@ func init() { - RegisterTranslator("fcos", "1.3.0", fcos1_3.ToIgn3_2Bytes) - RegisterTranslator("fcos", "1.4.0", fcos1_4.ToIgn3_3Bytes) - RegisterTranslator("fcos", "1.5.0-experimental", fcos1_5_exp.ToIgn3_4Bytes) -+ RegisterTranslator("nestos", "1.0.0", fcos1_0.ToIgn3_0Bytes) -+ RegisterTranslator("nestos", "1.1.0", fcos1_1.ToIgn3_1Bytes) -+ RegisterTranslator("nestos", "1.2.0", fcos1_2.ToIgn3_2Bytes) -+ RegisterTranslator("nestos", "1.3.0", fcos1_3.ToIgn3_2Bytes) -+ RegisterTranslator("nestos", "1.4.0", fcos1_4.ToIgn3_3Bytes) -+ RegisterTranslator("nestos", "1.5.0-experimental", fcos1_5_exp.ToIgn3_4Bytes) - RegisterTranslator("openshift", "4.8.0", openshift4_8.ToConfigBytes) - RegisterTranslator("openshift", "4.9.0", openshift4_9.ToConfigBytes) - RegisterTranslator("openshift", "4.10.0", openshift4_10.ToConfigBytes) diff --git a/v0.18.0.tar.gz b/v0.18.0.tar.gz new file mode 100644 index 0000000..75bd4a0 Binary files /dev/null and b/v0.18.0.tar.gz differ