[wip] sys-apps/ignition: sed s/flatcar-linux/flatcar patches

* dropped 2 non applied patches from previous upgrade * patch 0016 can be merged with 0002 once flatcar/ign-converter is released. Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar-archive · Sep 7, 2022 · 8d5955a · 8d5955a
1 parent 0840a2d
commit 8d5955a
Show file tree

Hide file tree

Showing 14 changed files with 1,509 additions and 1,630 deletions.
diff --git a/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch b/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch
diff --git a/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch b/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch
@@ -16,8 +16,8 @@ index e5a47737..9b5da9f3 100644
  	github.com/coreos/go-semver v0.3.0
  	github.com/coreos/go-systemd/v22 v22.0.0
  	github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4
-+	github.com/flatcar-linux/ign-converter v0.2.0
-+	github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
++	github.com/flatcar/ign-converter v0.2.0
++	github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
  	github.com/google/renameio v0.1.0
  	github.com/google/uuid v1.1.1
  	github.com/pin/tftp v2.1.0+incompatible

diff --git a/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch b/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch
@@ -44,11 +44,11 @@ index 097b98c7..afe8e529 100644
  github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
  github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
  github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-+github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
-+github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
-+github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
-+github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
-+github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
++github.com/flatcar/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
++github.com/flatcar/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
++github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
++github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
++github.com/flatcar/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
  github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
  github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
  github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

diff --git a/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch b/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch
diff --git a/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.1.patch b/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.1.patch
diff --git a/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch b/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch
@@ -24,16 +24,16 @@ index 512fc9f0..b0375236 100644
 +	"encoding/json"
 +	"fmt"
 +
-+	"github.com/flatcar-linux/ignition/config/v2_4"
- 	"github.com/flatcar-linux/ignition/v2/config/merge"
- 	"github.com/flatcar-linux/ignition/v2/config/shared/errors"
- 	"github.com/flatcar-linux/ignition/v2/config/util"
++	"github.com/flatcar/ignition/config/v2_4"
+ 	"github.com/flatcar/ignition/v2/config/merge"
+ 	"github.com/flatcar/ignition/v2/config/shared/errors"
+ 	"github.com/flatcar/ignition/v2/config/util"
 @@ -25,6 +29,8 @@ import (
 
  	"github.com/coreos/go-semver/semver"
  	"github.com/coreos/vcontext/report"
 +
-+	"github.com/flatcar-linux/ign-converter/translate/v24tov31"
++	"github.com/flatcar/ign-converter/translate/v24tov31"
  )
 
  func Merge(parent, child types.Config) types.Config {

diff --git a/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patche.patch b/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patche.patch
diff --git a/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch b/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch
@@ -18,10 +18,10 @@ index a4ebec6a..0ae9cd66 100644
  	"strings"
  	"time"
 
-+	iErrors "github.com/flatcar-linux/ignition/v2/config/shared/errors"
- 	"github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types"
- 	"github.com/flatcar-linux/ignition/v2/internal/providers/util"
- 	"github.com/flatcar-linux/ignition/v2/internal/resource"
++	iErrors "github.com/flatcar/ignition/v2/config/shared/errors"
+ 	"github.com/flatcar/ignition/v2/config/v3_4_experimental/types"
+ 	"github.com/flatcar/ignition/v2/internal/providers/util"
+ 	"github.com/flatcar/ignition/v2/internal/resource"
 @@ -37,9 +38,11 @@ import (
  	"github.com/coreos/vcontext/report"
  )
@@ -31,7 +31,7 @@ index a4ebec6a..0ae9cd66 100644
 -	firmwareConfigSizePath = "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/size"
 +var (
 +	firmwareConfigPaths = map[string]string{
-+		"/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar-linux/config/raw": "/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar-linux/config/size",
++		"/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar/config/raw": "/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar/config/size",
 +		"/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/raw":        "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/size",
 +	}
  )

diff --git a/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch
@@ -34,8 +34,8 @@ index 66ff5490..327ad52b 100644
  	"fmt"
 +	"net/url"
 
- 	"github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types"
- 	"github.com/flatcar-linux/ignition/v2/internal/providers"
+ 	"github.com/flatcar/ignition/v2/config/v3_4_experimental/types"
+ 	"github.com/flatcar/ignition/v2/internal/providers"
 @@ -50,26 +51,85 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
  		return types.Config{}, report.Report{}, providers.ErrNoProvider
  	}

diff --git a/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch b/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch
@@ -22,7 +22,7 @@ index 9fb88d8e..89d815b8 100644
  import (
 +	"strconv"
 +
- 	"github.com/flatcar-linux/ignition/v2/config/shared/errors"
+ 	"github.com/flatcar/ignition/v2/config/shared/errors"
 
  	"github.com/coreos/go-semver/semver"
 @@ -24,6 +26,7 @@ type versionStub struct {

diff --git a/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch b/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch
@@ -27,7 +27,7 @@ index 5e2b4a2b..061a488d 100644
 +	"strings"
 +	"unicode"
 
- 	"github.com/flatcar-linux/ignition/v2/config/shared/errors"
+ 	"github.com/flatcar/ignition/v2/config/shared/errors"
 
 @@ -24,10 +29,44 @@ import (
  	"github.com/coreos/vcontext/tree"

diff --git a/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch b/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch
@@ -102,7 +102,7 @@ index 0fe37f4a..3afc587f 100644
 --- a/internal/distro/distro.go
 +++ b/internal/distro/distro.go
 @@ -23,13 +23,17 @@ import (
- // -X github.com/flatcar-linux/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm
+ // -X github.com/flatcar/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm
  var (
  	// Device node directories and paths
 -	diskByLabelDir = "/dev/disk/by-label"
@@ -151,11 +151,11 @@ index 25993094..8ed6efdb 100644
 
  	"cloud.google.com/go/compute/metadata"
  	"cloud.google.com/go/storage"
- 	configErrors "github.com/flatcar-linux/ignition/v2/config/shared/errors"
-+	"github.com/flatcar-linux/ignition/v2/internal/distro"
- 	"github.com/flatcar-linux/ignition/v2/internal/log"
-+	"github.com/flatcar-linux/ignition/v2/internal/systemd"
- 	"github.com/flatcar-linux/ignition/v2/internal/util"
+ 	configErrors "github.com/flatcar/ignition/v2/config/shared/errors"
++	"github.com/flatcar/ignition/v2/internal/distro"
+ 	"github.com/flatcar/ignition/v2/internal/log"
++	"github.com/flatcar/ignition/v2/internal/systemd"
+ 	"github.com/flatcar/ignition/v2/internal/util"
  	"golang.org/x/oauth2/google"
  	"google.golang.org/api/option"
 @@ -145,6 +149,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) {

diff --git a/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch b/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch
@@ -38,8 +38,8 @@ index 285e7e4a..b4c2bede 100644
  	"os/exec"
 +	"path/filepath"
 
- 	"github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types"
- 	"github.com/flatcar-linux/ignition/v2/internal/distro"
+ 	"github.com/flatcar/ignition/v2/config/v3_4_experimental/types"
+ 	"github.com/flatcar/ignition/v2/internal/distro"
 @@ -105,35 +106,39 @@ func (s stage) Run(config types.Config) error {
  		return fmt.Errorf("failed to create filesystems: %v", err)
  	}
@@ -172,8 +172,8 @@ index dff93413..7840d8fc 100644
  	"os/exec"
 +	"strings"
 
- 	"github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types"
- 	"github.com/flatcar-linux/ignition/v2/internal/distro"
+ 	"github.com/flatcar/ignition/v2/config/v3_4_experimental/types"
+ 	"github.com/flatcar/ignition/v2/internal/distro"
 @@ -78,6 +79,17 @@ func (s stage) createRaids(config types.Config) error {
  		); err != nil {
  			return fmt.Errorf("mdadm failed: %v", err)

diff --git a/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch b/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch
@@ -19,9 +19,9 @@ index 9b5da9f3..3e201cfd 100644
  	github.com/coreos/go-semver v0.3.0
  	github.com/coreos/go-systemd/v22 v22.0.0
  	github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4
--	github.com/flatcar-linux/ign-converter v0.2.0
-+	github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0
- 	github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
+-	github.com/flatcar/ign-converter v0.2.0
++	github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0
+ 	github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
  	github.com/google/renameio v0.1.0
  	github.com/google/uuid v1.1.1
 diff --git a/go.sum b/go.sum
@@ -32,17 +32,17 @@ index afe8e529..82290ed3 100644
  github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
  github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
  github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
--github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
--github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
-+github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0 h1:7AIVpKuKQ2tUgczrGlR5A3vCqEizqmE2YFLhOnyZtIQ=
-+github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
- github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
- github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
- github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
-diff --git a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go
+-github.com/flatcar/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
+-github.com/flatcar/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
++github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0 h1:7AIVpKuKQ2tUgczrGlR5A3vCqEizqmE2YFLhOnyZtIQ=
++github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
+ github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
+ github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
+ github.com/flatcar/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
+diff --git a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go
 index d10cd7c3..f940b421 100644
---- a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go
-+++ b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go
+--- a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go
++++ b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go
 @@ -534,7 +534,7 @@ func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.Fi
  			file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", u.Name)
 
@@ -69,11 +69,11 @@ index 71ec1839..3e8983d0 100644
  github.com/coreos/vcontext/validate
  # github.com/davecgh/go-spew v1.1.0
  github.com/davecgh/go-spew/spew
--# github.com/flatcar-linux/ign-converter v0.2.0
-+# github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0
+-# github.com/flatcar/ign-converter v0.2.0
++# github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0
  ## explicit
- github.com/flatcar-linux/ign-converter/translate/v24tov31
- github.com/flatcar-linux/ign-converter/util
+ github.com/flatcar/ign-converter/translate/v24tov31
+ github.com/flatcar/ign-converter/util
 -- 
 2.35.1