<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12848">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">edit-gpif: Fix build for distros with python3 as default<br><br>Fix the script so it is python2 and python3 compatible, then let the<br>distro decide which python version to use.<br><br>Change-Id: If805c8167e2cf57ce3d6143dddfd4685ad729142<br>---<br>M firmware/src/common/Makefile.am<br>M firmware/src/common/edit-gpif<br>M firmware/src/usrp2/Makefile.am<br>M firmware/src/usrp2/edit-gpif<br>4 files changed, 4 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/48/12848/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/src/common/Makefile.am b/firmware/src/common/Makefile.am</span><br><span>index 9523232..a98671e 100644</span><br><span>--- a/firmware/src/common/Makefile.am</span><br><span>+++ b/firmware/src/common/Makefile.am</span><br><span>@@ -39,7 +39,7 @@</span><br><span> all: usrp_gpif.c</span><br><span> </span><br><span> usrp_gpif.c usrp_gpif_inline.h : gpif.c</span><br><span style="color: hsl(0, 100%, 40%);">- srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h</span><br><span style="color: hsl(120, 100%, 40%);">+        srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h</span><br><span> </span><br><span> CLEANFILES = \</span><br><span>   *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \</span><br><span>diff --git a/firmware/src/common/edit-gpif b/firmware/src/common/edit-gpif</span><br><span>index 5367b75..87e16eb 100755</span><br><span>--- a/firmware/src/common/edit-gpif</span><br><span>+++ b/firmware/src/common/edit-gpif</span><br><span>@@ -27,7 +27,6 @@</span><br><span> # uses.</span><br><span> </span><br><span> import re</span><br><span style="color: hsl(0, 100%, 40%);">-import string</span><br><span> import sys</span><br><span> </span><br><span> def check_flow_state (line, flow_state_dict):</span><br><span>@@ -93,7 +92,7 @@</span><br><span>     </span><br><span>     while 1:</span><br><span>         line = input.readline ()</span><br><span style="color: hsl(0, 100%, 40%);">-        line = string.replace (line, '\r','')</span><br><span style="color: hsl(120, 100%, 40%);">+        line = line.replace ('\r','')</span><br><span>         line = re.sub (r' *$', r'', line)</span><br><span> </span><br><span>         check_flow_state (line, flow_state_dict)</span><br><span>diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am</span><br><span>index a32e20c..6d44320 100644</span><br><span>--- a/firmware/src/usrp2/Makefile.am</span><br><span>+++ b/firmware/src/usrp2/Makefile.am</span><br><span>@@ -159,7 +159,7 @@</span><br><span> all: usrp_gpif.c</span><br><span> </span><br><span> usrp_gpif.c usrp_gpif_inline.h : gpif.c</span><br><span style="color: hsl(0, 100%, 40%);">-   srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h</span><br><span style="color: hsl(120, 100%, 40%);">+        srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h</span><br><span> </span><br><span> </span><br><span> # dependencies</span><br><span>diff --git a/firmware/src/usrp2/edit-gpif b/firmware/src/usrp2/edit-gpif</span><br><span>index 5367b75..87e16eb 100755</span><br><span>--- a/firmware/src/usrp2/edit-gpif</span><br><span>+++ b/firmware/src/usrp2/edit-gpif</span><br><span>@@ -27,7 +27,6 @@</span><br><span> # uses.</span><br><span> </span><br><span> import re</span><br><span style="color: hsl(0, 100%, 40%);">-import string</span><br><span> import sys</span><br><span> </span><br><span> def check_flow_state (line, flow_state_dict):</span><br><span>@@ -93,7 +92,7 @@</span><br><span>     </span><br><span>     while 1:</span><br><span>         line = input.readline ()</span><br><span style="color: hsl(0, 100%, 40%);">-        line = string.replace (line, '\r','')</span><br><span style="color: hsl(120, 100%, 40%);">+        line = line.replace ('\r','')</span><br><span>         line = re.sub (r' *$', r'', line)</span><br><span> </span><br><span>         check_flow_state (line, flow_state_dict)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12848">change 12848</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12848"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libusrp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If805c8167e2cf57ce3d6143dddfd4685ad729142 </div>
<div style="display:none"> Gerrit-Change-Number: 12848 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>