move kernel under rest of build and pull through aufs tools

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
This commit is contained in:
Justin Cormack
2015-12-17 15:26:42 +00:00
parent fdeb106f3a
commit 70d8143e48
9 changed files with 15 additions and 12 deletions

2
kernel/.gitignore vendored
View File

@@ -1,2 +0,0 @@
vmlinuz64
aufs-utils.tar

View File

@@ -1,73 +0,0 @@
FROM debian:jessie
ENV KERNEL_VERSION 4.1.12
RUN apt-get update && apt-get -y upgrade && apt-get -y install \
unzip \
xz-utils \
curl \
bc \
build-essential \
cpio \
gcc libc6 libc6-dev \
kmod \
squashfs-tools \
genisoimage \
xorriso \
syslinux \
isolinux \
automake \
pkg-config \
git \
ncurses-dev \
p7zip-full
ADD https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz .
RUN cat linux-${KERNEL_VERSION}.tar.xz | tar --absolute-names -xJ && mv /linux-${KERNEL_VERSION} /linux
# http://aufs.sourceforge.net/
ENV AUFS_REPO https://github.com/sfjro/aufs4-standalone
ENV AUFS_BRANCH aufs4.1
ENV AUFS_COMMIT 4912d6da07e3e24d7a8484e0e8a4c1315adbc8fd
# we use AUFS_COMMIT to get stronger repeatability guarantees
# Download AUFS and patch kernel
RUN git clone -b "$AUFS_BRANCH" "$AUFS_REPO" /aufs && \
cd /aufs && \
git checkout -q "$AUFS_COMMIT" && \
cd /linux && \
cp -r /aufs/Documentation /linux && \
cp -r /aufs/fs /linux && \
cp -r /aufs/include/uapi/linux/aufs_type.h /linux/include/uapi/linux/ && \
set -e && for patch in \
/aufs/aufs*-kbuild.patch \
/aufs/aufs*-base.patch \
/aufs/aufs*-mmap.patch \
/aufs/aufs*-standalone.patch \
/aufs/aufs*-loopback.patch \
; do \
patch -p1 < "$patch"; \
done
COPY kernel_config /linux/.config
RUN jobs=$(nproc); \
cd /linux && \
make -j ${jobs} oldconfig && \
make -j ${jobs} bzImage && \
make INSTALL_HDR_PATH=/tmp/kernel-headers headers_install
# Build aufs tools, do this here as they need kernel headers and to match aufs
# Fortunately they are build statically linked
ENV AUFS_TOOLS_COMMIT 5e0c348bd8b1898beb1e043b026bcb0e0c7b0d54
RUN git clone https://github.com/Distrotech/aufs-util.git && \
cd /aufs-util && \
git checkout "$AUFS_TOOLS_COMMIT" && \
CPPFLAGS="-I/tmp/kernel-headers/include" CLFAGS=$CPPFLAGS LDFLAGS=$CPPFLAGS make && \
DESTDIR=/tmp/aufs-utils make install && \
rm -rf /tmp/aufs-utils/usr/lib /tmp/aufs-utils/usr/share && \
cd /tmp/aufs-utils && tar cf /aufs-utils.tar .

View File

@@ -1,13 +0,0 @@
all: vmlinuz64 aufs-utils.tar
kernel: kernel_config Dockerfile
docker build -t mobykernel:build .
vmlinuz64: kernel
docker run mobykernel:build cat /linux/arch/x86_64/boot/bzImage > vmlinuz64
aufs-utils.tar: kernel
docker run mobykernel:build cat /aufs-utils.tar > aufs-utils.tar
clean:
rm -f vmlinuz64 aufs-utils.tar

View File

@@ -1,3 +0,0 @@
Temporary non modular kernel config for pinata alpha
TODO: build with Alpine and/or use Alpine kernels - needs some patches.

File diff suppressed because it is too large Load Diff