From 7a109e994d467c5675e3c0e09968b7c7ea567d4b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 16 Feb 2026 12:15:09 +0100 Subject: [PATCH] .github: drop old scripted driver builds Instead of the script driven linear driver build, we now have parallelized MPBT based build up and running - so let's drop the old one. Signed-off-by: Enrico Weigelt, metux IT consult --- .github/scripts/compile-drivers.sh | 66 ----------------------------- .github/workflows/build-xserver.yml | 53 +---------------------- 2 files changed, 1 insertion(+), 118 deletions(-) delete mode 100755 .github/scripts/compile-drivers.sh diff --git a/.github/scripts/compile-drivers.sh b/.github/scripts/compile-drivers.sh deleted file mode 100755 index 072fd53b4c..0000000000 --- a/.github/scripts/compile-drivers.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -set -e - -. .github/scripts/util.sh - -export PKG_CONFIG_PATH="/usr/local/lib/x86_64-linux-gnu/pkgconfig/:$PKG_CONFIG_PATH" -export ACLOCAL_PATH="/usr/share/aclocal:/usr/local/share/aclocal" - -mkdir -p $DRV_BUILD_DIR -cd $DRV_BUILD_DIR - -build_xf86drv_ac input-elographics 25.0.0 -build_xf86drv_ac input-evdev 25.0.0 -build_xf86drv_ac input-joystick 25.0.0 -build_xf86drv_ac input-keyboard 25.0.0 -build_xf86drv_ac input-libinput 25.0.0 -build_xf86drv_ac input-mouse 25.0.0 -build_xf86drv_ac input-synaptics 25.0.0 -build_xf86drv_ac input-vmmouse 25.0.0 -build_xf86drv_ac input-void 25.0.0 -build_xf86drv_ac input-wacom 25.0.0 - -build_xf86drv_ac video-amdgpu 25.0.0 -build_xf86drv_ac video-apm 25.0.0 -build_xf86drv_ac video-ark 25.0.0 -build_xf86drv_ac video-ast 25.0.0 -build_xf86drv_ac video-ati 25.0.0 -build_xf86drv_ac video-chips 25.0.0 -build_xf86drv_ac video-cirrus 25.0.0 -build_xf86drv_ac video-dummy 25.0.0 -build_xf86drv_ac video-fbdev 25.0.0 -build_xf86drv_ac video-freedreno 25.0.0 -build_xf86drv_ac video-geode 25.0.0 -build_xf86drv_ac video-i128 25.0.0 -build_xf86drv_ac video-i740 25.0.0 -build_xf86drv_ac video-intel 25.0.1 -build_xf86drv_ac video-mach64 25.0.0 -build_xf86drv_ac video-mga 25.0.0 -build_xf86drv_ac video-neomagic 25.0.0 -build_xf86drv_ac video-nested 25.0.0 -build_xf86drv_ac video-nouveau 25.0.0 -build_xf86drv_ac video-nv 25.0.0 -build_xf86drv_ac video-omap 25.0.0 -build_xf86drv_ac video-qxl 25.0.0 -build_xf86drv_ac video-r128 25.0.0 -build_xf86drv_ac video-rendition 25.0.0 -build_xf86drv_ac video-s3virge 25.0.0 -build_xf86drv_ac video-savage 25.0.0 -build_xf86drv_ac video-siliconmotion 25.0.0 -build_xf86drv_ac video-sis 25.0.0 -build_xf86drv_ac video-sisusb 25.0.0 -build_xf86drv_ac video-suncg14 25.0.0 -build_xf86drv_ac video-suncg3 25.0.0 -build_xf86drv_ac video-suncg6 25.0.0 -build_xf86drv_ac video-sunffb 25.0.0 -build_xf86drv_ac video-suntcx 25.0.0 -build_xf86drv_ac video-sunleo 25.0.0 -build_xf86drv_ac video-tdfx 25.0.0 -build_xf86drv_ac video-trident 25.0.0 -build_xf86drv_ac video-vesa 25.0.0 -build_xf86drv_ac video-vmware 25.0.0 -build_xf86drv_ac video-v4l 25.0.1 -build_xf86drv_ac video-vbox 25.0.0 -build_xf86drv_ac video-voodoo 25.0.0 -build_xf86drv_ac video-xgi 25.0.0 diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml index 258fe9038d..e8b063cc29 100644 --- a/.github/workflows/build-xserver.yml +++ b/.github/workflows/build-xserver.yml @@ -62,57 +62,6 @@ jobs: __BUILD/meson-logs/* __BUILD/test/piglit-results/* - drivers-build-ubuntu: - env: - MESON_ARGS: -Dprefix=/usr -Dxorg-sdk=true -Dxorg=false -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Dxfbdev=false - runs-on: ubuntu-latest - steps: - - name: Check out repository code - uses: actions/checkout@v4 - - - name: prepare build environment - run: | - MACHINE=`gcc -dumpmachine` - echo "MACHINE=$MACHINE" >> "$GITHUB_ENV" - echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV" - sudo chown root /bin/tar && sudo chmod u+s /bin/tar - - - name: apt cache - uses: actions/cache@v4 - with: - path: /var/cache/apt - key: apt-cache-${{ hashFiles('.github/scripts/ubuntu/install-pkg.sh') }} - restore-keys: apt-cache- - - - name: pkg install - run: sudo .github/scripts/ubuntu/install-pkg.sh - - - name: X11 prereq cache - uses: actions/cache@v4 - with: - path: | - ${{ env.X11_PREFIX }} - ${{ env.X11_BUILD_DIR }}/xts - ${{ env.X11_BUILD_DIR }}/piglit - key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }} - restore-keys: ${{ runner.name }}-x11-deps- - - - name: generic prereq - run: .github/scripts/install-prereq-drivers.sh - - - name: build xserver sdk - run: | - echo -n > .meson_environment - echo "export MESON_BUILDDIR=$MESON_BUILDDIR" >> .meson_environment - echo "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> .meson_environment - .github/scripts/meson-build.sh --skip-test - sudo meson install --no-rebuild -C "$MESON_BUILDDIR" - sudo mkdir -p /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules - sudo chown -R runner /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules - - - name: compile drivers - run: .github/scripts/compile-drivers.sh - xserver-build-mingw32-ubuntu: runs-on: ubuntu-latest env: @@ -336,7 +285,7 @@ jobs: if: ${{ startsWith(github.ref, 'refs/tags/xlibre-xserver-') }} needs: - xserver-build-ubuntu - - drivers-build-ubuntu + - xserver-and-drivers-mpbt - xserver-build-mingw32-ubuntu - xserver-build-macos - xserver-build-freebsd