|
54 | 54 | # * ENABLE_BOOTCHART: Enable SONiC bootchart
|
55 | 55 | # * Default: n
|
56 | 56 | # * Values: y,n
|
57 |
| -# * GZ_COMPRESS_PROGRAM: Select pigz to reduce build time |
58 |
| -# * Default: gzip |
59 |
| -# * Values: pigz,gzip |
60 | 57 | # * UNATTENDED: Don't wait for interactive input from terminal, setting this
|
61 | 58 | # * value to anything will enable it
|
62 | 59 | # * Default: unset
|
@@ -157,10 +154,6 @@ ifeq ($(LEGACY_SONIC_MGMT_DOCKER),)
|
157 | 154 | override LEGACY_SONIC_MGMT_DOCKER = y
|
158 | 155 | endif
|
159 | 156 |
|
160 |
| -ifneq ($(GZ_COMPRESS_PROGRAM), pigz) |
161 |
| -override GZ_COMPRESS_PROGRAM = gzip |
162 |
| -endif |
163 |
| - |
164 | 157 | ifeq ($(CONFIGURED_ARCH),amd64)
|
165 | 158 | SLAVE_BASE_IMAGE = $(SLAVE_DIR)
|
166 | 159 | MULTIARCH_QEMU_ENVIRON = n
|
@@ -229,7 +222,6 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
|
229 | 222 | INCLUDE_FIPS=$(INCLUDE_FIPS) \
|
230 | 223 | DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) \
|
231 | 224 | DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
|
232 |
| - GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \ |
233 | 225 | j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
|
234 | 226 |
|
235 | 227 | $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
|
@@ -587,7 +579,6 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
|
587 | 579 | SONIC_SLAVE_DOCKER_DRIVER=$(SONIC_SLAVE_DOCKER_DRIVER) \
|
588 | 580 | MIRROR_URLS=$(MIRROR_URLS) \
|
589 | 581 | MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
|
590 |
| - GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \ |
591 | 582 | MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
|
592 | 583 | SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
|
593 | 584 | ONIE_IMAGE_PART_SIZE=$(ONIE_IMAGE_PART_SIZE) \
|
|
0 commit comments