This is an automated email from the ASF dual-hosted git repository. sjanc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 6b82531e230cc8ef2f11d777a45ab3e6e91d19a9 Author: Szymon Janc <[email protected]> AuthorDate: Wed Oct 7 10:50:26 2026 +0200 mgmt/mcumgr: Use in-tree mcumgr packages This switches all core packages and applications to mcumgr packages imported in previous commit. Dependencies on @apache-mynewt-mcumgr/cborattr are replaced with @apache-mynewt-core/encoding/cborattr which is still a link to cborattr in apache-mynewt-mcumgr repository. Assisted-by: Claude:claude-opus-5-5 --- apps/bleprph_oic/pkg.yml | 2 +- apps/iptest/pkg.yml | 2 +- apps/ocf_sample/pkg.yml | 2 +- apps/slinky/pkg.yml | 2 +- apps/slinky_oic/pkg.yml | 6 +++--- fs/fs/pkg.yml | 2 +- mgmt/imgmgr/pkg.yml | 2 +- mgmt/mgmt/pkg.yml | 2 +- mgmt/oicmgr/pkg.yml | 4 ++-- mgmt/smp/pkg.yml | 8 ++++---- mgmt/smp/smp_os/pkg.yml | 6 +++--- mgmt/smp/transport/ble/pkg.yml | 2 +- mgmt/smp/transport/smp_shell/pkg.yml | 2 +- net/oic/pkg.yml | 2 +- net/oic/selftest/pkg.yml | 2 +- sys/config/pkg.yml | 4 ++-- sys/log/full/pkg.yml | 6 +++--- sys/log/util/log_cbor_reader/pkg.yml | 2 +- sys/reboot/pkg.yml | 2 +- sys/shell/pkg.yml | 2 +- sys/stats/full/pkg.yml | 2 +- test/crash_test/pkg.yml | 2 +- test/runtest/pkg.yml | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps/bleprph_oic/pkg.yml b/apps/bleprph_oic/pkg.yml index d6847c602..385112390 100644 --- a/apps/bleprph_oic/pkg.yml +++ b/apps/bleprph_oic/pkg.yml @@ -31,7 +31,7 @@ pkg.deps: - "@apache-mynewt-nimble/nimble/host/store/config" - "@apache-mynewt-nimble/nimble/transport" - "@apache-mynewt-core/sys/console" - - "@apache-mynewt-mcumgr/cmd/os_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/os_mgmt" - "@apache-mynewt-core/mgmt/imgmgr" - "@apache-mynewt-core/sys/log" - "@apache-mynewt-core/sys/log/modlog" diff --git a/apps/iptest/pkg.yml b/apps/iptest/pkg.yml index 6b129a775..f961c4a7e 100644 --- a/apps/iptest/pkg.yml +++ b/apps/iptest/pkg.yml @@ -43,4 +43,4 @@ pkg.deps.CONFIG_FCB: pkg.deps.BUILD_WITH_OIC: - "@apache-mynewt-core/net/oic" - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" diff --git a/apps/ocf_sample/pkg.yml b/apps/ocf_sample/pkg.yml index 8ddf56221..e6cdb2b37 100644 --- a/apps/ocf_sample/pkg.yml +++ b/apps/ocf_sample/pkg.yml @@ -27,7 +27,7 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/net/oic" - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/sys/console" - "@apache-mynewt-core/sys/log" - "@apache-mynewt-core/sys/log/modlog" diff --git a/apps/slinky/pkg.yml b/apps/slinky/pkg.yml index 3c1013123..f71da5377 100644 --- a/apps/slinky/pkg.yml +++ b/apps/slinky/pkg.yml @@ -26,7 +26,7 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/test/flash_test" - - "@apache-mynewt-mcumgr/cmd/stat_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/stat_mgmt" - "@apache-mynewt-core/mgmt/imgmgr" - "@apache-mynewt-core/mgmt/smp/transport/smp_shell" - "@apache-mynewt-core/kernel/os" diff --git a/apps/slinky_oic/pkg.yml b/apps/slinky_oic/pkg.yml index f610db918..4e080cb48 100644 --- a/apps/slinky_oic/pkg.yml +++ b/apps/slinky_oic/pkg.yml @@ -25,12 +25,12 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - "@apache-mynewt-mcumgr/mgmt" - - "@apache-mynewt-mcumgr/cmd/stat_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/stat_mgmt" - "@apache-mynewt-core/mgmt/oicmgr" - "@apache-mynewt-core/mgmt/imgmgr" - "@apache-mynewt-core/kernel/os" - - "@apache-mynewt-mcumgr/cmd/os_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/os_mgmt" - "@mcuboot/boot/bootutil" - "@apache-mynewt-core/sys/shell" - "@apache-mynewt-core/sys/config" diff --git a/fs/fs/pkg.yml b/fs/fs/pkg.yml index fc3e1eeaa..4c593502e 100644 --- a/fs/fs/pkg.yml +++ b/fs/fs/pkg.yml @@ -30,6 +30,6 @@ pkg.deps.FS_CLI: - "@apache-mynewt-core/sys/shell" pkg.deps.FS_MGMT: - - "@apache-mynewt-mcumgr/cmd/fs_mgmt/port/mynewt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/fs_mgmt/port/mynewt" pkg.whole_archive: true diff --git a/mgmt/imgmgr/pkg.yml b/mgmt/imgmgr/pkg.yml index 6dabb27ea..7fb05c145 100644 --- a/mgmt/imgmgr/pkg.yml +++ b/mgmt/imgmgr/pkg.yml @@ -27,7 +27,7 @@ pkg.deps: - "@apache-mynewt-core/boot/split" - "@apache-mynewt-core/encoding/base64" - "@apache-mynewt-core/sys/flash_map" - - "@apache-mynewt-mcumgr/cmd/img_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/img_mgmt" pkg.req_apis: - bootloader diff --git a/mgmt/mgmt/pkg.yml b/mgmt/mgmt/pkg.yml index d6c56f3da..4cde92d39 100644 --- a/mgmt/mgmt/pkg.yml +++ b/mgmt/mgmt/pkg.yml @@ -26,4 +26,4 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/encoding/tinycbor" - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" diff --git a/mgmt/oicmgr/pkg.yml b/mgmt/oicmgr/pkg.yml index 784948c5c..4a22d3fb3 100644 --- a/mgmt/oicmgr/pkg.yml +++ b/mgmt/oicmgr/pkg.yml @@ -29,8 +29,8 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/net/oic" - - "@apache-mynewt-mcumgr/omp/port/mynewt" - - "@apache-mynewt-mcumgr/omp" + - "@apache-mynewt-core/mgmt/mcumgr/omp/port/mynewt" + - "@apache-mynewt-core/mgmt/mcumgr/omp" pkg.init: omgr_pkg_init: 'MYNEWT_VAL(OICMGR_SYSINIT_STAGE)' diff --git a/mgmt/smp/pkg.yml b/mgmt/smp/pkg.yml index 616c6410f..a9de1b225 100644 --- a/mgmt/smp/pkg.yml +++ b/mgmt/smp/pkg.yml @@ -24,12 +24,12 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/kernel/os" - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - "@apache-mynewt-core/util/mem" - - "@apache-mynewt-mcumgr/smp" - - "@apache-mynewt-mcumgr/cmd/os_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/smp" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/os_mgmt" pkg.deps.TIMEPERSIST: - "@apache-mynewt-core/time/timepersist" diff --git a/mgmt/smp/smp_os/pkg.yml b/mgmt/smp/smp_os/pkg.yml index 1283430ff..310eadd34 100644 --- a/mgmt/smp/smp_os/pkg.yml +++ b/mgmt/smp/smp_os/pkg.yml @@ -27,10 +27,10 @@ pkg.deps: - "@apache-mynewt-core/hw/hal" - "@apache-mynewt-core/time/datetime" - "@apache-mynewt-core/kernel/os" - - "@apache-mynewt-mcumgr/cmd/os_mgmt" - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/os_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - "@apache-mynewt-core/encoding/tinycbor" - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" pkg.deps.TIMEPERSIST: - "@apache-mynewt-core/time/timepersist" diff --git a/mgmt/smp/transport/ble/pkg.yml b/mgmt/smp/transport/ble/pkg.yml index ff002a0ae..80cac59a6 100644 --- a/mgmt/smp/transport/ble/pkg.yml +++ b/mgmt/smp/transport/ble/pkg.yml @@ -27,7 +27,7 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/kernel/os" - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - "@apache-mynewt-core/mgmt/smp" - "@apache-mynewt-nimble/nimble/host" diff --git a/mgmt/smp/transport/smp_shell/pkg.yml b/mgmt/smp/transport/smp_shell/pkg.yml index 8bad0fc75..9c1bf16c1 100644 --- a/mgmt/smp/transport/smp_shell/pkg.yml +++ b/mgmt/smp/transport/smp_shell/pkg.yml @@ -29,7 +29,7 @@ pkg.deps: - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/sys/shell" - "@apache-mynewt-core/mgmt/smp" - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - "@apache-mynewt-core/encoding/tinycbor" pkg.init: diff --git a/net/oic/pkg.yml b/net/oic/pkg.yml index 53343ecb8..b938f1680 100644 --- a/net/oic/pkg.yml +++ b/net/oic/pkg.yml @@ -24,7 +24,7 @@ pkg.homepage: "https://www.iotivity.org/"; pkg.keywords: pkg.deps: - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/sys/log/modlog" diff --git a/net/oic/selftest/pkg.yml b/net/oic/selftest/pkg.yml index ab8419d70..7d20aac26 100644 --- a/net/oic/selftest/pkg.yml +++ b/net/oic/selftest/pkg.yml @@ -23,7 +23,7 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/net/oic" - "@apache-mynewt-core/sys/console/stub" diff --git a/sys/config/pkg.yml b/sys/config/pkg.yml index 9f7829716..b8df23453 100644 --- a/sys/config/pkg.yml +++ b/sys/config/pkg.yml @@ -28,8 +28,8 @@ pkg.deps: pkg.deps.CONFIG_CLI: - "@apache-mynewt-core/sys/shell" pkg.deps.CONFIG_MGMT: - - "@apache-mynewt-mcumgr/cborattr" - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/encoding/cborattr" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" pkg.deps.CONFIG_FCB: - "@apache-mynewt-core/fs/fcb" pkg.deps.CONFIG_FCB2: diff --git a/sys/log/full/pkg.yml b/sys/log/full/pkg.yml index 4e438c987..a9d2b7913 100644 --- a/sys/log/full/pkg.yml +++ b/sys/log/full/pkg.yml @@ -44,12 +44,12 @@ pkg.deps.LOG_CLI: - "@apache-mynewt-core/util/parse" pkg.deps.LOG_CONSOLE: - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/encoding/tinycbor" pkg.deps.LOG_MGMT: - - "@apache-mynewt-mcumgr/cmd/log_mgmt" - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/log_mgmt" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/encoding/tinycbor" pkg.deps.LOG_FLAGS_IMAGE_HASH: diff --git a/sys/log/util/log_cbor_reader/pkg.yml b/sys/log/util/log_cbor_reader/pkg.yml index c205f8894..89c08eb09 100644 --- a/sys/log/util/log_cbor_reader/pkg.yml +++ b/sys/log/util/log_cbor_reader/pkg.yml @@ -27,7 +27,7 @@ pkg.keywords: - reader pkg.deps: - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/sys/log/common" diff --git a/sys/reboot/pkg.yml b/sys/reboot/pkg.yml index 649df3d10..6df8c4baa 100644 --- a/sys/reboot/pkg.yml +++ b/sys/reboot/pkg.yml @@ -31,7 +31,7 @@ pkg.deps: - "@apache-mynewt-core/sys/flash_map" - "@apache-mynewt-core/sys/log/modlog" - "@apache-mynewt-core/encoding/tinycbor" - - "@apache-mynewt-mcumgr/cmd/img_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/img_mgmt" - "@mcuboot/boot/bootutil" pkg.deps.(REBOOT_LOG_FCB && LOG_FCB): diff --git a/sys/shell/pkg.yml b/sys/shell/pkg.yml index c2684ede7..e4856a52e 100644 --- a/sys/shell/pkg.yml +++ b/sys/shell/pkg.yml @@ -29,7 +29,7 @@ pkg.deps: - "@apache-mynewt-core/util/streamer" pkg.deps.SHELL_MGMT: - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - "@apache-mynewt-core/encoding/base64" - "@apache-mynewt-core/util/crc" diff --git a/sys/stats/full/pkg.yml b/sys/stats/full/pkg.yml index fc320c7bb..b0c3df119 100644 --- a/sys/stats/full/pkg.yml +++ b/sys/stats/full/pkg.yml @@ -31,7 +31,7 @@ pkg.apis: pkg.deps.STATS_CLI: - "@apache-mynewt-core/sys/shell" pkg.deps.STATS_MGMT: - - "@apache-mynewt-mcumgr/cmd/stat_mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/cmd/stat_mgmt" pkg.whole_archive: true diff --git a/test/crash_test/pkg.yml b/test/crash_test/pkg.yml index 110929da6..02ed822a8 100644 --- a/test/crash_test/pkg.yml +++ b/test/crash_test/pkg.yml @@ -29,7 +29,7 @@ pkg.req_apis.CRASH_TEST_CLI: pkg.deps.CRASH_TEST_MGMT: - "@apache-mynewt-core/mgmt/mgmt" - "@apache-mynewt-core/encoding/json" - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" pkg.whole_archive: true diff --git a/test/runtest/pkg.yml b/test/runtest/pkg.yml index 8add65563..e3f922824 100644 --- a/test/runtest/pkg.yml +++ b/test/runtest/pkg.yml @@ -23,12 +23,12 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - "@apache-mynewt-mcumgr/cborattr" + - "@apache-mynewt-core/encoding/cborattr" - "@apache-mynewt-core/util/taskpool" pkg.deps.RUNTEST_CLI: - "@apache-mynewt-core/sys/shell" pkg.deps.RUNTEST_MGMT: - - "@apache-mynewt-mcumgr/mgmt" + - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - "@apache-mynewt-core/encoding/json" - "@apache-mynewt-core/test/testutil" pkg.deps.RUNTEST_LOG:
