[Glibc-bsd-commits] r1612 - trunk/kfreebsd-6/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-06-25 08:08:09 +0000 (Sun, 25 Jun 2006)
New Revision: 1612

Added:
   trunk/kfreebsd-6/debian/patches/911_hwpmc.diff
Removed:
   trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff
Log:
* re-enable hwpmc


Deleted: trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff	2006-06-24 18:12:41 UTC (rev 1611)
+++ trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff	2006-06-25 08:08:09 UTC (rev 1612)
@@ -1,58 +0,0 @@
-
-  Disabled because of FTBFS.  Needless to say, it should be eventualy reenabled.
-
-Index: sys/conf/files.i386
-===================================================================
---- sys/conf/files.i386.orig	2006-06-24 17:39:05.000000000 +0200
-+++ sys/conf/files.i386	2006-06-24 17:43:13.000000000 +0200
-@@ -157,11 +157,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
-Index: sys/conf/files
-===================================================================
---- sys/conf/files.orig	2006-06-24 17:39:05.000000000 +0200
-+++ sys/conf/files	2006-06-24 17:43:13.000000000 +0200
-@@ -590,8 +590,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
-Index: sys/modules/Makefile
-===================================================================
---- sys/modules/Makefile.orig	2006-06-24 17:40:30.000000000 +0200
-+++ sys/modules/Makefile	2006-06-24 17:43:13.000000000 +0200
-@@ -89,7 +89,6 @@
- 	${_hfa} \
- 	hifn \
- 	hme \
--	hwpmc \
- 	${_i2c} \
- 	${_ibcs2} \
- 	${_ichwd} \
-Index: sys/conf/files.amd64
-===================================================================
---- sys/conf/files.amd64.orig	2006-06-24 17:42:39.000000000 +0200
-+++ sys/conf/files.amd64	2006-06-24 17:43:13.000000000 +0200
-@@ -135,9 +135,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
- dev/kbd/kbd.c			optional	sc
- dev/kbd/kbd.c			optional	ukbd

Added: trunk/kfreebsd-6/debian/patches/911_hwpmc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/911_hwpmc.diff	2006-06-24 18:12:41 UTC (rev 1611)
+++ trunk/kfreebsd-6/debian/patches/911_hwpmc.diff	2006-06-25 08:08:09 UTC (rev 1612)
@@ -0,0 +1,14 @@
+
+
+Index: sys/modules/hwpmc/Makefile
+===================================================================
+--- sys/modules/hwpmc/Makefile.orig	2006-06-25 11:03:50.000000000 +0200
++++ sys/modules/hwpmc/Makefile	2006-06-25 11:04:06.000000000 +0200
+@@ -9,6 +9,7 @@
+ SRCS=	hwpmc_mod.c hwpmc_logging.c vnode_if.h
+ 
+ WARNS?=	2
++NO_WERROR?= 1
+ 
+ .if ${MACHINE_ARCH} == "alpha"
+ SRCS+=	hwpmc_alpha.c