[Glibc-bsd-commits] r1369 - in trunk/freebsd-utils: . debian
debian/patches
Robert Millan
rmh at costa.debian.org
Sun Mar 19 20:15:53 UTC 2006
Author: rmh
Date: 2006-03-19 20:15:44 +0000 (Sun, 19 Mar 2006)
New Revision: 1369
Added:
trunk/freebsd-utils/debian/kldutils.install
trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/install
trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff
trunk/freebsd-utils/debian/rules
trunk/freebsd-utils/fetch
Log:
* Add all mount_* variants to the package (not all of them are enabled,
though, because of FTBFS).
* Bump mount itself (not relatives) to 6.x (needed by mount_reiserfs).
- Versioned {build-,}dependencies on libbsd and glibc.
- Fix install files (different packages were mixed up).
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/changelog 2006-03-19 20:15:44 UTC (rev 1369)
@@ -1,11 +1,14 @@
freebsd-utils (5.4+1-0.1) unreleased; urgency=low
- * Add kldutils and net-tools.
+ * Add kldutils and (disabled) 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).
+ * Add all mount_* variants to the package (not all of them are enabled,
+ though, because of FTBFS).
+ * Bump mount itself (not relatives) to 6.x (needed by mount_reiserfs).
- -- Robert Millan <rmh at aybabtu.com> Sun, 19 Mar 2006 11:49:25 +0100
+ -- Robert Millan <rmh at aybabtu.com> Sun, 19 Mar 2006 21:12:22 +0100
freebsd-utils (5.4-0.1) unreleased; urgency=low
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/control 2006-03-19 20:15:44 UTC (rev 1369)
@@ -3,20 +3,30 @@
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, libbsd-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365)
Standards-Version: 3.6.0
Package: freebsd-utils
+Essential: yes
Architecture: kfreebsd-i386 kfreebsd-amd64
-Essential: yes
-Depends: ${shlibs:Depends}, ufsutils, kldutils, freebsd-hackedutils
+Depends: ${shlibs:Depends}, ufsutils, kldutils, libc0.1 (>= 2.3.6-3+kbsd.r1365), 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}
+Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6-3+kbsd.r1365)
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.
+
+#Package: net-tools
+#Section: net
+#Priority: important
+#Architecture: kfreebsd-i386 kfreebsd-amd64
+#Depends: ${shlibs:Depends}
+#Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 5.2.1-26)
+#Description: FreeBSD networking tools
+# This package contains the FreeBSD tools needed to manage networking on
+# GNU/kFreeBSD.
Modified: trunk/freebsd-utils/debian/install
===================================================================
--- trunk/freebsd-utils/debian/install 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/install 2006-03-19 20:15:44 UTC (rev 1369)
@@ -12,5 +12,3 @@
scripts/sbin/umount /sbin
scripts/sbin/swapon /sbin
scripts/sbin/swapoff /sbin
-
-debian/modules /etc
Copied: trunk/freebsd-utils/debian/kldutils.install (from rev 1361, trunk/freebsd-utils/debian/install)
===================================================================
--- trunk/freebsd-utils/debian/install 2006-03-19 10:50:43 UTC (rev 1361)
+++ trunk/freebsd-utils/debian/kldutils.install 2006-03-19 20:15:44 UTC (rev 1369)
@@ -0,0 +1,4 @@
+build-tree/src/sbin/kldload/kldload /sbin
+build-tree/src/sbin/kldunload/kldunload /sbin
+build-tree/src/sbin/kldstat/kldstat /bin
+debian/modules /etc
Modified: trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff 2006-03-19 20:15:44 UTC (rev 1369)
@@ -1,15 +1,16 @@
---- src/sbin/mount/mount.c~ 2006-03-18 13:58:00.000000000 +0100
-+++ src/sbin/mount/mount.c 2006-03-18 14:02:35.000000000 +0100
-@@ -138,7 +138,7 @@
+diff -ur src.old/sbin/mount/mount.c src/sbin/mount/mount.c
+--- src.old/sbin/mount/mount.c 2006-03-19 20:56:08.000000000 +0100
++++ src/sbin/mount/mount.c 2006-03-19 20:56:47.000000000 +0100
+@@ -137,7 +137,7 @@
options = NULL;
vfslist = NULL;
vfstype = "ufs";
- while ((ch = getopt(argc, argv, "adF:fo:prwt:uv")) != -1)
-+ while ((ch = getopt(argc, argv, "ad:fo:prwt:uv")) != -1)
++ while ((ch = getopt(argc, argv, "adfo:prwt:uv")) != -1)
switch (ch) {
case 'a':
all = 1;
-@@ -146,9 +146,6 @@
+@@ -145,9 +145,6 @@
case 'd':
debug = 1;
break;
@@ -19,14 +20,24 @@
case 'f':
init_flags |= MNT_FORCE;
break;
---- src/sbin/umount/umount.c~ 2006-03-18 14:16:14.000000000 +0100
-+++ src/sbin/umount/umount.c 2006-03-18 14:20:51.000000000 +0100
+@@ -707,7 +704,7 @@
+ {
+
+ (void)fprintf(stderr, "%s\n%s\n%s\n",
+-"usage: mount [-adfpruvw] [-F fstab] [-o options] [-t ufs | external_type]",
++"usage: mount [-adfpruvw] [-o options] [-t ufs | external_type]",
+ " mount [-dfpruvw] special | node",
+ " mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
+ exit(1);
+diff -ur src.old/sbin/umount/umount.c src/sbin/umount/umount.c
+--- src.old/sbin/umount/umount.c 2006-03-19 20:56:08.000000000 +0100
++++ src/sbin/umount/umount.c 2006-03-19 20:57:21.000000000 +0100
@@ -94,7 +94,7 @@
sync();
all = errs = 0;
- while ((ch = getopt(argc, argv, "AaF:fh:t:v")) != -1)
-+ while ((ch = getopt(argc, argv, "Aa:fh:t:v")) != -1)
++ while ((ch = getopt(argc, argv, "Aafh:t:v")) != -1)
switch (ch) {
case 'A':
all = 2;
@@ -49,7 +60,7 @@
errs = umountall(typelist);
break;
case 0:
-@@ -580,6 +577,6 @@
+@@ -577,6 +574,6 @@
(void)fprintf(stderr, "%s\n%s\n",
"usage: umount [-fv] special | node",
@@ -57,14 +68,3 @@
+ " umount -a | -A [-fv] [-h host] [-t type]");
exit(1);
}
---- src/sbin/mount/mount.c~ 2006-03-18 14:16:14.000000000 +0100
-+++ src/sbin/mount/mount.c 2006-03-18 14:21:13.000000000 +0100
-@@ -704,7 +704,7 @@
-
- (void)fprintf(stderr, "%s\n%s\n%s\n",
- "usage: mount [-dfpruvw] [-o options] [-t ufs | external_type] special node",
--" mount [-adfpruvw] [ -F fstab] [-o options] [-t ufs | external_type]",
-+" mount [-adfpruvw] [-o options] [-t ufs | external_type]",
- " mount [-dfpruvw] special | node");
- exit(1);
- }
Modified: trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff 2006-03-19 20:15:44 UTC (rev 1369)
@@ -1,9 +1,9 @@
---- src/sbin/mount/mount.c~ 2006-03-18 14:06:22.000000000 +0100
-+++ src/sbin/mount/mount.c 2006-03-18 14:07:15.000000000 +0100
-@@ -461,10 +461,9 @@
+--- src/sbin/mount/mount.c~ 2006-03-19 20:51:12.000000000 +0100
++++ src/sbin/mount/mount.c 2006-03-19 20:52:07.000000000 +0100
+@@ -465,10 +465,9 @@
+ exit(mount_ufs(argc, (char * const *) argv));
/* Go find an executable. */
- (void)snprintf(execname, sizeof(execname), "mount_%s", vfstype);
- execvP(execname, _PATH_SYSPATH, (char * const *)argv);
+ execvp(execname, (char * const *)argv);
if (errno == ENOENT) {
Added: trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff 2006-03-19 20:15:44 UTC (rev 1369)
@@ -0,0 +1,10 @@
+--- src/sbin/mount_nullfs/mount_nullfs.c~ 2006-03-19 20:36:49.000000000 +0100
++++ src/sbin/mount_nullfs/mount_nullfs.c 2006-03-19 20:38:22.000000000 +0100
+@@ -63,6 +63,7 @@
+ };
+
+ int subdir(const char *, const char *);
++static void usage();
+
+ int
+ main(argc, argv)
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/debian/rules 2006-03-19 20:15:44 UTC (rev 1369)
@@ -6,34 +6,41 @@
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
-
package=freebsd-utils
+SHELL:=bash
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)
+PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
export LDADD=-lbsd
-dirs=sbin/dmesg \
- sbin/mount \
- sbin/mount_std \
- sbin/umount \
- usr.sbin/rpc.umntall \
- sbin/swapon \
- sbin/sysctl \
- $(NULL)
+build/freebsd-utils:: apply-patches
+ set -e ; for i in sbin/{dmesg,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
+ sbin/mount_{autofs,ext2fs,hpfs,nullfs,reiserfs,unionfs} \
+ ; do \
+ $(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
+ done
+# FIXME: add xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs
-build/$(package):: apply-patches
- set -e ; for i in $(dirs) ; do \
+build/kldutils:: apply-patches
+ set -e ; for i in sbin/kld{load,stat,unload} \
+ ; do \
$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
done
+build/net-tools:: apply-patches
+ set -e ; for i in sbin/{ifconfig,route} \
+ ; do \
+ $(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
+ done
+
include /usr/share/cdbs/1/rules/tarball.mk
pre-build:: $(_cdbs_tarball_stamps)
find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \
- -e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
- -e "/[ \t]*__dead2[ \t]*/d" \
+ -e "/^__FBSDID/d" \
+ -e "/[ \t]*__\(dead2\|unused\|result\)[ \t]*/d" \
+ -e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
+ -e "s,<sys/iconv\.h>,<iconv.h>,g" \
+ -e "s/^LDADD=/LDADD+=/g" \
-e "s/getline/bsd_&/g" \
; done)
Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch 2006-03-19 20:08:40 UTC (rev 1368)
+++ trunk/freebsd-utils/fetch 2006-03-19 20:15:44 UTC (rev 1369)
@@ -16,7 +16,8 @@
src/sbin/dmesg \
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/mount_std src/sbin/umount src/usr.sbin/rpc.umntall \
+ src/sbin/mount_{cd9660,ext2fs,hpfs,msdosfs,nfs,nfs4,ntfs,nullfs,udf,umapfs,unionfs} \
src/sbin/swapon \
src/sbin/sysctl \
; do
@@ -24,6 +25,13 @@
test -e $i
done
+for i in \
+ src/sbin/mount{,_autofs,_reiserfs} \
+ ; do
+ cvs ${action} -r RELENG_6_0_0_RELEASE $i
+ test -e $i
+done
+
rm -f src.tar.gz
tar -czpf src.tar.gz src
rm -rf src
More information about the Glibc-bsd-commits
mailing list