CC: opkg: ensure image provided feeds are available after sysupgrade
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 11 Sep 2015 10:48:42 +0000 (10:48 +0000)
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 11 Sep 2015 10:48:42 +0000 (10:48 +0000)
commitac8dd1d3f9c3d2f192aa42d06945cee9464a0dd6
tree7aa8803c4f6728bc09868a08e04b7acc9bfae941
parentf13a17fd6841b217c01a839f1b812ae5b1084222
CC: opkg: ensure image provided feeds are available after sysupgrade
Split the opkg.conf into three files, to make it easier to support custom
feeds and configs:

* /etc/opkg.conf -> base opkg configuration
* /etc/opkg/distfeeds.conf -> default Openwrt package feeds
* /etc/opkg/customfeeds.conf -> custom package feeds

Of these three, only the base opkg.conf and the customfeeds.conf is marked
as to be kept, so that the distfeeds.conf from the image is always used.

To ease migration, a script is added that moves any feeds from /etc/opkg.conf
to /etc/opkg/customfeeds.conf on first boot.

Also ensure that any keys used for verification are also kept in upgrade.

Backport of r46491.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46848 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/system/opkg/Makefile
package/system/opkg/files/20_migrate-feeds [new file with mode: 0644]
package/system/opkg/files/customfeeds.conf [new file with mode: 0644]