Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apko for openSUSE:Factory checked in at 2026-02-18 17:05:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apko (Old) and /work/SRC/openSUSE:Factory/.apko.new.1977 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apko" Wed Feb 18 17:05:49 2026 rev:95 rq:1333756 version:1.1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/apko/apko.changes 2026-02-09 13:43:20.415865715 +0100 +++ /work/SRC/openSUSE:Factory/.apko.new.1977/apko.changes 2026-02-18 17:07:01.513707872 +0100 @@ -1,0 +2,30 @@ +Tue Feb 17 12:44:40 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 1.1.8: + * build(deps): bump chainguard-dev/actions from 1.6.0 to 1.6.1 + (#2076) + * build(deps): bump github/codeql-action from 4.32.2 to 4.32.3 + (#2073) + * Add LockImageConfigurationWithPackages to return package + metadata (#2061) + +------------------------------------------------------------------- +Mon Feb 16 05:51:07 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 1.1.7: + * build(deps): bump k8s.io/apimachinery from 0.35.0 to 0.35.1 + (#2071) + * build(deps): bump google.golang.org/api from 0.265.0 to 0.266.0 + (#2072) + * build(deps): bump chainguard-dev/actions from 1.5.15 to 1.6.0 + (#2070) + * build(deps): bump step-security/harden-runner from 2.14.1 to + 2.14.2 (#2065) + * build(deps): bump golang.org/x/sys from 0.40.0 to 0.41.0 + (#2064) + * build(deps): bump github.com/go-git/go-git/v5 from 5.16.4 to + 5.16.5 (#2068) + * build(deps): bump github.com/klauspost/compress from 1.18.3 to + 1.18.4 (#2066) + +------------------------------------------------------------------- Old: ---- apko-1.1.6.obscpio New: ---- apko-1.1.8.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apko.spec ++++++ --- /var/tmp/diff_new_pack.bopMiz/_old 2026-02-18 17:07:03.269780961 +0100 +++ /var/tmp/diff_new_pack.bopMiz/_new 2026-02-18 17:07:03.273781128 +0100 @@ -17,7 +17,7 @@ Name: apko -Version: 1.1.6 +Version: 1.1.8 Release: 0 Summary: Build OCI images from APK packages directly without Dockerfile License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.bopMiz/_old 2026-02-18 17:07:03.321783126 +0100 +++ /var/tmp/diff_new_pack.bopMiz/_new 2026-02-18 17:07:03.325783292 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/chainguard-dev/apko</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.1.6</param> + <param name="revision">v1.1.8</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.bopMiz/_old 2026-02-18 17:07:03.353784457 +0100 +++ /var/tmp/diff_new_pack.bopMiz/_new 2026-02-18 17:07:03.357784624 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/chainguard-dev/apko</param> - <param name="changesrevision">71349474418f141dc0956979df9015ec1c61cefe</param></service></servicedata> + <param name="changesrevision">5b0e4ae614eed88cc9d7fea6bcb1db9c41afb5b9</param></service></servicedata> (No newline at EOF) ++++++ apko-1.1.6.obscpio -> apko-1.1.8.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-1.1.6/go.mod new/apko-1.1.8/go.mod --- old/apko-1.1.6/go.mod 2026-02-06 16:47:58.000000000 +0100 +++ new/apko-1.1.8/go.mod 2026-02-16 16:12:52.000000000 +0100 @@ -6,14 +6,14 @@ chainguard.dev/sdk v0.1.50 github.com/chainguard-dev/clog v1.8.0 github.com/charmbracelet/log v0.4.2 - github.com/go-git/go-git/v5 v5.16.4 + github.com/go-git/go-git/v5 v5.16.5 github.com/google/go-cmp v0.7.0 github.com/google/go-containerregistry v0.20.7 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-retryablehttp v0.7.8 github.com/invopop/jsonschema v0.13.0 - github.com/klauspost/compress v1.18.3 + github.com/klauspost/compress v1.18.4 github.com/klauspost/pgzip v1.2.6 github.com/package-url/packageurl-go v0.1.3 github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0 @@ -26,14 +26,14 @@ go.opentelemetry.io/otel v1.40.0 go.opentelemetry.io/otel/trace v1.40.0 go.step.sm/crypto v0.76.0 - golang.org/x/oauth2 v0.34.0 + golang.org/x/oauth2 v0.35.0 golang.org/x/sync v0.19.0 - golang.org/x/sys v0.40.0 + golang.org/x/sys v0.41.0 golang.org/x/time v0.14.0 - google.golang.org/api v0.265.0 + google.golang.org/api v0.266.0 gopkg.in/ini.v1 v1.67.1 gopkg.in/yaml.v3 v3.0.1 - k8s.io/apimachinery v0.35.0 + k8s.io/apimachinery v0.35.1 sigs.k8s.io/release-utils v0.12.3 ) @@ -85,7 +85,7 @@ github.com/google/s2a-go v0.1.9 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect - github.com/googleapis/gax-go/v2 v2.16.0 // indirect + github.com/googleapis/gax-go/v2 v2.17.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect @@ -131,8 +131,8 @@ golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect golang.org/x/net v0.49.0 // indirect golang.org/x/text v0.33.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect google.golang.org/grpc v1.78.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-1.1.6/go.sum new/apko-1.1.8/go.sum --- old/apko-1.1.6/go.sum 2026-02-06 16:47:58.000000000 +0100 +++ new/apko-1.1.8/go.sum 2026-02-16 16:12:52.000000000 +0100 @@ -104,8 +104,8 @@ github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.16.4 h1:7ajIEZHZJULcyJebDLo99bGgS0jRrOxzZG4uCk2Yb2Y= -github.com/go-git/go-git/v5 v5.16.4/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8= +github.com/go-git/go-git/v5 v5.16.5 h1:mdkuqblwr57kVfXri5TTH+nMFLNUxIj9Z7F5ykFbw5s= +github.com/go-git/go-git/v5 v5.16.5/go.mod h1:QOMLpNf1qxuSY4StA/ArOdfFR2TrKEjJiye2kel2m+M= github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY= github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= @@ -134,8 +134,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.11 h1:vAe81Msw+8tKUxi2Dqh/NZMz7475yUvmRIkXr4oN2ao= github.com/googleapis/enterprise-certificate-proxy v0.3.11/go.mod h1:RFV7MUdlb7AgEq2v7FmMCfeSMCllAzWxFgRdusoGks8= -github.com/googleapis/gax-go/v2 v2.16.0 h1:iHbQmKLLZrexmb0OSsNGTeSTS0HO4YvFOG8g5E4Zd0Y= -github.com/googleapis/gax-go/v2 v2.16.0/go.mod h1:o1vfQjjNZn4+dPnRdl/4ZD7S9414Y4xA+a/6Icj6l14= +github.com/googleapis/gax-go/v2 v2.17.0 h1:RksgfBpxqff0EZkDWYuz9q/uWsTVz+kf43LsZ1J6SMc= +github.com/googleapis/gax-go/v2 v2.17.0/go.mod h1:mzaqghpQp4JDh3HvADwrat+6M3MOIDp5YKHhb9PAgDY= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 h1:B+8ClL/kCQkRiU82d9xajRPKYMrB7E0MbtzWVi1K4ns= @@ -159,8 +159,8 @@ github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw= -github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= +github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -322,8 +322,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= -golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw= -golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= +golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ= +golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -343,8 +343,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -373,12 +373,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/api v0.265.0 h1:FZvfUdI8nfmuNrE34aOWFPmLC+qRBEiNm3JdivTvAAU= -google.golang.org/api v0.265.0/go.mod h1:uAvfEl3SLUj/7n6k+lJutcswVojHPp2Sp08jWCu8hLY= -google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls= -google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 h1:H86B94AW+VfJWDqFeEbBPhEtHzJwJfTbgE2lZa54ZAQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= +google.golang.org/api v0.266.0 h1:hco+oNCf9y7DmLeAtHJi/uBAY7n/7XC9mZPxu1ROiyk= +google.golang.org/api v0.266.0/go.mod h1:Jzc0+ZfLnyvXma3UtaTl023TdhZu6OMBP9tJ+0EmFD0= +google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 h1:merA0rdPeUV3YIIfHHcH4qBkiQAc1nfCKSI7lB4cV2M= +google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409/go.mod h1:fl8J1IvUjCilwZzQowmw2b7HQB2eAuYBabMXzWurF+I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 h1:Jr5R2J6F6qWyzINc+4AM8t5pfUz6beZpHp678GNrMbE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -398,7 +398,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= -k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8= -k8s.io/apimachinery v0.35.0/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns= +k8s.io/apimachinery v0.35.1 h1:yxO6gV555P1YV0SANtnTjXYfiivaTPvCTKX6w6qdDsU= +k8s.io/apimachinery v0.35.1/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns= sigs.k8s.io/release-utils v0.12.3 h1:iNVJY81QfmMCmXxMg8IvvkkeQNk6ZWlLj+iPKSlKyVQ= sigs.k8s.io/release-utils v0.12.3/go.mod h1:BvbNmm1BmM3cnEpBmNHWL3wOSziOdGlsYR8vCFq/Q0o= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-1.1.6/pkg/build/lock.go new/apko-1.1.8/pkg/build/lock.go --- old/apko-1.1.6/pkg/build/lock.go 2026-02-06 16:47:58.000000000 +0100 +++ new/apko-1.1.8/pkg/build/lock.go 2026-02-16 16:12:52.000000000 +0100 @@ -25,6 +25,7 @@ "k8s.io/apimachinery/pkg/util/sets" + "chainguard.dev/apko/pkg/apk/apk" "chainguard.dev/apko/pkg/build/types" pkglock "chainguard.dev/apko/pkg/lock" ) @@ -35,9 +36,19 @@ // architecture that could not be locked. Using the "index" architecture is equivalent to what // this used to return prior to supporting per-arch locked configs. func LockImageConfiguration(ctx context.Context, ic types.ImageConfiguration, opts ...Option) (map[string]*types.ImageConfiguration, map[string][]string, error) { + ics, missing, _, err := LockImageConfigurationWithPackages(ctx, ic, opts...) + return ics, missing, err +} + +// LockImageConfigurationWithPackages is like LockImageConfiguration but additionally returns +// the resolved package metadata per architecture. The returned map contains the full +// RepositoryPackage objects as resolved by the solver. +// When a lockfile is used, the resolved packages map will be nil as the full package metadata +// is not available from lockfiles. +func LockImageConfigurationWithPackages(ctx context.Context, ic types.ImageConfiguration, opts ...Option) (map[string]*types.ImageConfiguration, map[string][]string, map[types.Architecture][]*apk.RepositoryPackage, error) { o, input, err := NewOptions(append(opts, WithImageConfiguration(ic))...) if err != nil { - return nil, nil, err + return nil, nil, nil, err } input.Contents.BuildRepositories = sets.List(sets.New(input.Contents.BuildRepositories...).Insert(o.ExtraBuildRepos...)) @@ -46,31 +57,33 @@ mc, err := NewMultiArch(ctx, input.Archs, append(opts, WithImageConfiguration(*input))...) if err != nil { - return nil, nil, err + return nil, nil, nil, err } // Determine the exact versions of our transitive packages and lock them // down in the "resolved" configuration, so that this build may be // reproduced exactly. var pls map[string][]string + var resolvedPkgs map[types.Architecture][]*apk.RepositoryPackage missing := map[string][]string{} if o.Lockfile == "" { - archs, err := resolvePackageList(ctx, mc) + archs, pkgs, err := resolvePackageList(ctx, mc) if err != nil { - return nil, nil, err + return nil, nil, nil, err } + resolvedPkgs = pkgs pls, missing, err = unify(input.Contents.Packages, archs) if err != nil { - return nil, missing, err + return nil, missing, nil, err } } else { l, err := pkglock.FromFile(o.Lockfile) if err != nil { - return nil, nil, err + return nil, nil, nil, err } for _, bc := range mc.Contexts { if err := bc.VerifyLockfileConsistency(ctx, l.Config); err != nil { - return nil, nil, err + return nil, nil, nil, err } } pls = l.Arch2LockedPackages(input.Archs) @@ -82,7 +95,7 @@ // Create a defensive copy of "input". copied := types.ImageConfiguration{} if err := input.MergeInto(&copied); err != nil { - return nil, nil, err + return nil, nil, nil, err } copied.Contents.Packages = pl @@ -95,15 +108,15 @@ ics[arch] = &copied } - return ics, missing, nil + return ics, missing, resolvedPkgs, nil } -func resolvePackageList(ctx context.Context, mc *MultiArch) ([]resolved, error) { +func resolvePackageList(ctx context.Context, mc *MultiArch) ([]resolved, map[types.Architecture][]*apk.RepositoryPackage, error) { archs := make([]resolved, 0, len(mc.Contexts)) toInstalls, err := mc.BuildPackageLists(ctx) if err != nil { - return nil, err + return nil, nil, err } for arch, pkgs := range toInstalls { r := resolved{ @@ -133,7 +146,7 @@ } archs = append(archs, r) } - return archs, nil + return archs, toInstalls, nil } type resolved struct { ++++++ apko.obsinfo ++++++ --- /var/tmp/diff_new_pack.bopMiz/_old 2026-02-18 17:07:04.113816091 +0100 +++ /var/tmp/diff_new_pack.bopMiz/_new 2026-02-18 17:07:04.117816257 +0100 @@ -1,5 +1,5 @@ name: apko -version: 1.1.6 -mtime: 1770392878 -commit: 71349474418f141dc0956979df9015ec1c61cefe +version: 1.1.8 +mtime: 1771254772 +commit: 5b0e4ae614eed88cc9d7fea6bcb1db9c41afb5b9 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/apko/vendor.tar.gz /work/SRC/openSUSE:Factory/.apko.new.1977/vendor.tar.gz differ: char 15, line 1
