From 719a003508b82b2dee8fbb3fe57f5df17189dd7b Mon Sep 17 00:00:00 2001
From: Diego Sueiro <diego.sueiro@arm.com>
Date: Tue, 8 Dec 2020 14:05:29 +0000
Subject: [PATCH] arm-autonomy/modutils-initscripts: Revert fix modules.dep
 update

This reverts commit 9872afc6c7de4f2d83a11ab4cf57593b0b02661d.

The fix was merged in oe-core as: 572f3045faa0a937947fbd56bcfef7bad55e9da6

Change-Id: Ib9531c1d18ac743c063afe66de18015472cdbb3d
Issue-Id: SCM-1520
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../modutils-initscripts.bbappend             |  4 ---
 .../fix-modules-dep-creation.patch            | 33 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts/fix-modules-dep-creation.patch

diff --git a/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend b/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend
index 6cd3e175..2a2fd207 100644
--- a/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend
+++ b/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend
@@ -1,6 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append = " file://fix-modules-dep-creation.patch"
-
 # We want to have modutils.sh running after checkroot.sh (05)
 INITSCRIPT_PARAMS = "start 06 S ."
diff --git a/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts/fix-modules-dep-creation.patch b/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts/fix-modules-dep-creation.patch
deleted file mode 100644
index c9a7c1f2..00000000
--- a/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts/fix-modules-dep-creation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-When building an image with USE_DEPMOD="0" we expect that on the first boot the
-modutils.sh initscript to create the modules.dep file if it is empty or not
-present.
-
-Upstream-Status: Pending
-Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
-
-diff --git a/modutils.sh b/modutils.sh
-index a78adf5729..4afd12a9fe 100755
---- a/modutils.sh
-+++ b/modutils.sh
-@@ -13,14 +13,17 @@
- 
- LOAD_MODULE=modprobe
- [ -f /proc/modules ] || exit 0
--[ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0
--[ -e /sbin/modprobe ] || LOAD_MODULE=insmod
- 
--if [ ! -f /lib/modules/`uname -r`/modules.dep ]; then
-+# Test if modules.dep exists and has a size greater than zero
-+if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then
- 	[ "$VERBOSE" != no ] && echo "Calculating module dependencies ..."
--	depmod -Ae
-+	depmod -ae
- fi
- 
-+[ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0
-+[ -e /sbin/modprobe ] || LOAD_MODULE=insmod
-+
-+
- loaded_modules=" "
- 
- process_file() {