Hello community,
here is the log from the commit of package enic-kmp
checked in at Fri Nov 21 15:15:34 CET 2008.
--------
--- enic-kmp/enic-kmp.changes 2008-11-10 11:57:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/enic-kmp/enic-kmp.changes 2008-11-21 14:36:45.690530000 +0100
@@ -1,0 +2,10 @@
+Fri Nov 21 13:05:02 CET 2008 - kkeil@suse.de
+
+- add fnic part (fate #305349)
+
+-------------------------------------------------------------------
+Fri Nov 21 12:38:46 CET 2008 - ro@suse.de
+
+- underscorify debug_package_requires even more
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
enic.patch
fnic-1.0.0.tar.bz2
fnic.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ enic-kmp.spec ++++++
--- /var/tmp/diff_new_pack.EK9443/_old 2008-11-21 15:15:22.000000000 +0100
+++ /var/tmp/diff_new_pack.EK9443/_new 2008-11-21 15:15:22.000000000 +0100
@@ -25,13 +25,16 @@
AutoReqProv: on
Summary: The Cisco 10 Gbit ethernet driver
Version: 0.0.1
-Release: 3
+Release: 4
Source: enic-%{version}.tar.bz2
+Source1: fnic-1.0.0.tar.bz2
+Patch0: enic.patch
+Patch1: fnic.patch
License: GPL v2 only
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 x86_64
%define kernel_version %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-source`|sed 's/_/-/g;')
-%define kernel_version_ %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-source`)
+%define kernel_version_ %(echo `rpm -q --queryformat '%{VERSION}_%{RELEASE}' kernel-source`)
%define debug_package_requires enic-kmp = %{version}_%{kernel_version_}
%suse_kernel_module_package -n enic kdump um
@@ -62,14 +65,23 @@
Scott Feldman
%prep
-%setup -n enic
+%setup -n enic -b 1
+%patch0 -p1
+cd ../fnic
+%patch1 -p1
%build
echo "flavors_to_build: %{flavors_to_build}"
+cd ..
+echo "enic.ko external" > enic/Module.supported
+echo "fnic.ko external" > fnic/Module.supported
for flavor in %flavors_to_build; do
- mkdir -p ../$flavor
- cp * ../$flavor/
- pushd ../$flavor/
+ mkdir -p $flavor
+ cp -a enic fnic $flavor/
+ pushd $flavor/enic
+ make -C /usr/src/linux-obj/%_target_cpu/$flavor modules M=$PWD
+ popd
+ pushd $flavor/fnic
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules M=$PWD
popd
done
@@ -77,13 +89,21 @@
%install
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
export INSTALL_MOD_DIR=updates
+cd ..
for flavor in %flavors_to_build; do
- pushd ../$flavor/
+ pushd $flavor/enic
+ make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD
+ popd
+ pushd $flavor/fnic
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD
popd
done
%changelog
+* Fri Nov 21 2008 kkeil@suse.de
+- add fnic part (fate #305349)
+* Fri Nov 21 2008 ro@suse.de
+- underscorify debug_package_requires even more
* Mon Nov 10 2008 ro@suse.de
- fix debug_package_requires
* Mon Oct 27 2008 kkeil@suse.de
++++++ enic-0.0.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/enic/compat.h new/enic/compat.h
--- old/enic/compat.h 2008-10-27 10:57:18.000000000 +0100
+++ new/enic/compat.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#ifndef COMPAT_H
-#define COMPAT_H
-
-#define PCI_VENDOR_ID_CISCO 0x1137
-#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/enic/enic.h new/enic/enic.h
--- old/enic/enic.h 2008-10-27 10:58:03.000000000 +0100
+++ new/enic/enic.h 2008-11-20 20:23:45.000000000 +0100
@@ -21,7 +21,7 @@
#define _ENIC_H_
#include
-#include "compat.h"
+
#include "vnic_enet.h"
#include "vnic_dev.h"
#include "vnic_wq.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/enic/enic.mod.c new/enic/enic.mod.c
--- old/enic/enic.mod.c 2008-10-27 10:58:13.000000000 +0100
+++ new/enic/enic.mod.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-#include
-#include
-#include
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-
-struct module __this_module
-__attribute__((section(".gnu.linkonce.this_module"))) = {
- .name = KBUILD_MODNAME,
- .init = init_module,
-#ifdef CONFIG_MODULE_UNLOAD
- .exit = cleanup_module,
-#endif
- .arch = MODULE_ARCH_INIT,
-};
-
-static const struct modversion_info ____versions[]
-__used
-__attribute__((section("__versions"))) = {
-};
-
-static const char __module_depends[]
-__used
-__attribute__((section(".modinfo"))) =
-"depends=";
-
-MODULE_ALIAS("pci:v00001137d00000043sv*sd*bc*sc*i*");
-
-MODULE_INFO(srcversion, "FBE2D84D6996BAC599A612A");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/enic/Makefile new/enic/Makefile
--- old/enic/Makefile 2008-10-27 12:40:22.000000000 +0100
+++ new/enic/Makefile 2008-11-20 20:23:45.000000000 +0100
@@ -1,4 +1,5 @@
-obj-m := enic.o
+obj-$(CONFIG_ENIC) := enic.o
enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
enic_res.o vnic_dev.o vnic_rq.o
+
++++++ enic.patch ++++++
Index: enic/Makefile
===================================================================
--- enic.orig/Makefile
+++ enic/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_ENIC) := enic.o
+obj-m := enic.o
enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
enic_res.o vnic_dev.o vnic_rq.o
Index: enic/enic.h
===================================================================
--- enic.orig/enic.h
+++ enic/enic.h
@@ -31,6 +31,11 @@
#include "vnic_stats.h"
#include "vnic_rss.h"
+#ifndef PCI_VENDOR_ID_CISCO
+#define PCI_VENDOR_ID_CISCO 0x1137
+#endif
+
+
#define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco 10G Ethernet Driver"
#define DRV_VERSION "0.0.1-18163.472-k1"
++++++ fnic.patch ++++++
Index: fnic/Makefile
===================================================================
--- fnic.orig/Makefile
+++ fnic/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_FCOE_FNIC) += fnic.o
+obj-m += fnic.o
fnic-y := \
fnic_attrs.o \
Index: fnic/fnic.h
===================================================================
--- fnic.orig/fnic.h
+++ fnic/fnic.h
@@ -22,7 +22,8 @@
#include
#include
#include
-#include
+#include
+#include "missing.h"
#include "fnic_io.h"
#include "fnic_res.h"
#include "vnic_dev.h"
@@ -34,6 +35,10 @@
#include "vnic_stats.h"
#include "vnic_scsi.h"
+#ifndef PCI_VENDOR_ID_CISCO
+#define PCI_VENDOR_ID_CISCO 0x1137
+#endif
+
#define DRV_NAME "fnic"
#define DRV_DESCRIPTION "Cisco FCoE HBA Driver"
#define DRV_VERSION "1.0.0"
Index: fnic/fnic_fcs.c
===================================================================
--- fnic.orig/fnic_fcs.c
+++ fnic/fnic_fcs.c
@@ -29,8 +29,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include "fnic_io.h"
#include "fnic.h"
#include "cq_enet_desc.h"
Index: fnic/fnic_isr.c
===================================================================
--- fnic.orig/fnic_isr.c
+++ fnic/fnic_isr.c
@@ -24,8 +24,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include "vnic_dev.h"
#include "vnic_intr.h"
#include "vnic_stats.h"
Index: fnic/fnic_main.c
===================================================================
--- fnic.orig/fnic_main.c
+++ fnic/fnic_main.c
@@ -36,8 +36,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include "vnic_dev.h"
#include "vnic_intr.h"
Index: fnic/fnic_scsi.c
===================================================================
--- fnic.orig/fnic_scsi.c
+++ fnic/fnic_scsi.c
@@ -39,8 +39,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include "fnic_io.h"
#include "fnic.h"
Index: fnic/missing.h
===================================================================
--- /dev/null
+++ fnic/missing.h
@@ -0,0 +1,12 @@
+#ifndef MISSING_H
+#define MISSING_H
+
+/**
+ * FC_LPORT HELPER FUNCTIONS
+ *****************************/
+static inline void *lport_priv(const struct fc_lport *lp)
+{
+ return (void *)(lp + 1);
+}
+
+#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
