[Glibc-bsd-commits] r5155 - in trunk/kfreebsd-11/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Thu Nov 28 15:27:40 UTC 2013
Author: rmh
Date: 2013-11-23 16:22:26 +0000 (So, 23 lis 2013)
New Revision: 5155
Removed:
trunk/kfreebsd-11/debian/patches/003_glibc_dev_aicasm.diff
Modified:
trunk/kfreebsd-11/debian/changelog
trunk/kfreebsd-11/debian/control.in
trunk/kfreebsd-11/debian/patches/902_version.diff
trunk/kfreebsd-11/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff
trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff
trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff
trunk/kfreebsd-11/debian/patches/series
trunk/kfreebsd-11/debian/patches/userland.diff
Log:
* New upstream snapshot.
- Refresh all patches.
- Upstream moved aicasm off the kernel build process. Follow them and
aicasm from freebsd-buildutils (>= 10~svn258496-1~).
- r258281: Fix siginfo_t.si_status for wait6/waitid/SIGCHLD.
(Closes: #729698)
Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/changelog 2013-11-23 16:22:26 UTC (rev 5155)
@@ -1,5 +1,12 @@
-kfreebsd-11 (11.0~svn256281-2) UNRELEASED; urgency=low
+kfreebsd-11 (11.0~svn258494-1) experimental; urgency=low
+ * New upstream snapshot.
+ - Refresh all patches.
+ - Upstream moved aicasm off the kernel build process. Follow them and
+ aicasm from freebsd-buildutils (>= 10~svn258496-1~).
+ - r258281: Fix siginfo_t.si_status for wait6/waitid/SIGCHLD.
+ (Closes: #729698)
+
[ Robert Millan ]
* Remove (disabled) patch 006_mips_i8259_alloc.diff. Problem has been
fixed in upstream already.
@@ -10,7 +17,7 @@
[ Guillem Jover ]
* Remove myself from Uploaders.
- -- Robert Millan <rmh at debian.org> Sat, 02 Nov 2013 14:13:22 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 23 Nov 2013 13:24:23 +0100
kfreebsd-11 (11.0~svn256281-1) experimental; urgency=low
Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/control.in 2013-11-23 16:22:26 UTC (rev 5155)
@@ -6,11 +6,11 @@
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 10~svn253832),
+# for aicasm
+ freebsd-buildutils (>= 10~svn258496-1~),
freebsd-glue (>= 0.1.5),
byacc,
@cc_pkg@, libdb-dev,
- libbsd-dev (>= 0.3.0), pkg-config,
libsbuf-dev (>= 9.0+ds1-2),
kernel-wedge (>= 2.88) [kfreebsd-any],
Standards-Version: 3.9.2
Deleted: trunk/kfreebsd-11/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/003_glibc_dev_aicasm.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/003_glibc_dev_aicasm.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -1,23 +0,0 @@
-
-Partially sent to freebsd-hackers (2011-07-02)
-
---- a/sys/dev/aic7xxx/aicasm/Makefile
-+++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -16,6 +16,9 @@
- DPADD= ${LIBL}
- LDADD= -ll
- WARNS?= 5
-+NO_WERROR?= 1
-+LDADD+= -ldb -lbsd
-+CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
-
- # Correct path for kernel builds
- # Don't rely on the kernel's .depend file
-@@ -24,7 +27,6 @@
- DEPENDFILE= .depend_aicasm
- .endif
-
--CFLAGS+= -I.
- .ifdef MAKESRCPATH
- CFLAGS+= -I${MAKESRCPATH}
- .endif
Modified: trunk/kfreebsd-11/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/902_version.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/902_version.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -1,11 +1,12 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -189,7 +189,7 @@
- cat << EOF > vers.c
- $COPYRIGHT
- #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"
--#define VERSTR "${VERSION} #${v}${svn}${git}${p4version}: ${t}\\n ${u}@${h}:${d}\\n"
-+#define VERSTR "#${v} ${t}\\n"
+@@ -212,6 +212,9 @@
+ #define VERSTR "${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}\\n ${u}@${h}:${d}\\n"
#define RELSTR "${RELEASE}"
++#undef VERSTR
++#define VERSTR "#${v} ${t}\\n"
++
char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR;
+ char version[sizeof(VERSTR) > 256 ? sizeof(VERSTR) : 256] = VERSTR;
+ char compiler_version[] = "${compiler_v}";
Modified: trunk/kfreebsd-11/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/908_linprocfs_is_not_proc.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/908_linprocfs_is_not_proc.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -1,6 +1,6 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -356,10 +356,6 @@
+@@ -357,10 +357,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -1,6 +1,6 @@
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -396,7 +396,7 @@
+@@ -397,7 +397,7 @@
VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -9,7 +9,7 @@
VNET_DEFINE(int, ip6_no_radr) = 0;
VNET_DEFINE(int, ip6_norbit_raif) = 0;
VNET_DEFINE(int, ip6_rfc6204w3) = 0;
-@@ -412,7 +412,7 @@
+@@ -413,7 +413,7 @@
VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix
* walk list every 5 sec. */
VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */
Modified: trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -5,7 +5,7 @@
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -94,6 +94,8 @@
+@@ -95,6 +95,8 @@
.endif
WERROR?= -Werror
Modified: trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -13,7 +13,7 @@
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
-@@ -108,11 +108,7 @@
+@@ -115,11 +115,7 @@
#define SIGUSR1 30 /* user defined signal 1 */
#define SIGUSR2 31 /* user defined signal 2 */
#endif
@@ -26,7 +26,7 @@
#define SIGRTMIN 65
#define SIGRTMAX 126
-@@ -171,6 +167,8 @@
+@@ -178,6 +174,8 @@
void *_attribute; /* pthread_attr_t * */
} _sigev_thread;
unsigned short _kevent_flags;
Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/series 2013-11-23 16:22:26 UTC (rev 5155)
@@ -7,7 +7,6 @@
userland.diff
001_misc.diff
002_maxpathlen.diff
-003_glibc_dev_aicasm.diff
004_xargs.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff 2013-11-23 15:22:26 UTC (rev 5154)
+++ trunk/kfreebsd-11/debian/patches/userland.diff 2013-11-23 16:22:26 UTC (rev 5155)
@@ -347,7 +347,7 @@
/*
* __FreeBSD_version numbers are documented in the Porter's Handbook.
-@@ -95,11 +101,15 @@
+@@ -97,11 +103,15 @@
#include <sys/syslimits.h>
#define MAXCOMLEN 19 /* max command name remembered */
@@ -363,7 +363,7 @@
#define NOFILE OPEN_MAX /* max open files per process */
#define NOGROUP 65535 /* marker for empty group set member */
#define MAXHOSTNAMELEN 256 /* max hostname size */
-@@ -136,7 +146,9 @@
+@@ -138,7 +148,9 @@
#ifndef DEV_BSHIFT
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
#endif
@@ -373,7 +373,7 @@
#ifndef BLKDEV_IOSIZE
#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
-@@ -212,9 +224,11 @@
+@@ -214,9 +226,11 @@
#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */
#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock mutex */
@@ -385,7 +385,7 @@
#define NBPW sizeof(int) /* number of bytes per word (integer) */
#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
-@@ -260,6 +274,7 @@
+@@ -262,6 +276,7 @@
#define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 32
@@ -393,7 +393,7 @@
/* Bit map related macros. */
#define setbit(a,i) (((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
#define clrbit(a,i) (((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-@@ -267,6 +282,7 @@
+@@ -269,6 +284,7 @@
(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
#define isclr(a,i) \
((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
@@ -401,7 +401,7 @@
/* Macros for counting and rounding. */
#ifndef howmany
-@@ -275,9 +291,13 @@
+@@ -277,9 +293,13 @@
#define nitems(x) (sizeof((x)) / sizeof((x)[0]))
#define rounddown(x, y) (((x)/(y))*(y))
#define rounddown2(x, y) ((x)&(~((y)-1))) /* if y is power of two */
More information about the Glibc-bsd-commits
mailing list