diff --git a/Dockerfile b/Dockerfile index a06d24b..3d79a4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,16 +10,17 @@ FROM lpenz/debian-etch-i386-minbase AS kernel-builder ARG DEBIAN_FRONTEND=noninteractive ARG ARCH=i386 ARG CONCURRENCY_LEVEL=4 -RUN (echo "deb-src http://archive.debian.org/debian etch main" >> /etc/apt/sources.list) && \ +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 &&\ apt-get update && \ - apt-get install -y aptitude build-essential cvs unzip git-core ncurses-dev\ + apt-get install -y aptitude build-essential quilt cvs unzip git-core ncurses-dev\ linux-headers-2.6.24-etchnhalf.1-686 \ squashfs-source-etchnhalf \ linux-source-2.6.24 && \ apt-get build-dep -y linux-image-2.6.24-etchnhalf.1-686 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* + apt-get clean + # rm -rf /var/lib/apt/lists/* WORKDIR /usr/src COPY --from=fetcher /src/glide glide @@ -29,6 +30,12 @@ RUN tar xjf linux-source-2.6.24.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 && \ + dpkg-deb -x nvidia-kernel-legacy-71xx-source_71.86.15-3_i386.deb / && \ + tar xjf nvidia-kernel-legacy-71xx.tar.bz2 && \ + patch -d modules/nvidia-kernel-legacy-71xx -p1 < nvidia.patch + 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) && \ @@ -36,9 +43,10 @@ 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 +#RUN rm *.gz *.bz2 && rm -Rf glide # Note: we need to use Lenny because of live-helper -# it does target Etch though... +# it allows creating Etch live image though ! FROM lpenz/debian-lenny-i386-minbase WORKDIR /root COPY --from=kernel-builder /usr/src/*.deb . diff --git a/nvidia.patch b/nvidia.patch new file mode 100644 index 0000000..c16138e --- /dev/null +++ b/nvidia.patch @@ -0,0 +1,55 @@ +diff -urN nvidia-kernel-legacy-71xx/debian/patches/series nvidia-kernel-legacy-71xx_patched/debian/patches/series +--- nvidia-kernel-legacy-71xx/debian/patches/series 2012-06-30 11:53:56.000000000 +0000 ++++ nvidia-kernel-legacy-71xx_patched/debian/patches/series 2026-03-20 21:24:38.264511597 +0000 +@@ -1,8 +1,5 @@ + patch-3.0-rt-nvidia.patch + use-nv-kernel.o.ARCH.patch + conditionally-include-linux_version.h.patch +-avoid-ld.gold.patch + fix-typos.patch + linux3.patch +-kernel-3.4.patch +-drop24support.patch +diff -urN nvidia-kernel-legacy-71xx/debian/rules nvidia-kernel-legacy-71xx_patched/debian/rules +--- nvidia-kernel-legacy-71xx/debian/rules 2012-06-30 11:53:56.000000000 +0000 ++++ nvidia-kernel-legacy-71xx_patched/debian/rules 2026-03-20 21:24:20.952363260 +0000 +@@ -54,12 +54,14 @@ + sed 's/#KVERS#/$(KVERS)/g' debian/install.template > debian/install + touch $@ + ++export QUILT_PATCHES=debian/patches ++ + build: build-arch build-indep + build-arch: build-stamp + build-indep: + build-stamp: configure-stamp +- dh_prep +- dh_quilt_patch ++ dh_clean -k ++ quilt push -a || test $$? = 2 + $(MAKE) LINUXDIR=$(KSRC) + touch $@ + +@@ -73,8 +75,6 @@ + dh_installdocs $(wildcard debian/changelog.nvidia-kernel*-source*) + dh_installchangelogs NVIDIA_Changelog + dh_installmodules +- dh_bugfiles +- dh_lintian + dh_strip + dh_compress + dh_fixperms +@@ -88,7 +88,6 @@ + dh_testdir + dh_testroot + $(MAKE) LINUXDIR=$(KSRC) $(KPKG_EXTRAV_ARG) clean +- dh_quilt_unpatch || quilt --quiltrc /dev/null pop -af + dh_clean debian/control debian/install + + # The kdist_configure target is called by make-kpkg modules_config. It +diff -urN nvidia-kernel-legacy-71xx/debian/compat nvidia-kernel-legacy-71xx_patched/debian/compat +--- nvidia-kernel-legacy-71xx/debian/compat 2012-06-30 11:53:56.000000000 +0000 ++++ nvidia-kernel-legacy-71xx_patched/debian/compat 2026-03-20 21:24:20.952363260 +0000 +@@ -1 +1 @@ +-8 ++5