From 4af06750d770e5a4b7fc3c457424d2b8a7894d89 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 3 May 2022 14:43:50 -0700 Subject: [PATCH] scripts/check_kernel_config: handle string options --- packages/linux/package.mk | 2 +- tools/check_kernel_config | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index f848b29192..358eacd6aa 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -179,7 +179,7 @@ pre_make_target() { continue fi - if [ "$(${PKG_BUILD}/scripts/config --state ${OPTION%%=*})" != "${OPTION##*=}" ]; then + if [ "$(${PKG_BUILD}/scripts/config --state ${OPTION%%=*})" != "$(echo ${OPTION##*=} | tr -d '"')" ]; then MISSING_KERNEL_OPTIONS+="\t${OPTION}\n" fi done < ${DISTRO_DIR}/${DISTRO}/kernel_options diff --git a/tools/check_kernel_config b/tools/check_kernel_config index 41a52d7117..16552225fd 100755 --- a/tools/check_kernel_config +++ b/tools/check_kernel_config @@ -26,6 +26,12 @@ if [ -f "${DISTRO_DIR}/${DISTRO}/kernel_options" ]; then $PKG_BUILD/scripts/config --file $PKG_KERNEL_CFG_FILE --disable ${OPTION%%=*} fi + # must be a string if it contains double quotes + if [ -n "$(echo ${OPTION##*=} | grep '"')" ]; then + echo "[${OPTION##*=}] ${OPTION%%=*}" + $PKG_BUILD/scripts/config --file $PKG_KERNEL_CFG_FILE --set-str ${OPTION%%=*} $(echo ${OPTION##*=} | tr -d '"') + fi + done < ${DISTRO_DIR}/${DISTRO}/kernel_options else echo "kernel options file doesn't exist: ${DISTRO_DIR}/${DISTRO}/kernel_options"