From 2cffa7b45583a7b92c91e3d652b64f443355baa4 Mon Sep 17 00:00:00 2001 From: Tiejun Chen Date: Wed, 21 Feb 2018 14:19:52 -0800 Subject: [PATCH 1/3] Add one script to get patches prefixed by the term of number Signed-off-by: Tiejun Chen --- scripts/prefix-with-number.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 scripts/prefix-with-number.sh diff --git a/scripts/prefix-with-number.sh b/scripts/prefix-with-number.sh new file mode 100755 index 000000000..e49915b61 --- /dev/null +++ b/scripts/prefix-with-number.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# This can help get patches prefixed by the term of number. +# +# Just please list all patches in the file "series" orderly, and then run this +# script directly. +# +# $ cat series +# $ xxxx.patch +# $ yyyy.patch +# $ zzzz.patch +# $ ./prefix-with-number.sh +# $ ls -l +# 0001-xxxx.patch +# 0002-yyyy.patch +# 0003-zzzz.patch +# +i=0000 +for line in `sed -e "s/#.*//g" series`; do + i=$(expr $i + 1) + a=$((10000+$i)) + mv $line ${a:1}-$line +done; From 0a35d388bc903880337ad2c59bfa914dd5af320d Mon Sep 17 00:00:00 2001 From: Tiejun Chen Date: Wed, 21 Feb 2018 14:53:14 -0800 Subject: [PATCH 2/3] Clarify to support Preempt-RT kernel Add one example yml to use Preempt-RT kernel, and mention -rt support in docs/kernels.md. Signed-off-by: Tiejun Chen --- docs/kernels.md | 5 +++++ examples/rt-for-vmware.yml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 examples/rt-for-vmware.yml diff --git a/docs/kernels.md b/docs/kernels.md index 0ba7ed999..7430e5199 100644 --- a/docs/kernels.md +++ b/docs/kernels.md @@ -27,6 +27,11 @@ In addition to the official images, there are also some from some Linux distributions into LinuxKit kernel packages. These are mostly provided for testing purposes. +Note now linuxkit also embraces Preempt-RT Linux kernel to support more +use cases for the promising IoT scenarios. All -rt patches are grabbed from +https://www.kernel.org/pub/linux/kernel/projects/rt/. But so far we just +enable it over 4.14.x. + ## Loading kernel modules diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml new file mode 100644 index 000000000..c9c4cff9b --- /dev/null +++ b/examples/rt-for-vmware.yml @@ -0,0 +1,36 @@ +kernel: + image: linuxkit/kernel:4.14.18-rt + cmdline: "console=tty0" +init: + - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/ca-certificates:v0.2 +onboot: + - name: sysctl + image: linuxkit/sysctl:v0.2 +services: + - name: getty + image: linuxkit/getty:v0.2 + env: + - INSECURE=true + - name: rngd + image: linuxkit/rngd:v0.2 + - name: dhcpcd + image: linuxkit/dhcpcd:v0.2 + - name: open-vm-tools + image: linuxkit/open-vm-tools:v0.2 + - name: nginx + image: nginx:1.13.8-alpine + capabilities: + - CAP_NET_BIND_SERVICE + - CAP_CHOWN + - CAP_SETUID + - CAP_SETGID + - CAP_DAC_OVERRIDE + binds: + - /etc/resolv.conf:/etc/resolv.conf +trust: + org: + - linuxkit + - library From 4ee49332326834072089e0536a256144825c08f6 Mon Sep 17 00:00:00 2001 From: Tiejun Chen Date: Wed, 21 Feb 2018 21:28:52 -0800 Subject: [PATCH 3/3] Update AUTHORS Signed-off-by: Tiejun Chen --- .mailmap | 1 + AUTHORS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 588c67bc6..1a666bd07 100644 --- a/.mailmap +++ b/.mailmap @@ -49,5 +49,6 @@ Sebastiaan van Stijn Simon Ferquel Thomas Gazagnaire Thomas Gazagnaire +Tiejun Chen Vincent Demeester Vincent Demeester diff --git a/AUTHORS b/AUTHORS index 7fef312f5..25e64da08 100644 --- a/AUTHORS +++ b/AUTHORS @@ -93,7 +93,7 @@ Thomas Gazagnaire Thomas Leonard Thomas Shaw Tiago Pires -Tiejun Chen +Tiejun Chen Tim Potter Tobias Klauser Tycho Andersen