Skip to content

Commit

Permalink
Addressing review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
shanshri committed Nov 28, 2023
1 parent f32fc26 commit 7190c62
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 282 deletions.
272 changes: 0 additions & 272 deletions device/pensando/arm64-elba-asic-r0/config_db.json

This file was deleted.

16 changes: 8 additions & 8 deletions files/dsc/install_debian.j2
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@ cat <<EOF >> $root_mnt/$BL_CONF
default main
label main
kernel /$image_dir/boot/vmlinuz-5.10.0-18-2-arm64
initrd /$image_dir/boot/initrd.img-5.10.0-18-2-arm64
devicetree /$image_dir/boot/elba-asic-psci.dtb
append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
kernel /$image_dir/boot/vmlinuz-5.10.0-18-2-arm64
initrd /$image_dir/boot/initrd.img-5.10.0-18-2-arm64
devicetree /$image_dir/boot/elba-asic-psci.dtb
append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
}
EOF
}
Expand All @@ -257,19 +257,19 @@ install_root_filesystem()
echo "==> Installing root filesystem"

mount /dev/mmcblk0p$root_pn $root_mnt
mkdir -p $root_mnt/$image_dir
mkdir -p $root_mnt/$image_dir

# Decompress the file for the file system directly to the partition
if [ x"$docker_inram" = x"on" ]; then
if [ x"$docker_inram" = x"on" ]; then
# when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -o - -x "platform.tar.gz" -d $root_mnt/$image_dir
else
else
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -o - -x "$FILESYSTEM_DOCKERFS" "platform.tar.gz" -d $root_mnt/$image_dir

TAR_EXTRA_OPTION="--numeric-owner"
mkdir -p $root_mnt/$image_dir/$DOCKERFS_DIR
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -op - "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $root_mnt/$image_dir/$DOCKERFS_DIR
fi
fi

create_bootloader_conf

Expand Down
2 changes: 1 addition & 1 deletion platform/pensando/dsc-drivers/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
10
2 changes: 1 addition & 1 deletion platform/pensando/dsc-drivers/debian/control
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: ionic
Section: main
Priority: extra
Maintainer: Guohan Lu <gulv@microsoft.com>
Maintainer: Shantanu Shrivastava <shanshri@amd.com>
Build-Depends: debhelper (>= 8.0.0), bzip2
Standards-Version: 3.9.3
#Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git
Expand Down

0 comments on commit 7190c62

Please sign in to comment.