r1253 - trunk/kfreebsd-6/debian/patches
Author: rmh
Date: 2006-02-27 09:27:58 +0000 (Mon, 27 Feb 2006)
New Revision: 1253
Modified:
trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff
Log:
Add missing amd64-specific hunks of patches that modified i386 files.
Modified: trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2006-02-27 07:18:50 UTC (rev 1252)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2006-02-27 09:27:58 UTC (rev 1253)
@@ -205,3 +205,78 @@
_safe= safe
_scsi_low= scsi_low
_smbfs= smbfs
+diff -ur sys.old/amd64/conf/GENERIC sys/amd64/conf/GENERIC
+--- sys.old/amd64/conf/GENERIC 2006-02-27 10:04:33.000000000 +0100
++++ sys/amd64/conf/GENERIC 2006-02-27 09:57:22.000000000 +0100
+@@ -117,7 +117,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 iir # Intel Integrated RAID
+ device ips # IBM (Adaptec) ServeRAID
+ device mly # Mylex AcceleRAID/eXtremeRAID
+@@ -184,7 +183,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
+diff -ur sys.old/conf/files.amd64 sys/conf/files.amd64
+--- sys.old/conf/files.amd64 2006-02-27 10:04:53.000000000 +0100
++++ sys/conf/files.amd64 2006-02-27 09:56:50.000000000 +0100
+@@ -47,32 +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
+-#
+ amd64/acpica/OsdEnvironment.c optional acpi
+ amd64/acpica/acpi_machdep.c optional acpi
+ amd64/acpica/acpi_wakeup.c optional acpi
+@@ -156,11 +130,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/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
+@@ -168,7 +137,6 @@
+ dev/kbd/kbd.c optional sc
+ dev/kbd/kbd.c optional ukbd
+ dev/mem/memutil.c optional mem
+-dev/nve/if_nve.c optional nve pci
+ dev/ppc/ppc.c optional ppc
+ dev/ppc/ppc_puc.c optional ppc puc
+ dev/sio/sio.c optional sio
Modified: trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff 2006-02-27 07:18:50 UTC (rev 1252)
+++ trunk/kfreebsd-6/debian/patches/906_grow_sysv_ipc_limits.diff 2006-02-27 09:27:58 UTC (rev 1253)
@@ -39,3 +39,20 @@
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
+--- sys.old/amd64/conf/GENERIC 2006-02-27 10:18:19.000000000 +0100
++++ sys/amd64/conf/GENERIC 2006-02-27 10:18:57.000000000 +0100
+@@ -54,8 +54,14 @@
+ options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+ options KTRACE # ktrace(1) support
+ options SYSVSHM # SYSV-style shared memory
++options SHMMAXPGS=4096
++options SHMSEG=256
+ options SYSVMSG # SYSV-style message queues
+ options SYSVSEM # SYSV-style semaphores
++options SEMMNI=256
++options SEMMNS=512
++options SEMMNU=256
++options SEMMAP=256
+ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
+ options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
Modified: trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff 2006-02-27 07:18:50 UTC (rev 1252)
+++ trunk/kfreebsd-6/debian/patches/910_GENERIC_hints.diff 2006-02-27 09:27:58 UTC (rev 1253)
@@ -8,3 +8,13 @@
hint.vga.0.at="isa"
hint.sc.0.at="isa"
hint.sc.0.flags="0x100"
+--- sys.old/amd64/conf/GENERIC.hints 2006-02-27 10:04:33.000000000 +0100
++++ sys/amd64/conf/GENERIC.hints 2006-02-27 10:19:52.000000000 +0100
+@@ -14,6 +14,7 @@
+ hint.atkbd.0.flags="0x1"
+ hint.psm.0.at="atkbdc"
+ hint.psm.0.irq="12"
++hint.psm.0.flags="0x100"
+ hint.vga.0.at="isa"
+ hint.sc.0.at="isa"
+ hint.sc.0.flags="0x100"
Modified: trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff 2006-02-27 07:18:50 UTC (rev 1252)
+++ trunk/kfreebsd-6/debian/patches/910_disable_hwpmc.diff 2006-02-27 09:27:58 UTC (rev 1253)
@@ -36,3 +36,15 @@
${_i2c} \
${_ibcs2} \
${_ichwd} \
+--- sys/conf/files.amd64~ 2006-02-27 09:56:50.000000000 +0100
++++ sys/conf/files.amd64 2006-02-27 10:21:10.000000000 +0100
+@@ -130,9 +130,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
Reply to: