Dev

.github/workflows/update.yml

@@ -112,9 +112,9 @@ jobs:
           make all
           make install
           make DESTDIR=/source/output install
-          git clone -c http.sslVerify=false --single-branch https://github.com/eudev-project/eudev.git /tmp/eudev
+          git clone -c http.sslVerify=false --single-branch https://github.com/AuxXxilium/eudev.git /tmp/eudev
           cd /tmp/eudev
-          git checkout 3.2.14
+          git checkout master
           ./autogen.sh
           ./configure CC=${CC} --host=${HOST} --prefix=/usr --sysconfdir=/etc --disable-manpages --disable-selinux --disable-mtd_probe --enable-kmod
           [ -z "$(grep 'env.mak' Makefile)" ] && sed -i '1 i include /env.mak' Makefile
@@ -129,7 +129,6 @@ jobs:
           rm -f /source/output/usr/lib/udev/rules.d/60-persistent-storage.rules
           rm -f /source/output/usr/lib/udev/rules.d/60-persistent-storage-tape.rules
           rm -f /source/output/usr/lib/udev/rules.d/80-net-name-slot.rules
-          cp -f /source/input/80-net-name-slot.rules /source/output/usr/lib/udev/rules.d/80-net-name-slot.rules
           chown 1000.1000 -R /source/output
           EOF
 

amepatch/all/usr/sbin/amepatch.sh

@@ -43,21 +43,14 @@ if [ -d "/var/packages/CodecPack" ]; then
     echo "${content}" >"${lic}"
 
 	if "${cp_usr_path}/bin/synoame-bin-check-license"; then
-        [ -d "/var/packages/CodecPack/target/apparmor" ] && apparmor="/var/packages/CodecPack/target/apparmor"
-        [ -d "/volume1/@appstore/CodecPack/apparmor" ] && apparmor="/volume1/@appstore/CodecPack/apparmor"
-        /usr/syno/etc/rc.sysv/apparmor.sh remove_packages_profile 0 CodecPack
-        # disable apparmor check for AME
-        if [ -e "${apparmor}" ]; then
-            mv -f "${apparmor}" "${apparmor}.bak"
-        fi
         ${cp_usr_path}/bin/synoame-bin-auto-install-needed-codec
         echo -e "AME Patch: Successful!"
     else
         echo -e "AME Patch: Unsuccessful!"
         exit 1
    	fi
 
-    sleep 3
+    sleep 10
     /usr/syno/bin/synopkg start CodecPack
 fi
 

eudev/install.sh

@@ -22,30 +22,25 @@ if [ "${1}" = "modules" ]; then
     exit 1
   }
   echo "Triggering add events to udev"
+  udevadm hwdb --update
   udevadm trigger --type=subsystems --action=add
+  udevadm trigger --type=subsystems --action=change
   udevadm trigger --type=devices --action=add
   udevadm trigger --type=devices --action=change
-  udevadm settle --timeout=30 || echo "udevadm settle failed"
+  udevadm settle --timeout=30 || echo "eudev: udevadm settle failed"
   # Give more time
   sleep 10
   # Remove from memory to not conflict with RAID mount scripts
   /usr/bin/killall udevd
 elif [ "${1}" = "late" ]; then
   echo "Starting eudev daemon - late"
-  # The modules of SA6400 still have compatibility issues, temporarily canceling the copy. TODO: to be resolved
-  if [ ! "${ModuleUnique}" = "synology_epyc7002_sa6400" ]; then
-    echo "eudev: copy firmware and modules"
-    export LD_LIBRARY_PATH=/tmpRoot/bin:/tmpRoot/lib
-    /tmpRoot/bin/cp -rnf /usr/lib/firmware/* /tmpRoot/usr/lib/firmware/
-    /tmpRoot/bin/cp -rnf /usr/lib/modules/* /tmpRoot/usr/lib/modules/
-    /usr/sbin/depmod -a -b /tmpRoot/
-  else
-    echo "eudev: copy firmware"
-    export LD_LIBRARY_PATH=/tmpRoot/bin:/tmpRoot/lib
-    /tmpRoot/bin/cp -rnf /usr/lib/modules/* /tmpRoot/usr/lib/modules/
-  fi
-  echo "eudev: Copy rules"
+  echo "eudev: copy Firmware"
+  export LD_LIBRARY_PATH=/tmpRoot/bin:/tmpRoot/lib
+  /tmpRoot/bin/cp -rnf /usr/lib/firmware/* /tmpRoot/usr/lib/firmware/
+  echo "eudev: copy Rules"
   cp -vf /usr/lib/udev/rules.d/* /tmpRoot/usr/lib/udev/rules.d/
+  echo "eudev: copy HWDB"
+  cp -vf /etc/udev/hwdb.d/* /tmpRoot/etc/udev/hwdb.d/
   [ -f "/tmpRoot/lib/systemd/system/udevrules.service" ] && rm -f "/tmpRoot/lib/systemd/system/udevrules.service"
   DEST="/tmpRoot/lib/systemd/system/udevrules.service"
   echo "[Unit]"                                                                  >${DEST}
@@ -54,7 +49,9 @@ elif [ "${1}" = "late" ]; then
   echo "[Service]"                                                              >>${DEST}
   echo "Type=oneshot"                                                           >>${DEST}
   echo "RemainAfterExit=true"                                                   >>${DEST}
+  echo "ExecStart=/usr/bin/udevadm hwdb --update"                               >>${DEST}
   echo "ExecStart=/usr/bin/udevadm control --reload-rules"                      >>${DEST}
+  echo "ExecStart=/usr/bin/udevadm trigger"                                     >>${DEST}
   echo                                                                          >>${DEST}
   echo "[Install]"                                                              >>${DEST}
   echo "WantedBy=multi-user.target"                                             >>${DEST}