Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow using no CIPD pigweed configuration when activating #20105

Merged
merged 2 commits into from
Jul 1, 2022
Merged

Allow using no CIPD pigweed configuration when activating #20105

merged 2 commits into from
Jul 1, 2022

Conversation

agners
Copy link
Contributor

@agners agners commented Jun 29, 2022

Problem

Currently there is a no CIPD bootstrap script symlinked at scripts/no_cipd_bootstrap.sh. However, there is no scripts/activate.sh equivalent (which is useful in CI e.g. when cloning manually using scripts/checkout_submodules.py beforehand).

Change overview

Instead of using a separate script allow to pass the Pigweed bootstrap configuration file via environment variable.

Testing

Locally by building with:

scripts/checkout_submodules.py --shallow --platform linux
PW_CONFIG_FILE=scripts/environment_no_cipd.json source scripts/activate.sh

@agners
Allow to set pigweed config via environment
14b89e6 
Allow to specify custom pigweed configuration file via PW_CONFIG_FILE,
e.g.
PW_CONFIG_FILE=scripts/environment_no_cipd.json source scripts/bootstrap.sh

This allows to use a custom pigweed config for scripts/activate.sh as
well.
@agners
Disable rosetta in no_cipd config as well
7e4eba3
@github-actions
Copy link

github-actions bot commented Jun 29, 2022 •
edited
Loading

PR #20105: Size comparison from 81c7f2a to 7e4eba3

Decreases (2 builds for telink)
platform target config section 81c7f2a 7e4eba3 change % change
telink light-switch-app tlsr9518adk80d text 564512 564508 -4 -0.0
lighting-app tlsr9518adk80d text 580872 580870 -2 -0.0
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 81c7f2a 7e4eba3 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 664931 664931 0 0.0
(read/write) 188068 188068 0 0.0
.bss 75892 75892 0 0.0
.data 3356 3356 0 0.0
.rodata 88083 88083 0 0.0
.text 576532 576532 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 653707 653707 0 0.0
(read/write) 198588 198588 0 0.0
.bss 75188 75188 0 0.0
.data 3356 3356 0 0.0
.rodata 91563 91563 0 0.0
.text 561828 561828 0 0.0
lock-ftd LP_CC2652R7 (read only) 667487 667487 0 0.0
(read/write) 175656 175656 0 0.0
.bss 72924 72924 0 0.0
.data 3280 3280 0 0.0
.rodata 76183 76183 0 0.0
.text 590824 590824 0 0.0
lock-mtd LP_CC2652R7 (read only) 616903 616903 0 0.0
(read/write) 146040 146040 0 0.0
.bss 68644 68644 0 0.0
.data 3280 3280 0 0.0
.rodata 76063 76063 0 0.0
.text 540352 540352 0 0.0
pump-app LP_CC2652R7 (read only) 676967 676967 0 0.0
(read/write) 167024 167024 0 0.0
.bss 73004 73004 0 0.0
.data 3280 3280 0 0.0
.rodata 88415 88415 0 0.0
.text 588068 588068 0 0.0
pump-controller-app LP_CC2652R7 (read only) 662783 662783 0 0.0
(read/write) 181328 181328 0 0.0
.bss 73124 73124 0 0.0
.data 3276 3276 0 0.0
.rodata 84263 84263 0 0.0
.text 578040 578040 0 0.0
shell LP_CC2652R7 (read only) 657374 657374 0 0.0
(read/write) 191128 191128 0 0.0
.bss 78196 78196 0 0.0
.data 3360 3360 0 0.0
.rodata 84830 84830 0 0.0
.text 572228 572228 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 580174 580174 0 0.0
.app_xip_area 457176 457176 0 0.0
.bss 65960 65960 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 581734 581734 0 0.0
.app_xip_area 458544 458544 0 0.0
.bss 66152 66152 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 583230 583230 0 0.0
.app_xip_area 461080 461080 0 0.0
.bss 65168 65168 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1081420 1081420 0 0.0
.bss 134772 134772 0 0.0
.data 2048 2048 0 0.0
.text 944580 944580 0 0.0
BRD4161A+rpc (read/write) 1135684 1135684 0 0.0
.bss 151452 151452 0 0.0
.data 2260 2260 0 0.0
.text 981952 981952 0 0.0
BRD4161A+rs911x (read/write) 943884 943884 0 0.0
.bss 140488 140488 0 0.0
.data 2048 2048 0 0.0
.text 801328 801328 0 0.0
lock-app BRD4161A+wf200 (read/write) 1121048 1121048 0 0.0
.bss 140920 140920 0 0.0
.data 2060 2060 0 0.0
.text 978048 978048 0 0.0
window-app BRD4161A (read/write) 1066700 1066700 0 0.0
.bss 134852 134852 0 0.0
.data 2076 2076 0 0.0
.text 929748 929748 0 0.0
esp32 all-clusters-app c3devkit (read only) 1018218 1018218 0 0.0
(read/write) 1486650 1486650 0 0.0
.dram0.bss 71856 71856 0 0.0
.dram0.data 14592 14592 0 0.0
.flash.rodata 214776 214776 0 0.0
.flash.text 1018218 1018218 0 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1072315 1072315 0 0.0
(read/write) 488752 488752 0 0.0
.dram0.bss 77376 77376 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 245236 245236 0 0.0
.flash.text 1066931 1066931 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 659520 659520 0 0.0
.bss 71292 71292 0 0.0
.data 1992 1992 0 0.0
.text 580436 580436 0 0.0
lock k32w061+release (read/write) 685988 685988 0 0.0
.bss 71756 71756 0 0.0
.data 2004 2004 0 0.0
.text 606428 606428 0 0.0
linux all-clusters-app debug (read only) 2952673 2952673 0 0.0
(read/write) 155288 155288 0 0.0
.bss 62144 62144 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84904 84904 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 263133 263133 0 0.0
.text 2512546 2512546 0 0.0
all-clusters-minimal-app debug (read only) 2806769 2806769 0 0.0
(read/write) 147224 147224 0 0.0
.bss 61472 61472 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77544 77544 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 264797 264797 0 0.0
.text 2367154 2367154 0 0.0
bridge-app debug+rpc (read only) 2310201 2310201 0 0.0
(read/write) 126048 126048 0 0.0
.bss 49536 49536 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66920 66920 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 197696 197696 0 0.0
.text 1950962 1950962 0 0.0
chip-tool debug (read only) 10175741 10175741 0 0.0
(read/write) 610792 610792 0 0.0
.bss 24384 24384 0 0.0
.data 1088 1088 0 0.0
.data.rel.ro 579024 579024 0 0.0
.dynamic 624 624 0 0.0
.got 5016 5016 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 509285 509285 0 0.0
.text 8257797 8257797 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9907444 9907444 0 0.0
(read/write) 675601 675601 0 0.0
.bss 42609 42609 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 614592 614592 0 0.0
.dynamic 528 528 0 0.0
.got 13440 13440 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 472548 472548 0 0.0
.text 7895396 7895396 0 0.0
lighting-app debug+rpc (read only) 2546033 2546033 0 0.0
(read/write) 130072 130072 0 0.0
.bss 50048 50048 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72056 72056 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 213448 213448 0 0.0
.text 2162450 2162450 0 0.0
lock-app debug (read only) 2507953 2507953 0 0.0
(read/write) 125048 125048 0 0.0
.bss 48448 48448 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69032 69032 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 228200 228200 0 0.0
.text 2114802 2114802 0 0.0
ota-provider-app debug (read only) 2317089 2317089 0 0.0
(read/write) 118856 118856 0 0.0
.bss 48096 48096 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63032 63032 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203288 203288 0 0.0
.text 1951218 1951218 0 0.0
ota-requestor-app debug (read only) 2434241 2434241 0 0.0
(read/write) 125760 125760 0 0.0
.bss 50464 50464 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67224 67224 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207328 207328 0 0.0
.text 2055954 2055954 0 0.0
shell debug (read only) 2542401 2542401 0 0.0
(read/write) 141608 141608 0 0.0
.bss 58056 58056 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76640 76640 0 0.0
.dynamic 608 608 0 0.0
.got 4096 4096 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 227218 227218 0 0.0
.text 2158962 2158962 0 0.0
thermostat-no-ble arm64 (read only) 2589940 2589940 0 0.0
(read/write) 158833 158833 0 0.0
.bss 65857 65857 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83184 83184 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165236 165236 0 0.0
.text 2185104 2185104 0 0.0
tv-app debug (read only) 3095641 3095641 0 0.0
(read/write) 256424 256424 0 0.0
.bss 165832 165832 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79312 79312 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 248832 248832 0 0.0
.text 2659122 2659122 0 0.0
tv-casting-app debug (read only) 5553801 5553801 0 0.0
(read/write) 162256 162256 0 0.0
.bss 50856 50856 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 102744 102744 0 0.0
.dynamic 608 608 0 0.0
.got 4720 4720 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 343113 343113 0 0.0
.text 4933954 4933954 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2446592 2446592 0 0.0
.bss 215716 215716 0 0.0
.data 5872 5872 0 0.0
.text 1409236 1409236 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1174459 1174459 0 0.0
bss 144660 144660 0 0.0
rodata 141340 141340 0 0.0
text 809524 809524 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1155311 1155311 0 0.0
bss 143896 143896 0 0.0
rodata 133272 133272 0 0.0
text 799228 799228 0 0.0
p6 all-clusters-app default (read/write) 2562256 2562256 0 0.0
.bss 150896 150896 0 0.0
.data 2776 2776 0 0.0
.text 1520520 1520520 0 0.0
all-clusters-minimal-app default (read/write) 2508136 2508136 0 0.0
.bss 150176 150176 0 0.0
.data 2776 2776 0 0.0
.text 1466400 1466400 0 0.0
light-app default (read/write) 2438648 2438648 0 0.0
.bss 142232 142232 0 0.0
.data 2592 2592 0 0.0
.text 1396912 1396912 0 0.0
lock-app default (read/write) 2464928 2464928 0 0.0
.bss 142080 142080 0 0.0
.data 2600 2600 0 0.0
.text 1423192 1423192 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 797756 797756 0 0.0
bss 72336 72336 0 0.0
noinit 40416 40416 0 0.0
text 564512 564508 -4 -0.0
lighting-app tlsr9518adk80d (read/write) 817624 817624 0 0.0
bss 73180 73180 0 0.0
noinit 40416 40416 0 0.0
text 580872 580870 -2 -0.0

@woody-apple woody-apple merged commit 7b3f419 into project-chip:master Jul 1, 2022
@agners agners deleted the improve-no-cipd-setup-try2 branch July 1, 2022 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@andy31415 andy31415 Awaiting requested review from andy31415

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

@woody-apple woody-apple Awaiting requested review from woody-apple

Assignees
No one assigned
Labels
review - approved scripts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@agners @andy31415 @woody-apple