Skip to contentSkip to conversation

wireguard: fix kernel 4.12 build issues

PATCH In review Bruce Ashfield 2 participants 3 messages Aug 29, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wireguard: fix kernel 4.12 build issues

We upgrade the module + tools recipes to fix the following build error:

wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:
In function 'setup':
| wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:269:7:
error: 'struct net_device' has no member named 'destructor'; did you mean 'priv_destructor'?

 |   dev->destructor = destruct;
 |        ^~~~~~~~~~
 |        priv_destructor

We also add a RDEPENDS on "bash" to the wireguard-tools recipe to fix the following QA issue that appeared with the version bump:

ERROR: wireguard-tools-0.0.20170810-r0 do_package_qa: QA Issue:
/usr/bin/wg-quick contained in package wireguard-tools requires /bin/bash, but no providers found in RDEPENDS_wireguard-tools? [file-rdeps]

---
 ...eguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} | 0
 ...ireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} | 2 +-
 meta-networking/recipes-kernel/wireguard/wireguard.inc                | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-networking/recipes-kernel/wireguard/{wireguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} (100%)
 rename meta-networking/recipes-kernel/wireguard/{wireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} (93%)
meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb renamed from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb +0 -0
similarity index 100%
rename from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb
rename to meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb
meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb renamed from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb +1 -1
similarity index 93%
rename from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb
rename to meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb
index 79d420f1a417..c4ddbcb0e90f 100644
@@ -24,4 +24,4 @@ FILES_${PN} = " \
     ${bindir} \
 "
 
-RDEPENDS_${PN} = "wireguard-module"
+RDEPENDS_${PN} = "wireguard-module bash"
meta-networking/recipes-kernel/wireguard/wireguard.inc +2 -2
index 9e38c57ffa5b..b26536d3308c 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "e9969ebbdf525fcbe91a513db8a5c864"
-SRC_URI[sha256sum] = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908"
+SRC_URI[md5sum] = "8dd3e080407b8295c25565a847a4ca27"
+SRC_URI[sha256sum] = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"
 
 S = "${WORKDIR}/WireGuard-${PV}/src/"
Signature · 1 line
2.5.0
#1 lore raw
Quoted 12 lines · Bruce Ashfield

We upgrade the module + tools recipes to fix the following build error:

wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:
In function 'setup':
| wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:269:7:
error: 'struct net_device' has no member named 'destructor'; did you mean 'priv_destructor'?

 |   dev->destructor = destruct;
 |        ^~~~~~~~~~
 |        priv_destructor
Quoted 8 lines

We also add a RDEPENDS on "bash" to the wireguard-tools recipe to fix the following QA issue that appeared with the version bump:

ERROR: wireguard-tools-0.0.20170810-r0 do_package_qa: QA Issue:
/usr/bin/wg-quick contained in package wireguard-tools requires /bin/bash, but no providers found in RDEPENDS_wireguard-tools? [file-rdeps]

already fixed with
https://patchwork.openembedded.org/patch/143341/
https://patchwork.openembedded.org/patch/143280/

your commit msg is better though

Quoted 48 lines
---
 ...eguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} | 0
 ...ireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} | 2 +-
 meta-networking/recipes-kernel/wireguard/wireguard.inc                | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-networking/recipes-kernel/wireguard/{wireguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} (100%)
 rename meta-networking/recipes-kernel/wireguard/{wireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} (93%)
meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb renamed from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb +0 -0
similarity index 100%
rename from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb
rename to meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb
meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb renamed from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb +1 -1
similarity index 93%
rename from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb
rename to meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb
index 79d420f1a417..c4ddbcb0e90f 100644
@@ -24,4 +24,4 @@ FILES_${PN} = " \
     ${bindir} \
 "
 
-RDEPENDS_${PN} = "wireguard-module"
+RDEPENDS_${PN} = "wireguard-module bash"
meta-networking/recipes-kernel/wireguard/wireguard.inc +2 -3
index 9e38c57ffa5b..b26536d3308c 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "e9969ebbdf525fcbe91a513db8a5c864"
-SRC_URI[sha256sum] = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908"
+SRC_URI[md5sum] = "8dd3e080407b8295c25565a847a4ca27"
+SRC_URI[sha256sum] = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"
 
 S = "${WORKDIR}/WireGuard-${PV}/src/"
--

2.5.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 23 lines · Khem Raj
Quoted 12 lines · Bruce Ashfield

We upgrade the module + tools recipes to fix the following build error:

wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:
In function 'setup':
| wireguard-module/0.0.20170517-r0/WireGuard-0.0.20170517/src/device.c:269:7:
error: 'struct net_device' has no member named 'destructor'; did you mean 'priv_destructor'?

  |   dev->destructor = destruct;
  |        ^~~~~~~~~~
  |        priv_destructor
Quoted 8 lines

We also add a RDEPENDS on "bash" to the wireguard-tools recipe to fix the following QA issue that appeared with the version bump:

ERROR: wireguard-tools-0.0.20170810-r0 do_package_qa: QA Issue:
/usr/bin/wg-quick contained in package wireguard-tools requires /bin/bash, but no providers found in RDEPENDS_wireguard-tools? [file-rdeps]

Quoted 4 lines

already fixed with
https://patchwork.openembedded.org/patch/143341/
https://patchwork.openembedded.org/patch/143280/

Damn! I missed that going to the list. Luckily, it wasn't much work to fix :D

Bruce

Quoted 50 lines

your commit msg is better though

Quoted 48 lines
---
  ...eguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} | 0
  ...ireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} | 2 +-
  meta-networking/recipes-kernel/wireguard/wireguard.inc                | 4 ++--
  3 files changed, 3 insertions(+), 3 deletions(-)

rename meta-networking/recipes-kernel/wireguard/{wireguard-module_0.0.20170517.bb => wireguard-module_0.0.20170810.bb} (100%) rename meta-networking/recipes-kernel/wireguard/{wireguard-tools_0.0.20170517.bb => wireguard-tools_0.0.20170810.bb} (93%)

meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb renamed from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb +0 -0
similarity index 100%
rename from meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170517.bb
rename to meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb
meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb renamed from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb +1 -1
similarity index 93%
rename from meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170517.bb
rename to meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb
index 79d420f1a417..c4ddbcb0e90f 100644
@@ -24,4 +24,4 @@ FILES_${PN} = " \
      ${bindir} \
  "
 
-RDEPENDS_${PN} = "wireguard-module"
+RDEPENDS_${PN} = "wireguard-module bash"
meta-networking/recipes-kernel/wireguard/wireguard.inc +2 -3
index 9e38c57ffa5b..b26536d3308c 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
  SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "e9969ebbdf525fcbe91a513db8a5c864"
-SRC_URI[sha256sum] = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908"
+SRC_URI[md5sum] = "8dd3e080407b8295c25565a847a4ca27"
+SRC_URI[sha256sum] = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"
 
  S = "${WORKDIR}/WireGuard-${PV}/src/"
--

2.5.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel