rpms/kernel/FC-3 Makefile,1.23,1.24 kernel-2.6.spec,1.794,1.795
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 6 02:13:57 UTC 2005
- Previous message (by thread): rpms/gcc/devel gcc4-builtin-apply.patch, NONE, 1.1 gcc4-g++-struct-layout.patch, NONE, 1.1 gcc4-macrospace.patch, NONE, 1.1 .cvsignore, 1.80, 1.81 gcc4.spec, 1.24, 1.25 sources, 1.81, 1.82 gcc4-c++-pr20381.patch, 1.1, NONE gcc4-pr16104.patch, 1.2, NONE gcc4-pr19769-workaround.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/FC-3/configs config-generic, 1.3, 1.4 config-x86-generic, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv16796
Modified Files:
Makefile kernel-2.6.spec
Log Message:
disable slab, add requires
Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile 8 Jan 2005 07:56:35 -0000 1.23
+++ Makefile 6 Apr 2005 02:13:55 -0000 1.24
@@ -20,10 +20,10 @@
hammer: x86_64
debug:
- @perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-generic
- @perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-x86-generic
+ @perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' configs/config-generic
+ @perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' configs/config-x86-generic
release:
- @perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-generic
- @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-x86-generic
+ @perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' configs/config-generic
+ @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' configs/config-x86-generic
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- kernel-2.6.spec 30 Mar 2005 23:36:54 -0000 1.794
+++ kernel-2.6.spec 6 Apr 2005 02:13:55 -0000 1.795
@@ -127,7 +127,7 @@
# problems with the newer kernel or lack certain things that make
# integration in the distro harder than needed.
#
-%define package_conflicts cipe < 1.4.5, kudzu <= 0.92, initscripts < 7.23, dev < 3.2-7, iptables < 1.2.5-3, bcm5820 < 1.81, nvidia-rh72 <= 1.0
+%define package_conflicts cipe < 1.4.5, kudzu <= 0.92, initscripts < 7.23, dev < 3.2-7, iptables < 1.2.5-3, bcm5820 < 1.81, nvidia-rh72 <= 1.0, selinux-policy-targeted >= 1.17.30-2.94
#
# Several packages had bugs in them that became obvious when the NPTL
@@ -158,6 +158,7 @@
# a correct but undesirable perl dependency from the module headers which
# isn't required for the kernel proper to function
AutoReqProv: no
+Requires: udev >= 039-10.FC3.7
#
# List the packages used during the kernel build
@@ -900,6 +901,9 @@
%endif
%changelog
+* Wed Apr 5 2005 Dave Jones <davej at redhat.com>
+- Disable slab debug.
+
* Wed Mar 30 2005 Dave Jones <davej at redhat.com>
- x86_64: Only free PMDs and PUDs after other CPUs have been flushed
- Previous message (by thread): rpms/gcc/devel gcc4-builtin-apply.patch, NONE, 1.1 gcc4-g++-struct-layout.patch, NONE, 1.1 gcc4-macrospace.patch, NONE, 1.1 .cvsignore, 1.80, 1.81 gcc4.spec, 1.24, 1.25 sources, 1.81, 1.82 gcc4-c++-pr20381.patch, 1.1, NONE gcc4-pr16104.patch, 1.2, NONE gcc4-pr19769-workaround.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/FC-3/configs config-generic, 1.3, 1.4 config-x86-generic, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list