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-contrib-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 e3d4210db1..2c69c58f8b 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 @@ require wireguard.inc -inherit module-base kernel-module-split +inherit module kernel-module-split DEPENDS = "virtual/kernel libmnl" @@ -10,14 +10,22 @@ DEPENDS = "virtual/kernel libmnl" EXTRA_OEMAKE_append = " \ KERNELDIR=${STAGING_KERNEL_DIR} \ - CC='${CC}' \ - KERNEL_CC='${KERNEL_CC}' \ " -KERNEL_MODULES_META_PACKAGE = "${PN}" MAKE_TARGETS = "module" -MODULES_INSTALL_TARGET = "module-install" RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +MODULE_NAME = "wireguard" -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" +# Kernel module packages MUST begin with 'kernel-module-', otherwise +# multilib image generation can fail. +# +# The following line is only necessary if the recipe name does not begin +# with kernel-module-. +PKG_${PN} = "kernel-module-${MODULE_NAME}" + +module_do_install() { + install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} + install -m 0644 ${MODULE_NAME}.ko \ + ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko +} |