|
| 1 | +From 16db739657f86532831c8df72c3fc37574ca5a31 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Philippe Coval <philippe.coval@silabs.com> |
| 3 | +Date: Mon, 24 Mar 2025 18:29:16 +0100 |
| 4 | +Subject: [PATCH 6/6] git: docker/uic-resources: Removed as not part of |
| 5 | + UnifyCore (LFS) |
| 6 | + |
| 7 | +This change is motivated by zeal project |
| 8 | + |
| 9 | +Tests are passing, but it fail later on installing package: |
| 10 | + |
| 11 | + #12 1.646 dpkg: error processing archive ./build/z-wave-protocol-controller_1.7.0_x86_64/libunify_1.7.0-65-gbc86741e_x86_64.deb (--install): |
| 12 | + Error: No space left on device : '/home/runner/runners/2.323.0/_diag/pages/a643bedf-49e7-4c3e-9568-b498945dda79_dd23db01-cff6-57a4-373a-5c8097a97333_1.log' |
| 13 | + |
| 14 | +I suspect the cause it all the assets in tree, this has to be cleaned up. |
| 15 | + |
| 16 | +This change prevent this problem, further cleaning may be considered. |
| 17 | + |
| 18 | +Relate-to: https://github.com/SiliconLabsSoftware/z-wave-engine-application-layer/issues/11#issuecomment-2748887134 |
| 19 | +Relate-to: https://github.com/SiliconLabsSoftware/z-wave-protocol-controller/issues/77 |
| 20 | +Relate-to: https://github.com/SiliconLabsSoftware/z-wave-engine-application-layer/issues/10 |
| 21 | +Relate-to: https://github.com/SiliconLabsSoftware/z-wave-engine-application-layer/issues/11 |
| 22 | +Relate-to: https://github.com/SiliconLabsSoftware/z-wave-engine-application-layer/issues/7 |
| 23 | +Signed-off-by: Philippe Coval <philippe.coval@silabs.com> |
| 24 | +--- |
| 25 | + docker/uic-resources/README.md | 64 ------------------- |
| 26 | + docker/uic-resources/linux/slc_cli_linux.zip | 3 - |
| 27 | + .../uic-resources/linux/zap_apack_linux.zip | 3 - |
| 28 | + docker/uic-resources/mac/slc_cli_mac.zip | 3 - |
| 29 | + docker/uic-resources/mac/zap-2022.1.10.dmg | 3 - |
| 30 | + docker/uic-resources/mac/zap_apack_mac.zip | 3 - |
| 31 | + 6 files changed, 79 deletions(-) |
| 32 | + delete mode 100644 docker/uic-resources/README.md |
| 33 | + delete mode 100644 docker/uic-resources/linux/slc_cli_linux.zip |
| 34 | + delete mode 100644 docker/uic-resources/linux/zap_apack_linux.zip |
| 35 | + delete mode 100644 docker/uic-resources/mac/slc_cli_mac.zip |
| 36 | + delete mode 100644 docker/uic-resources/mac/zap-2022.1.10.dmg |
| 37 | + delete mode 100644 docker/uic-resources/mac/zap_apack_mac.zip |
| 38 | + |
| 39 | +diff --git a/docker/uic-resources/README.md b/docker/uic-resources/README.md |
| 40 | +deleted file mode 100644 |
| 41 | +index cf767433db..0000000000 |
| 42 | +--- a/docker/uic-resources/README.md |
| 43 | ++++ /dev/null |
| 44 | +@@ -1,64 +0,0 @@ |
| 45 | +-This repository holds binary resource dependencies for UIC |
| 46 | +- |
| 47 | +-# Overview of Artifacts |
| 48 | +- |
| 49 | +-## Silicon Labs Configurator(SLC) |
| 50 | +-slc is a tool used to create Silicon Labs Universal Configurator(UC) projects. |
| 51 | +- |
| 52 | +-Artifact paths: |
| 53 | +-- linux/slc_cli_linux.zip |
| 54 | +-- mac/slc_cli_mac.zip |
| 55 | +- |
| 56 | +-See [UG520: Software Project Generation and |
| 57 | +-Configuration with SLC-CLI](https://www.silabs.com/documents/public/user-guides/ug520-software-project-generation-configuration-with-slc-cli.pdf) for more details. |
| 58 | +- |
| 59 | +- |
| 60 | +-## ZCL Configurator (ZAP) |
| 61 | +-zap is a tool used to generate source code to handle ZCL cluster command and attribute consumption. |
| 62 | +-Build information: ZAP internal build #[490](https://jenkins-cbs-gecko-sdk.silabs.net/job/ZAP/job/silabs/490/) |
| 63 | +- |
| 64 | +-Artifact paths: |
| 65 | +-- linux/zap-2022.1.10_amd64.deb |
| 66 | +-- linux/zap_apack_linux.zip |
| 67 | +-- mac/zap-2022.1.10.dmg |
| 68 | +-- mac/zap_apack_mac.zip |
| 69 | +- |
| 70 | +- |
| 71 | +-See [AN1325: Zigbee Cluster Configurator User's Guide](https://www.silabs.com/documents/public/application-notes/an1325-zigbee-cluster-configurator-users-guide.pdf) for more details. |
| 72 | +- |
| 73 | +-> ### **WARNING**: The ZAP adaptor pack archives have been modified according to the changes below. Ensure these changes are made on subsequent updates to these archives. |
| 74 | +- |
| 75 | +-### Modifications Made to Adapter Pack |
| 76 | +- |
| 77 | +-Change in apack.json: Add `--no-sandbox` parameter in the `uc_generate` function: |
| 78 | +-```diff |
| 79 | +-diff --git a/apack.json b/apack.json |
| 80 | +-index cf87a910..8bce7281 100644 |
| 81 | +---- a/apack.json |
| 82 | +-+++ b/apack.json |
| 83 | +-@@ -36,7 +36,7 @@ |
| 84 | +- "cmd": "$(zap) --version" |
| 85 | +- }, |
| 86 | +- "uc_generate": { |
| 87 | +-- "cmd": "$(zap) generate --noUi --noServer -o ${generationOutput} --zcl ${sdkRoot}/app/zcl/zcl-zap.json --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-temp |
| 88 | +-late/gen-templates.json --in ${contentFolder}" |
| 89 | +-+ "cmd": "$(zap) generate --noUi --noServer --no-sandbox -o ${generationOutput} --zcl ${sdkRoot}/app/zcl/zcl-zap.json --generationTemplate ${sdkRoot}/protocol/zigbee/app |
| 90 | +-/framework/gen-template/gen-templates.json --in ${contentFolder}" |
| 91 | +- }, |
| 92 | +- "uc_upgrade": { |
| 93 | +- "cmd": "$(zap) convert --noUi --noServer --in ${contentFolder} --zcl ${sdkRoot}/app/zcl/zcl-zap.json --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/g |
| 94 | +-en-templates.json" |
| 95 | +-``` |
| 96 | +- |
| 97 | +-#### Instructions to modify zip archives: |
| 98 | +- |
| 99 | +-*ZIP_FILE = zap_apack_linux.zip OR zap_apack_mac.zip* |
| 100 | +- |
| 101 | +-```bash |
| 102 | +-# Extract only apack.json from zip file |
| 103 | +-$ unzip -p ZIP_FILE.zip apack.json > apack.json |
| 104 | +-# Add --no-sandbox parameter to slc zap generate config |
| 105 | +-$ sed -i 's/--noServer -o/--noServer --no-sandbox -o/' apack.json |
| 106 | +-# Update apack.json in zip file |
| 107 | +-$ zip ZIP_FILE.zip apack.json |
| 108 | +-``` |
| 109 | +diff --git a/docker/uic-resources/linux/slc_cli_linux.zip b/docker/uic-resources/linux/slc_cli_linux.zip |
| 110 | +deleted file mode 100644 |
| 111 | +index c7097892ad..0000000000 |
| 112 | +--- a/docker/uic-resources/linux/slc_cli_linux.zip |
| 113 | ++++ /dev/null |
| 114 | +@@ -1,3 +0,0 @@ |
| 115 | +-version https://git-lfs.github.com/spec/v1 |
| 116 | +-oid sha256:4163ec1a48e63dbde26a7e589a1af569f82d9cbbe11fd71742ff0ae2f726e292 |
| 117 | +-size 208440392 |
| 118 | +diff --git a/docker/uic-resources/linux/zap_apack_linux.zip b/docker/uic-resources/linux/zap_apack_linux.zip |
| 119 | +deleted file mode 100644 |
| 120 | +index 0160f70038..0000000000 |
| 121 | +--- a/docker/uic-resources/linux/zap_apack_linux.zip |
| 122 | ++++ /dev/null |
| 123 | +@@ -1,3 +0,0 @@ |
| 124 | +-version https://git-lfs.github.com/spec/v1 |
| 125 | +-oid sha256:73119ea68ad6f717e915f4d9854243321d27cd4bce12429548c2510a7ff1bf42 |
| 126 | +-size 94376620 |
| 127 | +diff --git a/docker/uic-resources/mac/slc_cli_mac.zip b/docker/uic-resources/mac/slc_cli_mac.zip |
| 128 | +deleted file mode 100644 |
| 129 | +index 89dbdf641d..0000000000 |
| 130 | +--- a/docker/uic-resources/mac/slc_cli_mac.zip |
| 131 | ++++ /dev/null |
| 132 | +@@ -1,3 +0,0 @@ |
| 133 | +-version https://git-lfs.github.com/spec/v1 |
| 134 | +-oid sha256:e95ffb2e21aaa47a2ae220964abd566cac454fe04fcee0ce23c2bbcd86bac7e7 |
| 135 | +-size 187615728 |
| 136 | +diff --git a/docker/uic-resources/mac/zap-2022.1.10.dmg b/docker/uic-resources/mac/zap-2022.1.10.dmg |
| 137 | +deleted file mode 100644 |
| 138 | +index 5cbc724612..0000000000 |
| 139 | +--- a/docker/uic-resources/mac/zap-2022.1.10.dmg |
| 140 | ++++ /dev/null |
| 141 | +@@ -1,3 +0,0 @@ |
| 142 | +-version https://git-lfs.github.com/spec/v1 |
| 143 | +-oid sha256:dc580a5b53751749236cab3c3af32a1dcad9fcb96e834300404bdf2e0d0b595e |
| 144 | +-size 94185073 |
| 145 | +diff --git a/docker/uic-resources/mac/zap_apack_mac.zip b/docker/uic-resources/mac/zap_apack_mac.zip |
| 146 | +deleted file mode 100644 |
| 147 | +index 2d1a47bdbc..0000000000 |
| 148 | +--- a/docker/uic-resources/mac/zap_apack_mac.zip |
| 149 | ++++ /dev/null |
| 150 | +@@ -1,3 +0,0 @@ |
| 151 | +-version https://git-lfs.github.com/spec/v1 |
| 152 | +-oid sha256:f5ced7930d5a6289f26e81ed7913e9c02e93f1053a3bfa492bff9f9287b25522 |
| 153 | +-size 94020675 |
| 154 | +-- |
| 155 | +2.39.5 |
| 156 | + |
0 commit comments