[Pbuilder-maint] pbuilder CVS update: pbuilder
pdebuild-user-mode-linux pdebuild-uml-checkparams
pbuilder-user-mode-linux pbuilder-uml-checkparams
pbuilder-checkparams ChangeLog AUTHORS
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Sat Sep 16 08:01:39 UTC 2006
User: dancer
Date: 06/09/16 08:01:39
Modified: . pdebuild-user-mode-linux pdebuild-uml-checkparams
pbuilder-user-mode-linux pbuilder-uml-checkparams
pbuilder-checkparams ChangeLog AUTHORS
Log:
user-mode-linux support
Revision Changes Path
1.17 +1 -1 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.17&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-user-mode-linux?rev=1.17&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.17&r2=1.16&cvsroot=
-----------------------------------
Index: pdebuild-user-mode-linux
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-user-mode-linux,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pdebuild-user-mode-linux 30 May 2006 23:45:45 -0000 1.16
+++ pdebuild-user-mode-linux 16 Sep 2006 08:01:39 -0000 1.17
@@ -47,7 +47,7 @@
echo "W: Unmet build-dependency in source"
fi
echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | /bin/bash
- pbuilder-user-mode-linux build "$@" --buildresult "${UML_BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
+ pbuilder-user-mode-linux build "$@" --buildresult "${UML_BUILDRESULT}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
fi
# do signing with optional key specifier
1.5 +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.5&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-uml-checkparams?rev=1.5&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.5&r2=1.4&cvsroot=
-----------------------------------
Index: pdebuild-uml-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-uml-checkparams,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pdebuild-uml-checkparams 30 May 2006 23:45:45 -0000 1.4
+++ pdebuild-uml-checkparams 16 Sep 2006 08:01:39 -0000 1.5
@@ -20,7 +20,7 @@
# requires
# . /usr/lib/pbuilder/pbuilder-loadconfig
-for SYSTEM_CONFIG in /usr/share/pbuilder/pbuilder-uml.conf /etc/pbuilder/pbuilder-uml.conf ${HOME}/.pbuilderrc; do
+for SYSTEM_CONFIG in /usr/share/pbuilder/pbuilder-uml.conf /etc/pbuilder/pbuilder-uml.conf ${HOME}/.pbuilderrc ${HOME}/.pbuilder-umlrc; do
if [ -f ${SYSTEM_CONFIG} ]; then
. ${SYSTEM_CONFIG}
fi
1.51 +15 -5 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.51&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-user-mode-linux?rev=1.51&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.51&r2=1.50&cvsroot=
-----------------------------------
Index: pbuilder-user-mode-linux
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-user-mode-linux,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pbuilder-user-mode-linux 30 May 2006 23:45:45 -0000 1.50
+++ pbuilder-user-mode-linux 16 Sep 2006 08:01:39 -0000 1.51
@@ -62,13 +62,20 @@
mount -t proc /proc /proc
mount -t tmpfs /tmp /tmp
-#if ! fsck -p /dev/ubd/1; then
-# echo "W: Failed to fsck /dev/ubd/1"
+
+# create devices
+mount -t tmpfs tmpfs /dev
+mknod /dev/ubdb b 98 16
+#if ! fsck -p /dev/ubdb; then
+# echo "W: Failed to fsck /dev/ubdb"
#fi
-if ! mount -t ext2 /dev/ubd/1 ${UML_CHROOT_MOUNTPOINT}; then
- echo "E: Cannot mount /dev/ubd/1, is UML root image accessible as current user?"
+if ! mount -t ext2 /dev/ubdb ${UML_CHROOT_MOUNTPOINT}; then
+ echo "E: Cannot mount /dev/ubdb, is UML root image accessible as current user?"
exit 1
fi
+mount --bind ${UML_CHROOT_MOUNTPOINT}/dev /dev
+
+
export LOGNAME="${LOGNAME}"
export HOME="${HOME}"
hostname "${UML_HOSTNAME}"
@@ -125,6 +132,9 @@
fi
pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT[@]} --buildresult "\${BUILDRESULT}" --buildplace "${UML_CHROOT_MOUNTPOINT}" --internal-build-uml ${UML_DEBUGMODE:+--debug} ${BUILDING_DSC_FILE} ${UML_EXECUTE_EXTRAOPT}
echo \$? > /proc/exitcode
+
+umount /dev
+umount ${UML_CHROOT_MOUNTPOINT}
/sbin/halt -d -f
EOF
@@ -134,7 +144,7 @@
echo "W: You are uid=0. Don't run UML as uid=0, it's not supported."
fi
- echo Invoking: "linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1=${PBUILDER_COW}${PBUILDER_UML_IMAGE} devfs=mount init=${INSIDE_PBUILDER} rw"
+ echo Invoking: "linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1=${PBUILDER_COW}${PBUILDER_UML_IMAGE} init=${INSIDE_PBUILDER} rw"
if linux mem=${UML_MEM} eth0=${MY_ETH0} con0=fd:0,fd:1 con=pty root=/dev/root rootflags=/ rootfstype=hostfs ubd1="${PBUILDER_COW}${PBUILDER_UML_IMAGE}" devfs=mount init=${INSIDE_PBUILDER} rw ; then
UML_EXITCODE=$?
echo " -> Successful exit from user-mode linux"
1.11 +1 -1 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.11&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-uml-checkparams?rev=1.11&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.11&r2=1.10&cvsroot=
-----------------------------------
Index: pbuilder-uml-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-uml-checkparams,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pbuilder-uml-checkparams 30 May 2006 23:45:45 -0000 1.10
+++ pbuilder-uml-checkparams 16 Sep 2006 08:01:39 -0000 1.11
@@ -21,7 +21,7 @@
# requires
# . /usr/lib/pbuilder/pbuilder-loadconfig
-for SYSTEM_CONFIG in /usr/share/pbuilder/pbuilder-uml.conf /etc/pbuilder/pbuilder-uml.conf ${HOME}/.pbuilderrc; do
+for SYSTEM_CONFIG in /usr/share/pbuilder/pbuilder-uml.conf /etc/pbuilder/pbuilder-uml.conf ${HOME}/.pbuilderrc ${HOME}/.pbuilder-umlrc; do
if [ -f ${SYSTEM_CONFIG} ]; then
. ${SYSTEM_CONFIG}
fi
1.84 +1 -1 pbuilder/pbuilder-checkparams
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams?annotate=1.84&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-checkparams?rev=1.84&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.84&r2=1.83&cvsroot=
-----------------------------------
Index: pbuilder-checkparams
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-checkparams,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- pbuilder-checkparams 1 Sep 2006 15:38:14 -0000 1.83
+++ pbuilder-checkparams 16 Sep 2006 08:01:39 -0000 1.84
@@ -209,7 +209,7 @@
# specify this option if I am running inside UML.
echo " -> Running in pbuilder-user-mode-linux mode"
INTERNAL_BUILD_UML="yes"
- IGNORE_UMOUNT="yes"
+ IGNORE_UMOUNT="no"
shift;
;;
--) # end of processing for this
1.405 +13 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.405&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.405&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.405&r2=1.404&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- ChangeLog 3 Sep 2006 09:13:24 -0000 1.404
+++ ChangeLog 16 Sep 2006 08:01:39 -0000 1.405
@@ -1,3 +1,15 @@
+2006-09-16 Junichi Uekawa <dancer at debian.org>
+
+ * added patch from Mattia Dongili <malattia at linux.it> for pbuilder-uml.
+ diffstat /tmp/pbuilder-uml.diff
+ debian/rules | 16 ++++++++++++++--
+ pbuilder-checkparams | 2 +-
+ pbuilder-uml-checkparams | 2 +-
+ pbuilder-user-mode-linux | 20 +++++++++++++++-----
+ pdebuild-uml-checkparams | 2 +-
+ pdebuild-user-mode-linux | 2 +-
+ 6 files changed, 33 insertions(+), 11 deletions(-)
+
2006-09-03 Junichi Uekawa <dancer at debian.org>
* examples/B90linda, etc.: add notice that it's usable for hookdir.
1.14 +2 -1 pbuilder/AUTHORS
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/AUTHORS?annotate=1.14&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/AUTHORS?rev=1.14&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/AUTHORS.diff?r1=1.14&r2=1.13&cvsroot=
-----------------------------------
Index: AUTHORS
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/AUTHORS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AUTHORS 6 Apr 2003 22:16:35 -0000 1.13
+++ AUTHORS 16 Sep 2006 08:01:39 -0000 1.14
@@ -8,5 +8,6 @@
Henrique de Moraes Holschuh <hmh at debian.org> -- portion of pbuilder-satisfydepends (version dependency check)
Daniel Schepler <schepler at math.berkeley.edu> -- many patches, --preserve-buildplace
Sam Hartman <hartmans at debian.org> -- bind-mount patch
+Mattia Dongili <malattia at linux.it> -- user-mode-linux support
$Id$
\ No newline at end of file
More information about the Pbuilder-maint
mailing list