Kernel 5.4 & Update Dependencies (#1)

Author: bassrock

.github/workflows/ci.yml

@@ -41,8 +41,7 @@ jobs:
           docker build -t boot2docker/boot2docker .
           docker run --rm boot2docker/boot2docker > boot2docker.iso
 
-      - name: '"ls"'
-        run: ls -lh boot2docker.iso
-
-      - name: '"docker images"'
-        run: docker images
+      - uses: actions/upload-artifact@v2
+        with:
+          name: boot2docker.iso
+          path: boot2docker.iso

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:stable-slim
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-xc"]
 
@@ -25,6 +25,7 @@ RUN apt-get update; \
 		wget \
 		xorriso \
 		xz-utils \
+		rsync \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
@@ -38,11 +39,11 @@ WORKDIR /rootfs
 # updated via "update.sh"
 ENV TCL_MIRRORS http://distro.ibiblio.org/tinycorelinux http://repo.tinycorelinux.net
 ENV TCL_MAJOR 11.x
-ENV TCL_VERSION 11.0
+ENV TCL_VERSION 11.1
 
 # http://distro.ibiblio.org/tinycorelinux/8.x/x86_64/archive/8.2.1/distribution_files/rootfs64.gz.md5.txt
 # updated via "update.sh"
-ENV TCL_ROOTFS="rootfs64.gz" TCL_ROOTFS_MD5="ea8699a39115289ed00d807eac4c3118"
+ENV TCL_ROOTFS="rootfs64.gz" TCL_ROOTFS_MD5="3c5846fd0eb2f4ecc15e424678ef7919"
 
 COPY files/tce-load.patch files/udhcpc.patch /tcl-patches/
 
@@ -178,7 +179,7 @@ ENV LINUX_GPG_KEYS \
 		647F28654894E3BD457199BE38DBBDC86092693E
 
 # updated via "update.sh"
-ENV LINUX_VERSION 4.19.103
+ENV LINUX_VERSION 5.4.80
 
 RUN wget -O /linux.tar.xz "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.xz"; \
 	wget -O /linux.tar.asc "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.sign"; \
@@ -333,9 +334,9 @@ RUN make -C /usr/src/linux INSTALL_HDR_PATH=/usr/local headers_install
 
 # http://download.virtualbox.org/virtualbox/
 # updated via "update.sh"
-ENV VBOX_VERSION 5.2.36
+ENV VBOX_VERSION 6.1.16
 # https://www.virtualbox.org/download/hashes/$VBOX_VERSION/SHA256SUMS
-ENV VBOX_SHA256 6124287b7a1790436a9b0b2601154b50c6cd6e680aeff45c61d03ee1158f3eb9
+ENV VBOX_SHA256 88db771a5efd7c048228e5c1e0b8fba56542e9d8c1b75f7af5b0c4cf334f0584
 # (VBoxGuestAdditions_X.Y.Z.iso SHA256, for verification)
 
 RUN wget -O /vbox.iso "https://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso"; \
@@ -360,17 +361,18 @@ RUN make -C /usr/src/vbox/amd64/src/vboxguest -j "$(nproc)" \
 
 # TCL includes VMware's open-vm-tools 10.2.0.1608+ (no reason to compile that ourselves)
 RUN tcl-tce-load open-vm-tools; \
-	tcl-chroot vmhgfs-fuse --version; \
-	tcl-chroot vmtoolsd --version
+	tcl-chroot vmhgfs-fuse --version;
+	# vmtoolsd needs to run within a vmware hypervisor so we don't print the version
+	#tcl-chroot vmtoolsd --version
 
-ENV PARALLELS_VERSION 13.3.0-43321
+ENV PARALLELS_VERSION 16.1.1-49141
 
 RUN wget -O /parallels.tgz "https://download.parallels.com/desktop/v${PARALLELS_VERSION%%.*}/$PARALLELS_VERSION/ParallelsTools-$PARALLELS_VERSION-boot2docker.tar.gz"; \
 	mkdir /usr/src/parallels; \
 	tar --extract --file /parallels.tgz --directory /usr/src/parallels --strip-components 1; \
 	rm /parallels.tgz
 RUN cp -vr /usr/src/parallels/tools/* ./; \
-	make -C /usr/src/parallels/kmods -f Makefile.kmods -j "$(nproc)" installme \
+	make -C /usr/src/parallels/kmods -f Makefile.kmods -j "$(nproc)" compile \
 		SRC='/usr/src/linux' \
 		KERNEL_DIR='/usr/src/linux' \
 		KVER="$(< /usr/src/linux/include/config/kernel.release)" \
@@ -381,7 +383,7 @@ RUN cp -vr /usr/src/parallels/tools/* ./; \
 
 # https://github.com/xenserver/xe-guest-utilities/tags
 # updated via "update.sh"
-ENV XEN_VERSION 7.18.0
+ENV XEN_VERSION 7.20.0
 
 RUN wget -O /xen.tgz "https://github.com/xenserver/xe-guest-utilities/archive/v$XEN_VERSION.tar.gz"; \
 	mkdir /usr/src/xen; \
@@ -412,7 +414,7 @@ RUN wget -O usr/local/sbin/cgroupfs-mount "https://github.com/tianon/cgroupfs-mo
 	chmod +x usr/local/sbin/cgroupfs-mount; \
 	tcl-chroot cgroupfs-mount
 
-ENV DOCKER_VERSION 19.03.6
+ENV DOCKER_VERSION 19.03.13
 
 # Get the Docker binaries with version that matches our boot2docker version.
 RUN DOCKER_CHANNEL='edge'; \

files/init.d/docker

@@ -218,7 +218,7 @@ start() {
 
 	# https://github.com/docker/docker-ce-packaging/blob/468d37e0d6d303b785eb9bfc42612397d683c7e5/deb/systemd/docker.service#L15-L19
 	ulimit -n 1048576   # LimitNOFILE
-	ulimit -p unlimited # LimitNPROC
+	ulimit -u unlimited # LimitNPROC
 	ulimit -c unlimited # LimitCORE
 
 	mkdir -p /var/lib/boot2docker/log

files/kernel-config.d/cifs

@@ -1,5 +1,7 @@
 CONFIG_CIFS=m
-CONFIG_CIFS_ACL=y
+# Remove unneeded ifdef for CONFIG_CIFS_ACL (always enabled now)
+# https://wiki.samba.org/index.php/LinuxCIFSKernel
+#CONFIG_CIFS_ACL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CIFS_XATTR=y
 

files/kernel-config.d/docker

@@ -6,7 +6,8 @@ CONFIG_BRIDGE=m
 CONFIG_BRIDGE_NETFILTER=m
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_CFQ_GROUP_IOSCHED=y
+# No longer around since linux 5.1
+#CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
@@ -30,8 +31,9 @@ CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_INET_ESP=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_IOSCHED_CFQ=m
+#CONFIG_INET_XFRM_MODE_TRANSPORT=m
+# No longer around since linux 5.1
+#CONFIG_IOSCHED_CFQ=m
 CONFIG_IPC_NS=y
 CONFIG_IPVLAN=m
 CONFIG_IP_NF_FILTER=m
@@ -44,7 +46,7 @@ CONFIG_IP_VS_PROTO_TCP=y
 CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_RR=m
 CONFIG_KEYS=y
-CONFIG_LEGACY_VSYSCALL_EMULATE=y
+#CONFIG_LEGACY_VSYSCALL_EMULATE=y
 CONFIG_MACVLAN=m
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
@@ -61,8 +63,8 @@ CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_NEEDED=y
+#CONFIG_NF_NAT_IPV4=m
+#CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_TFTP=m
 CONFIG_OVERLAY_FS=m
 CONFIG_PID_NS=y

files/make-b2d-iso.sh

@@ -40,8 +40,9 @@ mkdir -p /tmp/stats
 
 	echo "- Parallels Tools v$PARALLELS_VERSION" # https://github.com/boot2docker/boot2docker/pull/1332#issuecomment-420273330
 
-	ovtVersion="$(tcl-chroot vmtoolsd --version | grep -oE 'version [^ ]+' | cut -d' ' -f2)"
-	echo "- VMware Tools (\`open-vm-tools\`) [v$ovtVersion](http://distro.ibiblio.org/tinycorelinux/$TCL_MAJOR/x86_64/tcz/open-vm-tools.tcz.info)"
+# vmtoolsd needs to run within a vmware hypervisor so we don't print the version
+#	ovtVersion="$(tcl-chroot vmtoolsd --version | grep -oE 'version [^ ]+' | cut -d' ' -f2)"
+#	echo "- VMware Tools (\`open-vm-tools\`) [v$ovtVersion](http://distro.ibiblio.org/tinycorelinux/$TCL_MAJOR/x86_64/tcz/open-vm-tools.tcz.info)"
 
 	echo "- VirtualBox Guest Additions [v$VBOX_VERSION](https://download.virtualbox.org/virtualbox/$VBOX_VERSION/)"
 

update.sh

@@ -3,7 +3,7 @@ set -Eeuo pipefail
 
 # TODO http://distro.ibiblio.org/tinycorelinux/latest-x86_64
 major='11.x'
-version='11.0' # TODO auto-detect latest
+version='11.1' # TODO auto-detect latest
 # 9.x doesn't seem to use ".../archive/X.Y.Z/..." in the same way as 8.x :(
 
 mirrors=(
@@ -12,10 +12,10 @@ mirrors=(
 )
 
 # https://www.kernel.org/
-kernelBase='4.19'
+kernelBase='5.4'
 # https://github.com/boot2docker/boot2docker/issues/1398
 # https://download.virtualbox.org/virtualbox/
-vboxBase='5'
+vboxBase='6'
 
 # avoid issues with slow Git HTTP interactions (*cough* sourceforge *cough*)
 export GIT_HTTP_LOW_SPEED_LIMIT='100'