commit: 8bed70bbcf40a4d5861975bf753f05f6d5307ded Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Mon Sep 8 16:18:00 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Mon Sep 8 16:18:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bed70bb
app-containers/lxd: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> ...0.3-pr-12834-dont-stop-parsing-image-info.patch | 79 ---------------------- .../lxd-5.0.3-pr-12847-ignore-incus-archives.patch | 26 ------- ....0.3-remove-shellcheck-buildsystem-checks.patch | 33 --------- 3 files changed, 138 deletions(-) diff --git a/app-containers/lxd/files/lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch b/app-containers/lxd/files/lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch deleted file mode 100644 index 768e4d160132..000000000000 --- a/app-containers/lxd/files/lxd-5.0.3-pr-12834-dont-stop-parsing-image-info.patch +++ /dev/null @@ -1,79 +0,0 @@ -From fe71f2135bdc3aa6ea28de7ed1ac324f7d689ed6 Mon Sep 17 00:00:00 2001 -From: Thomas Parrott <[email protected]> -Date: Wed, 7 Feb 2024 16:53:29 +0000 -Subject: [PATCH 1/2] shared/simplestreams/products: Fix regression in parsing - version files - -Don't stop when finding first matching version file because the index is parsed -in random order and LXD calls it multiple times when figuring out which image -file to download and so stopping early can cause mismatches when trying to match -a converted alias to a specific file fingerprint. - -Introduced with 3e9acc4 - -Signed-off-by: Thomas Parrott <[email protected]> -(cherry picked from commit 3681d5e54649fcc2fc9375b6820c1133f140228d) ---- - shared/simplestreams/products.go | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go -index a07e4d5b1b5b..542051403899 100644 ---- a/shared/simplestreams/products.go -+++ b/shared/simplestreams/products.go -@@ -279,8 +279,6 @@ func (s *Products) ToLXD() ([]api.Image, map[string][][]string) { - if err != nil { - continue - } -- -- break // Stop at first compatible item found. - } else if shared.StringInSlice(item.FileType, lxdCompatItems) { - // Locate the root files - for _, subItem := range version.Items { -@@ -291,8 +289,6 @@ func (s *Products) ToLXD() ([]api.Image, map[string][][]string) { - } - } - } -- -- break // Stop at first compatible item found. - } - } - } - -From d3253e4cbc85b97e3bc6dba9a27fd2ab0c4d8685 Mon Sep 17 00:00:00 2001 -From: Thomas Parrott <[email protected]> -Date: Wed, 7 Feb 2024 10:28:36 +0000 -Subject: [PATCH 2/2] shared/simplestreams/simplestreams: Improve error - messages - -Signed-off-by: Thomas Parrott <[email protected]> -(cherry picked from commit 56364f5a97373155d5e6a5a6b10d06d16a25fb3c) ---- - shared/simplestreams/simplestreams.go | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go -index 3f3255cac913..68e1d96278a3 100644 ---- a/shared/simplestreams/simplestreams.go -+++ b/shared/simplestreams/simplestreams.go -@@ -377,7 +377,7 @@ func (s *SimpleStreams) GetFiles(fingerprint string) (map[string]DownloadableFil - } - } - -- return nil, fmt.Errorf("Couldn't find the requested image") -+ return nil, fmt.Errorf("Couldn't find the requested image for fingerprint %q", fingerprint) - } - - // ListAliases returns a list of image aliases for the provided image fingerprint. -@@ -501,9 +501,9 @@ func (s *SimpleStreams) GetImage(fingerprint string) (*api.Image, error) { - } - - if len(matches) == 0 { -- return nil, fmt.Errorf("The requested image couldn't be found") -+ return nil, fmt.Errorf("The requested image couldn't be found for fingerprint %q", fingerprint) - } else if len(matches) > 1 { -- return nil, fmt.Errorf("More than one match for the provided partial fingerprint") -+ return nil, fmt.Errorf("More than one match for the provided partial fingerprint %q", fingerprint) - } - - return &matches[0], nil diff --git a/app-containers/lxd/files/lxd-5.0.3-pr-12847-ignore-incus-archives.patch b/app-containers/lxd/files/lxd-5.0.3-pr-12847-ignore-incus-archives.patch deleted file mode 100644 index 76a6a1476de8..000000000000 --- a/app-containers/lxd/files/lxd-5.0.3-pr-12847-ignore-incus-archives.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 55bd4024dbfc315c0f57da57f2f9bd9c5c97dad1 Mon Sep 17 00:00:00 2001 -From: Din Music <[email protected]> -Date: Thu, 18 Jan 2024 17:08:36 +0100 -Subject: [PATCH] shared/simplestreams/products: Search only for lxd archives - -Signed-off-by: Din Music <[email protected]> -(cherry picked from commit 0c9253da9448475e6de60dd345c67c0179884f13) ---- - shared/simplestreams/products.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/shared/simplestreams/products.go b/shared/simplestreams/products.go -index 542051403899..d80d8e7be251 100644 ---- a/shared/simplestreams/products.go -+++ b/shared/simplestreams/products.go -@@ -10,8 +10,8 @@ import ( - "github.com/canonical/lxd/shared/osarch" - ) - --var lxdCompatCombinedItems = []string{"lxd_combined.tar.gz", "incus_combined.tar.gz"} --var lxdCompatItems = []string{"lxd.tar.xz", "incus.tar.xz"} -+var lxdCompatCombinedItems = []string{"lxd_combined.tar.gz"} -+var lxdCompatItems = []string{"lxd.tar.xz"} - - // Products represents the base of download.json. - type Products struct { diff --git a/app-containers/lxd/files/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch b/app-containers/lxd/files/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch deleted file mode 100644 index d3efd72ecb37..000000000000 --- a/app-containers/lxd/files/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Makefile b/Makefile -index 8061227..c9b85d2 100644 ---- a/Makefile -+++ b/Makefile -@@ -258,28 +258,6 @@ endif - .PHONY: build-mo - build-mo: $(MOFILES) - --.PHONY: static-analysis --static-analysis: --ifeq ($(shell command -v golangci-lint),) -- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin --endif --ifeq ($(shell command -v shellcheck),) -- echo "Please install shellcheck" -- exit 1 --else --ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0" -- @echo "WARN: shellcheck version is not 0.8.0" --endif --endif --ifeq ($(shell command -v flake8),) -- echo "Please install flake8" -- exit 1 --endif -- flake8 test/deps/import-busybox -- shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh test/backends/*.sh test/lint/*.sh -- shellcheck test/extras/*.sh -- run-parts --exit-on-error --regex '.sh' test/lint -- - .PHONY: staticcheck - staticcheck: - ifeq ($(shell command -v staticcheck),)
