commit hdjmod for openSUSE:Factory
Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2012-12-28 15:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdjmod", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes 2012-10-23 19:37:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2012-12-28 15:01:20.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Dec 23 16:47:42 UTC 2012 - marix@marix.org + +- Fixed build on kernel 3.7 + +------------------------------------------------------------------- New: ---- hdjmod_kernel_3.7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdjmod.spec ++++++ --- /var/tmp/diff_new_pack.TJRRFw/_old 2012-12-28 15:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.TJRRFw/_new 2012-12-28 15:01:21.000000000 +0100 @@ -47,6 +47,8 @@ Patch5: hdjmod_fix_hotplug.patch # PATCH-FIX-UPSTREAM hdjmod_kernel_3.6.patch [bnc#783848] marix@marix.org -- Fix build on kernel 3.6 and newer Patch6: hdjmod_kernel_3.6.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_3.7.patch marix@marix.org -- Fix build on kernel 3.7 and newer +Patch7: hdjmod_kernel_3.7.patch # The package triggers RPM-Lint warning because it misses requires to the proper kernel packages # These requires should be added by the kernel_module_package macro, so, therefore the are not @@ -71,6 +73,7 @@ %patch1 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 set -- * mkdir source mv "$@" source/ ++++++ hdjmod_kernel_3.6.patch ++++++ --- /var/tmp/diff_new_pack.TJRRFw/_old 2012-12-28 15:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.TJRRFw/_new 2012-12-28 15:01:21.000000000 +0100 @@ -5,7 +5,7 @@ /* Try to allocate a netlink socket minimizing the risk of collision, * by starting at the max unit number and counting down */ for (unit=MAX_LINKS-1;unit>MIN_NETLINK_UNIT;unit--) { -+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + nl_sk = netlink_kernel_create( + &init_net, + unit, @@ -27,7 +27,7 @@ return NULL; } -+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + nlh = nlmsg_put(skb, target_pid, seq, t, size, flags); + if(!nlh) { + if (skb) { ++++++ hdjmod_kernel_3.7.patch ++++++ diff -aru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2012-12-23 17:41:13.111607777 +0100 +++ hdjmod-1.28/device.c 2012-12-23 17:42:33.115898437 +0100 @@ -2397,7 +2397,9 @@ nl_sk = netlink_kernel_create( &init_net, unit, +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) THIS_MODULE, +#endif NULL); #else nl_sk = netlink_kernel_create( Nur in hdjmod-1.28: .device.c.swp. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de