@@ -169,7 +169,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/linux-image-${LINUX_KERNEL_VERSI
169169 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
170170sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
171171if [[ $CONFIGURED_ARCH == amd64 ]]; then
172- sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode hdparm
172+ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install hdparm
173173fi
174174
175175# # Update initramfs for booting with squashfs+overlay
@@ -379,6 +379,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
379379 haveged \
380380 fdisk \
381381 gpg \
382+ dmidecode \
382383 jq \
383384 auditd \
384385 linux-perf \
@@ -391,6 +392,12 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
391392 zstd \
392393 nvme-cli
393394
395+ sudo cp files/initramfs-tools/pzstd $FILESYSTEM_ROOT /etc/initramfs-tools/hooks/pzstd
396+ sudo chmod +x $FILESYSTEM_ROOT /etc/initramfs-tools/hooks/pzstd
397+
398+ sudo cp files/initramfs-tools/file $FILESYSTEM_ROOT /etc/initramfs-tools/hooks/file
399+ sudo chmod +x $FILESYSTEM_ROOT /etc/initramfs-tools/hooks/file
400+
394401# Have systemd create the auditd log directory
395402sudo mkdir -p ${FILESYSTEM_ROOT} /etc/systemd/system/auditd.service.d
396403sudo tee ${FILESYSTEM_ROOT} /etc/systemd/system/auditd.service.d/log-directory.conf > /dev/null << EOF
@@ -747,7 +754,10 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then
747754 elif [[ $CONFIGURED_ARCH == arm64 ]]; then
748755 if [[ $CONFIGURED_PLATFORM == pensando ]]; then
749756 # # copy device tree file into boot (XXX: need to compile dtb from dts)
750- sudo cp -v $PLATFORM_DIR /pensando/elba-asic-psci.dtb $FILESYSTEM_ROOT /boot/
757+ sudo cp -v $FILESYSTEM_ROOT /usr/lib/linux-image-${LINUX_KERNEL_VERSION} -${CONFIGURED_ARCH} /pensando/elba-asic-psci.dtb $FILESYSTEM_ROOT /boot/
758+ sudo cp -v $FILESYSTEM_ROOT /usr/lib/linux-image-${LINUX_KERNEL_VERSION} -${CONFIGURED_ARCH} /pensando/elba-asic-psci-lipari.dtb $FILESYSTEM_ROOT /boot/
759+ sudo cp -v $FILESYSTEM_ROOT /usr/lib/linux-image-${LINUX_KERNEL_VERSION} -${CONFIGURED_ARCH} /pensando/elba-asic-psci-mtfuji.dtb $FILESYSTEM_ROOT /boot/
760+ sudo cp -v $PLATFORM_DIR /pensando/install_file $FILESYSTEM_ROOT /boot/
751761 # # make kernel as gzip file
752762 sudo LANG=C chroot $FILESYSTEM_ROOT gzip /boot/${KERNEL_FILE}
753763 sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/${KERNEL_FILE} .gz /boot/${KERNEL_FILE}
@@ -851,7 +861,11 @@ if [[ $MULTIARCH_QEMU_ENVIRON == y || $CROSS_BUILD_ENVIRON == y ]]; then
851861fi
852862
853863# # Compress docker files
854- pushd $FILESYSTEM_ROOT && sudo tar -I pigz -c f $OLDPWD /$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH} var/lib/docker . ; popd
864+ if [ " $BUILD_REDUCE_IMAGE_SIZE " = " y" ; then
865+ pushd $FILESYSTEM_ROOT && sudo tar -I pzstd -cf $OLDPWD /$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH} var/lib/docker . ; popd
866+ else
867+ pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD /$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH} var/lib/docker . ; popd
868+ fi
855869
856870# # Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
857871pushd $FILESYSTEM_ROOT && sudo tar -I pigz -c f platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD /$INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
0 commit comments