[pve-devel] r5215 - pve-kernel-2.6.35/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-05 12:02:48 +0000 (Tue, 05 Oct 2010)
New Revision: 5215

Modified:
   pve-kernel-2.6.35/trunk/Makefile
Log:


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2010-10-05 12:01:20 UTC (rev 5214)
+++ pve-kernel-2.6.35/trunk/Makefile	2010-10-05 12:02:48 UTC (rev 5215)
@@ -34,7 +34,7 @@
 PVEPKG=proxmox-ve-${KERNEL_VER}
 PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 
-all: check_gcc ${DST_DEB} ${PVE_DEB} ${HDR_DEB}
+all: check_gcc ${DST_DEB} ${PVE_DEB} ${HDR_DEB} fwlist-${KVNAME}
 
 ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
 	rm -rf proxmox-ve/data
@@ -80,6 +80,9 @@
 	# install scst modules
 	install -m 644 -D iscsi-scst.ko tmp/lib/modules/${KVNAME}/extra/scst/iscsi-scst.ko
 	tar xf scst-modules.tar -C tmp/lib/modules/${KVNAME}/extra/scst
+	# remove firmware
+	rm -rf tmp/lib/firmware
+	# finalize
 	depmod -b tmp/ ${KVNAME}
 	mv tmp data
 
@@ -102,8 +105,6 @@
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-2.6.35.diff
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/scst_exec_req_fifo-2.6.35.patch
-	#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/io_context-2.6.32.patch
-	#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/readahead-2.6.32.patch
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/iscsi-scst/kernel/patches/put_page_callback-2.6.35.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
@@ -114,6 +115,10 @@
 	cd ${KERNEL_SRC}.org; git checkout -b local ${UBUNTU_BRANCH}	
 	touch $@
 
+fwlist-${KVNAME}: data
+	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
+	mv fwlist.tmp $@
+
 linux-firmware.git/WHENCE:
 	git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git linux-firmware.git
 
@@ -228,6 +233,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.35 config-2.6.35.org ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb pci.ids ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} iscsi-scst.ko scst-modules.tar ${SCSTDIR} fwlist.initrd
+	rm -rf *~ .compile_mark config-2.6.35 config-2.6.35.org ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb pci.ids ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} iscsi-scst.ko scst-modules.tar ${SCSTDIR} fwlist.initrd fwlist-${KVNAME}