Skip to content

Commit cf78fa9

Browse files
rgo3nyh
authored andcommitted
scripts: fix setup.py for Ubuntu versions
As explained in issue #1085 the setup script is broken for some Ubuntu versions. This commit installs the packages `python-dpkt` and `python3-dpkt` for the respective Ubuntu version. Signed-off-by: Robin Gögge <[email protected]>
1 parent 91de2b9 commit cf78fa9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

scripts/setup.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ class Ubuntu(object):
245245
'maven',
246246
'openssl',
247247
'p11-kit',
248-
'python3-dpkt',
249248
'python3-requests',
250249
'qemu-system-x86',
251250
'qemu-utils',
@@ -263,49 +262,49 @@ class Ubuntu(object):
263262
ec2_post_install = None
264263

265264
class Ubuntu_20_04(object):
266-
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients']
265+
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients', 'python3-dpkt']
267266
ec2_packages = ['ec2-api-tools', 'awscli']
268267
test_packages = []
269268
ec2_post_install = None
270269
version = '20.04'
271270

272271
class Ubuntu_19_10(object):
273-
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients']
272+
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients', 'python3-dpkt']
274273
ec2_packages = ['ec2-api-tools', 'awscli']
275274
test_packages = []
276275
ec2_post_install = None
277276
version = '19.10'
278277

279278
class Ubuntu_19_04(object):
280-
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients']
279+
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients', 'python-dpkt']
281280
ec2_packages = ['ec2-api-tools', 'awscli']
282281
test_packages = []
283282
ec2_post_install = None
284283
version = '19.04'
285284

286285
class Ubuntu_18_10(object):
287-
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients']
286+
packages = ['bridge-utils', 'libvirt-daemon-system', 'libvirt-clients', 'python-dpkt']
288287
ec2_packages = ['ec2-api-tools', 'awscli']
289288
test_packages = []
290289
ec2_post_install = None
291290
version = '18.10'
292291

293292
class Ubuntu_18_04(object):
294-
packages = ['bridge-utils', 'libvirt-bin']
293+
packages = ['bridge-utils', 'libvirt-bin', 'python-dpkt']
295294
ec2_packages = ['ec2-api-tools', 'awscli']
296295
test_packages = []
297296
ec2_post_install = None
298297
version = '18.04'
299298

300299
class Ubuntu_17_04(object):
301-
packages = ['libvirt-bin']
300+
packages = ['libvirt-bin', 'python-dpkt']
302301
ec2_packages = ['ec2-api-tools', 'awscli']
303302
test_packages = []
304303
ec2_post_install = None
305304
version = '17.04'
306305

307306
class Ubuntu_16_04(object):
308-
packages = ['libvirt-bin']
307+
packages = ['libvirt-bin', 'python-dpkt']
309308
ec2_packages = ['ec2-api-tools', 'awscli']
310309
test_packages = []
311310
ec2_post_install = None

0 commit comments

Comments
 (0)