svn commit: r257010 - in projects/vps: sys/vps tools/vps usr.sbin/vpsctl

[Will Andrews]

Author: will
Date: Wed Oct 23 19:06:53 2013
New Revision: 257010
URL: http://svnweb.freebsd.org/changeset/base/257010

Log:
  Sync with svn.7he.at/vps/trunk r202.
  
  r202 | klaus | 2013-08-01 01:05:34 -0600 (Thu, 01 Aug 2013) | 3 lines
  Some build fixes.
  
  Submitted by:	Klaus P. Ohrhallinger <k at 7he.at>

Modified:
  projects/vps/sys/vps/vps_restore.c
  projects/vps/tools/vps/makepublicdiff.sh
  projects/vps/usr.sbin/vpsctl/Makefile

Modified: projects/vps/sys/vps/vps_restore.c
==============================================================================
--- projects/vps/sys/vps/vps_restore.c	Wed Oct 23 19:06:15 2013	(r257009)
+++ projects/vps/sys/vps/vps_restore.c	Wed Oct 23 19:06:53 2013	(r257010)
@@ -301,6 +301,7 @@ vps_restore_ucred_all(struct vps_snapst_
 }
 
 VPSFUNC
+__attribute__((unused))
 static int
 vps_restore_ucred_checkall(struct vps_snapst_ctx *ctx, struct vps *vps)
 {
@@ -976,7 +977,7 @@ vps_restore_kqueue(struct vps_snapst_ctx
 		return (error);
 	}
 	fget(td, td->td_retval[0], 0, &fp);
-	DBGR("%s: kqueue installed at fd %ld\n",
+	DBGR("%s: kqueue installed at fd %zd\n",
 	    __func__, td->td_retval[0]);
 
 	kq = NULL;
@@ -2175,7 +2176,8 @@ vps_restore_inodenumtovnode(struct vps_s
 
 	vdfi = (struct vps_dump_fileinodenum *)o1->data;
 
-	DBGR("%s: fsid=%lu fileid=%d\n", __func__, vdfi->fsid, vdfi->fileid);
+	DBGR("%s: fsid=%llu fileid=%d\n",
+	     __func__, (unsigned long long)vdfi->fsid, vdfi->fileid);
 
 	DBGR("%s: vps's rootpath=[%s] vnode=%p\n",
 	     __func__, vps->_rootpath, vps->_rootvnode);

Modified: projects/vps/tools/vps/makepublicdiff.sh
==============================================================================
--- projects/vps/tools/vps/makepublicdiff.sh	Wed Oct 23 19:06:15 2013	(r257009)
+++ projects/vps/tools/vps/makepublicdiff.sh	Wed Oct 23 19:06:53 2013	(r257010)
@@ -5,7 +5,7 @@ WORKDIR=head
 
 DIFFFILENAME=$(date '+vps-%Y%m%d_%s.diff')
 
-diff -Naupr -x .svn -x rsync_vps.\* -I '$Id.*$' -I '$FreeBSD.*$' ${ORIGDIR} ${WORKDIR} > ${DIFFFILENAME} 
+diff -Naupr -x .svn -x rsync_vps.\* -x VPS_DBG -I '$Id.*$' -I '$FreeBSD.*$' ${ORIGDIR} ${WORKDIR} > ${DIFFFILENAME} 
 
 ls -lh ${DIFFFILENAME}
 

Modified: projects/vps/usr.sbin/vpsctl/Makefile
==============================================================================
--- projects/vps/usr.sbin/vpsctl/Makefile	Wed Oct 23 19:06:15 2013	(r257009)
+++ projects/vps/usr.sbin/vpsctl/Makefile	Wed Oct 23 19:06:53 2013	(r257010)
@@ -25,9 +25,11 @@ clean:
 mkprivlist:
 	true
 
-priv_ston.c priv_ntos.c: mkprivlist
+priv_generate:
 	${.CURDIR}/mkprivlist.sh ${.CURDIR}/../../sys/sys/priv.h
 
+priv_ston.c priv_ntos.c: mkprivlist priv_generate
+
 vpsctl: priv_ston.c priv_ntos.c
 	cc -Wall -g -I../../sys -I/usr/include -o vpsctl \
 		${.CURDIR}/vpsctl.c \