From 6b09a17405d7dc2944d1b5613fee64ba86a520d3 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Tue, 7 Mar 2017 10:50:57 +0100
Subject: install: opensuse - fix non-utf8 characters issue in /etc/services

The scapy python script (data.py) parses the file /etc/services
using the default utf8 decoder. Unfortunately, there are some
characters in that file which are non-utf8 hence the script
stops prematurely. This patch addresses that issue.

Change-Id: Ib5bd41d4fc60b4ce1072fe71b14769b02da7b724
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---
 systems/opensuse/42.2/build_base_machine.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'systems/opensuse')

diff --git a/systems/opensuse/42.2/build_base_machine.sh b/systems/opensuse/42.2/build_base_machine.sh
index 29f4fce0..cf55484b 100755
--- a/systems/opensuse/42.2/build_base_machine.sh
+++ b/systems/opensuse/42.2/build_base_machine.sh
@@ -32,6 +32,7 @@ fuse
 fuse-devel
 glib2-devel
 zlib-devel
+ncurses-devel
 kernel-default
 kernel-default-devel
 pkg-config
@@ -54,10 +55,8 @@ python3
 python-pip
 python3-pip
 python3-setuptools
-python3-dbus
-python3-dev
+python3-devel
 python3-tk
-python3-reportlab
 
 # libraries
 libnuma1
@@ -67,8 +66,9 @@ libpixman-1-0-devel
 libtool
 libpcap-devel
 libnet9
-libncurses5-dev
-libcurl4-openssl-dev
+libncurses5
+libcurl4
+libcurl-devel
 libxml2
 libfuse2
 libopenssl1_0_0
@@ -82,8 +82,12 @@ updatedb
 # fix for the Ixia TclClient
 ln -sf $(locate libc.so.6) /lib/libc.so.6
 
-# virtual environemtn for python
+# virtual environment for python
 pip3 install virtualenv
 
 # hugepages setup
 mkdir -p /dev/hugepages
+
+# fix for non-utf8 characters in file
+cp /etc/services /etc/services.bak
+iconv -o /etc/services -f utf-8 -t utf-8 -c /etc/services.bak
-- 
cgit 1.2.3-korg