Przeglądaj źródła

pkg/debian: Update Debian/Ubuntu build scripts for new annotations config format

Maximilian Luz 2 lat temu
rodzic
commit
1e8dfad86b
1 zmienionych plików z 6 dodań i 5 usunięć
  1. 6 5
      .github/workflows/debian.yml

+ 6 - 5
.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