From 15366330c7d06e3a455598363c2463b769396bfe Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Mon, 25 Mar 2024 20:28:07 +0800
Subject: [PATCH] update 2024-03-25 20:28:07

---
 luci-app-amlogic/Makefile                              |  2 +-
 luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip | 10 ++++++++++
 luci-theme-atmaterial_new/Makefile                     |  4 ++--
 luci-theme-tomato/Makefile                             |  1 -
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile
index a244271d9..3e04f1e1b 100644
--- a/luci-app-amlogic/Makefile
+++ b/luci-app-amlogic/Makefile
@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.227
+PKG_VERSION:=3.1.228
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License
diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
index 861056711..431a6a39d 100755
--- a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
+++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
@@ -757,6 +757,16 @@ echo "done"
 echo
 
 echo -n "Update boot args ... "
+
+if [ -f /tmp/armbianEnv.txt ];then
+    ORIG_OVERLAYS=$(grep '^overlays=' /tmp/armbianEnv.txt)
+    ORIG_USER_OVERLAYS=$(grep '^user_overlays=' /tmp/armbianEnv.txt)
+    sed -e '/user_overlays=/d' -i armbianEnv.txt
+    sed -e '/overlays=/d' -i armbianEnv.txt
+    echo "$ORIG_OVERLAYS" >> armbianEnv.txt
+    echo "$ORIG_USER_OVERLAYS" >> armbianEnv.txt
+fi
+
 sed -e '/fdtfile=/d' -i armbianEnv.txt
 sed -e '/rootdev=/d' -i armbianEnv.txt
 sed -e '/rootfstype=/d' -i armbianEnv.txt
diff --git a/luci-theme-atmaterial_new/Makefile b/luci-theme-atmaterial_new/Makefile
index 43721d85d..9703d8b90 100644
--- a/luci-theme-atmaterial_new/Makefile
+++ b/luci-theme-atmaterial_new/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=Atmaterial_new kenzo
 LUCI_DEPENDS:=
 PKG_VERSION:=1.2
-PKG_RELEASE:=02-20200209
+PKG_RELEASE:=2
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
-# call BuildPackage - OpenWrt buildroot signature
\ No newline at end of file
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-theme-tomato/Makefile b/luci-theme-tomato/Makefile
index 0e729c8c5..2d67d925a 100644
--- a/luci-theme-tomato/Makefile
+++ b/luci-theme-tomato/Makefile
@@ -1,6 +1,5 @@
 # LuCI Material Theme
 # Copyright 2015 Lutty Yang <lutty@wcan.in>
-#
 # Licensed under the Apache License v2.0
 # http://www.apache.org/licenses/LICENSE-2.0