From d00f309676fe78cc6ce8c1e16f2767d8f45650c2 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <abaumann@yahoo.com>
Date: Sun, 4 Dec 2011 21:59:48 +0100
Subject: tried to upgrade, broken now

---
 Makefile | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 675910b..1dbe021 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,9 @@ help:
 
 # software versions
 SYSLINUX_VERSION=4.04
-KERNEL_VERSION=2.6.35.2
-UCLIBC_VERSION=0.9.31
-BUSYBOX_VERSION=1.17.1
+KERNEL_VERSION=3.1.4
+UCLIBC_VERSION=0.9.32
+BUSYBOX_VERSION=1.19.3
 ACPID_VERSION=1.0.10
 GPM_VERSION=1.20.6
 PERL_VERSION=5.12.1
@@ -24,6 +24,8 @@ LUA_VERSION=5.1.4
 
 PARALLEL=-j12
 
+LIBDIR=lib64
+
 all: qemu vdi vmdk zip-vdi zip-vmdk
 
 vdi:
@@ -118,7 +120,7 @@ syslinux:
 
 syslinux-loader:
 	/sbin/losetup /dev/loop1 minilinux.img
-	cat syslinux-3.86/mbr/mbr.bin > /dev/loop1
+	cat syslinux-$(SYSLINUX_VERSION)/mbr/mbr.bin > /dev/loop1
 	sync && sleep 1
 	/sbin/losetup -d /dev/loop1
 
@@ -131,8 +133,8 @@ syslinux-clean:
 kernel:
 	-rm -rf linux-$(KERNEL_VERSION)
 	tar jxf tarballs/linux-$(KERNEL_VERSION).tar.bz2
-	cp kernel-config linux-$(KERNEL_VERSION)/.config
-	cd linux-$(KERNEL_VERSION) && make $(PARALLEL) bzImage
+	cp kernel-config.`uname -m` linux-$(KERNEL_VERSION)/.config
+	cd linux-$(KERNEL_VERSION) && ( yes '' | make $(PARALLEL) bzImage )
 	cp linux-$(KERNEL_VERSION)/arch/x86/boot/bzImage target/boot/bzImage-$(KERNEL_VERSION)
 
 kernel-clean:
@@ -158,14 +160,14 @@ busybox:
 	cp busybox-config busybox-$(BUSYBOX_VERSION)/.config
 	cd busybox-$(BUSYBOX_VERSION) && make $(PARALLEL)
 	cd busybox-$(BUSYBOX_VERSION) && make install
-	cp /lib/libcrypt.so.1 target/lib
-	cp /lib/ld-linux.so.2 target/lib
-	cp /lib/libm.so.6 target/lib
-	cp /lib/libc.so.6 target/lib
-	cp /lib/libdl.so.2 target/lib
-	cp /lib/libpthread.so.0 target/lib
-	-cp /lib/libpcre.so.0 target/lib
-	-cp /usr/lib/libpcre.so.3 target/lib
+	cp /$(LIBDIR)/libcrypt.so.1 target/lib
+	cp /$(LIBDIR)/ld-linux-x86-64.so.2 target/lib
+	cp /$(LIBDIR)/libm.so.6 target/lib
+	cp /$(LIBDIR)/libc.so.6 target/lib
+	cp /$(LIBDIR)/libdl.so.2 target/lib
+	cp /$(LIBDIR)/libpthread.so.0 target/lib
+	-cp /$(LIBDIR)/libpcre.so.0 target/lib
+	-cp /usr/$(LIBDIR)/libpcre.so.3 target/lib
 
 	
 busybox-clean:
@@ -250,7 +252,7 @@ source:
 		http://www.kernel.org/pub/linux/utils/boot/syslinux/4.xx//syslinux-$(SYSLINUX_VERSION).tar.bz2
 	-test -r tarballs/linux-$(KERNEL_VERSION).tar.bz2 || \
 		wget -O tarballs/linux-$(KERNEL_VERSION).tar.bz2 \
-		http://www.kernel.org/pub/linux/kernel/v2.6/linux-$(KERNEL_VERSION).tar.bz2
+		http://www.kernel.org/pub/linux/kernel/v3.0//linux-$(KERNEL_VERSION).tar.bz2
 	-test -r tarballs/uClibc-$(UCLIBC_VERSION).tar.bz2 || \
 		wget -O tarballs/uClibc-$(UCLIBC_VERSION).tar.bz2 \
 		http://www.uclibc.org/downloads/uClibc-$(UCLIBC_VERSION).tar.bz2
-- 
cgit v1.2.3-54-g00ecf