enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/main.sh: allow correctly use of 'head' in BRANCH reference. (#1611)

Browse Source 
In fetch_from_repo() from general.sh, when ref uses `head` as value, the ref_name
will be set to `HEAD`, which is later used as a subdir:

   local workdir=$dir/$ref_name

This commit makes the directories consistent with the workdir above.
This commit is contained in:
Levin Du 2019-11-16 16:49:00 +08:00 committed by Igor Pečovnik
parent 3fdbeaf8f3
commit 01fec6b3b4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/main.sh
View File

@ -366,9 +366,13 @@ fi
compile_sunxi_tools
install_rkbin_tools
BOOTSOURCEDIR=$BOOTDIR/${BOOTBRANCH##*:}
LINUXSOURCEDIR=$KERNELDIR/${KERNELBRANCH##*:}
[[ -n $ATFSOURCE ]] && ATFSOURCEDIR=$ATFDIR/${ATFBRANCH##*:}
branch2dir() {
[[ $1 == head ]] && echo HEAD || echo ${1##*:}
}
BOOTSOURCEDIR=$BOOTDIR/$(branch2dir ${BOOTBRANCH})
LINUXSOURCEDIR=$KERNELDIR/$(branch2dir ${KERNELBRANCH})
[[ -n $ATFSOURCE ]] && ATFSOURCEDIR=$ATFDIR/$(branch2dir ${ATFBRANCH})
# define package names
DEB_BRANCH=${BRANCH//default}