diff --git a/Dockerfile b/Dockerfile index 9a76982..7100e2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ COPY config-kernel ./ RUN (zcat /usr/src/unionfs-2.2.3_for_2.6.24.diff.gz | patch -p1) && \ (cat config-kernel > .config) && \ make oldconfig &&\ - make-kpkg --initrd --arch i386 kernel_headers kernel_image modules + make-kpkg --initrd --arch $ARCH kernel_headers kernel_image modules # Note: we need to use Lenny because of live-helper diff --git a/Jenkinsfile b/Jenkinsfile index d81f374..9cbcbe6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,47 +10,77 @@ pipeline { stages { stage('Build ISO') { steps { - sh ''' - set -e - cd /root/live - deb="$(ls -1 /root/linux-image-*.deb | head -n1)" - kernpkg="$(dpkg-deb -f "$deb" Package)" - echo "$kernpkg" + dir('root/live') + { + sh ''' + set -e + deb="$(ls -1 /root/linux-image-*.deb | head -n1)" + kernpkg="$(dpkg-deb -f "$deb" Package)" + echo "$kernpkg" - deb="$(ls -1 /root/squashfs-modules-*.deb | head -n1)" - squashfspkg="$(dpkg-deb -f "$deb" Package)" - echo "$squashfspkg" + deb="$(ls -1 /root/squashfs-modules-*.deb | head -n1)" + squashfspkg="$(dpkg-deb -f "$deb" Package)" + echo "$squashfspkg" - lh_config \ - -a i386 \ - --apt apt \ - −−apt−secure false \ - --binary-images iso \ - --bootloader syslinux \ - --bootstrap debootstrap \ - --debconf-frontend noninteractive \ - --debian-installer live \ - --hostname RetroDebian \ - --distribution etch \ - --mirror-bootstrap http://archive.debian.org/debian/ \ - --mirror-binary http://archive.debian.org/debian/ \ - --mirror-binary-security http://archive.debian.org/debian-security/ \ - --mirror-chroot http://archive.debian.org/debian/ \ - --mirror-chroot-security http://archive.debian.org/debian-security/ \ - --union-filesystem unionfs \ - --linux-packages "squashfs-modules-2.6.24 linux-image-2.6.24" \ - -k retrodebian1 - - chmod +x /root/update-initramfs.sh - cp /root/update-initramfs.sh config/chroot_local-hooks + lh_config \ + -a i386 \ + --apt apt \ + −−apt−secure false \ + --binary-images iso \ + --bootloader syslinux \ + --bootstrap debootstrap \ + --debconf-frontend noninteractive \ + --debian-installer live \ + --hostname RetroDebian \ + --distribution etch \ + --mirror-bootstrap http://archive.debian.org/debian/ \ + --mirror-binary http://archive.debian.org/debian/ \ + --mirror-binary-security http://archive.debian.org/debian-security/ \ + --mirror-chroot http://archive.debian.org/debian/ \ + --mirror-chroot-security http://archive.debian.org/debian-security/ \ + --union-filesystem unionfs \ + --linux-packages "squashfs-modules-2.6.24 linux-image-2.6.24" \ + -k retrodebian1 + + chmod +x /root/update-initramfs.sh + cp /root/update-initramfs.sh config/chroot_local-hooks + cp /root/linux-image-*.deb config/chroot_local-packages/ + cp /root/squashfs-modules-*.deb config/chroot_local-packages/ + ''' + sh ''' + |cat > config/chroot_local-packageslists/desktop.list <<'EOF' + |xserver-xorg + |xinit + |xterm + |xfonts-base + |xfonts-100dpi + |xfonts-75dpi + |xfonts-scalable + |fluxbox + |menu + |pcmanfm + |lxpanel + |leafpad + |roxterm + |dbus + |hal + |pmount + |sudo + |alsa-base + |alsa-utils + |pciutils + |usbutils + |psmisc + |wget + |curl + |less + |unzip + |zip + |EOF + '''.stripMargin() - cp /root/linux-image-*.deb config/chroot_local-packages/ - cp /root/squashfs-modules-*.deb config/chroot_local-packages/ - - lh_build - - ls -al - ''' + sh 'lh_build' + } } } stage('Collect ISO') { diff --git a/config-kernel b/config-kernel index bebf77a..8dc9f12 100644 --- a/config-kernel +++ b/config-kernel @@ -3,9 +3,9 @@ # Linux kernel version: 2.6.24 # Tue Mar 17 22:36:14 2026 # -CONFIG_64BIT=y -# CONFIG_X86_32 is not set -CONFIG_X86_64=y +CONFIG_64BIT=n +CONFIG_X86_32=y +# CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -48,7 +48,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="-retrodebian1" -CONFIG_LOCALVERSION_AUTO=y +CONFIG_LOCALVERSION_AUTO=n CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -101,7 +101,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set +CONFIG_KMOD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y # CONFIG_BLK_DEV_IO_TRACE is not set @@ -128,7 +128,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_SMP=y +CONFIG_SMP=n CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set @@ -146,7 +146,7 @@ CONFIG_X86_PC=y # CONFIG_M586MMX is not set # CONFIG_M686 is not set # CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set +CONFIG_MPENTIUMIII=y # CONFIG_MPENTIUMM is not set # CONFIG_MPENTIUM4 is not set # CONFIG_MK6 is not set @@ -164,7 +164,7 @@ CONFIG_X86_PC=y # CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set -CONFIG_GENERIC_CPU=y +# CONFIG_GENERIC_CPU is not set CONFIG_X86_L1_CACHE_BYTES=128 CONFIG_X86_INTERNODE_CACHE_BYTES=128 CONFIG_X86_CMPXCHG=y @@ -177,12 +177,12 @@ CONFIG_HPET_EMULATE_RTC=y CONFIG_GART_IOMMU=y # CONFIG_CALGARY_IOMMU is not set CONFIG_SWIOTLB=y -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=1 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set +#CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y @@ -379,7 +379,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y +CONFIG_IPV6=n # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set @@ -393,7 +393,7 @@ CONFIG_IPV6=y # CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=y +# CONFIG_IPV6_SIT is not set # CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set @@ -1177,7 +1177,7 @@ CONFIG_USB_MON=y # CONFIG_EDAC is not set # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set -CONFIG_VIRTUALIZATION=y +CONFIG_VIRTUALIZATION=n # CONFIG_KVM is not set #