Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-12-14 16:50:45 +08:00
commit 6156e0182e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 9 additions and 9 deletions

View File

@ -30,7 +30,7 @@ define Package/lua5.3/Default
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=Lua programming language
TITLE:=Lua programming language (version 5.3)
URL:=https://www.lua.org/
MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
endef
@ -42,7 +42,7 @@ define Package/lua5.3/Default/description
endef
define Package/liblua5.3
$(call Package/lua53/Default)
$(call Package/lua5.3/Default)
SUBMENU:=
SECTION:=libs
CATEGORY:=Libraries
@ -51,7 +51,7 @@ $(call Package/lua53/Default)
endef
define Package/liblua5.3/description
$(call Package/lua53/Default/description)
$(call Package/lua5.3/Default/description)
This package contains the Lua shared libraries, needed by other programs.
endef

View File

@ -21,8 +21,8 @@
led-running = &led_system_green;
led-upgrade = &led_system_green;
/* Aliases as required by u-boot to patch MAC addresses */
ethernet0 = &dp5;
ethernet1 = &dp6;
ethernet0 = &dp6;
ethernet1 = &dp5;
label-mac-device = &dp5;
};
@ -372,14 +372,14 @@
&dp5 {
status = "okay";
phy-handle = <&qca8081_28>;
label = "wan";
phy-handle = <&qca8081_24>;
label = "lan";
};
&dp6 {
status = "okay";
phy-handle = <&qca8081_24>;
label = "lan";
phy-handle = <&qca8081_28>;
label = "wan";
};
&wifi {