diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 0c4a95b0e..4009de9d8 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -1,6 +1,6 @@ # This is a blueprint for building the open source components of Docker for Mac kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:15c56c57ac9a7adeec20b34f36f2bc165c347679 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host @@ -52,7 +52,7 @@ services: image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b # Enable getty for easier debugging - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/docs/kernels.md b/docs/kernels.md index 1a9b1354c..11d83f2bf 100644 --- a/docs/kernels.md +++ b/docs/kernels.md @@ -339,7 +339,7 @@ file: ``` kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - /zfs-kmod:4.9.47 diff --git a/examples/aws.yml b/examples/aws.yml index 2a68ab431..7d41f3e2b 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 9dbaeb3ac..6f68c0902 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/bar/mac-addr b/examples/bar/mac-addr new file mode 100644 index 000000000..8c8796cdf --- /dev/null +++ b/examples/bar/mac-addr @@ -0,0 +1 @@ +e2:14:27:53:9f:9f \ No newline at end of file diff --git a/examples/bar/qemu.pid b/examples/bar/qemu.pid new file mode 100644 index 000000000..a8135b832 --- /dev/null +++ b/examples/bar/qemu.pid @@ -0,0 +1 @@ +87422 diff --git a/examples/docker.yml b/examples/docker.yml index 4d95950c3..dbd705fcb 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -18,7 +18,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/foo/mac-addr b/examples/foo/mac-addr new file mode 100644 index 000000000..71b0b7b4a --- /dev/null +++ b/examples/foo/mac-addr @@ -0,0 +1 @@ +9e:70:33:12:ee:0a \ No newline at end of file diff --git a/examples/foo/qemu.pid b/examples/foo/qemu.pid new file mode 100644 index 000000000..9bc570c40 --- /dev/null +++ b/examples/foo/qemu.pid @@ -0,0 +1 @@ +87412 diff --git a/examples/gcp.yml b/examples/gcp.yml index e0a1c8e14..8e939c88a 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index c12e4bf76..b2f3e1b40 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 4d710bdf2..f33988cab 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index ef555c6bf..f553a1f2f 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -7,7 +7,7 @@ init: - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/openstack.yml b/examples/openstack.yml index 8e260dbc2..23168587a 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -19,7 +19,7 @@ services: - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.yml b/examples/packet.yml index f02820bc5..397a5a710 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -22,7 +22,7 @@ services: - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a trust: org: - linuxkit diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 393bd482e..75f9c993a 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -1,7 +1,7 @@ # Minimal YAML to run a redis server (used at DockerCon'17) # connect: nc localhost 6379 kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -13,7 +13,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 3bc145a87..01f2a5907 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -14,7 +14,7 @@ onboot: command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index d5ff381a5..a1fbf3760 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index b5ec7c9db..ede130955 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index 58eb7e016..a1199927c 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:a9ad57ed738a31ea9380cd73236866c312b35489 services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 1479d38f5..8a3b53bdb 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -19,7 +19,7 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:c7e61d9250de0b21455dc5c8bb885bd8faa31621 binds: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index ac7860d74..51844e637 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/vultr.yml b/examples/vultr.yml index 9b4af77a9..2da1f9388 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 4cb3c3c17..fa73f206e 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,7 +40,7 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true net: /run/netns/wg1 diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 68d274898..8fa129aef 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -40,6 +40,8 @@ ENV KERNEL_PGP2_SIGN=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL ENV WIREGUARD_VERSION=0.0.20171101 ENV WIREGUARD_SHA256=096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 ENV WIREGUARD_URL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${WIREGUARD_VERSION}.tar.xz +# XXX REMOVE FOR NEXT RELEASE +ENV WIREGUARD_PATCH=https://git.zx2c4.com/WireGuard/patch/?id=cc310a5dd1899417971e993d61d1230b14fe4f87 # We copy the entire directory. This copies some unneeded files, but # allows us to check for the existence /patches-${KERNEL_SERIES} to @@ -109,6 +111,8 @@ RUN make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \ RUN curl -sSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \ echo "${WIREGUARD_SHA256} /wireguard.tar.xz" | sha256sum -c - && \ tar -C / --one-top-level=wireguard --strip-components=2 -xJf /wireguard.tar.xz "WireGuard-${WIREGUARD_VERSION}/src" && \ + curl -sSL -o /wireguard.patch "${WIREGUARD_PATCH}" && \ + (cd /wireguard && patch -p 2 < /wireguard.patch) && \ make -j "$(getconf _NPROCESSORS_ONLN)" M="/wireguard" modules # Modules and Device Tree binaries diff --git a/kernel/Makefile b/kernel/Makefile index 51defc4b6..2ca623831 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -172,11 +172,11 @@ endef # Build Targets # Debug targets only for latest stable and LTS stable # -$(eval $(call kernel,4.13.10,4.13.x,$(EXTRA))) -$(eval $(call kernel,4.13.10,4.13.x,-dbg)) -$(eval $(call kernel,4.9.59,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.59,4.9.x,-dbg)) -$(eval $(call kernel,4.4.95,4.4.x,$(EXTRA))) +$(eval $(call kernel,4.13.11,4.13.x,$(EXTRA))) +$(eval $(call kernel,4.13.11,4.13.x,-dbg)) +$(eval $(call kernel,4.9.60,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.60,4.9.x,-dbg)) +$(eval $(call kernel,4.4.96,4.4.x,$(EXTRA))) # Target for kernel config kconfig: | sources diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index ee89db835..343844f57 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.13.10 Kernel Configuration +# Linux/arm64 4.13.11 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index e9cd4370f..cb4033711 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.13.10 Kernel Configuration +# Linux/x86 4.13.11 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.4.x-aarch64 b/kernel/config-4.4.x-aarch64 index d4316834b..0c5c7dbb0 100644 --- a/kernel/config-4.4.x-aarch64 +++ b/kernel/config-4.4.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.95 Kernel Configuration +# Linux/arm64 4.4.96 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index a92e654a8..bf4d6e0cd 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.95 Kernel Configuration +# Linux/x86 4.4.96 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.9.x-aarch64 b/kernel/config-4.9.x-aarch64 index ee5dd2a13..deb1a9a5e 100644 --- a/kernel/config-4.9.x-aarch64 +++ b/kernel/config-4.9.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.59 Kernel Configuration +# Linux/arm64 4.9.60 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index bd058a8f3..1f580344b 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.59 Kernel Configuration +# Linux/x86 4.9.60 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch index 0672d1190..0e619b0e9 100644 --- a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch +++ b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch @@ -1,4 +1,4 @@ -From f4a0a0b8f21fba644927d8993dc8f10ac0aa1ae9 Mon Sep 17 00:00:00 2001 +From 84976a5ab64666c933687ee817ca36eae7f0a494 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:12 -0600 Subject: [PATCH 01/12] vmbus: vmbus_open(): reset onchannel_callback on error @@ -30,5 +30,5 @@ index be3fccab07fe..4775616ec87f 100644 } EXPORT_SYMBOL_GPL(vmbus_open); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index f9ef69852..e261a82df 100644 --- a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From 3b85f52d8ace71a3b5f5184e7475f0bbdd64cdb7 Mon Sep 17 00:00:00 2001 +From 6c78a4a02c48cbdb43d96b93b663247d04d69b04 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:20 -0600 Subject: [PATCH 02/12] vmbus: remove "goto error_clean_msglist" in @@ -59,5 +59,5 @@ index 4775616ec87f..033100a1cd59 100644 vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle); kfree(open_info); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch b/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch index 13fa24a2c..ac148fcfa 100644 --- a/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch +++ b/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch @@ -1,4 +1,4 @@ -From 98b9acabc37de2de3058542f7675d9a0acfc027a Mon Sep 17 00:00:00 2001 +From adedf654b77734e3f2789bce51c4706f8f5175a2 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:26 -0600 Subject: [PATCH 03/12] hv_sock: implements Hyper-V transport for Virtual @@ -930,5 +930,5 @@ index 000000000000..fd89bf357617 +MODULE_VERSION("1.0.0"); +MODULE_LICENSE("GPL"); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch b/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch index 53ae177a6..4c1e8f0d6 100644 --- a/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch +++ b/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch @@ -1,4 +1,4 @@ -From 0b6bb454585f5377a680de8ddc575560ccc70dd0 Mon Sep 17 00:00:00 2001 +From 7577da4c86e01fe716ce883713d65e33a801bd8a Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:29 -0600 Subject: [PATCH 04/12] VMCI: only try to load on VMware hypervisor @@ -60,5 +60,5 @@ index d7eaf1eb11e7..1789ea71ff5d 100644 if (vmci_err < VMCI_SUCCESS) { pr_err("Failed to initialize VMCIEvent (result=%d)\n", -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch b/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch index 796e5c8dc..286d4c06a 100644 --- a/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch +++ b/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch @@ -1,4 +1,4 @@ -From 40b7f8b296e25569f5b591227266f4563580fa15 Mon Sep 17 00:00:00 2001 +From ceddb6362cdf6c7603519796765a637273492957 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:35 -0600 Subject: [PATCH 05/12] hv_sock: add the support of auto-loading @@ -26,5 +26,5 @@ index fd89bf357617..f465b0b662df 100644 MODULE_LICENSE("GPL"); +MODULE_ALIAS_NETPROTO(PF_VSOCK); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch b/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch index a912eda28..94bc65a28 100644 --- a/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch +++ b/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch @@ -1,4 +1,4 @@ -From 9ba95ab3f8b0ecb2b603cdbd4a91ea2e706e3b15 Mon Sep 17 00:00:00 2001 +From bd7602a121fa1a8b5f73e5724c583524ee7feb76 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 18:52:02 -0600 Subject: [PATCH 06/12] tools: hv_sock: 2 simple test cases. @@ -426,5 +426,5 @@ index 000000000000..fb4370c53152 + return -1; +} -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch b/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch index 07d3baa6c..724aa9b38 100644 --- a/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch +++ b/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch @@ -1,4 +1,4 @@ -From 6239bf9e96e36e5d1b90ea81424e2546279cbc13 Mon Sep 17 00:00:00 2001 +From 88e20d993efc8c0a9d1f43fd3d21623a20758736 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 16 May 2017 22:14:03 +0800 Subject: [PATCH 07/12] hvsock: fix a race in hvs_stream_dequeue() @@ -109,5 +109,5 @@ index f465b0b662df..30154836acd0 100644 case 1: ret = 1; -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch b/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch index 6ff5c2541..6b151da59 100644 --- a/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch +++ b/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch @@ -1,4 +1,4 @@ -From 90c9108bd15c2727eba0f39d574c36b4c211dfd2 Mon Sep 17 00:00:00 2001 +From 288e8b9c78243d1a2e8767c01a3259125b8fbf7c Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 19 May 2017 21:49:59 +0800 Subject: [PATCH 08/12] hvsock: fix vsock_dequeue/enqueue_accept race @@ -45,5 +45,5 @@ index dfc8c51e4d74..b7b2c66d91fd 100644 /* The caller will need a reference on the connected socket so we let * it call sock_put(). -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch b/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch index 32828f74f..0f2012ed0 100644 --- a/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch +++ b/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch @@ -1,4 +1,4 @@ -From 72c2a4fa0f4b0189299ebbbd832f3d3c9b099ff1 Mon Sep 17 00:00:00 2001 +From 7471603c7d3cd40047450df595f3f0d7825079c8 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 21 Jun 2017 22:30:42 +0800 Subject: [PATCH 09/12] hv-sock: a temporary workaround for the @@ -129,5 +129,5 @@ index 30154836acd0..b8bf1446ae13 100644 return 0; } -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch b/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch index 4f38839db..3f3cda4c3 100644 --- a/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch +++ b/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch @@ -1,4 +1,4 @@ -From 3ae05c99d9c0e6f2301216eac4cf8ce2ae486d62 Mon Sep 17 00:00:00 2001 +From ce4cee4266809f78cacd7af80d895fb673ecdf9f Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 7 Jul 2017 09:15:29 +0800 Subject: [PATCH 10/12] hv-sock: avoid double FINs if shutdown() is called @@ -37,5 +37,5 @@ index b8bf1446ae13..50e4bc822c69 100644 /* It can't fail: see hvs_channel_writable_bytes(). */ -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch b/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch index 853402805..df4b7f574 100644 --- a/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch +++ b/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch @@ -1,4 +1,4 @@ -From 05fde1fa40b0dd5022754e3d48dd620af68e904b Mon Sep 17 00:00:00 2001 +From d5f5c579890682ced38cf3c4e3b6bf993ebef894 Mon Sep 17 00:00:00 2001 From: Randy Dodgen Date: Thu, 24 Aug 2017 15:26:01 -0400 Subject: [PATCH 11/12] ext4: fix fault handling when mounted with -o dax,ro @@ -57,5 +57,5 @@ index 86ea1d92839a..197653ea6041 100644 if (write) { sb_start_pagefault(sb); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index b9486dc6e..6ba768c7f 100644 --- a/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From edb260a0322aabd25741c944ad51c50b25afc58d Mon Sep 17 00:00:00 2001 +From feaeb71fa61fc28494fb975146410f6a0a6b629a Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH 12/12] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB @@ -24,5 +24,5 @@ index 3f03567631cb..e63c201ed1ef 100644 enum ars_masks { -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch index 8a3876352..08ca3f084 100644 --- a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch +++ b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch @@ -1,4 +1,4 @@ -From e95145acfc6062195b12e14299e3839be2df97bf Mon Sep 17 00:00:00 2001 +From d5e8a0ed2095282aa7cb9a0069d42a87a13e443b Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/12] tools build: Add test for sched_getcpu() @@ -146,5 +146,5 @@ index 43899e0d6fa1..c3b180254f91 100644 int is_printable_array(char *p, unsigned int len); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch index e40d9f7ea..7f7cb1461 100644 --- a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch +++ b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch @@ -1,4 +1,4 @@ -From 98c13fec490097bd8318a70d81b19ddbfaa16052 Mon Sep 17 00:00:00 2001 +From cdd5c9dfb7c862318a2f6e62fbb545a30c3b5349 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable @@ -66,5 +66,5 @@ index 95f0884aae02..f3ed3c963c71 100644 while ((jr = jit_get_next_entry(jd))) { switch(jr->prefix.id) { -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch index 234c6e6a3..1c90f0307 100644 --- a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch +++ b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch @@ -1,4 +1,4 @@ -From 8efd45543d57bf4cf24eafecb64f490fa831ed82 Mon Sep 17 00:00:00 2001 +From 71cf8afb83ba98cd5f0e393199ebf535568c9fe2 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets @@ -1787,5 +1787,5 @@ index 000000000000..331d3759f5cb +MODULE_DESCRIPTION("Hyper-V Sockets"); +MODULE_LICENSE("Dual BSD/GPL"); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch index 97cdf2842..6344b1654 100644 --- a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch +++ b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch @@ -1,4 +1,4 @@ -From 875dad6f4fa637023682f54a03d1eab4a7dcebf3 Mon Sep 17 00:00:00 2001 +From 68f053cbf10cc80f01617d767e2b05485509cc8c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs @@ -26,5 +26,5 @@ index d8bc4b910192..8df02f3ca0b2 100644 } -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch index 27aa26706..050d38dff 100644 --- a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch +++ b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch @@ -1,4 +1,4 @@ -From e45050acfc01efc8484dfe2d04ba7c21c83100c7 Mon Sep 17 00:00:00 2001 +From ebdedd98531a0f1f47b74df79f3f307c16038dfd Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host @@ -44,5 +44,5 @@ index bcd06306f3e8..e7707747f56d 100644 } -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch index fd11b6000..2b820160b 100644 --- a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch +++ b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch @@ -1,4 +1,4 @@ -From 19924585496e229428e1871a27557d4918e6aff2 Mon Sep 17 00:00:00 2001 +From 8731ad91ce1223191f0482142f14c390f8932d2d Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages. @@ -101,5 +101,5 @@ index a76e3db0d01f..b1446d51ef45 100644 return 0; } -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch index 41d08d56d..b048d77eb 100644 --- a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch +++ b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch @@ -1,4 +1,4 @@ -From 9477107e903d0939328a84d6e22de4dae762cfae Mon Sep 17 00:00:00 2001 +From 76005647261e5b311c378ef5c2bb06f55aa0deda Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host @@ -44,5 +44,5 @@ index b1446d51ef45..4e543dbb731a 100644 rc = hvutil_transport_send(hvt, vss_msg, sizeof(*vss_msg), NULL); if (rc) { -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch index 1ee441914..c89e517f3 100644 --- a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch +++ b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch @@ -1,4 +1,4 @@ -From f6b40f0b7dbd32da19cd00f03aae30dd41b28186 Mon Sep 17 00:00:00 2001 +From 1e7567cbc09b1fe7ee5272a89093b759226ba0bf Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to @@ -488,5 +488,5 @@ index c9af8369b4f7..7df9eb8f0cf7 100644 void hv_event_tasklet_disable(struct vmbus_channel *channel); void hv_event_tasklet_enable(struct vmbus_channel *channel); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch index fb8ed24ca..6b18d8c7f 100644 --- a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch +++ b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch @@ -1,4 +1,4 @@ -From 805f232cfdc518581666e5340c07eb8d218deb29 Mon Sep 17 00:00:00 2001 +From da6e16c303eea83808f3509982cdbe95082eb02e Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions. @@ -114,5 +114,5 @@ index f3797c07be10..89440c2eb346 100644 hb_srv_version & 0xFFFF); } -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch index b80af5f65..468e493c1 100644 --- a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch +++ b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch @@ -1,4 +1,4 @@ -From 6e224c15922d02dd6b04c394963e412d8c90e8e1 Mon Sep 17 00:00:00 2001 +From cbaafe98938bb81b32fa864a6acc5076604e9267 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/12] vmbus: fix missed ring events on boot @@ -52,5 +52,5 @@ index e7949b64bfbc..2fe024e86209 100644 void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid) -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index 2b91b5b9c..89e27c6ac 100644 --- a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From fb3de9fdab13a2ef50eecaa05b937652b0718d1b Mon Sep 17 00:00:00 2001 +From 8c6ac11fb40a32a7cc529a71b49280bb4e05e77d Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in @@ -56,5 +56,5 @@ index 1606e7f08f4b..1caed01954f6 100644 vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle); kfree(open_info); -- -2.11.1 +2.14.1 diff --git a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch index 82e2863be..019d414c5 100644 --- a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch +++ b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch @@ -1,4 +1,4 @@ -From e46408349d038b9426dbfbb40f86b67583c3d24c Mon Sep 17 00:00:00 2001 +From 2085a220c4c9cb9480aa90925351397b82efe2a8 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on @@ -173,5 +173,5 @@ index 7df9eb8f0cf7..a87757cf277b 100644 void vmbus_setevent(struct vmbus_channel *channel); -- -2.11.1 +2.14.1 diff --git a/linuxkit.yml b/linuxkit.yml index 79baa0993..da087ee15 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 5ac48b1d7..a3a446800 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror +FROM linuxkit/alpine:0fb5b5e7952d22eeae57607493168e679a4a0c0a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index ec1c178eb..189dafc29 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror +FROM linuxkit/alpine:0fb5b5e7952d22eeae57607493168e679a4a0c0a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add curl RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index d8787474e..d6b2caa25 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror +FROM linuxkit/alpine:0fb5b5e7952d22eeae57607493168e679a4a0c0a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 2de8fe114..67f05d309 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index f5118bb5b..2adf2b407 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index bfb854884..68eddc017 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index d1eb3ccc0..afddc36a8 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -26,7 +26,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd @@ -34,7 +34,7 @@ services: - name: ntpd image: linuxkit/openntpd:07a80c3e3e816658318ac027e1253ff9a228b8de - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a - name: kubelet image: linuxkitprojects/kubernetes:4d8ef8789cc04cb0e8cf42dc3f34e03ec70daf3d files: diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 5cf612fb8..07eb69e6b 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 # with runc, logwrite, startmemlogd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 5b4746053..5af082d92 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index bf25172d8..8651aef0a 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -23,7 +23,7 @@ onboot: image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: qemu-ga diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 07cd89428..a7e6fac0f 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index c562e779c..be74f830d 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index e6bc33cd0..720bc7b25 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index c562e779c..be74f830d 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index c562e779c..be74f830d 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index c562e779c..be74f830d 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index c562e779c..be74f830d 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 2097d454e..1811c9602 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index c562e779c..be74f830d 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 5928f02cb..0aa253465 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 771a97763..87ba8f880 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.95 + image: linuxkit/kernel:4.4.96 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 2c785658d..aa1202ca9 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/005_config_4.13.x/test.yml b/test/cases/020_kernel/005_config_4.13.x/test.yml index 0a0b8ead0..28e0958f1 100644 --- a/test/cases/020_kernel/005_config_4.13.x/test.yml +++ b/test/cases/020_kernel/005_config_4.13.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.13.10 + image: linuxkit/kernel:4.13.11 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile index cfccbf556..f1e84565b 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.9.59 AS ksrc +FROM linuxkit/kernel:4.9.60 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh index 76c21f6b4..5a7bdf32e 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.59 +docker pull linuxkit/kernel:4.9.60 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.yml b/test/cases/020_kernel/010_kmod_4.9.x/test.yml index fcfcbd600..70e330272 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 10420363f..f154c88b3 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.95 + image: linuxkit/kernel:4.4.96 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 1076f6fff..e65a251ee 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml index 1c1b48898..29c2f6dc1 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.13.10 + image: linuxkit/kernel:4.13.11 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 509bec85c..2e36fe1ef 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index fd0be2974..fc608244f 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 1e9e56c42..432ea3d2c 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 210a6a4fe..2047e0076 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index f6d923435..0df2d27e9 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 429e758c1..5486dc2a7 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index faf2544cf..80fbd2a5d 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 97317b3d5..08a7dc575 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index bb3e8e598..96d808ab3 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 3a79ebbc3..f03f34224 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 27d07f70a..10c0627e0 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index d5e38f7e8..2938d8964 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 56fedc88c..ed6373a3e 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 39e47af26..7f89d73b0 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 57ecfc40f..1667f9967 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 3a10842b5..9dfd4bbd5 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index e4beace03..a86be4d6a 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 276fcf314..b9ac038da 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 7e6620421..bc1fa5812 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index ccbd049a7..7b76f1ede 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index a705ed13a..9c10051cf 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index eaaf09ee1..38801c635 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 @@ -11,7 +11,7 @@ onboot: image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index f1fa009d7..80997cab4 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/hack/test.yml b/test/hack/test.yml index 37f669140..b13999ccc 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -1,7 +1,7 @@ # FIXME: This should use the minimal example # We continue to use the kernel-config-test as CI is currently expecting to see a success message kernel: - image: linuxkit/kernel:4.9.59 + image: linuxkit/kernel:4.9.60 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 6c9e81fb4..f17c42ded 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:9403ab03f754228313f5bc2b0fb131330a2f4bab-arm64 +# linuxkit/alpine:ae5646c043bb48cee3fa428714ee27dda2f57812-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -76,7 +76,7 @@ gmp-dev-6.1.2-r0 gnupg-2.1.20-r0 gnutls-3.5.13-r0 go-1.8.4-r0 -go-1.9.2-r0 +go-1.9.2-r1 grep-3.0-r0 guile-2.0.13-r0 guile-libs-2.0.13-r0 @@ -257,7 +257,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171017-r0 +wireguard-tools-0.0.20171101-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r4 xfsprogs-4.5.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 91f0938ea..dc21d457f 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:3bd325c47d5f6e6f5126e588d9d9404572399c42-amd64 +# linuxkit/alpine:0fb5b5e7952d22eeae57607493168e679a4a0c0a-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 alpine-keys-2.1-r1 alsa-lib-1.1.3-r0 -apk-tools-2.7.3-r0 +apk-tools-2.7.4-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -77,7 +77,7 @@ gmp-dev-6.1.2-r0 gnupg-2.1.20-r0 gnutls-3.5.13-r0 go-1.8.4-r0 -go-1.9.2-r0 +go-1.9.2-r1 grep-3.0-r0 guile-2.0.13-r0 guile-libs-2.0.13-r0 @@ -265,7 +265,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171017-r0 +wireguard-tools-0.0.20171101-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r4 xfsprogs-4.5.0-r0