diff options
| author | Junichi Uekawa <dancer@netfort.gr.jp> | 2012-03-09 08:14:19 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@netfort.gr.jp> | 2012-03-09 08:14:19 +0900 |
| commit | 7aa69397d99fff86196c3a835551f099e4603057 (patch) | |
| tree | 0ea32320ac6f569b2a1c6dec6a9b6aa86acdf46e /pdebuild | |
| parent | 78747b5f1081e3afa1d5e0147c4efdbd833b7d14 (diff) | |
| download | pbuilder-7aa69397d99fff86196c3a835551f099e4603057.tar pbuilder-7aa69397d99fff86196c3a835551f099e4603057.tar.gz | |
make longer lines wrap so reading patch files aren't as painful.
Diffstat (limited to 'pdebuild')
| -rw-r--r-- | pdebuild | 29 |
1 files changed, 26 insertions, 3 deletions
@@ -44,7 +44,20 @@ export BUILDRESULTUID=$(id -u) export BUILDRESULTGID=$(id -g) if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) "$@" -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "" --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD" + ${PBUILDERROOTCMD} \ + ${PDEBUILD_PBUILDER} \ + --execute \ + ${EXTRA_CONFIGFILE[@]/#/--configfile } \ + --bindmounts $(readlink -f ..) \ + "$@" \ + -- \ + /usr/lib/pbuilder/pdebuild-internal \ + ${PWD} \ + --debbuildopts "" \ + --debbuildopts "${DEBBUILDOPTS}" \ + --uid "${BUILDRESULTUID}" \ + --gid "${BUILDRESULTGID}" \ + --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD" if [ -d "${BUILDRESULT}" ]; then for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' ../${CHANGES}); do conditional_cp_a ../"$files" "${BUILDRESULT}" @@ -58,8 +71,18 @@ else if ! dpkg-checkbuilddeps -B ; then log "W: Unmet build-dependency in source" fi - echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[AbBF](\s|$)/$1$2/g' | /bin/bash - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "" --debbuildopts "${DEBBUILDOPTS}" "$@" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc + echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | \ + perl -pe 's/(^|\s)-[AbBF](\s|$)/$1$2/g' | \ + /bin/bash + ${PBUILDERROOTCMD} \ + ${PDEBUILD_PBUILDER} \ + --build \ + ${EXTRA_CONFIGFILE[@]/#/--configfile } \ + --buildresult "${BUILDRESULT}" \ + --debbuildopts "" \ + --debbuildopts "${DEBBUILDOPTS}" \ + "$@" \ + ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi # do signing with optional key specifier |