diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-kernel/kmod | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-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.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod_git.bb | 18 |
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 | ||
| 8 | inherit native | 8 | inherit native |
| 9 | 9 | ||
| 10 | do_install_append (){ | 10 | do_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." |
| 7 | HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/" | 7 | HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/" |
| 8 | LICENSE = "GPL-2.0+ & LGPL-2.1+" | 8 | LICENSE = "GPL-2.0+ & LGPL-2.1+" |
| 9 | LICENSE_libkmod = "LGPL-2.1+" | 9 | LICENSE:libkmod = "LGPL-2.1+" |
| 10 | SECTION = "base" | 10 | SECTION = "base" |
| 11 | 11 | ||
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 12 | LIC_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 | ||
| 6 | DEPENDS += "zlib" | 6 | DEPENDS += "zlib" |
| 7 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 7 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
| 8 | RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 8 | RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
| 9 | RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 9 | RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
| 10 | RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 10 | RREPLACES:${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 |
| 13 | RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 13 | RCONFLICTS: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 |
| 16 | EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}" | 16 | EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}" |
| 17 | 17 | ||
| 18 | do_install_append () { | 18 | do_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 | ||
| 36 | do_compile_prepend() { | 36 | do_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 | ||
| 42 | ALTERNATIVE_PRIORITY = "70" | 42 | ALTERNATIVE_PRIORITY = "70" |
| 43 | 43 | ||
| 44 | ALTERNATIVE_kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" | 44 | ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" |
| 45 | 45 | ||
| 46 | ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" | 46 | ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" |
| 47 | ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" | 47 | ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" |
| @@ -56,7 +56,7 @@ ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" | |||
| 56 | 56 | ||
| 57 | PACKAGES =+ "libkmod" | 57 | PACKAGES =+ "libkmod" |
| 58 | 58 | ||
| 59 | FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" | 59 | FILES:libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" |
| 60 | FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" | 60 | FILES:${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" |
| 61 | 61 | ||
| 62 | BBCLASSEXTEND = "nativesdk" | 62 | BBCLASSEXTEND = "nativesdk" |
