From 233b397411812d7c0105fad58522f5ae396c805d Mon Sep 17 00:00:00 2001
From: root <root@oz.(none)>
Date: Sat, 8 May 2010 17:44:56 +0200
Subject: upgraded kernel to 2.6.33.3 fixed compilation of miniperl with perl
 5.12.0

---
 Makefile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1248f08..585d29c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,14 @@ help:
 
 # software versions
 GRUB_VERSION=0.97
-KERNEL_VERSION=2.6.33.2
+KERNEL_VERSION=2.6.33.3
 UCLIBC_VERSION=0.9.31
 BUSYBOX_VERSION=1.16.1
 ACPID_VERSION=1.0.10
 GPM_VERSION=1.20.6
-PERL_VERSION=5.10.1
+PERL_VERSION=5.12.0
+
+PARALLEL=-j12
 
 all: qemu vdi vmdk zip-vdi zip-vmdk
 
@@ -109,7 +111,7 @@ disk-image:
 grub:
 	tar zxf tarballs/grub-$(GRUB_VERSION).tar.gz
 	mkdir grub-build && cd grub-build && ../grub-$(GRUB_VERSION)/configure --prefix=`pwd`
-	cd grub-build && make
+	cd grub-build && make $(PARALLEL)
 	cd grub-build && make install
 	cp grub-build/lib/grub/i386-pc/stage1 target/boot/grub
 	cp grub-build/lib/grub/i386-pc/stage2 target/boot/grub
@@ -141,8 +143,8 @@ 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 bzImage
-	cp linux-$(KERNEL_VERSION)/arch/i386/boot/bzImage target/boot/bzImage-$(KERNEL_VERSION)
+	cd linux-$(KERNEL_VERSION) && make $(PARALLEL) bzImage
+	cp linux-$(KERNEL_VERSION)/arch/x86/boot/bzImage target/boot/bzImage-$(KERNEL_VERSION)
 
 kernel-clean:
 	-rm -rf linux-$(KERNEL_VERSION)
@@ -153,7 +155,7 @@ uclibc:
 	-rm -rf uClibc-$(UCLIBC_VERSION)
 	tar jxf tarballs/uClibc-$(UCLIBC_VERSION).tar.bz2
 	cp uclibc-config uClibc-$(UCLIBC_VERSION)/.config
-	cd uClibc-$(UCLIBC_VERSION) && make CROSS=i486-pc-linux-gnu-
+	cd uClibc-$(UCLIBC_VERSION) && make $(PARALLEL) CROSS=i486-pc-linux-gnu-
 	cd uClibc-$(UCLIBC_VERSION) && make install DESTDIR=/tools
 
 uclibc-clean:
@@ -165,7 +167,7 @@ busybox:
 	-rm -rf busybox-$(BUSYBOX_VERSION)
 	tar jxf tarballs/busybox-$(BUSYBOX_VERSION).tar.bz2
 	cp busybox-config busybox-$(BUSYBOX_VERSION)/.config
-	cd busybox-$(BUSYBOX_VERSION) && make
+	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
@@ -184,7 +186,7 @@ gpm:
 	-rm -rf gpm-$(GPM_VERSION)
 	tar jxf tarballs/gpm-$(GPM_VERSION).tar.bz2
 	cd gpm-$(GPM_VERSION) && ./configure --prefix=/usr --without-curses
-	cd gpm-$(GPM_VERSION) && make LDFLAGS="-lm"
+	cd gpm-$(GPM_VERSION) && make LDFLAGS="-lm" $(PARALLEL)
 	cd gpm-$(GPM_VERSION) && cp src/gpm ../target/usr/sbin
 
 gpm-clean:
@@ -194,7 +196,7 @@ acpid:
 	-rm -rf acpid-$(ACPID_VERSION)
 	-rm -rf target/etc/acpi
 	tar zxf tarballs/acpid-$(ACPID_VERSION).tar.gz	
-	cd acpid-$(ACPID_VERSION) && make
+	cd acpid-$(ACPID_VERSION) && make $(PARALLEL)
 	cd acpid-$(ACPID_VERSION) && cp acpid ../target/usr/sbin/acpid
 	mkdir target/etc/acpi
 	mkdir target/etc/acpi/events
@@ -208,7 +210,8 @@ acpid-clean:
 perl:
 	-rm -rf perl-$(PERL_VERSION)
 	tar zxf tarballs/perl-$(PERL_VERSION).tar.gz
-	cd perl-$(PERL_VERSION) && make -f Makefile.micro
+	cp {Makefile.micro,miniperlmain.c} perl-$(PERL_VERSION)
+	cd perl-$(PERL_VERSION) && make -f Makefile.micro $(PARALLEL)
 	cd perl-$(PERL_VERSION) && cp microperl ../target/usr/bin/perl
 
 perl-clean:
-- 
cgit v1.2.3-54-g00ecf