diff options
| author | Rob Savoye <rob.savoye@linaro.org> | 2015-10-05 22:30:08 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2015-10-05 22:30:08 +0000 |
| commit | 3180316dc5030cd5da94cd2b3ad5b8c0d35dc9be (patch) | |
| tree | ee7b2d087bbf34718433a30f74bee3a5bbafe52e | |
| parent | 0bbafec041aa97e195be8de9f3689c55e38b7cff (diff) | |
| parent | b69580653a31b02815fb513c987798fe3137d6a5 (diff) | |
Merge topic 'fix_slibdir_libdir_rtlddir'
* changes:
lib/checkout.sh: prune git branches before git pull in checkout() 'Update' code path.
lib/configure.sh: Set libdir=/usr/lib, slibdir=/lib, and rtlddir=/lib
| -rw-r--r-- | lib/checkout.sh | 11 | ||||
| -rwxr-xr-x | lib/configure.sh | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lib/checkout.sh b/lib/checkout.sh index 9f983535..5299b706 100644 --- a/lib/checkout.sh +++ b/lib/checkout.sh @@ -367,6 +367,17 @@ checkout() notice "Updating sources for ${tool} in ${srcdir}" dryrun "(cd ${repodir} && git stash --all)" dryrun "(cd ${repodir} && git reset --hard)" + + # This is required due to the following scenario: A git + # reference dir is populated with a git clone on day X. On day + # Y a developer removes a branch and then replaces the same + # branch with a new branch of the same name. On day Z ABE is + # executed against the reference dir copy and the git pull fails + # due to error: 'refs/remotes/origin/<branch>' exists; cannot + # create 'refs/remotes/origin/<branch>'. You have to remove the + # stale branches before pulling the new ones. + dryrun "(cd ${repodir} && git remote prune origin)" + dryrun "(cd ${repodir} && git_robust pull)" # Update branch directory (which maybe the same as repo # directory) diff --git a/lib/configure.sh b/lib/configure.sh index ba909ce4..af16cf8e 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -185,8 +185,15 @@ configure_build() # defaults to lib64/ for aarch64. We need to override this. # There's no need to install anything into lib64/ since we don't # have biarch systems. - echo libdir=/lib > ${builddir}/configparms - echo slibdir=/usr/lib > ${builddir}/configparms + + # libdir is where static libraries and linker scripts are installed, + # like libc.so, libc_nonshared.a, and libc.a. + echo libdir=/usr/lib > ${builddir}/configparms + + # slibdir is where shared objects are installed. + echo slibdir=/lib >> ${builddir}/configparms + + # rtlddir is where the dynamic-linker is installed. echo rtlddir=/lib >> ${builddir}/configparms local opts="${opts} --build=${build} --host=${target} --target=${target} --prefix=/usr" dryrun "(mkdir -p ${sysroots}/usr/lib)" |