Use the platform.tar.gz as a replacement for platform folder

Author: xumia

build_debian.sh

@@ -647,5 +647,5 @@ fi
 pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo zip --symlinks $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
+pushd $FILESYSTEM_ROOT && sudo tar czf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
 sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS

files/Aboot/boot0.j2

@@ -350,6 +350,12 @@ extract_image() {
     ## Unzip the image except boot0 and dockerfs archive
     unzip -oq "$swipath" -x boot0 "$dockerfs" -d "$image_path"
 
+    ## Extrat the platform.tar.gz
+    info "Extracting platform.tar.gz"
+    mkdir -p $image_path/platform
+    tar xzf $image_path/platform.tar.gz -C $image_path/platform
+    rm -rf $image_path/platform.tar.gz
+
     ## detect rootfs type
     local mountstr="$(grep " $target_path " /proc/mounts)"
     local rootdev="$(echo $mountstr | cut -f1 -d' ')"

installer/arm64/install.sh

@@ -168,6 +168,9 @@ else
     unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
 fi
 
+mkdir -p $demo_mnt/$image_dir/platform
+tar xzf $demo_mnt/$image_dir/platform.tar.gz -C $demo_mnt/$image_dir/platform
+rm -rf $demo_mnt/$image_dir/platform.tar.gz
 
 if [ "$install_env" = "onie" ]; then
     # Store machine description in target file system

installer/armhf/install.sh

@@ -168,6 +168,9 @@ else
     unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
 fi
 
+mkdir -p $demo_mnt/$image_dir/platform
+tar xzf $demo_mnt/$image_dir/platform.tar.gz -C $demo_mnt/$image_dir/platform
+rm -rf $demo_mnt/$image_dir/platform.tar.gz
 
 if [ "$install_env" = "onie" ]; then
     # Store machine description in target file system

installer/x86_64/install.sh

@@ -549,6 +549,10 @@ else
     unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
 fi
 
+mkdir -p $demo_mnt/$image_dir/platform
+tar xzf $demo_mnt/$image_dir/platform.tar.gz -C $demo_mnt/$image_dir/platform
+rm -rf $demo_mnt/$image_dir/platform.tar.gz
+
 if [ "$install_env" = "onie" ]; then
     # Store machine description in target file system
     if [ -f /etc/machine-build.conf ]; then