diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile | 34 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 3 | ||||
| -rwxr-xr-x | pbuilderrc | 1 | ||||
| -rw-r--r-- | pbuilderrc.5 | 2 |
6 files changed, 35 insertions, 20 deletions
@@ -1,6 +1,18 @@ 2002-02-20 Junichi Uekawa <dancer@debian.org> + * pbuilderrc.5: update the doc accordingly. + + * pbuilder-buildpackage (CHROOTEXEC): add fakeroot to EXTRAPACKAGES when in fakeroot mode. + + * pbuilderrc (BASETGZ): revert the pbuilderrc change to make fakeroot always installed. + It's only required when fakeroot mode of buildpackage is run. Make it so. + + * pbuilder-buildpackage: most things are now fixed. fakeroot mode now works! + + * Makefile (INSTALL_DIRECTORY): rewrote the makefile to be a bit better with install. + * pbuilder-buildpackage: add fix to chown the directory as well + removed some debug string. 2002-02-18 Junichi Uekawa <dancer@debian.org> @@ -1,3 +1,7 @@ +INSTALL_DIRECTORY=install -d -m 0755 +INSTALL_FILE=install -m 0644 +INSTALL_EXECUTABLE=install -m 0755 + clean: rm -f *.bak *~ TAGS @@ -5,19 +9,19 @@ TAGS: etags pbuilder-* pbuilder install: - install -d $(DESTDIR)/etc - install -d $(DESTDIR)/usr/sbin - install -d $(DESTDIR)/usr/bin - install -d $(DESTDIR)/usr/lib/pbuilder - install -d $(DESTDIR)/usr/share/pbuilder - install -m 755 pbuilder-buildpackage $(DESTDIR)/usr/lib/pbuilder/ - install -m 755 pbuilder-createbuildenv $(DESTDIR)/usr/lib/pbuilder/ - install -m 755 pbuilder-updatebuildenv $(DESTDIR)/usr/lib/pbuilder/ - install -m 755 pbuilder-runhooks $(DESTDIR)/usr/lib/pbuilder/ - install -m 755 pbuilder-checkparams $(DESTDIR)/usr/lib/pbuilder/ - install -m 755 pbuilder-modules $(DESTDIR)/usr/lib/pbuilder/ - install -m 755 pbuilder $(DESTDIR)/usr/sbin - install -m 755 pdebuild $(DESTDIR)/usr/bin - install -m 644 pbuilderrc $(DESTDIR)/etc - install -m 644 pbuilderrc $(DESTDIR)/usr/share/pbuilder + $(INSTALL_DIRECTORY) $(DESTDIR)/etc + $(INSTALL_DIRECTORY) $(DESTDIR)/usr/sbin + $(INSTALL_DIRECTORY) $(DESTDIR)/usr/bin + $(INSTALL_DIRECTORY) $(DESTDIR)/usr/lib/pbuilder + $(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/pbuilder + $(INSTALL_EXECUTABLE) pbuilder-buildpackage $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder-createbuildenv $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder-updatebuildenv $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder-runhooks $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder-checkparams $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder-modules $(DESTDIR)/usr/lib/pbuilder/ + $(INSTALL_EXECUTABLE) pbuilder $(DESTDIR)/usr/sbin + $(INSTALL_EXECUTABLE) pdebuild $(DESTDIR)/usr/bin + $(INSTALL_FILE) 644 pbuilderrc $(DESTDIR)/etc + $(INSTALL_FILE) 644 pbuilderrc $(DESTDIR)/usr/share/pbuilder diff --git a/debian/changelog b/debian/changelog index c5caba2..30852ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,14 +8,13 @@ pbuilder (0.23) unstable; urgency=low * Support building as non-root user, and using fakeroot inside the chroot. (please test) -- can't do. * EXTRAPACKAGES takes effect within the build target. (please test) - * Make adding fakeroot inside the chroot the default. * handle ( <<version) version dependency format. Space should be allowed there. (please test) * /etc/mailname inside chroot is generated. (closes: #133773) * apply fixed description, which looks better, by joeyh, thanks. (closes: #134457) - -- Junichi Uekawa <dancer@debian.org> Mon, 18 Feb 2002 12:48:03 +0900 + -- pbuilder (0.22) unstable; urgency=low diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 088a27d..247ae73 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -18,7 +18,7 @@ export LANG=C export LC_ALL=C -set -ex +set -e function copydsc () { local DSCFILE="$1" @@ -212,6 +212,7 @@ fi; if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then SUTOUSER="HOME=/tmp/buildd su $BUILDUSERNAME -- " DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot" + EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot" echo "I: using fakeroot in build." else # run the build in root @@ -4,7 +4,6 @@ BASETGZ=/var/cache/pbuilder/base.tgz #EXTRAPACKAGES=gcc3.0-athlon-builder -EXTRAPACKAGES="fakeroot" #export DEBIAN_BUILDARCH=athlon BUILDPLACE=/var/cache/pbuilder/build/ MIRRORSITE=http://www.jp.debian.org/debian diff --git a/pbuilderrc.5 b/pbuilderrc.5 index 85763ea..3245440 100644 --- a/pbuilderrc.5 +++ b/pbuilderrc.5 @@ -179,7 +179,7 @@ Specifying this will enable the use of fakeroot inside pbuilder. Note that this will require fakeroot to be installed within -the chroot. +the chroot, and fakeroot will automatically be installed. And .B "-rfakeroot" will be added to |