diff options
Diffstat (limited to 'meta/recipes-kernel/modutils-initscripts')
3 files changed, 13 insertions, 18 deletions
diff --git a/meta/recipes-kernel/modutils-initscripts/files/PD.patch b/meta/recipes-kernel/modutils-initscripts/files/PD.patch deleted file mode 100644 index 21ac49cbd8..0000000000 --- a/meta/recipes-kernel/modutils-initscripts/files/PD.patch +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [licensing] | ||
2 | |||
3 | Index: modutils-initscripts-1.0/LICENSE | ||
4 | =================================================================== | ||
5 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
6 | +++ modutils-initscripts-1.0/LICENSE 2010-12-06 14:26:03.570339002 -0800 | ||
7 | @@ -0,0 +1 @@ | ||
8 | +Public Domain | ||
diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index 28fe6f92d7..e9aaa66cb7 100755 --- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh +++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh | |||
@@ -1,4 +1,8 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | ||
3 | # SPDX-License-Identifier: MIT | ||
4 | # | ||
5 | |||
2 | ### BEGIN INIT INFO | 6 | ### BEGIN INIT INFO |
3 | # Provides: module-init-tools | 7 | # Provides: module-init-tools |
4 | # Required-Start: | 8 | # Required-Start: |
@@ -13,6 +17,7 @@ | |||
13 | 17 | ||
14 | LOAD_MODULE=modprobe | 18 | LOAD_MODULE=modprobe |
15 | [ -f /proc/modules ] || exit 0 | 19 | [ -f /proc/modules ] || exit 0 |
20 | [ -d /lib/modules/`uname -r` ] || exit 0 | ||
16 | 21 | ||
17 | # Test if modules.dep exists and has a size greater than zero | 22 | # Test if modules.dep exists and has a size greater than zero |
18 | if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then | 23 | if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then |
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index 97b4ddb88b..49268445a8 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | |||
@@ -1,13 +1,11 @@ | |||
1 | SUMMARY = "Initscript for auto-loading kernel modules on boot" | 1 | SUMMARY = "Initscript for auto-loading kernel modules on boot" |
2 | SECTION = "base" | 2 | SECTION = "base" |
3 | LICENSE = "PD" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098" | 4 | LIC_FILES_CHKSUM = "file://modutils.sh;beginline=3;endline=3;md5=b2dccaa94b3629a08bfb4f983cad6f89" |
5 | SRC_URI = "file://modutils.sh \ | 5 | SRC_URI = "file://modutils.sh" |
6 | file://PD.patch" | ||
7 | 6 | ||
8 | PR = "r7" | 7 | S = "${WORKDIR}/sources" |
9 | 8 | UNPACKDIR = "${S}" | |
10 | S = "${WORKDIR}" | ||
11 | 9 | ||
12 | INITSCRIPT_NAME = "modutils.sh" | 10 | INITSCRIPT_NAME = "modutils.sh" |
13 | INITSCRIPT_PARAMS = "start 06 S ." | 11 | INITSCRIPT_PARAMS = "start 06 S ." |
@@ -19,11 +17,11 @@ do_compile () { | |||
19 | 17 | ||
20 | do_install () { | 18 | do_install () { |
21 | install -d ${D}${sysconfdir}/init.d/ | 19 | install -d ${D}${sysconfdir}/init.d/ |
22 | install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/ | 20 | install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/ |
23 | } | 21 | } |
24 | 22 | ||
25 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 23 | PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
26 | pkg_postinst_${PN} () { | 24 | pkg_postinst:${PN} () { |
27 | if type systemctl >/dev/null 2>/dev/null; then | 25 | if type systemctl >/dev/null 2>/dev/null; then |
28 | if [ -n "$D" ]; then | 26 | if [ -n "$D" ]; then |
29 | OPTS="--root=$D" | 27 | OPTS="--root=$D" |