update

devices/common/diy.sh

@@ -5,6 +5,7 @@ sed -i '/	refresh_config();/d' scripts/feeds
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p custom
 ./scripts/feeds install -a
+cd feeds/custom; git pull; cd -
 sed -i 's/Os/O2/g' include/target.mk
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl

devices/common/patches/opkginstall.patch

@@ -209,66 +209,6 @@
  }
  
 
---- a/package/feeds/luci/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
-+++ b/package/feeds/luci/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
-@@ -203,6 +203,7 @@ return view.extend({
- 			}, this, ev.target))
- 			.then(L.bind(function(btn, res) {
- 				var keep = E('input', { type: 'checkbox' }),
-+				    keep_opkg = E('input', { type: 'checkbox' }),
- 				    force = E('input', { type: 'checkbox' }),
- 				    is_valid = res[1].valid,
- 				    is_forceable = res[1].forceable,
-@@ -220,6 +221,10 @@ return view.extend({
- 				body.push(E('p', {}, E('label', { 'class': 'btn' }, [
- 					keep, ' ', _('Keep settings and retain the current configuration')
- 				])));
-+				body.push(E('p', {}, E('label', { 'class': 'btn' }, [
-+					keep_opkg, ' ', _('Retain the current packages')
-+				])));
-+					keep_opkg.checked = true;
- 
- 				if (!is_valid || is_too_big)
- 					body.push(E('hr'));
-@@ -257,7 +262,7 @@ return view.extend({
- 
- 				var cntbtn = E('button', {
- 					'class': 'btn cbi-button-action important',
--					'click': ui.createHandlerFn(this, 'handleSysupgradeConfirm', btn, keep, force),
-+					'click': ui.createHandlerFn(this, 'handleSysupgradeConfirm', btn, keep, keep_opkg, force),
- 					'disabled': (!is_valid || is_too_big) ? true : null
- 				}, [ _('Continue') ]);
- 
-@@ -282,7 +287,7 @@ return view.extend({
- 			}, this, ev.target));
- 	},
- 
--	handleSysupgradeConfirm: function(btn, keep, force, ev) {
-+	handleSysupgradeConfirm: function(btn, keep, keep_opkg, force, ev) {
- 		btn.firstChild.data = _('Flashing…');
- 
- 		ui.showModal(_('Flashing…'), [
-@@ -294,6 +299,9 @@ return view.extend({
- 		if (!keep.checked)
- 			opts.push('-n');
- 
-+		if (keep_opkg.checked)
-+			opts.push('-k');
-+
- 		if (force.checked)
- 			opts.push('--force');
- 
---- a/package/feeds/luci/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json
-+++ b/package/feeds/luci/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json
-@@ -140,6 +140,7 @@
- 				"/sbin/sysupgrade --force /tmp/firmware.bin": [ "exec" ],
- 				"/sbin/sysupgrade -n --force /tmp/firmware.bin": [ "exec" ],
- 				"/sbin/sysupgrade -n /tmp/firmware.bin": [ "exec" ],
-+				"/sbin/sysupgrade -k /tmp/firmware.bin": [ "exec" ],
- 				"/sbin/sysupgrade --restore-backup /tmp/backup.tar.gz": [ "exec" ],
- 				"/sbin/sysupgrade --test /tmp/firmware.bin": [ "exec" ],
- 				"/sbin/sysupgrade /tmp/firmware.bin": [ "exec" ],
-
 --- a/package/base-files/files/sbin/sysupgrade
 +++ b/package/base-files/files/sbin/sysupgrade
 @@ -232,6 +232,7 @@ do_save_conffiles() {