reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-t/au-Goulburn-Rocky_Hill b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-t/au-Goulburn-Rocky_Hill
new file mode 100755
index 0000000..259d9ea
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-t/au-Goulburn-Rocky_Hill
@@ -0,0 +1,664 @@
+# Australia / Goulburn / Rocky Hill
+#
+# Scanned 31/07/2016 - Alex Ferrara (alex@receptiveit.com.au)
+
+[Nine Canberra]
+ SERVICE_ID = 2055
+ VIDEO_PID = 353
+ AUDIO_PID = 354
+ PID_0b = 8026
+ PID_06 = 355
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[9HD Canberra]
+ SERVICE_ID = 2247
+ VIDEO_PID = 1761
+ AUDIO_PID = 1762 1763 8025
+ PID_0b = 8026
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Nine Canberra]
+ SERVICE_ID = 2215
+ VIDEO_PID = 353
+ AUDIO_PID = 354
+ PID_0b = 8026
+ PID_06 = 355
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[9Gem]
+ SERVICE_ID = 2087
+ VIDEO_PID = 1711
+ AUDIO_PID = 1712
+ PID_0b = 8026
+ PID_06 = 1713
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[9Go!]
+ SERVICE_ID = 2119
+ VIDEO_PID = 1721
+ AUDIO_PID = 1722
+ PID_0b = 8026
+ PID_06 = 1723
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[9Life]
+ SERVICE_ID = 2279
+ VIDEO_PID = 1771
+ AUDIO_PID = 1772
+ PID_0b = 8026
+ PID_06 = 1773
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[YESSHOP]
+ SERVICE_ID = 2151
+ VIDEO_PID = 1731
+ AUDIO_PID = 1732
+ PID_0b = 8026
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Aspire]
+ SERVICE_ID = 2183
+ VIDEO_PID = 1741
+ AUDIO_PID = 1742
+ PID_0b = 8026
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+ SERVICE_ID = 1921
+ VIDEO_PID = 122
+ AUDIO_PID = 522
+ PID_0b = 102
+ PID_06 = 722
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra HD]
+ SERVICE_ID = 1939
+ VIDEO_PID = 125
+ AUDIO_PID = 525 725
+ PID_0b = 102
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+ SERVICE_ID = 1922
+ VIDEO_PID = 123
+ AUDIO_PID = 523
+ PID_0b = 102
+ PID_06 = 723
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ELEVEN Canberra]
+ SERVICE_ID = 1926
+ VIDEO_PID = 124
+ AUDIO_PID = 524
+ PID_0b = 102
+ PID_06 = 724
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN NETWORK]
+ SERVICE_ID = 1936
+ VIDEO_PID = 126
+ AUDIO_PID = 526
+ PID_0b = 102
+ PID_06 = 726
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[TVSN]
+ SERVICE_ID = 1928
+ VIDEO_PID = 116
+ AUDIO_PID = 516
+ PID_0b = 102
+ PID_06 = 716
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[GOLD]
+ SERVICE_ID = 1927
+ VIDEO_PID = 115
+ AUDIO_PID = 515
+ PID_0b = 102
+ PID_06 = 715
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+ SERVICE_ID = 1925
+ VIDEO_PID = 123
+ AUDIO_PID = 523
+ PID_0b = 102
+ PID_06 = 723
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+ SERVICE_ID = 1924
+ VIDEO_PID = 122
+ AUDIO_PID = 522
+ PID_0b = 102
+ PID_06 = 722
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+ SERVICE_ID = 2374
+ VIDEO_PID = 2740
+ AUDIO_PID = 2741
+ PID_0b = 2749
+ PID_06 = 2745
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+ SERVICE_ID = 2400
+ VIDEO_PID = 2740
+ AUDIO_PID = 2741
+ PID_0b = 2749
+ PID_06 = 2745
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+ SERVICE_ID = 2401
+ VIDEO_PID = 2740
+ AUDIO_PID = 2741
+ PID_0b = 2749
+ PID_06 = 2745
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[7TWO Canberra]
+ SERVICE_ID = 2402
+ VIDEO_PID = 4620
+ AUDIO_PID = 4621
+ PID_0b = 2749
+ PID_06 = 4625
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[7mate Canberra]
+ SERVICE_ID = 2403
+ VIDEO_PID = 4630
+ AUDIO_PID = 4632 4635
+ PID_0b = 2749
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ishoptv]
+ SERVICE_ID = 2405
+ VIDEO_PID = 4650
+ AUDIO_PID = 4651
+ PID_0b = 2749
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[RACING.COM]
+ SERVICE_ID = 2408
+ VIDEO_PID = 4680
+ AUDIO_PID = 4681
+ PID_0b = 2749
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC News 24]
+ SERVICE_ID = 672
+ VIDEO_PID = 516
+ AUDIO_PID = 654 580 5500
+ PID_0b = 5501 5000
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC]
+ SERVICE_ID = 673
+ VIDEO_PID = 512
+ AUDIO_PID = 650
+ PID_0b = 5501 5000
+ PID_06 = 576
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC2/KIDS]
+ SERVICE_ID = 674
+ VIDEO_PID = 513
+ AUDIO_PID = 651
+ PID_0b = 5501 5000
+ PID_06 = 577
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC]
+ SERVICE_ID = 675
+ VIDEO_PID = 512
+ AUDIO_PID = 650
+ PID_0b = 5501 5000
+ PID_06 = 576
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC3]
+ SERVICE_ID = 676
+ VIDEO_PID = 514
+ AUDIO_PID = 652
+ PID_0b = 5501 5000
+ PID_06 = 578
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Double J]
+ SERVICE_ID = 678
+ AUDIO_PID = 690
+ PID_0b = 5501
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC Jazz]
+ SERVICE_ID = 679
+ AUDIO_PID = 700
+ PID_0b = 5501
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS ONE]
+ SERVICE_ID = 849
+ VIDEO_PID = 161
+ AUDIO_PID = 81
+ PID_0b = 7000 5000
+ PID_06 = 41
+ PID_05 = 7849
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS HD]
+ SERVICE_ID = 853
+ VIDEO_PID = 102
+ AUDIO_PID = 103
+ PID_0b = 7000 5000
+ PID_06 = 43
+ PID_05 = 7853
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS TWO]
+ SERVICE_ID = 850
+ VIDEO_PID = 162
+ AUDIO_PID = 83
+ PID_0b = 7000 5000
+ PID_06 = 42
+ PID_05 = 7850
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Food Network]
+ SERVICE_ID = 851
+ VIDEO_PID = 163
+ AUDIO_PID = 85
+ PID_0b = 7000 5000
+ PID_06 = 44
+ PID_05 = 7849
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[NITV]
+ SERVICE_ID = 852
+ VIDEO_PID = 164
+ AUDIO_PID = 87
+ PID_0b = 7000 5000
+ PID_06 = 45
+ PID_05 = 7852
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 1]
+ SERVICE_ID = 862
+ AUDIO_PID = 201
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 2]
+ SERVICE_ID = 863
+ AUDIO_PID = 202
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 3]
+ SERVICE_ID = 864
+ AUDIO_PID = 203
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+