diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2018-09-12 13:40:13 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-09-13 00:32:35 +0000 |
| commit | 9ce6a21aaa76cd40c95ebbcb5fc6e48a8f5dfdb9 (patch) | |
| tree | 5656afec4a81b93dcda22b5af8b41c051f246bd8 /build-data/platforms.mk | |
| parent | b1232555e91b286feab5667b5a22f29aa8e96626 (diff) | |
Fix: vppapigen make build fails on fresh install
Steps to reproduce:
vagrant@localhost:/vagrant$ build-root/vagrant/build.sh
...
@@@@ Building vpp in /vagrant/build-root/build-vpp-native/vpp @@@@
[51/1169] Generating API header /vagrant/build-root/build-vpp-native/vpp/vlibmemory/memclnt.api.json
FAILED: cd /vagrant/build-root/build-vpp-native/vpp/vlibmemory && mkdir -p /vagrant/build-root/build-vpp-native/vpp/vlibmemory && /vagrant/src/tools/vppapigen/vppapigen --includedir /vagrant/src --input /vagrant/src/vlibmemory/memclnt.api JSON --output /vagrant/build-root/build-vpp-native/vpp/vlibmemory/memclnt.api.json
AttributeError: 'module' object has no attribute 'dumps'
This seems to be due to JSON.py namespace colliding with the standard lib json.py
Change-Id: If389e4e05ef0c166b0c2b3bef7ec0185298679a8
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'build-data/platforms.mk')
| -rw-r--r-- | build-data/platforms.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-data/platforms.mk b/build-data/platforms.mk index fafddc64a0d..d06720272c6 100644 --- a/build-data/platforms.mk +++ b/build-data/platforms.mk @@ -78,9 +78,9 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) : dev package needs a couple of additions ; \ echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/bin/vppapigen /usr/bin \ >> deb/debian/vpp-dev.install ; \ - echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/C.py /usr/share/vpp \ + echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/vppapigen_c.py /usr/share/vpp \ >> deb/debian/vpp-dev.install ; \ - echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/JSON.py /usr/share/vpp \ + echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/vppapigen_json.py /usr/share/vpp \ >> deb/debian/vpp-dev.install ; \ echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin \ >> deb/debian/vpp-dev.install ; \ |