opkg: ensure image provided feeds are available after sysupgrade
authorJonas Gorski <jogo@openwrt.org>
Sat, 25 Jul 2015 12:12:28 +0000 (12:12 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sat, 25 Jul 2015 12:12:28 +0000 (12:12 +0000)
commit2fce99213972731fa1480b2de3f460dca66bfcf7
tree8c1ff2916d28649934fae34de1149a71b036be58
parentec6c8aa40d2b770c3fda7575259bae5a48f21805
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.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46491
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]