CC: opkg: ensure image provided feeds are available after sysupgrade
authorJonas Gorski <jogo@openwrt.org>
Fri, 11 Sep 2015 10:48:42 +0000 (10:48 +0000)
committerJonas Gorski <jogo@openwrt.org>
Fri, 11 Sep 2015 10:48:42 +0000 (10:48 +0000)
commit9fac90549e42d5c8141cdb4258fc765454b7d401
tree797ea13aef33de59f12093404246c2d1c3a6617b
parent4dfa0df733904689c893588a87bda590e4c93e07
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>
SVN-Revision: 46848
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]