matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58dcf7f6fc
sonic-buildimage/rules/openssh.mk

22 lines
768 B
Makefile
Raw Normal View History

[openssh] Introduce custom openssh-server package for supporting reverse console SSH (#5717) * Build and install openssh from source * Copy openssh deb package to dest folder * Update make rule * Update sonic debian extension * Append empty line before EOF * Update openssh patch * Add openssh-server to base image dependency * Fix indent type * Fix comments * Use commit id instead of tag id and add comment Signed-off-by: Jing Kan jika@microsoft.com
2020-11-01 20:31:15 -06:00
# openssh package
[baseimage]: Update openssh to 1:8.4p1-5+deb11u2 (#16826) Openssh in Debian Bullseye has been updated to 1:8.4p1-5+deb11u2 to fix CVE-2023-38408. Since we're building openssh with some patches, we need to update our version as well. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2023-10-11 12:42:20 -05:00
OPENSSH_VERSION = 8.4p1-5+deb11u2
[openssh] Introduce custom openssh-server package for supporting reverse console SSH (#5717) * Build and install openssh from source * Copy openssh deb package to dest folder * Update make rule * Update sonic debian extension * Append empty line before EOF * Update openssh patch * Add openssh-server to base image dependency * Fix indent type * Fix comments * Use commit id instead of tag id and add comment Signed-off-by: Jing Kan jika@microsoft.com
2020-11-01 20:31:15 -06:00
export OPENSSH_VERSION
OPENSSH_SERVER = openssh-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
$(OPENSSH_SERVER)_SRC_PATH = $(SRC_PATH)/openssh
[openssh] Update openssh make file, add missing dependency to libnl. (#12327) Update openssh make file, add missing dependency to libnl. #### Why I did it Openssh indirectly depends on libnl. Another PR #12447 need add new patch to openssh, after adding new patch to openssh, PR build failed with libnl missing error. #### How I did it Update openssh make file, add missing dependency to libnl. #### How to verify it Pass all test case #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 #### Description for the changelog Update openssh make file, add missing dependency to libnl. #### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
2022-10-24 00:03:52 -05:00
$(OPENSSH_SERVER)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_ROUTE3_DEV)
[openssh] Introduce custom openssh-server package for supporting reverse console SSH (#5717) * Build and install openssh from source * Copy openssh deb package to dest folder * Update make rule * Update sonic debian extension * Append empty line before EOF * Update openssh patch * Add openssh-server to base image dependency * Fix indent type * Fix comments * Use commit id instead of tag id and add comment Signed-off-by: Jing Kan jika@microsoft.com
2020-11-01 20:31:15 -06:00
SONIC_MAKE_DEBS += $(OPENSSH_SERVER)
[baseimage]: Update openssh to 1:8.4p1-5+deb11u2 (#16826) Openssh in Debian Bullseye has been updated to 1:8.4p1-5+deb11u2 to fix CVE-2023-38408. Since we're building openssh with some patches, we need to update our version as well. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2023-10-11 12:42:20 -05:00
OPENSSH_CLIENT = openssh-client_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
[202305] Backport PRs to fix build (#16896, #16859, #16636) (#16934) * 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 commit 9ae77bc2dd636cd50413c3a97a83cfb2775a0e65) * 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 commit 963d40a77baa47ed36d12d8964623112a95f627e) * [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 commit bfa05c83498dbc6869ee5e22c496778db790c020) --------- Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
2023-10-20 02:39:54 -05:00
$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_CLIENT)))
[baseimage]: Update openssh to 1:8.4p1-5+deb11u2 (#16826) Openssh in Debian Bullseye has been updated to 1:8.4p1-5+deb11u2 to fix CVE-2023-38408. Since we're building openssh with some patches, we need to update our version as well. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2023-10-11 12:42:20 -05:00
OPENSSH_SFTP_SERVER = openssh-sftp-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb
[202305] Backport PRs to fix build (#16896, #16859, #16636) (#16934) * 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 commit 9ae77bc2dd636cd50413c3a97a83cfb2775a0e65) * 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 commit 963d40a77baa47ed36d12d8964623112a95f627e) * [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 commit bfa05c83498dbc6869ee5e22c496778db790c020) --------- Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
2023-10-20 02:39:54 -05:00
$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SFTP_SERVER)))
[baseimage]: Update openssh to 1:8.4p1-5+deb11u2 (#16826) Openssh in Debian Bullseye has been updated to 1:8.4p1-5+deb11u2 to fix CVE-2023-38408. Since we're building openssh with some patches, we need to update our version as well. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2023-10-11 12:42:20 -05:00
[openssh] Introduce custom openssh-server package for supporting reverse console SSH (#5717) * Build and install openssh from source * Copy openssh deb package to dest folder * Update make rule * Update sonic debian extension * Append empty line before EOF * Update openssh patch * Add openssh-server to base image dependency * Fix indent type * Fix comments * Use commit id instead of tag id and add comment Signed-off-by: Jing Kan jika@microsoft.com
2020-11-01 20:31:15 -06:00
# 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
Reference in New Issue Copy Permalink