Skip to content
This repository was archived by the owner on Jan 1, 2021. It is now read-only.

Commit ff140b9

Browse files
tianontianon
committed
Update to TCL 11.0, Linux 4.19.103, VBox Guest Additions 5.2.36, Xen Tools 7.18.0, Docker 19.03.6-rc2
1 parent e99ccc0 commit ff140b9

3 files changed

Lines changed: 14 additions & 23 deletions

File tree

‎Dockerfile‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ WORKDIR /rootfs
3737

3838
# updated via "update.sh"
3939
ENV TCL_MIRRORS http://distro.ibiblio.org/tinycorelinux http://repo.tinycorelinux.net
40-
ENV TCL_MAJOR 10.x
41-
ENV TCL_VERSION 10.1
40+
ENV TCL_MAJOR 11.x
41+
ENV TCL_VERSION 11.0
4242

4343
# http://distro.ibiblio.org/tinycorelinux/8.x/x86_64/archive/8.2.1/distribution_files/rootfs64.gz.md5.txt
4444
# updated via "update.sh"
45-
ENV TCL_ROOTFS="rootfs64.gz" TCL_ROOTFS_MD5="ec65d3b2bbb64f62a171f60439c84127"
45+
ENV TCL_ROOTFS="rootfs64.gz" TCL_ROOTFS_MD5="ea8699a39115289ed00d807eac4c3118"
4646

4747
COPY files/tce-load.patch files/udhcpc.patch /tcl-patches/
4848

@@ -178,7 +178,7 @@ ENV LINUX_GPG_KEYS \
178178
647F28654894E3BD457199BE38DBBDC86092693E
179179

180180
# updated via "update.sh"
181-
ENV LINUX_VERSION 4.19.84
181+
ENV LINUX_VERSION 4.19.103
182182

183183
RUN wget -O /linux.tar.xz "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.xz"; \
184184
wget -O /linux.tar.asc "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERSION%%.*}.x/linux-${LINUX_VERSION}.tar.sign"; \
@@ -214,15 +214,6 @@ RUN wget -O /linux.tar.xz "https://cdn.kernel.org/pub/linux/kernel/v${LINUX_VERS
214214
ln -sT "linux-$LINUX_VERSION" /usr/src/linux; \
215215
[ -d /usr/src/linux ]
216216

217-
# apply kernel entropy patch from 5.4; this same patch was backported in Debian in 5.3.9-1
218-
# - https://git.kernel.org/linus/50ee7529ec4500c88f8664560770a7a1b65db72b
219-
# - https://salsa.debian.org/kernel-team/linux/commit/c323c453b2485a33bfb33635a07f3a50bc1db1ee
220-
# - https://lists.debian.org/debian-boot/2019/11/msg00077.html
221-
# specifically, this solves the problem of early-boot entropy (SSH key generation, for example), avoiding the need for userspace solutions like haveged
222-
RUN wget -O kernel-entropy.patch 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=50ee7529ec4500c88f8664560770a7a1b65db72b'; \
223-
patch -p1 --input "$PWD/kernel-entropy.patch" --directory /usr/src/linux; \
224-
rm kernel-entropy.patch
225-
226217
RUN { \
227218
echo '#!/usr/bin/env bash'; \
228219
echo 'set -Eeuo pipefail'; \
@@ -318,10 +309,10 @@ RUN tcl-tce-load \
318309
git \
319310
iproute2 \
320311
iptables \
321-
ncurses-terminfo \
312+
ncursesw-terminfo \
322313
nfs-utils \
323314
openssh \
324-
openssl \
315+
openssl-1.1.1 \
325316
parted \
326317
procps-ng \
327318
rsync \
@@ -342,9 +333,9 @@ RUN make -C /usr/src/linux INSTALL_HDR_PATH=/usr/local headers_install
342333

343334
# http://download.virtualbox.org/virtualbox/
344335
# updated via "update.sh"
345-
ENV VBOX_VERSION 5.2.34
336+
ENV VBOX_VERSION 5.2.36
346337
# https://www.virtualbox.org/download/hashes/$VBOX_VERSION/SHA256SUMS
347-
ENV VBOX_SHA256 d1b63891abca37fd78f5c8af1764e10e5754b1eecabd1fcfe7599c29a93ba007
338+
ENV VBOX_SHA256 6124287b7a1790436a9b0b2601154b50c6cd6e680aeff45c61d03ee1158f3eb9
348339
# (VBoxGuestAdditions_X.Y.Z.iso SHA256, for verification)
349340

350341
RUN wget -O /vbox.iso "https://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso"; \
@@ -390,7 +381,7 @@ RUN cp -vr /usr/src/parallels/tools/* ./; \
390381

391382
# https://github.com/xenserver/xe-guest-utilities/tags
392383
# updated via "update.sh"
393-
ENV XEN_VERSION 7.16.0
384+
ENV XEN_VERSION 7.18.0
394385

395386
RUN wget -O /xen.tgz "https://github.com/xenserver/xe-guest-utilities/archive/v$XEN_VERSION.tar.gz"; \
396387
mkdir /usr/src/xen; \
@@ -421,7 +412,7 @@ RUN wget -O usr/local/sbin/cgroupfs-mount "https://github.com/tianon/cgroupfs-mo
421412
chmod +x usr/local/sbin/cgroupfs-mount; \
422413
tcl-chroot cgroupfs-mount
423414

424-
ENV DOCKER_VERSION 19.03.5
415+
ENV DOCKER_VERSION 19.03.6-rc2
425416

426417
# Get the Docker binaries with version that matches our boot2docker version.
427418
RUN DOCKER_CHANNEL='edge'; \

‎files/tce-load.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Description: replace "mount" with "unsquashfs" and ignore "-KERNEL" deps
22
Author: Tatsushi Demachi, Tianon Gravi
33
Partial-Origin: https://github.com/tatsushid/docker-tinycore/blob/017b258a08a41399f65250c9865a163226c8e0bf/8.2/x86_64/src/tce-load.patch
4-
Unpatched-Source: https://github.com/tinycorelinux/Core-scripts/blob/19fed4fa59585899ef47163424b15f59f15d3e4d/usr/bin/tce-load
4+
Unpatched-Source: https://github.com/tinycorelinux/Core-scripts/blob/1a3285fb230f4894c3fda75ab5401318793c1bd8/usr/bin/tce-load
55

66
diff --git a/usr/bin/tce-load b/usr/bin/tce-load
77
index 1378b90..fea2aa8 100755
@@ -11,7 +11,7 @@ index 1378b90..fea2aa8 100755
1111

1212
copyInstall() {
1313
[ -d /mnt/test ] || sudo /bin/mkdir -p /mnt/test
14-
- sudo /bin/mount $1 /mnt/test -t squashfs -o loop,ro,bs=4096
14+
- sudo /bin/mount $1 /mnt/test -t squashfs -o loop,ro
1515
+ sudo /usr/local/bin/unsquashfs -force -dest /mnt/test $1 || exit 1
1616
if [ "$?" == 0 ]; then
1717
if [ "$(ls -A /mnt/test)" ]; then

‎update.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
set -Eeuo pipefail
33

44
# TODO http://distro.ibiblio.org/tinycorelinux/latest-x86_64
5-
major='10.x'
6-
version='10.1' # TODO auto-detect latest
5+
major='11.x'
6+
version='11.0' # TODO auto-detect latest
77
# 9.x doesn't seem to use ".../archive/X.Y.Z/..." in the same way as 8.x :(
88

99
mirrors=(

0 commit comments

Comments
 (0)