From f27c3ff5eda58d76e49ce5129b3cb29e402be272 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 24 Jan 2017 18:50:38 +0000 Subject: [PATCH] Move ebpf to its own directory Unlike the other images in `base` this needs parts from the Moby build so move it for now. Signed-off-by: Justin Cormack --- alpine/Makefile | 4 ++-- alpine/{base => }/ebpf/Dockerfile | 0 alpine/{base => }/ebpf/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename alpine/{base => }/ebpf/Dockerfile (100%) rename alpine/{base => }/ebpf/Makefile (70%) diff --git a/alpine/Makefile b/alpine/Makefile index 3c85ccd9b..72250e873 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -28,7 +28,7 @@ GCE_IMAGE=mobylinux/mkimage-gce@sha256:f9abf2eae20984b7dd3c1afb700b2c9c41e39e6e7 moby.img: Dockerfile mkinitrd.sh init $(ETCFILES) $(MAKE) -C kernel $(MAKE) -j -C packages - $(MAKE) -C base/ebpf + $(MAKE) -C ebpf printf $(TAG)$(DIRTY) > etc/moby-commit BUILD=$$( tar cf - \ Dockerfile etc usr init mkinitrd.sh \ @@ -216,6 +216,6 @@ clean: $(MAKE) -C containers clean $(MAKE) -C test clean $(MAKE) -C kernel clean - $(MAKE) -C base/ebpf clean + $(MAKE) -C ebpf clean .DELETE_ON_ERROR: diff --git a/alpine/base/ebpf/Dockerfile b/alpine/ebpf/Dockerfile similarity index 100% rename from alpine/base/ebpf/Dockerfile rename to alpine/ebpf/Dockerfile diff --git a/alpine/base/ebpf/Makefile b/alpine/ebpf/Makefile similarity index 70% rename from alpine/base/ebpf/Makefile rename to alpine/ebpf/Makefile index 979f9f097..9036e7ca9 100644 --- a/alpine/base/ebpf/Makefile +++ b/alpine/ebpf/Makefile @@ -1,4 +1,4 @@ -KERNEL_FILES=-C ../../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar +KERNEL_FILES=-C ../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar default: ebpf.tag