[build]: add buster docker as the last step of the build proces
- build SONIC_STRETCH_DOCKERS in sonic-slave-stretch docker - build image related module in sonic-slave-buster docker. This includes all kernels modules and some packages Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
Guohan Lu
parent
358d93eeb5
commit
01cb7934b0
18
Makefile
18
Makefile
@ -1,13 +1,17 @@
|
||||
# SONiC make file
|
||||
|
||||
NOJESSIE ?= 0
|
||||
NOSTRETCH ?= 0
|
||||
|
||||
%::
|
||||
@echo "+++ --- Making $@ --- +++"
|
||||
ifeq ($(NOJESSIE), 0)
|
||||
EXTRA_JESSIE_TARGETS=$(notdir $@) make -f Makefile.work jessie
|
||||
EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie
|
||||
endif
|
||||
BLDENV=stretch make -f Makefile.work $@
|
||||
ifeq ($(NOSTRETCH), 0)
|
||||
EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
|
||||
endif
|
||||
BLDENV=buster make -f Makefile.work $@
|
||||
|
||||
jessie:
|
||||
@echo "+++ Making $@ +++"
|
||||
@ -15,12 +19,18 @@ ifeq ($(NOJESSIE), 0)
|
||||
make -f Makefile.work jessie
|
||||
endif
|
||||
|
||||
buster:
|
||||
BLDENV=buster make -f Makefile.work
|
||||
stretch:
|
||||
@echo "+++ Making $@ +++"
|
||||
ifeq ($(NOSTRETCH), 0)
|
||||
make -f Makefile.work stretch
|
||||
endif
|
||||
|
||||
clean reset init configure showtag sonic-slave-build sonic-slave-bash :
|
||||
@echo "+++ Making $@ +++"
|
||||
ifeq ($(NOJESSIE), 0)
|
||||
make -f Makefile.work $@
|
||||
endif
|
||||
ifeq ($(NOSTRETCH), 0)
|
||||
BLDENV=stretch make -f Makefile.work $@
|
||||
endif
|
||||
BLDENV=buster make -f Makefile.work $@
|
||||
|
||||
@ -200,7 +200,7 @@ SONIC_BUILD_INSTRUCTION := make \
|
||||
HTTPS_PROXY=$(https_proxy) \
|
||||
SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) \
|
||||
SONIC_ENABLE_RESTAPI=$(ENABLE_RESTAPI) \
|
||||
EXTRA_JESSIE_TARGETS=$(EXTRA_JESSIE_TARGETS) \
|
||||
EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
|
||||
BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
|
||||
$(SONIC_OVERRIDE_BUILD_VARS)
|
||||
|
||||
|
||||
@ -35,9 +35,9 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
|
||||
# Version name differs between ARCH, copying same version as in sonic-slave docker
|
||||
DOCKER_VERSION=18.06.3~ce~3-0~debian
|
||||
else
|
||||
DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
|
||||
DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
|
||||
fi
|
||||
LINUX_KERNEL_VERSION=4.9.0-11-2
|
||||
LINUX_KERNEL_VERSION=4.19.0-6
|
||||
|
||||
## Working directory to prepare the file system
|
||||
FILESYSTEM_ROOT=./fsroot
|
||||
@ -81,9 +81,9 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
|
||||
# qemu arm bin executable for cross-building
|
||||
sudo mkdir -p $FILESYSTEM_ROOT/usr/bin
|
||||
sudo cp /usr/bin/qemu*static $FILESYSTEM_ROOT/usr/bin || true
|
||||
sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH stretch $FILESYSTEM_ROOT http://deb.debian.org/debian
|
||||
sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://deb.debian.org/debian
|
||||
else
|
||||
sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH stretch $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
|
||||
sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
|
||||
fi
|
||||
|
||||
## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
|
||||
@ -203,9 +203,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add /tmp/docker.gpg
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
|
||||
"deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian stretch stable"
|
||||
"$deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian $IMAGE_DISTRO stable"
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
|
||||
|
||||
if [ "$INSTALL_KUBERNETES" == "y" ]
|
||||
@ -325,9 +325,9 @@ sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
|
||||
sudo LANG=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT update-locale "LANG=en_US.UTF-8"
|
||||
sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -name 'en_US' -type f -exec rm -f {} +"
|
||||
|
||||
# Install certain fundamental packages from stretch-backports in order to get
|
||||
# Install certain fundamental packages from $IMAGE_DISTRO-backports in order to get
|
||||
# more up-to-date (but potentially less stable) versions
|
||||
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t stretch-backports install \
|
||||
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
|
||||
picocom
|
||||
|
||||
if [[ $CONFIGURED_ARCH == amd64 ]]; then
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
## Debian mirror on Microsoft Azure
|
||||
## Ref: http://debian-archive.trafficmanager.net/
|
||||
|
||||
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
|
||||
deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
|
||||
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
|
||||
deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
|
||||
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free
|
||||
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
|
||||
deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
|
||||
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
|
||||
deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
|
||||
deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
## Debian mirror for ARM
|
||||
## Not the repo mirror site can change in future, and needs to be updated to be in sync
|
||||
|
||||
deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free
|
||||
deb-src [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free
|
||||
deb [arch=arm64] http://deb.debian.org/debian stretch-updates main contrib non-free
|
||||
deb-src [arch=arm64] http://deb.debian.org/debian stretch-updates main contrib non-free
|
||||
deb [arch=arm64] http://ftp.debian.org/debian stretch-backports main
|
||||
deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
|
||||
deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
|
||||
deb [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
|
||||
deb-src [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
|
||||
deb [arch=arm64] http://ftp.debian.org/debian buster-backports main
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
## Debian mirror for ARM
|
||||
## Not the repo mirror site can change in future, and needs to be updated to be in sync
|
||||
|
||||
deb [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free
|
||||
deb-src [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free
|
||||
deb [arch=armhf] http://deb.debian.org/debian stretch-updates main contrib non-free
|
||||
deb-src [arch=armhf] http://deb.debian.org/debian stretch-updates main contrib non-free
|
||||
deb [arch=armhf] http://ftp.debian.org/debian stretch-backports main
|
||||
deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
|
||||
deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
|
||||
deb [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
|
||||
deb-src [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
|
||||
deb [arch=armhf] http://ftp.debian.org/debian buster-backports main
|
||||
|
||||
@ -606,12 +606,12 @@ menuentry '$demo_grub_entry' {
|
||||
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
|
||||
insmod part_msdos
|
||||
insmod ext2
|
||||
linux /$image_dir/boot/vmlinuz-4.9.0-11-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
|
||||
linux /$image_dir/boot/vmlinuz-4.19.0-6-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
|
||||
net.ifnames=0 biosdevname=0 \
|
||||
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
|
||||
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
|
||||
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
|
||||
initrd /$image_dir/boot/initrd.img-4.9.0-11-2-amd64
|
||||
initrd /$image_dir/boot/initrd.img-4.19.0-6-amd64
|
||||
}
|
||||
EOF
|
||||
|
||||
|
||||
@ -6,5 +6,3 @@ BFN_MODULE = bfn-modules_$(VERSION)_amd64.deb
|
||||
$(BFN_MODULE)_SRC_PATH = $(PLATFORM_PATH)/bfn-modules
|
||||
$(BFN_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
SONIC_DPKG_DEBS += $(BFN_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(BFN_MODULE)
|
||||
|
||||
@ -21,5 +21,3 @@ $(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODU
|
||||
export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON2 ARISTA_PLATFORM_MODULE_PYTHON3 ARISTA_PLATFORM_MODULE_DRIVERS
|
||||
|
||||
export ARISTA_SCD_DRIVER_CONFIG=m
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ARISTA_PLATFORM_MODULE)
|
||||
|
||||
@ -9,5 +9,3 @@ $(BFN_MONTARA_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-module
|
||||
$(BFN_MONTARA_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(BFN_MONTARA_PLATFORM_MODULE)_PLATFORM = x86_64-accton_wedge100bf_32x-r0
|
||||
SONIC_DPKG_DEBS += $(BFN_MONTARA_PLATFORM_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(BFN_MONTARA_PLATFORM_MODULE)
|
||||
|
||||
@ -9,5 +9,3 @@ $(BFN_NEWPORT_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-module
|
||||
$(BFN_NEWPORT_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(BFN_NEWPORT_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as9516bf_32d-r0
|
||||
SONIC_DPKG_DEBS += $(BFN_NEWPORT_PLATFORM_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(BFN_NEWPORT_PLATFORM_MODULE)
|
||||
|
||||
@ -10,4 +10,3 @@ $(BFN_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(BFN_PLATFORM_MODULE)_PLATFORM = x86_64-accton_wedge100bf_65x-r0
|
||||
SONIC_DPKG_DEBS += $(BFN_PLATFORM_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(BFN_PLATFORM_MODULE)
|
||||
|
||||
@ -17,4 +17,3 @@ $(INGRASYS_S9280_64X_PLATFORM_MODULE)_PLATFORM = x86_64-ingrasys_s9280_64x-r0
|
||||
|
||||
$(eval $(call add_extra_package,$(INGRASYS_S9180_32X_PLATFORM_MODULE),$(INGRASYS_S9280_64X_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(INGRASYS_S9180_32X_PLATFORM_MODULE)
|
||||
|
||||
@ -10,4 +10,3 @@ $(WNC_OSW1800_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMO
|
||||
$(WNC_OSW1800_PLATFORM_MODULE)_PLATFORM = x86_64-wnc_osw1800-r0
|
||||
SONIC_DPKG_DEBS += $(WNC_OSW1800_PLATFORM_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(WNC_OSW1800_PLATFORM_MODULE)
|
||||
|
||||
@ -111,5 +111,3 @@ $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS
|
||||
ACCTON_AS7315_27XB_PLATFORM_MODULE = sonic-platform-accton-as7315-27xb_$(ACCTON_AS7315_27XB_PLATFORM_MODULE_VERSION)_amd64.deb
|
||||
$(ACCTON_AS7315_27XB_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as7315_27xb-r0
|
||||
$(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS7315_27XB_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ACCTON_AS7712_32X_PLATFORM_MODULE)
|
||||
|
||||
@ -16,6 +16,5 @@ ALPHANETWORKS_SNH60B0_640F_PLATFORM_MODULE = sonic-platform-alphanetworks-snh60b
|
||||
$(ALPHANETWORKS_SNH60B0_640F_PLATFORM_MODULE)_PLATFORM = x86_64-alphanetworks_snh60b0_640f-r0
|
||||
$(eval $(call add_extra_package,$(ALPHANETWORKS_SNH60A0_320FV2_PLATFORM_MODULE),$(ALPHANETWORKS_SNH60B0_640F_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ALPHANETWORKS_SNH60A0_320FV2_PLATFORM_MODULE)
|
||||
|
||||
|
||||
|
||||
@ -22,4 +22,3 @@ export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON2 ARISTA_PLATFORM_MOD
|
||||
|
||||
export ARISTA_SCD_DRIVER_CONFIG=m
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ARISTA_PLATFORM_MODULE)
|
||||
|
||||
@ -12,4 +12,3 @@ SONIC_MAKE_DEBS += $(BRCM_XLR_GTS_PLATFORM_MODULE)
|
||||
|
||||
export BRCM_XLR_GTS_PLATFORM_MODULE
|
||||
|
||||
SONIC_STRETCH_DEBS += $(BRCM_XLR_GTS_PLATFORM_MODULE)
|
||||
|
||||
@ -28,4 +28,3 @@ CEL_SILVERSTONE_PLATFORM_MODULE = platform-modules-silverstone_$(CEL_SILVERSTONE
|
||||
$(CEL_SILVERSTONE_PLATFORM_MODULE)_PLATFORM = x86_64-cel_silverstone-r0
|
||||
$(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_SILVERSTONE_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(CEL_DX010_PLATFORM_MODULE)
|
||||
|
||||
@ -46,7 +46,6 @@ $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_Z9332F_PLAT
|
||||
DELL_S5248F_PLATFORM_MODULE = platform-modules-s5248f_$(DELL_S5248F_PLATFORM_MODULE_VERSION)_amd64.deb
|
||||
$(DELL_S5248F_PLATFORM_MODULE)_PLATFORM = x86_64-dellemc_s5248f_c3538-r0
|
||||
$(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S5248F_PLATFORM_MODULE)))
|
||||
SONIC_STRETCH_DEBS += $(DELL_Z9100_PLATFORM_MODULE)
|
||||
|
||||
#flashrom tool
|
||||
$(shell ./$(PLATFORM_PATH)/sonic-platform-modules-dell/tools/flashrom.sh > /dev/null 2>&1)
|
||||
|
||||
@ -34,4 +34,3 @@ DELTA_AG9032V2A_PLATFORM_MODULE = platform-modules-ag9032v2a_$(DELTA_AG9032V2A_P
|
||||
$(DELTA_AG9032V2A_PLATFORM_MODULE)_PLATFORM = x86_64-delta_ag9032v2a-r0
|
||||
$(eval $(call add_extra_package,$(DELTA_AG9032V1_PLATFORM_MODULE),$(DELTA_AG9032V2A_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(DELTA_AG9032V1_PLATFORM_MODULE)
|
||||
|
||||
@ -35,4 +35,3 @@ $(eval $(call add_extra_package,$(INGRASYS_S9100_PLATFORM_MODULE),$(INGRASYS_S89
|
||||
$(eval $(call add_extra_package,$(INGRASYS_S9100_PLATFORM_MODULE),$(INGRASYS_S8810_32Q_PLATFORM_MODULE)))
|
||||
$(eval $(call add_extra_package,$(INGRASYS_S9100_PLATFORM_MODULE),$(INGRASYS_S9200_64X_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(INGRASYS_S9100_PLATFORM_MODULE)
|
||||
|
||||
@ -40,4 +40,3 @@ INVENTEC_D7264Q28B_PLATFORM_MODULE = platform-modules-d7264q28b_$(INVENTEC_D7264
|
||||
$(INVENTEC_D7264Q28B_PLATFORM_MODULE)_PLATFORM = x86_64-inventec_d7264q28b-r0
|
||||
$(eval $(call add_extra_package,$(INVENTEC_D7032Q28B_PLATFORM_MODULE),$(INVENTEC_D7264Q28B_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(INVENTEC_D7032Q28B_PLATFORM_MODULE)
|
||||
|
||||
@ -16,5 +16,3 @@ JUNIPER_QFX5200_PLATFORM_MODULE = sonic-platform-juniper-qfx5200_$(JUNIPER_QFX52
|
||||
$(JUNIPER_QFX5200_PLATFORM_MODULE)_PLATFORM = x86_64-juniper_qfx5200-r0
|
||||
|
||||
$(eval $(call add_extra_package,$(JUNIPER_QFX5210_PLATFORM_MODULE),$(JUNIPER_QFX5200_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(JUNIPER_QFX5210_PLATFORM_MODULE)
|
||||
|
||||
@ -10,4 +10,3 @@ $(MITAC_LY1200_32X_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_
|
||||
$(MITAC_LY1200_32X_PLATFORM_MODULE)_PLATFORM = x86_64-mitac_ly1200_b32h0_c3-r0
|
||||
SONIC_DPKG_DEBS += $(MITAC_LY1200_32X_PLATFORM_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(MITAC_LY1200_32X_PLATFORM_MODULE)
|
||||
|
||||
@ -34,4 +34,3 @@ QUANTA_IX9_32X_PLATFORM_MODULE = sonic-platform-quanta-ix9-32x_$(QUANTA_IX9_32X_
|
||||
$(QUANTA_IX9_32X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix9_bwde-r0
|
||||
$(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX9_32X_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(QUANTA_IX1B_32X_PLATFORM_MODULE)
|
||||
|
||||
@ -8,4 +8,3 @@ $(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
|
||||
$(BRCM_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(BRCM_OPENNSL_KERNEL)
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
CAVM_PLATFORM_DEB = cavm_platform_modules.deb
|
||||
$(CAVM_PLATFORM_DEB)_SRC_PATH = $(PLATFORM_PATH)/cavm_platform_modules
|
||||
SONIC_MAKE_DEBS += $(CAVM_PLATFORM_DEB)
|
||||
SONIC_STRETCH_DEBS += $(CAVM_PLATFORM_DEB)
|
||||
|
||||
@ -4,4 +4,3 @@ CAVM_XPNET_DEB = xp80-Pcie-Endpoint.deb
|
||||
$(CAVM_XPNET_DEB)_URL = $(CAVM_SAI_URL)/netdev/$(CAVM_XPNET_DEB)
|
||||
|
||||
SONIC_ONLINE_DEBS += $(CAVM_XPNET_DEB)
|
||||
SONIC_STRETCH_DEBS += $(CAVM_XPNET_DEB)
|
||||
|
||||
@ -12,7 +12,6 @@ CENTEC_E582_48X6Q_PLATFORM_MODULE = platform-modules-e582-48x6q_$(CENTEC_E582_48
|
||||
$(CENTEC_E582_48X6Q_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-e582
|
||||
$(CENTEC_E582_48X6Q_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(CENTEC_E582_48X6Q_PLATFORM_MODULE)_PLATFORM = x86_64-centec_e582_48x6q-r0
|
||||
SONIC_STRETCH_DEBS += $(CENTEC_E582_48X6Q_PLATFORM_MODULE)
|
||||
SONIC_DPKG_DEBS += $(CENTEC_E582_48X6Q_PLATFORM_MODULE)
|
||||
|
||||
CENTEC_E582_48X2Q4Z_PLATFORM_MODULE = platform-modules-e582-48x2q4z_$(CENTEC_E582_48X2Q4Z_PLATFORM_MODULE_VERSION)_amd64.deb
|
||||
|
||||
@ -11,4 +11,3 @@ $(INVM_HSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_HSAI)
|
||||
$(INVM_DRV)_URL = $(INVM_SAI_ONLINE)/$(INVM_DRV)
|
||||
|
||||
SONIC_ONLINE_DEBS += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV)
|
||||
SONIC_STRETCH_DEBS += $(INVM_DRV)
|
||||
|
||||
@ -9,4 +9,3 @@ $(CEL_MIDSTONE_200I_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-
|
||||
$(CEL_MIDSTONE_200I_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(CEL_MIDSTONE_200I_PLATFORM_MODULE)_PLATFORM = x86_64-cel_midstone-r0
|
||||
SONIC_DPKG_DEBS += $(CEL_MIDSTONE_200I_PLATFORM_MODULE)
|
||||
SONIC_STRETCH_DEBS+= $(CEL_MIDSTONE_200I_PLATFORM_MODULE)
|
||||
|
||||
@ -10,4 +10,3 @@ $(DELTA_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(DELTA_PLATFORM_MODULE)_PLATFORM = x86_64-delta_et-c032if-r0
|
||||
|
||||
SONIC_DPKG_DEBS += $(DELTA_PLATFORM_MODULE)
|
||||
SONIC_STRETCH_DEBS += $(DELTA_PLATFORM_MODULE)
|
||||
|
||||
@ -4,4 +4,3 @@
|
||||
LINUX_KERNEL_DTB = linux-image-4.9.168-arm64.deb
|
||||
$(LINUX_KERNEL_DTB)_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/arm64/kernel/$(LINUX_KERNEL_DTB)
|
||||
SONIC_ONLINE_DEBS += $(LINUX_KERNEL_DTB)
|
||||
SONIC_STRETCH_DEBS += $(LINUX_KERNEL_DTB)
|
||||
|
||||
@ -4,4 +4,3 @@
|
||||
LINUX_KERNEL_DTB = linux-image-4.9.189-armhf.deb
|
||||
$(LINUX_KERNEL_DTB)_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/kernel/$(LINUX_KERNEL_DTB)
|
||||
SONIC_ONLINE_DEBS += $(LINUX_KERNEL_DTB)
|
||||
SONIC_STRETCH_DEBS += $(LINUX_KERNEL_DTB)
|
||||
|
||||
@ -6,4 +6,3 @@ $(ET6448M_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-et6448m
|
||||
$(ET6448M_PLATFORM)_PLATFORM = armhf-marvell_et6448m_52x-r0
|
||||
SONIC_DPKG_DEBS += $(ET6448M_PLATFORM)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ET6448M_PLATFORM)
|
||||
|
||||
@ -23,4 +23,3 @@ $(NEPHOS_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
SONIC_DPKG_DEBS += $(NEPHOS_MODULE)
|
||||
endif
|
||||
|
||||
SONIC_STRETCH_DEBS += $(NEPHOS_MODULE)
|
||||
|
||||
@ -10,4 +10,3 @@ $(ACCTON_AS7116_54X_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS
|
||||
$(ACCTON_AS7116_54X_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as7116_54x-r0
|
||||
SONIC_DPKG_DEBS += $(ACCTON_AS7116_54X_PLATFORM_MODULE)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ACCTON_AS7116_54X_PLATFORM_MODULE)
|
||||
|
||||
@ -9,18 +9,15 @@ $(CIG_CS6436_56P_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-mod
|
||||
$(CIG_CS6436_56P_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(CIG_CS6436_56P_PLATFORM_MODULE)_PLATFORM = x86_64-cig_cs6436_56p-r0
|
||||
SONIC_DPKG_DEBS += $(CIG_CS6436_56P_PLATFORM_MODULE)
|
||||
SONIC_STRETCH_DEBS += $(CIG_CS6436_56P_PLATFORM_MODULE)
|
||||
|
||||
CIG_CS6436_54P_PLATFORM_MODULE = sonic-platform-cig-cs6436-54p_$(CIG_MTK_PLATFORM_MODULE_VERSION)_amd64.deb
|
||||
$(CIG_CS6436_54P_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-cig
|
||||
$(CIG_CS6436_54P_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(CIG_CS6436_54P_PLATFORM_MODULE)_PLATFORM = x86_64-cig_cs6436_54p-r0
|
||||
SONIC_DPKG_DEBS += $(CIG_CS6436_54P_PLATFORM_MODULE)
|
||||
SONIC_STRETCH_DEBS += $(CIG_CS6436_54P_PLATFORM_MODULE)
|
||||
|
||||
CIG_CS5435_54P_PLATFORM_MODULE = sonic-platform-cig-cs5435-54p_$(CIG_MTK_PLATFORM_MODULE_VERSION)_amd64.deb
|
||||
$(CIG_CS5435_54P_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-cig
|
||||
$(CIG_CS5435_54P_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
$(CIG_CS5435_54P_PLATFORM_MODULE)_PLATFORM = x86_64-cig_cs5435_54p-r0
|
||||
SONIC_DPKG_DEBS += $(CIG_CS5435_54P_PLATFORM_MODULE)
|
||||
SONIC_STRETCH_DEBS += $(CIG_CS5435_54P_PLATFORM_MODULE)
|
||||
|
||||
@ -17,5 +17,3 @@ $(INGRASYS_S9230_64X_PLATFORM_MODULE)_PLATFORM = x86_64-ingrasys_s9230_64x-r0
|
||||
|
||||
$(eval $(call add_extra_package,$(INGRASYS_S9130_32X_PLATFORM_MODULE),$(INGRASYS_S9230_64X_PLATFORM_MODULE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(INGRASYS_S9130_32X_PLATFORM_MODULE)
|
||||
SONIC_STRETCH_DEBS += $(INGRASYS_S9230_64X_PLATFORM_MODULE)
|
||||
|
||||
@ -4,3 +4,4 @@ DOCKER_PTF = docker-ptf.gz
|
||||
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
|
||||
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF)
|
||||
SONIC_DOCKER_IMAGES += $(DOCKER_PTF)
|
||||
SONIC_STRETCH_DOCKERS += $(DOCKER_PTF)
|
||||
|
||||
@ -12,7 +12,6 @@ $(FRR)_DEPENDS += $(LIBSNMP_DEV) $(LIBYANG_DEV)
|
||||
$(FRR)_RDEPENDS += $(LIBYANG)
|
||||
$(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr
|
||||
SONIC_MAKE_DEBS += $(FRR)
|
||||
SONIC_STRETCH_DEBS += $(FRR)
|
||||
|
||||
FRR_PYTHONTOOLS = frr-pythontools_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_all.deb
|
||||
$(eval $(call add_derived_package,$(FRR),$(FRR_PYTHONTOOLS)))
|
||||
|
||||
@ -7,7 +7,6 @@ $(ICCPD)_DEPENDS += $(LIBNL_GENL3_DEV) $(LIBNL_CLI_DEV)
|
||||
$(ICCPD)_RDEPENDS += $(LIBNL_GENL3) $(LIBNL_CLI)
|
||||
$(ICCPD)_SRC_PATH = $(SRC_PATH)/iccpd
|
||||
SONIC_MAKE_DEBS += $(ICCPD)
|
||||
# SONIC_STRETCH_DEBS += $(ICCPD)
|
||||
|
||||
# Export these variables so they can be used in a sub-make
|
||||
export ICCPD_VERSION
|
||||
|
||||
@ -6,6 +6,5 @@ export IFUPDOWN2_VERSION
|
||||
IFUPDOWN2 = ifupdown2_$(IFUPDOWN2_VERSION)_all.deb
|
||||
$(IFUPDOWN2)_SRC_PATH = $(SRC_PATH)/ifupdown2
|
||||
SONIC_MAKE_DEBS += $(IFUPDOWN2)
|
||||
SONIC_STRETCH_DEBS += $(IFUPDOWN2)
|
||||
|
||||
export IFUPDOWN2
|
||||
|
||||
@ -9,5 +9,3 @@ SONIC_MAKE_DEBS += $(INITRAMFS_TOOLS)
|
||||
|
||||
INITRAMFS_TOOLS_CORE = initramfs-tools-core_$(INITRAMFS_TOOLS_VERSION)_all.deb
|
||||
$(eval $(call add_extra_package,$(INITRAMFS_TOOLS),$(INITRAMFS_TOOLS_CORE)))
|
||||
|
||||
SONIC_STRETCH_DEBS += $(INITRAMFS_TOOLS) $(INITRAMFS_TOOLS_CORE)
|
||||
|
||||
@ -7,7 +7,6 @@ IPTABLES_VERSION_FULL = $(IPTABLES_VERSION)-$(IPTABLES_VERSION_SUFFIX)
|
||||
IPTABLES = iptables_$(IPTABLES_VERSION_FULL)_amd64.deb
|
||||
$(IPTABLES)_SRC_PATH = $(SRC_PATH)/iptables
|
||||
SONIC_MAKE_DEBS += $(IPTABLES)
|
||||
SONIC_STRETCH_DEBS += $(IPTABLES)
|
||||
|
||||
IPTABLESIP4TC = libip4tc0_$(IPTABLES_VERSION_FULL)_amd64.deb
|
||||
$(eval $(call add_derived_package,$(IPTABLES),$(IPTABLESIP4TC)))
|
||||
|
||||
@ -8,7 +8,5 @@ ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(ISC_DHCP_RELAY)_SRC_PATH = $(SRC_PATH)/isc-dhcp
|
||||
SONIC_MAKE_DEBS += $(ISC_DHCP_RELAY)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(ISC_DHCP_RELAY)
|
||||
|
||||
ISC_DHCP_RELAY_DBG = isc-dhcp-relay-dbgsym_$(ISC_DHCP_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(eval $(call add_derived_package,$(ISC_DHCP_RELAY),$(ISC_DHCP_RELAY_DBG)))
|
||||
|
||||
@ -7,5 +7,3 @@ IXGBE_DRIVER = ixgbe.ko
|
||||
$(IXGBE_DRIVER)_SRC_PATH = $(SRC_PATH)/ixgbe
|
||||
$(IXGBE_DRIVER)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
|
||||
SONIC_MAKE_FILES += $(IXGBE_DRIVER)
|
||||
|
||||
SONIC_STRETCH_FILES += $(IXGBE_DRIVER)
|
||||
|
||||
@ -8,6 +8,5 @@ export KDUMP_TOOLS_VERSION
|
||||
KDUMP_TOOLS = kdump-tools_$(KDUMP_TOOLS_VERSION)_all.deb
|
||||
$(KDUMP_TOOLS)_SRC_PATH = $(SRC_PATH)/kdump-tools
|
||||
SONIC_MAKE_DEBS += $(KDUMP_TOOLS)
|
||||
SONIC_STRETCH_DEBS += $(KDUMP_TOOLS)
|
||||
|
||||
export KDUMP_TOOLS
|
||||
|
||||
@ -12,7 +12,6 @@ LIBYANG = libyang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang
|
||||
$(LIBYANG)_DEPENDS += $(SWIG_BASE) $(SWIG)
|
||||
SONIC_MAKE_DEBS += $(LIBYANG)
|
||||
SONIC_STRETCH_DEBS += $(LIBYANG)
|
||||
|
||||
LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DEV)))
|
||||
|
||||
@ -8,7 +8,5 @@ MONIT = monit_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(MONIT)_SRC_PATH = $(SRC_PATH)/monit
|
||||
SONIC_MAKE_DEBS += $(MONIT)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(MONIT)
|
||||
|
||||
MONIT_DBG = monit-dbgsym_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(eval $(call add_derived_package,$(MONIT),$(MONIT_DBG)))
|
||||
|
||||
@ -7,7 +7,6 @@ export RADVD_VERSION
|
||||
RADVD = radvd_$(RADVD_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(RADVD)_SRC_PATH = $(SRC_PATH)/radvd
|
||||
SONIC_MAKE_DEBS += $(RADVD)
|
||||
SONIC_STRETCH_DEBS += $(RADVD)
|
||||
|
||||
RADVD_DBG = radvd-dbgsym_$(RADVD_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(eval $(call add_derived_package,$(RADVD),$(RADVD_DBG)))
|
||||
|
||||
@ -9,7 +9,6 @@ $(HSFLOWD)_DEPENDS += $(LIBHIREDIS_DEV)
|
||||
$(HSFLOWD)_SRC_PATH = $(SRC_PATH)/sflow/hsflowd
|
||||
|
||||
SONIC_MAKE_DEBS += $(HSFLOWD)
|
||||
SONIC_STRETCH_DEBS += $(HSFLOWD)
|
||||
|
||||
HSFLOWD_DBG = hsflowd-dbg_$(HSFLOWD_VERSION)-$(HSFLOWD_SUBVERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(HSFLOWD_DBG)_DEPENDS += $(HSFLOWD)
|
||||
@ -27,7 +26,6 @@ SFLOWTOOL = sflowtool_$(SFLOWTOOL_VERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(SFLOWTOOL)_SRC_PATH = $(SRC_PATH)/sflow/sflowtool
|
||||
|
||||
SONIC_MAKE_DEBS += $(SFLOWTOOL)
|
||||
SONIC_STRETCH_DEBS += $(SFLOWTOOL)
|
||||
export SFLOWTOOL
|
||||
|
||||
# psample package
|
||||
@ -40,7 +38,6 @@ PSAMPLE = psample_$(PSAMPLE_VERSION)-$(PSAMPLE_SUBVERSION)_$(CONFIGURED_ARCH).de
|
||||
$(PSAMPLE)_SRC_PATH = $(SRC_PATH)/sflow/psample
|
||||
|
||||
SONIC_MAKE_DEBS += $(PSAMPLE)
|
||||
SONIC_STRETCH_DEBS += $(PSAMPLE)
|
||||
export PSAMPLE
|
||||
|
||||
# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
|
||||
|
||||
@ -9,5 +9,4 @@ export SMARTMONTOOLS_VERSION_MAJOR SMARTMONTOOLS_VERSION_FULL
|
||||
SMARTMONTOOLS = smartmontools_$(SMARTMONTOOLS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
|
||||
$(SMARTMONTOOLS)_SRC_PATH = $(SRC_PATH)/smartmontools
|
||||
|
||||
SONIC_STRETCH_DEBS += $(SMARTMONTOOLS)
|
||||
SONIC_MAKE_DEBS += $(SMARTMONTOOLS)
|
||||
|
||||
@ -8,4 +8,3 @@ export SONIC_DEVICE_DATA_VERSION SONIC_DEVICE_DATA_VERSION_FULL
|
||||
SONIC_DEVICE_DATA = sonic-device-data_$(SONIC_DEVICE_DATA_VERSION_FULL)_all.deb
|
||||
$(SONIC_DEVICE_DATA)_SRC_PATH = $(SRC_PATH)/sonic-device-data
|
||||
SONIC_MAKE_DEBS += $(SONIC_DEVICE_DATA)
|
||||
SONIC_STRETCH_DEBS += $(SONIC_DEVICE_DATA)
|
||||
|
||||
@ -6,7 +6,6 @@ SONIC_ZTP_VERSION = 1.0.0
|
||||
SONIC_ZTP = sonic-ztp_$(SONIC_ZTP_VERSION)_all.deb
|
||||
$(SONIC_ZTP)_SRC_PATH = $(SRC_PATH)/sonic-ztp
|
||||
SONIC_DPKG_DEBS += $(SONIC_ZTP)
|
||||
SONIC_STRETCH_DEBS += $(SONIC_ZTP)
|
||||
|
||||
export SONIC_ZTP_VERSION
|
||||
export SONIC_ZTP
|
||||
|
||||
@ -11,7 +11,6 @@ export SWIG_SUBVERSION
|
||||
SWIG_BASE = swig$(SWIG_VERSION_BASE)_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(SWIG_BASE)_SRC_PATH = $(SRC_PATH)/swig
|
||||
SONIC_MAKE_DEBS += $(SWIG_BASE)
|
||||
SONIC_STRETCH_DEBS += $(SWIG_BASE)
|
||||
|
||||
SWIG = swig_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_$(CONFIGURED_ARCH).deb
|
||||
$(eval $(call add_derived_package,$(SWIG_BASE),$(SWIG)))
|
||||
|
||||
@ -29,8 +29,6 @@ $(LIBNSS_TACPLUS)_RDEPENDS += $(LIBTAC2)
|
||||
$(LIBNSS_TACPLUS)_SRC_PATH = $(SRC_PATH)/tacacs/nss
|
||||
SONIC_MAKE_DEBS += $(LIBNSS_TACPLUS)
|
||||
|
||||
SONIC_STRETCH_DEBS += $(LIBPAM_TACPLUS) $(LIBNSS_TACPLUS)
|
||||
|
||||
# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
|
||||
# are archived into debug one image to facilitate debugging.
|
||||
#
|
||||
|
||||
91
slave.mk
91
slave.mk
@ -34,8 +34,12 @@ endif
|
||||
PYTHON_DEBS_PATH = $(TARGET_PATH)/python-debs
|
||||
PYTHON_WHEELS_PATH = $(TARGET_PATH)/python-wheels
|
||||
PROJECT_ROOT = $(shell pwd)
|
||||
JESSIE_DEBS_PATH = $(TARGET_PATH)/debs/jessie
|
||||
JESSIE_FILES_PATH = $(TARGET_PATH)/files/jessie
|
||||
STRETCH_DEBS_PATH = $(TARGET_PATH)/debs/stretch
|
||||
STRETCH_FILES_PATH = $(TARGET_PATH)/files/stretch
|
||||
BUSTER_DEBS_PATH = $(TARGET_PATH)/debs/buster
|
||||
BUSTER_FILES_PATH = $(TARGET_PATH)/files/buster
|
||||
DBG_IMAGE_MARK = dbg
|
||||
DBG_SRC_ARCHIVE_FILE = $(TARGET_PATH)/sonic_src.tar.gz
|
||||
|
||||
@ -45,12 +49,17 @@ CONFIGURED_ARCH := $(shell [ -f .arch ] && cat .arch || echo amd64)
|
||||
ifeq ($(PLATFORM_ARCH),)
|
||||
override PLATFORM_ARCH = $(CONFIGURED_ARCH)
|
||||
endif
|
||||
IMAGE_DISTRO := buster
|
||||
IMAGE_DISTRO_DEBS_PATH = $(TARGET_PATH)/debs/$(IMAGE_DISTRO)
|
||||
IMAGE_DISTRO_FILES_PATH = $(TARGET_PATH)/files/$(IMAGE_DISTRO)
|
||||
|
||||
export BUILD_NUMBER
|
||||
export BUILD_TIMESTAMP
|
||||
export CONFIGURED_PLATFORM
|
||||
export CONFIGURED_ARCH
|
||||
export STRETCH_DEBS_PATH
|
||||
export PYTHON_WHEELS_PATH
|
||||
export IMAGE_DISTRO
|
||||
export IMAGE_DISTRO_DEBS_PATH
|
||||
|
||||
###############################################################################
|
||||
## Utility rules
|
||||
@ -64,12 +73,16 @@ ifneq ($(CONFIGURED_PLATFORM),generic)
|
||||
endif
|
||||
|
||||
configure :
|
||||
@mkdir -p target/debs
|
||||
@mkdir -p target/debs/stretch
|
||||
@mkdir -p target/files
|
||||
@mkdir -p target/files/stretch
|
||||
@mkdir -p target/python-debs
|
||||
@mkdir -p target/python-wheels
|
||||
@mkdir -p $(DEBS_PATH)
|
||||
@mkdir -p $(JESSIE_DEBS_PATH)
|
||||
@mkdir -p $(STRETCH_DEBS_PATH)
|
||||
@mkdir -p $(BUSTER_DEBS_PATH)
|
||||
@mkdir -p $(FILES_PATH)
|
||||
@mkdir -p $(JESSIE_FILES_PATH)
|
||||
@mkdir -p $(STRETCH_FILES_PATH)
|
||||
@mkdir -p $(BUSTER_FILES_PATH)
|
||||
@mkdir -p $(PYTHON_DEBS_PATH)
|
||||
@mkdir -p $(PYTHON_WHEELS_PATH)
|
||||
@echo $(PLATFORM) > .platform
|
||||
@echo $(PLATFORM_ARCH) > .arch
|
||||
|
||||
@ -602,17 +615,32 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.g
|
||||
|
||||
SONIC_TARGET_LIST += $(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES))
|
||||
|
||||
# Build jessie docker images only in jessie slave docker,
|
||||
# jessie docker images only in jessie slave docker
|
||||
DOCKER_IMAGES_FOR_INSTALLERS := $(sort $(foreach installer,$(SONIC_INSTALLERS),$($(installer)_DOCKERS)))
|
||||
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_JESSIE_DOCKERS), $(eval $(DOCKER_IMAGE)_DEBS_PATH := $(JESSIE_DEBS_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_JESSIE_DOCKERS), $(eval $(DOCKER_IMAGE)_FILES_PATH := $(JESSIE_FILES_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_JESSIE_DBG_DOCKERS), $(eval $(DOCKER_IMAGE)_DEBS_PATH := $(JESSIE_DEBS_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_JESSIE_DBG_DOCKERS), $(eval $(DOCKER_IMAGE)_FILES_PATH := $(JESSIE_FILES_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_STRETCH_DOCKERS), $(eval $(DOCKER_IMAGE)_DEBS_PATH := $(STRETCH_DEBS_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_STRETCH_DOCKERS), $(eval $(DOCKER_IMAGE)_FILES_PATH := $(STRETCH_FILES_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_STRETCH_DBG_DOCKERS), $(eval $(DOCKER_IMAGE)_DEBS_PATH := $(STRETCH_DEBS_PATH)))
|
||||
$(foreach DOCKER_IMAGE,$(SONIC_STRETCH_DBG_DOCKERS), $(eval $(DOCKER_IMAGE)_FILES_PATH := $(STRETCH_FILES_PATH)))
|
||||
|
||||
ifeq ($(BLDENV),)
|
||||
DOCKER_IMAGES_FOR_INSTALLERS := $(sort $(foreach installer,$(SONIC_INSTALLERS),$($(installer)_DOCKERS)))
|
||||
DOCKER_IMAGES := $(SONIC_JESSIE_DOCKERS)
|
||||
DOCKER_DBG_IMAGES := $(SONIC_JESSIE_DBG_DOCKERS)
|
||||
SONIC_JESSIE_DOCKERS_FOR_INSTALLERS = $(filter $(SONIC_JESSIE_DOCKERS),$(DOCKER_IMAGES_FOR_INSTALLERS) $(EXTRA_JESSIE_TARGETS))
|
||||
SONIC_JESSIE_DBG_DOCKERS_FOR_INSTALLERS = $(filter $(SONIC_JESSIE_DBG_DOCKERS), $(patsubst %.gz,%-$(DBG_IMAGE_MARK).gz, $(SONIC_JESSIE_DOCKERS_FOR_INSTALLERS)))
|
||||
JESSIE_DOCKER_IMAGES = $(filter $(SONIC_JESSIE_DOCKERS),$(DOCKER_IMAGES_FOR_INSTALLERS) $(EXTRA_DOCKER_TARGETS))
|
||||
JESSIE_DBG_DOCKER_IMAGES = $(filter $(SONIC_JESSIE_DBG_DOCKERS), $(patsubst %.gz,%-$(DBG_IMAGE_MARK).gz, $(JESSIE_DOCKER_IMAGES)))
|
||||
else
|
||||
DOCKER_IMAGES := $(filter-out $(SONIC_JESSIE_DOCKERS), $(SONIC_DOCKER_IMAGES))
|
||||
DOCKER_DBG_IMAGES := $(filter-out $(SONIC_JESSIE_DBG_DOCKERS), $(SONIC_DOCKER_DBG_IMAGES))
|
||||
ifeq ($(BLDENV),stretch)
|
||||
DOCKER_IMAGES := $(SONIC_STRETCH_DOCKERS)
|
||||
DOCKER_DBG_IMAGES := $(SONIC_STRETCH_DBG_DOCKERS)
|
||||
STRETCH_DOCKER_IMAGES = $(filter $(SONIC_STRETCH_DOCKERS),$(DOCKER_IMAGES_FOR_INSTALLERS) $(EXTRA_DOCKER_TARGETS))
|
||||
STRETCH_DBG_DOCKER_IMAGES = $(filter $(SONIC_STRETCH_DBG_DOCKERS), $(patsubst %.gz,%-$(DBG_IMAGE_MARK).gz, $(STRETCH_DOCKER_IMAGES)))
|
||||
else
|
||||
DOCKER_IMAGES := $(SONIC_DOCKER_IMAGES)
|
||||
DOCKER_DBG_IMAGES := $(SONIC_DOCKER_DBG_IMAGES)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Targets for building docker images
|
||||
@ -638,8 +666,8 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform
|
||||
mkdir -p $($*.gz_PATH)/files $(LOG)
|
||||
mkdir -p $($*.gz_PATH)/python-debs $(LOG)
|
||||
mkdir -p $($*.gz_PATH)/python-wheels $(LOG)
|
||||
sudo mount --bind $(DEBS_PATH) $($*.gz_PATH)/debs $(LOG)
|
||||
sudo mount --bind $(FILES_PATH) $($*.gz_PATH)/files $(LOG)
|
||||
sudo mount --bind $($*.gz_DEBS_PATH) $($*.gz_PATH)/debs $(LOG)
|
||||
sudo mount --bind $($*.gz_FILES_PATH) $($*.gz_PATH)/files $(LOG)
|
||||
sudo mount --bind $(PYTHON_DEBS_PATH) $($*.gz_PATH)/python-debs $(LOG)
|
||||
sudo mount --bind $(PYTHON_WHEELS_PATH) $($*.gz_PATH)/python-wheels $(LOG)
|
||||
# Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs
|
||||
@ -686,7 +714,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_DBG_IMAGES)) : $(TARGET_PATH)/%-$(DBG_IMAG
|
||||
if [ -z '$($*-$(DBG_IMAGE_MARK).gz_CACHE_LOADED)' ] ; then
|
||||
|
||||
mkdir -p $($*.gz_PATH)/debs $(LOG)
|
||||
sudo mount --bind $(DEBS_PATH) $($*.gz_PATH)/debs $(LOG)
|
||||
sudo mount --bind $($*.gz_DEBS_PATH) $($*.gz_PATH)/debs $(LOG)
|
||||
# Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs
|
||||
$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbg_debs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++'))
|
||||
$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_image_dbgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_IMAGE_PACKAGES)))\n" | awk '!a[$$0]++'))
|
||||
@ -733,10 +761,10 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
|
||||
build_debian.sh \
|
||||
scripts/dbg_files.sh \
|
||||
build_image.sh \
|
||||
$$(addsuffix -install,$$(addprefix $(STRETCH_DEBS_PATH)/,$$($$*_DEPENDS))) \
|
||||
$$(addprefix $(STRETCH_DEBS_PATH)/,$$($$*_INSTALLS)) \
|
||||
$$(addprefix $(STRETCH_DEBS_PATH)/,$$($$*_LAZY_INSTALLS)) \
|
||||
$(addprefix $(STRETCH_DEBS_PATH)/,$(INITRAMFS_TOOLS) \
|
||||
$$(addsuffix -install,$$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$$($$*_DEPENDS))) \
|
||||
$$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$$($$*_INSTALLS)) \
|
||||
$$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$$($$*_LAZY_INSTALLS)) \
|
||||
$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) \
|
||||
$(LINUX_KERNEL) \
|
||||
$(SONIC_DEVICE_DATA) \
|
||||
$(PYTHON_CLICK) \
|
||||
@ -748,7 +776,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
|
||||
$$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
|
||||
$$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
|
||||
$(if $(findstring y,$(ENABLE_ZTP)),$(addprefix $(DEBS_PATH)/,$(SONIC_ZTP))) \
|
||||
$(addprefix $(STRETCH_FILES_PATH)/, $(if $(filter $(CONFIGURED_ARCH),amd64), $(IXGBE_DRIVER))) \
|
||||
$(addprefix $(IMAGE_DISTRO_FILES_PATH)/, $(if $(filter $(CONFIGURED_ARCH),amd64), $(IXGBE_DRIVER))) \
|
||||
$(addprefix $(PYTHON_DEBS_PATH)/,$(SONIC_UTILS)) \
|
||||
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \
|
||||
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2)) \
|
||||
@ -757,11 +785,11 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
|
||||
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MODELS_PY3))
|
||||
$(HEADER)
|
||||
# Pass initramfs and linux kernel explicitly. They are used for all platforms
|
||||
export debs_path="$(STRETCH_DEBS_PATH)"
|
||||
export debs_path="$(IMAGE_DISTRO_DEBS_PATH)"
|
||||
export files_path="$(FILES_PATH)"
|
||||
export python_debs_path="$(PYTHON_DEBS_PATH)"
|
||||
export initramfs_tools="$(STRETCH_DEBS_PATH)/$(INITRAMFS_TOOLS)"
|
||||
export linux_kernel="$(STRETCH_DEBS_PATH)/$(LINUX_KERNEL)"
|
||||
export initramfs_tools="$(IMAGE_DISTRO_DEBS_PATH)/$(INITRAMFS_TOOLS)"
|
||||
export linux_kernel="$(IMAGE_DISTRO_DEBS_PATH)/$(LINUX_KERNEL)"
|
||||
export onie_recovery_image="$(FILES_PATH)/$(ONIE_RECOVERY_IMAGE)"
|
||||
export kversion="$(KVERSION)"
|
||||
export image_type="$($*_IMAGE_TYPE)"
|
||||
@ -776,8 +804,8 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
|
||||
export shutdown_bgp_on_start="$(SHUTDOWN_BGP_ON_START)"
|
||||
export install_kubernetes="$(INSTALL_KUBERNETES)"
|
||||
export enable_pfcwd_on_start="$(ENABLE_PFCWD_ON_START)"
|
||||
export installer_debs="$(addprefix $(STRETCH_DEBS_PATH)/,$($*_INSTALLS))"
|
||||
export lazy_installer_debs="$(foreach deb, $($*_LAZY_INSTALLS),$(foreach device, $($(deb)_PLATFORM),$(addprefix $(device)@, $(STRETCH_DEBS_PATH)/$(deb))))"
|
||||
export installer_debs="$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$($*_INSTALLS))"
|
||||
export lazy_installer_debs="$(foreach deb, $($*_LAZY_INSTALLS),$(foreach device, $($(deb)_PLATFORM),$(addprefix $(device)@, $(IMAGE_DISTRO_DEBS_PATH)/$(deb))))"
|
||||
export installer_images="$(addprefix $(TARGET_PATH)/,$($*_DOCKERS))"
|
||||
export config_engine_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE))"
|
||||
export swsssdk_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY2))"
|
||||
@ -930,12 +958,11 @@ clean :: .platform clean-logs $$(SONIC_CLEAN_DEBS) $$(SONIC_CLEAN_FILES) $$(SONI
|
||||
|
||||
all : .platform $$(addprefix $(TARGET_PATH)/,$$(SONIC_ALL))
|
||||
|
||||
stretch : $$(addprefix $(DEBS_PATH)/,$$(SONIC_STRETCH_DEBS)) \
|
||||
$$(addprefix $(FILES_PATH)/,$$(SONIC_STRETCH_FILES)) \
|
||||
$$(addprefix $(TARGET_PATH)/,$$(SONIC_STRETCH_DOCKERS_FOR_INSTALLERS)) \
|
||||
$$(addprefix $(TARGET_PATH)/,$$(SONIC_STRETCH_DBG_DOCKERS_FOR_INSTALLERS))
|
||||
stretch : $$(addprefix $(TARGET_PATH)/,$$(STRETCH_DOCKER_IMAGES)) \
|
||||
$$(addprefix $(TARGET_PATH)/,$$(STRETCH_DBG_DOCKER_IMAGES))
|
||||
|
||||
jessie : $$(addprefix $(TARGET_PATH)/,$$(SONIC_JESSIE_DOCKERS_FOR_INSTALLERS))
|
||||
jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \
|
||||
$$(addprefix $(TARGET_PATH)/,$$(JESSIE_DBG_DOCKER_IMAGES))
|
||||
|
||||
###############################################################################
|
||||
## Standard targets
|
||||
|
||||
@ -9,7 +9,7 @@ from os import system, environ
|
||||
from sys import exit
|
||||
|
||||
# find path of pkgs from environment vars
|
||||
prefix = '../../'; debs = environ["STRETCH_DEBS_PATH"]
|
||||
prefix = '../../'; debs = environ["IMAGE_DISTRO_DEBS_PATH"]
|
||||
deps_path = '{}/{}'.format(prefix, debs)
|
||||
# dependencies
|
||||
libyang = '{}/{}'.format(deps_path, environ["LIBYANG"])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user