diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | debian/.cvsignore | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 8 | ||||
| -rw-r--r-- | pbuilder-modules | 21 | ||||
| -rw-r--r-- | pbuilder.1 | 9 | ||||
| -rwxr-xr-x | pbuilderrc | 2 |
7 files changed, 47 insertions, 2 deletions
diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..99ee691 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,2 @@ +build-stamp +configure-stamp diff --git a/debian/.cvsignore b/debian/.cvsignore new file mode 100644 index 0000000..110f167 --- /dev/null +++ b/debian/.cvsignore @@ -0,0 +1,4 @@ +files +pbuilder +pbuilder.postinst.debhelper +pbuilder.prerm.debhelper diff --git a/debian/changelog b/debian/changelog index 356d262..67e421d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ pbuilder (0.3) unstable; urgency=low over fully to the internal checker. * change priority to extra, because it depends on an extra package. thanks to mechanix. + * added non-us mirror and other mirror options - -- Junichi Uekawa <dancer@debian.org> Fri, 7 Sep 2001 01:55:23 +0900 + -- Junichi Uekawa <dancer@debian.org> Fri, 7 Sep 2001 15:27:28 +0900 pbuilder (0.2) unstable; urgency=low diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 748cea7..feb21fc 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -22,6 +22,14 @@ while [ -n "$1" ]; do MIRRORSITE="$2"; shift; shift; ;; + --nonusmirror) + NONUSMIRRORSITE="$2"; + shift; shift; + ;; + --othermirror) + OTHERMIRROR="$3"; + shift; shift; + ;; --http-proxy) export http_proxy="$2"; shift; shift; diff --git a/pbuilder-modules b/pbuilder-modules index c1da6a1..def60f8 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -29,6 +29,8 @@ Operation Options: --basetgz [base.tgz location] --buildplace [location of build] --mirror [mirror location] + --nonusmirror [non-US mirror location] + --othermirror [other mirror location in apt deb-line format, delimited with | signs] --http-proxy [proxy] --distribution [distribution(potato/woody/sid)] --buildresult [location-to-copy-build-result] @@ -66,10 +68,27 @@ function abortingfunction () { function installaptlines (){ echo Installing apt-lines - cat > "$BUILDPLACE"/etc/apt/sources.list << EOF + rm "$BUILDPLACE"/etc/apt/sources.list + test -n "$DISTRIBUTION" && ( + echo "Distribution not specified, please specify" >&2 + exit 1 + ) + if [ -n "$MIRRORSITE" ] then + cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF deb $MIRRORSITE $DISTRIBUTION main contrib non-free deb-src $MIRRORSITE $DISTRIBUTION main contrib non-free EOF + fi + if [ -n "$NONUSMIRRORSITE" ] then + cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF +deb $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free +deb-src $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free +EOF + fi + if [ -n "$OTHERMIRROR" ] then + echo "$OTHERMIRROR" | tr "|" "\n" >> "$BUILDPLACE"/etc/apt/sources.list + fi + } function extractbuildplace () { @@ -74,6 +74,15 @@ The format is something like: .I "http://http.us.debian.org/debian" which should point to your favorite mirror. .TP +.BI "--nonusmirror [" "mirror location" "]" +The non-US mirror, specified like the +.B "--mirror" +option +.TP +.BI "--othermirror [" "apt deb line " "|" " other deb lines... " "]" +The lines which is added to the sources.list, delimited with +.B "|" +.TP .BI "--http-proxy [" "proxy" "]" Specifies the http proxy url. Something like .B "http://xxx.xxx.xxx.xxx:8080/" @@ -4,6 +4,8 @@ BASETGZ=/var/cache/pbuilder/base.tgz #export DEBIAN_BUILDARCH=athlon BUILDPLACE=/var/cache/pbuilder/build/ MIRRORSITE=http://www.jp.debian.org/debian +#NONUSMIRRORSITE="http://www.jp.debian.org/debian-non-US" +#OTHERMIRROR="deb http://www.home.com/updates/ ./" #export http_proxy=http://your-proxy:8080/ USEPROC=yes BUILDRESULT=/var/cache/pbuilder/result/ |