rpms/kernel/devel linux-2.6-blkcipher-depend-on-chainiv.patch, NONE, 1.1 linux-2.6-lguest-bonghits.patch, NONE, 1.1 linux-2.6-ppc-use-libgcc.patch, NONE, 1.1 patch-2.6.25-rc2-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.765, 1.766 config-generic, 1.73, 1.74 config-x86-generic, 1.29, 1.30 config-x86_64-generic, 1.26, 1.27 kernel.spec, 1.440, 1.441 sources, 1.725, 1.726 upstream, 1.647, 1.648 linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch, 1.1, NONE patch-2.6.25-rc2-git2.bz2.sign, 1.1, NONE
Kyle McMartin (kyle)
fedora-extras-commits at redhat.com
Wed Feb 20 23:07:46 UTC 2008
- Previous message (by thread): rpms/selinux-policy/devel booleans-targeted.conf, 1.36, 1.37 policy-20071130.patch, 1.71, 1.72
- Next message (by thread): rpms/hunky-fonts/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE hunky-fonts.spec, 1.3, NONE sources, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25552
Modified Files:
.cvsignore config-generic config-x86-generic
config-x86_64-generic kernel.spec sources upstream
Added Files:
linux-2.6-blkcipher-depend-on-chainiv.patch
linux-2.6-lguest-bonghits.patch linux-2.6-ppc-use-libgcc.patch
patch-2.6.25-rc2-git4.bz2.sign
Removed Files:
linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
patch-2.6.25-rc2-git2.bz2.sign
Log Message:
* Wed Feb 20 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25-rc2-git4
- Enable VIRTIO modules.
- lguest: fix asm-offsets.h symbols
- ppc: link in libgcc.a for now
- crypto_blkcipher: add a hack to make it depend on chainiv
linux-2.6-blkcipher-depend-on-chainiv.patch:
--- NEW FILE linux-2.6-blkcipher-depend-on-chainiv.patch ---
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 4a7e65c..0ab656e 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -27,6 +27,8 @@
#include "internal.h"
+extern int chainiv_dummy_bonghits;
+
enum {
BLKCIPHER_WALK_PHYS = 1 << 0,
BLKCIPHER_WALK_SLOW = 1 << 1,
@@ -698,3 +700,11 @@ EXPORT_SYMBOL_GPL(skcipher_geniv_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic block chaining cipher type");
+
+int blkcipher_init(void)
+{
+ chainiv_dummy_bonghits = 0x900dcafe;
+
+ return 0;
+}
+module_init(blkcipher_init);
diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index d17fa04..853eadf 100644
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
@@ -23,6 +23,9 @@
#include <linux/string.h>
#include <linux/workqueue.h>
+static int chainiv_dummy_bonghits = 0;
+EXPORT_SYMBOL_GPL(chainiv_dummy_bonghits);
+
enum {
CHAINIV_STATE_INUSE = 0,
};
linux-2.6-lguest-bonghits.patch:
--- NEW FILE linux-2.6-lguest-bonghits.patch ---
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index a33d530..44bafdd 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -134,7 +134,7 @@ void foo(void)
OFFSET(LGUEST_DATA_pgdir, lguest_data, pgdir);
#endif
-#ifdef CONFIG_LGUEST
+#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
OFFSET(LGUEST_PAGES_host_gdt_desc, lguest_pages, state.host_gdt_desc);
OFFSET(LGUEST_PAGES_host_idt_desc, lguest_pages, state.host_idt_desc);
linux-2.6-ppc-use-libgcc.patch:
--- NEW FILE linux-2.6-ppc-use-libgcc.patch ---
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 1c6ce35..3f1bbcb 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -150,6 +150,8 @@ core-$(CONFIG_XMON) += arch/powerpc/xmon/
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
+libs-y += `$(CC) -print-libgcc-file-name`
+
# Default to zImage, override when needed
all: zImage
--- NEW FILE patch-2.6.25-rc2-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHu9CoyGugalF9Dw4RAopeAJ4qf5s6QIqLO/phRJuHApN6ltTvTgCfeXqR
H3/lH+oIkSJ15NEuBVWGJR4=
=AdiF
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- .cvsignore 19 Feb 2008 16:20:31 -0000 1.765
+++ .cvsignore 20 Feb 2008 23:07:08 -0000 1.766
@@ -5,4 +5,4 @@
kernel-2.6.24
linux-2.6.24.tar.bz2
patch-2.6.25-rc2.bz2
-patch-2.6.25-rc2-git2.bz2
+patch-2.6.25-rc2-git4.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- config-generic 19 Feb 2008 16:20:31 -0000 1.73
+++ config-generic 20 Feb 2008 23:07:08 -0000 1.74
@@ -403,9 +403,11 @@
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_BLK_DEV_HD is not set
+CONFIG_VIRTIO=m
CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_NET=m
#
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-x86-generic 15 Feb 2008 22:25:08 -0000 1.29
+++ config-x86-generic 20 Feb 2008 23:07:08 -0000 1.30
@@ -362,3 +362,5 @@
# CONFIG_CPA_DEBUG is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+
+CONFIG_HP_WATCHDOG=m
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-x86_64-generic 18 Feb 2008 02:38:36 -0000 1.26
+++ config-x86_64-generic 20 Feb 2008 23:07:08 -0000 1.27
@@ -255,3 +255,5 @@
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_CPA_DEBUG is not set
CONFIG_CRYPTO_SALSA20_X86_64=m
+
+CONFIG_HP_WATCHDOG=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- kernel.spec 20 Feb 2008 21:17:17 -0000 1.440
+++ kernel.spec 20 Feb 2008 23:07:08 -0000 1.441
@@ -45,7 +45,7 @@
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 2
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -626,9 +626,6 @@
# atl2 network driver
Patch2020: linux-2.6-netdev-atl2.patch
-# fix broken pcmcia station address detection
-Patch2021: linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
-
# ext4 patches
Patch2100: linux-2.6-ext4-stable-queue.patch
@@ -645,6 +642,12 @@
# usb video
Patch2400: linux-2.6-uvcvideo.patch
+Patch2500: linux-2.6-lguest-bonghits.patch
+Patch2501: linux-2.6-ppc-use-libgcc.patch
+
+### HACK ###
+Patch2502: linux-2.6-blkcipher-depend-on-chainiv.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1096,7 +1099,7 @@
ApplyPatch linux-2.6-ata-quirk.patch
# wireless patches headed for 2.6.25
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
# wireless patches headed for 2.6.26
ApplyPatch linux-2.6-wireless-pending.patch
@@ -1127,7 +1130,6 @@
ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
ApplyPatch linux-2.6-netdev-e1000-disable-alpm.patch
ApplyPatch linux-2.6-netdev-atl2.patch
-ApplyPatch linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
# Nouveau DRM + drm fixes
ApplyPatch nouveau-drm.patch
@@ -1146,6 +1148,11 @@
# usb video
ApplyPatch linux-2.6-uvcvideo.patch
+ApplyPatch linux-2.6-lguest-bonghits.patch
+ApplyPatch linux-2.6-ppc-use-libgcc.patch
+
+ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch
+
# ---------- below all scheduled for 2.6.24 -----------------
# END OF PATCH APPLICATIONS
@@ -1730,6 +1737,13 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Wed Feb 20 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25-rc2-git4
+- Enable VIRTIO modules.
+- lguest: fix asm-offsets.h symbols
+- ppc: link in libgcc.a for now
+- crypto_blkcipher: add a hack to make it depend on chainiv
+
* Wed Feb 20 2008 Eric Sandeen <sandeen at redhat.com>
- More ext4 updates/fixes from the "stable" ext4 patchqueue
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -r1.725 -r1.726
--- sources 19 Feb 2008 16:20:31 -0000 1.725
+++ sources 20 Feb 2008 23:07:08 -0000 1.726
@@ -1,3 +1,3 @@
3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2
dbfa4fb224fede6b96ed42497f123946 patch-2.6.25-rc2.bz2
-21b84df5922602c2c6e98b1b61cb122c patch-2.6.25-rc2-git2.bz2
+5c89b6e1378c53e075a14cda9c0d619a patch-2.6.25-rc2-git4.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -r1.647 -r1.648
--- upstream 19 Feb 2008 16:20:31 -0000 1.647
+++ upstream 20 Feb 2008 23:07:08 -0000 1.648
@@ -1,3 +1,3 @@
linux-2.6.24.tar.bz2
patch-2.6.25-rc2.bz2
-patch-2.6.25-rc2-git2.bz2
+patch-2.6.25-rc2-git4.bz2
--- linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch DELETED ---
--- patch-2.6.25-rc2-git2.bz2.sign DELETED ---
- Previous message (by thread): rpms/selinux-policy/devel booleans-targeted.conf, 1.36, 1.37 policy-20071130.patch, 1.71, 1.72
- Next message (by thread): rpms/hunky-fonts/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE hunky-fonts.spec, 1.3, NONE sources, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list