update

devices/common/default-settings

@@ -213,3 +213,13 @@ rm -rf /tmp/luci-*
 
 uci -q set base_config.@status[0].version=$version
 uci commit base_config
+
+(
+[[ -f "/bin/coremark" && ! -f "/etc/bench.log" && "$(uci -q get wizard.default.coremark)" == '1' ]] && {
+		sleep 30
+		/bin/coremark >/tmp/coremark.log
+		cat /tmp/coremark.log | grep "CoreMark 1.0" | cut -d "/" -f 1 | cut -d "." -f -2 >/etc/bench.log
+		sed -i 's/CoreMark 1.0/(CpuMark/g' /etc/bench.log
+		echo " Scores)" >>/etc/bench.log
+}
+) &

devices/common/diy.sh

@@ -40,8 +40,7 @@ sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite/' pack
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
 sed -i '/root:/c\root:$1$tTPCBw1t$ldzfp37h5lSpO9VXk4uUE\/:18336:0:99999:7:::' package/base-files/files/etc/shadow
 sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
-sed -i -e '$a /etc/sysupgrade.conf' \
-       -e '$a /etc/bench.log' \
+sed -i -e '$a /etc/bench.log' \
        -e '/\/etc\/profile/d' \
        -e '/\/etc\/shinit/d' \
        package/base-files/files/lib/upgrade/keep.d/base-files-essential

devices/common/patches/opkginstall.patch

@@ -151,7 +151,7 @@
  						opkg="$opkg $1"
  						shift
  					;;
-@@ -35,8 +35,36 @@ case "$action" in
+@@ -35,8 +35,31 @@ case "$action" in
  			if flock -x 200; then
  				$opkg $action "$@" </dev/null >/tmp/opkg.out 2>/tmp/opkg.err
  				code=$?
@@ -160,15 +160,7 @@
 +					$opkg $action luci-i18n-"$(echo $@ | cut -d - -f 3-)"-zh-cn </dev/null >>/tmp/opkg.out 2>/dev/null
 +				fi
 +				case "$action" in
-+					install)
-+						[ "$(opkg list-installed | cut -f 1 -d ' ' | grep -w $@)" ] && {
-+							rm -f /tmp/opkg.err
-+						}
-+						[[ "$(opkg list-installed | cut -f 1 -d ' ' | grep -w $@)" && ! "$(cat /etc/backup/user_installed.opkg | grep -w $@)" ]] && {
-+							echo $@ >>/etc/backup/user_installed.opkg
-+						}
-+					;;
-+					upgrade)
++					install|upgrade)
 +						[ "$(opkg list-installed | cut -f 1 -d ' ' | grep -w $@)" ] && {
 +							rm -f /tmp/opkg.err
 +						}
@@ -177,9 +169,12 @@
 +						[ ! "$(opkg list-installed | cut -f 1 -d ' ' | grep -w $@)" ] && {
 +							rm -f /tmp/opkg.err
 +						}
-+						sed -i "/^$@$/d" /etc/backup/user_installed.opkg
 +					;;
 +				esac
++				grep -q "wget returned 8" /tmp/opkg.err && {
++						opkg update </dev/null >/tmp/opkg.out 2>/tmp/opkg.err
++						$opkg $action "$@" </dev/null >>/tmp/opkg.out 2>>/tmp/opkg.err
++					}
  				stderr=$(cat /tmp/opkg.err)
 +				[ -n "$stderr" ] || {
 +					echo "🎉 已完成, 请关闭本窗口~" >>/tmp/opkg.out
@@ -207,10 +202,19 @@
  
  	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
  		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
-+		echo "${ETCBACKUP_DIR}/user_installed.opkg" >> "$CONFFILES"
++		. /etc/profile.d/opkg.sh; opkg save
  		mkdir -p "$ETCBACKUP_DIR"
  		# Avoid touching filesystem on each backup
  		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
+@@ -249,6 +250,8 @@ do_save_conffiles() {
+ 			\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
+ 			\( -exec echo {} unknown \; \) \
+ 			\) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES}
++	else
++		uci -q del opkg.auto; uci commit opkg
+ 	fi
+ 
+ 	v "Saving config files..."
 
 --- a/package/feeds/luci/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
 +++ b/package/feeds/luci/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js

devices/common/patches/package.patch

@@ -1,6 +1,6 @@
 --- a/include/package.mk
 +++ b/include/package.mk
-@@ -354,3 +354,10 @@ dist:
+@@ -354,3 +354,11 @@ dist:
  
  distcheck:
  	$(Build/DistCheck)
@@ -8,6 +8,7 @@
 +ifndef Package/$(PKG_NAME)/conffiles
 +define Package/$(PKG_NAME)/conffiles
 +/etc/config/
++/etc/$(PKG_NAME)/
 +endef
 +endif
 +

devices/common/patches/profile.patch

@@ -1,13 +1,11 @@
 --- a/package/base-files/files/etc/profile
 +++ b/package/base-files/files/etc/profile
-@@ -22,7 +23,9 @@ esac
+@@ -22,7 +23,7 @@ esac
  
  [ -n "$FAILSAFE" ] || {
  	for FILE in /etc/profile.d/*.sh; do
 -		[ -e "$FILE" ] && . "$FILE"
-+		[ -e "$FILE" ] && [ -f "/bin/bash" ] && env -i bash "$FILE" || {
-+			[ "$FILE" != "/etc/profile.d/sysinfo.sh" ] && . "$FILE"
-+		}
++		[ -e "$FILE" ] && [ "$FILE" == "/etc/profile.d/sysinfo.sh" ] && env -i bash "$FILE" || . "$FILE"
  	done
  	unset FILE
- }
+ }