Skip to content

Commit

Permalink
remove multistrap files
Browse files Browse the repository at this point in the history
Signed-off-by: Bo YU <[email protected]>
  • Loading branch information
yuzibo committed Dec 26, 2023
1 parent fa80bab commit a5c65f3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 43 deletions.
6 changes: 0 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ RUN --mount=type=cache,sharing=shared,target=/var/cache \
#WORKDIR /build
#COPY rootfs/multistrap_nvme.conf multistrap.conf

#RUN --mount=type=cache,sharing=shared,target=/var/cache \
# --mount=type=cache,sharing=shared,target=/var/lib/apt/lists \
# --mount=type=tmpfs,target=/usr/share/man \
# --mount=type=tmpfs,target=/usr/share/doc \
# eatmydata multistrap -f multistrap.conf


FROM builder as build_image
Expand All @@ -44,4 +39,3 @@ COPY rootfs/setup_rootfs.sh ./rv64-port/
COPY rootfs/setup_rootfs.sh /tmp

CMD /builder/build.sh ${KERNEL_VERSION}

27 changes: 0 additions & 27 deletions rootfs/multistrap_nvme.conf

This file was deleted.

17 changes: 7 additions & 10 deletions rootfs/setup_rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ fi

kernel_image=${lib_dir##*/}

# set default dtb file, please verify your board version

cd ${lib_dir}/starfive/
ln -s jh7110-starfive-visionfive-2-v1.2a.dtb jh7110-visionfive-v2.dtb
cd -


# cp your latest dtb file,e.g, cp /usr/lib/linux-image-xx-riscv64
# need you confirm it here
Expand All @@ -70,20 +76,11 @@ EOF

cat /boot/extlinux/extlinux.conf

#dpkg-reconfigure ${kernel_image}

# update u-boot
#update-initramfs -c -k all
sed -i -e 's|append |append root=/dev/mmcblk1p3 |' /boot/extlinux/extlinux.conf

u-boot-update

# boot from sd card
cat <<EOF >> /boot/scripts.txt
sed -i -e 's|root=[^ ]*|root=/dev/mmcblk1p3|' /boot/extlinux/extlinux.conf
cd ${lib_dir}/starfive/
ln -s jh7110-starfive-visionfive-2-v1.2a.dtb jh7110-visionfive-v2.dtb
cd -
EOF

# double check
cat /boot/extlinux/extlinux.conf
Expand Down

0 comments on commit a5c65f3

Please sign in to comment.