summaryrefslogtreecommitdiffstats
path: root/recipes-containers
Commit message (Collapse)AuthorAgeFilesLines
...
* skopeo: add default set of configuration filesStefan Agner2019-10-133-1/+166
| | | | | | | | | Add a default registries.conf and storage.conf. Those config files are used by several projects of the containers group like buildah or podman. Provide it as part of skopeo like the other distributions do. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* podman: bump to latest release 1.6.1Stefan Agner2019-10-131-2/+2
| | | | | | | Bump to latest podman release 1.6.1. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* podman: remove comment about runcStefan Agner2019-10-131-2/+0
| | | | | | | | | It seems that docker uses nowadays a rather vanilla version of runc, at the time of writing 1.0.0-rc8. This version has successfully tested with podman, hence remove the obsolete comment. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* crun: introduce crun (OCI runtime provider)Bruce Ashfield2019-10-131-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Create the initial recipe to provide crun as an alternative OCI runtime provider. This currently has a depdenency on seccomp, but it would be nice if we can make that optional in the future to avoid pulling in all of meta-security as a dependency. Example: % skopeo copy docker://busybox oci:busybox-oci:latest % mkdir busybox-bundle % oci-image-tool create --ref platform.os=linux busybox-oci busybox-bundle % cd busybox-bundle/ % rm config.json % runc spec % runc run foo ^D % crun run foo ^D Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* podman: fix layer check cut & paste errorsBruce Ashfield2019-10-071-8/+2
| | | | | | | | The layer check for podman was copied from cri-o .. and some non podman elements came over as part of that copy. We drop selinux as a check, and fix some comments. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* podman: make docker wrapper configurable via packageconfigBruce Ashfield2019-10-031-1/+10
| | | | | | | | | | | | | | | | | podman can behave as transparent drop in replacement for docker via a wrapper 'docker' script that simply calls podman when any docker command is issues. While this is an interesting feature, we want it to be optional .. since it is possible that podman and docker might want to be installed at the same time. So we introduce a 'podman' PACKAGECONFIG, that controls whether or not this wrapper is installed, and if it is installed it marks the podman package as conflicting with docker (which gets us a better message than a failed image assembly provides). Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* podman: add build flexibility to dependenciesBruce Ashfield2019-10-021-1/+19
| | | | | | | | | | | | | | | | In a similar manner to cri-o, we don't want to make meta-selinux or meta-security a hard dependency to meta-virtualization. So we implement a similar anonymous python check that allows the recipe to be skipped if the dependent layers are not present (and hence we are yocto compatible). If we get more than two recipes doing layer checks (this is the 2nd), we can move the functionality to a class. We also make the runc dependency be virtual/runc versus picking a specific provider (even if only runc-opencontainers has been tested). Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cri-o: drop ostree from anonymous python warningBruce Ashfield2019-10-021-6/+0
| | | | | | | ostree is now provided by meta-oe, which is a required layer so we can drop it from the anonymous python checks for layers. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* conmon: initial addStefan Agner2019-10-022-0/+61
| | | | | | | Add conmon, a OCI container runtime monitor. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cni: move cni tools to /usr/libexec/cniStefan Agner2019-10-021-1/+1
| | | | | | | | | Use a standard location to store the cni tools and plugins. This is more in line how other distributions package cni. Keep a symlink to /opt/cni/bin for backward compatibility. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* skopeo: add skopeoStefan Agner2019-10-021-0/+73
| | | | | | | | | | | | | | skopeo is a command line utility that performs various operations on container images and image repositories. skopeo can work with OCI images as well as the original Docker v2 images. The recipe originates from from meta-overc commit a497792. It has been updated with the new project URL and v0.1.39. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* podman: add the Pod Manager toolStefan Agner2019-10-021-0/+93
| | | | | | | | | | | | | | | | | | Podman is a daemonless container engine for developing, managing, and running OCI Containers on your Linux System. Containers can either be run as root or in rootless mode. This patch adds the initial recipe for podman. Currently the build tags systemd (if in DISTRO_FEATURES), seccomp, varlink and remoteclient are enabled which allows to run podman with overlayfs as root and vfs in rootless mode. The storage drivers btrfs and device-mapper have not been tested and are disabled at the moment. It seems that seccomp is mandatory, which makes meta-security which provides libseccomp a mandatory dependency for this recipe. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker/moby: 19.03.x updateBruce Ashfield2019-09-262-66/+4
| | | | | | | Updating the moby recipes to the match the 19.03.x updates pulled into docker/docker-ce Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: add transient configuration packageconfigMatt Spencer2019-09-243-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit: [ Author: Tom Rini <trini@konsulko.com> Date: Fri Feb 8 13:22:35 2019 -0500 docker: Move /etc/docker to a symlink to volatiles The only thing which docker uses /etc/docker for is a TLS key for connecting with other TLS-enabled services. Make /etc/docker a symlink to the existing docker volatiles directory so that we can use docker on a read-only rootfs. Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] We've had a transient / volatile docker configuration since we point our /etc configuration to /run. This is not always a good thing if a static configuration for keys, etc, is desired. We maintain this functionality under the 'transient-config' PACKAGECONFIG, and also allow the existing static/permanent config to be used. Signed-off-by: Matt Spencer <matthew@thespencers.me.uk> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: rename docker -> docker-moby and introduce virtual/dockerBruce Ashfield2019-09-242-0/+9
| | | | | | | | | | | | | | | | | | The recipe which was providing the default "docker" package was aligned with the moby repositories. In order to make that alignment clear, we rename that recipe docker-moby. To allow easier switching between the docker providing recipes, we introduce a virtual/docker PROVIDES to the common .inc file (and hence each recipe). This allows users to chose what they want via the standard PREFERRED_PROVIDER mechanism. Also to allow existing package lists and image installs to continue to work without changes, we make sure that the implementation specific docker-<foo> packages RPROVIDE docker. If any packages are missed, we'll add them to this list in future updates. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker-ce: update to v19.03.2Stefan Agner2019-09-231-2/+2
| | | | | | | Bump the git hashes to Docker CE v19.03.2. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker-ce: improve hardcoded CC for cross compileStefan Agner2019-09-232-0/+62
| | | | | | | | | | | | | | | | | | | | Since commit applied in moby [61a3285 Support cross-compile for arm] it hardcoded var-CC to support cross-compile for arm Correct it with "${parameter:-word}" format, it is helpful for user define toolchains (Use Default Values. If parameter is unset or null, the expansion of word is substituted. Otherwise, the value of parameter is substituted.) https://github.com/moby/moby/commit/61a3285864d3f1b489f48f765b61b2c7bd300372 This fixes a build issue seen when building docker-ce: exec: "aarch64-linux-gnu-gcc": executable file not found in $PATH Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* kubernetes: fix compiling failure: execvp: /bin/bash: Argument list too longHongxu Jia2019-09-182-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use GNU Make 4.2.1(such as fedora-29) to build k8s in a long directory, it failed with `execvp: /bin/bash: Argument list too long' [snip] $ cd /buildarea1/hjia/wrlinux-1019/I_/suspect_/that_/if_/you_/create_/your_/project_/in_/a_/very_/deep_/directory/build_master-wr_qemux86-64_faw_2019090509/build/tmp-glibc/work/core2-64-wrs-linux/kubernetes/v1.16.0-alpha+git7054e3ead7e1a00ca6ac3ec47ea355b76061a35a-r0/kubernetes-v1.16.0-alpha+git7054e3ead7e1a00ca6ac3ec47ea355b76061a35a/src/import $ make cross KUBE_BUILD_PLATFORMS=linux/amd64 GOLDFLAGS="" |+++ [0804 16:38:32] Building go targets for linux/amd64: | ./vendor/k8s.io/code-generator/cmd/deepcopy-gen |make[1]: execvp: /bin/bash: Argument list too long |make[1]: *** [Makefile.generated_files:184: pkg/kubectl/cmd/testing/zz_generated.deepcopy.go] Error 127 |make: *** [Makefile:557: generated_files] Error 2 ... [snip] From make manual [1] $? The names of all the prerequisites that are newer than the target, with spaces between them. While two `$?' was passed to bash in a line, it caused above failure, drop a duplicated one could workaround the issue. [1] https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* templates/lxc-download.in: Use curl instead of wgetJoakim Roubert2019-09-182-1/+51
| | | | | | | | | When curl's MIT license is preferable to wget's GPLv3. Which it is in several situations. Change-Id: I72ee1ce66493c564557b73fae80f5219ef83af6d Signed-off-by: Joakim Roubert <joakimr@axis.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* oci-systemd-hook: fixup patch contextMark Asselstine2019-09-181-9/+9
| | | | | | | | | | | | | | | | | | | commit 7394c154a92f [containers: update oci-systemd-hook to 0.2.0] incorrectly adjusted the context around the patch 0001-Add-additional-cgroup-mounts-from-root-NS-automatica.patch. This resulted in containers failing with an error: systemdhook <error>: Failed to mkdir new dest: /opt/container/cube-server/rootfs/sys/fs/cgroup/perf_event: No such file or directory Unfortunately, the code was being patched in ahead of the mounting of the tmpfs after the patch context was adjusted. You can even get a hint of this in the comment "Systemd is already handled above". Here we correct this by pushing the code down to the correct position in the file/function, making the error go away and proper function return. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* lxc: restore the ability to move nl80211 deviceYunguo Wei2019-09-142-0/+95
| | | | | | | | | | | | | | | | nl80211 device can't be moved to another namespace due to e389f2afd8509(start: unify and simplify network creation), and lxc community has fixed this issue with: commit 3dd7829433f63b2ec1323a1f237efa7d67ea6e2b lxc upstream This patch is grabbing the commit above, and should be abandoned with lxc uprev afterwards. See more details here: https://github.com/lxc/lxc/issues/3105 Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cri-o: RDEPENDS on libdevmapperMing Liu2019-09-091-0/+1
| | | | | | | | | | | Since comit 3f64779e in meta-oe: [ libdevmapper/lvm2: force recipe libdevmapper to populate sysroot only ] libdevmapper recipe does not provide package any more, we need RDEPENDS on libdevmapper which is being provided by lvm2 recipe. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* containerd-opencontainers: building unstripped binariesHongxu Jia2019-09-032-0/+45
| | | | | | | | | | It defaults to "-s -w" [1] which strips debug information, refresh a backported patch to build unstripped binaries https://golang.org/cmd/link/ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* kubernetes: building unstripped binariesHongxu Jia2019-09-031-1/+1
| | | | | | | | | | | | Specify GOLDFLAGS as an empty string for building unstripped binaries, which allows you to use code debugging tools like delve. When GOLDFLAGS is unspecified, it defaults to "-s -w" which strips debug information. Other flags that can be used for GOLDFLAGS are documented at https://golang.org/cmd/link/ [1] [1] https://github.com/kubernetes/kubernetes/blob/master/build/root/Makefile#L82 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cgroup-lite: support usrmergeChangqing Li2019-09-031-3/+3
| | | | | Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* runc: add PACKAGECONFIG to allow building as static or notChen Qi2019-08-125-25/+45
| | | | | | | | | | | | Add a new PACKAGECONFIG, static, which when enabled will build runc as static. Default to enable it. We need this because we should allow users to build runc as not static so that when docker's cgroup driver is set to systemd, we don't get error. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* kubernetes: clean up environment settings in do_compileChen Qi2019-08-121-24/+12
| | | | | | | | | | | | | | There are unnessary and incorrect settings like GOOS and GOROOT. There are also redundant settings like GOPATH, CGO_CFLAGS, etc, whose latter setting will cover the previous one. So clean all these up. Also, remove the comment which suggests settings GOVERSION to "1.10%", as it's no longer valid for current OE. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* lxc: upgrade 3.1.0 -> 3.2.1Yuan Chao2019-08-121-2/+2
| | | | | Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* criu: upgrade 3.11 -> 3.12Yuan Chao2019-08-122-7/+9
| | | | | | | Refresh patch: 0001-criu-Fix-toolchain-hardcode.patch Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cri-o: skip it when depends not foundMingli Yu2019-08-121-0/+22
| | | | | | | | | cri-o depends on ostree, libselinux and libseccomp and we should check if the layer which provides these recipes exist or not before go on. Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* kubernetes: set COMPATIBLE_HOSTChen Qi2019-07-311-0/+2
| | | | | | | | | | | Currently kubernetes does not build for qemux86, qemumips, qemumips64, qemuppc. So set COMPATIBLE_HOST to make this clear. Otherwise we get build failure when trying to build like below. fatal error: bits/long-double-64.h: No such file or directory Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: Define override-able BUILD_TAGSAnoop Karollil2019-07-301-2/+3
| | | | | | | | | | | | | | | DOCKER_BUILDTAGS has tags that exclude btrfs and devicemapper graph drivers. To enable either, the tags have to be removed, but this isn't easily possible as DOCKER_BUILDTAGS can't be overridden via a bbappend. Define a BUILD_TAGS variable in the docker recipe that is set with the exclude tags, and use it for setting DOCKER_BUILDTAGS. This makes it possible for downstream to tweak BUILD_TAGS/DOCKER_BUILD_TAGS via a bbappend. Signed-off-by: Anoop Karollil <anoop.karollil@ge.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: improve hardcoded CC for cross compileHongxu Jia2019-07-222-1/+63
| | | | | | | | | | | | | | | | Since commit applied in moby [61a3285 Support cross-compile for arm] it hardcoded var-CC to support cross-compile for arm Correct it with "${parameter:-word}" format, it is helpful for user define toolchains (Use Default Values. If parameter is unset or null, the expansion of word is substituted. Otherwise, the value of parameter is substituted.) https://github.com/moby/moby/commit/61a3285864d3f1b489f48f765b61b2c7bd300372 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* containers/go/build: don't override global package strip flagsBruce Ashfield2019-07-225-6/+0
| | | | | | | | | | | | | | | | | | When the go-lang container recipes were first created there were issues with strip and the resulting binaries. As such, strip was inhibited for the various packages. This variable is now set in the default classes, and tests show that strip works on the binaries (saving up to 2M on disk for some binaries) with no runtime issues found. So we drop our explicit set of the inhibit and let the build proceed by the defaults. If issues are found, we can re-enable the setting or bbappends can turn it back on for builds showing issues. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* k8s: update to 1.16+Bruce Ashfield2019-07-121-2/+2
| | | | | | | Upgrading kubernetes to the 1.16 series. This is currently in alpha, but will be released before the feature freeze. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cri-o: update to 1.15Bruce Ashfield2019-07-121-14/+42
| | | | | | | | | | | | | | | | | Updating to the 1.15 release. With this update there are significant new build constraints and dependencies. As such, the cross binaries are now being be built by default, with the old (non-cross) build being kept around as an optional way to build the components. There are still issues with the non-cross build, so it will require more work in the future. We also document the requirement for selinux and seccomp in the README as dependencies if you build cri-o. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* containerd: update to 0.2.7Bruce Ashfield2019-07-121-2/+2
| | | | | | | Updating to the latest containerd 0.2.x release. No build changes were required, and runtime behaviour is the same. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* containers: update oci-systemd-hook to 0.2.0Bruce Ashfield2019-07-123-26/+31
| | | | | | | | | | Updating to the latest oci-systemd-hook version. We also refresh the patches, specifically the selinux patch, for the updated context. The additional cgroups mount patch needed to be tweaks for new required parameters, but is otherwise unchanged. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* containers/runtime-spec: update to v1.01Bruce Ashfield2019-07-121-2/+2
| | | | | | | Updating the reference spec to v1.01. No functional or runtime changes are expected from this. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker-ce: update to v19.03-rcBruce Ashfield2019-07-121-11/+11
| | | | | | | | | | | | Updating the docker community edition to the 19.03 series. The build changes are minor (mainly cleanup), but otherwise, we are changing branches and setting new SRCREVs. The LICENSE checksum tweak is due to copyright year changes in the files. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker/moby: update to v19.03-rcBruce Ashfield2019-07-121-6/+6
| | | | | | | | | | | | | updating the full community build (moby) of the docker engine, cli and networking components to the 19.03 release series. The changes are minimal, versioning, branch selection, but otherwise everything in the build is the same as the previous versions. The SRCREVs are selected through an audit of moby and docker-ce to synchronize the build points for the various components. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* oci-image-tools: refresh to tip of masterBruce Ashfield2019-07-123-323/+1
| | | | | | | | Updating the oci-image-tools to the tip of the master branch. This gets us official integrations of some backported patches (along with other associated minor fixes). Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* oci-image-spec: uprev to v1.0.1Bruce Ashfield2019-07-121-7/+7
| | | | | | | | | | | Updating the reference/source package of the oci-image-spec to v1.0.1. We also cleanup the install rule to be a bit simpler (by using --parents), and remove the .tool directory (which is new to this version), since it won't be package by default (and hence throws a QA error) and we don't need the .tool/* files. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* runc: update to -rc8Bruce Ashfield2019-07-122-4/+4
| | | | | | | | | | Updating both the pure opencontainers runc and the docker opencontainers variants to -rc8. We track the tip of master for opencontainers and for docker we match the -ce and moby -rc8 commit hashes. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker-distribution: remove docker-distribution-ptest dependenciesChangqing Li2019-07-031-0/+2
| | | | | | | | | | | after commit https://git.openembedded.org/openembedded-core/ commit/meta/classes/ptest.bbclass?id=b47194b57d94260b4e6438c5bf74914027f0b520 package ${PN}-ptest will depend on ${PN} by default, but for docker-distribution, ${PN} is empty package, remove it from dependency to avoid image do rootfs failure since nothing provides error. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* docker: make docker-init a runtime dependency by defaultStefan Agner2019-07-031-1/+2
| | | | | | | | | | | | | | | If docker run --init is used docker expects docker-init to be present, if not Docker fails to start the container with the following error: docker: Error response from daemon: exec: "docker-init": executable file not found in $PATH. However, docker-init does not get deployed by default since commit d19fda374317 ("docker: consolidate common depends/options"). Readd docker-init through a PACKAGECONFIG RDEPENDS to make sure it gets deployed by default again. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* singularity: openssl cert configs path fixed.Cevat Bostancioglu2019-07-031-2/+2
| | | | | | openssl recipe moves ssl-1.1 directory as ssl , singularity recipe cannot find ssl-1.1 path. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* criu: fix dump error on Intel Apollo Lake SOCDengke Du2019-05-292-0/+49
| | | | | | | | | | | | | | | Fix dump error when executing: criu dump -D checkpoint -t pid ------------------------------------------------- Error (criu/arch/x86/crtools.c:362): x86: Corruption in XFEATURE_YMM area (expected 64 but 0 obtained) Error (criu/cr-dump.c:1280): Can't infect (pid: 2874) with parasite Error (criu/cr-dump.c:1732): Dumping FAILED. ------------------------------------------------- Backport upstream patch on criu-dev branch to fix this: [https://github.com/checkpoint-restore/criu/commit/5a52e34655636a8f00a664cf42716e1439ea2ef0] Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cri-o: build crio-config natively to generate conmon/config.hMark Asselstine2019-04-122-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | Part of building cri-o is the generation of the 'conmon/config.h' file. The content of this file is dynamic in that it has buffer sizes and a socket path which will depend on constants that are set in other parts of the code. For example the socket path can be setup for Windows or for Linux. To generate 'conmon/config.h' a small GO application is built and run called crio-config. This isn't really suitable for a -native package but we do have to run crio-config on the build host so we don't want to cross compile it. We therefor use the native GO to build this. This change allows things to work when the build host arch and the target arch don't match. A small update to the Makefile avoids mixing build host arch and target arch GO packages. Finally, We drop the crio-config binary from the install as it is only used to create the conmon/config.h as part of the build. This is consistent with the Makefile's install rule which does not install this binary as it has no use on the target. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
* cri-o: fixup buildMark Asselstine2019-04-121-19/+0
| | | | | | | | | | | | | | | | | | After oe-core commits 5f48939e2640 [goarch.bbclass: use MACHINEOVERRIDES and simplify go_map_arm()] 6300c4a83f7c [go.bbclass:Export more GO* environment variables] we see a build failure with cri-o: | go build runtime/cgo: attempting to install package runtime/cgo into read-only GOROOT | Makefile:112: recipe for target 'conmon/config.h' failed | make: *** [conmon/config.h] Error 1 to avoid this we should not overwrite the GO* environment being setup by the go.bbclass, so we drop most of our GO* exports here. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>