Attachment 274251 Details for Bug 406831 – Diff between the packages

[patch] Diff between the packages

diff-between-0-42-and-0-43.diff (text/plain), 2.37 KB, created by Lubomir Kundrak on 2007-11-30 19:21:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Kundrak

Created: 2007-11-30 19:21:23 UTC

Size: 2.37 KB

patch

obsolete

>? rdiff
>Index: config-generic
>===================================================================
>RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
>retrieving revision 1.42
>retrieving revision 1.43
>diff -u -p -r1.42 -r1.43
>--- config-generic	21 Nov 2007 20:06:41 -0000	1.42
>+++ config-generic	26 Nov 2007 12:37:00 -0000	1.43
>@@ -1279,8 +1279,11 @@ CONFIG_HOSTAP_CS=m
> # CONFIG_IPW2200 is not set
> # CONFIG_IPW2100_DEBUG is not set
> # CONFIG_IPW2200_DEBUG is not set
>-# CONFIG_LIBERTAS is not set
>-
>+CONFIG_LIBERTAS=m
>+CONFIG_LIBERTAS_USB=m
>+CONFIG_LIBERTAS_CS=m
>+CONFIG_LIBERTAS_SDIO=m
>+CONFIG_LIBERTAS_DEBUG=y
> CONFIG_IWL4965=m
> CONFIG_IWL4965_DEBUG=y
> CONFIG_IWL4965_SENSITIVITY=y
>Index: kernel.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
>retrieving revision 1.251
>retrieving revision 1.252
>diff -u -p -r1.251 -r1.252
>--- kernel.spec	24 Nov 2007 10:24:23 -0000	1.251
>+++ kernel.spec	26 Nov 2007 12:37:00 -0000	1.252
>@@ -23,7 +23,7 @@ Summary: The Linux kernel (the core of t
> # Bah. Have to set this to a negative for the moment to fix rpm ordering after
> # moving the spec file. cvs sucks. Should be sure to fix this once 2.6.23 is out.
> %define fedora_cvs_origin 209
>-%define fedora_build %(R="$Revision: 1.251 $"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
>+%define fedora_build %(R="$Revision: 1.252 $"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
> 
> # base_sublevel is the kernel version we're starting with and patching
> # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
>@@ -1371,7 +1371,7 @@ BuildKernel() {
>     collect_modules_list networking \
>     			 'register_netdev|ieee80211_register_hw|usbnet_probe'
>     collect_modules_list block \
>-    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue'
>+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans'
> 
>     # detect missing or incorrect license tags
>     rm -f modinfo
>@@ -1699,6 +1699,10 @@ fi
> %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
> 
> %changelog
>+* Mon Nov 26 2007 David Woodhouse <dwmw2@redhat.com>
>+- Build libertas wireless driver
>+- Include flash translation layers in modules.block list
>+
> * Sat Nov 24 2007 David Woodhouse <dwmw2@redhat.com>
> - Fix fec_mpc52xx Ethernet driver to use the right skbs
>

Actions: View | Diff

Attachments on bug 406831: 274211 | 274221 | 274251