mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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>
This commit is contained in:
@@ -379,19 +379,19 @@ do_kernel_checkout() {
|
||||
set +e
|
||||
|
||||
source_dir=`echo ${S} | sed 's%/$%%'`
|
||||
source_workdir="${WORKDIR}/git"
|
||||
if [ -d "${WORKDIR}/git/" ]; then
|
||||
source_workdir="${UNPACKDIR}/git"
|
||||
if [ -d "${UNPACKDIR}/git/" ]; then
|
||||
# case: git repository
|
||||
# if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
|
||||
if [ "${source_dir}" != "${source_workdir}" ]; then
|
||||
if [ -d "${source_workdir}/.git" ]; then
|
||||
# regular git repository with .git
|
||||
rm -rf ${S}
|
||||
mv ${WORKDIR}/git ${S}
|
||||
mv ${UNPACKDIR}/git ${S}
|
||||
else
|
||||
# create source for bare cloned git repository
|
||||
git clone ${WORKDIR}/git ${S}
|
||||
rm -rf ${WORKDIR}/git
|
||||
rm -rf ${UNPACKDIR}/git
|
||||
fi
|
||||
fi
|
||||
cd ${S}
|
||||
@@ -434,7 +434,7 @@ do_kernel_checkout() {
|
||||
|
||||
set -e
|
||||
}
|
||||
do_kernel_checkout[dirs] = "${S} ${WORKDIR}"
|
||||
do_kernel_checkout[dirs] = "${S} ${UNPACKDIR}"
|
||||
|
||||
addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc
|
||||
addtask kernel_metadata after do_validate_branches do_unpack before do_patch
|
||||
|
||||
Reference in New Issue
Block a user