matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the makefiles to allow using Bullseye slave image

Browse Source 
This adds the Makefile changes to use the Bullseye slave image, but
doesn't use it by default. There should be no functional changes with
this change (Buster will still be used for now).

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2021-06-30 12:45:40 -07:00 committed by lguohan
parent d4261a693b
commit a1fb1dee78
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -2,6 +2,8 @@
NOJESSIE ?= 1 NOJESSIE ?= 1
NOSTRETCH ?= 0 NOSTRETCH ?= 0
NOBUSTER ?= 0
NOBULLSEYE ?= 1
%:: %::
@echo "+++ --- Making $@ --- +++" @echo "+++ --- Making $@ --- +++"
@ -11,7 +13,12 @@ endif
ifeq ($(NOSTRETCH), 0) ifeq ($(NOSTRETCH), 0)
EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
endif endif
ifeq ($(NOBUSTER), 0)
BLDENV=buster make -f Makefile.work $@ BLDENV=buster make -f Makefile.work $@
endif
ifeq ($(NOBULLSEYE), 0)
BLDENV=bullseye make -f Makefile.work $@
endif
jessie: jessie:
@echo "+++ Making $@ +++" @echo "+++ Making $@ +++"
@ -25,6 +32,12 @@ ifeq ($(NOSTRETCH), 0)
make -f Makefile.work stretch make -f Makefile.work stretch
endif endif
buster:
@echo "+++ Making $@ +++"
ifeq ($(NOBUSTER), 0)
make -f Makefile.work buster
endif
init: init:
@echo "+++ Making $@ +++" @echo "+++ Making $@ +++"
make -f Makefile.work $@ make -f Makefile.work $@
@ -37,7 +50,12 @@ endif
ifeq ($(NOSTRETCH), 0) ifeq ($(NOSTRETCH), 0)
BLDENV=stretch make -f Makefile.work $@ BLDENV=stretch make -f Makefile.work $@
endif endif
ifeq ($(NOBUSTER), 0)
BLDENV=buster make -f Makefile.work $@ BLDENV=buster make -f Makefile.work $@
endif
ifeq ($(NOBULLSEYE), 0)
BLDENV=bullseye make -f Makefile.work $@
endif
# Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h # Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
freeze: freeze:

4
Makefile.work
View File

@ -92,7 +92,9 @@ ifeq ($(PLATFORM_ARCH),)
override PLATFORM_ARCH = $(CONFIGURED_ARCH) override PLATFORM_ARCH = $(CONFIGURED_ARCH)
endif endif
ifeq ($(BLDENV), buster) ifeq ($(BLDENV), bullseye)
SLAVE_DIR = sonic-slave-bullseye
else ifeq ($(BLDENV), buster)
SLAVE_DIR = sonic-slave-buster SLAVE_DIR = sonic-slave-buster
else ifeq ($(BLDENV), stretch) else ifeq ($(BLDENV), stretch)
SLAVE_DIR = sonic-slave-stretch SLAVE_DIR = sonic-slave-stretch

8
slave.mk
View File

@ -39,6 +39,8 @@ STRETCH_DEBS_PATH = $(TARGET_PATH)/debs/stretch
STRETCH_FILES_PATH = $(TARGET_PATH)/files/stretch STRETCH_FILES_PATH = $(TARGET_PATH)/files/stretch
BUSTER_DEBS_PATH = $(TARGET_PATH)/debs/buster BUSTER_DEBS_PATH = $(TARGET_PATH)/debs/buster
BUSTER_FILES_PATH = $(TARGET_PATH)/files/buster BUSTER_FILES_PATH = $(TARGET_PATH)/files/buster
BULLSEYE_DEBS_PATH = $(TARGET_PATH)/debs/bullseye
BULLSEYE_FILES_PATH = $(TARGET_PATH)/files/bullseye
DBG_IMAGE_MARK = dbg DBG_IMAGE_MARK = dbg
DBG_SRC_ARCHIVE_FILE = $(TARGET_PATH)/sonic_src.tar.gz DBG_SRC_ARCHIVE_FILE = $(TARGET_PATH)/sonic_src.tar.gz
DPKG_ADMINDIR_PATH = /sonic/dpkg DPKG_ADMINDIR_PATH = /sonic/dpkg
@ -49,7 +51,11 @@ CONFIGURED_ARCH := $(shell [ -f .arch ] && cat .arch || echo amd64)
ifeq ($(PLATFORM_ARCH),) ifeq ($(PLATFORM_ARCH),)
override PLATFORM_ARCH = $(CONFIGURED_ARCH) override PLATFORM_ARCH = $(CONFIGURED_ARCH)
endif endif
ifeq ($(BLDENV),bullseye)
IMAGE_DISTRO := bullseye
else
IMAGE_DISTRO := buster IMAGE_DISTRO := buster
endif
IMAGE_DISTRO_DEBS_PATH = $(TARGET_PATH)/debs/$(IMAGE_DISTRO) IMAGE_DISTRO_DEBS_PATH = $(TARGET_PATH)/debs/$(IMAGE_DISTRO)
IMAGE_DISTRO_FILES_PATH = $(TARGET_PATH)/files/$(IMAGE_DISTRO) IMAGE_DISTRO_FILES_PATH = $(TARGET_PATH)/files/$(IMAGE_DISTRO)
@ -79,10 +85,12 @@ configure :
@mkdir -p $(JESSIE_DEBS_PATH) @mkdir -p $(JESSIE_DEBS_PATH)
@mkdir -p $(STRETCH_DEBS_PATH) @mkdir -p $(STRETCH_DEBS_PATH)
@mkdir -p $(BUSTER_DEBS_PATH) @mkdir -p $(BUSTER_DEBS_PATH)
@mkdir -p $(BULLSEYE_DEBS_PATH)
@mkdir -p $(FILES_PATH) @mkdir -p $(FILES_PATH)
@mkdir -p $(JESSIE_FILES_PATH) @mkdir -p $(JESSIE_FILES_PATH)
@mkdir -p $(STRETCH_FILES_PATH) @mkdir -p $(STRETCH_FILES_PATH)
@mkdir -p $(BUSTER_FILES_PATH) @mkdir -p $(BUSTER_FILES_PATH)
@mkdir -p $(BULLSEYE_FILES_PATH)
@mkdir -p $(PYTHON_DEBS_PATH) @mkdir -p $(PYTHON_DEBS_PATH)
@mkdir -p $(PYTHON_WHEELS_PATH) @mkdir -p $(PYTHON_WHEELS_PATH)
@mkdir -p $(DPKG_ADMINDIR_PATH) @mkdir -p $(DPKG_ADMINDIR_PATH)