From 8ff1fe144df4b4dbd28fbac492eca306445fea5f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 29 Jan 2017 20:26:51 +0000 Subject: [PATCH] Clean up patch copying Signed-off-by: Justin Cormack --- alpine/kernel/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index 8f48907a9..a487ece8a 100644 --- a/alpine/kernel/Makefile +++ b/alpine/kernel/Makefile @@ -10,6 +10,7 @@ x86_64/vmlinuz64: Dockerfile.aufs kernel_config kernel_config.debug kernel_confi 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 tar cf - bzImage kernel-dev.tar kernel-headers.tar vmlinux kernel-modules.tar | tar xf - -C x86_64 mv x86_64/bzImage $@ + rm -rf etc/kernel-patches mkdir -p etc/kernel-patches cp -a patches-4.9/* etc/kernel-patches tar xf x86_64/kernel-modules.tar @@ -21,7 +22,9 @@ x86_64/vmlinuz64: Dockerfile.4.4 kernel_config kernel_config.debug kernel_config 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 tar cf - bzImage kernel-dev.tar kernel-headers.tar vmlinux kernel-modules.tar | tar xf - -C x86_64 mv x86_64/bzImage $@ - cp -a patches-4.4 etc/kernel-patches + rm -rf etc/kernel-patches + mkdir -p etc/kernel-patches + cp -a patches-4.4/* etc/kernel-patches tar xf x86_64/kernel-modules.tar else x86_64/vmlinuz64: Dockerfile kernel_config kernel_config.debug patches-4.9 @@ -30,7 +33,9 @@ x86_64/vmlinuz64: Dockerfile kernel_config kernel_config.debug patches-4.9 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 tar cf - bzImage kernel-dev.tar kernel-headers.tar vmlinux kernel-modules.tar | tar xf - -C x86_64 mv x86_64/bzImage $@ - cp -a patches-4.9 etc/kernel-patches + rm -rf etc/kernel-patches + mkdir -p etc/kernel-patches + cp -a patches-4.9/* etc/kernel-patches tar xf x86_64/kernel-modules.tar endif endif