sonic-net · lguohan · Jan 24, 2020 · Jan 20, 2020
@@ -130,12 +130,16 @@ ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
     DOCKER_SERVICE_SAFE_KILLER :=  (MARCH_PID=`ps -eo pid,cmd | grep "[0-9] dockerd.*march" | awk '{print $$1}'`; echo "Killing march docker $$MARCH_PID"; [ -z "$$MARCH_PID" ] || sudo kill -9 "$$MARCH_PID";)
     DOCKER_SERVICE_MULTIARCH_CHECK := ($(DOCKER_SERVICE_SAFE_KILLER); sudo rm -fr /var/run/march/; (echo "Starting docker march service..."; sudo $(SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH) &) &>/dev/null ; sleep 2; sudo $(SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH);)
 
-   # Docker service to load the compiled dockers-*.gz 
-    SONIC_NATIVE_DOCKERD_FOR_DOCKERFS := rm -fr $(PWD)/dockerfs/; mkdir -p $(PWD)/dockerfs/; sudo dockerd --storage-driver=overlay2 --iptables=false \
-	--data-root $(PWD)/dockerfs/var/lib/docker/ --exec-root=$(PWD)/dockerfs/var/run/docker/ \
-	-H unix://$(PWD)/dockerfs/var/run/docker.sock -p $(PWD)/dockerfs/var/run/docker.pid &
-    SONIC_USERFACL_DOCKERD_FOR_DOCKERFS := setfacl -m user:$(USER):rw $(PWD)/dockerfs/var/run/docker.sock
-    DOCKER_SERVICE_DOCKERFS_CHECK := (sudo docker -H unix://$(PWD)/dockerfs/var/run/docker.sock info &> /dev/null && sudo kill -9 `sudo cat $(PWD)/dockerfs/var/run/docker.pid`  && false) || (echo "Starting docker build service..."; (sudo $(SONIC_NATIVE_DOCKERD_FOR_DOCKERFS) ) &>/dev/null ; sleep 1; sudo $(SONIC_USERFACL_DOCKERD_FOR_DOCKERFS);)
+    # Docker service to load the compiled dockers-*.gz
+    # docker 19.0 version above has path/length restriction, so replaced it with soft link in /tmp/
+    # Also dockerd does mkdir on the provided softlink, so used two level path "d/d"
+    D_ROOT=/tmp/d/d
+    SONIC_NATIVE_DOCKERD_FOR_DOCKERFS := rm -fr $(PWD)/dockerfs; mkdir -p $(PWD)/dockerfs; sudo rm -fr /tmp/d; mkdir -p /tmp/d; ln -s -f $(PWD)/dockerfs $(D_ROOT); \
+					sudo dockerd --storage-driver=overlay2 --iptables=false \
+					--data-root $(D_ROOT)/var/lib/docker/ --exec-root=$(D_ROOT)/var/run/docker/ \
+					-H unix://$(D_ROOT)/var/run/docker.sock -p $(D_ROOT)/var/run/docker.pid &
+    SONIC_USERFACL_DOCKERD_FOR_DOCKERFS := setfacl -m user:$(USER):rw $(D_ROOT)/var/run/docker.sock
+    DOCKER_SERVICE_DOCKERFS_CHECK := (sudo docker -H unix://$(D_ROOT)/var/run/docker.sock info &> /dev/null && sudo kill -9 `sudo cat $(D_ROOT)/var/run/docker.pid`  && false) || (echo "Starting docker build service..."; (sudo $(SONIC_NATIVE_DOCKERD_FOR_DOCKERFS) ) &> /tmp/dockerfs.log ; sleep 1; sudo $(SONIC_USERFACL_DOCKERD_FOR_DOCKERFS);)
 
 endif
 

@@ -500,8 +500,8 @@ fi
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove gcc libpython2.7-dev
 
 ## Add mtd and uboot firmware tools package
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools mtd-utils
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-mark manual u-boot-tools mtd-utils
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools mtd-utils device-tree-compiler
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-mark manual u-boot-tools mtd-utils device-tree-compiler
 
 ## Update initramfs
 sudo chroot $FILESYSTEM_ROOT update-initramfs -u
@@ -510,10 +510,13 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
     INITRD_FILE=initrd.img-${LINUX_KERNEL_VERSION}-${CONFIGURED_ARCH}
     if [[ $CONFIGURED_ARCH == armhf ]]; then
         INITRD_FILE=initrd.img-${LINUX_KERNEL_VERSION}-armmp
+        sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -A arm -O linux -T ramdisk -C gzip -d /boot/$INITRD_FILE /boot/u${INITRD_FILE}
+        ## Overwriting the initrd image with uInitrd
+        sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
+    elif [[ $CONFIGURED_ARCH == arm64 ]]; then
+        sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
+        sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
     fi
-    sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -A arm -O linux -T ramdisk -C gzip -d /boot/$INITRD_FILE /boot/u${INITRD_FILE}
-    ## Overwriting the initrd image with uInitrd
-    sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
 fi
 
 ## Clean up apt

@@ -56,12 +56,10 @@ RUN apt-get update &&        \
         lua-bitop            \
         lua-cjson
 
-{% if CONFIGURED_ARCH == "armhf" %}
-# ip and ifconfig utility missing in docker for armhf
+# ip and ifconfig utility missing in docker for arm arch
 RUN apt-get -y install       \
         iproute2             \
         net-tools
-{% endif %}
 
 RUN mkdir -p /etc/supervisor /var/log/supervisor
 

@@ -1,9 +1,18 @@
 #!/bin/sh
 
-#  Copyright (C) 2014,2015 Curt Brune <[email protected]>
-#  Copyright (C) 2015 david_yang <[email protected]>
+#  Copyright (C) Marvell Inc
 #
-#  SPDX-License-Identifier:     GPL-2.0
+
+_trap_push() {
+    local next="$1"
+    eval "trap_push() {
+        local oldcmd='$(echo "$next" | sed -e s/\'/\'\\\\\'\'/g)'
+        local newcmd=\"\$1; \$oldcmd\"
+        trap -- \"\$newcmd\" EXIT INT TERM HUP
+        _trap_push \"\$newcmd\"
+    }"
+}
+_trap_push true
 
 set -e
 
@@ -28,35 +37,124 @@ if [ -r ./onie-image-arm64.conf ]; then
     . ./onie-image-arm64.conf
 fi
 
+echo "ONIE Installer: platform: $platform"
 
-echo "Installer: platform: $platform"
+# Make sure run as root or under 'sudo'
+if [ $(id -u) -ne 0 ]
+    then echo "Please run as root"
+    exit 1
+fi
 
-install_uimage() {
-    echo "Copying uImage to NOR flash:"
-    flashcp -v demo-${platform}.itb $mtd_dev
-}
+if [ -r /etc/machine.conf ]; then
+    . /etc/machine.conf
+elif [ -r /host/machine.conf ]; then
+    . /host/machine.conf
+elif [ "$install_env" != "build" ]; then
+    echo "cannot find machine.conf"
+    exit 1
+fi
+
+echo "onie_platform: $onie_platform"
+
+# Get platform specific linux kernel command line arguments
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX=""
+
+# Default var/log device size in MB
+VAR_LOG_SIZE=4096
+
+[ -r platforms/$onie_platform ] && . platforms/$onie_platform
+
+
+# If running in ONIE
+if [ "$install_env" = "onie" ]; then
+    # The onie bin tool prefix
+    onie_bin=
+    # The persistent ONIE directory location
+    onie_root_dir=/mnt/onie-boot/onie
+    # The onie file system root
+    onie_initrd_tmp=/
+fi
+
+# The build system prepares this script by replacing %%DEMO-TYPE%%
+# with "OS" or "DIAG".
+demo_type="%%DEMO_TYPE%%"
+
+# The build system prepares this script by replacing %%IMAGE_VERSION%%
+# with git revision hash as a version identifier
+image_version="%%IMAGE_VERSION%%"
+timestamp="$(date -u +%Y%m%d)"
+
+demo_volume_label="SONiC-${demo_type}"
+demo_volume_revision_label="SONiC-${demo_type}-${image_version}"
 
-hw_load() {
-    echo "cp.b $img_start \$loadaddr $img_sz"
-}
 
 . ./platform.conf
 
-install_uimage
+image_dir="image-$image_version"
+
+if [ "$install_env" = "onie" ]; then
+    # Create/format the flash
+    create_partition
+    mount_partition
+elif [ "$install_env" = "sonic" ]; then
+    demo_mnt="/host"
+    eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
+    # Prevent installing existing SONiC if it is running
+    if [ "$image_dir" = "image-$running_sonic_revision" ]; then
+        echo "Not installing SONiC version $running_sonic_revision, as current running SONiC has the same version"
+        exit 0
+    fi
+    # Remove extra SONiC images if any
+    for f in $demo_mnt/image-* ; do
+        if [ -d $f ] && [ "$f" != "$demo_mnt/image-$running_sonic_revision" ] && [ "$f" != "$demo_mnt/$image_dir" ]; then
+            echo "Removing old SONiC installation $f"
+            rm -rf $f
+        fi
+    done
+fi
 
-hw_load_str="$(hw_load)"
+# Create target directory or clean it up if exists
+if [ -d $demo_mnt/$image_dir ]; then
+    echo "Directory $demo_mnt/$image_dir/ already exists. Cleaning up..."
+    rm -rf $demo_mnt/$image_dir/*
+else
+    mkdir $demo_mnt/$image_dir || {
+        echo "Error: Unable to create SONiC directory"
+        exit 1
+    }
+fi
 
-echo "Updating U-Boot environment variables"
-(cat <<EOF
-hw_load $hw_load_str
-copy_img echo "Loading Demo $platform image..." && run hw_load
-nos_bootcmd run copy_img && setenv bootargs quiet console=\$consoledev,\$baudrate && bootm \$loadaddr
-EOF
-) > /tmp/env.txt
+# Decompress the file for the file system directly to the partition
+if [ x"$docker_inram" = x"on" ]; then
+    # when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
+    unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt/$image_dir
+else
+    unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" -d $demo_mnt/$image_dir
+
+    if [ "$install_env" = "onie" ]; then
+        TAR_EXTRA_OPTION="--numeric-owner"
+    else
+        TAR_EXTRA_OPTION="--numeric-owner --warning=no-timestamp"
+    fi
+    mkdir -p $demo_mnt/$image_dir/$DOCKERFS_DIR
+    unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
+fi
 
-fw_setenv -f -s /tmp/env.txt
 
-cd /
+if [ "$install_env" = "onie" ]; then
+    # Store machine description in target file system
+    if [ -f /etc/machine-build.conf ]; then
+        # onie_ variable are generate at runtime.
+        # they are no longer hardcoded in /etc/machine.conf
+        # also remove single quotes around the value
+        set | grep ^onie | sed -e "s/='/=/" -e "s/'$//" > $demo_mnt/machine.conf
+    else
+        cp /etc/machine.conf $demo_mnt
+    fi
+fi
+
+# Update Bootloader Menu with installed image
+bootloader_menu_config
 
 # Set NOS mode if available.  For manufacturing diag installers, you
 # probably want to skip this step so that the system remains in ONIE

@@ -24,6 +24,9 @@ FILESYSTEM_DOCKERFS=dockerfs.tar.gz
 ## docker directory on the root filesystem
 DOCKERFS_DIR=docker
 
+## docker ramfs disk space
+DOCKER_RAMFS_SIZE=900M
+
 ## Output file name for onie installer
 OUTPUT_ONIE_IMAGE=target/sonic-$TARGET_MACHINE.bin
 

@@ -3,7 +3,6 @@
 DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz
 $(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
 $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
-$(DOCKER_SAISERVER_MRVL)_FILES += $(DSSERVE) $(BCMCMD)
 $(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
 

@@ -1,10 +1,7 @@
 # linux kernel package for marvell arm64
 
-KVERSION = 4.9.168
-
-
-LINUX_KERNEL = linux-image-4.9.168-arm64.deb
-export LINUX_KERNEL
-
-$(LINUX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/linux
-SONIC_MAKE_DEBS += $(LINUX_KERNEL)
+# Add platform specific DTB
+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)
@@ -2,9 +2,9 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-LINUX_KERNEL_MRVL_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/arm64/kernel/$(LINUX_KERNEL)
+LINUX_KERNEL_MRVL_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/arm64/kernel/$(LINUX_KERNEL_DTB)
 
-$(addprefix $(DEST)/, $(LINUX_KERNEL)): $(DEST)/% :
+$(addprefix $(DEST)/, $(LINUX_KERNEL_DTB)): $(DEST)/% :
 	# get deb package
-	wget -O $(DEST)/$(LINUX_KERNEL) $(LINUX_KERNEL_MRVL_URL)
+	wget -O $(DEST)/$(LINUX_KERNEL_DTB) $(LINUX_KERNEL_MRVL_URL)
 
@@ -4,6 +4,7 @@ SONIC_ONE_IMAGE = sonic-marvell-arm64.bin
 $(SONIC_ONE_IMAGE)_MACHINE = marvell-arm64
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
+$(SONIC_ONE_IMAGE)_INSTALLS += $(LINUX_KERNEL_DTB)
 ifeq ($(INSTALL_DEBUG_TOOLS),y)
 $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
 $(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))