[Glibc-bsd-commits] r1564 - in trunk/kfreebsd-7: . debian
debian/arch debian/arch/amd64 debian/arch/i386 debian/patches
Robert Millan
rmh at costa.debian.org
Sat May 6 16:52:13 UTC 2006
Author: rmh
Date: 2006-05-06 16:51:15 +0000 (Sat, 06 May 2006)
New Revision: 1564
Added:
trunk/kfreebsd-7/debian/arch/
trunk/kfreebsd-7/debian/arch/amd64/
trunk/kfreebsd-7/debian/arch/amd64/amd64-generic.config
trunk/kfreebsd-7/debian/arch/amd64/amd64-k8.config
trunk/kfreebsd-7/debian/arch/amd64/em64t-p4.config
trunk/kfreebsd-7/debian/arch/i386/
trunk/kfreebsd-7/debian/arch/i386/486.config
trunk/kfreebsd-7/debian/arch/i386/586.config
trunk/kfreebsd-7/debian/arch/i386/686.config
trunk/kfreebsd-7/debian/arch/i386/686.defines
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/compat
trunk/kfreebsd-7/debian/control.flavor.in
trunk/kfreebsd-7/debian/control.in
trunk/kfreebsd-7/debian/copyright
trunk/kfreebsd-7/debian/kfreebsd-image.overrides
trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
trunk/kfreebsd-7/debian/patches/001_misc.diff
trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-7/debian/patches/004_xargs.diff
trunk/kfreebsd-7/debian/patches/005_binutils.diff
trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
trunk/kfreebsd-7/debian/patches/008_config.diff
trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
trunk/kfreebsd-7/debian/patches/902_version.diff
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/904_dev_full.diff
trunk/kfreebsd-7/debian/patches/905_grow_arg_max.diff
trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-7/debian/patches/910_disable_hwpmc.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
trunk/kfreebsd-7/debian/patches/README
trunk/kfreebsd-7/debian/rules
trunk/kfreebsd-7/fetch
Removed:
trunk/kfreebsd-7/TODO
trunk/kfreebsd-7/debian/patches/002_enable_xbox.diff
Log:
Fork for 7-CURRENT, based on r1560.
Deleted: trunk/kfreebsd-7/TODO
===================================================================
--- trunk/kfreebsd-7/TODO 2006-05-06 12:13:59 UTC (rev 1563)
+++ trunk/kfreebsd-7/TODO 2006-05-06 16:51:15 UTC (rev 1564)
@@ -1 +0,0 @@
-- disable -smp flavors (SMP is now enabled by default)
Copied: trunk/kfreebsd-7/debian/arch/amd64/amd64-generic.config (from rev 1560, trunk/kfreebsd-6/debian/arch/amd64/amd64-generic.config)
Copied: trunk/kfreebsd-7/debian/arch/amd64/amd64-k8.config (from rev 1560, trunk/kfreebsd-6/debian/arch/amd64/amd64-k8.config)
Copied: trunk/kfreebsd-7/debian/arch/amd64/em64t-p4.config (from rev 1560, trunk/kfreebsd-6/debian/arch/amd64/em64t-p4.config)
Copied: trunk/kfreebsd-7/debian/arch/i386/486.config (from rev 1560, trunk/kfreebsd-6/debian/arch/i386/486.config)
===================================================================
--- trunk/kfreebsd-6/debian/arch/i386/486.config 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/arch/i386/486.config 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,13 @@
+# Kernel for Debian GNU/kFreeBSD on an i486 machine
+
+include GENERIC
+cpu I486_CPU
+cpu I586_CPU
+cpu I686_CPU
+makeoptions COPTFLAGS="-Os -frename-registers -pipe -march=i486"
+ident Debian-i486
+
+# Xbox support
+options XBOX
+device xboxfb
+device fb
Copied: trunk/kfreebsd-7/debian/arch/i386/586.config (from rev 1560, trunk/kfreebsd-6/debian/arch/i386/586.config)
Copied: trunk/kfreebsd-7/debian/arch/i386/686.config (from rev 1560, trunk/kfreebsd-6/debian/arch/i386/686.config)
===================================================================
--- trunk/kfreebsd-6/debian/arch/i386/686.config 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/arch/i386/686.config 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,11 @@
+# Kernel for Debian GNU/kFreeBSD on an i686 machine
+
+include GENERIC
+cpu I686_CPU
+makeoptions COPTFLAGS="-O2 -frename-registers -pipe -march=i686"
+ident Debian-i686
+
+# Xbox support
+options XBOX
+device xboxfb
+device fb
Copied: trunk/kfreebsd-7/debian/arch/i386/686.defines (from rev 1560, trunk/kfreebsd-6/debian/arch/i386/686.defines)
Copied: trunk/kfreebsd-7/debian/changelog (from rev 1560, trunk/kfreebsd-6/debian/changelog)
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/changelog 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,412 @@
+kfreebsd-7 (6.99+20060506-0.1) unreleased; urgency=low
+
+ * Fork for 7-CURRENT, based on r1560.
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 6 May 2006 09:04:52 +0200
+
+kfreebsd-6 (6.0-0.4) unreleased; urgency=low
+
+ * Re-enable atapi{fd,st}, ppc and psm, since they aren't being built
+ as modules (Oh my god! My mouse, printer and/or ultra-weird storage device
+ stopped working!).
+ * Fix broken perms (644) in module dir.
+
+ -- Robert Millan <rmh at aybabtu.com> Fri, 28 Apr 2006 15:47:45 +0200
+
+kfreebsd-6 (6.0-0.3) unreleased; urgency=low
+
+ * Finaly, multiple kernels can coexist on your system!
+ - Disable /boot/loader.conf (provided in kfreebsd-loader now).
+ - Get rid of /boot/device.hints (now embedded in kernel image).
+ - Move modules to /lib/modules/@RELEASE at .
+ - Move kernel image to /boot/kfreebsd- at RELEASE@.
+ * patches/999_config.diff: Refurbish. Now builds linprocfs/linux into
+ the kernel (since it's always used), and removes a bunch of non-
+ essential stuff (use kfreebsd-common to load them as modules).
+ Network and storage drivers _are_ still present (untill we port
+ hotplug/discover). On -486, this saves 544 KB in kernel.gz.
+
+ -- Robert Millan <rmh at aybabtu.com> Thu, 27 Apr 2006 18:56:22 +0200
+
+kfreebsd-6 (6.0-0.2) unreleased; urgency=low
+
+ * First "normal" upload to unreleased.
+
+ -- Robert Millan <rmh at aybabtu.com> Wed, 26 Apr 2006 14:55:28 +0200
+
+kfreebsd-6 (6.0-0.1) unreleased; urgency=low
+
+ [ Robert Edmonds ]
+ * New upstream version pulled from RELENG_6 CVSup.
+ - ReiserFS support. (Closes: #335019)
+ * Disabled the non-compiling hwpmc driver.
+
+ [ Robert Millan ]
+ * Merge 5.x branch changes (from rev 654 to rev 1058)
+ * Add src/usr.sbin/config into the source and build/use it dynamicaly.
+ * Fix IEEE 802.11 buffer overflow (FreeBSD-SA-06:05.80211 / CVE-2006-0226).
+ * Fix local kernel memory disclosure (FreeBSD-SA-06:06.kmem / CVE-2006-0379
+ / CVE-2006-0380).
+ * Fix IP fragment handling panic in pf (FreeBSD-SA-06:07.pf / CVE-2006-0381).
+ * Disable "nve" driver.
+ - copyright: Add nve to list of non-free components.
+ - patches/903_disable_non-free_drivers.diff: Disable nve.
+ - arch/i386/486.config: Ditto.
+ * control.in:
+ - (Build-Depends-Indep): Remove patchutils and sharutils (not really
+ needed).
+ - (Build-Depends): Ditto. Also update libdb4.4-dev.
+ - (Replaces): Remove kfreebsd at major@-source (it never existed for 6.x).
+ * rules: When obtaining major/version numbers, if this is a preliminar
+ snapshot (e.g. 6.99+20060217), pretend this is the actual release.
+ * autopatch.sh: Merge into rules. This allows us to use $(major) instead
+ of a hardcoded number.
+ * patches/001_misc.diff: Make this patch more upstream-friendly.
+ * Fix /dev permissions in userland.
+ - control.flavor.in (Depends): Add kfreebsd-common.
+ - patches/900_devfs_perm_fixes.diff: Remove.
+ * rules: Run patch with --dry-run first. This way if a patch fails
+ the tree isn't left in an inconsistent state.
+ * Add ndiswrapper-modules package.
+ - rules: Install ndis.ko and if_ndis.ko there.
+ - control.flavor.in: Add ndiswrapper-modules flavor.
+ * AMD64 support.
+ - patches/*.diff: Add amd64-specific hunks for patches that hack i386 files.
+ - arch/amd64/amd64-generic.config: New. Generic x86_64 config.
+ - arch/amd64/amd64-k8.config: New. K8 config.
+ - arch/amd64/amd64-k8-smp.config: New. K8 SMP config.
+ - arch/amd64/em64t-p4.config: New. P4 config.
+ - arch/amd64/em64t-p4-smp.config: New. P4 SMP config.
+ - patches/binutils.diff: Add binutils fixes for amd64 code.
+ - rules: Replace all "dh_* -a" with "dh_* -s". -a should NEVER be used.
+ See debhelper(7).
+ * Simplify/refurbish kernel config files by using the "include" command.
+ - patches/999_config.diff: New. Incorporate common changes in GENERIC.
+ - debian/rules: Copy all our config files into the tree, then symlink.
+ - debian/arch/*/*.config: Refurbish.
+ * Upstream now builds with "-O2 -frename-registers" so let's do that
+ as well.
+ - arch/*/*.config
+ * Disable build of modules that are already part of the kernel image.
+ This gives the .deb a size loss of ~1600 KB (~4 MB once installed).
+ - patches/009_disable_duped_modules.diff
+ * Build 486 and 586* flavors with -Os. This saves 400 KB, out of
+ which 240 KB are in kernel.gz. Rationale:
+ - 486 tiny flavor is needed for d-i.
+ - On old hardware, your amount of memory is likely to be utter crap. So
+ this is preferable to -O2 no matter the benchmarks.
+
+ [ Aurelien Jarno ]
+ * Fix a remote denial of service in NFS server (FreeBSD-SA-06:10.nfs /
+ CVE-2006-0900).
+ * Fix an IPsec replay attack vulnerability (FreeBSD-SA-06:11.ipsec /
+ CVE-2006-0905).
+ * Fix an FPU information disclosure on AMD processors (FreeBSD-SA-06:14.fpu /
+ CVE-2006-1056).
+
+ -- Robert Millan <rmh at aybabtu.com> Wed, 26 Apr 2006 12:06:11 +0200
+
+kfreebsd-5 (5.3-6) unstable; urgency=low
+
+ * Changed SCSI_DELAY to 2000. Users that need a longer time could
+ change this value in /boot/loader.conf (closes: bug#323155).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 29 Aug 2005 14:25:44 +0200
+
+kfreebsd-5 (5.3-5) unstable; urgency=low
+
+ * Enabled atapicam driver (closes: bug#323155).
+ * Allow the kernel to execve ET_DYN files.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 17 Aug 2005 15:44:18 +0200
+
+kfreebsd-5 (5.3-4) unstable; urgency=low
+
+ * Added OSS_GETVERSION ioctl. Patch from Robert Millan (closes:
+ bug#322197)
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 10 Aug 2005 00:56:00 +0200
+
+kfreebsd-5 (5.3-3) unstable; urgency=low
+
+ * Fixed the generation of the preinst script.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 6 Aug 2005 05:47:11 +0200
+
+kfreebsd-5 (5.3-2) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Provide the kernel sources as /usr/src/kfreebsd-source-5.3.tar.bz2
+ * Change the owner of the files inside kfreebsd-source-5.3.tar.bz2 to
+ root:src.
+ * Build a binary package kfreebsd-image-5.3 containing the kernel.
+ * Build a binary package kfreebsd-headers-5.3 containing the headers.
+ * Don't create kfreebsd.gz in postinst.
+ * Make the kfreebsd-source-5.3 buildable on non GNU/kFreeBSD systems.
+ * Added an abiname field.
+
+ [ Guillem Jover ]
+ * debian/rules:
+ - Use DEB_HOST_ARCH_CPU instead if DEB_HOST_GNU_CPU, fix amd64.
+ - Use SRC_PACKAGE instead of the tarball name.
+ - Use make -C option instead of "cd".
+ * General indentation fixes.
+
+ [ Robert Millan ]
+ * Put some drivers as modules.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 6 Aug 2005 00:09:57 +0200
+
+kfreebsd-5 (5.3-1) unstable; urgency=low
+
+ * Match linux kernel naming scheme:
+ - Renamed source package to kfreebsd-5.
+ - Renamed kfreebsd5-source to kfreebsd-source-5.
+ * Fix ipsec vulnerability (FreeBSD-SA-05:19.ipsec /
+ * CAN-2005-2359).
+ - patches/017_ipsec.diff
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 27 Jul 2005 17:44:01 +0200
+
+kfreebsd5-source (5.3-17) unstable; urgency=high
+
+ * Fix devfs ruleset bypass (FreeBSD-SA-05:17.devfs / CAN-2005-2218).
+ - patches/016_devfs.diff
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 20 Jul 2005 23:45:07 +0200
+
+kfreebsd5-source (5.3-16) unstable; urgency=low
+
+ * Fixed path of some patches.
+ * Don't change the build-dependencies at build-time.
+ * Bumped Standard-Version to 3.6.2.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 4 Jul 2005 01:18:41 +0200
+
+kfreebsd5-source (5.3-15) unstable; urgency=low
+
+ * Fix TCP denial of service (FreeBSD-SA-05:15.tcp / CAN-2005-0356).
+ - patches/015_tcp_dos.diff: New. Patch from upstream.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 2 Jul 2005 15:29:27 +0200
+
+kfreebsd5-source (5.3-14) unstable; urgency=low
+
+ * Provides kfreebsd-source instead of kernel-source (closes: bug#312524).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 10 Jun 2005 07:23:46 +0200
+
+kfreebsd5-source (5.3-13) unstable; urgency=low
+
+ * Changed to a team maintained package.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 6 Jun 2005 01:45:36 +0200
+
+kfreebsd5-source (5.3-12) unstable; urgency=low
+
+ * New maintainer. Thanks to Robert Millan for his great job.
+ * Added 014_ip_packed.diff to fix the build of MySQL on GNU/kFreeBSD.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 3 Jun 2005 07:52:08 +0200
+
+kfreebsd5-source (5.3-11) unstable; urgency=low
+
+ * Workaround hyperthreading CPU bug (FreeBSD-SA-05:09.htt / CAN-2005-0109).
+ - patches/013_hyperthreading_wa.diff: New. Patch from upstream.
+
+ -- Robert Millan <rmh at debian.org> Fri, 27 May 2005 14:07:37 +0200
+
+kfreebsd5-source (5.3-10) unstable; urgency=high
+
+ * Fix permissions in /dev/iir (FreeBSD-SA-05:06.iir / CAN-2005-1399).
+ - patches/010_iir_perms.diff: New. Patch from upstream.
+ * Fix memory leak in i386_get_ldt (FreeBSD-SA-05:07.ldt / CAN-2005-1400).
+ - patches/011_ldt_memleak.diff: New. Patch from upstream.
+ * Fix generic memory leak (FreeBSD-SA-05:08.kmem / CAN-2005-1406).
+ - patches/012_kmem_memleak.diff: New. Patch from upstream.
+
+ -- Robert Millan <rmh at debian.org> Mon, 9 May 2005 12:25:31 +0200
+
+kfreebsd5-source (5.3-9) unstable; urgency=low
+
+ * Fix memory leak in ifconf (FreeBSD-SA-05:04.ifconf / Closes: #304766).
+ - patches/009_ifconf_memleak.diff: New. Patch from upstream.
+
+ -- Robert Millan <rmh at debian.org> Fri, 15 Apr 2005 12:59:58 +0200
+
+kfreebsd5-source (5.3-8) unstable; urgency=low
+
+ * First upload to Debian. (Closes: #267447)
+
+ -- Robert Millan <rmh at debian.org> Thu, 7 Apr 2005 01:36:59 +0200
+
+kfreebsd5-source (5.3-7) unreleased; urgency=low
+
+ * Fix memory leak in sendfile (FreeBSD-SA-05:02.sendfile / CAN-2005-0708).
+ - patches/008_sendfile_memleak.diff: New. Patch from upstream.
+
+ -- Robert Millan <rmh at debian.org> Tue, 5 Apr 2005 12:32:35 +0200
+
+kfreebsd5-source (5.3-6) unreleased; urgency=low
+
+ * control.in.in: s/Build-Depends/&-Indep/g.
+ * control.in.in (Section): Set to "devel".
+
+ -- Robert Millan <rmh at debian.org> Wed, 23 Mar 2005 23:04:11 +0100
+
+kfreebsd5-source (5.3-5) unreleased; urgency=low
+
+ * patches/007_proc_mounts.diff: New. Rename /proc/mtab to /proc/mounts.
+
+ -- Robert Millan <rmh at debian.org> Sat, 5 Mar 2005 19:56:20 +0100
+
+kfreebsd5-source (5.3-4) unreleased; urgency=low
+
+ * rules: Use patchsys to test patches on every build.
+
+ -- Robert Millan <rmh at debian.org> Wed, 2 Mar 2005 21:03:19 +0100
+
+kfreebsd5-source (5.3-3) unreleased; urgency=low
+
+ * Misc cleanup.
+ * patches/007_cpu_class.diff: New. Detect i*86 subarches in uname.
+
+ -- Robert Millan <rmh at debian.org> Thu, 10 Feb 2005 15:25:58 +0100
+
+kfreebsd5-source (5.3-2) unreleased; urgency=low
+
+ * Grow Sysv IPC limits to reasonable values as advised in
+ postgresql documentation (kernel-resources.html#SYSVIPC-PARAMETERS).
+ - patches/906_grow_sysv_ipc_limits.diff
+
+ -- Robert Millan <rmh at debian.org> Tue, 1 Feb 2005 21:48:07 +0100
+
+kfreebsd5-source (5.3-1) unreleased; urgency=low
+
+ * Package split. Version rebumped.
+
+ -- Robert Millan <rmh at debian.org> Tue, 25 Jan 2005 13:37:15 +0100
+
+kfreebsd5 (5.3+1-1) unreleased; urgency=low
+
+ * Add RTC (real time clock) driver implementation.
+ - rtc.tar.gz: New.
+ - rules: Build rtc.
+
+ -- Robert Millan <rmh at debian.org> Tue, 28 Dec 2004 19:33:00 +0100
+
+kfreebsd5 (5.3-3) unreleased; urgency=low
+
+ * Set DEB_STRIP_EXCLUDE=/boot to avoid module inter-dependency problems.
+
+ -- Robert Millan <rmh at debian.org> Mon, 27 Dec 2004 18:36:30 +0100
+
+kfreebsd5 (5.3-2) unreleased; urgency=low
+
+ * Fix memory leak in procfs (FreeBSD-SA-04:17.procfs / CAN-2004-1066).
+ - patches/006_procfs_memleak.diff: New. Patch from upstream.
+
+ -- Robert Millan <rmh at debian.org> Thu, 2 Dec 2004 01:32:38 +0100
+
+kfreebsd5 (5.3-1) unreleased; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Fri, 26 Nov 2004 00:42:22 +0100
+
+kfreebsd5 (5.2.1-8) unreleased; urgency=low
+
+ * Bunch of miscellaneous fixes in preparation of 6.x branch split.
+
+ -- Robert Millan <rmh at debian.org> Tue, 16 Nov 2004 17:13:46 +0100
+
+kfreebsd5 (5.2.1-7) unreleased; urgency=low
+
+ * Fix local memory leak vulnerability (FreeBSD-SA-04:15.syscons /
+ CAN-2004-0919).
+ - patches/000_syscons_vulnerability.diff: New. Patch from upstream.
+ * Fix wrong permissions in some device files.
+ - patches/900_devfs_perm_fixes.diff: New. Sync uids/gids of kernel devices
+ with debian base-passwd ones.
+ * Rename some patches to follow the guidelines in README.
+ - README: New.
+ - etc.
+ * Use cdbs debian/control autogen feature.
+ - control.in: Rename to control.in.in and set the @cdbs@ tag.
+ - rules: Set DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes.
+ - mk/build.mk (clean): Generate control.in from control.in.in.
+
+ -- Robert Millan <rmh at debian.org> Tue, 5 Oct 2004 00:58:50 +0200
+
+kfreebsd5 (5.2.1-6) unreleased; urgency=low
+
+ * Use type-handling to auto-generate kfreebsd-gnu architecture list for dpkg.
+ - control.in
+ - mk/build.mk
+ * Ensure patches/003_config.diff contains a hunk for your CPU.
+ - mk/build.mk
+ * Drop Conflicts on makedev.
+ - control.in
+ * Grow ARG_MAX value to match with Linux' (Fixes FTBFS on a number of
+ packages).
+ - patches/016_grow_arg_max.diff: New.
+
+ -- Robert Millan <rmh at debian.org> Sat, 21 Aug 2004 18:35:01 +0200
+
+kfreebsd5 (5.2.1-5) unreleased; urgency=low
+
+ * patches/004_version.diff.in: New. Fix version information.
+ * mk/build.mk: Regenerate 004_version.diff with current debian revision.
+
+ -- Robert Millan <rmh at debian.org> Sat, 17 Jul 2004 02:14:34 +0200
+
+kfreebsd5 (5.2.1-4) unreleased; urgency=low
+
+ * patches/015_dev_full.diff: New. Implement /dev/full.
+ * control (Build-Depends): Allow flex as alternative for flex-old.
+
+ -- Robert Millan <rmh at debian.org> Mon, 12 Jul 2004 19:14:46 +0200
+
+kfreebsd5 (5.2.1-3) unreleased; urgency=low
+
+ * control: Make it an Essential package.
+
+ -- Robert Millan <rmh at debian.org> Tue, 6 Jul 2004 01:54:47 +0200
+
+kfreebsd5 (5.2.1-2) unreleased; urgency=low
+
+ * control (Build-Depends): Add flex-old.
+ * control (Depends): Nuke kfreebsd-loader.
+ * control (Conflicts): Add makedev.
+ * mk/build.mk: Add /boot/kfreebsd.gz and dummy /sbin/fsck.cd9660.
+
+ -- Robert Millan <rmh at debian.org> Wed, 30 Jun 2004 19:25:58 +0200
+
+kfreebsd5 (5.2.1-1) unreleased; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Tue, 4 May 2004 14:02:40 +0200
+
+freebsd-kernel (5.1-1) unstable; urgency=low
+
+ * New source package structure. Now build-depends on freebsd-source-5.1.
+ * Switched to cdbs.
+ * Updated to version 5.1
+
+ -- Nathan Hawkins <utsl at debian.org> Tue, 7 Oct 2003 12:43:36 -0500
+
+freebsd-kernel (5.0-2) unstable; urgency=low
+
+ * Set maintainer to glibc-bsd-devel at lists.alioth.debian.org
+ * Added me to Uploaders.
+ * Turn into non-native package.
+ * Added missing package to Build-Depends (freebsd-gcc)
+
+ -- Robert Millan <rmh at debian.org> Fri, 11 Jul 2003 05:50:58 +0200
+
+freebsd-kernel-5.0 (5.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Nathan Hawkins <utsl at debian.org> Mon, 3 Jul 2003 13:12:00 -0400
Copied: trunk/kfreebsd-7/debian/compat (from rev 1560, trunk/kfreebsd-6/debian/compat)
Copied: trunk/kfreebsd-7/debian/control.flavor.in (from rev 1560, trunk/kfreebsd-6/debian/control.flavor.in)
Copied: trunk/kfreebsd-7/debian/control.in (from rev 1560, trunk/kfreebsd-6/debian/control.in)
===================================================================
--- trunk/kfreebsd-6/debian/control.in 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/control.in 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,35 @@
+Source: kfreebsd- at major@
+Section: devel
+Priority: optional
+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-Indep: debhelper (>= 4.1.0), bzip2
+Build-Depends: debhelper (>= 4.1.0), bzip2, freebsd at major@-buildutils | freebsd6-buildutils (>= 6.0-0.2), libdb4.4-dev | libdb-dev, flex-old | flex, libbsd-dev
+# freebsd at major@-buildutils | freebsd6-buildutils (>= 6.0-0.2): Needed for new MK_* variable cruft (in 6.0-0.2 it's been backported).
+Standards-Version: 3.6.2
+
+Package: kfreebsd-source- at version@
+Architecture: all
+Section: devel
+Recommends: freebsd at major@-buildutils (>= @version@)
+Provides: kfreebsd-source- at major@, kfreebsd-source
+Description: source code for kernel of FreeBSD @version@ with Debian patches
+ This package provides the source code for kernel of FreeBSD @version@, base of
+ a GNU/kFreeBSD system.
+
+Package: kfreebsd-headers- at version@- at abiname@
+Architecture: kfreebsd-i386
+Section: devel
+Depends: coreutils
+Description: Common architecture-specific header files for kernel of FreeBSD @version@
+ This package provides the architecture-specific common kernel header files for
+ kernel of FreeBSD @version@, generally used for building out-of-tree kernel
+ modules. To obtain a complete set of headers you also need to install the
+ kfreebsd-headers- at version@- at abiname@-(flavour) package, matching the flavour of the
+ kernel you intend the build for. To obtain such a set for the currently running
+ kernel it is sufficient to run a command
+ .
+ apt-get install kfreebsd-headers-$(uname -r)
+ .
+ and it will be unpacked in /usr/src/kfreebsd-headers- at version@- at abiname@-(flavour)
+
Copied: trunk/kfreebsd-7/debian/copyright (from rev 1560, trunk/kfreebsd-6/debian/copyright)
===================================================================
--- trunk/kfreebsd-6/debian/copyright 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/copyright 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,55 @@
+This package was debianized by Nathan Hawkins <utsl at debian.org> on
+Thu, 18 Jul 2002 12:43:02 -0400.
+
+It was downloaded from FreeBSD CVS (http://www.freebsd.org/)
+
+Upstream Author: The FreeBSD Project
+
+Copyright:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted under the terms of the BSD License.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+On Debian GNU systems, the complete text of the BSD License can be
+found in `/usr/share/common-licenses/BSD'.
+
+There are, however, some exceptions. Parts of this package are distributed
+under other licenses:
+
+ Sources in `src/gnu' directory are licensed under the GNU General Public
+ License. On Debian GNU systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL'.
+
+ Sources/Binaries in the following directories are licensed under
+ DFSG-incompatible terms and were therefore removed from the package
+ (and disabled in the build system):
+
+src/sys/contrib/dev/ath
+src/sys/contrib/dev/hptmv
+src/sys/contrib/dev/nve
+src/sys/contrib/dev/oltr
+src/sys/dev/rr232x
+
+ The following directories contained code that is itself free, but depends
+ on the above cited non-free sources and was also removed (and disabled):
+
+src/sys/modules/ath
+src/sys/modules/hptmv
+src/sys/modules/nve
+src/sys/modules/oltr
+src/sys/modules/rr232x
+src/sys/dev/ath
+src/sys/dev/hptmv
+src/sys/dev/nve
Copied: trunk/kfreebsd-7/debian/kfreebsd-image.overrides (from rev 1560, trunk/kfreebsd-6/debian/kfreebsd-image.overrides)
Copied: trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in (from rev 1560, trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in)
Copied: trunk/kfreebsd-7/debian/patches/001_misc.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/001_misc.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/001_misc.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,101 @@
+
+Status: chflags is BSD-specific. We could add it to freebsd-utils.
+ The rest has been rejected (kern/93502)
+
+diff -ur sys/conf.old/kern.mk sys/conf/kern.mk
+--- sys/conf.old/kern.mk 2006-05-06 09:34:37.000000000 +0200
++++ sys/conf/kern.mk 2006-05-06 09:41:50.000000000 +0200
+@@ -1,5 +1,9 @@
+ # $FreeBSD: src/sys/conf/kern.mk,v 1.46 2005/07/15 11:45:30 ache Exp $
+
++.if !defined(OPSYS)
++OPSYS!= uname -s
++.endif
++
+ #
+ # Warning flags for compiling the kernel and components of the kernel.
+ #
+@@ -9,10 +13,14 @@
+ .if ${CC} == "icc"
+ #CWARNFLAGS= -w2 # use this if you are terribly bored
+ CWARNFLAGS=
+-.else
+-CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
++.elif !defined(CWARNFLAGS)
++CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- -fformat-extensions -std=c99
++ -std=c99
++.if ${OPSYS} == "FreeBSD"
++# FreeBSD extensions, not available in upstream GCC
++CWARNFLAGS+= -fformat-extensions
++.endif
+ .endif
+ #
+ # The following flags are next up for working on:
+@@ -30,8 +38,12 @@
+ # reserved for user applications.
+ #
+ .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \
++CFLAGS+= -mpreferred-stack-boundary=2 \
+ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
++.if ${OPSYS} == "FreeBSD"
++# FreeBSD extensions, not available in upstream GCC
++CFLAGS+= -mno-align-long-strings
++.endif
+ INLINE_LIMIT?= 8000
+ .endif
+
+diff -ur sys/conf.old/kern.post.mk sys/conf/kern.post.mk
+--- sys/conf.old/kern.post.mk 2006-05-06 09:34:37.000000000 +0200
++++ sys/conf/kern.post.mk 2006-05-06 09:42:47.000000000 +0200
+@@ -1,5 +1,15 @@
+ # $FreeBSD: src/sys/conf/kern.post.mk,v 1.92 2006/02/07 13:37:26 ru Exp $
+
++.if !defined(OPSYS)
++OPSYS!= uname -s
++.endif
++
++.if ${OPSYS} == "FreeBSD"
++WHEEL_GROUP?= wheel
++.else
++WHEEL_GROUP?= root
++.endif
++
+ # Part of a unified Makefile for building kernels. This part includes all
+ # the definitions that need to be after all the % directives except %RULES
+ # and ones that act like they are part of %RULES.
+@@ -214,11 +224,9 @@
+ .if exists(${DESTDIR}${KODIR})
+ -thiskernel=`sysctl -n kern.bootfile` ; \
+ if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
+- chflags -R noschg ${DESTDIR}${KODIR} ; \
+ rm -rf ${DESTDIR}${KODIR} ; \
+ else \
+ if [ -d ${DESTDIR}${KODIR}.old ] ; then \
+- chflags -R noschg ${DESTDIR}${KODIR}.old ; \
+ rm -rf ${DESTDIR}${KODIR}.old ; \
+ fi ; \
+ mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
+@@ -226,16 +234,16 @@
+ fi
+ .endif
+ mkdir -p ${DESTDIR}${KODIR}
+- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
++ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO} ${DESTDIR}${KODIR}
+ .if defined(DEBUG) && !defined(INSTALL_NODEBUG)
+- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
++ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+ .endif
+
+ kernel-reinstall:
+ @-chflags -R noschg ${DESTDIR}${KODIR}
+- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
++ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO} ${DESTDIR}${KODIR}
+ .if defined(DEBUG) && !defined(INSTALL_NODEBUG)
+- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
++ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+ .endif
+
+ config.o env.o hints.o vers.o vnode_if.o:
Deleted: trunk/kfreebsd-7/debian/patches/002_enable_xbox.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/002_enable_xbox.diff 2006-05-06 12:13:59 UTC (rev 1563)
+++ trunk/kfreebsd-7/debian/patches/002_enable_xbox.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -1,13 +0,0 @@
---- sys/i386/conf/GENERIC.old 2006-02-18 08:53:42.000000000 +0100
-+++ sys/i386/conf/GENERIC 2006-02-18 08:54:04.000000000 +0100
-@@ -23,6 +23,10 @@
- cpu I686_CPU
- ident GENERIC
-
-+options XBOX
-+device xboxfb
-+device fb
-+
- # To statically compile in device wiring instead of /boot/device.hints
- #hints "GENERIC.hints" # Default places to look for devices.
-
Copied: trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/003_glibc_dev_aicasm.diff)
Copied: trunk/kfreebsd-7/debian/patches/004_xargs.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/004_xargs.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/004_xargs.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/004_xargs.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,33 @@
+
+Status: xargs -J option requested to both upstream and debian.
+
+diff -ur sys.old/conf/kmod.mk sys/conf/kmod.mk
+--- sys.old/conf/kmod.mk 2006-05-06 09:46:13.000000000 +0200
++++ sys/conf/kmod.mk 2006-05-06 09:56:25.000000000 +0200
+@@ -197,7 +197,7 @@
+ grep -v '^#' < ${EXPORT_SYMS} > export_syms
+ .endif
+ awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
+- export_syms | xargs -J% ${OBJCOPY} % ${.TARGET}
++ export_syms | xargs -I% ${OBJCOPY} % ${.TARGET}
+ .endif
+ .endif
+ .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
+diff -ur sys.old/contrib/dev/acpica/acpica_prep.sh sys/contrib/dev/acpica/acpica_prep.sh
+--- sys.old/contrib/dev/acpica/acpica_prep.sh 2006-05-06 09:46:15.000000000 +0200
++++ sys/contrib/dev/acpica/acpica_prep.sh 2006-05-06 09:56:49.000000000 +0200
+@@ -56,12 +56,12 @@
+
+ echo copying full dirs
+ for i in ${fulldirs}; do
+- find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst}
++ find ${wrk} -name ${i} -type d | xargs -I % mv % ${dst}
+ done
+
+ # move files to destination
+ echo copying flat dirs
+-find ${wrk} -type f | xargs -J % mv % ${dst}
++find ${wrk} -type f | xargs -I % mv % ${dst}
+ mv ${dst}/changes.txt ${dst}/CHANGES.txt
+
+ # update src/headers for appropriate paths
Copied: trunk/kfreebsd-7/debian/patches/005_binutils.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/005_binutils.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/005_binutils.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,374 @@
+
+Status: Reported as kern/93331
+
+diff -ur sys.old/amd64/amd64/cpu_switch.S sys/amd64/amd64/cpu_switch.S
+--- sys.old/amd64/amd64/cpu_switch.S 2006-05-06 10:01:21.000000000 +0200
++++ sys/amd64/amd64/cpu_switch.S 2006-05-06 10:07:56.000000000 +0200
+@@ -105,10 +105,10 @@
+ jz 1f /* no, skip over */
+
+ /* Save segment selector numbers */
+- movl %ds,PCB_DS(%r8)
+- movl %es,PCB_ES(%r8)
+- movl %fs,PCB_FS(%r8)
+- movl %gs,PCB_GS(%r8)
++ movw %ds,PCB_DS(%r8)
++ movw %es,PCB_ES(%r8)
++ movw %fs,PCB_FS(%r8)
++ movw %gs,PCB_GS(%r8)
+ 1:
+ /* Test if debug registers should be saved. */
+ testl $PCB_DBREGS,PCB_FLAGS(%r8)
+@@ -174,14 +174,14 @@
+ jz 1f /* no, skip over */
+
+ /* Restore segment selector numbers */
+- movl PCB_DS(%r8),%ds
+- movl PCB_ES(%r8),%es
+- movl PCB_FS(%r8),%fs
++ movw PCB_DS(%r8),%ds
++ movw PCB_ES(%r8),%es
++ movw PCB_FS(%r8),%fs
+
+ /* Restore userland %gs while preserving kernel gsbase */
+ movl $MSR_GSBASE,%ecx
+ rdmsr
+- movl PCB_GS(%r8),%gs
++ movw PCB_GS(%r8),%gs
+ wrmsr
+ jmp 2f
+ 1:
+diff -ur sys.old/amd64/ia32/ia32_signal.c sys/amd64/ia32/ia32_signal.c
+--- sys.old/amd64/ia32/ia32_signal.c 2006-05-06 10:01:22.000000000 +0200
++++ sys/amd64/ia32/ia32_signal.c 2006-05-06 10:07:15.000000000 +0200
+@@ -327,8 +327,8 @@
+ sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
+ sf.sf_uc.uc_mcontext.mc_gs = rgs();
+ sf.sf_uc.uc_mcontext.mc_fs = rfs();
+- __asm __volatile("movl %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
+- __asm __volatile("movl %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
++ __asm __volatile("mov %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
++ __asm __volatile("mov %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
+ sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
+ sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
+ sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
+@@ -442,8 +442,8 @@
+ sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
+ sf.sf_uc.uc_mcontext.mc_gs = rgs();
+ sf.sf_uc.uc_mcontext.mc_fs = rfs();
+- __asm __volatile("movl %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
+- __asm __volatile("movl %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
++ __asm __volatile("mov %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
++ __asm __volatile("mov %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
+ sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
+ sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
+ sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
+diff -ur sys.old/amd64/ia32/ia32_sigtramp.S sys/amd64/ia32/ia32_sigtramp.S
+--- sys.old/amd64/ia32/ia32_sigtramp.S 2006-05-06 10:01:22.000000000 +0200
++++ sys/amd64/ia32/ia32_sigtramp.S 2006-05-06 10:07:15.000000000 +0200
+@@ -45,10 +45,10 @@
+ calll *IA32_SIGF_HANDLER(%esp)
+ leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
+ pushl %eax
+- movl IA32_UC_GS(%eax),%gs /* restore %gs */
+- movl IA32_UC_FS(%eax),%fs /* restore %fs */
+- movl IA32_UC_ES(%eax),%es /* restore %es */
+- movl IA32_UC_DS(%eax),%ds /* restore %ds */
++ mov IA32_UC_GS(%eax),%gs /* restore %gs */
++ mov IA32_UC_FS(%eax),%fs /* restore %fs */
++ mov IA32_UC_ES(%eax),%es /* restore %es */
++ mov IA32_UC_DS(%eax),%ds /* restore %ds */
+ movl $SYS_sigreturn,%eax
+ pushl %eax /* junk to fake return addr. */
+ int $0x80 /* enter kernel with args */
+@@ -62,10 +62,10 @@
+ calll *IA32_SIGF_HANDLER(%esp)
+ leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */
+ pushl %eax
+- movl IA32_UC4_GS(%eax),%gs /* restore %gs */
+- movl IA32_UC4_FS(%eax),%fs /* restore %fs */
+- movl IA32_UC4_ES(%eax),%es /* restore %es */
+- movl IA32_UC4_DS(%eax),%ds /* restore %ds */
++ mov IA32_UC4_GS(%eax),%gs /* restore %gs */
++ mov IA32_UC4_FS(%eax),%fs /* restore %fs */
++ mov IA32_UC4_ES(%eax),%es /* restore %es */
++ mov IA32_UC4_DS(%eax),%ds /* restore %ds */
+ movl $344,%eax /* 4.x SYS_sigreturn */
+ pushl %eax /* junk to fake return addr. */
+ int $0x80 /* enter kernel with args */
+diff -ur sys.old/amd64/include/cpufunc.h sys/amd64/include/cpufunc.h
+--- sys.old/amd64/include/cpufunc.h 2006-05-06 10:01:22.000000000 +0200
++++ sys/amd64/include/cpufunc.h 2006-05-06 10:07:15.000000000 +0200
+@@ -482,7 +482,7 @@
+ rfs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
++ __asm __volatile("mov %%fs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -490,7 +490,7 @@
+ rgs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%gs,%0" : "=rm" (sel));
++ __asm __volatile("mov %%gs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -498,20 +498,20 @@
+ rss(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
++ __asm __volatile("mov %%ss,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+ static __inline void
+ load_ds(u_int sel)
+ {
+- __asm __volatile("movl %0,%%ds" : : "rm" (sel));
++ __asm __volatile("mov %0,%%ds" : : "rm" (sel));
+ }
+
+ static __inline void
+ load_es(u_int sel)
+ {
+- __asm __volatile("movl %0,%%es" : : "rm" (sel));
++ __asm __volatile("mov %0,%%es" : : "rm" (sel));
+ }
+
+ #ifdef _KERNEL
+@@ -526,7 +526,7 @@
+
+ /* Preserve the fsbase value across the selector load */
+ fsbase = MSR_FSBASE;
+- __asm __volatile("rdmsr; movl %0,%%fs; wrmsr"
++ __asm __volatile("rdmsr; mov %0,%%fs; wrmsr"
+ : : "rm" (sel), "c" (fsbase) : "eax", "edx");
+ }
+
+@@ -544,7 +544,7 @@
+ * being trashed happens to be the kernel gsbase at the time.
+ */
+ gsbase = MSR_GSBASE;
+- __asm __volatile("pushfq; cli; rdmsr; movl %0,%%gs; wrmsr; popfq"
++ __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq"
+ : : "rm" (sel), "c" (gsbase) : "eax", "edx");
+ }
+ #else
+@@ -552,13 +552,13 @@
+ static __inline void
+ load_fs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
++ __asm __volatile("mov %0,%%fs" : : "rm" (sel));
+ }
+
+ static __inline void
+ load_gs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
++ __asm __volatile("mov %0,%%gs" : : "rm" (sel));
+ }
+ #endif
+
+diff -ur sys.old/amd64/linux32/linux32_locore.s sys/amd64/linux32/linux32_locore.s
+--- sys.old/amd64/linux32/linux32_locore.s 2006-05-06 10:01:23.000000000 +0200
++++ sys/amd64/linux32/linux32_locore.s 2006-05-06 10:07:15.000000000 +0200
+@@ -11,10 +11,10 @@
+ NON_GPROF_ENTRY(linux_sigcode)
+ call *LINUX_SIGF_HANDLER(%esp)
+ leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */
+- movl LINUX_SC_GS(%ebx),%gs
+- movl LINUX_SC_FS(%ebx),%fs
+- movl LINUX_SC_ES(%ebx),%es
+- movl LINUX_SC_DS(%ebx),%ds
++ mov LINUX_SC_GS(%ebx),%gs
++ mov LINUX_SC_FS(%ebx),%fs
++ mov LINUX_SC_ES(%ebx),%es
++ mov LINUX_SC_DS(%ebx),%ds
+ movl %esp, %ebx /* pass sigframe */
+ push %eax /* fake ret addr */
+ movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
+@@ -25,10 +25,10 @@
+ linux_rt_sigcode:
+ call *LINUX_RT_SIGF_HANDLER(%esp)
+ leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
+- movl LINUX_SC_GS(%ebx),%gs
+- movl LINUX_SC_FS(%ebx),%fs
+- movl LINUX_SC_ES(%ebx),%es
+- movl LINUX_SC_DS(%ebx),%ds
++ mov LINUX_SC_GS(%ebx),%gs
++ mov LINUX_SC_FS(%ebx),%fs
++ mov LINUX_SC_ES(%ebx),%es
++ mov LINUX_SC_DS(%ebx),%ds
+ push %eax /* fake ret addr */
+ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
+ int $0x80 /* enter kernel with args */
+diff -ur sys.old/amd64/linux32/linux32_sysvec.c sys/amd64/linux32/linux32_sysvec.c
+--- sys.old/amd64/linux32/linux32_sysvec.c 2006-05-06 10:01:23.000000000 +0200
++++ sys/amd64/linux32/linux32_sysvec.c 2006-05-06 10:07:15.000000000 +0200
+@@ -340,9 +340,9 @@
+ frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0];
+ frame.sf_sc.uc_mcontext.sc_gs = rgs();
+ frame.sf_sc.uc_mcontext.sc_fs = rfs();
+- __asm __volatile("movl %%es,%0" :
++ __asm __volatile("mov %%es,%0" :
+ "=rm" (frame.sf_sc.uc_mcontext.sc_es));
+- __asm __volatile("movl %%ds,%0" :
++ __asm __volatile("mov %%ds,%0" :
+ "=rm" (frame.sf_sc.uc_mcontext.sc_ds));
+ frame.sf_sc.uc_mcontext.sc_edi = regs->tf_rdi;
+ frame.sf_sc.uc_mcontext.sc_esi = regs->tf_rsi;
+@@ -472,8 +472,8 @@
+ frame.sf_sc.sc_mask = lmask.__bits[0];
+ frame.sf_sc.sc_gs = rgs();
+ frame.sf_sc.sc_fs = rfs();
+- __asm __volatile("movl %%es,%0" : "=rm" (frame.sf_sc.sc_es));
+- __asm __volatile("movl %%ds,%0" : "=rm" (frame.sf_sc.sc_ds));
++ __asm __volatile("mov %%es,%0" : "=rm" (frame.sf_sc.sc_es));
++ __asm __volatile("mov %%ds,%0" : "=rm" (frame.sf_sc.sc_ds));
+ frame.sf_sc.sc_edi = regs->tf_rdi;
+ frame.sf_sc.sc_esi = regs->tf_rsi;
+ frame.sf_sc.sc_ebp = regs->tf_rbp;
+diff -ur sys.old/compat/ndis/winx32_wrap.S sys/compat/ndis/winx32_wrap.S
+--- sys.old/compat/ndis/winx32_wrap.S 2006-05-06 10:01:34.000000000 +0200
++++ sys/compat/ndis/winx32_wrap.S 2006-05-06 10:07:15.000000000 +0200
+@@ -364,7 +364,7 @@
+ ret
+
+ ENTRY(x86_setfs)
+- movl 4(%esp),%fs
++ movw 4(%esp),%fs
+ ret
+
+ ENTRY(x86_gettid)
+diff -ur sys.old/i386/i386/locore.s sys/i386/i386/locore.s
+--- sys.old/i386/i386/locore.s 2006-05-06 10:02:25.000000000 +0200
++++ sys/i386/i386/locore.s 2006-05-06 10:07:15.000000000 +0200
+@@ -358,7 +358,7 @@
+ pushl %eax
+ testl $PSL_VM,UC_EFLAGS(%eax)
+ jne 1f
+- movl UC_GS(%eax),%gs /* restore %gs */
++ movw UC_GS(%eax),%gs /* restore %gs */
+ 1:
+ movl $SYS_sigreturn,%eax
+ pushl %eax /* junk to fake return addr. */
+@@ -375,7 +375,7 @@
+ pushl %eax
+ testl $PSL_VM,UC4_EFLAGS(%eax)
+ jne 1f
+- movl UC4_GS(%eax),%gs /* restore %gs */
++ movw UC4_GS(%eax),%gs /* restore %gs */
+ 1:
+ movl $344,%eax /* 4.x SYS_sigreturn */
+ pushl %eax /* junk to fake return addr. */
+@@ -393,7 +393,7 @@
+ pushl %eax
+ testl $PSL_VM,SC_PS(%eax)
+ jne 9f
+- movl SC_GS(%eax),%gs /* restore %gs */
++ movw SC_GS(%eax),%gs /* restore %gs */
+ 9:
+ movl $103,%eax /* 3.x SYS_sigreturn */
+ pushl %eax /* junk to fake return addr. */
+diff -ur sys.old/i386/i386/swtch.s sys/i386/i386/swtch.s
+--- sys.old/i386/i386/swtch.s 2006-05-06 10:02:24.000000000 +0200
++++ sys/i386/i386/swtch.s 2006-05-06 10:07:15.000000000 +0200
+@@ -111,7 +111,7 @@
+ movl %ebp,PCB_EBP(%edx)
+ movl %esi,PCB_ESI(%edx)
+ movl %edi,PCB_EDI(%edx)
+- movl %gs,PCB_GS(%edx)
++ movw %gs,PCB_GS(%edx)
+ pushfl /* PSL */
+ popl PCB_PSL(%edx)
+ /* Test if debug registers should be saved. */
+@@ -273,7 +273,7 @@
+ /* This must be done after loading the user LDT. */
+ .globl cpu_switch_load_gs
+ cpu_switch_load_gs:
+- movl PCB_GS(%edx),%gs
++ movw PCB_GS(%edx),%gs
+
+ /* Test if debug registers should be restored. */
+ testl $PCB_DBREGS,PCB_FLAGS(%edx)
+@@ -342,7 +342,7 @@
+ movl %ebp,PCB_EBP(%ecx)
+ movl %esi,PCB_ESI(%ecx)
+ movl %edi,PCB_EDI(%ecx)
+- movl %gs,PCB_GS(%ecx)
++ movw %gs,PCB_GS(%ecx)
+ pushfl
+ popl PCB_PSL(%ecx)
+
+diff -ur sys.old/i386/include/cpufunc.h sys/i386/include/cpufunc.h
+--- sys.old/i386/include/cpufunc.h 2006-05-06 10:02:26.000000000 +0200
++++ sys/i386/include/cpufunc.h 2006-05-06 10:07:15.000000000 +0200
+@@ -452,7 +452,7 @@
+ rfs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
++ __asm __volatile("mov %%fs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -460,7 +460,7 @@
+ rgs(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%gs,%0" : "=rm" (sel));
++ __asm __volatile("mov %%gs,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+@@ -468,20 +468,20 @@
+ rss(void)
+ {
+ u_int sel;
+- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
++ __asm __volatile("mov %%ss,%0" : "=rm" (sel));
+ return (sel);
+ }
+
+ static __inline void
+ load_fs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
++ __asm __volatile("mov %0,%%fs" : : "rm" (sel));
+ }
+
+ static __inline void
+ load_gs(u_int sel)
+ {
+- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
++ __asm __volatile("mov %0,%%gs" : : "rm" (sel));
+ }
+
+ static __inline void
+diff -ur sys.old/i386/linux/linux_locore.s sys/i386/linux/linux_locore.s
+--- sys.old/i386/linux/linux_locore.s 2006-05-06 10:02:27.000000000 +0200
++++ sys/i386/linux/linux_locore.s 2006-05-06 10:07:15.000000000 +0200
+@@ -8,7 +8,7 @@
+ NON_GPROF_ENTRY(linux_sigcode)
+ call *LINUX_SIGF_HANDLER(%esp)
+ leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */
+- movl LINUX_SC_GS(%ebx),%gs
++ movw LINUX_SC_GS(%ebx),%gs
+ movl %esp, %ebx /* pass sigframe */
+ push %eax /* fake ret addr */
+ movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
+@@ -19,7 +19,7 @@
+ linux_rt_sigcode:
+ call *LINUX_RT_SIGF_HANDLER(%esp)
+ leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
+- movl LINUX_SC_GS(%ebx),%gs
++ movw LINUX_SC_GS(%ebx),%gs
+ push %eax /* fake ret addr */
+ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
+ int $0x80 /* enter kernel with args */
Copied: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/007_clone_signals.diff)
Copied: trunk/kfreebsd-7/debian/patches/008_config.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/008_config.diff)
Copied: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,148 @@
+
+Status: in upstream BTS
+
+diff -ur sys/conf.old/Makefile.alpha sys/conf/Makefile.alpha
+--- sys/conf.old/Makefile.alpha 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.alpha 2006-05-06 10:25:03.000000000 +0200
+@@ -28,6 +28,8 @@
+ .endif
+ .include "$S/conf/kern.pre.mk"
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.amd64 sys/conf/Makefile.amd64
+--- sys/conf.old/Makefile.amd64 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.amd64 2006-05-06 10:25:03.000000000 +0200
+@@ -38,6 +38,8 @@
+
+ MKMODULESENV+= MACHINE=amd64
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.arm sys/conf/Makefile.arm
+--- sys/conf.old/Makefile.arm 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.arm 2006-05-06 10:25:21.000000000 +0200
+@@ -94,6 +94,8 @@
+ rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
+ inflate-tramp.o
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.i386 sys/conf/Makefile.i386
+--- sys/conf.old/Makefile.i386 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.i386 2006-05-06 10:25:03.000000000 +0200
+@@ -34,6 +34,8 @@
+
+ MKMODULESENV+= MACHINE=${MACHINE}
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.ia64 sys/conf/Makefile.ia64
+--- sys/conf.old/Makefile.ia64 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.ia64 2006-05-06 10:25:03.000000000 +0200
+@@ -38,6 +38,8 @@
+
+ ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.pc98 sys/conf/Makefile.pc98
+--- sys/conf.old/Makefile.pc98 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.pc98 2006-05-06 10:25:03.000000000 +0200
+@@ -34,6 +34,8 @@
+
+ MKMODULESENV+= MACHINE=${MACHINE}
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.powerpc sys/conf/Makefile.powerpc
+--- sys/conf.old/Makefile.powerpc 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.powerpc 2006-05-06 10:25:03.000000000 +0200
+@@ -37,6 +37,8 @@
+ CFLAGS+= -fno-omit-frame-pointer
+ .endif
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur sys/conf.old/Makefile.sparc64 sys/conf/Makefile.sparc64
+--- sys/conf.old/Makefile.sparc64 2006-05-06 10:22:29.000000000 +0200
++++ sys/conf/Makefile.sparc64 2006-05-06 10:25:03.000000000 +0200
+@@ -32,6 +32,8 @@
+
+ MDOBJS= exception.o interrupt.o
+
++%WITHOUT_MODULES
++
+ %BEFORE_DEPEND
+
+ %OBJS
+diff -ur usr.sbin/config.old/mkmakefile.c usr.sbin/config/mkmakefile.c
+--- usr.sbin/config.old/mkmakefile.c 2006-05-06 10:24:20.000000000 +0200
++++ usr.sbin/config/mkmakefile.c 2006-05-06 10:25:03.000000000 +0200
+@@ -70,6 +70,7 @@
+ static void do_rules(FILE *);
+ static void do_xxfiles(char *, FILE *);
+ static void do_objs(FILE *);
++static void do_without_modules(FILE *);
+ static void do_before_depend(FILE *);
+ static int opteq(const char *, const char *);
+ static void read_files(void);
+@@ -143,6 +144,8 @@
+ }
+ if (eq(line, "%BEFORE_DEPEND\n"))
+ do_before_depend(ofp);
++ else if (eq(line, "%WITHOUT_MODULES\n"))
++ do_without_modules(ofp);
+ else if (eq(line, "%OBJS\n"))
+ do_objs(ofp);
+ else if (strncmp(line, "%FILES.", 7) == 0)
+@@ -613,6 +616,28 @@
+ }
+
+ static void
++do_without_modules(FILE *fp)
++{
++ struct device *dp;
++ int lpos, len;
++ char *cp, *sp;
++
++ fprintf(fp, "MKMODULESENV+= WITHOUT_MODULES=\"");
++ lpos = 34;
++ STAILQ_FOREACH(dp, &dtab, d_next) {
++ sp = dp->d_name;
++ cp = sp + (len = strlen(sp)) - 1;
++ if (len + lpos > 72) {
++ lpos = 8;
++ fprintf(fp, "\\\n\t");
++ }
++ fprintf(fp, "%s ", sp);
++ lpos += len + 1;
++ }
++ fprintf(fp, "\"\n");
++}
++
++static void
+ do_xxfiles(char *tag, FILE *fp)
+ {
+ struct file_list *tp;
Copied: trunk/kfreebsd-7/debian/patches/013_ip_packed.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/013_ip_packed.diff)
Copied: trunk/kfreebsd-7/debian/patches/017_oss_compat.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/017_oss_compat.diff)
Copied: trunk/kfreebsd-7/debian/patches/902_version.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/902_version.diff)
Copied: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,350 @@
+diff -ur sys.old/amd64/conf/GENERIC sys/amd64/conf/GENERIC
+--- sys.old/amd64/conf/GENERIC 2006-05-06 12:05:26.000000000 +0200
++++ sys/amd64/conf/GENERIC 2006-05-06 12:15:48.000000000 +0200
+@@ -127,8 +127,6 @@
+ device arcmsr # Areca SATA II RAID
+ device ciss # Compaq Smart RAID 5*
+ device dpt # DPT Smartcache III, IV - See NOTES for options
+-device hptmv # Highpoint RocketRAID 182x
+-device rr232x # Highpoint RocketRAID 232x
+ device iir # Intel Integrated RAID
+ device ips # IBM (Adaptec) ServeRAID
+ device mly # Mylex AcceleRAID/eXtremeRAID
+@@ -200,7 +198,6 @@
+ device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+ device lge # Level 1 LXT1001 gigabit Ethernet
+ device nge # NatSemi DP83820 gigabit Ethernet
+-device nve # nVidia nForce MCP on-board Ethernet Networking
+ device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
+ device re # RealTek 8139C+/8169/8169S/8110S
+ device rl # RealTek 8129/8139
+@@ -234,9 +231,6 @@
+ device wlan_ccmp # 802.11 CCMP support
+ device wlan_tkip # 802.11 TKIP support
+ device an # Aironet 4500/4800 802.11 wireless NICs.
+-device ath # Atheros pci/cardbus NIC's
+-device ath_hal # Atheros HAL (Hardware Access Layer)
+-device ath_rate_sample # SampleRate tx rate control for ath
+ device awi # BayStack 660 and others
+ device ral # Ralink Technology RT2500 wireless NICs.
+ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+diff -ur sys.old/conf/files sys/conf/files
+--- sys.old/conf/files 2006-05-06 12:05:39.000000000 +0200
++++ sys/conf/files 2006-05-06 12:15:29.000000000 +0200
+@@ -241,8 +241,6 @@
+ contrib/dev/acpica/utobject.c optional acpi
+ contrib/dev/acpica/utstate.c optional acpi
+ contrib/dev/acpica/utxface.c optional acpi
+-contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal \
+- compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+ contrib/ipfilter/netinet/fil.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+ contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
+@@ -464,15 +462,6 @@
+ dev/ata/atapi-cd.c optional atapicd
+ dev/ata/atapi-fd.c optional atapifd
+ dev/ata/atapi-tape.c optional atapist
+-dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
+-dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
+- compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+-dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
+- compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+-dev/ath/if_ath.c optional ath \
+- compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+-dev/ath/if_ath_pci.c optional ath pci \
+- compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+ dev/awi/am79c930.c optional awi
+ dev/awi/awi.c optional awi
+ dev/awi/if_awi_pccard.c optional awi pccard
+diff -ur sys.old/conf/files.amd64 sys/conf/files.amd64
+--- sys.old/conf/files.amd64 2006-05-06 12:05:39.000000000 +0200
++++ sys/conf/files.amd64 2006-05-06 12:15:29.000000000 +0200
+@@ -47,36 +47,6 @@
+ no-obj no-implicit-rule before-depend \
+ clean "ukbdmap.h"
+ #
+-hal.o optional ath_hal \
+- dependency "$S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
+- compile-with "uudecode < $S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
+- no-implicit-rule
+-opt_ah.h optional ath_hal \
+- dependency "$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h" \
+- compile-with "cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \
+- no-obj no-implicit-rule before-depend \
+- clean "opt_ah.h"
+-#
+-nvenetlib.o optional nve pci \
+- dependency "$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu" \
+- compile-with "uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
+- no-implicit-rule
+-#
+-os+%DIKED-nve.h optional nve pci \
+- dependency "$S/contrib/dev/nve/os.h" \
+- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
+- no-implicit-rule no-obj before-depend \
+- clean "os+%DIKED-nve.h"
+-#
+-hptmvraid.o optional hptmv \
+- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
+- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
+- no-implicit-rule
+-rr232x_lib.o optional rr232x \
+- dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
+- compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \
+- no-implicit-rule
+-#
+ amd64/acpica/OsdEnvironment.c optional acpi
+ amd64/acpica/acpi_machdep.c optional acpi
+ amd64/acpica/acpi_wakeup.c optional acpi
+@@ -167,20 +137,11 @@
+ dev/fdc/fdc_acpi.c optional fdc
+ dev/fdc/fdc_isa.c optional fdc isa
+ dev/fdc/fdc_pccard.c optional fdc pccard
+-dev/hptmv/entry.c optional hptmv
+-dev/hptmv/mv.c optional hptmv
+-dev/hptmv/gui_lib.c optional hptmv
+-dev/hptmv/hptproc.c optional hptmv
+-dev/hptmv/ioctl.c optional hptmv
+ dev/hwpmc/hwpmc_amd.c optional hwpmc
+ dev/hwpmc/hwpmc_piv.c optional hwpmc
+ dev/hwpmc/hwpmc_x86.c optional hwpmc
+ dev/kbd/kbd.c optional atkbd | sc | ukbd
+ dev/mem/memutil.c optional mem
+-dev/nve/if_nve.c optional nve pci
+-dev/rr232x/os_bsd.c optional rr232x
+-dev/rr232x/osm_bsd.c optional rr232x
+-dev/rr232x/rr232x_config.c optional rr232x
+ dev/sio/sio.c optional sio
+ dev/sio/sio_isa.c optional sio isa
+ dev/speaker/spkr.c optional speaker
+diff -ur sys.old/conf/files.i386 sys/conf/files.i386
+--- sys.old/conf/files.i386 2006-05-06 12:05:39.000000000 +0200
++++ sys/conf/files.i386 2006-05-06 12:15:29.000000000 +0200
+@@ -46,42 +46,12 @@
+ no-obj no-implicit-rule before-depend \
+ clean "ukbdmap.h"
+ #
+-trlld.o optional oltr \
+- dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
+- compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
+- no-implicit-rule
+-#
+-hal.o optional ath_hal \
+- dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
+- compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
+- no-implicit-rule
+ opt_ah.h optional ath_hal \
+ dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \
+ compile-with "cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "opt_ah.h"
+ #
+-nvenetlib.o optional nve pci \
+- dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \
+- compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
+- no-implicit-rule
+-#
+-os+%DIKED-nve.h optional nve pci \
+- dependency "$S/contrib/dev/nve/os.h" \
+- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
+- no-implicit-rule no-obj before-depend \
+- clean "os+%DIKED-nve.h"
+-#
+-hptmvraid.o optional hptmv \
+- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
+- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
+- no-implicit-rule
+-#
+-rr232x_lib.o optional rr232x \
+- dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
+- compile-with "uudecode < $S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
+- no-implicit-rule
+-#
+ #
+ compat/linux/linux_file.c optional compat_linux
+ compat/linux/linux_getcwd.c optional compat_linux
+@@ -172,11 +142,6 @@
+ dev/fdc/fdc_isa.c optional fdc isa
+ dev/fdc/fdc_pccard.c optional fdc pccard
+ dev/fe/if_fe_isa.c optional fe isa
+-dev/hptmv/entry.c optional hptmv
+-dev/hptmv/mv.c optional hptmv
+-dev/hptmv/gui_lib.c optional hptmv
+-dev/hptmv/hptproc.c optional hptmv
+-dev/hptmv/ioctl.c optional hptmv
+ dev/hwpmc/hwpmc_amd.c optional hwpmc
+ dev/hwpmc/hwpmc_pentium.c optional hwpmc
+ dev/hwpmc/hwpmc_piv.c optional hwpmc
+@@ -196,12 +161,8 @@
+ dev/mem/memutil.c optional mem
+ dev/mse/mse.c optional mse
+ dev/mse/mse_isa.c optional mse isa
+-dev/nve/if_nve.c optional nve pci
+ dev/pcf/pcf_isa.c optional pcf
+ dev/random/nehemiah.c optional random
+-dev/rr232x/os_bsd.c optional rr232x
+-dev/rr232x/osm_bsd.c optional rr232x
+-dev/rr232x/rr232x_config.c optional rr232x
+ dev/sbni/if_sbni.c optional sbni
+ dev/sbni/if_sbni_isa.c optional sbni isa
+ dev/sbni/if_sbni_pci.c optional sbni pci
+diff -ur sys.old/conf/kern.pre.mk sys/conf/kern.pre.mk
+--- sys.old/conf/kern.pre.mk 2006-05-06 12:05:40.000000000 +0200
++++ sys/conf/kern.pre.mk 2006-05-06 12:15:29.000000000 +0200
+@@ -52,12 +52,6 @@
+ # include path into contrib'ed source files.
+ INCLUDES+= -I$S/contrib/altq
+
+-# ... and the same for Atheros HAL when the author builds it from
+-# non-distributable sources.
+-.if defined(ATH_BUILDING_FROM_SOURCE)
+-INCLUDES+= -I$S/contrib/dev/ath
+-.endif
+-
+ .if make(depend) || make(kernel-depend)
+
+ # ... and the same for ipfilter
+@@ -66,9 +60,6 @@
+ # ... and the same for pf
+ INCLUDES+= -I$S/contrib/pf
+
+-# ... and the same for Atheros HAL
+-INCLUDES+= -I$S/contrib/dev/ath/freebsd
+-
+ # ... and the same for the NgATM stuff
+ INCLUDES+= -I$S/contrib/ngatm
+
+diff -ur sys.old/i386/conf/GENERIC sys/i386/conf/GENERIC
+--- sys.old/i386/conf/GENERIC 2006-05-06 12:06:32.000000000 +0200
++++ sys/i386/conf/GENERIC 2006-05-06 12:15:40.000000000 +0200
+@@ -130,8 +130,6 @@
+ device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
+ device ciss # Compaq Smart RAID 5*
+ device dpt # DPT Smartcache III, IV - See NOTES for options
+-device hptmv # Highpoint RocketRAID 182x
+-device rr232x # Highpoint RocketRAID 232x
+ device iir # Intel Integrated RAID
+ device ips # IBM (Adaptec) ServeRAID
+ device mly # Mylex AcceleRAID/eXtremeRAID
+@@ -212,7 +210,6 @@
+ device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+ device lge # Level 1 LXT1001 gigabit Ethernet
+ device nge # NatSemi DP83820 gigabit Ethernet
+-device nve # nVidia nForce MCP on-board Ethernet Networking
+ device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
+ device re # RealTek 8139C+/8169/8169S/8110S
+ device rl # RealTek 8129/8139
+@@ -246,9 +243,6 @@
+ device wlan_ccmp # 802.11 CCMP support
+ device wlan_tkip # 802.11 TKIP support
+ device an # Aironet 4500/4800 802.11 wireless NICs.
+-device ath # Atheros pci/cardbus NIC's
+-device ath_hal # Atheros HAL (Hardware Access Layer)
+-device ath_rate_sample # SampleRate tx rate control for ath
+ device awi # BayStack 660 and others
+ device ral # Ralink Technology RT2500 wireless NICs.
+ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+diff -ur sys.old/modules/Makefile sys/modules/Makefile
+--- sys.old/modules/Makefile 2006-05-06 12:06:45.000000000 +0200
++++ sys/modules/Makefile 2006-05-06 12:15:29.000000000 +0200
+@@ -25,11 +25,6 @@
+ ${_arl} \
+ ${_asr} \
+ ata \
+- ath \
+- ${_ath_hal} \
+- ath_rate_amrr \
+- ath_rate_onoe \
+- ath_rate_sample \
+ aue \
+ ${_auxio} \
+ ${_awi} \
+@@ -90,7 +85,6 @@
+ ${_hfa} \
+ hifn \
+ hme \
+- ${_hptmv} \
+ hwpmc \
+ ${_i2c} \
+ ${_ibcs2} \
+@@ -174,9 +168,7 @@
+ ntfs \
+ ntfs_iconv \
+ nullfs \
+- ${_nve} \
+ ${_nwfs} \
+- ${_oltr} \
+ ${_osf1} \
+ ${_padlock} \
+ patm \
+@@ -205,7 +197,6 @@
+ reiserfs \
+ rl \
+ rp \
+- ${_rr232x} \
+ rue \
+ ${_s3} \
+ ${_safe} \
+@@ -331,7 +322,6 @@
+ _apm= apm
+ _ar= ar
+ _arcnet= arcnet
+-_ath_hal= ath_hal
+ _awi= awi
+ _bktr= bktr
+ _cardbus= cardbus
+@@ -369,7 +359,6 @@
+ .if ${MK_NCP} != "no"
+ _nwfs= nwfs
+ .endif
+-_oltr= oltr
+ _pccard= pccard
+ _pcfclock= pcfclock
+ _pecoff= pecoff
+@@ -404,7 +393,6 @@
+ _cx= cx
+ _dpt= dpt
+ _ex= ex
+-_hptmv= hptmv
+ _ichwd= ichwd
+ _ida= ida
+ _idt= idt
+@@ -414,13 +402,11 @@
+ _ipw= ipw
+ _iwi= iwi
+ _mly= mly
+-_nve= nve
+ .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
+ .if exists(${.CURDIR}/../crypto/via)
+ _padlock= padlock
+ .endif
+ .endif
+-_rr232x= rr232x
+ _s3= s3
+ _twa= twa
+ _vesa= vesa
+@@ -449,7 +435,6 @@
+ _agp= agp
+ _an= an
+ _arcmsr= arcmsr
+-_ath_hal= ath_hal
+ _ciss= ciss
+ _cpufreq= cpufreq
+ _digi= digi
+@@ -457,7 +442,6 @@
+ _ed= ed
+ _em= em
+ _ext2fs= ext2fs
+-_hptmv= hptmv
+ _i2c= i2c
+ _ichwd= ichwd
+ _ida= ida
+@@ -471,8 +455,6 @@
+ #_lnc= lnc
+ _mly= mly
+ _ndis= ndis
+-_nve= nve
+-_rr232x= rr232x
+ _safe= safe
+ _scsi_low= scsi_low
+ _smbfs= smbfs
Copied: trunk/kfreebsd-7/debian/patches/904_dev_full.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/904_dev_full.diff)
Copied: trunk/kfreebsd-7/debian/patches/905_grow_arg_max.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/905_grow_arg_max.diff)
Copied: trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff)
Copied: trunk/kfreebsd-7/debian/patches/907_cpu_class.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/907_cpu_class.diff)
Copied: trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/908_linprocfs_is_not_proc.diff)
Copied: trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff)
Copied: trunk/kfreebsd-7/debian/patches/910_disable_hwpmc.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/910_disable_hwpmc.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,54 @@
+
+ Disabled because of FTBFS. Needless to say, it should be eventualy reenabled.
+
+diff -ur sys.old/conf/files sys/conf/files
+--- sys.old/conf/files 2006-05-06 10:51:44.000000000 +0200
++++ sys/conf/files 2006-05-06 11:32:40.000000000 +0200
+@@ -626,8 +626,6 @@
+ dev/hme/if_hme.c optional hme
+ dev/hme/if_hme_pci.c optional hme pci
+ dev/hme/if_hme_sbus.c optional hme sbus
+-dev/hwpmc/hwpmc_logging.c optional hwpmc
+-dev/hwpmc/hwpmc_mod.c optional hwpmc
+ dev/ichsmb/ichsmb.c optional ichsmb
+ dev/ichsmb/ichsmb_pci.c optional ichsmb pci
+ dev/ida/ida.c optional ida
+diff -ur sys.old/conf/files.amd64 sys/conf/files.amd64
+--- sys.old/conf/files.amd64 2006-05-06 10:51:44.000000000 +0200
++++ sys/conf/files.amd64 2006-05-06 11:32:58.000000000 +0200
+@@ -137,9 +137,6 @@
+ dev/fdc/fdc_acpi.c optional fdc
+ dev/fdc/fdc_isa.c optional fdc isa
+ dev/fdc/fdc_pccard.c optional fdc pccard
+-dev/hwpmc/hwpmc_amd.c optional hwpmc
+-dev/hwpmc/hwpmc_piv.c optional hwpmc
+-dev/hwpmc/hwpmc_x86.c optional hwpmc
+ dev/kbd/kbd.c optional atkbd | sc | ukbd
+ dev/mem/memutil.c optional mem
+ dev/sio/sio.c optional sio
+diff -ur sys.old/conf/files.i386 sys/conf/files.i386
+--- sys.old/conf/files.i386 2006-05-06 10:51:44.000000000 +0200
++++ sys/conf/files.i386 2006-05-06 11:32:40.000000000 +0200
+@@ -142,11 +142,6 @@
+ dev/fdc/fdc_isa.c optional fdc isa
+ dev/fdc/fdc_pccard.c optional fdc pccard
+ dev/fe/if_fe_isa.c optional fe isa
+-dev/hwpmc/hwpmc_amd.c optional hwpmc
+-dev/hwpmc/hwpmc_pentium.c optional hwpmc
+-dev/hwpmc/hwpmc_piv.c optional hwpmc
+-dev/hwpmc/hwpmc_ppro.c optional hwpmc
+-dev/hwpmc/hwpmc_x86.c optional hwpmc
+ dev/ichwd/ichwd.c optional ichwd
+ dev/if_ndis/if_ndis.c optional ndis
+ dev/if_ndis/if_ndis_pccard.c optional ndis pccard
+diff -ur sys.old/modules/Makefile sys/modules/Makefile
+--- sys.old/modules/Makefile 2006-05-06 10:51:44.000000000 +0200
++++ sys/modules/Makefile 2006-05-06 11:32:40.000000000 +0200
+@@ -85,7 +85,6 @@
+ ${_hfa} \
+ hifn \
+ hme \
+- hwpmc \
+ ${_i2c} \
+ ${_ibcs2} \
+ ${_ichwd} \
Copied: trunk/kfreebsd-7/debian/patches/999_config.diff (from rev 1560, trunk/kfreebsd-6/debian/patches/999_config.diff)
===================================================================
--- trunk/kfreebsd-6/debian/patches/999_config.diff 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,217 @@
+diff -ur sys.old/amd64/conf/GENERIC sys/amd64/conf/GENERIC
+--- sys.old/amd64/conf/GENERIC 2006-05-06 10:51:44.000000000 +0200
++++ sys/amd64/conf/GENERIC 2006-05-06 11:35:59.000000000 +0200
+@@ -18,13 +18,8 @@
+ #
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.455 2006/05/03 18:15:36 sam Exp $
+
+-cpu HAMMER
+-ident GENERIC
+-
+ # To statically compile in device wiring instead of /boot/device.hints
+-#hints "GENERIC.hints" # Default places to look for devices.
+-
+-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++hints "GENERIC.hints" # Default places to look for devices.
+
+ #options SCHED_ULE # ULE scheduler
+ options SCHED_4BSD # 4BSD scheduler
+@@ -43,6 +38,8 @@
+ options MSDOSFS # MSDOS Filesystem
+ options CD9660 # ISO 9660 Filesystem
+ options PROCFS # Process filesystem (requires PSEUDOFS)
++options LINPROCFS
++options COMPAT_LINUX # Needed by LINPROCFS
+ options PSEUDOFS # Pseudo-filesystem framework
+ options GEOM_GPT # GUID Partition Tables.
+ options COMPAT_43 # Needed by COMPAT_LINUX32
+@@ -50,7 +47,7 @@
+ options COMPAT_IA32 # Compatible with i386 binaries
+ options COMPAT_FREEBSD4 # Compatible with FreeBSD4
+ options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
++options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
+ options KTRACE # ktrace(1) support
+ options SYSVSHM # SYSV-style shared memory
+ options SHMMAXPGS=4096
+@@ -80,15 +77,11 @@
+
+ # Linux 32-bit ABI support
+ options COMPAT_LINUX32 # Compatible with i386 linux binaries
+-options LINPROCFS # Cannot be a module yet.
+
+ # Bus support.
+ device acpi
+ device pci
+
+-# Floppy drives
+-device fdc
+-
+ # ATA and ATAPI devices
+ device ata
+ device atadisk # ATA disk drives
+@@ -96,6 +89,8 @@
+ device atapicd # ATAPI CDROM drives
+ device atapifd # ATAPI floppy drives
+ device atapist # ATAPI tape drives
++device atapicam # emulate ATAPI devices as SCSI via CAM
++ # needs CAM to be present (scbus && pass)
+ options ATA_STATIC_ID # Static device numbering
+
+ # SCSI Controllers
+@@ -177,10 +172,6 @@
+ # Parallel port
+ device ppc
+ device ppbus # Parallel port bus (required)
+-device lpt # Printer
+-device plip # TCP/IP over parallel
+-device ppi # Parallel port interface device
+-#device vpo # Requires scbus and da
+
+ # If you've got a "dumb" serial or parallel PCI card that is
+ # supported by the puc(4) glue driver, uncomment the following
+@@ -248,13 +239,8 @@
+ device loop # Network loopback
+ device random # Entropy device
+ device ether # Ethernet support
+-device sl # Kernel SLIP
+-device ppp # Kernel PPP
+-device tun # Packet tunnel.
+ device pty # Pseudo-ttys (telnet etc)
+ device md # Memory "disks"
+-device gif # IPv6 and IPv4 tunneling
+-device faith # IPv6-to-IPv4 relaying (translation)
+
+ # The `bpf' device enables the Berkeley Packet Filter.
+ # Be aware of the administrative consequences of enabling this!
+@@ -270,12 +256,8 @@
+ device ugen # Generic
+ device uhid # "Human Interface Devices"
+ device ukbd # Keyboard
+-device ulpt # Printer
+ device umass # Disks/Mass storage - Requires scbus and da
+-device ums # Mouse
+ device ural # Ralink Technology RT2500USB wireless NICs
+-device urio # Diamond Rio 500 MP3 player
+-device uscanner # Scanners
+ # USB Ethernet, requires miibus
+ device aue # ADMtek USB Ethernet
+ device axe # ASIX Electronics USB Ethernet
+@@ -288,3 +270,11 @@
+ device firewire # FireWire bus code
+ device sbp # SCSI over FireWire (Requires scbus and da)
+ device fwe # Ethernet over FireWire (non-standard!)
++
++# Alternate queueing
++options ALTQ
++options ALTQ_CBQ # Class Bases Queuing (CBQ)
++options ALTQ_RED # Random Early Detection (RED)
++options ALTQ_RIO # RED In/Out
++options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
++options ALTQ_PRIQ # Priority Queuing (PRIQ)
+diff -ur sys.old/i386/conf/GENERIC sys/i386/conf/GENERIC
+--- sys.old/i386/conf/GENERIC 2006-05-06 10:51:44.000000000 +0200
++++ sys/i386/conf/GENERIC 2006-05-06 11:37:03.000000000 +0200
+@@ -18,15 +18,8 @@
+ #
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.444 2006/05/03 18:13:11 sam Exp $
+
+-cpu I486_CPU
+-cpu I586_CPU
+-cpu I686_CPU
+-ident GENERIC
+-
+ # To statically compile in device wiring instead of /boot/device.hints
+-#hints "GENERIC.hints" # Default places to look for devices.
+-
+-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++hints "GENERIC.hints" # Default places to look for devices.
+
+ #options SCHED_ULE # ULE scheduler
+ options SCHED_4BSD # 4BSD scheduler
+@@ -44,13 +37,15 @@
+ options MSDOSFS # MSDOS Filesystem
+ options CD9660 # ISO 9660 Filesystem
+ options PROCFS # Process filesystem (requires PSEUDOFS)
++options LINPROCFS
++options COMPAT_LINUX # Needed by LINPROCFS
+ options PSEUDOFS # Pseudo-filesystem framework
+ options GEOM_GPT # GUID Partition Tables.
+ options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
+ options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
+ options COMPAT_FREEBSD4 # Compatible with FreeBSD4
+ options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
++options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
+ options KTRACE # ktrace(1) support
+ options SYSVSHM # SYSV-style shared memory
+ options SHMMAXPGS=4096
+@@ -83,9 +78,6 @@
+ device eisa
+ device pci
+
+-# Floppy drives
+-device fdc
+-
+ # ATA and ATAPI devices
+ device ata
+ device atadisk # ATA disk drives
+@@ -93,6 +85,8 @@
+ device atapicd # ATAPI CDROM drives
+ device atapifd # ATAPI floppy drives
+ device atapist # ATAPI tape drives
++device atapicam # emulate ATAPI devices as SCSI via CAM
++ # needs CAM to be present (scbus && pass)
+ options ATA_STATIC_ID # Static device numbering
+
+ # SCSI Controllers
+@@ -189,10 +183,6 @@
+ # Parallel port
+ device ppc
+ device ppbus # Parallel port bus (required)
+-device lpt # Printer
+-device plip # TCP/IP over parallel
+-device ppi # Parallel port interface device
+-#device vpo # Requires scbus and da
+
+ # If you've got a "dumb" serial or parallel PCI card that is
+ # supported by the puc(4) glue driver, uncomment the following
+@@ -261,13 +251,8 @@
+ device loop # Network loopback
+ device random # Entropy device
+ device ether # Ethernet support
+-device sl # Kernel SLIP
+-device ppp # Kernel PPP
+-device tun # Packet tunnel.
+ device pty # Pseudo-ttys (telnet etc)
+ device md # Memory "disks"
+-device gif # IPv6 and IPv4 tunneling
+-device faith # IPv6-to-IPv4 relaying (translation)
+
+ # The `bpf' device enables the Berkeley Packet Filter.
+ # Be aware of the administrative consequences of enabling this!
+@@ -283,12 +268,8 @@
+ device ugen # Generic
+ device uhid # "Human Interface Devices"
+ device ukbd # Keyboard
+-device ulpt # Printer
+ device umass # Disks/Mass storage - Requires scbus and da
+-device ums # Mouse
+ device ural # Ralink Technology RT2500USB wireless NICs
+-device urio # Diamond Rio 500 MP3 player
+-device uscanner # Scanners
+ # USB Ethernet, requires miibus
+ device aue # ADMtek USB Ethernet
+ device axe # ASIX Electronics USB Ethernet
+@@ -301,3 +282,11 @@
+ device firewire # FireWire bus code
+ device sbp # SCSI over FireWire (Requires scbus and da)
+ device fwe # Ethernet over FireWire (non-standard!)
++
++# Alternate queueing
++options ALTQ
++options ALTQ_CBQ # Class Bases Queuing (CBQ)
++options ALTQ_RED # Random Early Detection (RED)
++options ALTQ_RIO # RED In/Out
++options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
++options ALTQ_PRIQ # Priority Queuing (PRIQ)
Copied: trunk/kfreebsd-7/debian/patches/README (from rev 1560, trunk/kfreebsd-6/debian/patches/README)
Copied: trunk/kfreebsd-7/debian/rules (from rev 1560, trunk/kfreebsd-6/debian/rules)
===================================================================
--- trunk/kfreebsd-6/debian/rules 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/debian/rules 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,250 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+SHELL = bash
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+version := $(shell echo $(full_version) | sed -e 's/[+-].*//g')
+revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+major := $(shell dpkg-parsechangelog | grep ^Source: | sed -e 's/^.*-//g')
+ifeq (, $(findstring :$(major)., :$(version)))
+# Preliminar snapshot (e.g. 6.99+20060217). Pretend this is the actual release.
+version := $(major).0
+endif
+
+os := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+cpu := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+config_files := $(wildcard debian/arch/$(cpu)/*.config)
+flavours := $(config_files:debian/arch/$(cpu)/%.config=%)
+configfile := DEBCUSTOM
+abiname := 1
+
+SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
+IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
+HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
+NDIS_PACKAGE := $(CURDIR)/debian/ndiswrapper-modules-$(version)-$(abiname)
+SRC_TAR := kfreebsd-source-$(version).tar.bz2
+SRC_DIR := kfreebsd-source-$(version)
+HEADERS_DIR := kfreebsd-headers-$(version)-$(abiname)
+FLAVOR_DIR := flavor-$(version)-$(abiname)
+
+MAKE := make MACHINE_ARCH=$(cpu) CC=gcc-3.4 WERROR=
+PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
+
+control: clean
+ sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
+ $(CURDIR)/debian/control.in > $(CURDIR)/debian/control
+ for arch in `ls $(CURDIR)/debian/arch/` ; do \
+ for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
+ flavor=$${config/.config/} ; \
+ test -f $(CURDIR)/debian/arch/$$arch/$$flavor.defines && recommends=`awk '/^Recommends: / {print $$2}' $(CURDIR)/debian/arch/$$arch/$$flavor.defines` ; \
+ sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/$$arch/g" -e "s/@recommends@/$$recommends/g" \
+ $(CURDIR)/debian/control.flavor.in >> $(CURDIR)/debian/control ; \
+ done ; \
+ done
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -rf src kfreebsd-source-* flavor-* config
+ rm -f debian/kfreebsd-image-*.postinst
+
+ rm -f *-stamp
+ dh_clean
+
+src: src-stamp
+src-stamp:
+ tar xfj $(CURDIR)/src.tar.bz2
+
+ set -e ; find src -type f -name "*.[ch]" | (while read i ; do \
+ sed -i $$i \
+ -e 's/defined\( \|\t\)*(\( \|\t\)*__FreeBSD__\( \|\t\)*)/defined(__FreeBSD_kernel__)/g' \
+ -e 's/#\( \|\t\)*ifdef\( \|\t\)*__FreeBSD__/#ifdef __FreeBSD_kernel__/g' \
+ -e 's/#\( \|\t\)*ifndef\( \|\t\)*__FreeBSD__/#ifndef __FreeBSD_kernel__/g' \
+ -e 's/__FreeBSD__/$(major)/g' \
+ -e 's,#\( \|\t\)*include\( \|\t\)*<sys/device.h>,,g' \
+ -e 's,#\( \|\t\)*include\( \|\t\)*<dev/rndvar.h>,,g' \
+ -e 's,#\( \|\t\)*include\( \|\t\)*<sys/pool.h>,,g' \
+ -e 's,#\( \|\t\)*include\( \|\t\)*<netinet/ip_ipsp.h>,,g' \
+ -e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)bpfilter.h\(>\|"\),,g' \
+ -e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
+ ; done)
+
+ set -e ; for i in $(CURDIR)/debian/patches/*.diff ; do \
+ echo "--- Patch $$i ---" ; \
+ patch -p0 -d src/ --dry-run < $$i ; \
+ patch -p0 -d src/ < $$i >/dev/null ; \
+ done
+
+ touch src-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: src
+ dh_testdir
+
+ cp -af src $(SRC_DIR)
+
+ touch build-indep-stamp
+
+install-indep: install-indep-stamp
+install-indep-stamp: build-indep
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs -i
+
+ mkdir -p $(SOURCE_PACKAGE)/usr/src
+ chown -R root.src $(SRC_DIR)
+ tar cfj $(SOURCE_PACKAGE)/usr/src/$(SRC_TAR) $(SRC_DIR)
+
+ touch install-indep-stamp
+
+config: src
+ cp -af src/usr.sbin/config config
+ $(MAKE) -C config
+
+build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)
+build-flavor-%-stamp: src config
+ cp -af src $(FLAVOR_DIR)-$*
+
+ # Add the abiname and the flavor to the kernel version
+ sed -i -e 's/^RELEASE=".*"/RELEASE="$(version)-$(abiname)-$*"/g' $(FLAVOR_DIR)-$*/sys/conf/newvers.sh
+
+ # Set /lib/modules/${RELEASE} as module dir
+ sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
+
+ # Configure the kernel
+ cp debian/arch/$(cpu)/*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/
+ ln -sf $*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/$(configfile)
+ cd $(FLAVOR_DIR)-$*/sys/$(cpu)/conf \
+ && config $(configfile)
+
+ # Build it
+ $(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile)/ depend
+ $(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile)/
+
+ touch build-flavor-$*-stamp
+
+install-common-stamp: src
+ dh_testdir
+ dh_testroot
+ mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)
+ cd src \
+ && find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
+ find $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) -type f -exec chmod 644 {} \;
+
+ touch install-common-stamp
+
+install-arch: $(foreach flavor,$(flavours),install-flavor-$(flavor)-stamp)
+install-flavor-%-stamp: install-common-stamp build-flavor-%-stamp
+ dh_testdir
+ dh_testroot
+ dh_clean -k -pkfreebsd-image-$(version)-$(abiname)-$*
+
+ mkdir -p $(IMAGE_PACKAGE)-$*/{boot,lib/modules/$(version)-$(abiname)-$*}
+
+ # make the install target happy
+ install -o root -g root -m 644 \
+ $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/GENERIC.hints \
+ $(IMAGE_PACKAGE)-$*/boot/device.hints
+ install -o root -g root -m 644 \
+ $(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
+ $(IMAGE_PACKAGE)-$*/boot/loader.conf
+ mkdir -p $(IMAGE_PACKAGE)-$*/boot/defaults
+ install -o root -g root -m 644 \
+ $(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
+ $(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
+
+ # now install the kernel
+ $(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
+ mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+ chmod 644 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+ gzip -9 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+
+ # fix broken perms in module dir
+ chmod 644 $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/*
+
+ # remove loader.conf (part of kfreebsd-loader)
+ rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
+ rm -rf $(IMAGE_PACKAGE)-$*/boot/defaults
+
+ # remove device.hints (built into kernel)
+ rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
+
+ # override file
+ mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
+ install -p -o root -g root -m 644 \
+ debian/kfreebsd-image.overrides \
+ $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides/kfreebsd-image-$(version)-$(abiname)-$*
+
+ # move ndis modules to their own package
+ mkdir -p $(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
+ mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/ndis.ko $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/if_ndis.ko \
+ $(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/
+
+ # scripts
+ sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
+ > debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
+
+ # headers package
+ mkdir -p $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
+ cd $(FLAVOR_DIR)-$*/sys/$(cpu) \
+ && find . -type f -name "*.h" -not -regex ".*modules.*" -exec cp --parents {} $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) \; \
+ && cp -d --parents compile/$(configfile)/machine $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) \
+ && cp -d --parents conf/$(configfile) $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
+ find $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) -type f -exec chmod 644 {} \;
+ for dir in `ls $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)/sys` ; do \
+ ln -s ../../$(HEADERS_DIR)/sys/$$dir $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$$dir ; \
+ done
+
+ touch install-flavor-$*-stamp
+
+
+# Build architecture-independent files here.
+binary-indep: build-indep install-indep
+ dh_testdir
+ dh_testroot
+ dh_installdocs -i
+ dh_installchangelogs -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_makeshlibs -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+ifeq ($(os), kfreebsd)
+binary-arch: build-arch install-arch
+ dh_testdir
+ dh_testroot
+ dh_installdocs -s
+ dh_installchangelogs -s
+ dh_link -s
+ dh_strip -s -X/boot -X/lib/modules
+ dh_compress -s
+ dh_fixperms -s
+ dh_makeshlibs -s
+ dh_installdeb -s
+ dh_shlibdeps -s -X/boot -X/lib/modules
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
+else
+binary-arch:
+ # We have nothing to do
+endif
+
+binary: binary-indep binary-arch
+
+.PHONY: clean build build-indep
+.PHONY: binary-indep binary-arch binary-indep binary-arch binary
+
Copied: trunk/kfreebsd-7/fetch (from rev 1560, trunk/kfreebsd-6/fetch)
===================================================================
--- trunk/kfreebsd-6/fetch 2006-05-05 08:49:46 UTC (rev 1560)
+++ trunk/kfreebsd-7/fetch 2006-05-06 16:51:15 UTC (rev 1564)
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -ex
+
+rm -rf src
+
+if test -e src.tar.bz2 ; then
+ tar -xjpf src.tar.bz2
+ action="update"
+else
+ action="checkout"
+fi
+
+for i in src/{sys,usr.sbin/config} ; do
+ cvs -d freebsdanoncvs at anoncvs.freebsd.org:/home/ncvs ${action} -r HEAD $i
+ test -e $i
+done
+
+grep ^src/ debian/copyright | xargs rm -rf
+
+# assert that no non-free objects were left unremoved
+[ "`find src -name \*.o.uu | wc -l`" = "0" ]
+
+rm -f src.tar.bz2
+tar -cjpf src.tar.bz2 src/
+
+rm -rf src
More information about the Glibc-bsd-commits
mailing list