Change in libusrp[master]: build_eeprom.py: Fix build for distros with python3 as default

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/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Feb 6 18:08:08 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12847 )

Change subject: build_eeprom.py: Fix build for distros with python3 as default
......................................................................

build_eeprom.py: Fix build for distros with python3 as default

The script contains python2-only syntax, so it can only be run with
python2. Make sure to explicitly specify it needs to be run with python2
in order to run it fine on distros where python points to python3.

Change-Id: Ie695c26f1b2a4f84bdc2b67938fe37a4c50681dd
---
M firmware/src/common/build_eeprom.py
M firmware/src/usrp2/Makefile.am
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/firmware/src/common/build_eeprom.py b/firmware/src/common/build_eeprom.py
index 00c2e34..6092d61 100755
--- a/firmware/src/common/build_eeprom.py
+++ b/firmware/src/common/build_eeprom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright 2004,2006 Free Software Foundation, Inc.
 # 
diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am
index 24ff9b1..a32e20c 100644
--- a/firmware/src/usrp2/Makefile.am
+++ b/firmware/src/usrp2/Makefile.am
@@ -108,11 +108,11 @@
 	$(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
 
 burn-usrp2-eeprom: eeprom_boot.ihx
-	$(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r2 eeprom_boot.ihx > $@
+	$(srcdir)/../common/build_eeprom.py -p$(prefix) -r2 eeprom_boot.ihx > $@
 	chmod +x $@
 
 burn-usrp4-eeprom: eeprom_boot.ihx
-	$(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r4 eeprom_boot.ihx > $@
+	$(srcdir)/../common/build_eeprom.py -p$(prefix) -r4 eeprom_boot.ihx > $@
 	chmod +x $@
 
 

-- 
To view, visit https://gerrit.osmocom.org/12847
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: Ie695c26f1b2a4f84bdc2b67938fe37a4c50681dd
Gerrit-Change-Number: 12847
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: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190206/caaf4551/attachment.htm>


More information about the gerrit-log mailing list