From a8045fd73200c1ba47f064f14813ed799b78ac77 Mon Sep 17 00:00:00 2001 From: dancer Date: Tue, 23 Dec 2003 13:56:34 +0000 Subject: +2003-12-23 Junichi Uekawa + + * Makefile (install): update build rules to install pdebuild-internal + + * pbuilderrc.5: update document USE_PDEBUILD_INTERNAL + + * pdebuild-user-mode-linux.1: document --use-pdebuild-internal + + * pdebuild.1: document --use-pdebuild-internal + + * pbuilder-modules: document use-pdebuild-internal + + * pbuilder-checkparams: --use-pdebuild-internal option. + + * pdebuild: use pdebuild-internal if USE_PDEBUILD_INTERNAL option is 'yes' + + * pdebuild-user-mode-linux: use pdebuild-internal if USE_PDEBUILD_INTERNAL option is 'yes' + + * pdebuild-internal: Implement a pbuilder execute script to be + used for pdebuild without doing debian/rules clean outside of chroot. + + * pbuilder-checkparams: support multiple bindmounts; + delimit it with spaces. + + * pbuilder-modules: add --debug option here. + --- pdebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pdebuild') diff --git a/pdebuild b/pdebuild index 20ca26e..978e2f7 100644 --- a/pdebuild +++ b/pdebuild @@ -33,9 +33,13 @@ PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p') PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p') ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH) -dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} -${PBUILDERROOTCMD} pbuilder build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc -if [ "${AUTO_DEBSIGN}" = "yes" ]; then - debsign "${BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes" +if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then + ${PBUILDERROOTCMD} pbuilder execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} +else + dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} + ${PBUILDERROOTCMD} pbuilder build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi +if [ "${AUTO_DEBSIGN}" = "yes" ]; then + debsign "${BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes" +fi \ No newline at end of file -- cgit v1.2.3