diff --git a/build/linux-stable b/build/linux-stable index 28167d9..c04aba6 160000 --- a/build/linux-stable +++ b/build/linux-stable @@ -1 +1 @@ -Subproject commit 28167d98f121e6daf20ee5d182e8cfbd2b90ec71 +Subproject commit c04aba6ee8e97492b1929b7b4f59e43da56e3781 diff --git a/build_scripts/build_kernel.sh b/build_scripts/build_kernel.sh index c1b51a9..0894c57 100644 --- a/build_scripts/build_kernel.sh +++ b/build_scripts/build_kernel.sh @@ -22,8 +22,8 @@ kernel_do_compile() { local CHECK_DTBS=( renesas/r9a07g044c2-hummingboard-ripple.dtb ) - : $(CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_KERNEL}" -j "${MAKE_JOBS}" dt_binding_check || true) - CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_KERNEL}" -j "${MAKE_JOBS}" CHECK_DTBS=y ${CHECK_DTBS[@]} + CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_KERNEL}" -j "${MAKE_JOBS}" dt_binding_check || true + CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_KERNEL}" -j "${MAKE_JOBS}" CHECK_DTBS=y ${CHECK_DTBS[@]} || true CROSS_COMPILE=${CROSS_TOOLCHAIN} ARCH=arm64 make O="${BUILDDIR_TMP_KERNEL}" -j "${MAKE_JOBS}" Image Image.gz dtbs modules } diff --git a/docker/Dockerfile b/docker/Dockerfile index 0a7abab..9a25af5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,6 +31,9 @@ RUN pipx install dtschema RUN ln -sv libncursesw.so.6 /usr/lib/x86_64-linux-gnu/libncursesw.so.5 RUN ln -sv libtinfo.so.6 /usr/lib/x86_64-linux-gnu/libtinfo.so.5 +# delete default "ubuntu" user account, uid may conflict with entry script useradd +RUN userdel -r ubuntu + # build environment WORKDIR /work COPY shflags /