diff options
author | Junichi Uekawa <dancer@netfort.gr.jp> | 2009-08-08 23:49:13 +0900 |
---|---|---|
committer | Junichi Uekawa <dancer@netfort.gr.jp> | 2009-08-08 23:49:13 +0900 |
commit | 5047167c4e74464a454a79e94944843a0a586ef9 (patch) | |
tree | 4ed89898f467e9e3bed9871e090c3e38a0306888 | |
parent | d8a92f8d2a1ae1ad6e69d44541e815f9f26faf77 (diff) | |
download | pbuilder-5047167c4e74464a454a79e94944843a0a586ef9.tar pbuilder-5047167c4e74464a454a79e94944843a0a586ef9.tar.gz |
install aptitude via EXTRAPACKAGES, and not hard-code. (closes: #539578)
-rwxr-xr-x | pbuilder-createbuildenv | 2 | ||||
-rwxr-xr-x | pbuilder-updatebuildenv | 2 | ||||
-rwxr-xr-x | pbuilderrc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index d304f17..b0cb6c3 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -88,7 +88,7 @@ if [ -n "$REMOVEPACKAGES" ]; then fi recover_aptcache $CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade -$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt aptitude $EXTRAPACKAGES +$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES save_aptcache executehooks "E" diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index 92ccd0f..0915981 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -49,7 +49,7 @@ $CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade # support autoremove. TODO: Do not ignore error when etch is no longer # supported. $CHROOTEXEC /usr/bin/apt-get -y --force-yes autoremove || true -$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt aptitude $EXTRAPACKAGES +$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES save_aptcache # optionally auto-clean apt-cache @@ -5,7 +5,7 @@ # read pbuilderrc.5 document for notes on specific options. BASETGZ=/var/cache/pbuilder/base.tgz -#EXTRAPACKAGES=gcc3.0-athlon-builder +EXTRAPACKAGES="aptitude" #export DEBIAN_BUILDARCH=athlon BUILDPLACE=/var/cache/pbuilder/build/ MIRRORSITE=http://cdn.debian.net/debian |