[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] build: Drop xorg-x11 as a build dependency



commit d49ba6bf8f904a58bd1cfdfe6c93023b249f0578
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Jul 4 13:09:21 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Jul 9 18:11:35 2024 +0100

    build: Drop xorg-x11 as a build dependency
    
    The history on this one is complicated.  The note to README was added in
    commit 1f95747a4f16 ("Add openssl-dev and xorg-x11-dev to README") in 2007.
    
    At the time, there was a vendered version of Qemu in xen.git with a local
    modification using <X11/keysymdef.h> to access the monitor console over VNC.
    
    The final reference to keysymdef.h was dropped in commit 85896a7c4dc7 
("build:
    add autoconf to replace custom checks in tools/check") in 2012.  The next
    prior mention was in 2009 with commit a8ccb671c377 ("tools: fix x11 check")
    noting that x11 was not a direct dependcy of Xen; it was transitive through
    SDL for Qemu for source-based distros.
    
    It appears there may have been other unspecified dependencies on xorg,
    e.g. the use of lndir by unmodified_drivers which are no longer relevant
    either.
    
    These days its only the Debian based dockerfiles which install xorg-x11, and
    Qemu builds fine in these and others without x11.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
 README                                              | 1 -
 automation/build/debian/bookworm-arm64v8.dockerfile | 1 -
 automation/build/debian/bookworm-i386.dockerfile    | 1 -
 automation/build/debian/bookworm.dockerfile         | 1 -
 automation/build/debian/jessie-i386.dockerfile      | 1 -
 automation/build/debian/jessie.dockerfile           | 1 -
 automation/build/debian/stretch-i386.dockerfile     | 1 -
 automation/build/debian/stretch.dockerfile          | 1 -
 automation/build/ubuntu/bionic.dockerfile           | 1 -
 automation/build/ubuntu/focal.dockerfile            | 1 -
 automation/build/ubuntu/trusty.dockerfile           | 1 -
 automation/build/ubuntu/xenial.dockerfile           | 1 -
 12 files changed, 12 deletions(-)

diff --git a/README b/README
index bf6b8cd4d6..560247e710 100644
--- a/README
+++ b/README
@@ -52,7 +52,6 @@ provided by your OS distributor:
     * Development install of zlib (e.g., zlib-dev)
     * Development install of Python 2.7 or later (e.g., python-dev)
     * Development install of curses (e.g., libncurses-dev)
-    * Development install of x11 (e.g. xorg-x11-dev)
     * Development install of uuid (e.g. uuid-dev)
     * Development install of yajl (e.g. libyajl-dev)
     * Development install of libaio (e.g. libaio-dev) version 0.3.107 or
diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile 
b/automation/build/debian/bookworm-arm64v8.dockerfile
index a36b04e75e..11acc07bff 100644
--- a/automation/build/debian/bookworm-arm64v8.dockerfile
+++ b/automation/build/debian/bookworm-arm64v8.dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python3-dev \
         python3-setuptools \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/debian/bookworm-i386.dockerfile 
b/automation/build/debian/bookworm-i386.dockerfile
index 2ccf32193f..66fa3121c5 100644
--- a/automation/build/debian/bookworm-i386.dockerfile
+++ b/automation/build/debian/bookworm-i386.dockerfile
@@ -19,7 +19,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python3-dev \
         python3-setuptools \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/debian/bookworm.dockerfile 
b/automation/build/debian/bookworm.dockerfile
index d02e3df61f..db866fde30 100644
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python3-dev \
         python3-setuptools \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/debian/jessie-i386.dockerfile 
b/automation/build/debian/jessie-i386.dockerfile
index d66d069202..dfa6dae06c 100644
--- a/automation/build/debian/jessie-i386.dockerfile
+++ b/automation/build/debian/jessie-i386.dockerfile
@@ -25,7 +25,6 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         python-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/debian/jessie.dockerfile 
b/automation/build/debian/jessie.dockerfile
index 53c3bb28f1..82dae9ec70 100644
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -23,7 +23,6 @@ RUN apt-get update && \
         zlib1g-dev \
         libncurses5-dev \
         python-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/debian/stretch-i386.dockerfile 
b/automation/build/debian/stretch-i386.dockerfile
index 36108335e5..905096ab0e 100644
--- a/automation/build/debian/stretch-i386.dockerfile
+++ b/automation/build/debian/stretch-i386.dockerfile
@@ -26,7 +26,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python-dev \
         python3-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/debian/stretch.dockerfile 
b/automation/build/debian/stretch.dockerfile
index c5339d3c83..b99d229acf 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -24,7 +24,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python-dev \
         python3-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/ubuntu/bionic.dockerfile 
b/automation/build/ubuntu/bionic.dockerfile
index c83624e8ca..c1effc725e 100644
--- a/automation/build/ubuntu/bionic.dockerfile
+++ b/automation/build/ubuntu/bionic.dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python-dev \
         python3-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/ubuntu/focal.dockerfile 
b/automation/build/ubuntu/focal.dockerfile
index cabbebf377..b49e53d185 100644
--- a/automation/build/ubuntu/focal.dockerfile
+++ b/automation/build/ubuntu/focal.dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python3-dev \
         python3-setuptools \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/ubuntu/trusty.dockerfile 
b/automation/build/ubuntu/trusty.dockerfile
index ecbcb71b1c..1cda1bbd3f 100644
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python-dev \
         python3-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
diff --git a/automation/build/ubuntu/xenial.dockerfile 
b/automation/build/ubuntu/xenial.dockerfile
index 13ecae7a0b..aa8f560286 100644
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
         libncurses5-dev \
         python-dev \
         python3-dev \
-        xorg-dev \
         uuid-dev \
         libyajl-dev \
         libaio-dev \
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.