full build

2026-03-21 02:39:24 +01:00
parent 78b06be38e
commit aeda9dc10a
3 changed files with 99 additions and 13 deletions
--- a/85
+++ b/85
@@ -1,5 +1,5 @@
 FROM alpine:latest AS fetcher
-ARG CACHE_BUST=2
+ARG CACHE_BUST=10
 RUN apk add --no-cache git ca-certificates
 WORKDIR /src
 RUN echo "$CACHE_BUST" && git clone --depth 1 --branch retrodebian --single-branch https://gitea.chacha.ddns.net/chacha/glide.git
@@ -10,6 +10,8 @@ FROM lpenz/debian-etch-i386-minbase AS kernel-builder
 ARG DEBIAN_FRONTEND=noninteractive
 ARG ARCH=i386
 ARG CONCURRENCY_LEVEL=4
+
+# Preparing Environment
 RUN (echo "deb http://archive.debian.org/debian etch main non-free" > /etc/apt/sources.list) && \
    (echo "deb-src http://archive.debian.org/debian etch main non-free" >> /etc/apt/sources.list) && \
    mkdir -p /usr/src/modules &&\
@@ -21,20 +23,22 @@ RUN (echo "deb http://archive.debian.org/debian etch main non-free" > /etc/apt/s
    apt-get build-dep -y linux-image-2.6.24-etchnhalf.1-686 && \
    apt-get clean 

+# Preparing Kernel + patchs + modules
 WORKDIR /usr/src
 COPY --from=fetcher /src/glide glide
 COPY unionfs-2.2.3_for_2.6.24.diff.gz ./    
+COPY nvidia.patch ./
 RUN tar xjf linux-source-2.6.24.tar.bz2 && \
    tar xjf etchnhalf/squashfs.tar.bz2 && \
    ln -s linux-headers-2.6.24-etchnhalf.1-686/ linux-headers && \
-    mv glide/Device3Dfx modules/
-
-COPY nvidia.patch ./
-RUN wget http://archive.debian.org/debian-archive/debian/pool/non-free/n/nvidia-graphics-drivers-legacy-71xx/nvidia-kernel-legacy-71xx-source_71.86.15-3_i386.deb && \
+    mv glide/Device3Dfx modules/ &&\
+    wget http://archive.debian.org/debian-archive/debian/pool/non-free/n/nvidia-graphics-drivers-legacy-71xx/nvidia-kernel-legacy-71xx-source_71.86.15-3_i386.deb && \
    dpkg-deb -x nvidia-kernel-legacy-71xx-source_71.86.15-3_i386.deb / && \
    tar xjf nvidia-kernel-legacy-71xx.tar.bz2 && \
+    rm nvidia-kernel-legacy-71xx-source_71.86.15-3_i386.deb && \
    patch -d modules/nvidia-kernel-legacy-71xx -p1 < nvidia.patch

+# Building Kernel + patchs + modules
 WORKDIR /usr/src/linux-source-2.6.24
 COPY config-kernel ./
 RUN (zcat /usr/src/unionfs-2.2.3_for_2.6.24.diff.gz | patch -p1) && \
@@ -42,6 +46,77 @@ RUN (zcat /usr/src/unionfs-2.2.3_for_2.6.24.diff.gz | patch -p1) && \
    make oldconfig &&\
    make-kpkg --initrd --arch $ARCH kernel_headers kernel_image modules_image

+# Building userspace libs
+# 3Dfx 
+COPY buildglidepkg.sh /usr/src/
+RUN apt-get install -y nasm && \
+    chmod +x /usr/src/buildglidepkg.sh 
+# cvg / voodoo2
+WORKDIR /usr/src/glide
+    # glide2x
+    RUN mv swlibs glide2x/
+    WORKDIR /usr/src/glide/glide2x/
+    RUN make -f Makefile.linux clean
+    RUN make -f Makefile.linux FX_GLIDE_HW=cvg USE_X86=1 USE_MMX=1
+    RUN mv swlibs ../glide3x/
+    # glide3x
+    WORKDIR /usr/src/glide/glide3x/
+    RUN make -f Makefile.linux clean
+    RUN make -f Makefile.linux FX_GLIDE_HW=cvg USE_X86=1 USE_MMX=1
+    RUN mv swlibs ../
+WORKDIR /usr/src/
+RUN /usr/src/buildglidepkg.sh cvg
+
+# h3 / voodoo3 & Banshee
+RUN apt-get install -y libx11-dev x11proto-xf86dga-dev libxxf86vm-dev libxxf86dga-dev
+WORKDIR /usr/src/glide
+    # glide2x
+    RUN mv swlibs glide2x/
+    WORKDIR /usr/src/glide/glide2x/
+    RUN make -f Makefile.linux clean
+    RUN make -f Makefile.linux FX_GLIDE_HW=h3 USE_X86=1 USE_MMX=1
+    # glide3x
+    RUN mv swlibs ../glide3x/
+    WORKDIR /usr/src/glide/glide3x/
+    RUN make -f Makefile.linux clean
+    RUN make -f Makefile.linux FX_GLIDE_HW=h3 USE_X86=1 USE_MMX=1
+    RUN mv swlibs ../
+WORKDIR /usr/src/
+RUN /usr/src/buildglidepkg.sh h3
+
+# sst1 / voodoo1
+WORKDIR /usr/src/glide
+    # glide2x
+    RUN mv swlibs glide2x/
+    WORKDIR /usr/src/glide/glide2x/
+    RUN make -f Makefile.linux clean
+    RUN make -f Makefile.linux FX_GLIDE_HW=sst1 USE_X86=1 USE_MMX=1
+    # glide3x
+    RUN mv swlibs ../glide3x/
+    WORKDIR /usr/src/glide/glide3x/
+    RUN make -f Makefile.linux clean
+    RUN make -f Makefile.linux FX_GLIDE_HW=sst1 USE_X86=1 USE_MMX=1
+    RUN mv swlibs ../
+WORKDIR /usr/src/
+RUN /usr/src/buildglidepkg.sh sst1
+
+# sst96 / voodoo Rush
+# cannot build driver because of missing xf86rush lib...
+#WORKDIR /usr/src/glide
+#    # glide2x
+#    RUN mv swlibs glide2x/
+#    WORKDIR /usr/src/glide/glide2x/
+#    RUN make -f Makefile.linux clean
+#    RUN make -f Makefile.linux FX_GLIDE_HW=sst96
+#    # glide3x
+#    RUN mv swlibs ../glide3x/
+#    WORKDIR /usr/src/glide/glide3x/
+#    RUN make -f Makefile.linux clean
+#    RUN make -f Makefile.linux FX_GLIDE_HW=sst96 USE_X86=1 USE_MMX=1
+#    RUN mv swlibs ../
+#WORKDIR /usr/src/
+#RUN /usr/src/buildglidepkg.sh sst96
+
 #RUN rm *.gz *.bz2 && rm -Rf glide && rm -rf /var/lib/apt/lists/*

 # Note: we need to use Lenny because of live-helper
--- a/1
+++ b/1
@@ -58,6 +58,7 @@ pipeline {
                        cp /root/linux-image-*.deb config/chroot_local-packages/
                        cp /root/device3dfx-*.deb config/chroot_local-packages/
                        cp /root/squashfs-modules-*.deb config/chroot_local-packages/
+                        cp /root/libglide*-cvg*_i386.deb config/chroot_local-packages/
                        cp /root/desktop config/chroot_local-packageslists/
                        mkdir -p config/chroot_local-includes/usr/share/wallpapers
                        cp /root/wallpaper.jpg config/chroot_local-includes/usr/share/wallpapers/retrodebian.jpg
--- a/buildglidepkg.sh
+++ b/buildglidepkg.sh
@@ -1,14 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 set -e

 FLAVOUR="${1:-cvg}"
-VERSION_GLIDE2="${2:-2.53-1}"
+VERSION_GLIDE2="${2:-2.60-1}"
 VERSION_GLIDE3="${3:-3.10.0-1}"
 ARCH="${ARCH:-i386}"
 OUTDIR="${OUTDIR:-$(pwd)}"

-GLIDE2_SRC="/usr/src/glide/glide2x/${FLAVOUR}/lib"
-GLIDE3_SRC="/usr/src/glide/glide3x/${FLAVOUR}/lib"
+if [[ "$FLAVOUR" == "sst1" ]]
+then
+    GLIDE2_SRC="/usr/src/glide/glide2x/sst1/lib/sst1"
+    GLIDE3_SRC="/usr/src/glide/glide3x/sst1/lib/sst1"
+elif [[ "$FLAVOUR" == "sst96" ]]
+then
+    GLIDE2_SRC="/usr/src/glide/glide2x/sst1/lib/sst96"
+    GLIDE3_SRC="/usr/src/glide/glide3x/sst1/lib/sst96"
+else
+    GLIDE2_SRC="/usr/src/glide/glide2x/${FLAVOUR}/lib"
+    GLIDE3_SRC="/usr/src/glide/glide3x/${FLAVOUR}/lib"
+fi

 PKG2="libglide2-${FLAVOUR}"
 PKG3="libglide3-${FLAVOUR}"
@@ -21,11 +31,11 @@ build_pkg_glide2() {
    PKGDIR="${BUILDROOT}/${PKG2}"
    mkdir -p "${PKGDIR}/DEBIAN" "${PKGDIR}/usr/lib"

-    cp -a "${GLIDE2_SRC}/libglide.so.2.53" "${PKGDIR}/usr/lib/"
+    cp -a "${GLIDE2_SRC}/libglide.so.2.60" "${PKGDIR}/usr/lib/"
    cp -a "${GLIDE2_SRC}/libglide.a" "${PKGDIR}/usr/lib/"
-    ln -s libglide.so.2.53 "${PKGDIR}/usr/lib/libglide.so.2"
-    ln -s libglide.so.2.53 "${PKGDIR}/usr/lib/libglide.so"
-    ln -s libglide.so.2.53 "${PKGDIR}/usr/lib/libglide2x.so"
+    ln -s libglide.so.2.60 "${PKGDIR}/usr/lib/libglide.so.2"
+    ln -s libglide.so.2.60 "${PKGDIR}/usr/lib/libglide.so"
+    ln -s libglide.so.2.60 "${PKGDIR}/usr/lib/libglide2x.so"

    cat > "${PKGDIR}/DEBIAN/control" <<EOF
 Package: ${PKG2}