From 2ae4a26984a50ad325e57d3039007f5bc2308d88 Mon Sep 17 00:00:00 2001 From: Douglas RAILLARD Date: Tue, 11 Jun 2019 22:08:48 +0100 Subject: [PATCH] lisa-buildroot-update-kernel-config: Fix call from arbitrary folder cd to the kernel tree before calling merge_config.sh --- tools/lisa-buildroot-update-kernel-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/lisa-buildroot-update-kernel-config b/tools/lisa-buildroot-update-kernel-config index d98a4105a..d77a06d63 100755 --- a/tools/lisa-buildroot-update-kernel-config +++ b/tools/lisa-buildroot-update-kernel-config @@ -74,4 +74,6 @@ tee "$fragment" << EOF CONFIG_INITRAMFS_SOURCE="$ROOTFS" EOF +# merge_config.sh seems to have issue if called from other working directories +cd "$KERNEL_DIR" && KCONFIG_CONFIG="$KERNEL_CONFIG" "$KERNEL_DIR/scripts/kconfig/merge_config.sh" "$KERNEL_CONFIG" "$fragment" -- GitLab