[Glibc-bsd-commits] r3779 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/patches kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches
Robert Millan
rmh at alioth.debian.org
Thu Oct 27 19:48:26 UTC 2011
Author: rmh
Date: 2011-10-27 19:48:26 +0000 (Thu, 27 Oct 2011)
New Revision: 3779
Removed:
trunk/kfreebsd-10/debian/patches/907_cpu_class.diff
trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
trunk/kfreebsd-9/debian/patches/907_cpu_class.diff
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/series
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/series
Log:
Remove 907_cpu_class.diff (it breaks FreeBSD userland when running n a chroot on Debian kernel)
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-10/debian/changelog 2011-10-27 19:48:26 UTC (rev 3779)
@@ -6,13 +6,15 @@
* Fix panic on early boot. (Closes: #644417)
- Switch back to GCC 4.4.
- Turn optimization down to -O1 (901_disable_optimization_2.diff).
+ * Remove 907_cpu_class.diff (it breaks FreeBSD userland when running
+ in a chroot on Debian kernel).
[ Petr Salinger ]
* Drop 103_stat_pipe.diff, fixed upstream.
* Add 918_unix_socket_overflow.diff, to fix up breakage in our userland
after 000_unix_socket_overflow.diff. Closes: #645527.
- -- Robert Millan <rmh at debian.org> Sun, 16 Oct 2011 13:29:14 +0200
+ -- Robert Millan <rmh at debian.org> Thu, 27 Oct 2011 21:47:21 +0200
kfreebsd-10 (10.0~svn226224-1) experimental; urgency=low
Deleted: trunk/kfreebsd-10/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/907_cpu_class.diff 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-10/debian/patches/907_cpu_class.diff 2011-10-27 19:48:26 UTC (rev 3779)
@@ -1,40 +0,0 @@
-
-Status: Rejected in upstream (kern/77355).
-
---- a/sys/i386/i386/identcpu.c
-+++ b/sys/i386/i386/identcpu.c
-@@ -647,6 +647,7 @@
- #if defined(I486_CPU)
- case CPUCLASS_486:
- printf("486");
-+ machine[1] = '4';
- break;
- #endif
- #if defined(I586_CPU)
-@@ -658,6 +659,7 @@
- (u_int)((tsc_freq + 4999) / 10000) % 100);
- }
- printf("586");
-+ machine[1] = '5';
- break;
- #endif
- #if defined(I686_CPU)
-@@ -669,6 +671,7 @@
- (u_int)((tsc_freq + 4999) / 10000) % 100);
- }
- printf("686");
-+ machine[1] = '6';
- break;
- #endif
- default:
---- a/sys/amd64/amd64/identcpu.c
-+++ b/sys/amd64/amd64/identcpu.c
-@@ -85,7 +85,7 @@
- sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
- {
- #ifdef SCTL_MASK32
-- static const char machine32[] = "i386";
-+ static const char machine32[] = "i686";
- #endif
- int error;
-
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-10/debian/patches/series 2011-10-27 19:48:26 UTC (rev 3779)
@@ -16,7 +16,6 @@
903_disable_non-free_drivers.diff
904_dev_full.diff
906_grow_sysv_ipc_limits.diff
-907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
913_uudecode.diff
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-8/debian/changelog 2011-10-27 19:48:26 UTC (rev 3779)
@@ -8,8 +8,10 @@
* Fix panic on early boot. (Closes: #644417)
- Switch back to GCC 4.4.
- Turn optimization down to -O1 (901_disable_optimization_2.diff).
+ * Remove 907_cpu_class.diff (it breaks FreeBSD userland when running
+ in a chroot on Debian kernel).
- -- Robert Millan <rmh at debian.org> Thu, 27 Oct 2011 21:41:37 +0200
+ -- Robert Millan <rmh at debian.org> Thu, 27 Oct 2011 21:46:25 +0200
kfreebsd-8 (8.2-10) unstable; urgency=low
Deleted: trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/907_cpu_class.diff 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-8/debian/patches/907_cpu_class.diff 2011-10-27 19:48:26 UTC (rev 3779)
@@ -1,45 +0,0 @@
-
-Status: Rejected in upstream (kern/77355).
-
----
- sys/amd64/amd64/identcpu.c | 2 +-
- sys/i386/i386/identcpu.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
---- a/sys/i386/i386/identcpu.c
-+++ b/sys/i386/i386/identcpu.c
-@@ -634,6 +634,7 @@
- #if defined(I486_CPU)
- case CPUCLASS_486:
- printf("486");
-+ machine[1] = '4';
- break;
- #endif
- #if defined(I586_CPU)
-@@ -643,6 +644,7 @@
- (intmax_t)(tsc_freq + 4999) / 1000000,
- (u_int)((tsc_freq + 4999) / 10000) % 100);
- printf("586");
-+ machine[1] = '5';
- break;
- #endif
- #if defined(I686_CPU)
-@@ -652,6 +654,7 @@
- (intmax_t)(tsc_freq + 4999) / 1000000,
- (u_int)((tsc_freq + 4999) / 10000) % 100);
- printf("686");
-+ machine[1] = '6';
- break;
- #endif
- default:
---- a/sys/amd64/amd64/identcpu.c
-+++ b/sys/amd64/amd64/identcpu.c
-@@ -85,7 +85,7 @@
- sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
- {
- #ifdef SCTL_MASK32
-- static const char machine32[] = "i386";
-+ static const char machine32[] = "i686";
- #endif
- int error;
-
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-8/debian/patches/series 2011-10-27 19:48:26 UTC (rev 3779)
@@ -29,7 +29,6 @@
903_disable_non-free_drivers.diff
904_dev_full.diff
906_grow_sysv_ipc_limits.diff
-907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
912_binutils.diff
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-9/debian/changelog 2011-10-27 19:48:26 UTC (rev 3779)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0~svn226626-2) UNRELEASED; urgency=low
+
+ * Remove 907_cpu_class.diff (it breaks FreeBSD userland when running
+ in a chroot on Debian kernel).
+
+ -- Robert Millan <rmh at debian.org> Thu, 27 Oct 2011 21:46:50 +0200
+
kfreebsd-9 (9.0~svn226626-1) experimental; urgency=low
* New upstream snapshot.
Deleted: trunk/kfreebsd-9/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/907_cpu_class.diff 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-9/debian/patches/907_cpu_class.diff 2011-10-27 19:48:26 UTC (rev 3779)
@@ -1,40 +0,0 @@
-
-Status: Rejected in upstream (kern/77355).
-
---- a/sys/i386/i386/identcpu.c
-+++ b/sys/i386/i386/identcpu.c
-@@ -647,6 +647,7 @@
- #if defined(I486_CPU)
- case CPUCLASS_486:
- printf("486");
-+ machine[1] = '4';
- break;
- #endif
- #if defined(I586_CPU)
-@@ -658,6 +659,7 @@
- (u_int)((tsc_freq + 4999) / 10000) % 100);
- }
- printf("586");
-+ machine[1] = '5';
- break;
- #endif
- #if defined(I686_CPU)
-@@ -669,6 +671,7 @@
- (u_int)((tsc_freq + 4999) / 10000) % 100);
- }
- printf("686");
-+ machine[1] = '6';
- break;
- #endif
- default:
---- a/sys/amd64/amd64/identcpu.c
-+++ b/sys/amd64/amd64/identcpu.c
-@@ -85,7 +85,7 @@
- sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
- {
- #ifdef SCTL_MASK32
-- static const char machine32[] = "i386";
-+ static const char machine32[] = "i686";
- #endif
- int error;
-
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2011-10-27 19:43:16 UTC (rev 3778)
+++ trunk/kfreebsd-9/debian/patches/series 2011-10-27 19:48:26 UTC (rev 3779)
@@ -16,7 +16,6 @@
903_disable_non-free_drivers.diff
904_dev_full.diff
906_grow_sysv_ipc_limits.diff
-907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
913_uudecode.diff
More information about the Glibc-bsd-commits
mailing list