github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1112 from justincormack/patchfilesfix

Browse Source 
Clean up patch copying
This commit is contained in:
Justin Cormack 2017-01-29 21:34:38 +00:00 committed by GitHub
commit 483ea5cb81
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
alpine/kernel/Makefile
View File

@ -17,6 +17,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
@ -29,7 +30,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
$(MAKE) x86_64/kernel.img
else
@ -39,7 +42,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
$(MAKE) x86_64/kernel.img
endif