diff options
| author | Neil Williams <neil.williams@linaro.org> | 2018-04-19 14:26:48 +0100 |
|---|---|---|
| committer | Neil Williams <neil.williams@linaro.org> | 2018-04-19 14:26:48 +0100 |
| commit | 620b218e6ab0386be02e5e3d4d17004d1b984e03 (patch) | |
| tree | 196b4076db9160fa3c485d5827053722159ff426 | |
| parent | 85db5eb7f726b3bbb2d864020a9d9d7d4d7fabad (diff) | |
Adjust for common source tree
| -rw-r--r-- | bin/builder.lib | 10 | ||||
| -rwxr-xr-x | bin/debian-tip-build-stretch.sh | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bin/builder.lib b/bin/builder.lib index c1a7180..435c068 100644 --- a/bin/builder.lib +++ b/bin/builder.lib @@ -100,9 +100,15 @@ if [ -n "${LOG}" ]; then fi sbuild --build-dep-resolver=aptitude --force-orig-source -A ${SOURCE} -c ${schroot} -d ${suite} reprepro --ignore=wrongdistribution -b ${REPO_DIR} include ${BACKPORTS_SUITE} ${DIR}/${NAME}_${VERSION}-1+${BUILD_SUITE}_${host_arch}.changes -if [ -n "$arch" ]; then - sbuild --arch ${arch} -c ${schroot}-${arch} -d ${suite} +if [ ${NAME} = 'lava' ]; then + # build arm64 binary only + sbuild --build arm64 --no-arch-all --arch arm64 ${SOURCE} -c ${SECOND_SCHROOT} -d ${suite} + reprepro --ignore=wrongdistribution -b ${REPO_DIR} include ${BACKPORTS_SUITE} ${DIR}/${NAME}_${VERSION}-1+${BUILD_SUITE}_arm64.changes +else + if [ -n "$arch" ]; then + sbuild --build ${arch} --arch ${arch} -c ${schroot}-${arch} -d ${suite} reprepro --ignore=wrongdistribution -b ${REPO_DIR} include ${BACKPORTS_SUITE} ${DIR}/${NAME}_${VERSION}-1+${BUILD_SUITE}_${arch}.changes + fi fi if [ -n "${SECOND_SUITE}" ]; then cp ../changelog ./debian/ diff --git a/bin/debian-tip-build-stretch.sh b/bin/debian-tip-build-stretch.sh index 7b59ea6..6eadced 100755 --- a/bin/debian-tip-build-stretch.sh +++ b/bin/debian-tip-build-stretch.sh @@ -14,6 +14,7 @@ SCHROOT=stretch BACKPORTS_SUITE=stretch-backports GIT_DEBIAN_BRANCH=master SOURCE='-s' +SECOND_SCHROOT=stretch-arm64-sbuild if [ -z "$1" ]; then echo "Usage: <package> [<architecture>]" |