From 5122cd19a298efdff0fe71e5bf23f8df2285d72c Mon Sep 17 00:00:00 2001 From: Wentao Guan Date: Thu, 27 Feb 2025 00:20:29 +0800 Subject: [PATCH 1/2] deepin: config: config SPMI config SPMI for to make sure configs are consistant Signed-off-by: Wentao Guan --- arch/loongarch/configs/deepin_loongarch_desktop_defconfig | 1 + arch/x86/configs/deepin_x86_desktop_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/loongarch/configs/deepin_loongarch_desktop_defconfig b/arch/loongarch/configs/deepin_loongarch_desktop_defconfig index 762d2046af567..22f43119b1fee 100644 --- a/arch/loongarch/configs/deepin_loongarch_desktop_defconfig +++ b/arch/loongarch/configs/deepin_loongarch_desktop_defconfig @@ -2289,6 +2289,7 @@ CONFIG_SPI_TLE62X0=m CONFIG_SPI_SLAVE=y CONFIG_SPI_SLAVE_TIME=m CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m +CONFIG_SPMI=m CONFIG_HSI=m CONFIG_HSI_CHAR=m CONFIG_PPS_CLIENT_KTIMER=m diff --git a/arch/x86/configs/deepin_x86_desktop_defconfig b/arch/x86/configs/deepin_x86_desktop_defconfig index cef46de19ba21..262096c6e7f3a 100644 --- a/arch/x86/configs/deepin_x86_desktop_defconfig +++ b/arch/x86/configs/deepin_x86_desktop_defconfig @@ -2179,6 +2179,7 @@ CONFIG_SPI_TLE62X0=m CONFIG_SPI_SLAVE=y CONFIG_SPI_SLAVE_TIME=m CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m +CONFIG_SPMI=m CONFIG_HSI=m CONFIG_HSI_CHAR=m CONFIG_PPS_CLIENT_LDISC=m From 29578f34cbcb9d9bb3e0a1a5bb7fa22f9ed23d42 Mon Sep 17 00:00:00 2001 From: Wentao Guan Date: Thu, 27 Feb 2025 00:26:59 +0800 Subject: [PATCH 2/2] CI: add check-config.yml Signed-off-by: Wentao Guan --- .github/workflows/check-config.yml | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/check-config.yml diff --git a/.github/workflows/check-config.yml b/.github/workflows/check-config.yml new file mode 100644 index 0000000000000..d90e421dc344c --- /dev/null +++ b/.github/workflows/check-config.yml @@ -0,0 +1,34 @@ +name: Check defconfig Consistency + +on: + push: + pull_request: + +jobs: + check-defconfig: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y bc build-essential zstd flex bison libssl-dev make libelf-dev git debhelper pahole libncurses-dev + + - name: Backup original defconfig + run: | + cp arch/x86/configs/deepin_x86_desktop_defconfig defconfig.orig + + - name: Generate new defconfig + run: | + make ARCH=x86 deepin_x86_desktop_defconfig + make ARCH=x86 savedefconfig + + - name: Compare defconfig files + run: | + if ! diff -u defconfig defconfig.orig; then + echo "::error:: deepin_x86_desktop_defconfig 文件不一致，请执行 'make savedefconfig' 并提交更新" + exit 1 + fi