summaryrefslogtreecommitdiff
path: root/recipes-devtools
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2021-04-23 04:49:21 -0500
committerJohn Klug <john.klug@multitech.com>2021-04-23 04:49:21 -0500
commit393fc9b3ac7807b2664a9c3ce20389da1f94b61e (patch)
tree633952e9a085e7dc66d60a02e90ad06e7bab15bc /recipes-devtools
parentd1b76660d96c90faf33594a9de45c641c2c1c90f (diff)
downloadmeta-mlinux-393fc9b3ac7807b2664a9c3ce20389da1f94b61e.tar.gz
meta-mlinux-393fc9b3ac7807b2664a9c3ce20389da1f94b61e.tar.bz2
meta-mlinux-393fc9b3ac7807b2664a9c3ce20389da1f94b61e.zip
merge /usr/share/opkg/intercept/modprobe into opkg package
Diffstat (limited to 'recipes-devtools')
-rwxr-xr-xrecipes-devtools/opkg/files/modprobe2
-rw-r--r--recipes-devtools/opkg/opkg_%.bbappend5
2 files changed, 3 insertions, 4 deletions
diff --git a/recipes-devtools/opkg/files/modprobe b/recipes-devtools/opkg/files/modprobe
index 7e32c58..87785dd 100755
--- a/recipes-devtools/opkg/files/modprobe
+++ b/recipes-devtools/opkg/files/modprobe
@@ -1,4 +1,6 @@
#!/bin/sh
+# This script (modprobe) depends on sorting alphabetically after
+# depmod.
echo "modprobe $@" >> $OPKG_INTERCEPT_DIR/depmod
sort -u $OPKG_INTERCEPT_DIR/depmod > $OPKG_INTERCEPT_DIR/depmod.tmp
diff --git a/recipes-devtools/opkg/opkg_%.bbappend b/recipes-devtools/opkg/opkg_%.bbappend
index 99a3f3c..69c1427 100644
--- a/recipes-devtools/opkg/opkg_%.bbappend
+++ b/recipes-devtools/opkg/opkg_%.bbappend
@@ -1,4 +1,4 @@
-PR .= ".mlinux2"
+PR .= ".mlinux3"
SRC_URI += " file://0003-opkg_conf-create-opkg.lock-in-run-lock-instead-of-run.patch \
file://0004-opkg-symlink.patch \
@@ -6,9 +6,6 @@ SRC_URI += " file://0003-opkg_conf-create-opkg.lock-in-run-lock-instead-of-run.p
"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-# Modprobe fix
-PACKAGES =+ "${PN}-modprobe"
-FILES_${PN}-modprobe = "${datadir}/${PN}/intercept/modprobe"
do_install_append() {
install -d ${D}${datadir}/${PN}/intercept
install -m 0755 ${WORKDIR}/modprobe ${D}${datadir}/${PN}/intercept