Skip to content

Commit cc08a3f

Browse files
authored
Merge pull request #70 from thebsdbox/newKernel
Adds 5.10.57 Kernel
2 parents 93ba295 + f2207a2 commit cc08a3f

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

hook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: quay.io/tinkerbell/hook-kernel:5.10.11
2+
image: quay.io/tinkerbell/hook-kernel:5.10.57
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:v0.8

hook_debug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kernel:
2-
image: quay.io/tinkerbell/hook-kernel:5.10.11
2+
image: quay.io/tinkerbell/hook-kernel:5.10.57
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
55
- linuxkit/init:v0.8

kernel/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ devbuild_$(2)$(3)$(4): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard
103103
$(LABELS) \
104104
--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) .
105105

106+
106107
build_$(2)$(3)$(4): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard config-$(2)*) config-dbg
107108
@if [ x"$(DIRTY)" != x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi
108109
docker pull $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) || \
@@ -125,7 +126,7 @@ forcebuild_$(2)$(3)$(4): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildca
125126
--build-arg EXTRA=$(3) \
126127
--build-arg DEBUG=$(4) \
127128
$(LABELS) \
128-
--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) .
129+
-t $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) .
129130

130131
show-tag_$(2)$(3)$(4):
131132
@echo $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)
@@ -241,15 +242,13 @@ endef
241242
# Debug targets only for latest stable and LTS stable
242243
#
243244
ifeq ($(ARCH),x86_64)
244-
$(eval $(call kernel,5.10.11,5.10.x,$(EXTRA),$(DEBUG)))
245+
$(eval $(call kernel,5.10.57,5.10.x,$(EXTRA),$(DEBUG)))
245246
#$(eval $(call kernel,5.4.28,5.4.x,-rt,))
246247

247248
else ifeq ($(ARCH),aarch64)
248-
$(eval $(call kernel,5.10.11,5.10.x,$(EXTRA),$(DEBUG)))
249+
$(eval $(call kernel,5.10.57,5.10.x,$(EXTRA),$(DEBUG)))
249250
#$(eval $(call kernel,5.4.28,5.4.x,-rt,))
250251

251-
else ifeq ($(ARCH),s390x)
252-
$(eval $(call kernel,5.10.11,5.10.x,$(EXTRA),$(DEBUG)))
253252
endif
254253

255254
# Target for kernel config
@@ -298,6 +297,7 @@ else
298297
-t $(ORG)/kconfig:${KCONFIG_TAG} .
299298
endif
300299

300+
301301
.PHONY: clean
302302
clean:
303303
rm out/

kernel/config-5.10.x-aarch64

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 5.10.11 Kernel Configuration
3+
# Linux/arm64 5.10.57 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -218,6 +218,7 @@ CONFIG_USERMODE_DRIVER=y
218218
# CONFIG_BPF_PRELOAD is not set
219219
# CONFIG_USERFAULTFD is not set
220220
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
221+
CONFIG_KCMP=y
221222
CONFIG_RSEQ=y
222223
# CONFIG_DEBUG_RSEQ is not set
223224
# CONFIG_EMBEDDED is not set
@@ -416,6 +417,7 @@ CONFIG_KUSER_HELPERS=y
416417
#
417418
CONFIG_ARM64_HW_AFDBM=y
418419
CONFIG_ARM64_PAN=y
420+
CONFIG_AS_HAS_LSE_ATOMICS=y
419421
CONFIG_ARM64_LSE_ATOMICS=y
420422
CONFIG_ARM64_USE_LSE_ATOMICS=y
421423
CONFIG_ARM64_VHE=y
@@ -1674,7 +1676,6 @@ CONFIG_PCIEASPM_DEFAULT=y
16741676
# CONFIG_PCIEASPM_PERFORMANCE is not set
16751677
CONFIG_PCIE_PME=y
16761678
# CONFIG_PCIE_PTM is not set
1677-
# CONFIG_PCIE_BW is not set
16781679
CONFIG_PCI_MSI=y
16791680
CONFIG_PCI_MSI_IRQ_DOMAIN=y
16801681
CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -3485,6 +3486,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
34853486
# CONFIG_CHARGER_BQ25980 is not set
34863487
# CONFIG_CHARGER_SMB347 is not set
34873488
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
3489+
# CONFIG_BATTERY_RT5033 is not set
34883490
# CONFIG_CHARGER_RT9455 is not set
34893491
# CONFIG_CHARGER_UCS1002 is not set
34903492
# CONFIG_CHARGER_BD99954 is not set
@@ -5337,7 +5339,6 @@ CONFIG_RESET_BERLIN=y
53375339
CONFIG_RESET_BRCMSTB=y
53385340
CONFIG_RESET_BRCMSTB_RESCAL=y
53395341
CONFIG_RESET_IMX7=m
5340-
CONFIG_RESET_INTEL_GW=y
53415342
CONFIG_RESET_MESON=y
53425343
CONFIG_RESET_MESON_AUDIO_ARB=m
53435344
CONFIG_RESET_QCOM_AOSS=m
@@ -5359,7 +5360,6 @@ CONFIG_RESET_TEGRA_BPMP=y
53595360
CONFIG_GENERIC_PHY=y
53605361
CONFIG_GENERIC_PHY_MIPI_DPHY=y
53615362
CONFIG_PHY_XGENE=y
5362-
# CONFIG_USB_LGM_PHY is not set
53635363
CONFIG_PHY_SUN4I_USB=y
53645364
CONFIG_PHY_SUN6I_MIPI_DPHY=y
53655365
CONFIG_PHY_SUN9I_USB=y
@@ -5732,7 +5732,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
57325732
# CONFIG_PSTORE_PMSG is not set
57335733
# CONFIG_PSTORE_FTRACE is not set
57345734
# CONFIG_PSTORE_RAM is not set
5735-
# CONFIG_PSTORE_BLK is not set
57365735
# CONFIG_SYSV_FS is not set
57375736
# CONFIG_UFS_FS is not set
57385737
# CONFIG_EROFS_FS is not set

kernel/config-5.10.x-x86_64

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 5.10.11 Kernel Configuration
3+
# Linux/x86 5.10.57 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -237,6 +237,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
237237
# CONFIG_BPF_PRELOAD is not set
238238
# CONFIG_USERFAULTFD is not set
239239
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
240+
CONFIG_KCMP=y
240241
CONFIG_RSEQ=y
241242
# CONFIG_DEBUG_RSEQ is not set
242243
# CONFIG_EMBEDDED is not set
@@ -1618,7 +1619,6 @@ CONFIG_PCIEASPM_DEFAULT=y
16181619
# CONFIG_PCIEASPM_PERFORMANCE is not set
16191620
CONFIG_PCIE_PME=y
16201621
# CONFIG_PCIE_PTM is not set
1621-
# CONFIG_PCIE_BW is not set
16221622
CONFIG_PCI_MSI=y
16231623
CONFIG_PCI_MSI_IRQ_DOMAIN=y
16241624
CONFIG_PCI_QUIRKS=y
@@ -2727,6 +2727,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
27272727
# CONFIG_CHARGER_BQ2415X is not set
27282728
# CONFIG_CHARGER_SMB347 is not set
27292729
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
2730+
# CONFIG_BATTERY_RT5033 is not set
27302731
# CONFIG_CHARGER_BD99954 is not set
27312732
CONFIG_HWMON=y
27322733
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3599,7 +3600,6 @@ CONFIG_DMA_ACPI=y
35993600
# CONFIG_INTEL_IDXD is not set
36003601
# CONFIG_INTEL_IOATDMA is not set
36013602
# CONFIG_PLX_DMA is not set
3602-
# CONFIG_XILINX_ZYNQMP_DPDMA is not set
36033603
# CONFIG_QCOM_HIDMA_MGMT is not set
36043604
# CONFIG_QCOM_HIDMA is not set
36053605
CONFIG_DW_DMAC_CORE=y
@@ -3638,6 +3638,7 @@ CONFIG_UIO=m
36383638
# CONFIG_UIO_PRUSS is not set
36393639
# CONFIG_UIO_MF624 is not set
36403640
# CONFIG_UIO_HV_GENERIC is not set
3641+
# CONFIG_VFIO is not set
36413642
CONFIG_IRQ_BYPASS_MANAGER=m
36423643
# CONFIG_VIRT_DRIVERS is not set
36433644
CONFIG_VIRTIO=y
@@ -3672,7 +3673,7 @@ CONFIG_HYPERV_BALLOON=y
36723673
#
36733674
CONFIG_XEN_BALLOON=y
36743675
CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
3675-
CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
3676+
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
36763677
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
36773678
CONFIG_XEN_DEV_EVTCHN=y
36783679
# CONFIG_XEN_BACKEND is not set
@@ -3864,7 +3865,6 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
38643865

38653866
# CONFIG_IPACK_BUS is not set
38663867
CONFIG_RESET_CONTROLLER=y
3867-
# CONFIG_RESET_BRCMSTB_RESCAL is not set
38683868
# CONFIG_RESET_TI_SYSCON is not set
38693869

38703870
#
@@ -4108,7 +4108,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
41084108
# CONFIG_PSTORE_PMSG is not set
41094109
# CONFIG_PSTORE_FTRACE is not set
41104110
# CONFIG_PSTORE_RAM is not set
4111-
# CONFIG_PSTORE_BLK is not set
41124111
# CONFIG_SYSV_FS is not set
41134112
# CONFIG_UFS_FS is not set
41144113
# CONFIG_EROFS_FS is not set

0 commit comments

Comments
 (0)