Merge remote-tracking branch 'origin/jh7110-devel' into jh7110-mm-devel
This commit is contained in:
Andy Hu
@@ -0,0 +1,12 @@
|
||||
diff -purN ifplugd-0.28.orig/conf/ifplugd.conf ifplugd-0.28/conf/ifplugd.conf
|
||||
--- ifplugd-0.28.orig/conf/ifplugd.conf 2003-12-12 01:58:43.000000000 +0800
|
||||
+++ ifplugd-0.28/conf/ifplugd.conf 2022-12-06 16:37:58.939672090 +0800
|
||||
@@ -30,7 +30,7 @@
|
||||
# according to /proc/net/dev. Note that the list of interfaces
|
||||
# appearing in /proc/net/dev may depend on which kernel modules you
|
||||
# have loaded.
|
||||
-INTERFACES="eth0"
|
||||
+INTERFACES="eth0 eth1"
|
||||
|
||||
# Additional parameters for ifplugd.
|
||||
# (Run "ifplugd -h" for further information.)
|
||||
@@ -18,8 +18,21 @@ define IFUPDOWN_SCRIPTS_LOCALHOST
|
||||
endef
|
||||
|
||||
IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
|
||||
IFUPDOWN_SCRIPTS_DHCP_HOTPLUG = $(call qstrip,$(BR2_PACKAGE_IFPLUGD))
|
||||
|
||||
ifneq ($(IFUPDOWN_SCRIPTS_DHCP_IFACE),)
|
||||
ifneq ($(IFUPDOWN_SCRIPTS_DHCP_HOTPLUG),)
|
||||
define IFUPDOWN_SCRIPTS_DHCP
|
||||
( \
|
||||
echo ; \
|
||||
echo "allow-hotplug $(IFUPDOWN_SCRIPTS_DHCP_IFACE)"; \
|
||||
echo "iface $(IFUPDOWN_SCRIPTS_DHCP_IFACE) inet dhcp"; \
|
||||
echo " pre-up /etc/network/nfs_check"; \
|
||||
echo " wait-delay 15"; \
|
||||
echo " hostname \$$(hostname)"; \
|
||||
) >> $(TARGET_DIR)/etc/network/interfaces
|
||||
endef
|
||||
else
|
||||
define IFUPDOWN_SCRIPTS_DHCP
|
||||
( \
|
||||
echo ; \
|
||||
@@ -30,6 +43,7 @@ define IFUPDOWN_SCRIPTS_DHCP
|
||||
echo " hostname \$$(hostname)"; \
|
||||
) >> $(TARGET_DIR)/etc/network/interfaces
|
||||
endef
|
||||
endif
|
||||
define IFUPDOWN_SCRIPTS_DHCP_OPENRC
|
||||
echo "ifup $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \
|
||||
> $(TARGET_DIR)/etc/ifup.$(IFUPDOWN_SCRIPTS_DHCP_IFACE)
|
||||
@@ -38,6 +52,41 @@ define IFUPDOWN_SCRIPTS_DHCP_OPENRC
|
||||
endef
|
||||
endif
|
||||
|
||||
IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP_DUAL))
|
||||
IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE_HOTPLUG = $(call qstrip,$BR2_PACKAGE_IFPLUGD))
|
||||
|
||||
ifneq ($(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE),)
|
||||
ifneq ($(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE_HOTPLUG),)
|
||||
define IFUPDOWN_SCRIPTS_DHCP_DUAL
|
||||
( \
|
||||
echo ; \
|
||||
echo "allow-hotplug $(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE)"; \
|
||||
echo "iface $(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE) inet dhcp"; \
|
||||
echo " pre-up /etc/network/nfs_check"; \
|
||||
echo " wait-delay 15"; \
|
||||
echo " hostname \$$(hostname)"; \
|
||||
) >> $(TARGET_DIR)/etc/network/interfaces
|
||||
endef
|
||||
else
|
||||
define IFUPDOWN_SCRIPTS_DHCP_DUAL
|
||||
( \
|
||||
echo ; \
|
||||
echo "auto $(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE)"; \
|
||||
echo "iface $(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE) inet dhcp"; \
|
||||
echo " pre-up /etc/network/nfs_check"; \
|
||||
echo " wait-delay 15"; \
|
||||
echo " hostname \$$(hostname)"; \
|
||||
) >> $(TARGET_DIR)/etc/network/interfaces
|
||||
endef
|
||||
endif
|
||||
define IFUPDOWN_SCRIPTS_DHCP_DUAL_OPENRC
|
||||
echo "ifup $(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE)" \
|
||||
> $(TARGET_DIR)/etc/ifup.$(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE)
|
||||
echo "ifdown $(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE)" \
|
||||
> $(TARGET_DIR)/etc/ifdown.$(IFUPDOWN_SCRIPTS_DHCP_DUAL_IFACE)
|
||||
endef
|
||||
endif
|
||||
|
||||
define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
|
||||
$(TARGET_DIR)/etc/network/nfs_check
|
||||
@@ -48,6 +97,8 @@ define IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC
|
||||
$(IFUPDOWN_SCRIPTS_PREAMBLE)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP_OPENRC)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP_DUAL)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP_DUAL_OPENRC)
|
||||
endef
|
||||
|
||||
define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV
|
||||
@@ -56,6 +107,7 @@ define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV
|
||||
$(IFUPDOWN_SCRIPTS_PREAMBLE)
|
||||
$(IFUPDOWN_SCRIPTS_LOCALHOST)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP_DUAL)
|
||||
endef
|
||||
|
||||
# ifupdown-scripts can not be selected when systemd-networkd is
|
||||
@@ -67,6 +119,7 @@ define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD
|
||||
$(IFUPDOWN_SCRIPTS_PREAMBLE)
|
||||
$(IFUPDOWN_SCRIPTS_LOCALHOST)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP)
|
||||
$(IFUPDOWN_SCRIPTS_DHCP_DUAL)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
ISP_CTRL_NAME=/root/ISP/stf_isp_ctrl
|
||||
|
||||
# Default sensor
|
||||
SENSOR_CFG="imx219mipi -a 1"
|
||||
SENSOR_CFG="imx219mipi -j 0 -a 1"
|
||||
|
||||
USAGE="Usage:
|
||||
isp_ctrl_daemon.sh [start/stop] [imx219mipi/ov4689mipi/sc2235dvp] &"
|
||||
@@ -20,15 +20,15 @@ fi
|
||||
|
||||
case "$2" in
|
||||
imx219mipi)
|
||||
SENSOR_CFG="imx219mipi -a 1"
|
||||
SENSOR_CFG="imx219mipi -j 0 -a 1"
|
||||
echo "Select sensor imx219"
|
||||
;;
|
||||
ov4689mipi)
|
||||
SENSOR_CFG="ov4689mipi -a 1"
|
||||
SENSOR_CFG="ov4689mipi -j 0 -a 1"
|
||||
echo "Select sensor ov4689"
|
||||
;;
|
||||
sc2235dvp)
|
||||
SENSOR_CFG="sc2235dvp -a 0"
|
||||
SENSOR_CFG="sc2235dvp -i 0 -a 0"
|
||||
echo "Select sensor sc2235"
|
||||
;;
|
||||
*)
|
||||
@@ -43,20 +43,20 @@ NUM=`ps aux | grep ${ISP_CTRL_NAME} | grep -v grep |wc -l`
|
||||
|
||||
# If there are less than 1 stf_isp_ctrl, start one.
|
||||
if [ "${NUM}" -lt "1" ];then
|
||||
${ISP_CTRL_NAME} -m ${SENSOR_CFG} -j 0 &
|
||||
${ISP_CTRL_NAME} -m ${SENSOR_CFG} &
|
||||
|
||||
# If there are more than 1 stf_isp_ctrl, kill all of them and restart one.
|
||||
elif [ "${NUM}" -gt "1" ];then
|
||||
echo "more than 1 ${ISP_CTRL_NAME},killall & restart ${ISP_CTRL_NAME}"
|
||||
killall -9 $ISP_CTRL_NAME
|
||||
${ISP_CTRL_NAME} -m ${SENSOR_CFG} -j 0 &
|
||||
${ISP_CTRL_NAME} -m ${SENSOR_CFG} &
|
||||
fi
|
||||
|
||||
# Kill the zombie stf_isp_ctrl
|
||||
NUM_STAT=`ps aux | grep ${ISP_CTRL_NAME} | grep T | grep -v grep | wc -l`
|
||||
if [ "${NUM_STAT}" -gt "0" ];then
|
||||
killall -9 ${ISP_CTRL_NAME}
|
||||
${ISP_CTRL_NAME} -m ${SENSOR_CFG} -j 0 &
|
||||
${ISP_CTRL_NAME} -m ${SENSOR_CFG} &
|
||||
fi
|
||||
|
||||
sleep 5;
|
||||
|
||||
@@ -403,6 +403,21 @@ config BR2_SYSTEM_DHCP
|
||||
overwrite /etc/network/interfaces or add a networkd
|
||||
configuration file.
|
||||
|
||||
config BR2_SYSTEM_DHCP_DUAL
|
||||
string "Dual Network interface for the 2nd to configure through DHCP"
|
||||
default ""
|
||||
depends on BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || \
|
||||
BR2_PACKAGE_SYSTEMD_NETWORKD
|
||||
help
|
||||
Enter here the name of the network interface (E.G. eth1) to
|
||||
automatically configure through DHCP at bootup.
|
||||
|
||||
If left empty, no automatic DHCP requests will take place.
|
||||
|
||||
For more complicated network setups use an overlay to
|
||||
overwrite /etc/network/interfaces or add a networkd
|
||||
configuration file.
|
||||
|
||||
comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd or netifrc"
|
||||
depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || \
|
||||
BR2_PACKAGE_SYSTEMD_NETWORKD || BR2_PACKAGE_NETIFRC)
|
||||
|
||||
Reference in New Issue
Block a user