Merge branch 'OpenIPC:master' into master

2021-05-18 16:59:01 +03:00 · 2021-05-18 16:59:01 +03:00 · 1f233dd494
parent 7bc7d64f46 2867d53e01
commit 1f233dd494
27 changed files with 191 additions and 23 deletions
--- a/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516av100.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516av100.generic.config
@ -775,7 +775,8 @@ CONFIG_ARM_AMBA=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516dv100.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516dv100.generic.config
@ -775,7 +775,8 @@ CONFIG_ARM_AMBA=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516av200/kernel/hi3516av200.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516av200/kernel/hi3516av200.generic.config
@ -801,7 +801,8 @@ CONFIG_HAVE_BPF_JIT=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516av200/kernel/hi3519v101.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516av200/kernel/hi3519v101.generic.config
@ -801,7 +801,8 @@ CONFIG_HAVE_BPF_JIT=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv100/kernel/hi3516cv100.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv100/kernel/hi3516cv100.generic.config
@ -580,7 +580,8 @@ CONFIG_MAC80211_MESH=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv100/kernel/hi3518cv100.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv100/kernel/hi3518cv100.generic.config
@ -580,7 +580,8 @@ CONFIG_MAC80211_MESH=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv100/kernel/hi3518ev100.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv100/kernel/hi3518ev100.generic.config
@ -580,7 +580,8 @@ CONFIG_MAC80211_MESH=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config
@ -706,7 +706,8 @@ CONFIG_ARM_AMBA=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config
@ -706,7 +706,8 @@ CONFIG_ARM_AMBA=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev201.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev201.generic.config
@ -706,7 +706,8 @@ CONFIG_ARM_AMBA=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv300/kernel/hi3516cv300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv300/kernel/hi3516cv300.generic.config
@ -680,7 +680,8 @@ CONFIG_HAVE_BPF_JIT=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv300/kernel/hi3516ev100.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv300/kernel/hi3516ev100.generic.config
@ -680,7 +680,8 @@ CONFIG_HAVE_BPF_JIT=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv500/kernel/hi3516av300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv500/kernel/hi3516av300.generic.config
@ -775,7 +775,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv500/kernel/hi3516cv500.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv500/kernel/hi3516cv500.generic.config
@ -775,7 +775,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516cv500/kernel/hi3516dv300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516cv500/kernel/hi3516dv300.generic.config
@ -775,7 +775,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev200.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev200.generic.config
@ -763,7 +763,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev200.generic.config.original
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev200.generic.config.original
@ -760,7 +760,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config
@ -763,7 +763,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config.original
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config.original
@ -760,7 +760,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config
@ -763,7 +763,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config.original
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config.original
@ -759,7 +759,7 @@ CONFIG_ARM_AMBA=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig
@ -75,4 +75,3 @@ BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
 # BR2_PACKAGE_MXML is not set
 # BR2_PACKAGE_SSHPASS is not set
 # BR2_PACKAGE_RTL8188EU is not set
-
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_tehshield_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_tehshield_defconfig
@ -0,0 +1,81 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_EABI=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="4.9.37"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+# Toolchain
+BR2_GCC_VERSION_7_X=y
+# BR2_TOOLCHAIN_USES_UCLIBC is not set
+# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
+# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
+BR2_TOOLCHAIN_USES_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.37"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/hi3516ev300.generic.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_LINUX_KERNEL_EXT_HISI_PATCHER=y
+BR2_LINUX_KERNEL_EXT_HISI_PATCHER_LIST="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/patches/ $(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516ev200/kernel/overlay"
+
+# Filesystem
+# BR2_TARGET_TZ_INFO is not set
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
+
+# OpenIPC configuration
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1.05.12"
+BR2_TARGET_GENERIC_HOSTNAME="ipcam"
+BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
+
+# Packages
+BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_FWPRINTENV_NG=y
+BR2_PACKAGE_HISI_GPIO_SCANNER=y
+BR2_PACKAGE_HISILICON_OSDRV4=y
+BR2_PACKAGE_IPCTOOL=y
+BR2_PACKAGE_JSON_C=y
+BR2_PACKAGE_LAME=y
+BR2_PACKAGE_LIBEVENT_MINI=y
+BR2_PACKAGE_MAJESTIC=y
+BR2_PACKAGE_MINI_SNMPD=y
+BR2_PACKAGE_VTUND_LITE=y
+
+# Experimental
+BR2_PER_PACKAGE_DIRECTORIES=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+
+# Firmware
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+
+# LTE modem Sim7600
+BR2_PACKAGE_MODEM_MANAGER=y
+BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y
+
+# Unused
+# BR2_SHARED_STATIC_LIBS is not set
+# BR2_PACKAGE_JPEG_TURBO is not set
+# BR2_PACKAGE_MINIHTTP is not set
+# BR2_PACKAGE_MXML is not set
+# BR2_PACKAGE_SSHPASS is not set
+# BR2_PACKAGE_RTL8188EU is not set
--- a/general/overlay/etc/init.d/S10mdev
+++ b/general/overlay/etc/init.d/S10mdev
@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Start mdev....
+#
+
+case "$1" in
+  start)
+        echo "Starting mdev..."
+        # echo /sbin/mdev >/proc/sys/kernel/hotplug
+        /sbin/mdev -s
+        ;;
+  stop)
+        ;;
+  restart|reload)
+        ;;
+  *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+esac
+
+exit $?
--- a/general/overlay/etc/mdev.conf
+++ b/general/overlay/etc/mdev.conf
@ -0,0 +1,22 @@
+# Provide user, group, and mode information for devices.  If a regex matches
+# the device name provided by sysfs, use the appropriate user:group and mode
+# instead of the default 0:0 660.
+#
+# Syntax:
+# [-]devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]$ENVVAR=regex    user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]@maj,min[-min2]  user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+#
+# [-]: do not stop on this match, continue reading mdev.conf
+# =: move, >: move and create a symlink
+# !: do not create device node
+# @|$|*: run@cmd if $ACTION=add,  $cmd if $ACTION=remove, *cmd in all cases
+#
+#
+#
+mmcblk[0-9] root:disk 660
+mmcblk[0-9]p[0-9] root:disk 660 *(/lib/mdev/automount.sh)
+#
+sd[a-z] root:disk 660
+sd[a-z] [0-9] root:disk 660 *(/lib/mdev/automount.sh)
+#
--- a/general/overlay/etc/openipc_donaters
+++ b/general/overlay/etc/openipc_donaters
@ -4,4 +4,4 @@ role in the advancement of a stable, flexible and most importantly, Open IP Netw

 Your contribution will help us advance development proposals forward, and interact with the community on a regular basis.

-  https://openipc.org/contribution/
+  https://openipc.org/support/
--- a/general/overlay/lib/mdev/automount.sh
+++ b/general/overlay/lib/mdev/automount.sh
@ -0,0 +1,33 @@
+#!/bin/sh
+
+destdir=/mnt
+
+my_umount()
+{
+    if grep -qs "^/dev/$1 " /proc/mounts ; then
+        umount "${destdir}/$1";
+    fi
+
+    [ -d "${destdir}/$1" ] && rmdir "${destdir}/$1"
+}
+
+my_mount()
+{
+    mkdir -p "${destdir}/$1" || exit 1
+
+    if ! mount -t auto -o sync "/dev/$1" "${destdir}/$1"; then
+        # failed to mount, clean up mountpoint
+        rmdir "${destdir}/$1"
+        exit 1
+    fi
+}
+
+case "${ACTION}" in
+add|"")
+    my_umount ${MDEV}
+    my_mount ${MDEV}
+    ;;
+remove)
+    my_umount ${MDEV}
+    ;;
+esac