uudecode in freebsd-buildutils + kfreebsd-head or -8 packaging
Hi.
I tried to build the FreeBSD HEAD kernel using the [debian kfreebsd-7]
package (as described at [kfreebsd svn build]).
I managed to start building it (using the svn diff attached), but it
stops building saying:
##### ... #####
ld -d -warn-common -r -d -o if_iwn.kld if_iwn.o
:> export_syms
awk -f [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules/iwn/../../conf/kmod_syms.awk
if_iwn.kld export_syms | xargs -I% objcopy % if_iwn.kld
gen-ld-u-options if_iwn.kld > if_iwn.lopt
ld -Bshareable -d -warn-common -o if_iwn.ko if_iwn.kld "@if_iwn.lopt"
objcopy --strip-debug if_iwn.ko
===> iwnfw (all)
uudecode -p [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules/iwnfw/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu
> iwlwifi-4965-4.44.17.fw
uudecode: invalid option -- p
Try `uudecode --help' for more information.
*** Error code 1
Stop in [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules/iwnfw.
*** Error code 1
Stop in [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules.
*** Error code 1
Stop in [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/i386/compile/DEBCUSTOM.
make: *** [build-flavor-486-stamp] Error 1
dpkg-buildpackage: failure: debian/rules build gave error exit status 2
##### END #####
It looks like FreeBSD HEAD needs the "p" option of the command
"uudecode", that is not present in GNU sharutils version.
Can you please consider including [freebsd 7.1.0 uudecode] (it seems
the same that is in FreeBSD HEAD) in [debian freebsd-buildutils]?
Are you also planning a kfreebsd-8 or kfreebsd-head package?
If so, will it be only svn or also periodically built and uploaded to
experimental?
Thanks,
Luca Favatella
[debian kfreebsd-7]
http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-7/
[kfreebsd svn build]
http://lists.debian.org/debian-bsd/2008/12/msg00011.html
[freebsd 7.1.0 uudecode]
http://svn.freebsd.org/viewvc/base/release/7.1.0/usr.bin/uudecode/uudecode.c?revision=186660&view=markup
[debian freebsd-buildutils]
http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/fetch?op=file&rev=0&sc=0
Index: debian/patches/999_config.diff
===================================================================
--- debian/patches/999_config.diff (revision 2353)
+++ debian/patches/999_config.diff (working copy)
@@ -2,9 +2,9 @@
===================================================================
--- src.orig/sys/amd64/conf/GENERIC
+++ src/sys/amd64/conf/GENERIC
-@@ -18,13 +18,13 @@
+@@ -18,19 +18,19 @@
#
- # $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.518 2009/01/19 15:33:06 sobomax Exp $
-cpu HAMMER
-ident GENERIC
@@ -15,6 +15,12 @@
-#hints "GENERIC.hints" # Default places to look for devices.
+hints "GENERIC.hints" # Default places to look for devices.
+ # Use the following to compile in values accessible to the kernel
+ # through getenv() (or kenv(1) in userland). The format of the file
+ # is 'variable=value', see kenv(1)
+ #
+ # env "GENERIC.env"
+
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
@@ -29,10 +35,11 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,7 +55,7 @@
+@@ -53,8 +55,8 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+ options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-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
@@ -77,21 +84,19 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -252,13 +249,8 @@
+@@ -252,11 +249,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 pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
-device gif # IPv6 and IPv4 tunneling
-device faith # IPv6-to-IPv4 relaying (translation)
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -275,12 +267,9 @@
+@@ -275,13 +267,10 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -99,6 +104,7 @@
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
+ device rum # Ralink Technology RT2501USB wireless NICs
-device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
@@ -120,9 +126,9 @@
===================================================================
--- src.orig/sys/i386/conf/GENERIC
+++ src/sys/i386/conf/GENERIC
-@@ -18,15 +18,15 @@
+@@ -18,21 +18,21 @@
#
- # $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.507 2009/01/19 17:20:09 sam Exp $
-cpu I486_CPU
-cpu I586_CPU
@@ -137,6 +143,12 @@
-#hints "GENERIC.hints" # Default places to look for devices.
+hints "GENERIC.hints" # Default places to look for devices.
+ # Use the following to compile in values accessible to the kernel
+ # through getenv() (or kenv(1) in userland). The format of the file
+ # is 'variable=value', see kenv(1)
+ #
+ # env "GENERIC.env"
+
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
@@ -151,10 +163,11 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,7 +55,7 @@
+@@ -53,8 +55,8 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+ options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-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
@@ -199,21 +212,19 @@
# 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 @@
+@@ -265,11 +262,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 pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
-device gif # IPv6 and IPv4 tunneling
-device faith # IPv6-to-IPv4 relaying (translation)
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -288,13 +280,10 @@
+@@ -288,15 +280,12 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -222,10 +233,12 @@
device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
device rum # Ralink Technology RT2501USB wireless NICs
+ device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
device ucom # Generic com ttys
+ device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
@@ -321,3 +310,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 2353)
+++ debian/patches/series (working copy)
@@ -1,14 +1,10 @@
-000_ext2fs.diff
-001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
-005_binutils.diff
007_clone_signals.diff
008_config.diff
009_disable_duped_modules.diff
010_ET_DYN.diff
013_ip_packed.diff
-017_oss_compat.diff
020_linker.diff
101_subsecond_timestamp.diff
102_POLL_HUP.diff
@@ -19,7 +15,7 @@
907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
-911_no_werror.diff
912_binutils.diff
913_uudecode.diff
+950_command_line_options.diff
999_config.diff
Index: debian/patches/912_binutils.diff
===================================================================
--- debian/patches/912_binutils.diff (revision 2353)
+++ debian/patches/912_binutils.diff (working copy)
@@ -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 2004/05/29 01:09:00 tjr 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)
Index: debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- debian/patches/903_disable_non-free_drivers.diff (revision 2353)
+++ debian/patches/903_disable_non-free_drivers.diff (working copy)
@@ -1,71 +1,32 @@
-Index: src/sys/conf/files
-===================================================================
---- src.orig/sys/conf/files
-+++ src/sys/conf/files
-@@ -473,18 +473,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 \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
--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
Index: src/sys/conf/files.i386
===================================================================
--- src.orig/sys/conf/files.i386
+++ src/sys/conf/files.i386
-@@ -46,42 +46,6 @@
+@@ -46,26 +46,5 @@
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 "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" \
- no-implicit-rule
-#
--os+%DIKED-nve.h optional nve pci \
+-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
+-#
-hptrr_lib.o optional hptrr \
- dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
- compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
- no-implicit-rule
-#
--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
--#
- #
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
@@ -181,14 +145,6 @@
@@ -91,20 +52,6 @@
dev/nvram/nvram.c optional nvram isa
dev/pcf/pcf_isa.c optional pcf
dev/random/nehemiah.c optional random
-Index: src/sys/conf/kern.pre.mk
-===================================================================
---- src.orig/sys/conf/kern.pre.mk
-+++ src/sys/conf/kern.pre.mk
-@@ -67,9 +67,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 the NgATM stuff
- INCLUDES+= -I$S/contrib/ngatm
-
Index: src/sys/i386/conf/GENERIC
===================================================================
--- src.orig/sys/i386/conf/GENERIC
@@ -118,32 +65,10 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -252,9 +250,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)
--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.
Index: src/sys/modules/Makefile
===================================================================
--- src.orig/sys/modules/Makefile
+++ src/sys/modules/Makefile
-@@ -26,11 +26,6 @@
- ${_arl} \
- ${_asr} \
- ata \
-- ${_ath} \
-- ${_ath_hal} \
-- ${_ath_rate_amrr} \
-- ${_ath_rate_onoe} \
-- ${_ath_rate_sample} \
- aue \
- ${_auxio} \
- ${_awi} \
@@ -100,8 +95,6 @@
hifn \
hme \
@@ -153,15 +78,15 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -200,11 +193,8 @@
+@@ -200,11 +193,9 @@
ntfs_iconv \
- ${_nxge} \
nullfs \
- ${_nve} \
${_nvram} \
${_nwfs} \
-- ${_oltr} \
+ ${_nxge} \
- ${_opensolaris} \
+ ohci \
${_padlock} \
patm \
${_pccard} \
@@ -173,29 +98,15 @@
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 @@
+@@ -422,8 +406,5 @@
.if ${MK_NCP} != "no"
_nwfs= nwfs
.endif
--_oltr= oltr
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
_pccard= pccard
_pcfclock= pcfclock
- _pecoff= pecoff
@@ -447,9 +427,6 @@
_tmpfs= tmpfs
_wi= wi
@@ -223,18 +134,6 @@
_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 @@
_exca= exca
_ext2fs= ext2fs
@@ -254,9 +153,9 @@
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
- _pccard= pccard
- _rdma= rdma
- _safe= safe
+ .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
+ .if exists(${.CURDIR}/../crypto/via)
+ _padlock= padlock
@@ -573,9 +536,6 @@
_wi= wi
_wpi= wpi
@@ -267,29 +166,6 @@
.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
@@ -303,38 +179,18 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -240,9 +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)
--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.
Index: src/sys/conf/files.amd64
===================================================================
--- src.orig/sys/conf/files.amd64
+++ src/sys/conf/files.amd64
-@@ -47,37 +47,6 @@
+@@ -47,26 +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" \
-- no-implicit-rule
+- no-implicit-rule
-#
-os+%DIKED-nve.h optional nve pci \
- dependency "$S/contrib/dev/nve/os.h" \
@@ -346,16 +202,15 @@
- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
- no-implicit-rule
--#
-hptrr_lib.o optional hptrr \
- dependency "$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
- compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
- no-implicit-rule
-#
- #
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -176,14 +145,6 @@
+ amd64/acpica/acpi_wakeup.c optional acpi
+@@ -173,14 +153,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 +225,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 @@
+@@ -191,7 +163,6 @@
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
Index: debian/patches/950_command_line_options.diff
===================================================================
--- debian/patches/950_command_line_options.diff (revision 0)
+++ debian/patches/950_command_line_options.diff (revision 0)
@@ -0,0 +1,22 @@
+Index: src/sys/conf/kern.mk
+===================================================================
+--- src.orig/sys/conf/kern.mk
++++ src/sys/conf/kern.mk
+@@ -12,7 +12,7 @@
+ .else
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
++ ${_wundef} ${_Wno_pointer_sign}
+ .if !defined(WITH_GCC3)
+ _Wno_pointer_sign=-Wno-pointer-sign
+ .endif
+@@ -36,7 +36,7 @@
+ # 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
+ INLINE_LIMIT?= 8000
+ .endif
Index: debian/copyright
===================================================================
--- debian/copyright (revision 2353)
+++ debian/copyright (working copy)
@@ -41,7 +41,6 @@
(and disabled in the build system):
src/sys/compat/opensolaris
-src/sys/contrib/dev/ath
src/sys/contrib/dev/nve
src/sys/contrib/dev/oltr
src/sys/contrib/opensolaris
@@ -52,10 +51,7 @@
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/dev/ath
src/sys/dev/nve
-src/sys/modules/ath
-src/sys/modules/ath_hal
src/sys/modules/hptmv
src/sys/modules/hptrr
src/sys/modules/nve
Index: fetch
===================================================================
--- fetch (revision 2353)
+++ fetch (working copy)
@@ -2,7 +2,7 @@
set -ex
ANONCVS=anoncvs@anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_1_0_RELEASE
+RELENG=HEAD
rm -rf src
Reply to: