From d57604bf1a6537f8ae327fc1ce51b8b3ea06ff69 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 12 Nov 2021 23:40:50 +0800 Subject: [PATCH] default-settings: simplified installation Also fix typo error which will cause build failed. Fixes: 75954bd ("default-settings: split cnh variant into a separated pkg") (cherry picked from commit 202742604b2c0c4620419854e720acf649426036) --- package/emortal/default-settings/Makefile | 4 ++-- .../files/{zzz-default-settings => 99-default-settings} | 0 ...z-default-settings-chinese => 99-default-settings-chinese} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename package/emortal/default-settings/files/{zzz-default-settings => 99-default-settings} (100%) rename package/emortal/default-settings/files/{zzz-default-settings-chinese => 99-default-settings-chinese} (100%) diff --git a/package/emortal/default-settings/Makefile b/package/emortal/default-settings/Makefile index 99dff1b527..1fdde08503 100644 --- a/package/emortal/default-settings/Makefile +++ b/package/emortal/default-settings/Makefile @@ -40,12 +40,12 @@ define Package/default-settings/install $(INSTALL_DATA) ./files/openwrt_banner $(1)/etc/openwrt_banner $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings + $(INSTALL_BIN) ./files/99-default-settings $(1)/etc/uci-defaults/ endef define Package/default-settings-chn/install $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/zzz-default-settings-chinese $(1)/etc/uci-defaults/99-default-settings-chinese + $(INSTALL_BIN) ./files/99-default-settings-chinese $(1)/etc/uci-defaults/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n po2lmo ./i18n/default.zh_Hans.po $(1)/usr/lib/lua/luci/i18n/default.zh-cn.lmo diff --git a/package/emortal/default-settings/files/zzz-default-settings b/package/emortal/default-settings/files/99-default-settings similarity index 100% rename from package/emortal/default-settings/files/zzz-default-settings rename to package/emortal/default-settings/files/99-default-settings diff --git a/package/emortal/default-settings/files/zzz-default-settings-chinese b/package/emortal/default-settings/files/99-default-settings-chinese similarity index 100% rename from package/emortal/default-settings/files/zzz-default-settings-chinese rename to package/emortal/default-settings/files/99-default-settings-chinese