diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 995e9d65..f8d10fb1 100755
--- a/.github/workflows/update.yml
+++ b/.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
 
diff --git a/.github/workflows/update2.yml b/.github/workflows/update2.yml
deleted file mode 100644
index 33a88a92..00000000
--- a/.github/workflows/update2.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# Copyright (C) 2023 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
-#
-# This is free software, licensed under the MIT License.
-# See /LICENSE for more information.
-#
-
-name: Update Eudev New
-
-on:
-  workflow_dispatch:
-    inputs:
-      push:
-        description: 'push'
-        default: false
-        type: boolean
-      eudev:
-        description: 'update eudev'
-        default: true
-        type: boolean
-
-jobs:
-  eudev:
-    strategy:
-      matrix:
-        include:
-          - version: 7.1
-            platform: apollolake
-
-          - version: 7.2
-            platform: apollolake
-
-    if: inputs.eudev == true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@main
-
-      - name: Init Env
-        run: |
-          git config --global user.email "info@auxxxilium.tech"
-          git config --global user.name "AuxXxilium"
-          sudo timedatectl set-timezone "Europe/Berlin"
-
-      - name: Get EnvDeploy
-        run: |
-          ROOT_PATH=${{ github.workspace }}
-
-          git clone https://github.com/SynologyOpenSource/pkgscripts-ng.git ${ROOT_PATH}/pkgscripts-ng
-          cd ${ROOT_PATH}/pkgscripts-ng
-          git checkout DSM${{ matrix.version }}
-          sudo ./EnvDeploy -v ${{ matrix.version }} -l  # Get Available platforms
-          sudo ./EnvDeploy -q -v ${{ matrix.version }} -p ${{ matrix.platform }}
-
-          # Fault tolerance of pkgscripts-ng
-          if [ "${{ matrix.platform }}" == "broadwellntbap" -a "${{ matrix.version }}" == "7.1" ]; then
-            sed -i '/		broadwellnk	BROADWELLNK/a\		broadwellntbap  BROADWELLNTBAP                  linux-4.4.x             Intel Broadwell with ntb kernel config in AP mode' ${ROOT_PATH}/pkgscripts-ng/include/platforms
-          fi
-
-          #ENV
-          mkdir -p ${ROOT_PATH}/source
-
-          ENV_PATH=${ROOT_PATH}/build_env/ds.${{ matrix.platform }}-${{ matrix.version }}
-          sudo cp -al ${ROOT_PATH}/pkgscripts-ng ${ENV_PATH}/
-
-          sudo chroot ${ENV_PATH} << "EOF"
-          cd pkgscripts
-
-          version=${{ matrix.version }}; [ ${version:0:1} -gt 6 ] && sed -i 's/print(" ".join(kernels))/pass #&/' ProjectDepends.py
-          sed -i '/PLATFORM_FAMILY/a\\techo "PRODUCT=$PRODUCT" >> $file\n\techo "KSRC=$KERNEL_SEARCH_PATH" >> $file\n\techo "LINUX_SRC=$KERNEL_SEARCH_PATH" >> $file' include/build
-          ./SynoBuild -c -p ${{ matrix.platform }}
-
-          while read line; do if [ ${line:0:1} != "#" ]; then export ${line%%=*}="${line#*=}"; fi; done < /env${BUILD_ARCH}.mak
-          if [ -f "${KSRC}/Makefile" ]; then
-            # gcc issue "unrecognized command-line option '--param=allow-store-data-races=0'".
-            [ "${{ matrix.version }}" == "7.2" ] && sed -i 's/--param=allow-store-data-races=0/--allow-store-data-races/g' ${KSRC}/Makefile
-
-            VERSION=`cat ${KSRC}/Makefile | grep ^VERSION | awk -F' ' '{print $3}'`
-            PATCHLEVEL=`cat ${KSRC}/Makefile | grep ^PATCHLEVEL | awk -F' ' '{print $3}'`
-            SUBLEVEL=`cat ${KSRC}/Makefile | grep ^SUBLEVEL | awk -F' ' '{print $3}'`
-            [ -f "/env32.mak" ] && echo "KVER=${VERSION}.${PATCHLEVEL}.${SUBLEVEL}" >> /env32.mak
-            [ -f "/env64.mak" ] && echo "KVER=${VERSION}.${PATCHLEVEL}.${SUBLEVEL}" >> /env64.mak
-            CCVER=`$CC -v 2>&1 | tail -n 1 | awk -F' ' '{print $3}'`
-            [ -f "/env32.mak" ] && echo "CCVER=${CCVER}" >> /env32.mak
-            [ -f "/env64.mak" ] && echo "CCVER=${CCVER}" >> /env64.mak
-          fi
-          EOF
-
-          [ -f ${ENV_PATH}/env64.mak ] && ENV_FILE=${ENV_PATH}/env64.mak || ([ -f ${ENV_PATH}/env32.mak ] && ENV_FILE=${ENV_PATH}/env32.mak)
-          if [ -n "${ENV_FILE}" ]; then
-            KVER=`grep 'KVER=' ${ENV_FILE} | awk -F'=' '{print $2}'`
-            CCVER=`grep 'CCVER=' ${ENV_FILE} | awk -F'=' '{print $2}'`
-            [ -n "${KVER}" ] && echo "KVER=${KVER}" >> $GITHUB_ENV
-            [ -n "${CCVER}" ] && echo "CCVER=${CCVER}" >> $GITHUB_ENV
-          fi
-
-      - name: Make
-        run: |
-          ROOT_PATH=${{ github.workspace }}
-
-          sudo chroot build_env/ds.${{ matrix.platform }}-${{ matrix.version }} << "EOF"
-          sed -i 's/^CFLAGS=/#CFLAGS=/g; s/^CXXFLAGS=/#CXXFLAGS=/g' /env${BUILD_ARCH}.mak
-          while read line; do if [ ${line:0:1} != "#" ]; then export ${line%%=*}="${line#*=}"; fi; done < /env${BUILD_ARCH}.mak
-
-          git clone -c http.sslVerify=false --single-branch https://github.com/kmod-project/kmod.git /tmp/kmod
-          cd /tmp/kmod
-          git checkout master
-          patch -p1 < /source/input/kmod.patch
-          ./autogen.sh
-          ./configure CC=${CC} CFLAGS='-O2' --host=${HOST} --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --enable-tools --disable-manpages --disable-python --without-zstd --without-xz --without-zlib --without-openssl
-          [ -z "`grep 'env.mak' Makefile`" ] && sed -i '1 i include /env.mak' Makefile
-          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
-          cd /tmp/eudev
-          git checkout 3.2.14
-          ./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
-          make -i CFLAGS="-DSG_FLAG_LUN_INHIBIT=2" all
-          make -i CFLAGS="-DSG_FLAG_LUN_INHIBIT=2" DESTDIR=/source/output install
-          # ldd /source/output/usr/bin/kmod | awk  '{if (match($3,"/")){ printf("%s "),$3 } }'
-          # ldd /source/output/usr/bin/udevadm | awk  '{if (match($3,"/")){ printf("%s "),$3 } }'
-          rm -Rf /source/output/usr/share /source/output/usr/include /source/output/usr/lib/pkgconfig /source/output/usr/lib/libudev.*
-          cp -f ${ToolChainSysRoot}/usr/lib/libblkid.so.1 /source/output/usr/lib/libblkid.so.1
-          ln -sf /usr/bin/kmod /source/output/usr/sbin/depmod
-          cp -f /source/input/99-usb-realtek-net.rules /source/output/usr/lib/udev/rules.d/99-usb-realtek-net.rules
-          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
-          chown 1000.1000 -R /source/output
-          EOF
-
-          sudo cp -a ${ROOT_PATH}/build_env/ds.${{ matrix.platform }}-${{ matrix.version }}/source/output ${ROOT_PATH}/source/
-          sudo chmod a+rw -R ${ROOT_PATH}/source/output
-
-      - name: Tar to Artifacts
-        run: |
-          tar caf ${{ github.workspace }}/source/eudev-${{ matrix.version }}.tgz -C ${{ github.workspace }}/source/output .
-
-      - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: addons
-          path: |
-            ${{ github.workspace }}/source/*.tgz
-
-      - name: clean
-        run: |
-          sudo rm -rf ${{ github.workspace }}/build_env/ds.${{ matrix.platform }}-${{ matrix.version }}/source/*
-
-  release:
-    runs-on: ubuntu-latest
-    needs: eudev
-    if: inputs.push == true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@main
-
-      - name: Init Env
-        run: |
-          git config --global user.email "info@auxxxilium.tech"
-          git config --global user.name "AuxXxilium"
-          sudo timedatectl set-timezone "Europe/Berlin"
-
-      - name: download to artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: addons
-          path: ./artifacts
-
-      - name: Check and Push
-        run: |
-          if [ $(ls artifacts/*.tgz 2> /dev/null | wc -l) -gt 0 ]; then
-            echo "Copy eudev ..."
-            rm -rf eudev/all/addons/*
-            mv -f artifacts/*.tgz eudev/all/addons/
-
-            echo "Git push ..."
-            git pull
-            status=$(git status -s | grep -E 'eudev/all/addons/' | awk '{printf " %s", $2}')
-            if [ -n "${status}" ]; then
-              git add ${status}
-              git commit -m "eudev: update $(date +%Y-%m-%d" "%H:%M:%S)"
-              git push -f
-            fi
-          else
-            echo "No change ..."
-          fi
\ No newline at end of file
diff --git a/amepatch/all/usr/sbin/amepatch.sh b/amepatch/all/usr/sbin/amepatch.sh
index 5858fba6..6b4b7469 100755
--- a/amepatch/all/usr/sbin/amepatch.sh
+++ b/amepatch/all/usr/sbin/amepatch.sh
@@ -43,13 +43,6 @@ 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
@@ -57,7 +50,7 @@ if [ -d "/var/packages/CodecPack" ]; then
         exit 1
    	fi
 
-    sleep 3
+    sleep 10
     /usr/syno/bin/synopkg start CodecPack
 fi
 
diff --git a/eudev/install.sh b/eudev/install.sh
index 177ecf3e..57e667e3 100755
--- a/eudev/install.sh
+++ b/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}
diff --git a/eudevlite/all/addons/eudev-7.1.tgz b/eudevlite/all/addons/eudev-7.1.tgz
deleted file mode 100755
index 6af2feb5..00000000
Binary files a/eudevlite/all/addons/eudev-7.1.tgz and /dev/null differ
diff --git a/eudevlite/all/addons/eudev-7.2.tgz b/eudevlite/all/addons/eudev-7.2.tgz
deleted file mode 100755
index c2c4eda4..00000000
Binary files a/eudevlite/all/addons/eudev-7.2.tgz and /dev/null differ
diff --git a/eudevlite/install.sh b/eudevlite/install.sh
deleted file mode 100755
index aa75fbb0..00000000
--- a/eudevlite/install.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env ash
-
-# DSM version
-MajorVersion=$(/bin/get_key_value /etc.defaults/VERSION majorversion)
-MinorVersion=$(/bin/get_key_value /etc.defaults/VERSION minorversion)
-ModuleUnique=$(/bin/get_key_value /etc.defaults/VERSION unique) # Avoid confusion with global variables
-
-echo "eudev: MajorVersion:${MajorVersion} MinorVersion:${MinorVersion}"
-
-if [ "${1}" = "modules" ]; then
-  echo "Starting eudev daemon - modules"
-  if [ "${MinorVersion}" -lt "2" ]; then # < 2
-    tar zxf /addons/eudev-7.1.tgz -C /
-  else
-    tar zxf /addons/eudev-7.2.tgz -C /
-  fi
-  [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' >/proc/sys/kernel/hotplug
-  chmod 755 /usr/sbin/udevd /usr/bin/kmod /usr/bin/udevadm /usr/lib/udev/*
-  cp -f /etc/udev/hwdb.bin /usr/lib/udev/hwdb.bin
-  /usr/sbin/depmod -a
-  /usr/sbin/udevd -d || {
-    echo "FAIL"
-    exit 1
-  }
-  echo "Triggering add events to udev"
-  udevadm trigger --type=subsystems --action=add
-  udevadm trigger --type=devices --action=add
-  udevadm trigger --type=devices --action=change
-  udevadm settle --timeout=30 || echo "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"
-    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/firmware/* /tmpRoot/usr/lib/firmware/
-  fi
-  echo "eudev: Copy rules"
-  cp -vf /usr/lib/udev/rules.d/* /tmpRoot/usr/lib/udev/rules.d/
-  mkdir -p /tmpRoot/etc/udev
-  cp -vf /etc/udev/hwdb.bin /tmpRoot/etc/udev/hwdb.bin
-  mkdir -p /tmpRoot/usr/lib/udev
-  cp -vf /etc/udev/hwdb.bin /tmpRoot/usr/lib/udev/hwdb.bin
-  [ -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}
-  echo "Description=Reload udev rules"                                          >>${DEST}
-  echo                                                                          >>${DEST}
-  echo "[Service]"                                                              >>${DEST}
-  echo "Type=oneshot"                                                           >>${DEST}
-  echo "RemainAfterExit=true"                                                   >>${DEST}
-  echo "ExecStart=/usr/bin/udevadm control --reload-rules"                      >>${DEST}
-  echo                                                                          >>${DEST}
-  echo "[Install]"                                                              >>${DEST}
-  echo "WantedBy=multi-user.target"                                             >>${DEST}
-
-  mkdir -vp /tmpRoot/lib/systemd/system/multi-user.target.wants
-  ln -vsf /lib/systemd/system/udevrules.service /tmpRoot/lib/systemd/system/multi-user.target.wants/udevrules.service
-fi
diff --git a/eudevlite/manifest.yml b/eudevlite/manifest.yml
deleted file mode 100644
index fd8cdfda..00000000
--- a/eudevlite/manifest.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: 1
-name: eudevlite
-description: "eudev + kmod will assist with auto module loading"
-system: true
-beta: false
-all:
-  install-script: "install.sh"
-  copy: "all"
-apollolake: true
-broadwell: true
-broadwellnk: true
-broadwellnkv2: true
-broadwellntbap: true
-denverton: true
-geminilake: true
-purley: true
-v1000: true
-r1000: true
-epyc7002: true
\ No newline at end of file
diff --git a/eudevlite/src/62-nut-usbups.rules b/eudevlite/src/62-nut-usbups.rules
deleted file mode 100644
index 6c7ec5c7..00000000
--- a/eudevlite/src/62-nut-usbups.rules
+++ /dev/null
@@ -1,237 +0,0 @@
-# This file is generated and installed by the Network UPS Tools package.
-
-ACTION!="add|change", GOTO="nut-usbups_rules_end"
-SUBSYSTEM=="usb_device", GOTO="nut-usbups_rules_real"
-SUBSYSTEM=="usb", GOTO="nut-usbups_rules_real"
-SUBSYSTEM!="usb", GOTO="nut-usbups_rules_end"
-
-LABEL="nut-usbups_rules_real"
-#  ATCL FOR UPS  - nutdrv_atcl_usb
-ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="root"
-
-# Hewlett Packard
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="0001", MODE="664", GROUP="root"
-#  T500  - bcmxcp_usb
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f01", MODE="664", GROUP="root"
-#  T750  - bcmxcp_usb
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f02", MODE="664", GROUP="root"
-#  HP T750 INTL  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f06", MODE="664", GROUP="root"
-#  HP T1000 INTL  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f08", MODE="664", GROUP="root"
-#  HP T1500 INTL  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f09", MODE="664", GROUP="root"
-#  HP R/T 2200 INTL (like SMART2200RMXL2U)  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f0a", MODE="664", GROUP="root"
-#  HP R1500 G2 and G3 INTL  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe0", MODE="664", GROUP="root"
-#  HP T750 G2  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe1", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe2", MODE="664", GROUP="root"
-#  HP T1500 G3  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe3", MODE="664", GROUP="root"
-#  R/T3000  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe5", MODE="664", GROUP="root"
-#  R/T3000  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe6", MODE="664", GROUP="root"
-#  various models  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe7", MODE="664", GROUP="root"
-#  various models  - usbhid-ups
-ATTR{idVendor}=="03f0", ATTR{idProduct}=="1fe8", MODE="664", GROUP="root"
-
-# Eaton
-#  various models  - usbhid-ups
-ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="root"
-#  various models  - usbhid-ups
-ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="root"
-
-# Dell
-#  various models  - usbhid-ups
-ATTR{idVendor}=="047c", ATTR{idProduct}=="ffff", MODE="664", GROUP="root"
-#  TS Shara UPSes  - nutdrv_qx
-ATTR{idVendor}=="0483", ATTR{idProduct}=="0035", MODE="664", GROUP="root"
-
-# Riello (Cypress Semiconductor Corp.)
-#  various models  - riello_usb
-ATTR{idVendor}=="04b4", ATTR{idProduct}=="5500", MODE="664", GROUP="root"
-
-# Minibox
-#  openUPS Intelligent UPS (minimum required firmware 1.4)  - usbhid-ups
-ATTR{idVendor}=="04d8", ATTR{idProduct}=="d004", MODE="664", GROUP="root"
-#  openUPS Intelligent UPS (minimum required firmware 1.4)  - usbhid-ups
-ATTR{idVendor}=="04d8", ATTR{idProduct}=="d005", MODE="664", GROUP="root"
-
-# Belkin
-#  F6H375-USB  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0375", MODE="664", GROUP="root"
-#  F6C550-AVR  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="root"
-#  F6C1250-TW-RK  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0750", MODE="664", GROUP="root"
-#  F6C1500-TW-RK  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="root"
-#  F6C900-UNV  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="root"
-#  F6C100-UNV  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="root"
-#  F6C120-UNV  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="root"
-#  F6C800-UNV  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="root"
-#  Regulator PRO-USB  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0f51", MODE="664", GROUP="root"
-#  F6C1100-UNV, F6C1200-UNV  - usbhid-ups
-ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="root"
-
-# APC
-#  APC AP9584 Serial->USB kit  - usbhid-ups
-ATTR{idVendor}=="051d", ATTR{idProduct}=="0000", MODE="664", GROUP="root"
-#  various models  - usbhid-ups
-ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="root"
-#  various 5G models  - usbhid-ups
-ATTR{idVendor}=="051d", ATTR{idProduct}=="0003", MODE="664", GROUP="root"
-ATTR{idVendor}=="051d", ATTR{idProduct}=="0004", MODE="664", GROUP="root"
-
-# Powerware
-#  various models  - bcmxcp_usb
-ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="root"
-#  PW 9140  - usbhid-ups
-ATTR{idVendor}=="0592", ATTR{idProduct}=="0004", MODE="664", GROUP="root"
-#  Agiler UPS  - blazer_usb
-ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="root"
-#  Belkin F6C1200-UNV  - blazer_usb
-ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="root"
-
-# Phoenixtec Power Co., Ltd
-#  various models  - bcmxcp_usb
-ATTR{idVendor}=="06da", ATTR{idProduct}=="0002", MODE="664", GROUP="root"
-#  Mustek Powermust  - blazer_usb
-ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="root"
-#  Phoenixtec Innova 3/1 T  - blazer_usb
-ATTR{idVendor}=="06da", ATTR{idProduct}=="0004", MODE="664", GROUP="root"
-#  Phoenixtec Innova RT  - blazer_usb
-ATTR{idVendor}=="06da", ATTR{idProduct}=="0005", MODE="664", GROUP="root"
-#  Phoenixtec Innova T  - blazer_usb
-ATTR{idVendor}=="06da", ATTR{idProduct}=="0201", MODE="664", GROUP="root"
-#  Online Zinto A  - blazer_usb
-ATTR{idVendor}=="06da", ATTR{idProduct}=="0601", MODE="664", GROUP="root"
-#  various models  - usbhid-ups
-ATTR{idVendor}=="06da", ATTR{idProduct}=="ffff", MODE="664", GROUP="root"
-
-# iDowell
-#  iDowell  - usbhid-ups
-ATTR{idVendor}=="075d", ATTR{idProduct}=="0300", MODE="664", GROUP="root"
-
-# Cyber Power Systems
-#  900AVR/BC900D  - usbhid-ups
-ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="root"
-#  Dynex DX-800U?, CP1200AVR/BC1200D, CP825AVR-G, CP1000AVRLCD, CP1000PFCLCD, CP1500C, CP550HG, etc.  - usbhid-ups
-ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="root"
-#  OR2200LCDRM2U, OR700LCDRM1U, PR6000LCDRTXL5U  - usbhid-ups
-ATTR{idVendor}=="0764", ATTR{idProduct}=="0601", MODE="664", GROUP="root"
-#  Sweex 1000VA  - richcomm_usb
-ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="root"
-
-# TrippLite
-#  e.g. OMNIVS1000, SMART550USB, ...  - tripplite_usb
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="root"
-#  e.g. TrippLite AVR550U  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="root"
-#  e.g. TrippLite AVR750U  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="1007", MODE="664", GROUP="root"
-#  e.g. TrippLite ECO550UPS  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="1008", MODE="664", GROUP="root"
-#  e.g. TrippLite ECO550UPS  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="1009", MODE="664", GROUP="root"
-#  e.g. TrippLite ECO550UPS  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="1010", MODE="664", GROUP="root"
-#  e.g. TrippLite OMNI1000LCD  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="root"
-#  e.g. TrippLite OMNI900LCD  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2007", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2008", MODE="664", GROUP="root"
-#  e.g. TrippLite Smart1000LCD  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2009", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2010", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2011", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2012", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2013", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="2014", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3008", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3009", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3010", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3011", MODE="664", GROUP="root"
-#  e.g. TrippLite smart2200RMXL2U  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3013", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3014", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3015", MODE="664", GROUP="root"
-#  e.g. TrippLite Smart1500LCD (newer unit)  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="3016", MODE="664", GROUP="root"
-#  e.g. TrippLite SmartOnline SU1500RTXL2UA (older unit?)  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4001", MODE="664", GROUP="root"
-#  e.g. TrippLite SmartOnline SU6000RT4U?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="root"
-#  e.g. TrippLite SmartOnline SU1500RTXL2ua  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="root"
-#  e.g. TrippLite SmartOnline SU1000XLA  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4004", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4005", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4006", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4007", MODE="664", GROUP="root"
-#  e.g. ?  - usbhid-ups
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="4008", MODE="664", GROUP="root"
-
-# PowerCOM
-#  PowerCOM Vanguard and BNT-xxxAP  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0001", MODE="664", GROUP="root"
-#  PowerCOM Vanguard and BNT-xxxAP  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0004", MODE="664", GROUP="root"
-#  PowerCOM IMP - IMPERIAL Series  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a2", MODE="664", GROUP="root"
-#  PowerCOM SKP - Smart KING Pro (all Smart series)  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a3", MODE="664", GROUP="root"
-#  PowerCOM WOW  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a4", MODE="664", GROUP="root"
-#  PowerCOM VGD - Vanguard  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a5", MODE="664", GROUP="root"
-#  PowerCOM BNT - Black Knight Pro  - usbhid-ups
-ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a6", MODE="664", GROUP="root"
-#  Unitek Alpha 1200Sx  - blazer_usb
-ATTR{idVendor}=="0f03", ATTR{idProduct}=="0001", MODE="664", GROUP="root"
-
-# Liebert
-#  Liebert PowerSure PSA UPS  - usbhid-ups
-ATTR{idVendor}=="10af", ATTR{idProduct}=="0001", MODE="664", GROUP="root"
-#  Liebert PowerSure PSI 1440  - usbhid-ups
-ATTR{idVendor}=="10af", ATTR{idProduct}=="0004", MODE="664", GROUP="root"
-#  Liebert GXT3  - usbhid-ups
-ATTR{idVendor}=="10af", ATTR{idProduct}=="0008", MODE="664", GROUP="root"
-#  GE EP series  - blazer_usb
-ATTR{idVendor}=="14f0", ATTR{idProduct}=="00c9", MODE="664", GROUP="root"
-
-# AEG
-#  PROTECT B / NAS  - usbhid-ups
-ATTR{idVendor}=="2b2d", ATTR{idProduct}=="ffff", MODE="664", GROUP="root"
-#  Ablerex 625L USB  - blazer_usb
-ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="root"
-
-LABEL="nut-usbups_rules_end"
diff --git a/eudevlite/src/80-net-name-slot.rules b/eudevlite/src/80-net-name-slot.rules
deleted file mode 100644
index e69de29b..00000000
diff --git a/eudevlite/src/99-qed.rules b/eudevlite/src/99-qed.rules
deleted file mode 100644
index 19472e7e..00000000
--- a/eudevlite/src/99-qed.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="pci", DRIVER=="qed*", ACTION=="change", ENV{QED_DEBUGFS_BDF_DBG}=="?*", RUN+="/lib/udev/qed_udev_dbg.sh"
diff --git a/eudevlite/src/99-qedstor.rules b/eudevlite/src/99-qedstor.rules
deleted file mode 100644
index aa872584..00000000
--- a/eudevlite/src/99-qedstor.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# RULES FILE: located in /etc/udev/rules.d/
-#
-# qedstor drivers
-SUBSYSTEMS=="pci", ATTRS{class}=="0x020000", ACTION=="change", RUN+="qedstor_udev.sh"
diff --git a/eudevlite/src/99-usb-realtek-net.rules b/eudevlite/src/99-usb-realtek-net.rules
deleted file mode 100644
index 9589b19d..00000000
--- a/eudevlite/src/99-usb-realtek-net.rules
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is used to change the default configuration of Realtek USB ethernet adapters
-
-ACTION!="add", GOTO="usb_realtek_net_end"
-SUBSYSTEM!="usb", GOTO="usb_realtek_net_end"
-ENV{DEVTYPE}!="usb_device", GOTO="usb_realtek_net_end"
-
-# Modify this to change the default value
-ENV{REALTEK_MODE1}="1"
-ENV{REALTEK_MODE2}="3"
-
-# Realtek
-ATTR{idVendor}=="0bda", ATTR{idProduct}=="815[2,3,5,6]", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="0bda", ATTR{idProduct}=="8053", ATTR{bcdDevice}=="e???", ATTR{bConfigurationValue}!="$env{REALTEK_MODE2}", ATTR{bConfigurationValue}="$env{REALTEK_MODE2}"
-
-# Samsung
-ATTR{idVendor}=="04e8", ATTR{idProduct}=="a101", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-
-# Lenovo
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="304f", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3052", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3054", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3057", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3062", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3069", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3082", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="3098", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="7205", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="720a", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="720b", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="720c", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="7214", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="721e", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="8153", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="a359", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-ATTR{idVendor}=="17ef", ATTR{idProduct}=="a387", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-
-# TP-LINK
-ATTR{idVendor}=="2357", ATTR{idProduct}=="0601", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-
-# Nvidia
-ATTR{idVendor}=="0955", ATTR{idProduct}=="09ff", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-
-# LINKSYS
-ATTR{idVendor}=="13b1", ATTR{idProduct}=="0041", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}"
-
-LABEL="usb_realtek_net_end"
diff --git a/eudevlite/src/README.md b/eudevlite/src/README.md
deleted file mode 100644
index 88972103..00000000
--- a/eudevlite/src/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-1. kmod.patch: https://raw.githubusercontent.com/fbelavenuto/arpl-addons/v2.50/eudev/src/kmod.patch
-
-2. 50-usb-realtek-net.rules: https://www.realtek.com/zh/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software
-
-3. 80-net-name-slot.rules: Incompatible with synology system
diff --git a/eudevlite/src/kmod.patch b/eudevlite/src/kmod.patch
deleted file mode 100755
index 6f427d52..00000000
--- a/eudevlite/src/kmod.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 7c2b889..de8d8fd 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -221,7 +221,7 @@ static char *get_kernel_release(const char *dirname)
- 	if (uname(&u) < 0)
- 		return NULL;
- 
--	if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0)
-+	if (asprintf(&p, "%s", dirname_default_prefix) < 0)
- 		return NULL;
- 
- 	return p;
-diff --git a/tools/depmod.c b/tools/depmod.c
-index 364b7d4..d9f9566 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -906,7 +906,7 @@ struct vertex;
- struct mod {
- 	struct kmod_module *kmod;
- 	char *path;
--	const char *relpath; /* path relative to '$ROOT/lib/modules/$VER/' */
-+	const char *relpath; /* path relative to '$ROOT/lib/modules' */
- 	char *uncrelpath; /* same as relpath but ending in .ko */
- 	struct kmod_list *info_list;
- 	struct kmod_list *dep_sym_list;
-@@ -3008,8 +3008,8 @@ static int do_depmod(int argc, char *argv[])
- 	}
- 
- 	cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
--				  "%s/lib/modules/%s",
--				  root == NULL ? "" : root, cfg.kversion);
-+				  "%s/lib/modules",
-+				  root == NULL ? "" : root);
- 
- 	if (optind == argc)
- 		all = 1;
-diff --git a/tools/modinfo.c b/tools/modinfo.c
-index d0aab20..05b8fbe 100644
---- a/tools/modinfo.c
-+++ b/tools/modinfo.c
-@@ -462,8 +462,8 @@ static int do_modinfo(int argc, char *argv[])
- 			}
- 			kversion = u.release;
- 		}
--		snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
--			 root, kversion);
-+		snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules",
-+			 root);
- 		dirname = dirname_buf;
- 	}
- 
-diff --git a/tools/modprobe.c b/tools/modprobe.c
-index 2a2ae21..6f9c99e 100644
---- a/tools/modprobe.c
-+++ b/tools/modprobe.c
-@@ -970,8 +970,7 @@ static int do_modprobe(int argc, char **orig_argv)
- 			kversion = u.release;
- 		}
- 		snprintf(dirname_buf, sizeof(dirname_buf),
--				"%s/lib/modules/%s", root,
--				kversion);
-+				"%s/lib/modules", root);
- 		dirname = dirname_buf;
- 	}
- 
-diff --git a/tools/static-nodes.c b/tools/static-nodes.c
-index 8d2356d..6190e8d 100644
---- a/tools/static-nodes.c
-+++ b/tools/static-nodes.c
-@@ -212,16 +212,14 @@ static int do_static_nodes(int argc, char *argv[])
- 		goto finish;
- 	}
- 
--	snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release);
-+	snprintf(modules, sizeof(modules), "/lib/modules/modules.devname");
- 	in = fopen(modules, "re");
- 	if (in == NULL) {
- 		if (errno == ENOENT) {
--			fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n",
--				kernel.release);
-+			fprintf(stderr, "Warning: /lib/modules/modules.devname not found - ignoring\n");
- 			ret = EXIT_SUCCESS;
- 		} else {
--			fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n",
--				kernel.release);
-+			fprintf(stderr, "Error: could not open /lib/modules/modules.devname - %m\n");
- 			ret = EXIT_FAILURE;
- 		}
- 		goto finish;
diff --git a/revert/manifest.yml b/revert/manifest.yml
index 908bc6b7..27a5bccb 100755
--- a/revert/manifest.yml
+++ b/revert/manifest.yml
@@ -5,7 +5,7 @@ system: true
 beta: false
 all:
   install-script: "install.sh"
-  copy: all
+  copy: "all"
 apollolake: true
 broadwell: true
 broadwellnk: true