scripts: drop downstream 'west patch' command

Zephyr upstream has its own implementation of 'west patch' subcommand, which will basically allow the same kind of functionality. Drop downstream 'west patch', since it is not used currently by the SDK. That way there won't be any conflict after bumping Zephyr version. Signed-off-by: Marcin Niestroj <[email protected]>
golioth · Jan 24, 2025 · 76f4104 · 76f4104
1 parent 9c89fd7
commit 76f4104
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 97 deletions.
diff --git a/.ci-west-ncs-twister.yml b/.ci-west-ncs-twister.yml
@@ -6,6 +6,3 @@ manifest:
       name-allowlist:
         - nrf
         - zephyr
-    userdata:
-      patches_dirs:
-        - patches/west-ncs
diff --git a/.ci-west-ncs.yml b/.ci-west-ncs.yml
@@ -19,6 +19,3 @@ manifest:
         - trusted-firmware-m
         - zcbor
         - zephyr
-    userdata:
-      patches_dirs:
-        - patches/west-ncs
diff --git a/.ci-west-zephyr-twister.yml b/.ci-west-zephyr-twister.yml
@@ -5,6 +5,3 @@ manifest:
       file: west-zephyr.yml
       name-allowlist:
         - zephyr
-    userdata:
-      patches_dirs:
-        - patches/west-zephyr
diff --git a/.ci-west-zephyr.yml b/.ci-west-zephyr.yml
@@ -17,6 +17,3 @@ manifest:
         - tinycrypt
         - zcbor
         - zephyr
-    userdata:
-      patches_dirs:
-        - patches/west-zephyr
diff --git a/.github/workflows/hil-integration-nsim.yml b/.github/workflows/hil-integration-nsim.yml
@@ -93,7 +93,6 @@ jobs:
           west update -o=--depth=1 -n
           git config --global user.email [email protected]
           git config --global user.name "Git User"
-          west patch
 
           pip install \
             -r zephyr/scripts/requirements-base.txt \

diff --git a/.github/workflows/hil-sample-nsim.yml b/.github/workflows/hil-sample-nsim.yml
@@ -64,7 +64,6 @@ jobs:
           west update -o=--depth=1 -n
           git config --global user.email [email protected]
           git config --global user.name "Git User"
-          west patch
 
           pip3 install \
             -r zephyr/scripts/requirements-base.txt \

diff --git a/.github/workflows/hil-sample-zephyr.yml b/.github/workflows/hil-sample-zephyr.yml
@@ -91,7 +91,6 @@ jobs:
           if west config manifest.file | grep -q '.ci-west-zephyr.yml'; then
             git config --global user.email [email protected]
             git config --global user.name "Git User"
-            west patch
           fi
 
           pip3 install \
@@ -173,7 +172,6 @@ jobs:
           west update -o=--depth=1 -n
           git config --global user.email [email protected]
           git config --global user.name "Git User"
-          west patch
 
           pip3 install \
             -r zephyr/scripts/requirements-base.txt \

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,3 @@
-exclude: '^patches/'
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0

diff --git a/scripts/west-commands.yml b/scripts/west-commands.yml
diff --git a/scripts/west_commands/patch.py b/scripts/west_commands/patch.py
diff --git a/west-ncs.yml b/west-ncs.yml
@@ -8,6 +8,3 @@ manifest:
   self:
     path: modules/lib/golioth-firmware-sdk
     west-commands: scripts/west-commands.yml
-    userdata:
-      patches_dirs:
-        - patches/west-ncs
diff --git a/west-zephyr.yml b/west-zephyr.yml
@@ -9,6 +9,3 @@ manifest:
   self:
     path: modules/lib/golioth-firmware-sdk
     west-commands: scripts/west-commands.yml
-    userdata:
-      patches_dirs:
-        - patches/west-zephyr