-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26 from iyesin/fix_simplify_speedup
Fix, simplify and speedup image build
- Loading branch information
Showing
8 changed files
with
97 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,28 +2,20 @@ FROM debian:bullseye as builder | |
| MAINTAINER Tim Molteno "[email protected]" | ||
| ARG DEBIAN_FRONTEND=noninteractive | ||
|
|
||
| RUN apt-get update && apt-get install -y autoconf automake autotools-dev curl python3 libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev swig libssl-dev python3-distutils python3-dev git | ||
| RUN apt-get update \ | ||
| && apt-get install -y eatmydata \ | ||
| && eatmydata apt-get install -y autoconf automake autotools-dev bc binfmt-support \ | ||
| bison build-essential cpio curl debian-ports-archive-keyring \ | ||
| dosfstools e2fsprogs fdisk flex gawk gcc-riscv64-linux-gnu \ | ||
| git gperf g++-riscv64-linux-gnu kmod kpartx libexpat-dev \ | ||
| libgmp-dev libmpc-dev libmpfr-dev libssl-dev \ | ||
| libtool mmdebstrap multistrap openssl parted \ | ||
| patchutils python3 python3-dev python3-distutils \ | ||
| python3-setuptools qemu-user-static swig \ | ||
| systemd-container texinfo zlib1g-dev | ||
|
|
||
| RUN apt-get install -y gcc-riscv64-linux-gnu g++-riscv64-linux-gnu | ||
| ENV CROSS="CROSS_COMPILE=riscv64-linux-gnu-" | ||
| RUN riscv64-linux-gnu-gcc --version | grep gcc | cut -d')' -f2 | ||
| # WORKDIR /build | ||
| # ARG GNU_TOOLS_TAG | ||
| # RUN git config --global advice.detachedHead false | ||
| # RUN git clone --recursive --depth 1 --branch ${GNU_TOOLS_TAG} https://github.com/riscv/riscv-gnu-toolchain | ||
| # WORKDIR /build/riscv-gnu-toolchain | ||
| # RUN git checkout ${GNU_TOOLS_TAG} | ||
| # RUN ./configure --prefix=/opt/riscv64-unknown-linux-gnu --with-arch=rv64gc --with-abi=lp64d | ||
| # RUN make linux -j $(nproc) | ||
| # ENV PATH="/opt/riscv64-unknown-linux-gnu/bin:$PATH" | ||
|
|
||
| # ARG CROSS=CROSS_COMPILE=/build/riscv64-unknown-linux-gnu/bin/riscv64-unknown-linux-gnu- | ||
| # ENV CROSS=CROSS_COMPILE=riscv64-unknown-linux-gnu- | ||
|
|
||
| # Clean up | ||
| # WORKDIR /build | ||
| # RUN rm -rf riscv-gnu-toolchain | ||
|
|
||
|
|
||
|
|
||
| ############################################################################################ | ||
|
|
@@ -34,7 +26,7 @@ FROM builder as build_opensbi | |
| WORKDIR /build | ||
| RUN git clone --depth 1 https://github.com/riscv-software-src/opensbi | ||
| WORKDIR /build/opensbi | ||
| RUN make $CROSS PLATFORM=generic FW_PIC=y FW_OPTIONS=0x2 | ||
| RUN eatmydata make $CROSS PLATFORM=generic FW_PIC=y FW_OPTIONS=0x2 | ||
| # The binary is located here: /build/opensbi/build/platform/generic/firmware/fw_dynamic.bin | ||
|
|
||
|
|
||
|
|
@@ -45,35 +37,31 @@ RUN make $CROSS PLATFORM=generic FW_PIC=y FW_OPTIONS=0x2 | |
| FROM builder as build_kernel | ||
| ARG KERNEL_TAG | ||
| ARG KERNEL_COMMIT | ||
| RUN apt-get install -y cpio # Required for kernel build | ||
| WORKDIR /build | ||
| RUN git clone --depth 1 --branch ${KERNEL_TAG} https://github.com/smaeul/linux | ||
| WORKDIR /build/linux | ||
| RUN git checkout ${KERNEL_COMMIT} | ||
| RUN eatmydata git clone --depth 1 --branch ${KERNEL_TAG} https://github.com/smaeul/linux | ||
| RUN cd linux && eatmydata git checkout ${KERNEL_COMMIT} && cd - | ||
| WORKDIR /build/linux/drivers/net/wireless | ||
| RUN git clone --depth 1 https://github.com/YuzukiHD/Xradio-XR829.git | ||
| RUN eatmydata git clone --depth 1 https://github.com/YuzukiHD/Xradio-XR829.git | ||
| RUN echo 'obj-$(CONFIG_XR829_WLAN) += Xradio-XR829/' >> Makefile | ||
| WORKDIR /build/linux | ||
| #RUN git checkout riscv/d1-wip | ||
| #RUN git checkout d1-wip-v5.18-rc4 | ||
| COPY kernel/update_kernel_config.sh . | ||
| RUN ./update_kernel_config.sh defconfig | ||
| WORKDIR /build | ||
| RUN make ARCH=riscv -C linux O=../linux-build defconfig | ||
| RUN make -j $(nproc) -C linux-build ARCH=riscv $CROSS V=0 | ||
| RUN eatmydata make ARCH=riscv -C linux O=../linux-build defconfig | ||
| RUN eatmydata make -j $(nproc) -C linux-build ARCH=riscv $CROSS V=0 | ||
| # Files reside in /build/linux-build/arch/riscv/boot/Image.gz | ||
| RUN apt-get install -y kmod | ||
| # RUN make -j $(nproc) -C linux-build ARCH=riscv $CROSS INSTALL_MOD_PATH=/build/modules modules_install | ||
|
|
||
|
|
||
|
|
||
| # | ||
| # Build wifi modules | ||
| # | ||
| WORKDIR /build | ||
| RUN git clone --depth 1 https://github.com/lwfinger/rtl8723ds.git | ||
| RUN eatmydata git clone --depth 1 https://github.com/lwfinger/rtl8723ds.git | ||
| WORKDIR /build/rtl8723ds | ||
| RUN make -j $(nproc) ARCH=riscv $CROSS KSRC=../linux-build modules | ||
| RUN eatmydata make -j $(nproc) ARCH=riscv $CROSS KSRC=../linux-build modules | ||
| RUN ls -l | ||
| # Module resides in /build/rtl8723ds/8723ds.ko | ||
|
|
||
|
|
@@ -85,18 +73,15 @@ RUN ls -l | |
| # Module resides in /build/xr829/xr829.ko | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ############################################################################################ | ||
| # | ||
| # Build u-boot | ||
| # | ||
| FROM builder as build_uboot | ||
| ARG UBOOT_TAG | ||
| ARG BOARD | ||
| RUN apt-get install -y python3-setuptools git | ||
| WORKDIR /build | ||
| RUN git clone --depth 1 --branch ${UBOOT_TAG} https://github.com/smaeul/u-boot.git | ||
| RUN eatmydata git clone --depth 1 --branch ${UBOOT_TAG} https://github.com/smaeul/u-boot.git | ||
| WORKDIR /build/u-boot | ||
|
|
||
| # Make sure we update the device tree and add the overlays | ||
|
|
@@ -108,16 +93,16 @@ RUN cat ./arch/riscv/dts/Makefile | |
| RUN if [ "$BOARD" = "lichee_rv_86" ] ; then \ | ||
| echo "Building for the RV_86_Panel"; \ | ||
| ./update_uboot_config.sh lichee_rv_86_panel_defconfig; \ | ||
| make $CROSS lichee_rv_86_panel_defconfig; \ | ||
| eatmydata make $CROSS lichee_rv_86_panel_defconfig; \ | ||
| elif [ "$BOARD" = "lichee_rv_dock" ] || [ "$BOARD" = "lichee_rv_lcd" ] ; then \ | ||
| echo "Building for Lichee RV Dock"; \ | ||
| ./update_uboot_config.sh lichee_rv_dock_defconfig; \ | ||
| make $CROSS lichee_rv_dock_defconfig; \ | ||
| eatmydata make $CROSS lichee_rv_dock_defconfig; \ | ||
| else \ | ||
| echo "ERROR: unknown board"; \ | ||
| fi | ||
| COPY --from=build_opensbi /build/opensbi/build/platform/generic/firmware/fw_dynamic.bin ./ | ||
| RUN make -j $(nproc) $CROSS all OPENSBI=fw_dynamic.bin V=1 | ||
| RUN eatmydata make -j $(nproc) $CROSS all OPENSBI=fw_dynamic.bin V=1 | ||
| RUN ls -l arch/riscv/dts/ | ||
| # The binary is located here: u-boot/arch/riscv/dts/sun20i-d1-lichee-rv-dock.dtb | ||
| # The binary is located here: u-boot/arch/riscv/dts/sun20i-d1-lichee-rv-86-panel.dtb | ||
|
|
@@ -128,60 +113,47 @@ RUN ls -l arch/riscv/dts/ | |
| WORKDIR /build | ||
| RUN ls -l | ||
| COPY config/bootscr_${BOARD}.txt . | ||
| RUN ./u-boot/tools/mkimage -T script -C none -O linux -A riscv -d bootscr_${BOARD}.txt boot.scr | ||
| RUN eatmydata ./u-boot/tools/mkimage -T script -C none -O linux -A riscv -d bootscr_${BOARD}.txt boot.scr | ||
| # The boot script is here: boot.scr | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ############################################################################################ | ||
| # | ||
| # Build the root filesystem | ||
| # | ||
| FROM builder as build_rootfs | ||
| ARG BOARD | ||
|
|
||
|
|
||
| RUN apt-get install -y mmdebstrap qemu-user-static binfmt-support debian-ports-archive-keyring | ||
| RUN apt-get install -y multistrap systemd-container | ||
| RUN apt-get install -y kmod | ||
|
|
||
| WORKDIR /build | ||
| COPY rootfs/multistrap_$BOARD.conf multistrap.conf | ||
|
|
||
| RUN ls | ||
| RUN multistrap -f multistrap.conf | ||
|
|
||
| RUN eatmydata multistrap -f multistrap.conf | ||
|
|
||
| # Now install the kernel modules into the rootfs | ||
| WORKDIR /build | ||
| COPY --from=build_kernel /build/linux-build/ ./linux-build/ | ||
| COPY --from=build_kernel /build/linux/ ./linux/ | ||
| COPY --from=build_kernel /build/rtl8723ds/8723ds.ko . | ||
| WORKDIR /build/linux-build | ||
| RUN make ARCH=riscv INSTALL_MOD_PATH=/port/rv64-port modules_install | ||
|
|
||
| RUN eatmydata make ARCH=riscv INSTALL_MOD_PATH=/port/rv64-port modules_install | ||
|
|
||
| RUN ls /port/rv64-port/lib/modules/ > /kernel_ver | ||
| RUN echo "export MODDIR=$(ls /port/rv64-port/lib/modules/)" > /moddef | ||
| RUN ls /port/rv64-port/lib/modules/ | ||
| RUN . /moddef; echo "Creating wireless module in ${MODDIR}" | ||
| RUN . /moddef; install -v -D -p -m 644 /build/8723ds.ko /port/rv64-port/lib/modules/${MODDIR}/kernel/drivers/net/wireless/8723ds.ko | ||
|
|
||
|
|
||
| RUN . /moddef && echo "Creating wireless module in ${MODDIR}" | ||
| RUN . /moddef && install -v -D -p -m 644 /build/8723ds.ko /port/rv64-port/lib/modules/${MODDIR}/kernel/drivers/net/wireless/8723ds.ko | ||
|
|
||
| RUN . /moddef; rm /port/rv64-port/lib/modules/${MODDIR}/build | ||
| RUN . /moddef; rm /port/rv64-port/lib/modules/${MODDIR}/source | ||
| RUN . /moddef && rm /port/rv64-port/lib/modules/${MODDIR}/build | ||
| RUN . /moddef && rm /port/rv64-port/lib/modules/${MODDIR}/source | ||
|
|
||
| RUN . /moddef; depmod -a -b /port/rv64-port "${MODDIR}" | ||
| RUN . /moddef && depmod -a -b /port/rv64-port "${MODDIR}" | ||
| RUN echo '8723ds' >> /port/rv64-port/etc/modules | ||
| RUN echo 'xr829' >> /port/rv64-port/etc/modules | ||
|
|
||
| # This may not be needed as it should be done by the networking setup. | ||
| # RUN cp /etc/resolv.conf /port/rv64-port/etc/resolv.conf | ||
|
|
||
|
|
||
|
|
||
| ############################################################################################ | ||
| # | ||
| # Now Build the disk image | ||
|
|
@@ -197,24 +169,14 @@ ENV GNU_TOOLS_TAG=$GNU_TOOLS_TAG | |
| ENV DISK_MB=$DISK_MB | ||
| ENV BOARD=$BOARD | ||
|
|
||
| RUN apt-get install -y kpartx parted | ||
|
|
||
| WORKDIR /builder | ||
| COPY --from=build_rootfs /kernel_ver ./kernel_ver | ||
| COPY --from=build_rootfs /kernel_ver ./ | ||
| COPY --from=build_rootfs /port/rv64-port/ ./rv64-port/ | ||
| COPY --from=build_kernel /build/linux-build/arch/riscv/boot/Image.gz /build/linux/arch/riscv/configs/defconfig ./ | ||
| COPY --from=build_uboot /build/boot.scr /build/u-boot/u-boot-sunxi-with-spl.bin /build/u-boot/arch/riscv/dts/ov_lichee_rv_mini_lcd.dtb ./ | ||
|
|
||
| COPY --from=build_kernel /build/linux-build/arch/riscv/boot/Image.gz . | ||
| COPY --from=build_kernel /build/linux/arch/riscv/configs/defconfig . | ||
|
|
||
| COPY --from=build_uboot /build/boot.scr . | ||
| COPY --from=build_uboot /build/u-boot/u-boot-sunxi-with-spl.bin . | ||
| COPY --from=build_uboot /build/u-boot/arch/riscv/dts/ov_lichee_rv_mini_lcd.dtb . | ||
|
|
||
| COPY rootfs/setup_rootfs.sh ./rv64-port/ | ||
| COPY scripts/build.sh scripts/create_image.sh ./ | ||
| RUN ls -l | ||
| RUN apt-get install -y kpartx openssl fdisk dosfstools e2fsprogs kmod parted | ||
|
|
||
| COPY rootfs/setup_rootfs.sh ./rv64-port/setup_rootfs.sh | ||
|
|
||
| COPY scripts/build.sh . | ||
| COPY scripts/create_image.sh . | ||
| CMD /builder/build.sh | ||
| CMD eatmydata /builder/build.sh | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| #/bin/sh | ||
| #!/bin/sh | ||
| # Author. Tim Molteno [email protected] | ||
| # (C) 2022. | ||
|
|
||
| cp /etc/resolv.conf /builder/rv64-port/etc/resolv.conf | ||
| cp -av /etc/resolv.conf /builder/rv64-port/etc/resolv.conf | ||
|
|
||
|
|
||
| # Run the script to create the disk image | ||
|
|
||
Oops, something went wrong.