garypang13 před 4 roky
rodič
revize
1c29260368

+ 12 - 0
devices/common/patches/opkginstall.patch

@@ -1,3 +1,15 @@
+--- a/package/feeds/luci/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
++++ b/package/feeds/luci/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
+@@ -880,7 +880,7 @@ function handleOpkg(ev)
+ 				_('Waiting for the <em>opkg %h</em> command to complete…').format(cmd))
+ 		]);
+ 
+-		var argv = [ cmd, '--force-removal-of-dependent-packages' ];
++		var argv = [ cmd ];
+ 
+ 		if (rem && rem.checked)
+ 			argv.push('--autoremove');
+
 --- a/package/feeds/luci/luci-app-opkg/root/usr/libexec/opkg-call
 +++ b/package/feeds/luci/luci-app-opkg/root/usr/libexec/opkg-call
 @@ -15,6 +15,7 @@ case "$action" in

+ 9 - 3
devices/common/patches/package_lang.patch → devices/common/patches/package.patch

@@ -1,6 +1,6 @@
 --- a/include/package.mk
 +++ b/include/package.mk
-@@ -307,6 +307,21 @@ endif
+@@ -309,6 +309,21 @@ endif
    $(if $(PKG_HOST_ONLY),,$(call Build/DefaultTargets,$(1)))
  endef
  
@@ -22,11 +22,17 @@
  define pkg_install_files
  	$(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)
  endef
-@@ -353,3 +368,96 @@ dist:
+@@ -355,3 +370,102 @@ dist:
  
  distcheck:
  	$(Build/DistCheck)
 +
++ifndef Package/$(PKG_NAME)/conffiles
++define Package/$(PKG_NAME)/conffiles
++/etc/config/
++endef
++endif
++
 +LUCI_NAME?=$(notdir ${CURDIR})
 +LUCI_TYPE?=$(word 2,$(subst -, ,$(LUCI_NAME)))
 +LUCI_BASENAME?=$(patsubst luci-$(LUCI_TYPE)-%,%,$(LUCI_NAME))
@@ -118,4 +124,4 @@
 +endef
 +
 +  $(foreach lang,$(LUCI_LANGUAGES),$(eval $(call LuciTranslation,$(firstword $(LUCI_LC_ALIAS.$(lang)) $(lang)),$(lang))))
-+  $(foreach pkg,$(LUCI_LANG_PACKAGES),$(eval $(call BuildPackage1,$(pkg))))
++  $(foreach pkg,$(LUCI_LANG_PACKAGES),$(eval $(call BuildPackage1,$(pkg))))