3b89e5d467
As part of consolidating all common Python-based functionality into the new sonic-py-common package, this pull request: 1. Redirects all Python applications/scripts in sonic-buildimage repo which previously imported sonic_device_util or sonic_daemon_base to instead import sonic-py-common, which was added in https://github.com/Azure/sonic-buildimage/pull/5003 2. Replaces all calls to `sonic_device_util.get_platform_info()` to instead call `sonic_py_common.get_platform()` and removes any calls to `sonic_device_util.get_machine_info()` which are no longer necessary (i.e., those which were only used to pass the results to `sonic_device_util.get_platform_info()`. 3. Removes unused imports to the now-deprecated sonic-daemon-base package and sonic_device_util.py module This is the next step toward resolving https://github.com/Azure/sonic-buildimage/issues/4999 Also reverted my previous change in which device_info.get_platform() would first try obtaining the platform ID string from Config DB and fall back to gathering it from machine.conf upon failure because this function is called by sonic-cfggen before the data is in the DB, in which case, the db_connect() call will hang indefinitely, which was not the behavior I expected. As of now, the function will always reference machine.conf.
25 lines
1.1 KiB
Makefile
25 lines
1.1 KiB
Makefile
# sonic utilities package
|
|
#
|
|
# NOTE: sonic-config-engine is a build-time dependency of sonic-utilities
|
|
# due to unit tests which are run during the build. However,
|
|
# sonic-platform-common and swsssdk are runtime dependencies, and should be
|
|
# added here also. However, the current build system assumes all runtime
|
|
# dependencies are .deb packages.
|
|
#
|
|
# TODO: Create a way to specify both .deb and .whl runtime dependencies
|
|
# then add the aforementioned runtime dependencies here.
|
|
#
|
|
|
|
SONIC_UTILS = python-sonic-utilities_1.2-1_all.deb
|
|
$(SONIC_UTILS)_SRC_PATH = $(SRC_PATH)/sonic-utilities
|
|
$(SONIC_UTILS)_DEBS_DEPENDS = $(LIBYANG) \
|
|
$(LIBYANG_CPP) \
|
|
$(LIBYANG_PY2) \
|
|
$(LIBYANG_PY3)
|
|
$(SONIC_UTILS)_WHEEL_DEPENDS = $(SONIC_PY_COMMON_PY2) \
|
|
$(SONIC_PY_COMMON_PY3) \
|
|
$(SONIC_CONFIG_ENGINE) \
|
|
$(SONIC_YANG_MGMT_PY) \
|
|
$(SONIC_YANG_MODELS_PY3)
|
|
SONIC_PYTHON_STDEB_DEBS += $(SONIC_UTILS)
|