[Glibc-bsd-commits] r4175 - in trunk/kfreebsd-10/debian: . arch/mipsel patches
Robert Millan
rmh at alioth.debian.org
Wed Apr 4 23:08:55 UTC 2012
Author: rmh
Date: 2012-04-04 23:08:55 +0000 (Wed, 04 Apr 2012)
New Revision: 4175
Removed:
trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff
Modified:
trunk/kfreebsd-10/debian/arch/mipsel/malta.config
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/001_misc.diff
trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-10/debian/patches/004_xargs.diff
trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff
trunk/kfreebsd-10/debian/patches/914_psm.diff
trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-10/debian/patches/999_config.diff
trunk/kfreebsd-10/debian/patches/series
Log:
New upstream snapshot
Modified: trunk/kfreebsd-10/debian/arch/mipsel/malta.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/mipsel/malta.config 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/arch/mipsel/malta.config 2012-04-04 23:08:55 UTC (rev 4175)
@@ -3,6 +3,7 @@
include MALTA
makeoptions ARCH_FLAGS="-march=mips32 -mabi=32 -D__mips_o32"
+makeoptions WITHOUT_KERNEL_TRAMPOLINE=1
options CPU_HAVEFPU
options EXT2FS
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/changelog 2012-04-04 23:08:55 UTC (rev 4175)
@@ -1,5 +1,8 @@
-kfreebsd-10 (10.0~svn232747-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn233872-1) experimental; urgency=low
+ * New upstream snapshot.
+
+ [ Robert Millan ]
* Set -DWITHOUT_KERNEL_SYMBOLS MK knob to make lintian happy.
* Replace 950_no_stack_protector.diff with -DWITHOUT_SSP build knob.
* Misc adjustments to make it possible to build with Clang (if enabled
Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -23,12 +23,12 @@
-Wmissing-include-dirs -fdiagnostics-show-option \
${CWARNEXTRA}
#
-@@ -51,7 +58,7 @@
+@@ -52,7 +59,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
-+CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2 -mno-sse
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
++CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2
.else
CFLAGS+= -mno-aes -mno-avx
.endif
Modified: trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -25,12 +25,11 @@
# Correct path for kernel builds
# Don't rely on the kernel's .depend file
-@@ -24,8 +29,15 @@
+@@ -24,8 +29,14 @@
DEPENDFILE= .depend_aicasm
.endif
-+LIBBSD_CFLAGS!= pkg-config --cflags libbsd-overlay
-+CFLAGS+= ${LIBBSD_CFLAGS}
++CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
+
+# This would discard implicit include flags in upstream GCC
+.if ${OPSYS} == "FreeBSD"
@@ -41,25 +40,3 @@
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
---- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-@@ -1529,7 +1529,7 @@
- }
-
- static void
--add_macro_arg(const char *argtext, int argnum __unused)
-+add_macro_arg(const char *argtext, int argnum)
- {
- struct macro_arg *marg;
- int retval;
---- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-@@ -44,7 +44,7 @@
-
- #include <sys/types.h>
- #include <sys/param.h>
--#ifdef BSD
-+#if defined(BSD) && !defined(__GNU__)
- #include <db.h>
- #else
- #include <db_185.h>
Modified: trunk/kfreebsd-10/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/004_xargs.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -30,3 +30,19 @@
# canonify include paths
for H in ${src_headers}; do
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -168,12 +168,9 @@
+ rm -f .newdep
+ ${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
+ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
+- ${MAKE} -V CFILES_ZFS | \
+- MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS}
++ # GNU xargs behaves differently when given a single newline character.
+ ${MAKE} -V SFILES_NOZFS | \
+ MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
+- ${MAKE} -V SFILES_ZFS | \
+- MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ZFS_ASM_CFLAGS}
+ rm -f .depend
+ mv .newdep .depend
+
Modified: trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -1,6 +1,6 @@
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
-@@ -59,6 +59,9 @@
+@@ -51,6 +51,9 @@
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
Deleted: trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -1,11 +0,0 @@
---- a/sys/conf/Makefile.mips
-+++ b/sys/conf/Makefile.mips
-@@ -63,7 +63,7 @@
- # XXX hardcoded kernel entry point
- ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
-
--KERNEL_EXTRA=trampoline
-+#KERNEL_EXTRA=trampoline
- trampoline: ${KERNEL_KO}.tramp.bin
- ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \
- $S/$M/$M/inckern.S
Modified: trunk/kfreebsd-10/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/914_psm.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/914_psm.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -26,7 +26,7 @@
};
static devclass_t psm_devclass;
-@@ -1518,7 +1514,6 @@
+@@ -1515,7 +1511,6 @@
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -34,7 +34,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1660,12 +1655,6 @@
+@@ -1657,12 +1652,6 @@
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -47,7 +47,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2227,15 +2216,6 @@
+@@ -2224,15 +2213,6 @@
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +63,7 @@
default:
return (ENOTTY);
}
-@@ -3502,9 +3482,6 @@
+@@ -3499,9 +3479,6 @@
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -161,8 +161,6 @@
+@@ -163,8 +163,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -14,9 +14,9 @@
.if !defined(DEBUG)
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -136,7 +136,7 @@
- NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
- ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
+@@ -142,7 +142,7 @@
+ ZFS_C= ${CC} -c ${ZFS_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
+ ZFS_S= ${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC}
-.if ${MK_CTF} != "no"
+.if 0
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-04-04 23:08:55 UTC (rev 4175)
@@ -46,32 +46,17 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -289,11 +284,8 @@
+@@ -292,10 +287,7 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
- 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.
-@@ -320,13 +312,6 @@
- device dcons # Dumb console driver
- device dcons_crom # Configuration ROM for dcons
-
--# Sound support
--device sound # Generic sound driver (required)
--device snd_es137x # Ensoniq AudioPCI ES137x
--device snd_hda # Intel High Definition Audio
--device snd_ich # Intel, NVidia and other ICH AC'97 Audio
--device snd_via8233 # VIA VT8233x Audio
--
- # MMC/SD
- device mmc # MMC/SD bus
- device mmcsd # MMC/SD memory card
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -18,12 +18,14 @@
@@ -133,32 +118,17 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -302,11 +299,8 @@
+@@ -305,10 +302,7 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
- 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.
-@@ -333,13 +327,6 @@
- device dcons # Dumb console driver
- device dcons_crom # Configuration ROM for dcons
-
--# Sound support
--device sound # Generic sound driver (required)
--device snd_es137x # Ensoniq AudioPCI ES137x
--device snd_hda # Intel High Definition Audio
--device snd_ich # Intel, NVidia and other ICH AC'97 Audio
--device snd_via8233 # VIA VT8233x Audio
--
- # MMC/SD
- device mmc # MMC/SD bus
- device mmcsd # MMC/SD memory card
--- /dev/null
+++ b/sys/conf/DEBIAN
@@ -0,0 +1,48 @@
@@ -193,7 +163,7 @@
+nooption INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+nooption WITNESS # Enable checks to detect deadlocks and cycles
+nooption WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-+nooption MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
++nooption MALLOC_DEBUG_MAXZONES # Separate malloc(9) zones
+
+# Usually when full debugger is enabled, minimum debugger support is disabled.
+# Bring it back:
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2012-04-04 21:51:14 UTC (rev 4174)
+++ trunk/kfreebsd-10/debian/patches/series 2012-04-04 23:08:55 UTC (rev 4175)
@@ -5,13 +5,12 @@
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
-006_mips_i8259_alloc.diff
+#006_mips_i8259_alloc.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
101_nullfs_vsock.diff
107_mount_update.diff
109_linprocfs_non_x86.diff
-110_disable_trampoline_flavour.diff
# Patches that are likely to be Debian-specific
901_disable_optimization_2.diff
More information about the Glibc-bsd-commits
mailing list