Upgrade SONiC to Debian Bullseye

Makefile

@@ -3,7 +3,7 @@
 NOJESSIE ?= 1
 NOSTRETCH ?= 0
 NOBUSTER ?= 0
-NOBULLSEYE ?= 1
+NOBULLSEYE ?= 0
 
 ifeq ($(NOJESSIE),0)
 BUILD_JESSIE=1
@@ -35,7 +35,7 @@ ifeq ($(NOSTRETCH), 0)
 	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
 endif
 ifeq ($(NOBUSTER), 0)
-	BLDENV=buster make -f Makefile.work $@
+	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=buster make -f Makefile.work buster
 endif
 ifeq ($(NOBULLSEYE), 0)
 	BLDENV=bullseye make -f Makefile.work $@

Makefile.cache

@@ -74,7 +74,8 @@ SONIC_COMMON_DPKG_LIST  :=  debian/control debian/changelog debian/rules \
                             debian/compat debian/install debian/copyright
 SONIC_COMMON_BASE_FILES_LIST  := sonic-slave-jessie/Dockerfile.j2 sonic-slave-jessie/Dockerfile.user.j2 \
                                  sonic-slave-stretch/Dockerfile.j2 sonic-slave-stretch/Dockerfile.user.j2 \
-                                 sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user.j2
+                                 sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user.j2 \
+                                 sonic-slave-bullseye/Dockerfile.j2 sonic-slave-bullseye/Dockerfile.user.j2
 
 
 

build_debian.sh

@@ -31,8 +31,8 @@ set -x -e
 CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 
 ## docker engine version (with platform)
-DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
-LINUX_KERNEL_VERSION=4.19.0-12-2
+DOCKER_VERSION=5:20.10.7~3-0~debian-$IMAGE_DISTRO
+LINUX_KERNEL_VERSION=5.10.0-8-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -269,6 +269,7 @@ fi
 ## Note: parted is needed for partprobe in install.sh
 ## Note: ca-certificates is needed for easy_install
 ## Note: don't install python-apt by pip, older than Debian repo one
+## Note: fdisk and gpg are needed by fwutil
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
     file                    \
     ifmetric                \
@@ -281,8 +282,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     dbus                    \
     ntpstat                 \
     openssh-server          \
-    python                  \
-    python-apt              \
+    python3-apt             \
     traceroute              \
     iputils-ping            \
     net-tools               \
@@ -314,14 +314,16 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     ndisc6                  \
     makedumpfile            \
     conntrack               \
-    python-pip              \
     python3                 \
     python3-distutils       \
     python3-pip             \
+    python-is-python3       \
     cron                    \
-    libprotobuf17           \
+    libprotobuf23           \
     libgrpc++               \
     haveged                 \
+    fdisk                   \
+    gpg                     \
     jq
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
@@ -350,12 +352,11 @@ 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 $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 $IMAGE_DISTRO-backports install \
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
     picocom \
     systemd \
-    systemd-sysv
+    systemd-sysv \
+    ntp
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
@@ -425,13 +426,10 @@ done < files/image_config/sysctl/sysctl-net.conf
 sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT
 
 # Upgrade pip via PyPI and uninstall the Debian version
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install --upgrade 'pip<21'
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install --upgrade pip
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-pip python3-pip
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python3-pip
 
 # For building Python packages
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install 'setuptools==40.8.0'
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install 'wheel==0.35.1'
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setuptools==49.6.00'
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
 

device/dell/x86_64-dellemc_z9332f_d1508-r0/plugins/sfputil.py

@@ -47,40 +47,39 @@ class SfpUtil(SfpUtilBase):
     PORTS_IN_BLOCK = 34
 
     BASE_RES_PATH = "/sys/bus/pci/devices/0000:09:00.0/resource0"
-
     _port_to_i2c_mapping = {
-        1:  4,
-        2:  5,
-        3:  6,
-        4:  7,
-        5:  8,
-        6:  9,
-        7:  10,
-        8:  11,
-        9:  12,
-        10: 13,
-        11: 14,
-        12: 15,
-        13: 16,
-        14: 17,
-        15: 18,
-        16: 19,
-        17: 20,
-        18: 21,
-        19: 22,
-        20: 23,
-        21: 24,
-        22: 25,
-        23: 26,
-        24: 27,
-        25: 28,
-        26: 29,
-        27: 30,
-        28: 31,
-        29: 32,
-        30: 33,
-        31: 34,
-        32: 35,
+        1:  10,
+        2:  11,
+        3:  12,
+        4:  13,
+        5:  14,
+        6:  15,
+        7:  16,
+        8:  17,
+        9:  18,
+        10: 19,
+        11: 20,
+        12: 21,
+        13: 22,
+        14: 23,
+        15: 24,
+        16: 25,
+        17: 26,
+        18: 27,
+        19: 28,
+        20: 29,
+        21: 30,
+        22: 31,
+        23: 32,
+        24: 33,
+        25: 34,
+        26: 35,
+        27: 36,
+        28: 37,
+        29: 38,
+        30: 39,
+        31: 40,
+        32: 41,
         33: 1,
         34: 2,
     }

files/apt/sources.list.amd64

@@ -1,13 +1,15 @@
 ## Debian mirror on Microsoft Azure
 ## Ref: http://debian-archive.trafficmanager.net/
 
-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
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ buster_updates main contrib non-free
-deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ buster_updates main contrib non-free
-deb [arch=amd64] http://packages.trafficmanager.net/debian/debian buster-backports main contrib non-free
+deb [arch=amd64] http://deb.debian.org/debian/ bullseye main contrib non-free
+deb-src [arch=amd64] http://deb.debian.org/debian/ bullseye main contrib non-free
+#deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
+#deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye main contrib non-free
+#deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ bullseye/updates main contrib non-free
+#deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ bullseye/updates main contrib non-free
+#deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ bullseye-backports main contrib non-free
+#deb [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
+#deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
+#deb [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ bullseye_updates main contrib non-free
+#deb-src [arch=amd64] http://packages.trafficmanager.net/debian/debian-security/ bullseye_updates main contrib non-free
+#deb [arch=amd64] http://packages.trafficmanager.net/debian/debian bullseye-backports main contrib non-free

files/apt/sources.list.arm64

@@ -1,13 +1,13 @@
 ## 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 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
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=arm64] http://packages.trafficmanager.net/debian/debian buster-backports main
+deb [arch=arm64] http://deb.debian.org/debian bullseye main contrib non-free
+deb-src [arch=arm64] http://deb.debian.org/debian bullseye main contrib non-free
+deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
+deb-src [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
+deb [arch=arm64] http://ftp.debian.org/debian bullseye-backports main
+# deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
+# deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
+# deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
+# deb-src [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
+# deb [arch=arm64] http://packages.trafficmanager.net/debian/debian bullseye-backports main

files/apt/sources.list.armhf

@@ -1,13 +1,13 @@
 ## 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 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
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian buster main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-updates main contrib non-free
-deb [arch=armhf] http://packages.trafficmanager.net/debian/debian buster-backports main
+deb [arch=armhf] http://deb.debian.org/debian bullseye main contrib non-free
+deb-src [arch=armhf] http://deb.debian.org/debian bullseye main contrib non-free
+deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
+deb-src [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
+deb [arch=armhf] http://ftp.debian.org/debian bullseye-backports main
+# deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
+# deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye main contrib non-free
+# deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
+# deb-src [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-updates main contrib non-free
+# deb [arch=armhf] http://packages.trafficmanager.net/debian/debian bullseye-backports main

files/build_templates/docker_image_ctl.j2

@@ -57,7 +57,7 @@ function ebtables_config()
 
 function getMountPoint()
 {
-    echo $1 | python -c "import sys, json, os; mnts = [x for x in json.load(sys.stdin)[0]['Mounts'] if x['Destination'] == '/usr/share/sonic/hwsku']; print '' if len(mnts) == 0 else os.path.abspath(mnts[0]['Source'])" 2>/dev/null
+    echo $1 | python -c "import sys, json, os; mnts = [x for x in json.load(sys.stdin)[0]['Mounts'] if x['Destination'] == '/usr/share/sonic/hwsku']; print('' if len(mnts) == 0 else os.path.abspath(mnts[0]['Source']))" 2>/dev/null
 }
 
 function getBootType()