[1] MLD-5.x / Development / [5.4] dvb-mb: Patch 23 braucht ein Update
 

Offline BobW

  • Expert Member
  • *****
  • Posts: 652
    • View Profile
[5.4] dvb-mb: Patch 23 braucht ein Update
« on: October 30, 2017, 11:58:00 »
Hallo,

das Bauen von dvb-mb schlägt fehl, da Patch 23_dvb_dddvb.patch von der Realität quasi "rechts" überholt wurde und Dinge ändern möchte, die in den Sources bereits geändert wurden.

Hier ist der Output meines letzten Versuchs.
Code: [Select]
mkfrank@msi-stretch:~/MLD-5.4/dvb-mb$ git pull
Bereits aktuell.
mkfrank@msi-stretch:~/MLD-5.4/dvb-mb$ make
dvb-mb:
        Use patch ../11_dvb_rc-medion-x10-or2x.c.patch
patching file linux/drivers/media/rc/keymaps/rc-medion-x10-or2x.c
        Use patch ../12_dvb_rc-imon-pad.patch
patching file linux/drivers/media/rc/keymaps/rc-imon-pad.c
        Use patch ../13_dvb_rc-tt-1500.c.patch
patching file linux/drivers/media/rc/keymaps/rc-tt-1500.c
        Use patch ../14_dvb_rc-medion-x10-digitainer.c.patch
patching file linux/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c
        Use patch ../15_dvb_rc-medion-x10.c.patch
patching file linux/drivers/media/rc/keymaps/rc-medion-x10.c
        Use patch ../16_dvb_rc-rc6-mce.c.patch
patching file linux/drivers/media/rc/keymaps/rc-rc6-mce.c
        Use patch ../17_dvb_ttpci_shift_freq.patch
patching file linux/drivers/media/pci/ttpci/av7110.c
Hunk #2 succeeded at 1828 (offset 5 lines).
        Use patch ../18_dvb_mbe_changes.patch
patching file linux/include/uapi/linux/dvb/frontend.h
Hunk #1 succeeded at 560 with fuzz 2 (offset 239 lines).
        Use patch ../19_dvb_tevii-482.patch                                                                                                                                                                                   
patching file linux/drivers/media/usb/dvb-usb/dw2102.c                                                                                                                                                                         
Hunk #2 succeeded at 2506 (offset 54 lines).                                                                                                                                                                                   
Hunk #3 succeeded at 2570 (offset 50 lines).                                                                                                                                                                                   
Hunk #4 succeeded at 2599 (offset 50 lines).                                                                                                                                                                                   
        Use patch ../20_dvb_pctv452e.patch                                                                                                                                                                                     
patching file linux/drivers/media/usb/dvb-usb/pctv452e.c                                                                                                                                                                       
        Use patch ../21_dvb_makefile.patch                                                                                                                                                                                     
patching file v4l/Makefile                                                                                                                                                                                                     
        Use patch ../22_dvb_ffhd.patch                                                                                                                                                                                         
patching file linux/drivers/media/pci/saa716x/saa716x_rom.c                                                                                                                                                                   
patching file linux/drivers/media/pci/saa716x/Makefile                                                                                                                                                                         
patching file linux/drivers/media/pci/saa716x/saa716x_ff_cmd.h                                                                                                                                                                 
Hunk #1 succeeded at 1 with fuzz 2 (offset -18 lines).                                                                                                                                                                         
        Use patch ../23_dvb_dddvb.patch                                                                                                                                                                                       
patching file linux/drivers/media/dvb-core/dvb_ca_en50221.h                                                                                                                                                                   
Hunk #1 succeeded at 73 with fuzz 2 (offset 7 lines).
patching file linux/drivers/media/dvb-core/Makefile
patching file linux/drivers/media/dvb-core/dvb_frontend.h
patching file linux/drivers/media/dvb-core/dvbdev.h
patching file linux/drivers/media/dvb-core/dvbdev.c
patching file linux/drivers/media/dvb-core/dvb_netstream.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file linux/drivers/media/dvb-core/dvb_netstream.c.rej
patching file linux/drivers/media/dvb-frontends/Kconfig
Hunk #1 succeeded at 62 with fuzz 2 (offset 27 lines).
Hunk #2 succeeded at 147 (offset 27 lines).
patching file linux/drivers/media/dvb-frontends/Makefile
Hunk #1 FAILED at 112.
1 out of 1 hunk FAILED -- saving rejects to file linux/drivers/media/dvb-frontends/Makefile.rej
patching file linux/drivers/media/dvb-frontends/drxk_hard.c
Hunk #1 succeeded at 1866 with fuzz 1.
patching file linux/drivers/media/dvb-frontends/cxd2843.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file linux/drivers/media/dvb-frontends/cxd2843.c.rej
patching file linux/drivers/media/dvb-frontends/mxl5xxdd.c
Hunk #4 FAILED at 540.
Hunk #5 FAILED at 562.
Hunk #6 succeeded at 696 (offset 16 lines).
Hunk #7 FAILED at 732.
Hunk #8 succeeded at 784 (offset 15 lines).
Hunk #9 succeeded at 855 (offset 15 lines).
Hunk #10 succeeded at 1032 (offset 15 lines).
Hunk #11 succeeded at 1121 (offset 15 lines).
Hunk #12 succeeded at 1320 (offset 15 lines).
Hunk #13 succeeded at 1370 (offset 15 lines).
Hunk #14 succeeded at 1634 (offset 15 lines).
Hunk #15 succeeded at 1712 (offset 15 lines).
Hunk #16 succeeded at 1753 (offset 15 lines).
Hunk #17 succeeded at 1838 (offset 15 lines).
Hunk #18 succeeded at 1891 (offset 15 lines).
Hunk #19 succeeded at 1943 (offset 15 lines).
3 out of 19 hunks FAILED -- saving rejects to file linux/drivers/media/dvb-frontends/mxl5xxdd.c.rej
patching file linux/drivers/media/dvb-frontends/mxl5xxdd.h
patching file linux/drivers/media/dvb-frontends/stv0367dd.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file linux/drivers/media/dvb-frontends/stv0367dd.c.rej
patching file linux/drivers/media/dvb-frontends/stv090x.c
patching file linux/drivers/media/pci/ddbridge/ddbridge-core.c
Hunk #1 FAILED at 1349.
Hunk #2 FAILED at 1716.
Hunk #3 FAILED at 1742.
Hunk #4 FAILED at 1803.
Hunk #5 FAILED at 1841.
Hunk #6 FAILED at 1943.
Hunk #7 FAILED at 1993.
Hunk #8 FAILED at 2002.
Hunk #9 FAILED at 2021.
Hunk #10 FAILED at 2285.
Hunk #11 succeeded at 1617 (offset -702 lines).
Hunk #12 succeeded at 1932 with fuzz 1 (offset -703 lines).
Hunk #13 FAILED at 3117.
Hunk #14 FAILED at 3984.
12 out of 14 hunks FAILED -- saving rejects to file linux/drivers/media/pci/ddbridge/ddbridge-core.c.rej
patching file linux/drivers/media/pci/ddbridge/ddbridge.h
Hunk #1 succeeded at 88 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 249.
Hunk #3 succeeded at 317 (offset -1 lines).
Hunk #4 FAILED at 411.
2 out of 4 hunks FAILED -- saving rejects to file linux/drivers/media/pci/ddbridge/ddbridge.h.rej
The next patch would create the file linux/drivers/media/pci/ddbridge/Kconfig,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file linux/drivers/media/pci/ddbridge/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file linux/drivers/media/pci/ddbridge/Makefile.rej
patching file linux/drivers/media/pci/ddbridge/Kbuild
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file linux/drivers/media/pci/ddbridge/Kbuild.rej
patching file linux/include/uapi/linux/dvb/frontend.h
Hunk #1 succeeded at 401 with fuzz 1 (offset 202 lines).
patching file linux/drivers/media/dvb-frontends/stv0910.h
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- saving rejects to file linux/drivers/media/dvb-frontends/stv0910.h.rej
../Makefile.tools:659: die Regel für Ziel „patch“ scheiterte
make[2]: *** [patch] Fehler 1
Makefile:51: die Regel für Ziel „src/dvb-mb-2017.05.01“ scheiterte
make[1]: *** [src/dvb-mb-2017.05.01] Fehler 2
Ihr Branch ist auf dem selben Stand wie 'origin/master'.
mkfrank@msi-stretch:~/MLD-5.4/dvb-mb$

Schöne Grüße aus Wien
BobW

Edit: Nach Disablen von 23 scheitert auch 30_dvb_lnbh25dd.patch.
« Last Edit: October 30, 2017, 12:01:24 by BobW »

Offline P3f

  • Administrator
  • Expert Member
  • ********
  • Posts: 1467
    • View Profile
[5.4] dvb-mb: Patch 23 braucht ein Update
« Reply #1 on: October 30, 2017, 14:50:29 »
Hallo BobW,
vielen Dank für den Hinweis. Die Patche haben wir bereits aktualisiert im lokalen Repository. Also noch nicht online.

Im unstable Zweig stehen die aktualisierten Pakete zum Download bereit. Die Patche werde ich erst später Einchecken, da ich sowieso noch am dvb-mbe etwas nachbessern muss. Befinde mich nur gerade in einer anderen Zeitzone ✌️😇

Gruß,
Pit
----------------------------------------------------------------------
VDR 1:(MLD 6.5-64), ZOTAC ION ITX F-E, 1GB 1033, ATRIC-Einschalter, ImonLCD, Cinergy S2 HD
VDR 2 MLD 5.4-BPI: BananaPI | 16 GB SD-Card | MLD 5.3 in Entwicklung
MLD-WTK: WeTek-Play | 8 GB MicroSD-Card | MLD 5.3 als SatIP-Server

Offline BobW

  • Expert Member
  • *****
  • Posts: 652
    • View Profile
[5.4] dvb-mb: Patch 23 braucht ein Update
« Reply #2 on: October 30, 2017, 16:06:39 »
Hallo Pit,

nur nicht hetzen lassen ...

Danke für die Auskunft.

BobW

[1] MLD-5.x / Development / [5.4] dvb-mb: Patch 23 braucht ein Update
 



Users Online Users Online

0 Members and 1 Guest are viewing this topic.