Skip to content

build: migrate environment and scripts to python 3 #1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
supra-nlpn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: migrate environment and scripts to python 3 #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-config/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,11 +594,11 @@ machine-prefix:
# The onie/build-config/scripts/onie-build-targets.json file lists
# platforms and known working build environments.
DEBIAN_BUILD_HOST_PACKAGES = build-essential stgit u-boot-tools util-linux \
gperf device-tree-compiler python-all-dev xorriso \
gperf device-tree-compiler python3-dev xorriso \
autoconf automake bison flex texinfo libtool libtool-bin \
gawk libncurses5 libncurses5-dev bc \
dosfstools mtools pkg-config git wget help2man libexpat1 \
libexpat1-dev fakeroot python-sphinx rst2pdf \
libexpat1-dev fakeroot python3-sphinx rst2pdf \
libefivar-dev libnss3-tools libnss3-dev libpopt-dev \
libssl-dev sbsigntool uuid-runtime uuid-dev cpio \
bsdmainutils unzip
Expand Down
2 changes: 1 addition & 1 deletion build-config/scripts/mk-part-table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3

from struct import pack
import sys
Expand Down
4 changes: 2 additions & 2 deletions contrib/build-env/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ FROM debian:9
# Add initial development packages
RUN apt-get update && apt-get install -y \
build-essential stgit u-boot-tools util-linux \
gperf device-tree-compiler python-all-dev xorriso \
gperf device-tree-compiler python3-dev xorriso \
autoconf automake bison flex texinfo libtool libtool-bin \
realpath gawk libncurses5 libncurses5-dev bc \
dosfstools mtools pkg-config git wget help2man libexpat1 \
libexpat1-dev fakeroot python-sphinx rst2pdf \
libexpat1-dev fakeroot python3-sphinx rst2pdf \
libefivar-dev libnss3-tools libnss3-dev libpopt-dev \
libssl-dev sbsigntool uuid-runtime uuid-dev cpio \
bsdmainutils curl sudo unzip
Expand Down
2 changes: 1 addition & 1 deletion contrib/git-stats/gitdm/findoldfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
#
# Another quick hack of a script to find files unchanged
# since a given commit.
Expand Down
2 changes: 1 addition & 1 deletion contrib/git-stats/gitdm/logparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#-*- coding:utf-8 -*-
#
# Copyright © 2009 Germán Póo-Caamaño <gpoo@gnome.org>
Expand Down
2 changes: 1 addition & 1 deletion contrib/git-stats/gitdm/tests/gitdm-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
#

#
Expand Down
2 changes: 1 addition & 1 deletion contrib/git-stats/gitdm/treeplot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
#
# Create a graph of patch flow into the mainline.
#
Expand Down
2 changes: 1 addition & 1 deletion contrib/oce/build-onie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

# -----------------------------------------------------------------------------
# Copyright (C) 2014-2015 Carlos Cardenas <carlos@cumulusnetworks.com>
Expand Down
2 changes: 1 addition & 1 deletion contrib/oce/eyes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

# -----------------------------------------------------------------------------
# Copyright (C) 2015-2016 Carlos Cardenas <carlos@cumulusnetworks.com>
Expand Down
2 changes: 1 addition & 1 deletion contrib/oce/test-onie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

# -----------------------------------------------------------------------------
# Copyright (C) 2014-2016 Carlos Cardenas <carlos@cumulusnetworks.com>
Expand Down