[PATCH 1/2] arm-autonomy/modutils-initscripts: Revert fix modules.dep update

[PATCH 1/2] arm-autonomy/modutils-initscripts: Revert fix modules.dep update

[Diego Sueiro]

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>
---
 .../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 6cd3e17..2a2fd20 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 c9a7c1f..0000000
--- 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() {
-- 
2.17.1

[PATCH 2/2] arm-autonomy/init: Revert Change execution order between modutils.sh and checkroot.sh

[Diego Sueiro]

This reverts commit a996166e851a9245688fdbbcaf839e239edb5ed4.

The fix was merged in oe-core as: 39f16d7dc42dcfe4a3fcceb8e476ac3c1e0ba3a2

Change-Id: Iab8f7d7b49fe62f04a5c77c1b48ec7c4fcf5c617
Issue-Id: SCM-1520
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
 .../recipes-core/initscripts/initscripts_1.0.bbappend        | 5 -----
 .../modutils-initscripts/modutils-initscripts.bbappend       | 2 --
 2 files changed, 7 deletions(-)
 delete mode 100644 meta-arm-autonomy/recipes-core/initscripts/initscripts_1.0.bbappend
 delete mode 100644 meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend

diff --git a/meta-arm-autonomy/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-arm-autonomy/recipes-core/initscripts/initscripts_1.0.bbappend
deleted file mode 100644
index 5fb2197..0000000
--- a/meta-arm-autonomy/recipes-core/initscripts/initscripts_1.0.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-do_install_append() {
-    # We want to have checkroot.sh running before modutils.sh (06)
-    update-rc.d -r ${D} -f checkroot.sh remove
-    update-rc.d -r ${D} checkroot.sh start 05 S .
-}
diff --git a/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend b/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend
deleted file mode 100644
index 2a2fd20..0000000
--- a/meta-arm-autonomy/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# We want to have modutils.sh running after checkroot.sh (05)
-INITSCRIPT_PARAMS = "start 06 S ."
-- 
2.17.1

Re: [meta-arm] [PATCH 1/2] arm-autonomy/modutils-initscripts: Revert fix modules.dep update

[Jon Mason]

On Tue, Dec 08, 2020 at 02:05:29PM +0000, Diego Sueiro wrote:
> 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>

Both patches applied to master.

Thanks,
Jon

> ---
>  .../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 6cd3e17..2a2fd20 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 c9a7c1f..0000000
> --- 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() {
> -- 
> 2.17.1
> 

> 
> 
>