fb618b6e0b
* Remove main deb installation for derived deb build (#16859) * Don't install dependencies of derived debs When "building" a derived deb package, don't install the dependencies of the package into the container. It's not needed at this stage. * Re-add openssh-client and openssh-sftp-server as derived debs Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> (cherry picked from commit9ae77bc2dd) * Re-add missing dependency for derived debs. (#16896) * Re-add missing dependency for derived debs. My previous changed removed the whole dependency on the main deb existing, not just the installation of the main deb. Fix this by readding a dependency on the main deb being built/pulled from cache. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> (cherry picked from commit963d40a77b) * [build] Fix build issue in docker-ptf-sai caused by setuptools_scm new release (#16636) docker-ptf-sai build fails on setuptools_scm's new release on 09/20/2023. Use old version instead. (cherry picked from commitbfa05c8349) --------- Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
22 lines
768 B
Makefile
22 lines
768 B
Makefile
# openssh package
|
|
|
|
OPENSSH_VERSION = 8.4p1-5+deb11u2
|
|
|
|
export OPENSSH_VERSION
|
|
|
|
OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
|
|
$(OPENSSH_SERVER)_SRC_PATH = $(SRC_PATH)/openssh
|
|
$(OPENSSH_SERVER)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_ROUTE3_DEV)
|
|
SONIC_MAKE_DEBS += $(OPENSSH_SERVER)
|
|
|
|
OPENSSH_CLIENT = openssh-client_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
|
|
$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_CLIENT)))
|
|
|
|
OPENSSH_SFTP_SERVER = openssh-sftp-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
|
|
$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SFTP_SERVER)))
|
|
|
|
# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
|
|
# are archived into debug one image to facilitate debugging.
|
|
#
|
|
DBG_SRC_ARCHIVE += openssh
|