File tree 6 files changed +23
-9
lines changed
6 files changed +23
-9
lines changed Original file line number Diff line number Diff line change 647
647
pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD /$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH} var/lib/docker . ; popd
648
648
649
649
# # Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
650
- pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD /$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR / ; popd
650
+ 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
651
651
sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS
Original file line number Diff line number Diff line change @@ -348,7 +348,12 @@ extract_image() {
348
348
349
349
info " Extracting swi content"
350
350
# # Unzip the image except boot0 and dockerfs archive
351
- unzip -oq " $swipath " -x boot0 " $dockerfs " -d " $image_path "
351
+ unzip -oq " $swipath " -x boot0 " $dockerfs " " platform.tar.gz" -d " $image_path "
352
+
353
+ # # Extract the platform.tar.gz
354
+ info " Extracting platform.tar.gz"
355
+ mkdir -p " $image_path /platform"
356
+ unzip -oqp " $swipath " " platform.tar.gz" | tar xzf - -C " $image_path /platform" $TAR_EXTRA_OPTION
352
357
353
358
# # detect rootfs type
354
359
local mountstr=" $( grep " $target_path " /proc/mounts) "
Original file line number Diff line number Diff line change @@ -614,7 +614,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT depmod -a {{kversion}}
614
614
sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f --download-only
615
615
616
616
sudo mkdir -p $FILESYSTEM_ROOT /$PLATFORM_DIR /{{dev}}
617
- sudo cp {{ deb }} $FILESYSTEM_ROOT /$PLATFORM_DIR /{{dev}}/
617
+ sudo mkdir -p $FILESYSTEM_ROOT /$PLATFORM_DIR /common
618
+ sudo cp {{ deb }} $FILESYSTEM_ROOT /$PLATFORM_DIR /common/
619
+ sudo ln -sf " ../common/{{ debfilename }}" " $FILESYSTEM_ROOT /$PLATFORM_DIR /{{dev}}/{{ debfilename }}"
618
620
for f in $( find $FILESYSTEM_ROOT /var/cache/apt/archives -name " *.deb" ) ; do
619
621
sudo mv $f $FILESYSTEM_ROOT /$PLATFORM_DIR /{{dev}}/
620
622
done
Original file line number Diff line number Diff line change 155
155
# Decompress the file for the file system directly to the partition
156
156
if [ x" $docker_inram " = x" on" ]; then
157
157
# when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
158
- unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt /$image_dir
158
+ unzip -o $ONIE_INSTALLER_PAYLOAD -x " platform.tar.gz " - d $demo_mnt /$image_dir
159
159
else
160
- unzip -o $ONIE_INSTALLER_PAYLOAD -x " $FILESYSTEM_DOCKERFS " -d $demo_mnt /$image_dir
160
+ unzip -o $ONIE_INSTALLER_PAYLOAD -x " $FILESYSTEM_DOCKERFS " " platform.tar.gz " -d $demo_mnt /$image_dir
161
161
162
162
if [ " $install_env " = " onie" ]; then
163
163
TAR_EXTRA_OPTION=" --numeric-owner"
168
168
unzip -op $ONIE_INSTALLER_PAYLOAD " $FILESYSTEM_DOCKERFS " | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt /$image_dir /$DOCKERFS_DIR
169
169
fi
170
170
171
+ mkdir -p $demo_mnt /$image_dir /platform
172
+ unzip -op $ONIE_INSTALLER_PAYLOAD " platform.tar.gz" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt /$image_dir /platform
171
173
172
174
if [ " $install_env " = " onie" ]; then
173
175
# Store machine description in target file system
Original file line number Diff line number Diff line change 155
155
# Decompress the file for the file system directly to the partition
156
156
if [ x" $docker_inram " = x" on" ]; then
157
157
# when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
158
- unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt /$image_dir
158
+ unzip -o $ONIE_INSTALLER_PAYLOAD -x " platform.tar.gz " - d $demo_mnt /$image_dir
159
159
else
160
- unzip -o $ONIE_INSTALLER_PAYLOAD -x " $FILESYSTEM_DOCKERFS " -d $demo_mnt /$image_dir
160
+ unzip -o $ONIE_INSTALLER_PAYLOAD -x " $FILESYSTEM_DOCKERFS " " platform.tar.gz " -d $demo_mnt /$image_dir
161
161
162
162
if [ " $install_env " = " onie" ]; then
163
163
TAR_EXTRA_OPTION=" --numeric-owner"
168
168
unzip -op $ONIE_INSTALLER_PAYLOAD " $FILESYSTEM_DOCKERFS " | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt /$image_dir /$DOCKERFS_DIR
169
169
fi
170
170
171
+ mkdir -p $demo_mnt /$image_dir /platform
172
+ unzip -op $ONIE_INSTALLER_PAYLOAD " platform.tar.gz" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt /$image_dir /platform
171
173
172
174
if [ " $install_env " = " onie" ]; then
173
175
# Store machine description in target file system
Original file line number Diff line number Diff line change 536
536
# Decompress the file for the file system directly to the partition
537
537
if [ x" $docker_inram " = x" on" ]; then
538
538
# when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
539
- unzip -o $ONIE_INSTALLER_PAYLOAD -d $demo_mnt /$image_dir
539
+ unzip -o $ONIE_INSTALLER_PAYLOAD -x " platform.tar.gz " - d $demo_mnt /$image_dir
540
540
else
541
- unzip -o $ONIE_INSTALLER_PAYLOAD -x " $FILESYSTEM_DOCKERFS " -d $demo_mnt /$image_dir
541
+ unzip -o $ONIE_INSTALLER_PAYLOAD -x " $FILESYSTEM_DOCKERFS " " platform.tar.gz " -d $demo_mnt /$image_dir
542
542
543
543
if [ " $install_env " = " onie" ]; then
544
544
TAR_EXTRA_OPTION=" --numeric-owner"
549
549
unzip -op $ONIE_INSTALLER_PAYLOAD " $FILESYSTEM_DOCKERFS " | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt /$image_dir /$DOCKERFS_DIR
550
550
fi
551
551
552
+ mkdir -p $demo_mnt /$image_dir /platform
553
+ unzip -op $ONIE_INSTALLER_PAYLOAD " platform.tar.gz" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt /$image_dir /platform
554
+
552
555
if [ " $install_env " = " onie" ]; then
553
556
# Store machine description in target file system
554
557
if [ -f /etc/machine-build.conf ]; then
You can’t perform that action at this time.
0 commit comments