Lines 85-90
Link Here
|
85 |
# |
85 |
# |
86 |
# EGIT_BRANCH="${EGIT_MASTER}" |
86 |
# EGIT_BRANCH="${EGIT_MASTER}" |
87 |
|
87 |
|
|
|
88 |
# @ECLASS-VARIABLE: EGIT_TAG |
89 |
# @DESCRIPTION: |
90 |
# Variable containing tag name we want to check out. |
91 |
# It can be overriden via env using packagename_LIVE_BRANCH |
92 |
# variable. |
93 |
# |
94 |
# EGIT_BRANCH="${EGIT_MASTER}" |
95 |
|
88 |
# @ECLASS-VARIABLE: EGIT_COMMIT |
96 |
# @ECLASS-VARIABLE: EGIT_COMMIT |
89 |
# @DESCRIPTION: |
97 |
# @DESCRIPTION: |
90 |
# Variable containing commit hash/tag we want to check out. |
98 |
# Variable containing commit hash/tag we want to check out. |
Lines 139-144
Link Here
|
139 |
|
147 |
|
140 |
: ${EGIT_MASTER:=master} |
148 |
: ${EGIT_MASTER:=master} |
141 |
|
149 |
|
|
|
150 |
: ${EGIT_TAG:=} |
151 |
|
142 |
eval x="\$${PN//[-+]/_}_LIVE_REPO" |
152 |
eval x="\$${PN//[-+]/_}_LIVE_REPO" |
143 |
EGIT_REPO_URI=${x:-${EGIT_REPO_URI}} |
153 |
EGIT_REPO_URI=${x:-${EGIT_REPO_URI}} |
144 |
[[ -z ${EGIT_REPO_URI} ]] && die "EGIT_REPO_URI must have some value" |
154 |
[[ -z ${EGIT_REPO_URI} ]] && die "EGIT_REPO_URI must have some value" |
Lines 151-157
Link Here
|
151 |
|
161 |
|
152 |
eval x="\$${PN//[-+]/_}_LIVE_COMMIT" |
162 |
eval x="\$${PN//[-+]/_}_LIVE_COMMIT" |
153 |
[[ -n ${x} ]] && ewarn "QA: using \"${PN//[-+]/_}_LIVE_COMMIT\" variable, you won't get any support" |
163 |
[[ -n ${x} ]] && ewarn "QA: using \"${PN//[-+]/_}_LIVE_COMMIT\" variable, you won't get any support" |
154 |
EGIT_COMMIT=${x:-${EGIT_COMMIT:-${EGIT_BRANCH}}} |
164 |
EGIT_COMMIT=${x:-${EGIT_COMMIT:-${EGIT_TAG:-${EGIT_BRANCH}}}} |
155 |
|
165 |
|
156 |
: ${EGIT_REPACK:=} |
166 |
: ${EGIT_REPACK:=} |
157 |
|
167 |
|
Lines 197-205
Link Here
|
197 |
pushd "${EGIT_SOURCEDIR}" > /dev/null |
207 |
pushd "${EGIT_SOURCEDIR}" > /dev/null |
198 |
|
208 |
|
199 |
local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} |
209 |
local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} |
200 |
if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then |
210 |
if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] || \ |
201 |
branchname=tree-${EGIT_COMMIT} |
211 |
[[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then |
202 |
src=${EGIT_COMMIT} |
212 |
if [[ -n ${EGIT_TAG} ]]; then |
|
|
213 |
branchname=tag-${EGIT_TAG} |
214 |
src=${EGIT_TAG} |
215 |
else |
216 |
branchname=tree-${EGIT_COMMIT} |
217 |
src=${EGIT_COMMIT} |
218 |
fi |
203 |
fi |
219 |
fi |
204 |
debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}" |
220 |
debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}" |
205 |
git checkout -b ${branchname} ${src} \ |
221 |
git checkout -b ${branchname} ${src} \ |
Lines 396-401
Link Here
|
396 |
echo " branch: ${EGIT_BRANCH}" |
412 |
echo " branch: ${EGIT_BRANCH}" |
397 |
echo " storage directory: \"${EGIT_DIR}\"" |
413 |
echo " storage directory: \"${EGIT_DIR}\"" |
398 |
echo " checkout type: ${repo_type}" |
414 |
echo " checkout type: ${repo_type}" |
|
|
415 |
[[ -n ${EGIT_TAG} ]] && [[ ${EGIT_TAG} != ${EGIT_BRANCH} ]] \ |
416 |
&& echo " tag: ${EGIT_TAG}" |
399 |
} |
417 |
} |
400 |
|
418 |
|
401 |
# @FUNCTION: git_bootstrap |
419 |
# @FUNCTION: git_bootstrap |