Commit Graph

21 Commits

Author SHA1 Message Date
Martin Jansa
c01273e001 metadata: add whitespace around assignments
With:
https://lists.openembedded.org/g/bitbake-devel/message/17508
there are many WARNINGs from this layer will cover src_uri.inc files
in next commit.

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2025-04-03 17:56:53 +00:00
Bruce Ashfield
6b4793ce2e umoci: update to v0.4.7 -tip
Bumping umoci to version v0.4.7-260-g8f807a3, which comprises the following commits:

    e9fff47 pkg: fmtcompat: remove now that there are no users
    63bbda0 errors: drop remaining errors.Wrap-like fmtcompat.Errorf users
    73fffb3 errors: drop fmtcompat.Errorf for complicated err != nil checks
    00a632e errors: drop fmtcompat.Errorf for explicit err != nil checks
    5339feb errors: drop fmtcompat.Errorf for non-%w errors
    1c67765 *: migrate to Go stdlib error wrapping
    cd18171 pkg: fmtcompat: add a compatibility shim for fmt.Errorf
    aaa6de8 fmt: use %q for quoting
    97cbde3 *: fix new golint warnings
    094e766 gha: enable CodeQL scanning
    e597e6a idtools: return errors for >u32 specification
    71d012d oci: casext: mediatype: switch to generics for parser functions
    0a5d0dc build(deps): bump github.com/klauspost/pgzip from 1.2.5 to 1.2.6
    3405ba8 Fixed typo in rootless.md
    3cf87e0 build(deps): bump codecov/codecov-action from 4 to 5
    7bc95ad build(deps): bump golang.org/x/sys from 0.22.0 to 0.25.0
    a357a4e build(deps): bump github.com/moby/sys/user from 0.1.0 to 0.3.0
    7e48118 build(deps): bump opensuse/leap from 15.5 to 15.6
    3e5ade3 build(deps): bump actions/cache from 3 to 4
    a59f5ba build(deps): bump google.golang.org/protobuf from 1.34.1 to 1.34.2
    3078d6b build(deps): bump github.com/vbatts/go-mtree from 0.5.3 to 0.5.4
    ce130df build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0
    6fd54fc build(deps): bump codecov/codecov-action from 3 to 4

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2025-01-17 19:17:09 +00:00
Bruce Ashfield
3569724c16 umoci: update to v0.4.7 -tip
Bumping umoci to version v0.4.7-224-gff684ba, which comprises the following commits:

    3078d6b build(deps): bump github.com/vbatts/go-mtree from 0.5.3 to 0.5.4

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2024-07-16 16:49:34 +00:00
Kai Kang
710f858012 umoci & buildah & podman-tui: mark incompatible with mips
Since the runtime dependency skopeo has been marked incompatible with
mips, mark for umoci accordingly.

buildah and podman-tui rdepends on podman which has been marked
incompatible with mips, so mark for them too.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-11-06 16:21:12 +00:00
Mingli Yu
5cec30aae4 umoci: Remove the buildpath issue
Pass -trimpath to the build to fix the below build path issue:
  WARNING: umoci-v0.4.7+git-r0 do_package_qa: QA Issue: File /usr/sbin/umoci in package umoci contains reference to TMPDIR [buildpaths]

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-11-06 16:21:12 +00:00
Bruce Ashfield
08435d20b1 recipes/classes/scripts: Drop SRCPV usage
bitbake has been enhanced such that SRCPV is no longer needed in
PV to handle updating git hashes and task signatures.

We can simplify our PV by dropping SRCPV

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-08-24 01:38:21 +00:00
Bruce Ashfield
703feb3116 umoci: update to 0.4.7-tip
Bumping umoci to version v0.4.7-150-g33ec006, which comprises the following commits:

    150b9e0 build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4
    1c365a2 build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3
    6e6027c build(deps): bump golang.org/x/sys from 0.7.0 to 0.8.0
    b267d7b test: move 'go test' output to stderr for coverage binary
    947f407 build(deps): bump github.com/opencontainers/runc from 1.1.6 to 1.1.7
    e9394e8 CHANGELOG: update to include changes from v0.4.7
    08672f5 vendor: bump several deps
    b4f2258 go.mod: update Go version to go1.18
    b285980 build(deps): bump github.com/vbatts/go-mtree from 0.5.2 to 0.5.3
    61c566b build(deps): bump google.golang.org/protobuf from 1.28.1 to 1.30.0
    a0bb45f build(deps): bump actions/setup-go from 3 to 4
    bdfd50b build(deps): bump github.com/stretchr/testify from 1.8.1 to 1.8.2
    37c828e gha: ci: make ci-image cache expire weekly
    3e7ddbd dockerfile: update to leap 15.4
    44a127b Makefile: pull image details from Dockerfile
    c99bc38 dockerfile: fetch oci-*-tools with go install
    701c194 test: update to gomtree 0.5.2
    ac5e249 test: (raw-)config: only use export in sub-shell
    c8183de oci: config: strip "-dev" from runtime-spec version
    b1c2cdf oci: config: correctly handle runtime-spec versions
    de9ad94 make: add -buildvcs=false to builds
    6d52935 gha: bump Go version for validate to Go 1.20.x
    3544ece build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-06-15 17:42:31 -04:00
Bruce Ashfield
975f0a1d40 umoci: update to 0.4.7
Bumping umoci to version v0.4.7-117-gfb2db51, which comprises the following commits:

    3544ece build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1
    5978bb9 build(deps): bump github.com/vbatts/go-mtree from 0.5.1 to 0.5.2
    7c782c4 README: add dummy comment to start to make Hugo happy
    777164a build(deps): bump github.com/opencontainers/runc from 1.1.2 to 1.1.4
    1714399 build(deps): bump github.com/docker/go-units from 0.4.0 to 0.5.0
    ed6b0f4 build(deps): bump google.golang.org/protobuf from 1.28.0 to 1.28.1
    14756db build(deps): bump github.com/stretchr/testify from 1.7.1 to 1.8.0
    2034a22 test: handle /etc/pki/ca-trust with Fedora images
    2163223 *: improve io.Pipe CloseWithError usage
    aab35e4 *: implement EINTR-retry logic for io.Copy users

We also switch BUILD_FLAGS to STATIC_BUILD_FLAGS, as the Makefile
variable has changed.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2023-02-10 12:36:11 -05:00
Bruce Ashfield
f132afed23 umoci: fix reproducibility
pass -trimpath to the umoci build to remove TMPDIR references
in the binaries.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-09-13 15:28:14 -04:00
Bruce Ashfield
7dd1f5384b umoci: update to v0.4.7-latest
Bumping umoci to version v0.4.7-101-g4270d5b, which comprises the following commits:

    d8f4f12 build(deps): bump github.com/opencontainers/runc from 1.1.1 to 1.1.2
    2163223 *: improve io.Pipe CloseWithError usage
    aab35e4 *: implement EINTR-retry logic for io.Copy users

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-08-09 14:26:28 -04:00
Chen Qi
7808674c4c umoci: adjust CGO_CFLAGS and CGO_LDFLAGS settings
The CGO_CFLAGS and CGO_LDFLAGS should use target flags instead
of the nativesdk ones.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-06-20 12:09:46 -04:00
Bruce Ashfield
14427646ae umoci: update to 0.4.7-tip
Bumping umoci to version v0.4.7-98-gdb97609, which comprises the following commits:

    d8f4f12 build(deps): bump github.com/opencontainers/runc from 1.1.1 to 1.1.2
    9db1db9 dependabot: ignore github.com/klauspost/compress for now
    c20d1ba build(deps): bump github.com/vbatts/go-mtree from 0.5.0 to 0.5.1
    defa147 build(deps): bump actions/setup-go from 2 to 3
    d7c6b89 build(deps): bump actions/cache from 2 to 3.0.1
    e76ee78 build(deps): bump actions/checkout from 2 to 3
    852bb73 build(deps): bump actions/download-artifact from 2 to 3
    83706fc build(deps): bump actions/upload-artifact from 2 to 3
    b93cb2a build(deps): bump codecov/codecov-action from 2 to 3
    671fa10 build(deps): bump github.com/opencontainers/runc from 1.1.0 to 1.1.1
    abd9d71 build(deps): bump google.golang.org/protobuf from 1.27.1 to 1.28.0
    597a50e build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.7.1
    87f2e17 mutator: allow setting annotation data when generating a layer
    e14c6d5 README: s/anuvu/project-stacker
    c67586e build(deps): bump github.com/opencontainers/runc from 1.0.3 to 1.1.0

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-06-03 09:32:13 -04:00
Bruce Ashfield
2dd6ba297c umoci: update to 0.4.7-tip
Bumping umoci to version v0.4.7-70-gfa8e9f8, which comprises the following commits:

    c67586e build(deps): bump github.com/opencontainers/runc from 1.0.3 to 1.1.0
    88aaeca fuzz: always use golang:latest
    37b9db4 build(deps): bump golang from 1.17.4 to 1.17.5
    09ff9d5 build(deps): bump github.com/opencontainers/runc from 1.0.2 to 1.0.3
    86eb281 build(deps): bump golang from 1.17.3 to 1.17.4
    610dabf oci: protect against mediatype confusion attacks (CVE-2021-41190)
    9b17e05 oci: gc: fix tests to correctly use the right media-types
    38c20f1 ci: fix fresh builds
    220b0c0 build(deps): bump github.com/opencontainers/image-spec
    732d36d build(deps): bump golang from 1.17.2 to 1.17.3
    58f3a37 mutator: .Config() should return ispec.Image vs. ImageConfig
    001bbd4 ci: update main branch name
    7bebba6 ci: osx: only try to unlink parallel if installed
    a0d54ce build(deps): bump golang from 1.17.1 to 1.17.2
    72ec924 *: use new protobuf package
    09d1d79 build(deps): bump github.com/golang/protobuf from 1.5.0 to 1.5.2
    88243cd build(deps): bump github.com/rootless-containers/proto
    12270d3 build(deps): bump github.com/opencontainers/runc
    056236a *: make codecov slightly less annoying
    18fdf79 build(deps): bump github.com/stretchr/testify from 1.6.1 to 1.7.0
    6f84bbb build(deps): bump github.com/cyphar/filepath-securejoin
    0b4d52f build(deps): bump github.com/apex/log from 1.4.0 to 1.9.0
    ac6ba6c build(deps): bump github.com/klauspost/pgzip from 1.2.4 to 1.2.5
    9cd570d build(deps): bump golang from 1.14 to 1.17.1
    26e57a2 gha: enable dependabot
    65932cd ci: hardcode Go version used for linting
    17111a6 *: use go1.17-friendly go:build tags
    f6c2e79 codecov: drop explicit env.CODECOV_TOKEN
    f80d8e2 ci: use codecov-action
    785ed73 fix(Makefile): avoid usage of which
    97099f1 mutate: implement an AddExisting() API
    5adbd99 oci: casext: walk: do not attempt to recurse into un-parseable blobs
    aad89ed oci: cas: add StatBlob to CAS interface
    7091cd1 ci: switch to GitHub Actions
    3ceb144 Add 2 fuzzers

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2022-03-21 17:31:28 -04:00
Bruce Ashfield
0a7ae8bc50 global: convert github SRC_URIs to use https protocol
github is removing git:// access, and fetches will start experiencing
interruptions in service, and eventually will fail completely.

bitbake will also begin to warn on github src_uri's that don't use
https. So we convert the meta-virt instances to use protocol=https
(done using the oe-core contrib conversion script)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-11-02 09:57:03 -04:00
Bruce Ashfield
abf248bd38 umoci: switch branch to main
Like many other projects, umoci has switch to main instead of master.
(and then deleted master)

We change our branch specification to main, so the fetcher can once
again find our desired SRCREV.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-10-21 19:15:59 -04:00
Bruce Ashfield
d876cfc5bf global: overrides syntax conversion
OEcore/bitbake are moving to use the clearer ":" as an overrides
separator.

This is pass one of updating the meta-virt recipes to use that
syntax.

This has only been minimally build/runtime tested, more changes
will be required for missed overrides, or incorrect conversions

Note: A recent bitbake is required:

    commit 75fad23fc06c008a03414a1fc288a8614c6af9ca
    Author: Richard Purdie <richard.purdie@linuxfoundation.org>
    Date:   Sun Jul 18 12:59:15 2021 +0100

        bitbake: data_smart/parse: Allow ':' characters in variable/function names

        It is becomming increasingly clear we need to find a way to show what
        is/is not an override in our syntax. We need to do this in a way which
        is clear to users, readable and in a way we can transition to.

        The most effective way I've found to this is to use the ":" charater
        to directly replace "_" where an override is being specified. This
        includes "append", "prepend" and "remove" which are effectively special
        override directives.

        This patch simply adds the character to the parser so bitbake accepts
        the value but maps it back to "_" internally so there is no behaviour
        change.

        This change is simple enough it could potentially be backported to older
        version of bitbake meaning layers using the new syntax/markup could
        work with older releases. Even if other no other changes are accepted
        at this time and we don't backport, it does set us on a path where at
        some point in future we could
        require a more explict syntax.

        I've tested this patch by converting oe-core/meta-yocto to the new
        syntax for overrides (9000+ changes) and then seeing that builds
        continue to work with this patch.

        (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284)

        Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-08-02 17:17:53 -04:00
Xu, Yanfei
daac3b630f umoci: add nativesdk to BBCLASSEXTEND
add nativesdk to BBCLASSEXTEND

Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-06-21 09:04:47 -04:00
Bruce Ashfield
29de6c30b8 umoci: create -native do_compile and make it static
We need to use different build architecture and flags for the
native variant, so add a specific do_compile for it. The settings
are taken from the kubernetes recipes native go build.

We also switch to the umoci.static for -native, since patchelf is
breaking our executable if we leave it dynamic.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-05-07 11:52:05 -04:00
Bruce Ashfield
7690f23071 umoci: add -native variant
In preparation for using umoci along side of sloci as to
construct multi later oci images, we need a -native variant.

For now, we don't need skopeo on the host side, so we clear
it from the class-native RDEPENDS. Skopeo has significant
dependencies, so we'd rather avoid ever needing it as a
-native tool.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-05-06 16:35:21 -04:00
Bruce Ashfield
040275428d umoci: update to 0.4.7
Updating to the latest 0.4.7 release and updating the build
and fetch directories to the opencontainers github.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-05-06 16:29:45 -04:00
Bruce Ashfield
b7800ccc2a umoci: introduce umoci recipe for image building
Importing umoci from meta-overc

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-05-06 15:47:49 -04:00