Merge pull request #5087 from HiassofT/le10-kernel-overlays2

Move kernel overlays setup to init

packages/linux-firmware/brcmfmac_sdio-firmware/system.d/brcmfmac-firmware.service

@@ -1,6 +1,5 @@
 [Unit]
 Description=Broadcom SDIO Firmware Symlink Service
-After=kernel-overlays.service
 Before=kodi.service
 
 [Service]

packages/sysutils/busybox/package.mk

@@ -136,6 +136,9 @@ makeinstall_target() {
     cp ${PKG_DIR}/scripts/pastebinit ${INSTALL}/usr/bin/
       ln -sf pastebinit ${INSTALL}/usr/bin/paste
 
+  mkdir -p ${INSTALL}/usr/sbin
+    cp ${PKG_DIR}/scripts/kernel-overlays-setup ${INSTALL}/usr/sbin
+
   mkdir -p ${INSTALL}/usr/lib/libreelec
     cp ${PKG_DIR}/scripts/functions ${INSTALL}/usr/lib/libreelec
     cp ${PKG_DIR}/scripts/fs-resize ${INSTALL}/usr/lib/libreelec

packages/sysutils/busybox/scripts/init

@@ -14,6 +14,7 @@
 /usr/bin/busybox mkdir -p /flash
 /usr/bin/busybox mkdir -p /sysroot
 /usr/bin/busybox mkdir -p /storage
+/usr/bin/busybox mkdir -p /run
 
 # temp mountpoint for updates
 /usr/bin/busybox mkdir -p /update
@@ -22,6 +23,8 @@
 /usr/bin/busybox mount -t devtmpfs devtmpfs /dev
 /usr/bin/busybox mount -t proc proc /proc
 /usr/bin/busybox mount -t sysfs sysfs /sys
+# /run options have to match what systemd uses by default
+/usr/bin/busybox mount -t tmpfs -o mode=755,size=20%,nr_inodes=800k,nosuid,nodev,strictatime tmpfs /run
 
 UPDATE_ROOT=/storage/.update
 UPDATE_DIR="$UPDATE_ROOT"
@@ -1110,8 +1113,12 @@ done
 /usr/bin/busybox mount --move /dev /sysroot/dev
 /usr/bin/busybox mount --move /proc /sysroot/proc
 /usr/bin/busybox mount --move /sys /sysroot/sys
+/usr/bin/busybox mount --move /run /sysroot/run
 /usr/bin/busybox rm -fr /tmp
 
+# setup kernel overlays
+/usr/bin/busybox chroot /sysroot /usr/sbin/kernel-overlays-setup
+
 # tell OE settings addon to disable updates
 if [ "$UPDATE_DISABLED" = "yes" ]; then
   echo "" > /sysroot/dev/.update_disabled

packages/sysutils/busybox/scripts/kernel-overlays-setup

@@ -13,7 +13,6 @@ USER_FIRMWARE_DIR="/storage/.config/firmware"
 
 mkdir -p "${MODULES_DIR}"
 mkdir -p "${FIRMWARE_DIR}"
-mkdir -p "${OVERLAY_CONFIG_DIR}"
 
 log() {
   echo "kernel-overlays-setup: $@" > /dev/kmsg

packages/sysutils/busybox/system.d/rpi-flash-firmware.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=RPi Flash Firmware
-Requires=tmp.mount var.mount sys-kernel-config.mount kernel-overlays.service
+Requires=tmp.mount var.mount sys-kernel-config.mount
-After=tmp.mount var.mount sys-kernel-config.mount kernel-overlays.service
+After=tmp.mount var.mount sys-kernel-config.mount
 DefaultDependencies=no
 
 [Service]

packages/sysutils/busybox/tmpfiles.d/z_01_busybox.conf

@@ -6,5 +6,6 @@ d    /var/media                0755 root root - -
 d    /storage/backup           0755 root root - -
 d    /storage/.update          0755 root root - -
 d    /storage/.cache/cores     0755 root root - -
+d    /storage/.cache/kernel-overlays  0755 root root - -
 d    /storage/.cache/services  0755 root root - -
 d    /storage/.config          0755 root root - -

packages/sysutils/systemd/package.mk

@@ -214,7 +214,6 @@ post_makeinstall_target() {
   find_file_path scripts/cpufreq && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/bin
 
   mkdir -p ${INSTALL}/usr/sbin
-  cp ${PKG_DIR}/scripts/kernel-overlays-setup ${INSTALL}/usr/sbin
   cp ${PKG_DIR}/scripts/network-base-setup ${INSTALL}/usr/sbin
   cp ${PKG_DIR}/scripts/systemd-timesyncd-setup ${INSTALL}/usr/sbin
 
@@ -282,7 +281,6 @@ post_install() {
   enable_service userconfig.service
   enable_service usercache.service
   enable_service envconfig.service
-  enable_service kernel-overlays.service
   enable_service hwdb.service
   enable_service cpufreq.service
   enable_service network-base.service

packages/sysutils/systemd/system.d/kernel-overlays.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Create kernel modules tree from overlays
-DefaultDependencies=no
-Before=systemd-udevd.service systemd-udev-trigger.service systemd-modules-load.service systemd-remount-fs.service swap.service machine-id.service kmod-static-nodes.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/kernel-overlays-setup
-
-[Install]
-WantedBy=local-fs.target

packages/sysutils/systemd/system.d/modprobe@.service.d/dependencies.conf

@@ -1,2 +0,0 @@
-[Unit]
-After=kernel-overlays.service