From 1e8dfad86b3c450f0be3fdab23608e474512a19e Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 9 Dec 2022 16:43:17 +0100 Subject: [PATCH] pkg/debian: Update Debian/Ubuntu build scripts for new annotations config format --- .github/workflows/debian.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 86dfd1c7e..1b54e0c06 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -67,12 +67,13 @@ jobs: run: | cd pkg/debian/kernel/linux + # generate base config + ./debian/scripts/misc/annotations --arch amd64 --flavour generic --export > ../base.config + # merge configs - ./scripts/kconfig/merge_config.sh \ - debian.master/config/config.common.ubuntu \ - debian.master/config/amd64/config.common.amd64 \ - debian.master/config/amd64/config.flavour.generic \ - ../ubuntu.config \ + ./scripts/kconfig/merge_config.sh \ + ../base.config \ + ../ubuntu.config \ ../../../../configs/surface-${KERNEL_VERSION%.*}.config # set revision