From be53d1a4677d085e6a46c7cb5dcda3d0ebb5ea9c Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Sun, 27 Jun 2021 11:16:02 -0700
Subject: initramfs-framework: rename files dir

Fixes:
ERROR: initramfs-framework-1.0-r4 do_fetch: Fetcher failure for URL: 'file://dmverity'. Unable to fetch URL from any source.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../initrdscripts/initramfs-framework-dm/dmverity  | 63 ++++++++++++++++++++++
 recipes-core/initrdscripts/initramfs-framework.inc |  2 +-
 .../initrdscripts/initramfs-framework/dmverity     | 63 ----------------------
 3 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 recipes-core/initrdscripts/initramfs-framework-dm/dmverity
 delete mode 100644 recipes-core/initrdscripts/initramfs-framework/dmverity

(limited to 'recipes-core/initrdscripts')

diff --git a/recipes-core/initrdscripts/initramfs-framework-dm/dmverity b/recipes-core/initrdscripts/initramfs-framework-dm/dmverity
new file mode 100644
index 0000000..888052c
--- /dev/null
+++ b/recipes-core/initrdscripts/initramfs-framework-dm/dmverity
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+dmverity_enabled() {
+    return 0
+}
+
+dmverity_run() {
+    DATA_SIZE="__not_set__"
+    ROOT_HASH="__not_set__"
+
+    . /usr/share/misc/dm-verity.env
+
+    C=0
+    delay=${bootparam_rootdelay:-1}
+    timeout=${bootparam_roottimeout:-5}
+    RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
+    while [ ! -b "${RDEV}" ]; do
+        if [ $(( $C * $delay )) -gt $timeout ]; then
+            fatal "Root device resolution failed"
+            exit 1
+        fi
+
+        case "${bootparam_root}" in
+            ID=*)
+                RDEV="$(realpath /dev/disk/by-id/${bootparam_root#ID=})"
+                ;;
+            LABEL=*)
+                RDEV="$(realpath /dev/disk/by-label/${bootparam_root#LABEL=})"
+                ;;
+            PARTLABEL=*)
+                RDEV="$(realpath /dev/disk/by-partlabel/${bootparam_root#PARTLABEL=})"
+                ;;
+            PARTUUID=*)
+                RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
+                ;;
+            PATH=*)
+                RDEV="$(realpath /dev/disk/by-path/${bootparam_root#PATH=})"
+                ;;
+            UUID=*)
+                RDEV="$(realpath /dev/disk/by-uuid/${bootparam_root#UUID=})"
+                ;;
+            *)
+                RDEV="${bootparam_root}"
+        esac
+        debug "Sleeping for $delay second(s) to wait root to settle..."
+        sleep $delay
+        C=$(( $C + 1 ))
+
+    done
+
+    veritysetup \
+        --data-block-size=1024 \
+        --hash-offset=${DATA_SIZE} \
+        create rootfs \
+        ${RDEV} \
+        ${RDEV} \
+        ${ROOT_HASH}
+
+    mount \
+        -o ro \
+        /dev/mapper/rootfs \
+        ${ROOTFS_DIR} || exit 2
+}
diff --git a/recipes-core/initrdscripts/initramfs-framework.inc b/recipes-core/initrdscripts/initramfs-framework.inc
index dad9c96..12010bf 100644
--- a/recipes-core/initrdscripts/initramfs-framework.inc
+++ b/recipes-core/initrdscripts/initramfs-framework.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework-dm:"
 
 SRC_URI_append = "\
     file://dmverity \
diff --git a/recipes-core/initrdscripts/initramfs-framework/dmverity b/recipes-core/initrdscripts/initramfs-framework/dmverity
deleted file mode 100644
index 888052c..0000000
--- a/recipes-core/initrdscripts/initramfs-framework/dmverity
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-dmverity_enabled() {
-    return 0
-}
-
-dmverity_run() {
-    DATA_SIZE="__not_set__"
-    ROOT_HASH="__not_set__"
-
-    . /usr/share/misc/dm-verity.env
-
-    C=0
-    delay=${bootparam_rootdelay:-1}
-    timeout=${bootparam_roottimeout:-5}
-    RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
-    while [ ! -b "${RDEV}" ]; do
-        if [ $(( $C * $delay )) -gt $timeout ]; then
-            fatal "Root device resolution failed"
-            exit 1
-        fi
-
-        case "${bootparam_root}" in
-            ID=*)
-                RDEV="$(realpath /dev/disk/by-id/${bootparam_root#ID=})"
-                ;;
-            LABEL=*)
-                RDEV="$(realpath /dev/disk/by-label/${bootparam_root#LABEL=})"
-                ;;
-            PARTLABEL=*)
-                RDEV="$(realpath /dev/disk/by-partlabel/${bootparam_root#PARTLABEL=})"
-                ;;
-            PARTUUID=*)
-                RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
-                ;;
-            PATH=*)
-                RDEV="$(realpath /dev/disk/by-path/${bootparam_root#PATH=})"
-                ;;
-            UUID=*)
-                RDEV="$(realpath /dev/disk/by-uuid/${bootparam_root#UUID=})"
-                ;;
-            *)
-                RDEV="${bootparam_root}"
-        esac
-        debug "Sleeping for $delay second(s) to wait root to settle..."
-        sleep $delay
-        C=$(( $C + 1 ))
-
-    done
-
-    veritysetup \
-        --data-block-size=1024 \
-        --hash-offset=${DATA_SIZE} \
-        create rootfs \
-        ${RDEV} \
-        ${RDEV} \
-        ${ROOT_HASH}
-
-    mount \
-        -o ro \
-        /dev/mapper/rootfs \
-        ${ROOTFS_DIR} || exit 2
-}
-- 
cgit v1.2.3-54-g00ecf