Skip to content

Commit 5d5ade6

Browse files
committed
kernel: configure the kernel again after an initramfs build
Kernel/SetInitramfs writes the initramfs configuration into the kernel tree and deletes .config.prev, so that the next configure stage puts the regular configuration back. The check that decides if the configure stage must run ignored this signal. The next build then compiled the regular kernel with the initramfs configuration, and the squashfs images got a kernel with an embedded root filesystem. Run the configure stage if .config.prev is missing. Fixes: e97e3f3 ("kernel: configure the kernel only when an input changed") Signed-off-by: John Crispin <john@phrozen.org>
1 parent 4be0395 commit 5d5ade6

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

‎include/kernel-build.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ define BuildKernel
157157
$(KERNEL_CONFIG_CHECK): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config FORCE
158158
@mkdir -p $(LINUX_DIR)
159159
@[ -f $(STAMP_CONFIGURED) ] && [ -d $(LINUX_DIR)/user_headers ] && \
160+
[ -f $(LINUX_DIR)/.config.prev ] && \
160161
[ -z "$$$$(find $(KERNEL_CONFIG_DEPENDS) ! -type d \
161162
-newer $(STAMP_CONFIGURED) -print -quit 2>/dev/null)" ] || \
162163
touch $$@

0 commit comments

Comments
 (0)