automation: use python-dev python2.7-dev in Debian and Ubuntu

... instead of python2.7-dev.

We installed python2.7-dev because xen only worked with 2.7.

Installing python2.7-dev only gives python2.7-config, which causes
configure to fail because it wants python-config by default. Now xen
should work with 2.6 and above, we can install python-dev and let
distros pick the default python.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
I already updated all docker images. I intend to commit this even
without an ack from Doug.

diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile
index 7a05004511bcf36ff08c310641a6af0718e11a15..66a6abb3816ea65132fb877eaf5da49bdb34343e 100644 (file)
--- a/automation/build/debian/jessie-i386.dockerfile
+++ b/automation/build/debian/jessie-i386.dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
index bd04209f7f24872cfaf89514d9be1896bea07fa3..1232b9e204082cea300866d94073a5de199ae21a 100644 (file)
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
index 65247a474ef404da6d4714ee068ce19c073ef6e8..d2e96fafa73ebdf2381d51b24ff4cfdbabdbe2a7 100644 (file)
--- a/automation/build/debian/stretch-i386.dockerfile
+++ b/automation/build/debian/stretch-i386.dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index 9be09c5377c29ab4219017b83f3c4d09697c951f..daf8c9d38431efe5009294f40e1f31d546eb332b 100644 (file)
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/debian/unstable-arm64v8.dockerfile b/automation/build/debian/unstable-arm64v8.dockerfile
index 57db46a4d1aac00cc8193805f9c4ff6e949d9ee0..c701777c8d57d19c554a853895c100025a1f994f 100644 (file)
--- a/automation/build/debian/unstable-arm64v8.dockerfile
+++ b/automation/build/debian/unstable-arm64v8.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/debian/unstable-i386.dockerfile b/automation/build/debian/unstable-i386.dockerfile
index ffb9f11daaebe384b11b4b3ae81b3e6fbd9f7f1f..07df842240296a251aa79c83fda5520bfb38a9de 100644 (file)
--- a/automation/build/debian/unstable-i386.dockerfile
+++ b/automation/build/debian/unstable-i386.dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/unstable.dockerfile
index 0ba0c056d8b37cba3f456b87b1372ef633feb843..7762cf97ab1e4f60a2af98697a8039dcd9b75edb 100644 (file)
--- a/automation/build/debian/unstable.dockerfile
+++ b/automation/build/debian/unstable.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile
index 8de67ef14e3081507837611b328666408c748fd8..8e6a5d581f551dcfdf21ead053af0eaab93e6bc3 100644 (file)
--- a/automation/build/ubuntu/bionic.dockerfile
+++ b/automation/build/ubuntu/bionic.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
index 1d04bccbdfbcd1586e8b3cd88d5ac1ae011da524..d43d60c5f51d1969a472229bf6ad9ecfba6ff32d 100644 (file)
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \

diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
index 37869e39ede1066844e4bc1f3daded4ad510fa3f..66ddf15923fcf14940e47bc85e2d2b9be7d877eb 100644 (file)
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         libssl-dev \
-        python2.7-dev \
+        python-dev \
         xorg-dev \
         uuid-dev \
         libyajl-dev \