diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | Documentation/pbuilder-doc.xml | 11 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | examples/pbuilder-distribution.sh | 30 | ||||
| -rw-r--r-- | pdebuild | 5 | ||||
| -rw-r--r-- | pdebuild-user-mode-linux | 4 |
7 files changed, 70 insertions, 2 deletions
@@ -1,3 +1,20 @@ +2004-11-17 Junichi Uekawa <dancer@debian.org> + + * Makefile: add pbuilder-distribution.sh + + * Documentation/pbuilder-doc.xml: document the example. + + * examples/pbuilder-distribution.sh: add example from Jamin. + +2004-11-16 Junichi Uekawa <dancer@debian.org> + + * pdebuild-user-mode-linux: + * pdebuild: Check for build-deps before dpkg-buildpackage -S + +2004-11-14 Junichi Uekawa <dancer@debian.org> + + * pdebuild: add quoting for debbuildopts. + 2004-11-05 Junichi Uekawa <dancer@debian.org> * pbuilderrc.5: Fix formatting errors diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml index 451ffac..ed99d83 100644 --- a/Documentation/pbuilder-doc.xml +++ b/Documentation/pbuilder-doc.xml @@ -723,6 +723,17 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell <filename>examples/D10tmp</filename> with pbuilder. </para> </sect1> + <sect1 id="DISTRIBUTIONSWITCH"> + <title>Creating shortcut for running pbuilder with specific distribution</title> + <para> + When working with multiple chroots, it would be nice to work with + scripts that facilitate the amount of typing. + An example script + <filename>pbuilder-distribution.sh</filename> is provided as an example. + Invoking the script as <filename>pbuilder-woody</filename> will invoke + pbuilder for woody chroot. + </para> + </sect1> <sect1> <title>Using special apt sources list other than the default</title> <para> @@ -80,6 +80,7 @@ install: $(INSTALL_EXECUTABLE) examples/F90chrootmemo $(DESTDIR)/usr/share/doc/pbuilder/examples $(INSTALL_EXECUTABLE) examples/execute_installtest.sh $(DESTDIR)/usr/share/doc/pbuilder/examples $(INSTALL_EXECUTABLE) examples/execute_paramtest.sh $(DESTDIR)/usr/share/doc/pbuilder/examples + $(INSTALL_EXECUTABLE) examples/pbuilder-distribution.sh $(DESTDIR)/usr/share/doc/pbuilder/examples # install workaround for libc6 -- 2004-03-13 $(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/doc/pbuilder/examples/libc6workaround diff --git a/debian/changelog b/debian/changelog index d581775..e4d3d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ pbuilder (0.119) UNRELEASED; urgency=low * pbuilderrc.5:Fix manual page formatting (closes: #279700) + * Add example script from Jamin W Collins for short-cut way of specifying distribution. (closes: #255165) + * Warn if build-depends is not satisfied when invoking dpkg-buildpackage -S (closes: #266349) - -- Junichi Uekawa <dancer@debian.org> Fri, 5 Nov 2004 07:54:04 +0900 + -- Junichi Uekawa <dancer@debian.org> Wed, 17 Nov 2004 08:54:02 +0900 pbuilder (0.118) unstable; urgency=low diff --git a/examples/pbuilder-distribution.sh b/examples/pbuilder-distribution.sh new file mode 100755 index 0000000..9845d6a --- /dev/null +++ b/examples/pbuilder-distribution.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# script from Jamin W. Collins BTS: #255165 +# name this script 'pbuilder-woody', 'pbuilder-sid', 'pbuilder-sarge' etc. + +OPERATION=$1 +DISTRIBUTION=`basename $0 | cut -f2 -d '-'` +PROCEED=false +BASE_DIR="$HOME/pbuilder" +case $OPERATION in + create|update|build|clean|login|execute ) + PROCEED=true + ;; +esac +if ( $PROCEED == true ) then + shift + sudo pbuilder $OPERATION \ + --basetgz $BASE_DIR/$DISTRIBUTION-base.tgz \ + --distribution $DISTRIBUTION \ + --buildresult $BASE_DIR/result $@ +else + echo "Invalid command..." + echo "Valid commands are:" + echo " create" + echo " update" + echo " build" + echo " clean" + echo " login" + echo " execute" + exit 1 +fi @@ -1,6 +1,6 @@ #! /bin/bash # pbuilder -- personal Debian package builder -# Copyright (C) 2001-2003 Junichi Uekawa +# Copyright (C) 2001-2004 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,6 +36,9 @@ ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH) if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then ${PBUILDERROOTCMD} pbuilder execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" else + if [ ! dpkg-checkbuilddeps -B ]; then + echo "W: Unmet build-dependency in source" + fi dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS ${PBUILDERROOTCMD} pbuilder build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi diff --git a/pdebuild-user-mode-linux b/pdebuild-user-mode-linux index e26b0bd..c3fd815 100644 --- a/pdebuild-user-mode-linux +++ b/pdebuild-user-mode-linux @@ -34,6 +34,7 @@ PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p') PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p') ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH) + if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then if [ ! readlink -f .. ]; then echo "E: Cannot find .. dir from PWD=$(pwd)" @@ -41,6 +42,9 @@ if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then fi pbuilder-user-mode-linux execute "$@" --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" else + if [ ! dpkg-checkbuilddeps -B ]; then + echo "W: Unmet build-dependency in source" + fi dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS pbuilder-user-mode-linux build "$@" --buildresult "${UML_BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi |