diff --git a/alpine/kernel/Dockerfile.aufs b/alpine/kernel/Dockerfile.aufs index 95025c998..5cca69998 100644 --- a/alpine/kernel/Dockerfile.aufs +++ b/alpine/kernel/Dockerfile.aufs @@ -9,10 +9,10 @@ RUN curl -fsSL -o linux-${KERNEL_VERSION}.tar.xz ${KERNEL_SOURCE} RUN cat linux-${KERNEL_VERSION}.tar.xz | tar --absolute-names -xJ && mv /linux-${KERNEL_VERSION} /linux -# this is aufs4.9 20161219 +# this is aufs4.9 20170130 ENV AUFS_REPO https://github.com/sfjro/aufs4-standalone ENV AUFS_BRANCH aufs4.9 -ENV AUFS_COMMIT 0d8e71c28da317ec6371b6b95b46a70cefe13777 +ENV AUFS_COMMIT 6f44e3b0bd99399516982a04782d78f8dae96600 # Download AUFS RUN git clone -b "$AUFS_BRANCH" "$AUFS_REPO" /aufs && \ @@ -58,7 +58,7 @@ RUN if [ $DEBUG -ne "0" ]; then \ fi # Apply local patches -COPY patches-4.9/* patches-4.9-aufs/* /patches/ +COPY patches-4.9/* /patches/ RUN cd /linux && \ set -e && for patch in /patches/*.patch; do \ echo "Applying $patch"; \ diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index eb8b5762a..8f48907a9 100644 --- a/alpine/kernel/Makefile +++ b/alpine/kernel/Makefile @@ -3,7 +3,7 @@ DEBUG ?= 0 all: x86_64/vmlinuz64 ifdef AUFS -x86_64/vmlinuz64: Dockerfile.aufs kernel_config kernel_config.debug kernel_config.aufs patches-4.9 patches-4.9-aufs +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" && \ docker run --rm --net=none --log-driver=none $$BUILD cat aufs-utils.tar | tar xf - && \ @@ -11,7 +11,7 @@ x86_64/vmlinuz64: Dockerfile.aufs kernel_config kernel_config.debug kernel_confi 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 $@ mkdir -p etc/kernel-patches - cp -a patches-4.9/* patches-4.9-aufs/* etc/kernel-patches + cp -a patches-4.9/* etc/kernel-patches tar xf x86_64/kernel-modules.tar else ifdef LTS4.4 diff --git a/alpine/kernel/patches-4.9-aufs/0001-aufs-posix-acl.patch b/alpine/kernel/patches-4.9-aufs/0001-aufs-posix-acl.patch deleted file mode 100644 index 4d27d4f9b..000000000 --- a/alpine/kernel/patches-4.9-aufs/0001-aufs-posix-acl.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 750946c8bfce458490e7e4aba34f22893c16a297 -Author: J. R. Okajima -Date: Mon Jan 23 03:36:33 2017 +0900 - - aufs: for v4.9, support posix acl - - The commit - 3801e27 2016-12-08 aufs: for v4.9-rc1, support new xattr scheme - was not enough, and supporting posix acl was missing. - - Reported-by: Justin Cormack - See-also: https://github.com/docker/docker/issues/30245#issuecomment-274152452 - Signed-off-by: J. R. Okajima - -diff --git a/fs/aufs/xattr.c b/fs/aufs/xattr.c -index d0834e4..35fcc50 100644 ---- a/fs/aufs/xattr.c -+++ b/fs/aufs/xattr.c -@@ -19,6 +19,8 @@ - * handling xattr functions - */ - -+#include -+#include - #include - #include "aufs.h" - -@@ -322,7 +324,11 @@ static const struct xattr_handler au_xattr_handler = { - }; - - static const struct xattr_handler *au_xattr_handlers[] = { -- &au_xattr_handler, -+#ifdef CONFIG_FS_POSIX_ACL -+ &posix_acl_access_xattr_handler, -+ &posix_acl_default_xattr_handler, -+#endif -+ &au_xattr_handler, /* must be last */ - NULL - }; -