update

kiddin9 · Sep 9, 2024 · 4f9760d · 4f9760d
1 parent 8149041
commit 4f9760d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -18,7 +18,7 @@ mv -f feeds/kiddin9/base-files package/
 
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
-sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-opkg luci-app-upnp luci-app-autoreboot \
+sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-opkg luci-app-upnp \
 luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
 coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-fileassistant /" include/target.mk
 

diff --git a/devices/mediatek_filogic/patches/16-komi-a31.patch b/devices/mediatek_filogic/patches/16-komi-a31.patch
@@ -284,21 +284,17 @@ diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11
 index 794944d1aa918..2ca44b55c21fa 100644
 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
 +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
-@@ -109,6 +109,17 @@ case "$board" in
- 	jdcloud,re-cp-03)
- 		[ "$PHYNBR" = "1" ] && mmc_get_mac_binary factory 0xa > /sys${DEVPATH}/macaddress
+@@ -121,6 +121,13 @@ case "$board" in
+ 		[ "$PHYNBR" = "0" ] && macaddr_add $hw_mac_addr 2 > /sys${DEVPATH}/macaddress
+ 		[ "$PHYNBR" = "1" ] && macaddr_add $hw_mac_addr 3 > /sys${DEVPATH}/macaddress
  		;;
 +	imou,lc-hx3001)
 +		addr=$(mtd_get_mac_ascii u-boot-env mac)
 +		[ -n "$addr" ] || addr=$(macaddr_add $(mtd_get_mac_binary Factory 0x4) -1)
 +		[ "$PHYNBR" = "0" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
 +		[ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress
 +		;;
-+	konka,komi-a31)
-+		addr=$(cat /sys/class/net/eth0/address)
-+		[ "$PHYNBR" = "0" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
-+		[ "$PHYNBR" = "1" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress
-+		;;
- 	mercusys,mr90x-v1|\
- 	tplink,re6000xd)
- 		addr=$(get_mac_binary "/tmp/tp_data/default-mac" 0)
++	konka,komi-a31|\
+ 	nokia,ea0326gmp)
+ 		addr=$(cat /sys/class/net/eth0/address)
+ 		[ "$PHYNBR" = "0" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
diff --git a/devices/mediatek_filogic/patches/17-lc-hx3001.patch b/devices/mediatek_filogic/patches/17-lc-hx3001.patch
@@ -297,7 +297,7 @@ diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/imag
 index 83428f0d981e7..6d2e9d713be02 100644
 --- a/target/linux/mediatek/image/filogic.mk
 +++ b/target/linux/mediatek/image/filogic.mk
-@@ -589,6 +589,50 @@ endif
+@@ -589,6 +589,52 @@ endif
  endef
  TARGET_DEVICES += h3c_magic-nx30-pro-nmbm
 
@@ -324,24 +324,26 @@ index 83428f0d981e7..6d2e9d713be02 100644
 +TARGET_DEVICES += imou_lc-hx3001
 +
 +define Device/konka_komi-a31
-+  DEVICE_VENDOR := KONKA
++  DEVICE_VENDOR := Konka
 +  DEVICE_MODEL := KOMI A31
++  DEVICE_ALT0_VENDOR := E-Life
++  DEVICE_ALT0_MODEL := ETR631-T
++  DEVICE_ALT1_VENDOR := E-Life
++  DEVICE_ALT1_MODEL := ETR635-U
 +  DEVICE_DTS := mt7981b-konka-komi-a31
 +  DEVICE_DTS_DIR := ../dts
 +  DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware
-+  SUPPORTED_DEVICES := konka,komi-a31
 +  UBINIZE_OPTS := -E 5
 +  BLOCKSIZE := 128k
 +  PAGESIZE := 2048
 +  IMAGE_SIZE := 114688k
 +  KERNEL_IN_UBI := 1
++  KERNEL := kernel-bin | gzip
++  KERNEL_INITRAMFS := kernel-bin | lzma | \
++        fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
 +  IMAGES += factory.bin
 +  IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
 +  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-+  KERNEL = kernel-bin | lzma | \
-+       fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
-+  KERNEL_INITRAMFS = kernel-bin | lzma | \
-+       fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd
 +endef
 +TARGET_DEVICES += konka_komi-a31
 +