From 2b2b50c8133f9e0cddd79a5889f20f09b59893b1 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 16 Apr 2015 22:48:49 +0000 Subject: [PATCH] Fix building against Linux 4. Not sure if he wrote it but thanks to Massimiliano Torromeo at Arch for the patch. Closes bug #546564. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4 --- net-misc/r8168/ChangeLog | 7 +++- net-misc/r8168/Manifest | 33 ++++++++++--------- .../files/r8168-8.039.00-linux-4-compat.patch | 14 ++++++++ net-misc/r8168/r8168-8.039.00.ebuild | 6 +++- 4 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch diff --git a/net-misc/r8168/ChangeLog b/net-misc/r8168/ChangeLog index e8fc1ee9147b..cfb8245960a5 100644 --- a/net-misc/r8168/ChangeLog +++ b/net-misc/r8168/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/r8168 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.17 2015/03/24 22:44:54 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.18 2015/04/16 22:48:37 chewi Exp $ + + 16 Apr 2015; James Le Cuirot + +files/r8168-8.039.00-linux-4-compat.patch, r8168-8.039.00.ebuild: + Fix building against Linux 4. Not sure if he wrote it but thanks to + Massimiliano Torromeo at Arch for the patch. Closes bug #546564. *r8168-8.039.00 (24 Mar 2015) diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 745256312f9d..ac0ac1c7dc95 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -2,28 +2,29 @@ Hash: SHA256 AUX r8168-8.028.00-linux-3.3-compat.patch 724 SHA256 64d45a082464cfe170c82f6e35a501c8e84b69c83ccce6bcf48c312665c53b18 SHA512 8d42d14dd3b121a1dd2105ff9dde40d56e236066e519fa0677de72e3c19c4e2097239ffb3fc60beb456475c870743183620b6eff30a29ddf529ccdb51c4aac3e WHIRLPOOL 0c8a1df4e11e4ea0ca689fe15e2055233e87cf069b387d447287aa515c08bb26776f4313461dc89d7bf85b4d5ade6e74c49d864b8a43a73bc6df56927e6d8749 +AUX r8168-8.039.00-linux-4-compat.patch 628 SHA256 e6087439b30c8f6c26113c182dd1f95044d918241b1c281b6e84b9a334e68910 SHA512 d2dd86131085a7f3f26ebca1a3786338c752c68fb3325d76e038504e22a56e3ce12743daa87cc1136833bd10fd7d46e8afb79c0d8c78838ea2b78aa253809c13 WHIRLPOOL 100483d96b6888e9dd0e8b27d3a29c82db9180f8f9c7fbe032dda42de9402584d5e926d4e68beb43c87e6de03293c030e755b19f12f30b532f1efed9926f9d40 DIST r8168-8.028.00.tar.bz2 63208 SHA256 c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3 DIST r8168-8.039.00.tar.bz2 81132 SHA256 767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd SHA512 30c1d7a96b048518f0755cd616e1b1f5c3c7d1343a903dd8169e6bcb145c0a3ac0d7bbcdee6d2a2dd8b76c69f807a56e4678c5e19a10da3f46fe70e0aa5f10d2 WHIRLPOOL 5423d86ddb733a0236fd3a38ac43dd371bbd9255480983fdb9f2bc023977b84367df2b93cf91851eeef3267fdef2cb389231a6522f23148e8739f8587ff9ed36 EBUILD r8168-8.028.00.ebuild 848 SHA256 b888bd28da9e6340360ab85122ca8d6da04badb8b20825b752ae1e8bf71e3d39 SHA512 d254ffa67f3691b3a48c86e0874f5311612c24d2e6d11b8c0531acdaa8eaa27137c7b5a95dec6dd9630d2c48ee1782a487a37065f3056ff5396b7b4bf97140c7 WHIRLPOOL 78be42d320afa0a4b858664b61780058d3473caa07d76386165523ddb34da338401313a437388cb82efc8dee365fcc118f64637c7f9284811a750b138555b659 -EBUILD r8168-8.039.00.ebuild 837 SHA256 976bdec8676d465654363e7314f62d54d9803c4a8232fd3f6d7c68bfdb887eeb SHA512 5ee2202b20c625b002812f9304de4780e41b46c6aa69187f3f93b67291cc85a5d429df9a13a62c87a0a49eaa7c4782a519228e17c1a34c913f03502a624574ae WHIRLPOOL cfd3b91d9f751666f92bc7aa77d886d0ea454c5d332bfe02b579645cb9cd642270771d2a5b270f6f240ca2a1287471e4231c16cdd469629a6ae6ebd4b6db2eab -MISC ChangeLog 3279 SHA256 ee0dc0c85912cda4179fa778ea729d7d3c38a6007921d830e23ab03283d4a450 SHA512 328bbdfe5a0667b18c71c79a087ac134b2c6e7fa264f72ede26a068695a2dfe9521aba8732f6fc2f666b3b80083b95a9ab92fb3a132ed47ab936d199e02aeecb WHIRLPOOL b8716999128bf8839683c673283d5166231bd45993a05d66f60a61158caf43b40cfd3e1a06a41e8f000e1fc6b2e5a4b756f8c2ff428fe4ffef49426ad9fb484c +EBUILD r8168-8.039.00.ebuild 904 SHA256 b618ee646df5df8d5e53cf65748bea8769cb2b9c96935721d2130f34c6ef296f SHA512 4151c823ba6df5d775dcdc00fced737d41ed2877578da3e1973a553dbc3dd7e73f1c83bf0e46e746da261754a0b5532331c3efebf25281034a81cf6eaf18d3c4 WHIRLPOOL ef249d772924990fad2779ddf0da7d3f8ef60213022e92337db723a9607a7e347f72f97292c3d059d827a12715cdf8e20e631baab12004439b023410c80cebd9 +MISC ChangeLog 3536 SHA256 e86848375e2eae35cdc2000ebf612a586ce7f872e73d78933b4a0800fdaefd30 SHA512 c454699e7dc7e23d1fd1da36d36a7b80b4787978499d65cdfd169d7fef9a786824fc51e3b799c5a1520da046b0b74c8258a5951f48e4b92ec0f6ec2c7698605f WHIRLPOOL 236c0e13864501a53eba0bdf954038328ec25ab7ae9cbbd38033ffa4c432b66db0723ffda5153d69e1b757a2eba806f90c0fcf9f4fc87f8dd68b24bfa9ff175d MISC metadata.xml 470 SHA256 d33029ad508235cd26612cf55c82a7b6945d15d32dd103dc27375e95981d9f7f SHA512 c6c5592d0b00fa550f043fa4e3dc88d462a2e466d28ed34c846a226e702cbd6007a957cc16a26ede6854231b3b0d6221d69724a5e57c348e8d802789f8dab20b WHIRLPOOL 2524f8a8eb0ec80df589febbe2f17c9ec27b64d5efa8b78f86ab48dd276b5224586d36272b34d3e35f43f75af6dd812623c028463ba0c1a11c91b3f0c63ed60c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVEej2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVMDxLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy -MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kOKoP/jAe93mvdGIVoWwkVlEnHxfl -M/HpeEiyfYsiLURThQKJKRzd7cdxuSAzSYf/ycafJGPUoydlI2kbOv70vZbYPWBF -RDVdIgvgaumjveFZRq46wKYyy4fPjp5Gkf7v6WUHn+FQ1giTCMY4zV72bSUrkDE/ -f4L6xuhb3PU4CPWt8Xo6M2AIf+XtwPKCpJqdAOsFHluBJ3n62sPfBrJYgDboRefH -bxQ8MTdzZFZnOdFQSaVGFN3ipMSvtwRl7lYTOYtVh7ds+2ZDn0t9fEKPPBqQ35mE -WZ+OiPrWgTi8gk0s+8+yoiaV9TPNeaGMA+b1pqiUKIpNbM8M6mf4qKUOYNFgUXjR -6rXyyppbq8e1ZH8WL8i54bhkwrhX37hd8M+JItY+z5M7R4t+8Rd3RrLekW6IE/Op -sg0LqQi/uDW8Luu1rbSoSbc7ZH1g9QhpDUzkGlPDL2i6PbE/8if4Vgx9tqnSwRaD -jeoft2pNOc2I9ck7BNNv2bSH3KVPaTjROvVYnBCGhHWqfitwIP7N0TignZ+L8neR -RL3uHjnPUFYFTqxdT9ulUQHskEwW4vqgsHYMIhp9c3syb0d6XoEszvkzXhpyLQt7 -dMDzaL7G2c3uKqyrdyYoW35iKP847C09JG1ulMBP02KLFnqFnK63fTVHZTN7gVUc -lSNyvMIPQV2uLa6S1uMn -=atba +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kCOoQAIm95kZNvhKg8+6oZJpJxhWb +UaIvUipeGtD9tT5UHYtt4DN3FRvU9eBpIEo1txJ1Qd0Bw9YYNUCjbbNTQElklD/y +/LN0TDrwoisrp3UGNX/Z5qEE25YemdG6e1zDMTKDhPHX5wJIaEbyFDCsCAiDLvww +v+JpNK+3QFW6pGP0a2B3tsqNbf5IoJMjnHAo5+fyG0aFT+zFnq1CPJ5EXknEWhvM +gE8Cg/I+/lizDNJwvoT0nJFFFFrS7HNoMRW3YP005h4g+Lv6uyMSIN8JqSs4FCPo +2O4yGMFCA/npGS1oq0cPLIZb1AapYo854Z1lsz/kx5Y20DC7FKxZY0EnOdizYO7z +meHsFfUAcix4G49r5VXZXlTYIrbFtbMVqTG/gZEPTlR2gKU8KHXZ0GXBYe3yYWRs +w/ER0nXkwuSHm14kWtdyRBMxpV6WdktFjyDRhR1VO/eT45nHhrBamH6rUnhYx22f +o6x4IMPRbPfY7AjX00G5UmCuvd8aXxbJVXOxdcBYNNOHjBqEWloYSHqzuGPgfiDc +iEwoxkiSyftU7Hny6f98KuZ6UgwAMZBIMPkgGwK+OHwpkOkzfttz0mS7VIyNqtxw +XbmErVWP6+5iiLYF84XMpnOk7J8SQO+4tyg/1blV8lSHbNK7D5BNPIAK1bGkwL5E +8Nt+g0Tzt9Vk3c98vTgj +=rR+D -----END PGP SIGNATURE----- diff --git a/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch b/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch new file mode 100644 index 000000000000..67ad6a25f1b5 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch @@ -0,0 +1,14 @@ +diff --git a/src/r8168_n.c b/src/r8168_n.c +index 9d6f231..c4200d0 100755 +--- a/src/r8168_n.c ++++ b/src/r8168_n.c +@@ -3291,6 +3291,9 @@ rtl8168_tx_vlan_tag(struct rtl8168_private *tp, + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + tag = (tp->vlgrp && vlan_tx_tag_present(skb)) ? + TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00; ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ tag = (skb_vlan_tag_present(skb)) ? ++ TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00; + #else + tag = (vlan_tx_tag_present(skb)) ? + TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00; diff --git a/net-misc/r8168/r8168-8.039.00.ebuild b/net-misc/r8168/r8168-8.039.00.ebuild index 89a31e2ed750..29c50e786da9 100644 --- a/net-misc/r8168/r8168-8.039.00.ebuild +++ b/net-misc/r8168/r8168-8.039.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.039.00.ebuild,v 1.1 2015/03/24 22:44:54 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.039.00.ebuild,v 1.2 2015/04/16 22:48:37 chewi Exp $ EAPI=5 @@ -21,6 +21,10 @@ CONFIG_CHECK="!R8169" ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" +src_prepare() { + epatch "${FILESDIR}/${P}-linux-4-compat.patch" +} + pkg_setup() { linux-mod_pkg_setup BUILD_PARAMS="KERNELDIR=${KV_DIR}" -- 2.26.2