[Glibc-bsd-commits] r4018 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jan 28 19:11:14 UTC 2012
Author: rmh
Date: 2012-01-28 19:11:13 +0000 (Sat, 28 Jan 2012)
New Revision: 4018
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/000_v4l.diff
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/rules
Log:
Don't remove osreldate.h as it is needed by Glibc, generate it dynamically instead.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-28 18:54:30 UTC (rev 4017)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-28 19:11:13 UTC (rev 4018)
@@ -1,6 +1,6 @@
kfreebsd-kernel-headers (0.70) UNRELEASED; urgency=low
- * Remove <osreldate.h> (not a kernel header).
+ * Generate osreldate.h dynamically with up-to-date information.
* Add sys/syscall.h.
-- Robert Millan <rmh at debian.org> Sat, 28 Jan 2012 19:54:25 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2012-01-28 18:54:30 UTC (rev 4017)
+++ trunk/kfreebsd-kernel-headers/debian/install 2012-01-28 19:11:13 UTC (rev 4018)
@@ -310,5 +310,10 @@
# FIXME: kFreeBSD >= 9 provides its own version in sys/compat/linux/,
# however upstream doesn't use them. For now they prefer the ones
# from v4l_compat port (and yes, they're installed in linux dir).
-linux/videodev.h usr/include/linux
-linux/videodev2.h usr/include/linux
+misc/videodev.h usr/include/linux
+misc/videodev2.h usr/include/linux
+
+# FIXME: FreeBSD osreldate.h is not a kernel header. We're currently
+# abusing this path for __FreeBSD_kernel_version definition (needed
+# by glibc).
+misc/osreldate.h usr/include
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_v4l.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_v4l.diff 2012-01-28 18:54:30 UTC (rev 4017)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_v4l.diff 2012-01-28 19:11:13 UTC (rev 4018)
@@ -2,7 +2,7 @@
Stolen from v4l_compat FreeBSD port (2011-11-03)
--- /dev/null
-+++ b/linux/videodev.h
++++ b/misc/videodev.h
@@ -0,0 +1,340 @@
+/*
+ * Video for Linux version 1 - OBSOLETE
@@ -345,7 +345,7 @@
+ * End:
+ */
--- /dev/null
-+++ b/linux/videodev2.h
++++ b/misc/videodev2.h
@@ -0,0 +1,1843 @@
+/*
+ * Video for Linux Two header file
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2012-01-28 18:54:30 UTC (rev 4017)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2012-01-28 19:11:13 UTC (rev 4018)
@@ -51,8 +51,8 @@
#include <sys/endian.h>
/*
---- a/linux/videodev.h
-+++ b/linux/videodev.h
+--- a/misc/videodev.h
++++ b/misc/videodev.h
@@ -12,6 +12,7 @@
#ifndef __LINUX_VIDEODEV_H
#define __LINUX_VIDEODEV_H
@@ -61,8 +61,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <linux/videodev2.h>
---- a/linux/videodev2.h
-+++ b/linux/videodev2.h
+--- a/misc/videodev2.h
++++ b/misc/videodev2.h
@@ -56,6 +56,7 @@
#ifndef __LINUX_VIDEODEV2_H
#define __LINUX_VIDEODEV2_H
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2012-01-28 18:54:30 UTC (rev 4017)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2012-01-28 19:11:13 UTC (rev 4018)
@@ -24,7 +24,7 @@
dh_testroot
rm -rf .pc
rm -f *-stamp
- rm -rf sys usr.sbin linux
+ rm -rf sys usr.sbin misc
dh_clean
.PHONY: clean
@@ -36,6 +36,7 @@
dh_testdir
tar xfJ $(SRC_TAR) --wildcards --strip-components=1 "*.h"
+ mkdir -p misc
set -e ; \
fbsd_version=$$(sed sys/sys/param.h -ne "s/^#\s*define\s\+__FreeBSD_version\s\+\([0-9]*\)\s.*/\1/p") ; \
@@ -59,7 +60,8 @@
-e 's/defined\s*(\s*_SYS_CDEFS_H_\s*)/defined(_SYS_CDEFS_H)/g' \
-e 's/#\s*ifdef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifdef _SYS_CDEFS_H/g' \
-e 's/#\s*ifndef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifndef _SYS_CDEFS_H/g' \
- ; done)
+ ; done) ; \
+ echo "#define __FreeBSD_kernel_version $$fbsd_version" > misc/osreldate.h
QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2
More information about the Glibc-bsd-commits
mailing list