From 393fc9b3ac7807b2664a9c3ce20389da1f94b61e Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 23 Apr 2021 04:49:21 -0500
Subject: merge /usr/share/opkg/intercept/modprobe into opkg package

---
 recipes-devtools/opkg/files/modprobe  | 2 ++
 recipes-devtools/opkg/opkg_%.bbappend | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'recipes-devtools')

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
-- 
cgit v1.2.3