Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hook.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: quay.io/tinkerbell/hook-kernel:5.10.11
image: quay.io/tinkerbell/hook-kernel:5.10.57
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:v0.8
Expand Down
2 changes: 1 addition & 1 deletion hook_debug.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: quay.io/tinkerbell/hook-kernel:5.10.11
image: quay.io/tinkerbell/hook-kernel:5.10.57
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:v0.8
Expand Down
10 changes: 5 additions & 5 deletions kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ devbuild_$(2)$(3)$(4): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard
$(LABELS) \
--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) .


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

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

else ifeq ($(ARCH),aarch64)
$(eval $(call kernel,5.10.11,5.10.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.10.57,5.10.x,$(EXTRA),$(DEBUG)))
#$(eval $(call kernel,5.4.28,5.4.x,-rt,))

else ifeq ($(ARCH),s390x)
$(eval $(call kernel,5.10.11,5.10.x,$(EXTRA),$(DEBUG)))
endif

# Target for kernel config
Expand Down Expand Up @@ -298,6 +297,7 @@ else
-t $(ORG)/kconfig:${KCONFIG_TAG} .
endif


.PHONY: clean
clean:
rm out/
9 changes: 4 additions & 5 deletions kernel/config-5.10.x-aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.11 Kernel Configuration
# Linux/arm64 5.10.57 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -218,6 +218,7 @@ CONFIG_USERMODE_DRIVER=y
# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
Expand Down Expand Up @@ -416,6 +417,7 @@ CONFIG_KUSER_HELPERS=y
#
CONFIG_ARM64_HW_AFDBM=y
CONFIG_ARM64_PAN=y
CONFIG_AS_HAS_LSE_ATOMICS=y
CONFIG_ARM64_LSE_ATOMICS=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM64_VHE=y
Expand Down Expand Up @@ -1674,7 +1676,6 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
# CONFIG_PCIE_PTM is not set
# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_MSI_ARCH_FALLBACKS=y
Expand Down Expand Up @@ -3485,6 +3486,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_UCS1002 is not set
# CONFIG_CHARGER_BD99954 is not set
Expand Down Expand Up @@ -5337,7 +5339,6 @@ CONFIG_RESET_BERLIN=y
CONFIG_RESET_BRCMSTB=y
CONFIG_RESET_BRCMSTB_RESCAL=y
CONFIG_RESET_IMX7=m
CONFIG_RESET_INTEL_GW=y
CONFIG_RESET_MESON=y
CONFIG_RESET_MESON_AUDIO_ARB=m
CONFIG_RESET_QCOM_AOSS=m
Expand All @@ -5359,7 +5360,6 @@ CONFIG_RESET_TEGRA_BPMP=y
CONFIG_GENERIC_PHY=y
CONFIG_GENERIC_PHY_MIPI_DPHY=y
CONFIG_PHY_XGENE=y
# CONFIG_USB_LGM_PHY is not set
CONFIG_PHY_SUN4I_USB=y
CONFIG_PHY_SUN6I_MIPI_DPHY=y
CONFIG_PHY_SUN9I_USB=y
Expand Down Expand Up @@ -5732,7 +5732,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_FTRACE is not set
# CONFIG_PSTORE_RAM is not set
# CONFIG_PSTORE_BLK is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_EROFS_FS is not set
Expand Down
11 changes: 5 additions & 6 deletions kernel/config-5.10.x-x86_64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.10.11 Kernel Configuration
# Linux/x86 5.10.57 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -237,6 +237,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
Expand Down Expand Up @@ -1618,7 +1619,6 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
# CONFIG_PCIE_PTM is not set
# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_QUIRKS=y
Expand Down Expand Up @@ -2727,6 +2727,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_BD99954 is not set
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
Expand Down Expand Up @@ -3599,7 +3600,6 @@ CONFIG_DMA_ACPI=y
# CONFIG_INTEL_IDXD is not set
# CONFIG_INTEL_IOATDMA is not set
# CONFIG_PLX_DMA is not set
# CONFIG_XILINX_ZYNQMP_DPDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_HIDMA is not set
CONFIG_DW_DMAC_CORE=y
Expand Down Expand Up @@ -3638,6 +3638,7 @@ CONFIG_UIO=m
# CONFIG_UIO_PRUSS is not set
# CONFIG_UIO_MF624 is not set
# CONFIG_UIO_HV_GENERIC is not set
# CONFIG_VFIO is not set
CONFIG_IRQ_BYPASS_MANAGER=m
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO=y
Expand Down Expand Up @@ -3672,7 +3673,7 @@ CONFIG_HYPERV_BALLOON=y
#
CONFIG_XEN_BALLOON=y
CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_DEV_EVTCHN=y
# CONFIG_XEN_BACKEND is not set
Expand Down Expand Up @@ -3864,7 +3865,6 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y

# CONFIG_IPACK_BUS is not set
CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_BRCMSTB_RESCAL is not set
# CONFIG_RESET_TI_SYSCON is not set

#
Expand Down Expand Up @@ -4108,7 +4108,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_FTRACE is not set
# CONFIG_PSTORE_RAM is not set
# CONFIG_PSTORE_BLK is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_EROFS_FS is not set
Expand Down