diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-09 17:02:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-21 12:08:04 +0100 |
| commit | 71c6db8e65ced98db74fd18b726fa4b4c0346f05 (patch) | |
| tree | 0e5d7f21a2d65ba5b562068eb44d4e9b34465bed /meta/classes-recipe/kernel-yocto.bbclass | |
| parent | c6c1ed6ba0b7e529d955eeda71c4a66317fa1331 (diff) | |
| download | poky-71c6db8e65ced98db74fd18b726fa4b4c0346f05.tar.gz | |
recipes: Start WORKDIR -> UNPACKDIR transition
Replace references of WORKDIR with UNPACKDIR where it makes sense to do
so in preparation for changing the default value of UNPACKDIR.
(From OE-Core rev: 1f18b9a512800860d5153d89eb82b56388efad6f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/kernel-yocto.bbclass')
| -rw-r--r-- | meta/classes-recipe/kernel-yocto.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index 6468e8aa90..c4ed3f1ca2 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass | |||
| @@ -379,19 +379,19 @@ do_kernel_checkout() { | |||
| 379 | set +e | 379 | set +e |
| 380 | 380 | ||
| 381 | source_dir=`echo ${S} | sed 's%/$%%'` | 381 | source_dir=`echo ${S} | sed 's%/$%%'` |
| 382 | source_workdir="${WORKDIR}/git" | 382 | source_workdir="${UNPACKDIR}/git" |
| 383 | if [ -d "${WORKDIR}/git/" ]; then | 383 | if [ -d "${UNPACKDIR}/git/" ]; then |
| 384 | # case: git repository | 384 | # case: git repository |
| 385 | # if S is WORKDIR/git, then we shouldn't be moving or deleting the tree. | 385 | # if S is WORKDIR/git, then we shouldn't be moving or deleting the tree. |
| 386 | if [ "${source_dir}" != "${source_workdir}" ]; then | 386 | if [ "${source_dir}" != "${source_workdir}" ]; then |
| 387 | if [ -d "${source_workdir}/.git" ]; then | 387 | if [ -d "${source_workdir}/.git" ]; then |
| 388 | # regular git repository with .git | 388 | # regular git repository with .git |
| 389 | rm -rf ${S} | 389 | rm -rf ${S} |
| 390 | mv ${WORKDIR}/git ${S} | 390 | mv ${UNPACKDIR}/git ${S} |
| 391 | else | 391 | else |
| 392 | # create source for bare cloned git repository | 392 | # create source for bare cloned git repository |
| 393 | git clone ${WORKDIR}/git ${S} | 393 | git clone ${WORKDIR}/git ${S} |
| 394 | rm -rf ${WORKDIR}/git | 394 | rm -rf ${UNPACKDIR}/git |
| 395 | fi | 395 | fi |
| 396 | fi | 396 | fi |
| 397 | cd ${S} | 397 | cd ${S} |
| @@ -434,7 +434,7 @@ do_kernel_checkout() { | |||
| 434 | 434 | ||
| 435 | set -e | 435 | set -e |
| 436 | } | 436 | } |
| 437 | do_kernel_checkout[dirs] = "${S} ${WORKDIR}" | 437 | do_kernel_checkout[dirs] = "${S} ${UNPACKDIR}" |
| 438 | 438 | ||
| 439 | addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc | 439 | addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc |
| 440 | addtask kernel_metadata after do_validate_branches do_unpack before do_patch | 440 | addtask kernel_metadata after do_validate_branches do_unpack before do_patch |
