mirror of
https://github.com/cirosantilli/linux-kernel-module-cheat.git
synced 2026-01-22 17:55:57 +01:00
build: get rid of python2 entirely
This commit is contained in:
11
build
11
build
@@ -34,7 +34,6 @@ class _Component:
|
||||
apt_build_deps=None,
|
||||
submodules=None,
|
||||
submodules_shallow=None,
|
||||
python2_pkgs=None,
|
||||
python3_pkgs=None,
|
||||
ruby_pkgs=None,
|
||||
):
|
||||
@@ -45,7 +44,6 @@ class _Component:
|
||||
self.apt_build_deps = apt_build_deps or set()
|
||||
self.submodules = submodules or set()
|
||||
self.submodules_shallow = submodules_shallow or set()
|
||||
self.python2_pkgs = python2_pkgs or set()
|
||||
self.python3_pkgs = python3_pkgs or set()
|
||||
self.ruby_pkgs = ruby_pkgs or set()
|
||||
|
||||
@@ -281,7 +279,7 @@ so looping over all of them would waste time.
|
||||
'libncurses5-dev',
|
||||
'libtool-bin',
|
||||
'make',
|
||||
'python-dev',
|
||||
'python3-dev',
|
||||
'texinfo',
|
||||
},
|
||||
submodules_shallow={'crosstool-ng'},
|
||||
@@ -515,7 +513,6 @@ Which components to build. Default: qemu-buildroot
|
||||
apt_build_deps = set()
|
||||
submodules = set()
|
||||
submodules_shallow = set()
|
||||
python2_pkgs = set()
|
||||
python3_pkgs = {
|
||||
'pexpect==4.6.0',
|
||||
}
|
||||
@@ -525,7 +522,6 @@ Which components to build. Default: qemu-buildroot
|
||||
apt_build_deps.update(component.apt_build_deps)
|
||||
submodules.update(component.submodules)
|
||||
submodules_shallow.update(component.submodules_shallow)
|
||||
python2_pkgs.update(component.python2_pkgs)
|
||||
python3_pkgs.update(component.python3_pkgs)
|
||||
python3_pkgs.update(component.python3_pkgs)
|
||||
ruby_pkgs.update(component.ruby_pkgs)
|
||||
@@ -571,11 +567,6 @@ Which components to build. Default: qemu-buildroot
|
||||
['apt-get', 'build-dep'] + y + [LF] +
|
||||
self.sh.add_newlines(sorted(apt_build_deps))
|
||||
)
|
||||
if python2_pkgs:
|
||||
self.sh.run_cmd(
|
||||
['python', '-m', 'pip', 'install', '--user', LF] +
|
||||
self.sh.add_newlines(sorted(python2_pkgs))
|
||||
)
|
||||
if python3_pkgs:
|
||||
# Not with pip executable directly:
|
||||
# https://stackoverflow.com/questions/49836676/error-after-upgrading-pip-cannot-import-name-main/51846054#51846054
|
||||
|
||||
Reference in New Issue
Block a user