[Glibc-bsd-commits] r1361 - in trunk/freebsd-utils: . debian debian/patches

Robert Millan rmh at costa.debian.org
Sun Mar 19 10:50:44 UTC 2006 

Author: rmh
Date: 2006-03-19 10:50:43 +0000 (Sun, 19 Mar 2006)
New Revision: 1361

Added:
   trunk/freebsd-utils/debian/kldutils.init.d
   trunk/freebsd-utils/debian/modules
Removed:
   trunk/freebsd-utils/debian/patches/006_unmount_syscall.diff
   trunk/freebsd-utils/debian/patches/012_mount_std.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/dirs
   trunk/freebsd-utils/debian/install
   trunk/freebsd-utils/debian/patches/001_mount.diff
   trunk/freebsd-utils/debian/patches/008_swapon.diff
   trunk/freebsd-utils/debian/rules
   trunk/freebsd-utils/fetch
Log:
* Integrate kldutils package into freebsd-utils.
* fetch: Obtain source for kldutils and net-tools.
  * Stop linking with libedit-dev (vis/unvis functions are in libbsd now).
  * Add  tag to freebsd-utils.
  * Remove syscall() hacks (will use proper glibc now).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/changelog	2006-03-19 10:50:43 UTC (rev 1361)
@@ -1,3 +1,12 @@
+freebsd-utils (5.4+1-0.1) unreleased; urgency=low
+
+  * Add kldutils and net-tools.
+  * Stop linking with libedit-dev (vis/unvis functions are in libbsd now).
+  * Add ${shlibs:Depends} tag to freebsd-utils.
+  * Remove syscall() hacks (will use proper glibc now).
+
+ -- Robert Millan <rmh at aybabtu.com>  Sun, 19 Mar 2006 11:49:25 +0100
+
 freebsd-utils (5.4-0.1) unreleased; urgency=low
 
   * Initial release.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/control	2006-03-19 10:50:43 UTC (rev 1361)
@@ -3,12 +3,20 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libedit-dev, libbsd-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev
 Standards-Version: 3.6.0
 
 Package: freebsd-utils
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Essential: yes
-Depends: ufsutils, kldutils, freebsd-hackedutils
+Depends: ${shlibs:Depends}, ufsutils, kldutils, freebsd-hackedutils
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
  FreeBSD utilities needed for GNU/kFreeBSD.
+
+Package: kldutils
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Replaces: freebsd-utils (<= 5.2.1-16)
+Description: tools for managing kFreeBSD modules
+ This package contains a set of programs for loading, inserting, and
+ removing kernel modules for kFreeBSD.

Modified: trunk/freebsd-utils/debian/dirs
===================================================================
--- trunk/freebsd-utils/debian/dirs	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/dirs	2006-03-19 10:50:43 UTC (rev 1361)
@@ -1 +1,4 @@
+bin
+sbin
 lib/freebsd
+etc/modules.d

Modified: trunk/freebsd-utils/debian/install
===================================================================
--- trunk/freebsd-utils/debian/install	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/install	2006-03-19 10:50:43 UTC (rev 1361)
@@ -12,3 +12,5 @@
 scripts/sbin/umount			/sbin
 scripts/sbin/swapon			/sbin
 scripts/sbin/swapoff			/sbin
+
+debian/modules				/etc

Copied: trunk/freebsd-utils/debian/kldutils.init.d (from rev 1341, trunk/kldutils/debian/init.d)

Copied: trunk/freebsd-utils/debian/modules (from rev 1341, trunk/kldutils/debian/modules)

Modified: trunk/freebsd-utils/debian/patches/001_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/001_mount.diff	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/patches/001_mount.diff	2006-03-19 10:50:43 UTC (rev 1361)
@@ -9,22 +9,3 @@
  #include <ufs/ufs/ufsmount.h>
  
  #include "extern.h"
---- src/sbin/mount/mount_ufs.c.old	2006-03-18 13:54:12.000000000 +0100
-+++ src/sbin/mount/mount_ufs.c	2006-03-18 13:57:43.000000000 +0100
-@@ -43,6 +43,7 @@
- 
- #include <sys/param.h>
- #include <sys/mount.h>
-+#include <sys/syscall.h>
- 
- #include <err.h>
- #include <errno.h>
-@@ -105,7 +106,7 @@
- 	else
- 		args.export.ex_flags = 0;
- 
--	if (mount("ufs", fs_name, mntflags, &args) < 0) {
-+	if (syscall (SYS_mount, "ufs", fs_name, mntflags, &args) < 0) {
- 		switch (errno) {
- 		case EMFILE:
- 			warnx("%s on %s: mount table full",

Deleted: trunk/freebsd-utils/debian/patches/006_unmount_syscall.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/006_unmount_syscall.diff	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/patches/006_unmount_syscall.diff	2006-03-19 10:50:43 UTC (rev 1361)
@@ -1,19 +0,0 @@
---- src/sbin/umount/umount.c~	2006-03-18 14:21:27.000000000 +0100
-+++ src/sbin/umount/umount.c	2006-03-18 14:22:12.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <sys/mount.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-+#include <sys/syscall.h>
- 
- #include <netdb.h>
- #include <rpc/rpc.h>
-@@ -349,7 +350,7 @@
- 	if (!namematch(ai))
- 		return (1);
- 
--		if (unmount(sfs->f_mntonname, fflag) != 0) {
-+		if (syscall (SYS_unmount, sfs->f_mntonname, fflag) != 0) {
- 			warn("unmount of %s failed", sfs->f_mntonname);
- 			return (1);
- 		}

Modified: trunk/freebsd-utils/debian/patches/008_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/008_swapon.diff	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/patches/008_swapon.diff	2006-03-19 10:50:43 UTC (rev 1361)
@@ -1,14 +1,5 @@
 --- src/sbin/swapon/swapon.c~	2006-03-18 14:30:31.000000000 +0100
 +++ src/sbin/swapon/swapon.c	2006-03-18 15:57:02.000000000 +0100
-@@ -167,7 +167,7 @@
- static int
- swap_on_off(char *name, int doingall)
- {
--	if ((which_prog == SWAPOFF ? swapoff(name) : swapon(name)) == -1) {
-+	if ((which_prog == SWAPOFF ? syscall (SYS_swapoff, name) : syscall (SYS_swapon, name)) == -1) {
- 		switch (errno) {
- 		case EBUSY:
- 			if (!doingall)
 @@ -209,69 +209,6 @@
  static void
  swaplist(int lflag, int sflag, int hflag)
@@ -80,13 +71,3 @@
 +  fprintf (stderr, "%s\n", strerror (ENOSYS));
  }
  
---- src/sbin/swapon/swapon.c~	2006-03-18 15:57:38.000000000 +0100
-+++ src/sbin/swapon/swapon.c	2006-03-18 15:58:06.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/syscall.h>
- 
- static void usage(void);
- static int swap_on_off(char *name, int ignoreebusy);

Deleted: trunk/freebsd-utils/debian/patches/012_mount_std.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_mount_std.diff	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/patches/012_mount_std.diff	2006-03-19 10:50:43 UTC (rev 1361)
@@ -1,29 +0,0 @@
---- src/sbin/mount_std/mount_std.c~	2006-03-18 17:20:33.000000000 +0100
-+++ src/sbin/mount_std/mount_std.c	2006-03-18 17:21:52.000000000 +0100
-@@ -55,6 +55,8 @@
- #include <sysexits.h>
- #include <unistd.h>
- 
-+#include <sys/syscall.h>
-+
- #include "mntopts.h"
- 
- static struct mntopt mopts[] = {
-@@ -136,7 +138,7 @@
- 	 * FreeBSD-5.0.
- 	 */
- 	signal(SIGSYS, catchsig);
--	error = nmount(iov, 4, mntflags);
-+	error = syscall (SYS_nmount, iov, 4, mntflags);
- 	signal(SIGSYS, SIG_DFL);
- 
- 	/*
-@@ -145,7 +147,7 @@
- 	 * or the user didn't recompile his kernel.
- 	 */
- 	if (error && (errno == EOPNOTSUPP || errno == ENOSYS || caughtsig))
--		error = mount(fsname, mntpath, mntflags, NULL);
-+		error = syscall (SYS_mount, fsname, mntpath, mntflags, NULL);
- 
- 	if (error)
- 		err(EX_OSERR, NULL);

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/debian/rules	2006-03-19 10:50:43 UTC (rev 1361)
@@ -4,6 +4,7 @@
   
 DEB_TAR_SRCDIR                  := src
 DEB_AUTO_CLEANUP_RCS            := yes
+DEB_DH_INSTALLINIT_ARGS		:= --no-start --update-rcd-params="start 20 S ."
 
 # Add here any variable or target overrides you need
 
@@ -12,7 +13,7 @@
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/$(package)
 PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR)
-export LDADD=-ledit -lbsd
+export LDADD=-lbsd
 
 dirs=sbin/dmesg \
   sbin/mount \

Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch	2006-03-19 10:30:13 UTC (rev 1360)
+++ trunk/freebsd-utils/fetch	2006-03-19 10:50:43 UTC (rev 1361)
@@ -14,10 +14,9 @@
 
 for i in \
     src/sbin/dmesg \
-    src/sbin/mount \
-    src/sbin/mount_std \
-    src/sbin/umount \
-    src/usr.sbin/rpc.umntall \
+    src/sbin/ifconfig src/sbin/route \
+    src/sbin/kldconfig src/sbin/kldload src/sbin/kldstat src/sbin/kldunload \
+    src/sbin/mount src/sbin/mount_std src/sbin/umount src/usr.sbin/rpc.umntall \
     src/sbin/swapon \
     src/sbin/sysctl \
   ; do

More information about the Glibc-bsd-commits mailing list