@@ -545,7 +545,9 @@ func getLabels(opt Opt, labels map[string]string) map[string]string {

 }

 func getCDIManager(specDirs []string) (*cdidevices.Manager, error) {

-	// TODO: intentionally not returning nil here on empty specDirs as not handled in all code-paths yet

+	if len(specDirs) == 0 {

+		return nil, nil

+	}

 	cdiCache, err := func() (*cdi.Cache, error) {

 		cdiCache, err := cdi.NewCache(

 			cdi.WithSpecDirs(specDirs...),

@@ -63,7 +63,7 @@ require (

 	github.com/miekg/dns v1.1.61

 	github.com/mistifyio/go-zfs/v3 v3.0.1

 	github.com/mitchellh/copystructure v1.2.0

-	github.com/moby/buildkit v0.20.0-rc1.0.20250212151618-2f7007eec399

+	github.com/moby/buildkit v0.20.0-rc2

 	github.com/moby/docker-image-spec v1.3.1

 	github.com/moby/ipvs v1.1.0

 	github.com/moby/locker v1.0.1

@@ -187,7 +187,7 @@ require (

 	github.com/mitchellh/reflectwalk v1.0.2 // indirect

 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect

-	github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170 // indirect

+	github.com/package-url/packageurl-go v0.1.1 // indirect

 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect

 	github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect

 	github.com/philhofer/fwd v1.1.2 // indirect

@@ -29,8 +29,8 @@ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0 h1:mlmW46Q0B79I+Aj4a

 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0/go.mod h1:PXe2h+LKcWTX9afWdZoHyODqR4fBa5boUM/8uJfZ0Jo=

 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=

 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=

-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=

-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=

+github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=

+github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=

 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=

 github.com/Graylog2/go-gelf v0.0.0-20191017102106-1550ee647df0 h1:cOjLyhBhe91glgZZNbQUg9BJC57l6BiSKov0Ivv7k0U=

@@ -383,8 +383,8 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F

 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=

 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=

 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=

-github.com/moby/buildkit v0.20.0-rc1.0.20250212151618-2f7007eec399 h1:5D+c0/9DQkncvcLqFGYu7it8riR9kTonRIQpgUUg6r4=

-github.com/moby/buildkit v0.20.0-rc1.0.20250212151618-2f7007eec399/go.mod h1:mtRqVBkksyvFm+ljU1u+cigDh36TdFvlEGfz/XbYTiI=

+github.com/moby/buildkit v0.20.0-rc2 h1:QjACghvG0pSAp7dk9aQMYWioDEOljDWyyoUjyg35qfg=

+github.com/moby/buildkit v0.20.0-rc2/go.mod h1:kMXf90l/f3zygRK8bYbyetfyzoJYntb6Bpi2VsLfXgQ=

 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=

 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=

 github.com/moby/ipvs v1.1.0 h1:ONN4pGaZQgAx+1Scz5RvWV4Q7Gb+mvfRh3NsPS+1XQQ=

@@ -449,8 +449,8 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.

 github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=

 github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8=

 github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=

-github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170 h1:DiLBVp4DAcZlBVBEtJpNWZpZVq0AEeCY7Hqk8URVs4o=

-github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=

+github.com/package-url/packageurl-go v0.1.1 h1:KTRE0bK3sKbFKAk3yy63DpeskU7Cvs/x/Da5l+RtzyU=

+github.com/package-url/packageurl-go v0.1.1/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=

 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=

 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

@@ -39,6 +39,7 @@ const (

 	attrTimeout    = "timeout"

 	attrToken      = "token"

 	attrURL        = "url"

+	attrURLV2      = "url_v2"

 	attrRepository = "repository"

 	attrGHToken    = "ghtoken"

 	attrAPIVersion = "version"

@@ -79,6 +80,12 @@ func getConfig(attrs map[string]string) (*Config, error) {

 		}

 		apiVersionInt = int(i)

 	}

+	if apiVersionInt != 1 {

+		if v, ok := attrs[attrURLV2]; ok {

+			url = v

+			apiVersionInt = 2

+		}

+	}

 	// best effort on old clients

 	if apiVersionInt == 0 {

 		if strings.Contains(url, "results-receiver.actions.githubusercontent.com") {

@@ -19,12 +19,13 @@ func CheckInvalidPlatforms[T comparable](ctx context.Context, res *result.Result

 		return nil, err

 	}

-	if req.Request != "" {

-		return nil, nil

-	}

-

-	if _, ok := res.Metadata[exptypes.ExporterPlatformsKey]; len(res.Refs) > 0 && !ok {

-		return nil, errors.Errorf("build result contains multiple refs without platforms mapping")

+	if _, ok := res.Metadata[exptypes.ExporterPlatformsKey]; !ok {

+		if len(res.Refs) > 0 {

+			return nil, errors.Errorf("build result contains multiple refs without platforms mapping")

+		} else if res.IsEmpty() {

+			// No results and no exporter key. Don't run this check.

+			return nil, nil

+		}

 	}

 	isMap := len(res.Refs) > 0

@@ -1443,18 +1443,14 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {

 			}

 			chopt.Mode = os.FileMode(p)

 		} else {

-			if featureCopyChmodNonOctalEnabled {

-				if _, err := mode.Parse(cfg.chmod); err != nil {

-					var ne *strconv.NumError

-					if errors.As(err, &ne) {

-						return nonOctalErr // return nonOctalErr for compatibility if the value looks numeric

-					}

-					return err

+			if _, err := mode.Parse(cfg.chmod); err != nil {

+				var ne *strconv.NumError

+				if errors.As(err, &ne) {

+					return nonOctalErr // return nonOctalErr for compatibility if the value looks numeric

 				}

-				chopt.ModeStr = cfg.chmod

-			} else {

-				return nonOctalErr

+				return err

 			}

+			chopt.ModeStr = cfg.chmod

 		}

 	}

@@ -5,8 +5,12 @@ package dockerfile2llb

 import (

 	"github.com/moby/buildkit/client/llb"

 	"github.com/moby/buildkit/frontend/dockerfile/instructions"

+	"github.com/pkg/errors"

 )

-func dispatchRunDevices(_ *instructions.RunCommand) ([]llb.RunOption, error) {

+func dispatchRunDevices(c *instructions.RunCommand) ([]llb.RunOption, error) {

+	if len(instructions.GetDevices(c)) > 0 {

+		return nil, errors.Errorf("device feature is only supported in Dockerfile frontend 1.14.0-labs or later")

+	}

 	return nil, nil

 }

deleted file mode 100644

@@ -1,5 +0,0 @@

-//go:build !dfcopychmodnonoctal

-

-package dockerfile2llb

-

-var featureCopyChmodNonOctalEnabled = false

deleted file mode 100644

@@ -1,5 +0,0 @@

-//go:build dfcopychmodnonoctal

-

-package dockerfile2llb

-

-var featureCopyChmodNonOctalEnabled = true

@@ -199,16 +199,18 @@ func (e *ExecOp) CacheMap(ctx context.Context, g session.Group, index int) (*sol

 		cm.Deps[i].PreprocessFunc = unlazyResultFunc

 	}

-	for _, d := range e.op.CdiDevices {

-		setup, ok := e.w.CDIManager().OnDemandInstaller(d.Name)

-		if ok {

-			prev := cm.Deps[0].PreprocessFunc

-			cm.Deps[0].PreprocessFunc = func(ctx context.Context, r solver.Result, g session.Group) error {

-				if err := prev(ctx, r, g); err != nil {

-					return err

+	if e.w != nil && e.w.CDIManager() != nil {

+		for _, d := range e.op.CdiDevices {

+			setup, ok := e.w.CDIManager().OnDemandInstaller(d.Name)

+			if ok {

+				prev := cm.Deps[0].PreprocessFunc

+				cm.Deps[0].PreprocessFunc = func(ctx context.Context, r solver.Result, g session.Group) error {

+					if err := prev(ctx, r, g); err != nil {

+						return err

+					}

+					// we could pass glibc/musl type in here based on rootfs to get correct dynamic libs

+					return setup(ctx)

 				}

-				// we could pass glibc/musl type in here based on rootfs to get correct dynamic libs

-				return setup(ctx)

 			}

 		}

 	}

@@ -27,7 +27,6 @@ var qemuArchMap = map[string]string{

 	"riscv64": "riscv64",

 	"arm":     "arm",

 	"s390x":   "s390x",

-	"ppc64":   "ppc64",

 	"ppc64le": "ppc64le",

 	"386":     "i386",

 }

@@ -463,7 +463,7 @@ func init() {

 	Caps.Init(apicaps.Cap{

 		ID:      CapRemoteCacheAzBlob,

-		Enabled: false,

+		Enabled: true,

 		Status:  apicaps.CapStatusExperimental,

 	})

@@ -110,6 +110,20 @@ func (r *Result[T]) EachRef(fn func(T) error) (err error) {

 	return err

 }

+// IsEmpty returns true if this result does not refer to

+// any references.

+func (r *Result[T]) IsEmpty() bool {

+	r.mu.Lock()

+	defer r.mu.Unlock()

+

+	if len(r.Refs) > 0 {

+		return false

+	}

+

+	var zero T

+	return r.Ref == zero

+}

+

 // EachRef iterates over references in both a and b.

 // a and b are assumed to be of the same size and map their references

 // to the same set of keys

@@ -18,7 +18,7 @@ var (

 var (

 	UserCNIConfigPath = DefaultCNIConfigPath

-	CDISpecDirs       []string

+	CDISpecDirs       = []string{filepath.Join(os.Getenv("ProgramData"), "buildkitd", "cdi")}

 )

 func UserAddress() string {

@@ -1,12 +1,8 @@

 .PHONY: test clean lint

 test:

-	curl -L https://raw.githubusercontent.com/package-url/purl-spec/master/test-suite-data.json -o testdata/test-suite-data.json

 	go test -v -cover ./...

-clean:

-	find . -name "test-suite-data.json" | xargs rm -f

-

 lint:

 	go get -u golang.org/x/lint/golint

 	golint -set_exit_status

@@ -59,16 +59,16 @@ Testing using the normal ``go test`` command. Using ``make test`` will pull the

 ```

 $ make test

-curl -L https://raw.githubusercontent.com/package-url/purl-test-suite/master/test-suite-data.json -o testdata/test-suite-data.json

-  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current

-                                 Dload  Upload   Total   Spent    Left  Speed

-100  7181  100  7181    0     0   1202      0  0:00:05  0:00:05 --:--:--  1611

 go test -v -cover ./...

 === RUN   TestFromStringExamples

 --- PASS: TestFromStringExamples (0.00s)

 === RUN   TestToStringExamples

 --- PASS: TestToStringExamples (0.00s)

+=== RUN   TestStringer

+--- PASS: TestStringer (0.00s)

+=== RUN   TestQualifiersMapConversion

+--- PASS: TestQualifiersMapConversion (0.00s)

 PASS

-coverage: 94.7% of statements

-ok      github.com/package-url/packageurl-go    0.002s

+coverage: 90.7% of statements

+ok      github.com/package-url/packageurl-go    0.004s  coverage: 90.7% of statements

 ```

@@ -89,6 +89,10 @@ var (

 	TypeRPM = "rpm"

 	// TypeSwift is pkg:swift purl

 	TypeSwift = "swift"

+	// TypeHuggingface is pkg:huggingface purl.

+	TypeHuggingface = "huggingface"

+	// TypeMLflow is pkg:mlflow purl.

+	TypeMLFlow = "mlflow"

 )

 // Qualifier represents a single key=value qualifier in the package url

@@ -283,7 +287,7 @@ func FromString(purl string) (PackageURL, error) {

 	remainder = nextSplit[1]

 	index = strings.LastIndex(remainder, "/")

-	name := typeAdjustName(purlType, remainder[index+1:])

+	name := typeAdjustName(purlType, remainder[index+1:], qualifiers)

 	version := ""

 	atIndex := strings.Index(name, "@")

@@ -292,7 +296,7 @@ func FromString(purl string) (PackageURL, error) {

 		if err != nil {

 			return PackageURL{}, fmt.Errorf("failed to unescape purl version: %s", err)

 		}

-		version = v

+		version = typeAdjustVersion(purlType, v)

 		unecapeName, err := url.PathUnescape(name[:atIndex])

 		if err != nil {

@@ -342,7 +346,7 @@ func FromString(purl string) (PackageURL, error) {

 // See https://github.com/package-url/purl-spec#known-purl-types

 func typeAdjustNamespace(purlType, ns string) string {

 	switch purlType {

-	case TypeBitbucket, TypeDebian, TypeGithub, TypeGolang, TypeNPM, TypeRPM:

+	case TypeBitbucket, TypeDebian, TypeGithub, TypeGolang, TypeNPM, TypeRPM, TypeComposer:

 		return strings.ToLower(ns)

 	}

 	return ns

@@ -350,16 +354,48 @@ func typeAdjustNamespace(purlType, ns string) string {

 // Make any purl type-specific adjustments to the parsed name.

 // See https://github.com/package-url/purl-spec#known-purl-types

-func typeAdjustName(purlType, name string) string {

+func typeAdjustName(purlType, name string, qualifiers Qualifiers) string {

+	quals := qualifiers.Map()

 	switch purlType {

-	case TypeBitbucket, TypeDebian, TypeGithub, TypeGolang, TypeNPM:

+	case TypeBitbucket, TypeDebian, TypeGithub, TypeGolang, TypeNPM, TypeComposer:

 		return strings.ToLower(name)

 	case TypePyPi:

 		return strings.ToLower(strings.ReplaceAll(name, "_", "-"))

+	case TypeMLFlow:

+		return adjustMlflowName(name, quals)

 	}

 	return name

 }

+// Make any purl type-specific adjustments to the parsed version.

+// See https://github.com/package-url/purl-spec#known-purl-types

+func typeAdjustVersion(purlType, version string) string {

+	switch purlType {

+	case TypeHuggingface:

+		return strings.ToLower(version)

+	}

+	return version

+}

+

+// https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst#mlflow

+func adjustMlflowName(name string, qualifiers map[string]string) string {

+	if repo, ok := qualifiers["repository_url"]; ok {

+		if strings.Contains(repo, "azureml") {

+			// Azure ML is case-sensitive and must be kept as-is

+			return name

+		} else if strings.Contains(repo, "databricks") {

+			// Databricks is case-insensitive and must be lowercased

+			return strings.ToLower(name)

+		} else {

+			// Unknown repository type, keep as-is

+			return name

+		}

+	} else {

+		// No repository qualifier given, keep as-is

+		return name

+	}

+}

+

 // validQualifierKey validates a qualifierKey against our QualifierKeyPattern.

 func validQualifierKey(key string) bool {

 	return QualifierKeyPattern.MatchString(key)

@@ -755,7 +755,7 @@ github.com/mitchellh/hashstructure/v2

 # github.com/mitchellh/reflectwalk v1.0.2

 ## explicit

 github.com/mitchellh/reflectwalk

-# github.com/moby/buildkit v0.20.0-rc1.0.20250212151618-2f7007eec399

+# github.com/moby/buildkit v0.20.0-rc2

 ## explicit; go 1.22.0

 github.com/moby/buildkit/api/services/control

 github.com/moby/buildkit/api/types

@@ -1068,7 +1068,7 @@ github.com/opencontainers/runtime-tools/validate/capabilities

 github.com/opencontainers/selinux/go-selinux

 github.com/opencontainers/selinux/go-selinux/label

 github.com/opencontainers/selinux/pkg/pwalkdir

-# github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170

+# github.com/package-url/packageurl-go v0.1.1

 ## explicit; go 1.17

 github.com/package-url/packageurl-go

 # github.com/pelletier/go-toml v1.9.5