This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12848 ) Change subject: edit-gpif: Fix build for distros with python3 as default ...................................................................... edit-gpif: Fix build for distros with python3 as default Fix the script so it is python2 and python3 compatible, then let the distro decide which python version to use. Change-Id: If805c8167e2cf57ce3d6143dddfd4685ad729142 --- M firmware/src/common/Makefile.am M firmware/src/common/edit-gpif M firmware/src/usrp2/Makefile.am M firmware/src/usrp2/edit-gpif 4 files changed, 4 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/src/common/Makefile.am b/firmware/src/common/Makefile.am index 9523232..a98671e 100644 --- a/firmware/src/common/Makefile.am +++ b/firmware/src/common/Makefile.am @@ -39,7 +39,7 @@ all: usrp_gpif.c usrp_gpif.c usrp_gpif_inline.h : gpif.c - srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h + srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h CLEANFILES = \ *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \ diff --git a/firmware/src/common/edit-gpif b/firmware/src/common/edit-gpif index 5367b75..87e16eb 100755 --- a/firmware/src/common/edit-gpif +++ b/firmware/src/common/edit-gpif @@ -27,7 +27,6 @@ # uses. import re -import string import sys def check_flow_state (line, flow_state_dict): @@ -93,7 +92,7 @@ while 1: line = input.readline () - line = string.replace (line, '\r','') + line = line.replace ('\r','') line = re.sub (r' *$', r'', line) check_flow_state (line, flow_state_dict) diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am index a32e20c..6d44320 100644 --- a/firmware/src/usrp2/Makefile.am +++ b/firmware/src/usrp2/Makefile.am @@ -159,7 +159,7 @@ all: usrp_gpif.c usrp_gpif.c usrp_gpif_inline.h : gpif.c - srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h + srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h # dependencies diff --git a/firmware/src/usrp2/edit-gpif b/firmware/src/usrp2/edit-gpif index 5367b75..87e16eb 100755 --- a/firmware/src/usrp2/edit-gpif +++ b/firmware/src/usrp2/edit-gpif @@ -27,7 +27,6 @@ # uses. import re -import string import sys def check_flow_state (line, flow_state_dict): @@ -93,7 +92,7 @@ while 1: line = input.readline () - line = string.replace (line, '\r','') + line = line.replace ('\r','') line = re.sub (r' *$', r'', line) check_flow_state (line, flow_state_dict) -- To view, visit https://gerrit.osmocom.org/12848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If805c8167e2cf57ce3d6143dddfd4685ad729142 Gerrit-Change-Number: 12848 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190206/b3f4dc63/attachment.htm>