Skip to content

Commit aae3e35

Browse files
committed
Fix the issue of missing kernel file in wxy-oect(rk3566)
1 parent 7ba6f91 commit aae3e35

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

luci-app-amlogic/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
include $(TOPDIR)/rules.mk
1717

1818
PKG_NAME:=luci-app-amlogic
19-
PKG_VERSION:=3.1.266
19+
PKG_VERSION:=3.1.268
2020
PKG_RELEASE:=1
2121

2222
PKG_LICENSE:=GPL-2.0 License

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ update_kernel() {
268268
rm -f /boot/uInitrd*
269269
else
270270
valid_files="vmlinuz-${kernel_name} uInitrd-${kernel_name} config-${kernel_name} System.map-${kernel_name}"
271-
rm -f /boot/initrd.img*
271+
# wxy-oect: MODEL_ID numbers r304 and r306, require special handling of uInitrd
272+
[[ "${MODEL_ID}" =~ ^(r304|r306)$ ]] || rm -f /boot/initrd.img*
272273
fi
273274
for f in ${valid_files}; do [[ -f "/boot/${f}" ]] || restore_kernel; done
274275

@@ -289,9 +290,7 @@ update_kernel() {
289290
fi
290291

291292
# wxy-oect: MODEL_ID numbers r304 and r306, require special handling of uInitrd
292-
[[ "${MODEL_ID}" == "r304" || "${MODEL_ID}" == "r306" ]] && {
293-
rm -f uInitrd && ln -sf initrd.img-${kernel_name} uInitrd
294-
}
293+
[[ "${MODEL_ID}" =~ ^(r304|r306)$ ]] && ln -sf initrd.img-${kernel_name} uInitrd
295294
)
296295

297296
echo -e "(1/3) Unpacking [ boot-${kernel_name}.tar.gz ] done."

0 commit comments

Comments
 (0)