From 99648a82d158c0a94c9e5ede7116c13d2b38b45b Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 18 Jan 2017 11:44:31 +0000 Subject: [PATCH] Remove aufs 4.4 support This only shipped for one rc and we are not going to ship it any more, and CI is disabled. Signed-off-by: Justin Cormack --- alpine/kernel/Makefile | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index 14d5abe21..18473047c 100644 --- a/alpine/kernel/Makefile +++ b/alpine/kernel/Makefile @@ -1,26 +1,8 @@ DEBUG ?= 0 -ifdef AUFS4.4 -AUFS=1 -endif - all: x86_64/vmlinuz64 ifdef AUFS -ifdef AUFS4.4 -x86_64/vmlinuz64: Dockerfile.aufs4.4 kernel_config kernel_config.debug kernel_config.aufs kernel_config.4.4 patches-4.4 - mkdir -p x86_64 etc lib usr sbin - BUILD=$$( tar cf - $^ | docker build -f Dockerfile.aufs4.4 --build-arg DEBUG=$(DEBUG) -q - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-modules.tar > x86_64/kernel-modules.tar && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /aufs-utils.tar | tar xf - && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-source-info > etc/kernel-source-info && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /vmlinux > x86_64/vmlinux && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-headers.tar > x86_64/kernel-headers.tar && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /kernel-dev.tar > x86_64/kernel-dev.tar && \ - docker run --rm --net=none --log-driver=none $$BUILD cat /bzImage > $@ && \ - cp -a patches-4.4 etc/kernel-patches && \ - tar xf x86_64/kernel-modules.tar -else x86_64/vmlinuz64: Dockerfile.aufs kernel_config kernel_config.debug kernel_config.aufs patches-4.9 mkdir -p x86_64 etc lib usr sbin BUILD=$$( tar cf - $^ | docker build -f Dockerfile.aufs --build-arg DEBUG=$(DEBUG) -q - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \ @@ -33,7 +15,6 @@ x86_64/vmlinuz64: Dockerfile.aufs kernel_config kernel_config.debug kernel_confi docker run --rm --net=none --log-driver=none $$BUILD cat /bzImage > $@ && \ cp -a patches-4.9 etc/kernel-patches && \ tar xf x86_64/kernel-modules.tar -endif else ifdef LTS4.4 x86_64/vmlinuz64: Dockerfile.4.4 kernel_config kernel_config.debug kernel_config.4.4 patches-4.4