diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | pbuilder-buildpackage-funcs | 2 | ||||
| -rw-r--r-- | pbuilder-satisfydepends-gdebi | 80 |
3 files changed, 83 insertions, 1 deletions
@@ -15,6 +15,7 @@ SHELLCODES=pbuilder-buildpackage \ pbuilder-modules \ pbuilder-runhooks \ pbuilder-satisfydepends-classic \ + pbuilder-satisfydepends-gdebi \ pbuilder-satisfydepends-funcs \ pbuilder-satisfydepends-checkparams \ pbuilder-satisfydepends-aptitude \ @@ -81,6 +82,7 @@ install: #install aptitude as the default satisfydepends $(INSTALL_EXECUTABLE) pbuilder-satisfydepends-aptitude $(DESTDIR)/usr/lib/pbuilder/pbuilder-satisfydepends $(INSTALL_EXECUTABLE) pbuilder-satisfydepends-classic $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder-satisfydepends-gdebi $(DESTDIR)/usr/lib/pbuilder/ $(INSTALL_EXECUTABLE) pbuilder-satisfydepends-aptitude $(DESTDIR)/usr/lib/pbuilder/ $(INSTALL_EXECUTABLE) pbuilder-satisfydepends-experimental $(DESTDIR)/usr/lib/pbuilder/ $(INSTALL_EXECUTABLE) pbuilder-satisfydepends-checkparams $(DESTDIR)/usr/lib/pbuilder/ diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index a36fcb4..5cdbe40 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -37,7 +37,7 @@ function checkbuilddep () { yes) BUILDOPT="--binary-arch";; *) ;; esac - if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then + if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then : else # If asked to preserve the build place, and pbuilder-satisfydepends diff --git a/pbuilder-satisfydepends-gdebi b/pbuilder-satisfydepends-gdebi new file mode 100644 index 0000000..cdb192b --- /dev/null +++ b/pbuilder-satisfydepends-gdebi @@ -0,0 +1,80 @@ +#!/bin/bash +# pbuilder -- personal Debian package builder +# Copyright (C) 2001,2002,2003,2005-2006 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +# +# module to satisfy dependency using gdebi +# AUTHOR: Michael Vogt <mvogt@acm.org> + +set -e + + + +DEBIAN_CONTROL=debian/control +CHROOT="" +CHROOTEXEC="" +BD_REGEXP="build-(depends|depends-indep)" +BC_REGEXP="build-(conflicts|conflicts-indep)" +FORCEVERSION="" +CONTINUE_FAIL="no" + +while [ -n "$1" ]; do + case "$1" in + --control|-c) + DEBIAN_CONTROL="$2" + shift; shift + ;; + --chroot) + CHROOT="$2" + CHROOTEXEC="chroot $2 " + shift; shift + ;; + --internal-chrootexec) + CHROOTEXEC="$2" + shift; shift + ;; + --binary-all) + BD_REGEXP='build-(depends|depends-indep)' + BC_REGEXP='build-(conflicts|conflicts-indep)' + shift + ;; + --binary-arch) + BD_REGEXP='build-depends' + BC_REGEXP='build-conflicts' + shift + ;; + --echo) + CHROOTEXEC="echo $CHROOTEXEC" + shift + ;; + --continue-fail) + CONTINUE_FAIL="yes" + shift + ;; + --force-version) + FORCEVERSION="yes" + shift; + ;; + --help|-h|*) + print_help + exit 1 + ;; + esac +done + +INSTALL=$(/usr/bin/gdebi --quiet --apt-line --root $CHROOT $DEBIAN_CONTROL) +$CHROOTEXEC /usr/bin/apt-get install -y $INSTALL
\ No newline at end of file |