[Glibc-bsd-commits] r2475 - in trunk/kfreebsd-7: . debian debian/patches

Petr Salinger ps-guest at alioth.debian.org
Tue Apr 21 07:20:40 UTC 2009 

Author: ps-guest
Date: 2009-04-21 07:20:40 +0000 (Tue, 21 Apr 2009)
New Revision: 2475

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/001_misc.diff
   trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.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/010_ET_DYN.diff
   trunk/kfreebsd-7/debian/patches/020_linker.diff
   trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
   trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
   trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
   trunk/kfreebsd-7/debian/patches/912_binutils.diff
   trunk/kfreebsd-7/debian/patches/999_config.diff
   trunk/kfreebsd-7/debian/patches/series
   trunk/kfreebsd-7/fetch
Log:
* New upstream snapshot (RELENG_7_2)



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/changelog	2009-04-21 07:20:40 UTC (rev 2475)
@@ -1,3 +1,12 @@
+kfreebsd-7 (7.2~cvs20090421-1) EXPERIMENTAL; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream snapshot (RELENG_7_2)
+     - update of some patches
+     - refresh all patches
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 21 Apr 2009 12:00:00 +0200
+
 kfreebsd-7 (7.1-4) unstable; urgency=low
 
   * debian/control.flavor.in: depends on kldutils instead of 

Modified: trunk/kfreebsd-7/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/001_misc.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -7,7 +7,7 @@
 --- src.orig/sys/conf/kern.mk
 +++ src/sys/conf/kern.mk
 @@ -1,5 +1,9 @@
- # $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
+ # $FreeBSD: src/sys/conf/kern.mk,v 1.52.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $
  
 +.if !defined(OPSYS)
 +OPSYS!=		uname -s
@@ -51,22 +51,6 @@
 ===================================================================
 --- src.orig/sys/conf/kern.post.mk
 +++ src/sys/conf/kern.post.mk
-@@ -1,5 +1,15 @@
- # $FreeBSD: src/sys/conf/kern.post.mk,v 1.100.2.1 2008/08/27 04:41:15 jb 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.
 @@ -211,11 +221,9 @@
  .if exists(${DESTDIR}${KODIR})
  	-thiskernel=`sysctl -n kern.bootfile` ; \
@@ -79,30 +63,3 @@
  			rm -rf ${DESTDIR}${KODIR}.old ; \
  		fi ; \
  		mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
-@@ -223,21 +231,21 @@
- 	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
- .if defined(KERNEL_EXTRA_INSTALL)
--	${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
-+	${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_EXTRA_INSTALL} ${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:

Modified: trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -30,7 +30,7 @@
 --- src.orig/sys/dev/aic7xxx/aicasm/aicasm.h
 +++ src/sys/dev/aic7xxx/aicasm/aicasm.h
 @@ -42,8 +42,9 @@
-  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
+  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17.20.1 2009/04/15 03:14:26 kensmith Exp $
   */
  
 -#ifdef __linux__
@@ -131,7 +131,7 @@
 --- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 @@ -42,8 +42,9 @@
-  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
+  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17.20.1 2009/04/15 03:14:26 kensmith Exp $
   */
  
 -#ifdef __linux__

Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -140,7 +140,7 @@
 ===================================================================
 --- src.orig/sys/amd64/amd64/cpu_switch.S
 +++ src/sys/amd64/amd64/cpu_switch.S
-@@ -259,12 +259,12 @@
+@@ -260,12 +260,12 @@
  	jmp	do_tss
  
  store_seg:
@@ -157,7 +157,7 @@
  	jmp	done_store_seg
  2:	movq	PCPU(GS32P),%rax
  	movq	(%rax),%rax
-@@ -276,11 +276,11 @@
+@@ -277,11 +277,11 @@
  	jnz	2f
  1:	movl	$MSR_GSBASE,%ecx
  	rdmsr
@@ -170,7 +170,7 @@
 +	movw	PCB_DS(%r8),%ds
 +	movw	PCB_ES(%r8),%es
 +	movw	PCB_FS(%r8),%fs
- 	jmp	done_load_seg
+ 	jmp	restore_fsbase
  	/* Restore userland %gs while preserving kernel gsbase */
  2:	movq	PCPU(GS32P),%rax
 Index: src/sys/amd64/ia32/ia32_signal.c
@@ -283,26 +283,26 @@
 ===================================================================
 --- src.orig/sys/amd64/linux32/linux32_sysvec.c
 +++ src/sys/amd64/linux32/linux32_sysvec.c
-@@ -355,9 +355,9 @@
+@@ -365,9 +365,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" :
+ 	frame.sf_sc.uc_mcontext.sc_gs     = rgs();
+ 	frame.sf_sc.uc_mcontext.sc_fs     = rfs();
+-	__asm __volatile("movl %%es,%0" :
++	__asm __volatile("movw %%es,%0" :
  	    "=rm" (frame.sf_sc.uc_mcontext.sc_es));
--        __asm __volatile("movl %%ds,%0" :
-+        __asm __volatile("mov %%ds,%0" :
+-	__asm __volatile("movl %%ds,%0" :
++	__asm __volatile("movw %%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;
-@@ -489,8 +489,8 @@
+@@ -499,8 +499,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_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("movw %%es,%0" : "=rm" (frame.sf_sc.sc_es));
++	__asm __volatile("movw %%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;

Modified: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/007_clone_signals.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/007_clone_signals.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -2,7 +2,7 @@
 ===================================================================
 --- src.orig/sys/kern/kern_fork.c
 +++ src/sys/kern/kern_fork.c
-@@ -523,7 +523,11 @@
+@@ -529,7 +529,11 @@
  		p2->p_sigacts = newsigacts;
  	}
  	if (flags & RFLINUXTHPN) 

Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -27,7 +27,7 @@
 --- src.orig/usr.sbin/config/main.c
 +++ src/usr.sbin/config/main.c
 @@ -41,12 +41,18 @@
-   "$FreeBSD: src/usr.sbin/config/main.c,v 1.76.2.1 2008/06/27 15:20:18 emaste Exp $";
+   "$FreeBSD: src/usr.sbin/config/main.c,v 1.76.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $";
  #endif /* not lint */
  
 +#include <stdarg.h>

Modified: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -18,10 +18,10 @@
 ===================================================================
 --- src.orig/sys/conf/Makefile.arm
 +++ src/sys/conf/Makefile.arm
-@@ -109,6 +109,8 @@
- 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
- 	inflate-tramp.o tmphack.S
+@@ -108,6 +108,8 @@
  
+ MKMODULESENV+=	MACHINE=${MACHINE}
+ 
 +%WITHOUT_MODULES
 +
  %BEFORE_DEPEND
@@ -104,7 +104,7 @@
  static void do_before_depend(FILE *);
  static int opteq(const char *, const char *);
  static void read_files(void);
-@@ -142,6 +143,8 @@
+@@ -146,6 +147,8 @@
  		}
  		if (eq(line, "%BEFORE_DEPEND\n"))
  			do_before_depend(ofp);
@@ -113,7 +113,7 @@
  		else if (eq(line, "%OBJS\n"))
  			do_objs(ofp);
  		else if (strncmp(line, "%FILES.", 7) == 0)
-@@ -622,6 +625,28 @@
+@@ -626,6 +629,28 @@
  }
  
  static void

Modified: trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -4,8 +4,8 @@
 ===================================================================
 --- src.orig/sys/kern/imgact_elf.c
 +++ src/sys/kern/imgact_elf.c
-@@ -619,6 +619,8 @@
- 	const char *note_name;
+@@ -641,6 +641,8 @@
+ 	char *path;
  	struct thread *td = curthread;
  	struct sysentvec *sv;
 +	u_long rbase = 0;
@@ -13,7 +13,7 @@
  
  	/*
  	 * Do we have a valid ELF header ?
-@@ -660,11 +662,27 @@
+@@ -682,11 +684,27 @@
  		    hdr->e_ident[EI_OSABI]);
  		return (ENOEXEC);
  	}
@@ -42,7 +42,7 @@
  		newinterp = brand_info->interp_newpath;
  
  	/*
-@@ -708,7 +726,7 @@
+@@ -730,7 +748,7 @@
  
  			if ((error = __elfN(load_section)(vmspace,
  			    imgp->object, phdr[i].p_offset,
@@ -51,7 +51,7 @@
  			    phdr[i].p_memsz, phdr[i].p_filesz, prot,
  			    sv->sv_pagesize)) != 0)
  				return (error);
-@@ -722,11 +740,12 @@
+@@ -744,11 +762,12 @@
  			if (phdr[i].p_offset == 0 &&
  			    hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
  				<= phdr[i].p_filesz)
@@ -65,7 +65,7 @@
  
  			/*
  			 * Is this .text or .data?  We can't use
-@@ -748,7 +767,7 @@
+@@ -770,7 +789,7 @@
  			    phdr[i].p_memsz)) {
  				text_size = seg_size;
  				text_addr = seg_addr;
@@ -74,12 +74,12 @@
  			} else {
  				data_size = seg_size;
  				data_addr = seg_addr;
-@@ -756,7 +775,7 @@
+@@ -778,7 +797,7 @@
  			total_size += seg_size;
  			break;
  		case PT_PHDR: 	/* Program header table info */
 -			proghdr = phdr[i].p_vaddr;
 +			proghdr = phdr[i].p_vaddr + rbase;
  			break;
- 		case PT_NOTE:
- 			pnote = &phdr[i];
+ 		default:
+ 			break;

Modified: trunk/kfreebsd-7/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/020_linker.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/020_linker.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -8,7 +8,7 @@
 ===================================================================
 --- src.orig/sys/conf/kern.post.mk
 +++ src/sys/conf/kern.post.mk
-@@ -95,7 +95,9 @@
+@@ -85,7 +85,9 @@
  ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
  	@rm -f ${.TARGET}
  	@echo linking ${.TARGET}

Modified: trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -21,7 +21,7 @@
 ===================================================================
 --- src.orig/sys/kern/vfs_syscalls.c
 +++ src/sys/kern/vfs_syscalls.c
-@@ -2831,8 +2831,7 @@
+@@ -2846,8 +2846,7 @@
  	int error;
  
  	if (usrtvp == NULL) {

Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -2,22 +2,184 @@
 ===================================================================
 --- src.orig/sys/conf/files
 +++ src/sys/conf/files
-@@ -473,18 +473,6 @@
+@@ -475,180 +475,6 @@
  dev/ata/atapi-cd.c		optional atapicd
  dev/ata/atapi-fd.c		optional atapifd
  dev/ata/atapi-tape.c		optional atapist
--dev/ath/ah_osdep.c optional ath_hal \
+-#
+-dev/ath/if_ath.c		optional ath \
 -	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/if_ath_pci.c		optional ath pci \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ah_osdep.c		optional ath \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_hal/ah.c		optional ath \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_hal/ah_eeprom_v1.c	optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_hal/ah_eeprom_v3.c	optional ath_hal | ath_ar5211 | ath_ar5212 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_hal/ah_eeprom_v14.c optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_hal/ah_regdomain.c	optional ath \
+-	compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_hal/ar5210/ar5210_attach.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_beacon.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_interrupts.c	optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_keycache.c	optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_misc.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_phy.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_power.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_recv.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_reset.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5210/ar5210_xmit.c		optional ath_hal | ath_ar5210 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_attach.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_beacon.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_interrupts.c	optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_keycache.c	optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_misc.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_phy.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_power.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_recv.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_reset.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5211/ar5211_xmit.c		optional ath_hal | ath_ar5211 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_ani.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_attach.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_beacon.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_eeprom.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_gpio.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_interrupts.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_keycache.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_misc.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_phy.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_power.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_recv.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_reset.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_rfgain.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5212_xmit.c \
+-	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar2316.c	optional ath_rf2316 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar2317.c	optional ath_rf2317 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar2413.c	optional ath_hal | ath_rf2413 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar2425.c	optional ath_hal | ath_rf2425 | ath_rf2417 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5111.c	optional ath_hal | ath_rf5111 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5112.c	optional ath_hal | ath_rf5112 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5212/ar5413.c	optional ath_hal | ath_rf5413 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar2133.c	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_ani.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_attach.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_beacon.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_cal.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_cal_iq.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_eeprom.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_gpio.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_interrupts.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_keycache.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_misc.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_phy.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_power.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_recv.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_reset.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar5416_xmit.c \
+-	optional ath_hal | ath_ar5416 | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+-dev/ath/ath_hal/ar5416/ar9160_attach.c optional ath_hal | ath_ar9160 \
+-	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 -dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \
 -	compile-with "${NORMAL_C} -I$S/dev/ath"
 -dev/ath/ath_rate/onoe/onoe.c	optional ath_rate_onoe \
 -	compile-with "${NORMAL_C} -I$S/dev/ath"
 -dev/ath/ath_rate/sample/sample.c	optional ath_rate_sample \
 -	compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/if_ath.c		optional ath \
--	compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/if_ath_pci.c		optional ath pci \
--	compile-with "${NORMAL_C} -I$S/dev/ath"
  dev/awi/am79c930.c		optional awi
  dev/awi/awi.c			optional awi
  dev/awi/if_awi_pccard.c		optional awi pccard
@@ -25,7 +187,7 @@
 ===================================================================
 --- src.orig/sys/conf/files.i386
 +++ src/sys/conf/files.i386
-@@ -46,42 +46,6 @@
+@@ -46,32 +46,6 @@
  	no-obj no-implicit-rule before-depend				\
  	clean		"ukbdmap.h"
  #
@@ -34,16 +196,6 @@
 -	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	"rm -f opt_ah.h; 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" \
@@ -68,7 +220,7 @@
  #
  compat/linprocfs/linprocfs.c	optional linprocfs
  compat/linsysfs/linsysfs.c	optional linsysfs
-@@ -181,14 +145,6 @@
+@@ -172,14 +146,6 @@
  dev/fe/if_fe_isa.c		optional fe isa
  dev/glxsb/glxsb.c		optional glxsb
  dev/glxsb/glxsb_hash.c		optional glxsb
@@ -83,7 +235,7 @@
  dev/hwpmc/hwpmc_amd.c		optional hwpmc
  dev/hwpmc/hwpmc_pentium.c	optional hwpmc
  dev/hwpmc/hwpmc_piv.c		optional hwpmc
-@@ -215,7 +171,6 @@
+@@ -206,7 +172,6 @@
  dev/mse/mse.c			optional mse
  dev/mse/mse_isa.c		optional mse isa
  dev/nfe/if_nfe.c		optional nfe pci
@@ -95,12 +247,12 @@
 ===================================================================
 --- src.orig/sys/conf/kern.pre.mk
 +++ src/sys/conf/kern.pre.mk
-@@ -67,9 +67,6 @@
+@@ -65,9 +65,6 @@
  # ... and the same for pf
  INCLUDES+= -I$S/contrib/pf
  
--# ... and the same for Atheros HAL
--INCLUDES+= -I$S/dev/ath
+-# ... and the same for ath
+-INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath_hal
 -
  # ... and the same for the NgATM stuff
  INCLUDES+= -I$S/contrib/ngatm
@@ -118,12 +270,13 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -252,9 +250,6 @@
+@@ -253,10 +251,6 @@
  device		wlan_scan_ap	# 802.11 AP mode scanning
  device		wlan_scan_sta	# 802.11 STA mode scanning
  device		an		# Aironet 4500/4800 802.11 wireless NICs.
 -device		ath		# Atheros pci/cardbus NIC's
 -device		ath_hal		# Atheros HAL (Hardware Access Layer)
+-options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 -device		ath_rate_sample	# SampleRate tx rate control for ath
  device		awi		# BayStack 660 and others
  device		ral		# Ralink Technology RT2500 wireless NICs.
@@ -132,19 +285,15 @@
 ===================================================================
 --- src.orig/sys/modules/Makefile
 +++ src/sys/modules/Makefile
-@@ -26,11 +26,6 @@
+@@ -28,7 +28,6 @@
  	${_arl} \
  	${_asr} \
  	ata \
--	${_ath} \
--	${_ath_hal} \
--	${_ath_rate_amrr} \
--	${_ath_rate_onoe} \
--	${_ath_rate_sample} \
+-	ath \
  	aue \
  	${_auxio} \
  	${_awi} \
-@@ -100,8 +95,6 @@
+@@ -100,8 +99,6 @@
  	hifn \
  	hme \
  	${_hptiop} \
@@ -153,7 +302,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -200,11 +193,8 @@
+@@ -202,11 +199,8 @@
  	ntfs_iconv \
  	${_nxge} \
  	nullfs \
@@ -165,7 +314,7 @@
  	${_padlock} \
  	patm \
  	${_pccard} \
-@@ -327,7 +317,6 @@
+@@ -331,7 +325,6 @@
  	${_xe} \
  	xfs \
  	xl \
@@ -173,19 +322,7 @@
  	zlib \
  	zyd
  
-@@ -372,11 +361,6 @@
- _apm=		apm
- _ar=		ar
- _arcnet=	arcnet
--_ath=		ath
--_ath_hal=	ath_hal
--_ath_rate_amrr=	ath_rate_amrr
--_ath_rate_onoe=	ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _awi=		awi
- _bktr=		bktr
- _cardbus=	cardbus
-@@ -422,10 +406,6 @@
+@@ -423,10 +416,6 @@
  .if ${MK_NCP} != "no"
  _nwfs=		nwfs
  .endif
@@ -196,7 +333,7 @@
  _pccard=	pccard
  _pcfclock=	pcfclock
  _pecoff=	pecoff
-@@ -447,9 +427,6 @@
+@@ -448,9 +437,6 @@
  _tmpfs= 	tmpfs
  _wi=		wi
  _xe=		xe
@@ -206,7 +343,7 @@
  .if ${MACHINE} == "i386"
  _aac=		aac
  _acpi=		acpi
-@@ -467,8 +444,6 @@
+@@ -468,8 +454,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -215,7 +352,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -481,7 +456,6 @@
+@@ -482,7 +466,6 @@
  _ixgb=   	ixgb
  _mly=		mly
  _nfe=		nfe
@@ -223,19 +360,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _wpi=		wpi
-@@ -508,11 +482,6 @@
- _agp=		agp
- _an=		an
- _arcmsr=	arcmsr
--_ath=		ath
--_ath_hal=	ath_hal
--_ath_rate_amrr=	ath_rate_amrr
--_ath_rate_onoe=	ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _cardbus=	cardbus
- _cbb=		cbb
- _cmx=		cmx
-@@ -533,8 +502,6 @@
+@@ -530,8 +513,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -244,7 +369,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -554,12 +521,8 @@
+@@ -551,12 +532,8 @@
  _mly=		mly
  _ndis=		ndis
  _nfe=		nfe
@@ -257,7 +382,7 @@
  _pccard=	pccard
  _rdma=		rdma	
  _safe=		safe
-@@ -573,9 +536,6 @@
+@@ -570,9 +547,6 @@
  _wi=		wi
  _wpi=		wpi
  _wpifw=		wpifw
@@ -267,34 +392,11 @@
  .endif
  
  .if ${MACHINE_ARCH} == "ia64"
-@@ -617,22 +577,12 @@
- 
- .if ${MACHINE_ARCH} == "powerpc"
- _an=		an
--_ath=		ath
--_ath_hal=	ath_hal
--_ath_rate_amrr=	ath_rate_amrr
--_ath_rate_onoe=	ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _bm=		bm
- _nvram=		powermac_nvram
- _smbfs=		smbfs
- .endif
- 
- .if ${MACHINE_ARCH} == "sparc64"
--_ath=		ath
--_ath_hal=	ath_hal
--_ath_rate_amrr=	ath_rate_amrr
--_ath_rate_onoe=	ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _auxio=		auxio
- _em=		em
- _i2c=		i2c
 Index: src/sys/amd64/conf/GENERIC
 ===================================================================
 --- src.orig/sys/amd64/conf/GENERIC
 +++ src/sys/amd64/conf/GENERIC
-@@ -125,8 +125,6 @@
+@@ -124,8 +124,6 @@
  device		arcmsr		# Areca SATA II RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -303,12 +405,13 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -240,9 +238,6 @@
+@@ -240,10 +238,6 @@
  device		wlan_scan_ap	# 802.11 AP mode scanning
  device		wlan_scan_sta	# 802.11 STA mode scanning
  device		an		# Aironet 4500/4800 802.11 wireless NICs.
 -device		ath		# Atheros pci/cardbus NIC's
 -device		ath_hal		# Atheros HAL (Hardware Access Layer)
+-options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 -device		ath_rate_sample	# SampleRate tx rate control for ath
  device		awi		# BayStack 660 and others
  device		ral		# Ralink Technology RT2500 wireless NICs.
@@ -317,20 +420,10 @@
 ===================================================================
 --- src.orig/sys/conf/files.amd64
 +++ src/sys/conf/files.amd64
-@@ -47,37 +47,6 @@
+@@ -47,27 +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	"rm -f opt_ah.h; 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" \
@@ -355,7 +448,7 @@
  #
  amd64/acpica/OsdEnvironment.c	optional	acpi
  amd64/acpica/acpi_machdep.c	optional	acpi
-@@ -176,14 +145,6 @@
+@@ -167,14 +146,6 @@
  dev/fdc/fdc_acpi.c		optional	fdc
  dev/fdc/fdc_isa.c		optional	fdc isa
  dev/fdc/fdc_pccard.c		optional	fdc pccard
@@ -370,7 +463,7 @@
  dev/hwpmc/hwpmc_amd.c		optional	hwpmc
  dev/hwpmc/hwpmc_piv.c		optional	hwpmc
  dev/hwpmc/hwpmc_x86.c		optional	hwpmc
-@@ -191,7 +152,6 @@
+@@ -182,7 +153,6 @@
  dev/kbd/kbd.c			optional	atkbd | sc | ukbd
  dev/mem/memutil.c		optional	mem
  dev/nfe/if_nfe.c		optional	nfe pci

Modified: trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -45,7 +45,7 @@
 ===================================================================
 --- src.orig/sys/amd64/conf/GENERIC
 +++ src/sys/amd64/conf/GENERIC
-@@ -57,8 +57,14 @@
+@@ -56,8 +56,14 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory

Modified: trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -2,7 +2,7 @@
 ===================================================================
 --- src.orig/sys/compat/linprocfs/linprocfs.c
 +++ src/sys/compat/linprocfs/linprocfs.c
-@@ -336,10 +336,6 @@
+@@ -338,10 +338,6 @@
  
  		/* determine fs type */
  		fstype = mp->mnt_stat.f_fstypename;

Modified: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -3,7 +3,7 @@
 --- src.orig/sys/conf/ldscript.amd64
 +++ src/sys/conf/ldscript.amd64
 @@ -1,12 +1,12 @@
- /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9.26.1 2008/11/25 02:59:29 kensmith Exp $ */
+ /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9.28.1 2009/04/15 03:14:26 kensmith Exp $ */
 -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 +OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
  OUTPUT_ARCH(i386:x86-64)

Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff	2009-04-21 07:20:40 UTC (rev 2475)
@@ -4,7 +4,7 @@
 +++ src/sys/amd64/conf/GENERIC
 @@ -18,13 +18,13 @@
  #
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.14 2008/08/29 18:54:35 jhb Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.19.2.1 2009/04/15 03:14:26 kensmith Exp $
  
 -cpu		HAMMER
 -ident		GENERIC
@@ -20,7 +20,7 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -45,6 +45,8 @@
+@@ -44,6 +44,8 @@
  options 	MSDOSFS			# MSDOS Filesystem
  options 	CD9660			# ISO 9660 Filesystem
  options 	PROCFS			# Process filesystem (requires PSEUDOFS)
@@ -29,7 +29,7 @@
  options 	PSEUDOFS		# Pseudo-filesystem framework
  options 	GEOM_PART_GPT		# GUID Partition Tables.
  options 	GEOM_LABEL		# Provides labelization
-@@ -53,7 +55,7 @@
+@@ -52,7 +54,7 @@
  options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
@@ -38,7 +38,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -74,7 +76,7 @@
+@@ -73,7 +75,7 @@
  #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
  
  # Make an SMP-capable kernel by default
@@ -47,7 +47,7 @@
  
  # CPU frequency control
  device		cpufreq
-@@ -83,9 +85,6 @@
+@@ -82,9 +84,6 @@
  device		acpi
  device		pci
  
@@ -57,7 +57,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -93,6 +92,8 @@
+@@ -92,6 +91,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -66,7 +66,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -175,10 +176,6 @@
+@@ -174,10 +175,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -122,7 +122,7 @@
 +++ src/sys/i386/conf/GENERIC
 @@ -18,15 +18,15 @@
  #
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.14 2008/08/29 18:54:35 jhb Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.17.2.1 2009/04/15 03:14:26 kensmith Exp $
  
 -cpu		I486_CPU
 -cpu		I586_CPU
@@ -199,7 +199,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -265,13 +262,8 @@
+@@ -266,13 +263,8 @@
  device		loop		# Network loopback
  device		random		# Entropy device
  device		ether		# Ethernet support
@@ -213,7 +213,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -288,13 +280,10 @@
+@@ -289,13 +281,10 @@
  device		ugen		# Generic
  device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
@@ -227,7 +227,7 @@
  # USB Serial devices
  device		ucom		# Generic com ttys
  device		uark		# Technologies ARK3116 based serial adapters
-@@ -321,3 +310,11 @@
+@@ -322,3 +311,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/debian/patches/series	2009-04-21 07:20:40 UTC (rev 2475)
@@ -1,6 +1,3 @@
-000_ext2fs.diff
-000_kenv.diff
-000_ktimer.diff
 001_misc.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff

Modified: trunk/kfreebsd-7/fetch
===================================================================
--- trunk/kfreebsd-7/fetch	2009-04-19 13:51:30 UTC (rev 2474)
+++ trunk/kfreebsd-7/fetch	2009-04-21 07:20:40 UTC (rev 2475)
@@ -2,7 +2,8 @@
 set -ex
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_1_0_RELEASE
+#RELENG=RELENG_7_2_0_RELEASE
+RELENG=RELENG_7_2
 
 rm -rf src

More information about the Glibc-bsd-commits mailing list