mirror of
				https://github.com/Telecominfraproject/ols-nos.git
				synced 2025-10-30 17:48:09 +00:00 
			
		
		
		
	[Build] Fix krb5 package not found issue (#17926)
Why I did it Fix the build issue caused by the wrong version specified. See the build error logs: Try 4: /usr/bin/wget --retry-connrefused failed to get: -O --2024-01-26 11:38:23-- https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.10/amd64/libk5crypto3_1.18.3-6+deb11u14+fips_amd64.deb Resolving sonicstorage.blob.core.windows.net (sonicstorage.blob.core.windows.net)... 20.60.59.131 Connecting to sonicstorage.blob.core.windows.net (sonicstorage.blob.core.windows.net)|20.60.59.131|:443... connected. HTTP request sent, awaiting response... 404 The specified blob does not exist. 2024-01-26 11:38:23 ERROR 404: The specified blob does not exist.. Try 5: /usr/bin/wget --retry-connrefused failed to get: -O make[1]: *** [Makefile:12: /sonic/target/debs/bullseye/symcrypt-openssl_0.10_amd64.deb] Error 8 make[1]: Leaving directory '/sonic/src/sonic-fips' Work item tracking Microsoft ADO (number only): 26577929 The package not installed but PR passed issue is traced in another issue #17927 How I did it Add the libkrb5-dev and the depended packages to fix docker-sonic-vs build failure. The package libzmq3-dev has dependency on the libkrb5-dev.
This commit is contained in:
		| @@ -34,6 +34,10 @@ else | |||||||
| $(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP) | $(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP) | ||||||
| endif | endif | ||||||
|  |  | ||||||
|  | ifeq ($(INCLUDE_FIPS), y) | ||||||
|  | $(DOCKER_SONIC_VS)_DEPENDS += $(FIPS_KRB5_ALL) | ||||||
|  | endif | ||||||
|  |  | ||||||
| $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \ | $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \ | ||||||
|                             $(ARP_UPDATE_SCRIPT) \ |                             $(ARP_UPDATE_SCRIPT) \ | ||||||
|                             $(ARP_UPDATE_VARS_TEMPLATE) \ |                             $(ARP_UPDATE_VARS_TEMPLATE) \ | ||||||
|   | |||||||
| @@ -38,7 +38,6 @@ RUN apt-get install -y net-tools \ | |||||||
|                        iptables \ |                        iptables \ | ||||||
|                        jq \ |                        jq \ | ||||||
|                        libzmq5 \ |                        libzmq5 \ | ||||||
|                        libzmq3-dev \ |  | ||||||
|                        uuid-dev \ |                        uuid-dev \ | ||||||
|                        # For installing Python m2crypto package |                        # For installing Python m2crypto package | ||||||
|                        # (these can be uninstalled after installation) |                        # (these can be uninstalled after installation) | ||||||
| @@ -64,7 +63,11 @@ RUN apt-get install -y net-tools \ | |||||||
|                        libasan6 \ |                        libasan6 \ | ||||||
|                        {%- endif %} |                        {%- endif %} | ||||||
|                        dbus \ |                        dbus \ | ||||||
|                        redis-server |                        redis-server \ | ||||||
|  |                        # For libkrb5-dev | ||||||
|  |                        comerr-dev \ | ||||||
|  |                        libgssrpc4 \ | ||||||
|  |                        libkdb5-10 | ||||||
|  |  | ||||||
| # For sonic-config-engine Python 3 package | # For sonic-config-engine Python 3 package | ||||||
| # Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed. | # Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed. | ||||||
| @@ -88,6 +91,8 @@ COPY {%- for deb in docker_sonic_vs_debs.split(' ') %} debs/{{ deb }}{%- endfor | |||||||
| RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; {%- for deb in docker_sonic_vs_debs.split(' ') %} dpkg_apt /debs/{{ deb }};{%- endfor %} | RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; {%- for deb in docker_sonic_vs_debs.split(' ') %} dpkg_apt /debs/{{ deb }};{%- endfor %} | ||||||
| {%- endif %} | {%- endif %} | ||||||
|  |  | ||||||
|  | RUN apt-get install -y libzmq3-dev | ||||||
|  |  | ||||||
| {% if docker_sonic_vs_pydebs.strip() -%} | {% if docker_sonic_vs_pydebs.strip() -%} | ||||||
| # Copy locally-built Debian package dependencies | # Copy locally-built Debian package dependencies | ||||||
| COPY {%- for deb in docker_sonic_vs_pydebs.split(' ') %} python-debs/{{ deb }}{%- endfor %} /debs/ | COPY {%- for deb in docker_sonic_vs_pydebs.split(' ') %} python-debs/{{ deb }}{%- endfor %} /debs/ | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ FIPS_PYTHON_MAIN_VERSION = 3.9 | |||||||
| FIPS_PYTHON_VERSION = 3.9.2-1+fips | FIPS_PYTHON_VERSION = 3.9.2-1+fips | ||||||
| FIPS_GOLANG_MAIN_VERSION = 1.15 | FIPS_GOLANG_MAIN_VERSION = 1.15 | ||||||
| FIPS_GOLANG_VERSION = 1.15.15-1~deb11u4+fips | FIPS_GOLANG_VERSION = 1.15.15-1~deb11u4+fips | ||||||
| FIPS_KRB5_VERSION = 1.18.3-6+deb11u14+fips | FIPS_KRB5_VERSION = 1.18.3-6+deb11u4+fips | ||||||
| FIPS_URL_PREFIX = https://sonicstorage.blob.core.windows.net/public/fips/$(BLDENV)/$(FIPS_VERSION)/$(CONFIGURED_ARCH) | FIPS_URL_PREFIX = https://sonicstorage.blob.core.windows.net/public/fips/$(BLDENV)/$(FIPS_VERSION)/$(CONFIGURED_ARCH) | ||||||
|  |  | ||||||
| SYMCRYPT_OPENSSL_NAME = symcrypt-openssl | SYMCRYPT_OPENSSL_NAME = symcrypt-openssl | ||||||
| @@ -40,7 +40,15 @@ FIPS_GOLANG_DOC = golang-$(FIPS_GOLANG_MAIN_VERSION)-doc_$(FIPS_GOLANG_VERSION)_ | |||||||
| FIPS_GOLANG_ALL = $(FIPS_GOLANG) $(FIPS_GOLANG_GO) $(FIPS_GOLANG_SRC) $(FIPS_GOLANG_DOC) | FIPS_GOLANG_ALL = $(FIPS_GOLANG) $(FIPS_GOLANG_GO) $(FIPS_GOLANG_SRC) $(FIPS_GOLANG_DOC) | ||||||
|  |  | ||||||
| FIPS_KRB5 = libk5crypto3_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | FIPS_KRB5 = libk5crypto3_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
| FIPS_KRB5_ALL = $(FIPS_KRB5) | FIPS_KRB5_SUPPORT0 = libkrb5support0_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_3 = libkrb5-3_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_LIBGSSAPI = libgssapi-krb5-2_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_LIBKADM5CLNT = libkadm5clnt-mit12_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_LIBKADM5SRV = libkadm5srv-mit12_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_LIBGSSRPC4 = libgssrpc4_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_MULTIDEV = krb5-multidev_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_DEV = libkrb5-dev_$(FIPS_KRB5_VERSION)_$(CONFIGURED_ARCH).deb | ||||||
|  | FIPS_KRB5_ALL = $(FIPS_KRB5) $(FIPS_KRB5_SUPPORT0) $(FIPS_KRB5_3) $(FIPS_KRB5_LIBGSSAPI) $(FIPS_KRB5_LIBKADM5CLNT) $(FIPS_KRB5_LIBKADM5SRV) $(FIPS_KRB5_LIBGSSRPC4) $(FIPS_KRB5_MULTIDEV) $(FIPS_KRB5_DEV) | ||||||
|  |  | ||||||
| FIPS_DERIVED_TARGET = $(FIPS_OPENSSL_ALL) $(FIPS_OPENSSH_ALL) $(FIPS_GOLANG_ALL) $(FIPS_PYTHON_ALL) $(FIPS_KRB5_ALL) | FIPS_DERIVED_TARGET = $(FIPS_OPENSSL_ALL) $(FIPS_OPENSSH_ALL) $(FIPS_GOLANG_ALL) $(FIPS_PYTHON_ALL) $(FIPS_KRB5_ALL) | ||||||
| FIPS_PACKAGE_ALL = $(SYMCRYPT_OPENSSL) $(FIPS_DERIVED_TARGET) | FIPS_PACKAGE_ALL = $(SYMCRYPT_OPENSSL) $(FIPS_DERIVED_TARGET) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 xumia
					xumia