[Glibc-bsd-commits] r4993 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-10-03 19:42:27 +0000 (Thu, 03 Oct 2013)
New Revision: 4993

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/sys_kern_backward_compat.diff
   trunk/kfreebsd-kernel-headers/debian/preinst
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/links
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Use stub headers for sys/kern rename instead of symlink. (Closes: #725273)

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-10-02 23:46:00 UTC (rev 4992)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-10-03 19:42:27 UTC (rev 4993)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (9.2~4) unstable; urgency=low
+
+  * Use stub headers for sys/kern rename instead of symlink.
+    (Closes: #725273)
+
+ -- Robert Millan <rmh at debian.org>  Thu, 03 Oct 2013 19:57:08 +0200
+
 kfreebsd-kernel-headers (9.2~3) unstable; urgency=low
 
   * Remove 026_acpiio.diff (redundant).

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2013-10-02 23:46:00 UTC (rev 4992)
+++ trunk/kfreebsd-kernel-headers/debian/install	2013-10-03 19:42:27 UTC (rev 4993)
@@ -331,3 +331,9 @@
 # abusing this path for __FreeBSD_kernel_version definition (needed
 # by glibc).
 misc/osreldate.h			usr/include
+
+# For backward compatibility with kern -> kglue transition
+misc/kern/param.h			usr/include/sys/kern
+misc/kern/queue.h			usr/include/sys/kern
+misc/kern/time.h			usr/include/sys/kern
+misc/kern/types.h			usr/include/sys/kern

Modified: trunk/kfreebsd-kernel-headers/debian/links
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/links	2013-10-02 23:46:00 UTC (rev 4992)
+++ trunk/kfreebsd-kernel-headers/debian/links	2013-10-03 19:42:27 UTC (rev 4993)
@@ -1,3 +1,2 @@
 usr/include/opencrypto			usr/include/crypto
 usr/include/fs/cd9660			usr/include/isofs/cd9660
-usr/include/sys/kglue/sys		usr/include/sys/kern

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2013-10-02 23:46:00 UTC (rev 4992)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2013-10-03 19:42:27 UTC (rev 4993)
@@ -38,3 +38,4 @@
 queue_collision.diff
 sys_socket.diff
 signal_collision.diff
+sys_kern_backward_compat.diff

Added: trunk/kfreebsd-kernel-headers/debian/patches/sys_kern_backward_compat.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/sys_kern_backward_compat.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/sys_kern_backward_compat.diff	2013-10-03 19:42:27 UTC (rev 4993)
@@ -0,0 +1,16 @@
+--- /dev/null
++++ b/misc/kern/param.h
+@@ -0,0 +1 @@
++#include <sys/kglue/sys/param.h>
+--- /dev/null
++++ b/misc/kern/queue.h
+@@ -0,0 +1 @@
++#include <sys/kglue/sys/queue.h>
+--- /dev/null
++++ b/misc/kern/time.h
+@@ -0,0 +1 @@
++#include <sys/kglue/sys/time.h>
+--- /dev/null
++++ b/misc/kern/types.h
+@@ -0,0 +1 @@
++#include <sys/kglue/sys/types.h>

Added: trunk/kfreebsd-kernel-headers/debian/preinst
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/preinst	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/preinst	2013-10-03 19:42:27 UTC (rev 4993)
@@ -0,0 +1,39 @@
+#!/bin/sh
+# preinst script
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+
+case "$1" in
+    install|upgrade)
+        if test -L /usr/include/sys/kern ; then
+          rm -f /usr/include/sys/kern
+        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0