Skip to content
Snippets Groups Projects
Commit 50770e6d authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'bootloader' into 'master'

bootloader: get rid of source copying, build directly from the source instead

See merge request !401
parents d67a6331 6dfeb2ca
No related branches found
No related tags found
1 merge request!401bootloader: get rid of source copying, build directly from the source instead
...@@ -4,16 +4,15 @@ git = "https://gitlab.redox-os.org/redox-os/bootloader.git" ...@@ -4,16 +4,15 @@ git = "https://gitlab.redox-os.org/redox-os/bootloader.git"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
rsync -av --delete "${COOKBOOK_SOURCE}/" ./ OUTDIR="${COOKBOOK_BUILD}"
mkdir -v "${COOKBOOK_STAGE}/boot" mkdir -v "${COOKBOOK_STAGE}/boot"
function bootloader { function bootloader {
export TARGET="$1" export TARGET="$1"
src="$2" src="$2"
dst="$3" dst="$3"
"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" "build/${TARGET}/${src}" "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f "${COOKBOOK_SOURCE}/Makefile" -C "${OUTDIR}" "${OUTDIR}/${src}"
cp -v "build/${TARGET}/${src}" "${COOKBOOK_STAGE}/boot/${dst}" cp -v "${OUTDIR}/${src}" "${COOKBOOK_STAGE}/boot/${dst}"
} }
ARCH="$(echo "${TARGET}" | cut -d - -f1)" ARCH="$(echo "${TARGET}" | cut -d - -f1)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment