diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 1a2a5319..66f8f2b0 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -109,6 +109,15 @@ function buildMenu() { while IFS="=" read KEY VALUE; do writeConfigKey "synoinfo.${KEY}" "${VALUE}" "${USER_CONFIG_FILE}" done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo") + # Check addons + PLATFORM="`readModelKey "${MODEL}" "platform"`" + KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`" + while IFS="=" read ADDON PARAM; do + [ -z "${ADDON}" ] && continue + if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then + deleteConfigKey "addons.${ADDON}" "${USER_CONFIG_FILE}" + fi + done < <(readConfigMap "addons" "${USER_CONFIG_FILE}") # Remove old files rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" DIRTY=1 diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index 08480912..cc871e16 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -94,9 +94,6 @@ gzip -dc "${CACHE_PATH}/modules/firmware.tgz" | tar xf - -C "${RAMDISK_PATH}/usr # Clean rm -rf "${TMP_PATH}/modules" -# Build modules dependencies -/opt/arpl/depmod -a -b ${RAMDISK_PATH} 2>/dev/null - echo -n "." # Copying fake modprobe cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe" @@ -107,15 +104,22 @@ cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modul MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"` # Check if model needs Device-tree dynamic patch DT="`readModelKey "${MODEL}" "dt"`" -# Add system addon "dtbpatch" or "maxdisks" -[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']="${MAXDISKS}" -# Indispensable eudev system addon -ADDONS['eudev']="" echo -n "." mkdir -p "${RAMDISK_PATH}/addons" echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh" echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh" +# Required eudev and dtbpatch/maxdisks +installAddon eudev +echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog +if [ "${DT}" = "true" ]; then + installAddon dtbpatch + echo "/addons/dtbpatch.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog +else + installAddon maxdisks + echo "/addons/maxdisks.sh \${1} ${MAXDISKS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog +fi +# User addons for ADDON in ${!ADDONS[@]}; do PARAMS=${ADDONS[${ADDON}]} if ! installAddon ${ADDON}; then @@ -126,6 +130,9 @@ for ADDON in ${!ADDONS[@]}; do done chmod +x "${RAMDISK_PATH}/addons/addons.sh" +# Build modules dependencies +/opt/arpl/depmod -a -b ${RAMDISK_PATH} 2>/dev/null + # Reassembly ramdisk echo -n "." if [ "${RD_COMPRESSED}" == "true" ]; then diff --git a/files/board/arpl/p3/addons/9p/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/9p/apollolake-4.4.180.tgz new file mode 100644 index 00000000..89b6c082 Binary files /dev/null and b/files/board/arpl/p3/addons/9p/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/9p/broadwell-4.4.180.tgz b/files/board/arpl/p3/addons/9p/broadwell-4.4.180.tgz new file mode 100644 index 00000000..7cba71a0 Binary files /dev/null and b/files/board/arpl/p3/addons/9p/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/9p/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/addons/9p/broadwellnk-4.4.180.tgz new file mode 100644 index 00000000..d833bddf Binary files /dev/null and b/files/board/arpl/p3/addons/9p/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/9p/bromolow-3.10.108.tgz b/files/board/arpl/p3/addons/9p/bromolow-3.10.108.tgz new file mode 100644 index 00000000..7b95c9ab Binary files /dev/null and b/files/board/arpl/p3/addons/9p/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/addons/9p/denverton-4.4.180.tgz b/files/board/arpl/p3/addons/9p/denverton-4.4.180.tgz new file mode 100644 index 00000000..ffef254c Binary files /dev/null and b/files/board/arpl/p3/addons/9p/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/9p/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/9p/geminilake-4.4.180.tgz new file mode 100644 index 00000000..bf429566 Binary files /dev/null and b/files/board/arpl/p3/addons/9p/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/9p/manifest.yml b/files/board/arpl/p3/addons/9p/manifest.yml new file mode 100644 index 00000000..802f436e --- /dev/null +++ b/files/board/arpl/p3/addons/9p/manifest.yml @@ -0,0 +1,25 @@ +version: 1 +name: 9p +description: "Driver for virtio 9p" +available-for: + bromolow-3.10.108: + install-script: &script "install.sh" + copy: "bromolow-3.10.108" + apollolake-4.4.180: + install-script: *script + copy: "apollolake-4.4.180" + broadwell-4.4.180: + install-script: *script + copy: "broadwell-4.4.180" + broadwellnk-4.4.180: + install-script: *script + copy: "broadwellnk-4.4.180" + denverton-4.4.180: + install-script: *script + copy: "denverton-4.4.180" + geminilake-4.4.180: + install-script: *script + copy: "geminilake-4.4.180" + v1000-4.4.180: + install-script: *script + copy: "v1000-4.4.180" diff --git a/files/board/arpl/p3/addons/9p/v1000-4.4.180.tgz b/files/board/arpl/p3/addons/9p/v1000-4.4.180.tgz new file mode 100644 index 00000000..0fb0544f Binary files /dev/null and b/files/board/arpl/p3/addons/9p/v1000-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz index 17b1c671..20636d88 100644 Binary files a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz and b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz index 7e0936e3..d7caefc3 100644 Binary files a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz index a7b6b67e..7a5274bd 100644 Binary files a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz index 6f88e2fc..1c6f7c1e 100644 Binary files a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz and b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/modules/denverton-4.4.180.tgz b/files/board/arpl/p3/modules/denverton-4.4.180.tgz index d2d473ae..f62853f0 100644 Binary files a/files/board/arpl/p3/modules/denverton-4.4.180.tgz and b/files/board/arpl/p3/modules/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/firmware.tgz b/files/board/arpl/p3/modules/firmware.tgz index 933e9f2b..38baed8d 100644 Binary files a/files/board/arpl/p3/modules/firmware.tgz and b/files/board/arpl/p3/modules/firmware.tgz differ diff --git a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz index b93a4efd..fdceffed 100644 Binary files a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz and b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/v1000-4.4.180.tgz b/files/board/arpl/p3/modules/v1000-4.4.180.tgz index 8674e02b..dfc1ebe4 100644 Binary files a/files/board/arpl/p3/modules/v1000-4.4.180.tgz and b/files/board/arpl/p3/modules/v1000-4.4.180.tgz differ