Switch all build scripts to python3.

Since we only support jessie as build host, and jessie knowingly does have
python3 (although not by default), we don't really need to worry about being
both 2 and 3 compatible.
This commit is contained in:
Daniil Baturin 2017-01-25 17:01:16 -05:00
parent b7cbda3bff
commit ea48b7bd74
9 changed files with 14 additions and 13 deletions

View File

@ -44,7 +44,7 @@ There are several directories with their own purpose:
To build a VyOS image, you need a machine that runs Debian Jessie. Other build hosts are not supported.
Several packages are required for building the ISO and all packages, namely live-build, pbuilder, python-pystache and devscripts.
Several packages are required for building the ISO and all packages, namely python3, live-build, pbuilder, python3-pystache and devscripts.
Individual packages may have other build dependencies. If some packages are missing, build scripts will tell you.
## Building the ISO image

View File

@ -1,4 +1,5 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (C) 2015 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (C) 2015 VyOS maintainers and contributors
#
@ -32,7 +32,7 @@ deps = {
'live-build',
'pbuilder',
'devscripts',
'python-pystache'
'python3-pystache'
],
'binaries': []
}

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (C) 2015 VyOS maintainers and contributors
#

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (C) 2016 VyOS maintainers and contributors
#

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (C) 2015 VyOS maintainers and contributors
#

View File

@ -1,4 +1,5 @@
#!/usr/bin/python
#!/usr/bin/python3
#
# Copyright (C) 2016 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
@ -19,7 +20,6 @@
# that is included in the image and used by 'show version' command
# and install/upgrade scripts.
from __future__ import print_function
import os
import datetime
import json

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Copyright (C) 2015 VyOS maintainers and contributors
#
@ -50,4 +50,3 @@ result = os.system(pbuilder_create_command)
if result > 0:
print("pbuilder environment bootstrap failed")
sys.exit(1)

View File

@ -1,4 +1,5 @@
#!/usr/bin/python
#!/usr/bin/python3
#
# Copyright (C) 2016 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
@ -14,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# File: query-config
# Purpose: Extracts field values a flat JSON file,
# Purpose: Extracts field values from a flat JSON file,
# for use in languages that can't handle JSON easily,
# (I'm looking at you, Bourne shell!)