diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2019-06-03 15:32:39 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2019-06-14 15:45:41 +0200 |
| commit | 5fde3361da51f5c835eae68baa96ae32a7e48925 (patch) | |
| tree | 8ef2ee263d48d5dfb32845c0fa8d11b864d87eba /vendor/github.com/containers/buildah/pkg/unshare/unshare.c | |
| parent | d5f04e920bf0cca02c9efe25ceca7639cbf31644 (diff) | |
| download | podman-5fde3361da51f5c835eae68baa96ae32a7e48925.tar.gz podman-5fde3361da51f5c835eae68baa96ae32a7e48925.tar.bz2 podman-5fde3361da51f5c835eae68baa96ae32a7e48925.zip | |
Update containers/image to v2.0.0, and buildah to v1.8.4
In c/image, this adds the the mirror-by-digest-only option to mirrors, and
moves the search order to an independent list.
A synchronized buildah update is necessary to deal with the c/image API change.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'vendor/github.com/containers/buildah/pkg/unshare/unshare.c')
| -rw-r--r-- | vendor/github.com/containers/buildah/pkg/unshare/unshare.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vendor/github.com/containers/buildah/pkg/unshare/unshare.c b/vendor/github.com/containers/buildah/pkg/unshare/unshare.c index 67a3e0e4d..fd0d48d43 100644 --- a/vendor/github.com/containers/buildah/pkg/unshare/unshare.c +++ b/vendor/github.com/containers/buildah/pkg/unshare/unshare.c @@ -3,7 +3,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/syscall.h> -#include <linux/memfd.h> +#include <sys/mman.h> #include <fcntl.h> #include <grp.h> #include <sched.h> @@ -14,6 +14,17 @@ #include <errno.h> #include <unistd.h> +/* Open Source projects like conda-forge, want to package podman and are based + off of centos:6, Conda-force has minimal libc requirements and is lacking + the memfd.h file, so we use mmam.h +*/ +#ifndef MFD_ALLOW_SEALING +#define MFD_ALLOW_SEALING 2U +#endif +#ifndef MFD_CLOEXEC +#define MFD_CLOEXEC 1U +#endif + #ifndef F_LINUX_SPECIFIC_BASE #define F_LINUX_SPECIFIC_BASE 1024 #endif |