mirror of
				https://github.com/linuxkit/linuxkit.git
				synced 2025-10-31 14:37:30 +00:00 
			
		
		
		
	Merge pull request #3758 from rn/kern-up
Kernel update to 5.10.92/5.4.172 add 5.15.x, remove 5.12.x
This commit is contained in:
		| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0" |   cmdline: "console=tty0 console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0" |   cmdline: "console=tty0 console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # This is an example for building the open source components of Docker for Mac | # This is an example for building the open source components of Docker for Mac | ||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 page_poison=1" |   cmdline: "console=ttyS0 page_poison=1" | ||||||
| init: | init: | ||||||
|   - linuxkit/vpnkit-expose-port:87ac61469247b2a0483cbd1fd2915f220e078b78 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host |   - linuxkit/vpnkit-expose-port:87ac61469247b2a0483cbd1fd2915f220e078b78 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # Simple example of using an external logging service | # Simple example of using an external logging service | ||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0" |   cmdline: "console=tty0 console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: console=ttyS1 |   cmdline: console=ttyS1 | ||||||
|   ucode: intel-ucode.cpio |   ucode: intel-ucode.cpio | ||||||
| init: | init: | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ | |||||||
| # for arm64 then the 'ucode' line in the kernel section can be left | # for arm64 then the 'ucode' line in the kernel section can be left | ||||||
| # out. | # out. | ||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyAMA0" |   cmdline: "console=ttyAMA0" | ||||||
|   ucode: "" |   ucode: "" | ||||||
| onboot: | onboot: | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: console=ttyS1 |   cmdline: console=ttyS1 | ||||||
|   ucode: intel-ucode.cpio |   ucode: intel-ucode.cpio | ||||||
| init: | init: | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0" |   cmdline: "console=tty0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| # Minimal YAML to run a redis server (used at DockerCon'17) | # Minimal YAML to run a redis server (used at DockerCon'17) | ||||||
| # connect: nc localhost 6379 | # connect: nc localhost 6379 | ||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0" |   cmdline: "console=tty0 console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -68,7 +68,7 @@ WORKDIR /tmp | |||||||
| # Download Intel ucode, create a CPIO archive for it, and keep it in the build context | # Download Intel ucode, create a CPIO archive for it, and keep it in the build context | ||||||
| # so the firmware can also be referenced with CONFIG_EXTRA_FIRMWARE | # so the firmware can also be referenced with CONFIG_EXTRA_FIRMWARE | ||||||
| ENV UCODE_REPO=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files | ENV UCODE_REPO=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files | ||||||
| ENV UCODE_COMMIT=microcode-20210216 | ENV UCODE_COMMIT=microcode-20210608 | ||||||
| RUN set -e && \ | RUN set -e && \ | ||||||
|     if [ $(uname -m) == x86_64 ]; then \ |     if [ $(uname -m) == x86_64 ]; then \ | ||||||
|         git clone ${UCODE_REPO} ucode && \ |         git clone ${UCODE_REPO} ucode && \ | ||||||
|   | |||||||
| @@ -156,7 +156,7 @@ show-tags: show-tag_$(2)$(3)$(4) | |||||||
|  |  | ||||||
| # Only build perf only on x86 and recent LTS and latest stable kernels | # Only build perf only on x86 and recent LTS and latest stable kernels | ||||||
| ifeq ($(ARCH),x86_64) | ifeq ($(ARCH),x86_64) | ||||||
| ifeq ($(2), $(filter $(2),5.12.x 5.10.x 5.4.x)) | ifeq ($(2), $(filter $(2),5.15.x 5.10.x 5.4.x)) | ||||||
| build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) | build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) | ||||||
| 	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ | 	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ | ||||||
| 		 docker build -f Dockerfile.perf \ | 		 docker build -f Dockerfile.perf \ | ||||||
| @@ -194,7 +194,7 @@ endif | |||||||
|  |  | ||||||
| # Only build bcc only on x86 and recent LTS and latest stable kernels | # Only build bcc only on x86 and recent LTS and latest stable kernels | ||||||
| ifeq ($(ARCH),x86_64) | ifeq ($(ARCH),x86_64) | ||||||
| ifeq ($(2), $(filter $(2),5.12.x 5.10.x 5.4.x)) | ifeq ($(2), $(filter $(2),5.15.x 5.10.x 5.4.x)) | ||||||
| build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4) | build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4) | ||||||
| 	docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ | 	docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ | ||||||
| 		docker build -f Dockerfile.bcc \ | 		docker build -f Dockerfile.bcc \ | ||||||
| @@ -256,15 +256,15 @@ endef | |||||||
| # Debug targets only for latest stable and LTS stable | # Debug targets only for latest stable and LTS stable | ||||||
| # | # | ||||||
| ifeq ($(ARCH),x86_64) | ifeq ($(ARCH),x86_64) | ||||||
| $(eval $(call kernel,5.12.14,5.12.x,$(EXTRA),$(DEBUG))) | $(eval $(call kernel,5.15.15,5.15.x,$(EXTRA),$(DEBUG))) | ||||||
| $(eval $(call kernel,5.10.76,5.10.x,$(EXTRA),$(DEBUG))) | $(eval $(call kernel,5.15.15,5.15.x,,-dbg)) | ||||||
| $(eval $(call kernel,5.10.76,5.10.x,,-dbg)) | $(eval $(call kernel,5.10.92,5.10.x,$(EXTRA),$(DEBUG))) | ||||||
| $(eval $(call kernel,5.4.156,5.4.x,$(EXTRA),$(DEBUG))) | $(eval $(call kernel,5.4.172,5.4.x,$(EXTRA),$(DEBUG))) | ||||||
| $(eval $(call kernel,5.11.4,5.11.x,-rt,)) | $(eval $(call kernel,5.11.4,5.11.x,-rt,)) | ||||||
|  |  | ||||||
| else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64)) | else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64)) | ||||||
| $(eval $(call kernel,5.12.14,5.12.x,$(EXTRA),$(DEBUG))) | $(eval $(call kernel,5.15.15,5.15.x,$(EXTRA),$(DEBUG))) | ||||||
| $(eval $(call kernel,5.10.76,5.10.x,$(EXTRA),$(DEBUG))) | $(eval $(call kernel,5.10.92,5.10.x,$(EXTRA),$(DEBUG))) | ||||||
| $(eval $(call kernel,5.11.4,5.11.x,-rt,)) | $(eval $(call kernel,5.11.4,5.11.x,-rt,)) | ||||||
|  |  | ||||||
| endif | endif | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # | # | ||||||
| # Automatically generated file; DO NOT EDIT. | # Automatically generated file; DO NOT EDIT. | ||||||
| # Linux/arm64 5.10.76 Kernel Configuration | # Linux/arm64 5.10.92 Kernel Configuration | ||||||
| # | # | ||||||
| CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" | CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" | ||||||
| CONFIG_CC_IS_GCC=y | CONFIG_CC_IS_GCC=y | ||||||
| @@ -213,6 +213,7 @@ CONFIG_BPF_SYSCALL=y | |||||||
| CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y | CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y | ||||||
| CONFIG_BPF_JIT_ALWAYS_ON=y | CONFIG_BPF_JIT_ALWAYS_ON=y | ||||||
| CONFIG_BPF_JIT_DEFAULT_ON=y | CONFIG_BPF_JIT_DEFAULT_ON=y | ||||||
|  | # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set | ||||||
| # CONFIG_BPF_PRELOAD is not set | # CONFIG_BPF_PRELOAD is not set | ||||||
| # CONFIG_USERFAULTFD is not set | # CONFIG_USERFAULTFD is not set | ||||||
| CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y | CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # | # | ||||||
| # Automatically generated file; DO NOT EDIT. | # Automatically generated file; DO NOT EDIT. | ||||||
| # Linux/x86 5.10.76 Kernel Configuration | # Linux/x86 5.10.92 Kernel Configuration | ||||||
| # | # | ||||||
| CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" | CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" | ||||||
| CONFIG_CC_IS_GCC=y | CONFIG_CC_IS_GCC=y | ||||||
| @@ -233,6 +233,7 @@ CONFIG_BPF_SYSCALL=y | |||||||
| CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y | CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y | ||||||
| CONFIG_BPF_JIT_ALWAYS_ON=y | CONFIG_BPF_JIT_ALWAYS_ON=y | ||||||
| CONFIG_BPF_JIT_DEFAULT_ON=y | CONFIG_BPF_JIT_DEFAULT_ON=y | ||||||
|  | # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set | ||||||
| # CONFIG_BPF_PRELOAD is not set | # CONFIG_BPF_PRELOAD is not set | ||||||
| # CONFIG_USERFAULTFD is not set | # CONFIG_USERFAULTFD is not set | ||||||
| CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y | CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| # | # | ||||||
| # Automatically generated file; DO NOT EDIT. | # Automatically generated file; DO NOT EDIT. | ||||||
| # Linux/x86 5.4.156 Kernel Configuration | # Linux/x86 5.4.172 Kernel Configuration | ||||||
| # | # | ||||||
|  |  | ||||||
| # | # | ||||||
|   | |||||||
| @@ -1,55 +0,0 @@ | |||||||
| From 3635a8090f2271103511b68a5853b1d7e0a925b5 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Matt Redfearn <matt.redfearn@mips.com> |  | ||||||
| Date: Wed, 3 Jan 2018 09:57:30 +0000 |  | ||||||
| Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing |  | ||||||
|  __always_inline |  | ||||||
| MIME-Version: 1.0 |  | ||||||
| Content-Type: text/plain; charset=UTF-8 |  | ||||||
| Content-Transfer-Encoding: 8bit |  | ||||||
|  |  | ||||||
| Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining |  | ||||||
| of some byteswap operations") added __always_inline to swab functions |  | ||||||
| and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to |  | ||||||
| userspace headers") added a definition of __always_inline for use in |  | ||||||
| exported headers when the kernel's compiler.h is not available. |  | ||||||
|  |  | ||||||
| However, since swab.h does not include stddef.h, if the header soup does |  | ||||||
| not indirectly include it, the definition of __always_inline is missing, |  | ||||||
| resulting in a compilation failure, which was observed compiling the |  | ||||||
| perf tool using exported headers containing this commit: |  | ||||||
|  |  | ||||||
| In file included from /usr/include/linux/byteorder/little_endian.h:12:0, |  | ||||||
|                  from /usr/include/asm/byteorder.h:14, |  | ||||||
|                  from tools/include/uapi/linux/perf_event.h:20, |  | ||||||
|                  from perf.h:8, |  | ||||||
|                  from builtin-bench.c:18: |  | ||||||
| /usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’ |  | ||||||
|  static __always_inline __u16 __swab16p(const __u16 *p) |  | ||||||
|  |  | ||||||
| Fix this by replacing the inclusion of linux/compiler.h with |  | ||||||
| linux/stddef.h to ensure that we pick up that definition if required, |  | ||||||
| without relying on it's indirect inclusion. compiler.h is then included |  | ||||||
| indirectly, via stddef.h. |  | ||||||
|  |  | ||||||
| Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers") |  | ||||||
| Signed-off-by: Matt Redfearn <matt.redfearn@mips.com> |  | ||||||
| --- |  | ||||||
|  include/uapi/linux/swab.h | 2 +- |  | ||||||
|  1 file changed, 1 insertion(+), 1 deletion(-) |  | ||||||
|  |  | ||||||
| diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h |  | ||||||
| index 7272f85d6d6a..3736f2fe1541 100644 |  | ||||||
| --- a/include/uapi/linux/swab.h |  | ||||||
| +++ b/include/uapi/linux/swab.h |  | ||||||
| @@ -3,7 +3,7 @@ |  | ||||||
|  #define _UAPI_LINUX_SWAB_H |  | ||||||
|   |  | ||||||
|  #include <linux/types.h> |  | ||||||
| -#include <linux/compiler.h> |  | ||||||
| +#include <linux/stddef.h> |  | ||||||
|  #include <asm/bitsperlong.h> |  | ||||||
|  #include <asm/swab.h> |  | ||||||
|   |  | ||||||
| --  |  | ||||||
| 2.26.2 |  | ||||||
|  |  | ||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" |   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 page_poison=1" |   cmdline: "console=ttyS0 page_poison=1" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 page_poison=1" |   cmdline: "console=ttyS0 page_poison=1" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 page_poison=1" |   cmdline: "console=ttyS0 page_poison=1" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # NOTE: Images build from this file likely do not run | # NOTE: Images build from this file likely do not run | ||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,12 +1,12 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.4.156 |   image: linuxkit/kernel:5.4.172 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 |   - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 | ||||||
| onboot: | onboot: | ||||||
|   - name: check-kernel-config |   - name: check-kernel-config | ||||||
|     image: linuxkit/test-kernel-config:41aa03790ea637624a3f9737187e0c878766474b |     image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 | ||||||
|   - name: poweroff |   - name: poweroff | ||||||
|     image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c |     image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c | ||||||
|     command: ["/bin/sh", "/poweroff.sh", "3"] |     command: ["/bin/sh", "/poweroff.sh", "3"] | ||||||
|   | |||||||
| @@ -1,12 +1,12 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 |   - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 | ||||||
| onboot: | onboot: | ||||||
|   - name: check-kernel-config |   - name: check-kernel-config | ||||||
|     image: linuxkit/test-kernel-config:41aa03790ea637624a3f9737187e0c878766474b |     image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 | ||||||
|   - name: poweroff |   - name: poweroff | ||||||
|     image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c |     image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c | ||||||
|     command: ["/bin/sh", "/poweroff.sh", "3"] |     command: ["/bin/sh", "/poweroff.sh", "3"] | ||||||
|   | |||||||
| @@ -1,12 +1,12 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.12.14 |   image: linuxkit/kernel:5.15.15 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 |   - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601 | ||||||
| onboot: | onboot: | ||||||
|   - name: check-kernel-config |   - name: check-kernel-config | ||||||
|     image: linuxkit/test-kernel-config:41aa03790ea637624a3f9737187e0c878766474b |     image: linuxkit/test-kernel-config:dca02848703c85d896907d63325883c058c1a9d7 | ||||||
|   - name: poweroff |   - name: poweroff | ||||||
|     image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c |     image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c | ||||||
|     command: ["/bin/sh", "/poweroff.sh", "3"] |     command: ["/bin/sh", "/poweroff.sh", "3"] | ||||||
| @@ -3,10 +3,10 @@ | |||||||
| # In the last stage, it creates a package, which can be used for | # In the last stage, it creates a package, which can be used for | ||||||
| # testing. | # testing. | ||||||
|  |  | ||||||
| FROM linuxkit/kernel:5.4.156 AS ksrc | FROM linuxkit/kernel:5.4.172 AS ksrc | ||||||
|  |  | ||||||
| # Extract headers and compile module | # Extract headers and compile module | ||||||
| FROM linuxkit/kernel:5.4.156-builder AS build | FROM linuxkit/kernel:5.4.172-builder AS build | ||||||
| RUN apk add build-base elfutils-dev | RUN apk add build-base elfutils-dev | ||||||
|  |  | ||||||
| COPY --from=ksrc /kernel-dev.tar / | COPY --from=ksrc /kernel-dev.tar / | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.4.156 |   image: linuxkit/kernel:5.4.172 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -3,10 +3,10 @@ | |||||||
| # In the last stage, it creates a package, which can be used for | # In the last stage, it creates a package, which can be used for | ||||||
| # testing. | # testing. | ||||||
|  |  | ||||||
| FROM linuxkit/kernel:5.10.76 AS ksrc | FROM linuxkit/kernel:5.10.92 AS ksrc | ||||||
|  |  | ||||||
| # Extract headers and compile module | # Extract headers and compile module | ||||||
| FROM linuxkit/kernel:5.10.76-builder AS build | FROM linuxkit/kernel:5.10.92-builder AS build | ||||||
| RUN apk add build-base elfutils-dev | RUN apk add build-base elfutils-dev | ||||||
|  |  | ||||||
| COPY --from=ksrc /kernel-dev.tar / | COPY --from=ksrc /kernel-dev.tar / | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -3,10 +3,10 @@ | |||||||
| # In the last stage, it creates a package, which can be used for | # In the last stage, it creates a package, which can be used for | ||||||
| # testing. | # testing. | ||||||
| 
 | 
 | ||||||
| FROM linuxkit/kernel:5.12.14 AS ksrc | FROM linuxkit/kernel:5.15.15 AS ksrc | ||||||
| 
 | 
 | ||||||
| # Extract headers and compile module | # Extract headers and compile module | ||||||
| FROM linuxkit/kernel:5.12.14-builder AS build | FROM linuxkit/kernel:5.15.15-builder AS build | ||||||
| RUN apk add build-base elfutils-dev | RUN apk add build-base elfutils-dev | ||||||
| 
 | 
 | ||||||
| COPY --from=ksrc /kernel-dev.tar / | COPY --from=ksrc /kernel-dev.tar / | ||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.12.14 |   image: linuxkit/kernel:5.15.15 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0" |   cmdline: "console=ttyS0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 page_poison=1" |   cmdline: "console=ttyS0 page_poison=1" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" |   cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| kernel: | kernel: | ||||||
|   image: linuxkit/kernel:5.10.76 |   image: linuxkit/kernel:5.10.92 | ||||||
|   cmdline: "console=ttyS0 console=ttyAMA0" |   cmdline: "console=ttyS0 console=ttyAMA0" | ||||||
| init: | init: | ||||||
|   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 |   - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user