From 2ca331979b002a55686e21d12938699a74122546 Mon Sep 17 00:00:00 2001 From: dancer Date: Fri, 24 Aug 2001 06:09:39 +0000 Subject: updating docs, and fixing local data, and removing the feature to have a local mirror sites. --- README | 8 ++----- build-package | 4 ---- build-package.sh | 56 ------------------------------------------------ debian/README.Debian | 9 ++++++++ debian/copyright | 7 +++--- debian/dirs | 1 + pbuilder-buildpackage.sh | 3 --- pbuilder-createbuildenv | 11 ++-------- pbuilder-updatebuildenv | 23 ++++++++++---------- pbuilderrc | 9 +++----- 10 files changed, 33 insertions(+), 98 deletions(-) delete mode 100755 build-package delete mode 100755 build-package.sh diff --git a/README b/README index 908e988..f02ab9c 100644 --- a/README +++ b/README @@ -1,7 +1,3 @@ -run build-package. -give a packagename to build. - -It should work quite easily. - -base.tgz is required initially. +No docs. They will be added later. +Read the source for the moment. \ No newline at end of file diff --git a/build-package b/build-package deleted file mode 100755 index 8511f98..0000000 --- a/build-package +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -for a in $@; do ./build-package.sh $a; done - diff --git a/build-package.sh b/build-package.sh deleted file mode 100755 index f28e0db..0000000 --- a/build-package.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -export LANG=C -export LC_ALL=C - -PACKAGENAME=$1 -BASETGZ=/tmp/base.tgz -MYREPOSITORY=/home/dancer/DEBIAN/personal-buildd/build-package/my-repos -MYREPOSITORYEXTRAPATH=$MYREPOSITORY/i386/athlon -MYREPOSITORYHTTP=http://atoron.work.isl.doshisha.ac.jp/athlonmirror -EXTRAPACKAGES=gcc3.0-athlon-builder -export DEBIAN_BUILDARCH=athlon -BUILDPLACE=/home/dancer/buildd/tmp/buildd -CHROOTEXEC="chroot $BUILDPLACE " - - - -cd $MYREPOSITORY -echo Initializing repository -dpkg-scanpackages . . | gzip > Packages.gz -dpkg-scansources . . | gzip > Sources.gz - - -echo cleaning the build env -rm -rf $BUILDPLACE - -echo building the build env -mkdir -p $BUILDPLACE -cd $BUILDPLACE -tar xfzp $BASETGZ -mkdir -p $BUILDPLACE/tmp/buildd -for a in passwd hosts hostname resolv.conf; do - cp /etc/$a $BUILDPLACE/etc/$a; -done - -echo Installing apt-lines -cat > $BUILDPLACE/etc/apt/sources.list << EOF -deb $MYREPOSITORYHTTP ./ -deb-src $MYREPOSITORYHTTP ./ -deb http://www.jp.debian.org/debian unstable main contrib non-free -deb-src http://www.jp.debian.org/debian unstable main contrib non-free -EOF - -echo Refreshing the base.tgz -$CHROOTEXEC /usr/bin/apt-get update -$CHROOTEXEC /usr/bin/dpkg --purge lilo -$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade -$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES -$CHROOTEXEC /usr/bin/apt-get clean -cd $BUILDPLACE -#tar cfz $BASETGZ * - -echo Installing the build-deps and building -$CHROOTEXEC /bin/sh -c "(cd tmp/buildd; apt-get -y build-dep $PACKAGENAME ; apt-get -y source --build $PACKAGENAME || rm /tmp/buildd/* )" -echo Installing $BUILDPLACE/tmp/buildd/* to archive -mkdir -p $MYREPOSITORYEXTRAPATH -cp $BUILDPLACE/tmp/buildd/* $MYREPOSITORYEXTRAPATH diff --git a/debian/README.Debian b/debian/README.Debian index 553ffa1..0a44fc3 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -3,5 +3,14 @@ pbuilder for Debian This is a personal builder. +Try: + pbuilder-createbuildenv woody +to create the initial build env. + + pbuilder-updatebuildenv woody +would update + +It won't work with Debian 2.2, because dpkg-checkbuilddeps +does not exist yet in Debian 2.2. -- Junichi Uekawa , Sat, 28 Jul 2001 17:05:50 +0900 diff --git a/debian/copyright b/debian/copyright index 23a4b47..48faa07 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,11 @@ This package was debianized by Junichi Uekawa on Sat, 28 Jul 2001 17:05:50 +0900. -It was downloaded from +It was downloaded from http://mikilab.doshisha.ac.jp/~dancer/pbuilder -Upstream Author(s): +Upstream Author(s): Junichi Uekawa Copyright: - +GPL version 2 or later. +See /usr/share/common-licenses/GPL on Debian systems. diff --git a/debian/dirs b/debian/dirs index ca882bb..4090e38 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,3 @@ usr/bin usr/sbin +var/cache/pbuilder/ \ No newline at end of file diff --git a/pbuilder-buildpackage.sh b/pbuilder-buildpackage.sh index ada8fed..1999552 100755 --- a/pbuilder-buildpackage.sh +++ b/pbuilder-buildpackage.sh @@ -48,8 +48,5 @@ echo Installing the build-deps checkbuilddep echo Building the package $CHROOTEXEC /bin/sh -c "(cd tmp/buildd/*/; dpkg-buildpackage)" -echo Installing $BUILDPLACE/tmp/buildd/* to archive -mkdir -p $MYREPOSITORYEXTRAPATH -cp $BUILDPLACE/tmp/buildd/* $MYREPOSITORYEXTRAPATH # LocalWords: dpkg diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index bc5d560..7494ae4 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -11,11 +11,6 @@ if [ -z "$DISTRIBUTION" ]; then fi echo Distribution is $DISTRIBUTION. -cd $MYREPOSITORY -echo Initializing repository -dpkg-scanpackages . . | gzip > Packages.gz -dpkg-scansources . . | gzip > Sources.gz - echo cleaning the build env rm -rf $BUILDPLACE @@ -30,10 +25,8 @@ done echo Installing apt-lines cat > $BUILDPLACE/etc/apt/sources.list << EOF -deb $MYREPOSITORYHTTP ./ -deb-src $MYREPOSITORYHTTP ./ -deb http://www.jp.debian.org/debian $DISTRIBUTION main contrib non-free -deb-src http://www.jp.debian.org/debian $DISTRIBUTION main contrib non-free +deb $MIRRORSITE $DISTRIBUTION main contrib non-free +deb-src $MIRRORSITE $DISTRIBUTION main contrib non-free EOF echo Refreshing the base.tgz diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index a5f8d07..ef578b3 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -2,17 +2,18 @@ export LANG=C export LC_ALL=C +#this option is optional DISTRIBUTION=$1 -test -z "$DISTRIBUTION" && DISTRIBUTION=woody + . /etc/pbuilderrc CHROOTEXEC="chroot $BUILDPLACE " echo "Upgrading for distribution $DISTRIBUTION" -cd $MYREPOSITORY -echo Initializing repository -dpkg-scanpackages . . | gzip > Packages.gz -dpkg-scansources . . | gzip > Sources.gz +#cd $MYREPOSITORY +#echo Initializing repository +#dpkg-scanpackages . . | gzip > Packages.gz +#dpkg-scansources . . | gzip > Sources.gz echo cleaning the build env rm -rf $BUILDPLACE @@ -26,13 +27,13 @@ for a in passwd hosts hostname resolv.conf; do cp /etc/$a $BUILDPLACE/etc/$a; done -echo Installing apt-lines -cat > $BUILDPLACE/etc/apt/sources.list << EOF -deb $MYREPOSITORYHTTP ./ -deb-src $MYREPOSITORYHTTP ./ -deb http://www.jp.debian.org/debian $DISTRIBUTION main contrib non-free -deb-src http://www.jp.debian.org/debian $DISTRIBUTION main contrib non-free +if [ -n "$DISTRIBUTION" ]; then + echo Installing apt-lines + cat > $BUILDPLACE/etc/apt/sources.list << EOF +deb $MIRRORSITE $DISTRIBUTION main contrib non-free +deb-src $MIRRORSITE debian $DISTRIBUTION main contrib non-free EOF +fi echo Refreshing the base.tgz $CHROOTEXEC /usr/bin/apt-get update diff --git a/pbuilderrc b/pbuilderrc index a1fa8b4..d87ca5d 100755 --- a/pbuilderrc +++ b/pbuilderrc @@ -1,8 +1,5 @@ -BASETGZ=/tmp/base.tgz -MYREPOSITORY=/home/dancer/DEBIAN/personal-buildd/my-repos -MYREPOSITORYEXTRAPATH=$MYREPOSITORY/i386/athlon -MYREPOSITORYHTTP=http://atoron.work.isl.doshisha.ac.jp/athlonmirror +BASETGZ=/var/cache/pbuilder/base.tgz #EXTRAPACKAGES=gcc3.0-athlon-builder #export DEBIAN_BUILDARCH=athlon -BUILDPLACE=/home/dancer/buildd/tmp/buildd - +BUILDPLACE=/var/cache/pbuilder/build +MIRRORSITE=http://www.jp.debian.org/debian -- cgit v1.2.3