diff --git a/Dockerfile b/Dockerfile index f5d3046..795c3fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -44,4 +39,3 @@ COPY rootfs/setup_rootfs.sh ./rv64-port/ COPY rootfs/setup_rootfs.sh /tmp CMD /builder/build.sh ${KERNEL_VERSION} - diff --git a/rootfs/multistrap_nvme.conf b/rootfs/multistrap_nvme.conf deleted file mode 100644 index a31d197..0000000 --- a/rootfs/multistrap_nvme.conf +++ /dev/null @@ -1,27 +0,0 @@ -[General] -arch=riscv64 -directory=/build/rv64-sid -unpack=true -noauth=false -bootstrap=Debian -aptsources=Debian -cleanup=true - -[Debian] -packages=adduser base-passwd base-files bash bsdutils coreutils dash -packages=apt debconf debian-archive-keyring debianutils diffutils dpkg e2fsprogs findutils gpgv grep gzip hostname libacl1 libapt-pkg6.0 libattr1 libaudit-common libaudit1 libblkid1 libbz2-1.0 libc-bin libc6 libcap-ng0 libcap2 libcom-err2 libcrypt1 libdb5.3 libdebconfclient0 libext2fs2 libffi8 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed6 libidn2-0 liblz4-1 liblzma5 libmount1 libnettle8 libpam-modules libpam-modules-bin libpam-runtime libpam0g libpcre2-8-0 libpcre3 libseccomp2 libselinux1 libsemanage-common libsemanage2 libsepol2 libsmartcols1 libss2 libstdc++6 libtasn1-6 libtinfo6 libudev1 libunistring5 libuuid1 libxxhash0 libzstd1 login logsave lsb-base mawk mount ncurses-base ncurses-bin passwd perl-base sed tar tzdata zstd -packages=zlib1g apt-utils cpio cron debconf-i18n dmidecode dmsetup fdisk ifupdown iproute2 iputils-ping kmod less libapparmor1 libargon2-1 libbpf1 libbsd0 libcap2-bin libcryptsetup12 libdevmapper1.02.1 libedit2 libelf1 libestr0 libfastjson4 libfdisk1 libip4tc2 libjansson4 libjson-c5 libkmod2 liblocale-gettext-perl liblognorm5 libmd0 libmnl0 libncurses6 libncursesw6 libnewt0.52 libnftables1 libnftnl11 libpopt0 libreadline8 libslang2 libssl3 libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl libxtables12 logrotate nano netbase nftables procps readline-common sensible-utils -packages=pciutils p11-kit udev vim whiptail xxd -packages=util-linux util-linux-extra rsyslog dbus -packages=systemd systemd-sysv libsystemd0 -packages=tasksel tasksel-data -packages=net-tools openssh-server network-manager -packages=curl gpg openssl ca-certificates sudo psmisc swig tmux -packages=lshw lm-sensors -packages=u-boot-menu initramfs-tools -packages=eatmydata -source=http://deb.debian.org/debian/ -keyring=debian-archive-keyring -suite=unstable -components=main contrib non-free -omitdebsrc=true diff --git a/rootfs/setup_rootfs.sh b/rootfs/setup_rootfs.sh index 94471ab..627ec74 100755 --- a/rootfs/setup_rootfs.sh +++ b/rootfs/setup_rootfs.sh @@ -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 @@ -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 <> /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