summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kmod
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-kernel/kmod
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kmod')
-rw-r--r--meta/recipes-kernel/kmod/kmod-native_git.bb2
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc2
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb18
3 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index f61134bbaf..4dd34b1c82 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -7,7 +7,7 @@ DEPENDS += "zlib-native"
7 7
8inherit native 8inherit native
9 9
10do_install_append (){ 10do_install:append (){
11 for tool in depmod insmod lsmod modinfo modprobe rmmod 11 for tool in depmod insmod lsmod modinfo modprobe rmmod
12 do 12 do
13 ln -s kmod ${D}${bindir}/$tool 13 ln -s kmod ${D}${bindir}/$tool
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index e66684fda0..c2d550acaf 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -6,7 +6,7 @@ DESCRIPTION = "kmod is a set of tools to handle common tasks with Linux kernel m
6 insert, remove, list, check properties, resolve dependencies and aliases." 6 insert, remove, list, check properties, resolve dependencies and aliases."
7HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/" 7HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/"
8LICENSE = "GPL-2.0+ & LGPL-2.1+" 8LICENSE = "GPL-2.0+ & LGPL-2.1+"
9LICENSE_libkmod = "LGPL-2.1+" 9LICENSE:libkmod = "LGPL-2.1+"
10SECTION = "base" 10SECTION = "base"
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 12LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 4f2b037f2f..853561a61e 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -5,17 +5,17 @@ require kmod.inc
5 5
6DEPENDS += "zlib" 6DEPENDS += "zlib"
7PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 7PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
8RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 8RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
9RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 9RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
10RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 10RREPLACES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
11 11
12# to force user to remove old module-init-tools and replace them with kmod variants 12# to force user to remove old module-init-tools and replace them with kmod variants
13RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 13RCONFLICTS:libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
14 14
15# autotools set prefix to /usr, however we want them in /bin and /sbin 15# autotools set prefix to /usr, however we want them in /bin and /sbin
16EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}" 16EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}"
17 17
18do_install_append () { 18do_install:append () {
19 install -dm755 ${D}${base_bindir} 19 install -dm755 ${D}${base_bindir}
20 install -dm755 ${D}${base_sbindir} 20 install -dm755 ${D}${base_sbindir}
21 # add symlinks to kmod 21 # add symlinks to kmod
@@ -33,7 +33,7 @@ do_install_append () {
33 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" 33 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
34} 34}
35 35
36do_compile_prepend() { 36do_compile:prepend() {
37 sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status 37 sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status
38} 38}
39 39
@@ -41,7 +41,7 @@ inherit update-alternatives bash-completion
41 41
42ALTERNATIVE_PRIORITY = "70" 42ALTERNATIVE_PRIORITY = "70"
43 43
44ALTERNATIVE_kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" 44ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod"
45 45
46ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" 46ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod"
47ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" 47ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe"
@@ -56,7 +56,7 @@ ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod"
56 56
57PACKAGES =+ "libkmod" 57PACKAGES =+ "libkmod"
58 58
59FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" 59FILES:libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"
60FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" 60FILES:${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"
61 61
62BBCLASSEXTEND = "nativesdk" 62BBCLASSEXTEND = "nativesdk"