revert r16164
revert 16163
[Cubox] add dvb-sky support