diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2017-05-01 12:40:13 -0400 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2017-05-09 09:44:54 -0400 |
commit | ad0db129c7c8484520cd20cdfbb4670489125280 (patch) | |
tree | 25cc2d964c9e0e2dcfbb1d83c309d1aa9e6b40e5 | |
parent | 6418010bf0d74b21247962edbc63dd5e6fb1069a (diff) | |
download | meta-openembedded-ad0db129c7c8484520cd20cdfbb4670489125280.tar.gz |
wireguard: module install cleanup
The module_install target shouldn't be used, just installing the module to
the sysroot directly seems more appropriate.
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r-- | meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb index e3d4210db..2c69c58f8 100644 --- a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb +++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170421.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require wireguard.inc | 1 | require wireguard.inc |
2 | 2 | ||
3 | inherit module-base kernel-module-split | 3 | inherit module kernel-module-split |
4 | 4 | ||
5 | DEPENDS = "virtual/kernel libmnl" | 5 | DEPENDS = "virtual/kernel libmnl" |
6 | 6 | ||
@@ -10,14 +10,22 @@ DEPENDS = "virtual/kernel libmnl" | |||
10 | 10 | ||
11 | EXTRA_OEMAKE_append = " \ | 11 | EXTRA_OEMAKE_append = " \ |
12 | KERNELDIR=${STAGING_KERNEL_DIR} \ | 12 | KERNELDIR=${STAGING_KERNEL_DIR} \ |
13 | CC='${CC}' \ | ||
14 | KERNEL_CC='${KERNEL_CC}' \ | ||
15 | " | 13 | " |
16 | KERNEL_MODULES_META_PACKAGE = "${PN}" | ||
17 | 14 | ||
18 | MAKE_TARGETS = "module" | 15 | MAKE_TARGETS = "module" |
19 | MODULES_INSTALL_TARGET = "module-install" | ||
20 | 16 | ||
21 | RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" | 17 | RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" |
18 | MODULE_NAME = "wireguard" | ||
22 | 19 | ||
23 | PNBLACKLIST[wireguard-module] ?= "BROKEN: Kernel configuration invalid (http://errors.yoctoproject.org/Errors/Details/141421/) - the recipe will be removed on 2017-07-01 unless the issue is fixed" | 20 | # Kernel module packages MUST begin with 'kernel-module-', otherwise |
21 | # multilib image generation can fail. | ||
22 | # | ||
23 | # The following line is only necessary if the recipe name does not begin | ||
24 | # with kernel-module-. | ||
25 | PKG_${PN} = "kernel-module-${MODULE_NAME}" | ||
26 | |||
27 | module_do_install() { | ||
28 | install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} | ||
29 | install -m 0644 ${MODULE_NAME}.ko \ | ||
30 | ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko | ||
31 | } | ||