diff --git a/README.md b/README.md index a8b7068..d704932 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ The same `KEEP_SRC` variants work here too. ### Assembling disk images -Once you have bootloader outputs in `prebuilt/u-boot/` and kernel outputs in `prebuilt/linux/`, run: +Once you have bootloader outputs in `prebuilt/u-boot/` and kernel outputs in `prebuilt/linux-mainline/` and `prebuilt/linux-bsp/`, run: ```bash ./build-images.sh @@ -226,7 +226,7 @@ Once you have bootloader outputs in `prebuilt/u-boot/` and kernel outputs in `pr This produces compressed images for each board whose bootloader is present. The kernel and root filesystem are shared; only the bootloader partition differs per board. Output files: `out/debian---.img.gz` with a matching `.bmap` file, for both 512-byte and 4096-byte sector variants. When run inside the container, images go to `out/images/` instead (the container sets `IMG_OUT=/artifacts/images`). -Don't run the mainline and BSP kernel scripts in parallel against the same output directory — both write to the same `prebuilt/linux/` path and the final packaging step will fail. Run one, then the other (or set separate `LINUX_OUT` paths). +The mainline and BSP kernel scripts now default to separate output directories (`prebuilt/linux-mainline` and `prebuilt/linux-bsp`), so they can safely be run in parallel. If you need a custom path, set `LINUX_OUT` in the environment. ### Writing the image to SD/eMMC diff --git a/build-kernel-bsp.sh b/build-kernel-bsp.sh index 6f60141..5f81678 100755 --- a/build-kernel-bsp.sh +++ b/build-kernel-bsp.sh @@ -3,7 +3,7 @@ : "${VENDOR_DTS:=vendor-dts}" : "${PATCHES_DIR:=patches/bsp}" : "${KEEP_SRC:=no}" -: "${LINUX_OUT:=prebuilt/linux}" +: "${LINUX_OUT:=prebuilt/linux-bsp}" : "${CROSS_COMPILE:=aarch64-linux-gnu-}" : "${CONFIGS:=configs/linux-bsp}" diff --git a/build-kernel-mainline.sh b/build-kernel-mainline.sh index 64de932..acdcce8 100755 --- a/build-kernel-mainline.sh +++ b/build-kernel-mainline.sh @@ -2,7 +2,7 @@ : "${LINUX_DIR:=src/linux}" : "${VENDOR_DTS:=vendor-dts}" : "${KEEP_SRC:=no}" -: "${LINUX_OUT:=prebuilt/linux}" +: "${LINUX_OUT:=prebuilt/linux-mainline}" : "${CROSS_COMPILE:=aarch64-linux-gnu-}" : "${BASE_CONFIG:=configs/minconfig-mainline}" : "${CONFIGS:=configs/linux}"