From 5f1d074a1224712e012110c4fbcd0e796e251f14 Mon Sep 17 00:00:00 2001 From: cronyx Date: Thu, 18 May 2023 21:30:31 +0300 Subject: [PATCH 1/4] =?UTF-8?q?[sysupgrade]=201.=20added=20key=20to=20sele?= =?UTF-8?q?ct=20dev=20branch.=202.=20use=20downloaded=20ipcinfo=E2=80=A6?= =?UTF-8?q?=20(#804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- general/overlay/usr/sbin/sysupgrade | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index c60b1da6..5008820b 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -1,15 +1,18 @@ #!/bin/sh # -# OpenIPC.org | v.20230503 +# OpenIPC.org | v.20230518 # -scr_version=1.0.17 +scr_version=1.0.18 args=" $@" set -e LOCK_FILE=/tmp/sysupgrade.lock +IPCINFO=/tmp/ipcinfo + +[ -f ${IPCINFO} ] && chmod +x ${IPCINFO} || IPCINFO=$(which ipcinfo) echo_c() { # 31 red, 32 green, 33 yellow, 34 blue, 35 magenta, 36 cyan, 37 white, 38 grey @@ -83,10 +86,11 @@ do_wipe_overlay() { download_firmware() { echo_c 33 "\nFirmware" + [ "$branch_dev" = "1" ] && branch="dev" || branch="latest" osr=$(get_system_build) ftype=$(get_flash_type) build="${soc}-${ftype}-${osr}" - [ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz" + [ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/${branch}/openipc.${build}.tgz" echo "Download from $url" [ -z "$HASERLVER" ] && progress="-#" || progress="-s" [ "$(curl -o /dev/null -s -w '%{http_code}\n' "$url")" = "000" ] && die "Check your network!" @@ -190,7 +194,7 @@ get_kernel_version() { } get_system_info() { - vendor=$(ipcinfo --vendor) + vendor=$(${IPCINFO} -v) soc=$(fw_printenv -n soc) || die "SoC is not defined in U-Boot environment" kernel_device=$(get_device "kernel") kernel_version=$(get_kernel_version "$kernel_device") @@ -206,7 +210,7 @@ get_system_build() { } get_flash_type() { - local x=$(ipcinfo -F) + local x=$(${IPCINFO} -F) [ -z "$1" ] && [ "$x" = "nand" ] && $(fw_printenv bootcmd | grep -qv nand) && x=nor echo "$x" } @@ -224,6 +228,7 @@ Where: -k Update kernel from online repository. -r Update rootfs from online repository. -w Update Web UI to development version. + -d Update firmware from development branch. --url=[URL] Custom URL to update from (.tgz format). --kernel=[FILE] Update kernel from file (uImage format). --rootfs=[FILE] Update rootfs from file (squashfs format). @@ -271,6 +276,10 @@ for i in "$@"; do skip_ver=1 shift ;; + -d) + branch_dev=1 + shift + ;; -h | --help) print_sysinfo print_usage From 06dba3364c0deb39a9ad4db73c3e7642b85fd801 Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 19 May 2023 13:58:06 +0300 Subject: [PATCH 2/4] [no ci] fix hi3536dv100 rootfs oversize (#808) --- br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig index b4bbc658..282b9d00 100644 --- a/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig @@ -74,7 +74,7 @@ BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set -BR2_PACKAGE_MICROBE_WEB=y +# BR2_PACKAGE_MICROBE_WEB is not set # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_OPUS_OPENIPC is not set # BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT is not set From 8a8edbf305ca56b81c962eaec687abab5ac8a85c Mon Sep 17 00:00:00 2001 From: Paul Philippov Date: Fri, 19 May 2023 12:24:20 -0400 Subject: [PATCH 3/4] Update default MAC address (#807) --- .../wireless-configuration/files/network/interfaces.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/wireless-configuration/files/network/interfaces.conf b/general/package/wireless-configuration/files/network/interfaces.conf index 64d44ca9..411251c3 100644 --- a/general/package/wireless-configuration/files/network/interfaces.conf +++ b/general/package/wireless-configuration/files/network/interfaces.conf @@ -3,7 +3,7 @@ iface lo inet loopback auto eth0 iface eth0 inet static - hwaddress ether $(fw_printenv -n ethaddr || echo 00:24:B8:FF:FF:FF) + hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66) address 192.168.2.10 netmask 255.255.255.0 From 714c9b736d4df05327ef6c767f79014f3bb86535 Mon Sep 17 00:00:00 2001 From: Paul Philippov Date: Fri, 19 May 2023 12:27:05 -0400 Subject: [PATCH 4/4] Update eth0 default MAC (#806) --- general/overlay/etc/network/interfaces.d/eth0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/overlay/etc/network/interfaces.d/eth0 b/general/overlay/etc/network/interfaces.d/eth0 index 70bcef7c..055f7695 100644 --- a/general/overlay/etc/network/interfaces.d/eth0 +++ b/general/overlay/etc/network/interfaces.d/eth0 @@ -1,6 +1,6 @@ auto eth0 iface eth0 inet dhcp - hwaddress ether $(fw_printenv -n ethaddr || echo 00:24:B8:FF:FF:FF) + hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66) #udhcpc_opts -O search -O ntpsrv -O hostname #pre-up echo -e "nameserver 77.88.8.8\nnameserver 8.8.4.4\n" >/tmp/resolv.conf #pre-up echo -e "server 0.time.openipc.org iburst\nserver 1.time.openipc.org iburst\nserver 2.time.openipc.org iburst\nserver 3.time.openipc.org iburst" >/tmp/ntp.conf