update 2022-08-16 20:19:00

adguardhome/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
 PKG_VERSION:=0.107.9
-PKG_RELEASE:=58
+PKG_RELEASE:=59
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=cbf221585eb5c325a72c751dfef0c8a83abbacc6

aliyundrive-webdav/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aliyundrive-webdav
-PKG_VERSION:=1.10.0
+PKG_VERSION:=1.10.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_LICENSE:=MIT

luci-app-aliyundrive-webdav/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-aliyundrive-webdav
-PKG_VERSION:=1.10.0
+PKG_VERSION:=1.10.1
 PKG_RELEASE:=1
 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 

luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.112
+PKG_VERSION:=3.1.113
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/root/usr/sbin/openwrt-update-allwinner

@@ -182,6 +182,27 @@ else
     echo "losetup $IMG_FILE failed!"
     exit 1
 fi
+
+# fix loopdev issue in kernel 5.19
+function fix_loopdev() {
+    local parentdev=${1##*/}
+    if [ ! -d /sys/block/${parentdev} ];then
+        return
+    fi
+    subdevs=$(lsblk -l -o NAME | grep -E "^${parentdev}.+\$")
+    for subdev in $subdevs; do
+        if [ ! -d /sys/block/${parentdev}/${subdev} ];then
+            return
+        elif [ -b /dev/${sub_dev} ];then
+            continue
+        fi
+        source /sys/block/${parentdev}/${subdev}/uevent
+        mknod /dev/${subdev} b ${MAJOR} ${MINOR}
+        unset MAJOR MINOR DEVNAME DEVTYPE DISKSEQ PARTN PARTNAME
+    done
+}
+fix_loopdev ${LOOP_DEV}
+
 WAIT=3
 echo -n "The loopdev is $LOOP_DEV, wait ${WAIT} seconds "
 while [ $WAIT -ge 1 ]; do

luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic

@@ -204,6 +204,26 @@ else
     exit 1
 fi
 
+# fix loopdev issue in kernel 5.19
+function fix_loopdev() {
+    local parentdev=${1##*/}
+    if [ ! -d /sys/block/${parentdev} ];then
+        return
+    fi
+    subdevs=$(lsblk -l -o NAME | grep -E "^${parentdev}.+\$")
+    for subdev in $subdevs; do
+        if [ ! -d /sys/block/${parentdev}/${subdev} ];then
+            return
+        elif [ -b /dev/${sub_dev} ];then
+            continue
+        fi
+        source /sys/block/${parentdev}/${subdev}/uevent
+        mknod /dev/${subdev} b ${MAJOR} ${MINOR}
+        unset MAJOR MINOR DEVNAME DEVTYPE DISKSEQ PARTN PARTNAME
+    done
+}
+fix_loopdev ${LOOP_DEV}
+
 WAIT=3
 echo "The loopdev is [ $LOOP_DEV ], wait [ ${WAIT} ] seconds. "
 while [ $WAIT -ge 1 ]; do

luci-app-amlogic/root/usr/sbin/openwrt-update-kvm

@@ -211,6 +211,26 @@ else
     exit 1
 fi
 
+# fix loopdev issue in kernel 5.19
+function fix_loopdev() {
+    local parentdev=${1##*/}
+    if [ ! -d /sys/block/${parentdev} ];then
+        return
+    fi
+    subdevs=$(lsblk -l -o NAME | grep -E "^${parentdev}.+\$")
+    for subdev in $subdevs; do
+        if [ ! -d /sys/block/${parentdev}/${subdev} ];then
+            return
+        elif [ -b /dev/${sub_dev} ];then
+            continue
+        fi
+        source /sys/block/${parentdev}/${subdev}/uevent
+        mknod /dev/${subdev} b ${MAJOR} ${MINOR}
+        unset MAJOR MINOR DEVNAME DEVTYPE DISKSEQ PARTN PARTNAME
+    done
+}
+fix_loopdev ${LOOP_DEV}
+
 WAIT=3
 echo "The loopdev is [ $LOOP_DEV ], wait [ ${WAIT} ] seconds. "
 while [ $WAIT -ge 1 ]; do

luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip

@@ -41,6 +41,13 @@ elif [[ "$(echo ${MYDEVICE_NAME} | grep "BeikeYun")" != "" ]]; then
         MYDTB_FDTFILE="rk3328-beikeyun-1296mhz.dtb"
     fi
     SOC="beikeyun"
+elif [[ "$(echo ${MYDEVICE_NAME} | grep "FastRhino R68S")" != "" ]]; then
+    if [ -n "$CURRENT_FDTFILE" ];then
+        MYDTB_FDTFILE="$CURRENT_FDTFILE"
+    else
+        MYDTB_FDTFILE="rk3568-fastrhino-r68s.dtb"
+    fi
+    SOC="r68s"
 else
     echo "Unknown device: [ ${MYDEVICE_NAME} ], Not supported."
     exit 1
@@ -189,6 +196,27 @@ else
     echo "losetup $IMG_FILE failed!"
     exit 1
 fi
+
+# fix loopdev issue in kernel 5.19
+function fix_loopdev() {
+    local parentdev=${1##*/}
+    if [ ! -d /sys/block/${parentdev} ];then
+        return
+    fi
+    subdevs=$(lsblk -l -o NAME | grep -E "^${parentdev}.+\$")
+    for subdev in $subdevs; do
+        if [ ! -d /sys/block/${parentdev}/${subdev} ];then
+            return
+        elif [ -b /dev/${sub_dev} ];then
+            continue
+        fi
+        source /sys/block/${parentdev}/${subdev}/uevent
+        mknod /dev/${subdev} b ${MAJOR} ${MINOR}
+        unset MAJOR MINOR DEVNAME DEVTYPE DISKSEQ PARTN PARTNAME
+    done
+}
+fix_loopdev ${LOOP_DEV}
+
 WAIT=3
 echo -n "The loopdev is $LOOP_DEV, wait ${WAIT} seconds "
 while [ $WAIT -ge 1 ]; do
@@ -565,6 +593,11 @@ extraargs=usbcore.autosuspend=-1
 extraboardargs=
 fdtfile=/dtb/rockchip/${MYDTB_FDTFILE}
 EOF
+# 对没有 HDMI 的机型关闭 display tty 让 initrd script 输出到 uart
+# 参考 https://github.com/raspberrypi/linux/issues/2863
+if [ "$SOC" == "r68s" ];then
+    echo console=serial >> armbianEnv.txt
+fi
 sync
 echo "done"
 echo