[Pbuilder-maint] pbuilder CVS update: pbuilder
pdebuild-user-mode-linux pdebuild-uml-checkparams
pdebuild-checkparams pdebuild pbuilder-user-mode-linux
pbuilder-uml-checkparams pbuilder-modules
pbuilder-createbuildenv pbuilder-checkparams
pbuilder-buildpackage-funcs pbuilder-buildpackage Makefile ChangeLog
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Wed Dec 21 11:57:29 UTC 2005
User: dancer
Date: 05/12/21 11:57:29
Modified: . pdebuild-user-mode-linux pdebuild-uml-checkparams
pdebuild-checkparams pdebuild
pbuilder-user-mode-linux pbuilder-uml-checkparams
pbuilder-modules pbuilder-createbuildenv
pbuilder-checkparams pbuilder-buildpackage-funcs
pbuilder-buildpackage Makefile ChangeLog
Log:
use readlink -f instead of -e.
add q-funk's script.
Revision Changes Path
1.15 +2 -2 pbuilder/pdebuild-user-mode-linux
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-user-mode-linux?annotate=1.15&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-user-mode-linux?rev=1.15&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-user-mode-linux.diff?r1=1.15&r2=1.14&cvsroot=
-----------------------------------
Index: pdebuild-user-mode-linux
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-user-mode-linux,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pdebuild-user-mode-linux 5 Dec 2005 14:24:55 -0000 1.14
+++ pdebuild-user-mode-linux 21 Dec 2005 11:57:29 -0000 1.15
@@ -36,11 +36,11 @@
if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
- if [ ! readlink -e .. ]; then
+ if [ ! readlink -f .. ]; then
echo "E: Cannot find .. dir from PWD=$(pwd)"
exit 1
fi
- pbuilder-user-mode-linux execute "$@" --bindmounts $(readlink -e ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
+ pbuilder-user-mode-linux execute "$@" --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
else
if ! dpkg-checkbuilddeps -B; then
echo "W: Unmet build-dependency in source"
1.3 +1 -1 pbuilder/pdebuild-uml-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams?annotate=1.3&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams.diff?r1=1.3&r2=1.2&cvsroot=
-----------------------------------
Index: pdebuild-uml-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-uml-checkparams,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdebuild-uml-checkparams 5 Dec 2005 14:24:55 -0000 1.2
+++ pdebuild-uml-checkparams 21 Dec 2005 11:57:29 -0000 1.3
@@ -68,7 +68,7 @@
--buildresult)
# ignore buildresult
if [ -d "$2" ]; then
- UML_BUILDRESULT=$(readlink -e "$2")
+ UML_BUILDRESULT=$(readlink -f "$2")
else
echo "E: Directory $2 does not exist" >&2
exit 1
1.4 +1 -1 pbuilder/pdebuild-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-checkparams?annotate=1.4&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-checkparams?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-checkparams.diff?r1=1.4&r2=1.3&cvsroot=
-----------------------------------
Index: pdebuild-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-checkparams,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pdebuild-checkparams 5 Dec 2005 14:24:55 -0000 1.3
+++ pdebuild-checkparams 21 Dec 2005 11:57:29 -0000 1.4
@@ -28,7 +28,7 @@
--buildresult)
if [ -n "$2" ]; then
if [ -d "$2" ]; then
- BUILDRESULT=$(readlink -e "$2");
+ BUILDRESULT=$(readlink -f "$2");
else
echo "E: Directory $2 does not exist" >&2
exit 1
1.27 +1 -1 pbuilder/pdebuild
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild?annotate=1.27&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild?rev=1.27&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild.diff?r1=1.27&r2=1.26&cvsroot=
-----------------------------------
Index: pdebuild
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pdebuild 5 Dec 2005 14:24:55 -0000 1.26
+++ pdebuild 21 Dec 2005 11:57:29 -0000 1.27
@@ -37,7 +37,7 @@
export BUILDRESULTGID=$(id -g)
if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
- ${PBUILDERROOTCMD} pbuilder execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -e ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
+ ${PBUILDERROOTCMD} pbuilder execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
else
if ! dpkg-checkbuilddeps -B ; then
echo "W: Unmet build-dependency in source"
1.48 +1 -1 pbuilder/pbuilder-user-mode-linux
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux?annotate=1.48&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux?rev=1.48&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux.diff?r1=1.48&r2=1.47&cvsroot=
-----------------------------------
Index: pbuilder-user-mode-linux
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-user-mode-linux,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pbuilder-user-mode-linux 5 Dec 2005 14:24:55 -0000 1.47
+++ pbuilder-user-mode-linux 21 Dec 2005 11:57:29 -0000 1.48
@@ -146,7 +146,7 @@
-BUILDING_DSC_FILE=$(readlink -e "$1") || true # ignore failure here
+BUILDING_DSC_FILE=$(readlink -f "$1") || true # ignore failure here
EXTRACLEANUP=
UML_EXITCODE=1
case "${OPERATION}" in
1.7 +3 -3 pbuilder/pbuilder-uml-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams?annotate=1.7&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams.diff?r1=1.7&r2=1.6&cvsroot=
-----------------------------------
Index: pbuilder-uml-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-uml-checkparams,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pbuilder-uml-checkparams 5 Dec 2005 14:24:55 -0000 1.6
+++ pbuilder-uml-checkparams 21 Dec 2005 11:57:29 -0000 1.7
@@ -102,7 +102,7 @@
--buildresult)
# ignore buildresult
if [ -d "$2" ]; then
- UML_BUILDRESULT=$(readlink -e "$2")
+ UML_BUILDRESULT=$(readlink -f "$2")
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -110,7 +110,7 @@
shift; shift;;
--buildplace)
if [ -d "$2" ]; then
- BUILDPLACE=$(readlink -e "$2")
+ BUILDPLACE=$(readlink -f "$2")
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -119,7 +119,7 @@
--logfile)
exec > "$2";
exec 2>&1
- PBUILDER_BUILD_LOGFILE=$(readlink -e "$2")
+ PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
shift;shift;;
--)
shift;
1.89 +1 -1 pbuilder/pbuilder-modules
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?annotate=1.89&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?rev=1.89&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules.diff?r1=1.89&r2=1.88&cvsroot=
-----------------------------------
Index: pbuilder-modules
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-modules,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- pbuilder-modules 5 Dec 2005 14:24:55 -0000 1.88
+++ pbuilder-modules 21 Dec 2005 11:57:29 -0000 1.89
@@ -266,7 +266,7 @@
if [ ! -f "/etc/$a" ]; then
echo "E: /etc/$a does not exist, your setup is insane. fix it" >&2
fi
- cp $( readlink -e "/etc/$a" ) "$BUILDPLACE/etc/$a";
+ cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a";
done
}
1.48 +1 -1 pbuilder/pbuilder-createbuildenv
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv?annotate=1.48&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv?rev=1.48&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-createbuildenv.diff?r1=1.48&r2=1.47&cvsroot=
-----------------------------------
Index: pbuilder-createbuildenv
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-createbuildenv,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pbuilder-createbuildenv 5 Dec 2005 14:24:55 -0000 1.47
+++ pbuilder-createbuildenv 21 Dec 2005 11:57:29 -0000 1.48
@@ -50,7 +50,7 @@
unset DEBOOTSTRAPSCRIPT
if [ -n "$HOOKDIR" ]; then
if [ -f "$HOOKDIR/$DISTRIBUTION" ]; then
- DEBOOTSTRAPSCRIPT=$(readlink -e "$HOOKDIR")"/$DISTRIBUTION"
+ DEBOOTSTRAPSCRIPT=$(readlink -f "$HOOKDIR")"/$DISTRIBUTION"
echo " -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT"
fi
fi
1.75 +4 -4 pbuilder/pbuilder-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams?annotate=1.75&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams?rev=1.75&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams.diff?r1=1.75&r2=1.74&cvsroot=
-----------------------------------
Index: pbuilder-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-checkparams,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- pbuilder-checkparams 5 Dec 2005 14:24:55 -0000 1.74
+++ pbuilder-checkparams 21 Dec 2005 11:57:29 -0000 1.75
@@ -56,7 +56,7 @@
echo "E: Directory $2 does not exist" >&2
exit 1
fi
- BUILDPLACE=$(readlink -e "$2");
+ BUILDPLACE=$(readlink -f "$2");
shift; shift;
;;
--mirror)
@@ -82,7 +82,7 @@
--buildresult)
if [ -n "$2" ]; then
if [ -d "$2" ]; then
- BUILDRESULT=$(readlink -e "$2");
+ BUILDRESULT=$(readlink -f "$2");
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -95,7 +95,7 @@
--aptcache)
if [ -n "$2" ]; then
if [ -d "$2" ]; then
- APTCACHE=$(readlink -e "$2");
+ APTCACHE=$(readlink -f "$2");
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -142,7 +142,7 @@
echo " -> Logging to $2"
exec > "$2";
exec 2>&1
- PBUILDER_BUILD_LOGFILE=$(readlink -e "$2")
+ PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
shift; shift;
;;
--pkgname-logfile)
1.28 +3 -3 pbuilder/pbuilder-buildpackage-funcs
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage-funcs?annotate=1.28&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage-funcs?rev=1.28&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage-funcs.diff?r1=1.28&r2=1.27&cvsroot=
-----------------------------------
Index: pbuilder-buildpackage-funcs
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-buildpackage-funcs,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pbuilder-buildpackage-funcs 5 Dec 2005 14:24:55 -0000 1.27
+++ pbuilder-buildpackage-funcs 21 Dec 2005 11:57:29 -0000 1.28
@@ -70,8 +70,8 @@
# a hack for cowdancer, used when a file is edited in-place;
# Copy the file to create a new i-node so that hardlinked original is intact
for A in "$@"; do
- if readlink -e "$A"; then
- A=$(readlink -e "$A")
+ if readlink -f "$A"; then
+ A=$(readlink -f "$A")
mv "$A" "$A"~
cp -a "$A"~ "$A"
rm -f "$A"~
1.118 +3 -3 pbuilder/pbuilder-buildpackage
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?annotate=1.118&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?rev=1.118&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage.diff?r1=1.118&r2=1.117&cvsroot=
-----------------------------------
Index: pbuilder-buildpackage
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-buildpackage,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- pbuilder-buildpackage 5 Dec 2005 14:24:55 -0000 1.117
+++ pbuilder-buildpackage 21 Dec 2005 11:57:29 -0000 1.118
@@ -61,7 +61,7 @@
PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)
exec > "${PBUILDER_BUILD_LOGFILE}"
exec 2>&1
- PBUILDER_BUILD_LOGFILE=$(readlink -e "${PBUILDER_BUILD_LOGFILE}")
+ PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}")
echo "I: Using pkgname logfile"
showbuildbanner '$Id$'
echobacktime
1.41 +2 -0 pbuilder/Makefile
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/Makefile?annotate=1.41&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/Makefile?rev=1.41&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/Makefile.diff?r1=1.41&r2=1.40&cvsroot=
-----------------------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile 21 Dec 2005 11:06:09 -0000 1.40
+++ Makefile 21 Dec 2005 11:57:29 -0000 1.41
@@ -82,6 +82,8 @@
$(INSTALL_EXECUTABLE) examples/D10tmp $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/D90chrootmemo $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/F90chrootmemo $(DESTDIR)/usr/share/doc/pbuilder/examples
+ $(INSTALL_EXECUTABLE) examples/B90list-missing $(DESTDIR)/usr/share/doc/pbuilder/examples
+ $(INSTALL_EXECUTABLE) examples/B91debc $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/execute_installtest.sh $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/execute_paramtest.sh $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/pbuilder-distribution.sh $(DESTDIR)/usr/share/doc/pbuilder/examples
1.358 +5 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.358&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.358&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.358&r2=1.357&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- ChangeLog 21 Dec 2005 11:06:09 -0000 1.357
+++ ChangeLog 21 Dec 2005 11:57:29 -0000 1.358
@@ -1,5 +1,9 @@
2005-12-21 Junichi Uekawa <dancer at debian.org>
+ * Makefile (install):
+ * examples/B91debc:
+ * examples/B90list-missing: from q-funk. 343894
+
* testsuite/run-regression.sh: add results display.
* testsuite/run-test.sh: add results display
More information about the Pbuilder-maint
mailing list