[pve-devel] r4923 - pve-kernel-2.6.32/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Wed Aug 4 08:54:23 CEST 2010 

Author: dietmar
Date: 2010-08-04 06:54:22 +0000 (Wed, 04 Aug 2010)
New Revision: 4923

Added:
   pve-kernel-2.6.32/trunk/changelog.firmware
   pve-kernel-2.6.32/trunk/control.firmware
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/create-initrd-dir
Log:
add new firmeware package


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-08-03 12:37:20 UTC (rev 4922)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-08-04 06:54:22 UTC (rev 4923)
@@ -18,6 +18,10 @@
 KERNEL_SRC_TAR=linux-2.6_${KERNEL_VER}.orig.tar.gz
 KERNEL_DEB_DIFF=linux-2.6_${KERNEL_VER}-${KERNEL_DEB_REL}.diff
 
+FW_VER=1.0
+FW_REL=6
+FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
+
 BUSYBOXVER=1.14.0
 BUSYBOXSOURCE=busybox-${BUSYBOXVER}.tar.bz2
 BUSYBOXDIR=busybox-${BUSYBOXVER}
@@ -37,7 +41,7 @@
 PVEPKG=proxmox-ve-${KERNEL_VER}
 PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 
-all: check_gcc ${DST_DEB} ${PVE_DEB} ${HDR_DEB} firmware-${KERNEL_VER}.tgz
+all: check_gcc ${DST_DEB} ${PVE_DEB} ${FW_DEB} ${HDR_DEB}
 
 ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
 	rm -rf proxmox-ve/data
@@ -70,7 +74,7 @@
 	lintian ${DST_DEB}
 
 
-data firmware-${KERNEL_VER}.tgz: .compile_mark config-${KERNEL_VER} aoe.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark config-${KERNEL_VER} aoe.ko iscsi-scst.ko scst-modules.tar
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 config-${KERNEL_VER} tmp/boot/config-${KVNAME}
@@ -84,11 +88,7 @@
 	# 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
-	# create firmeware package
-	install -d tmp/usr/share/doc/pve-firmware
-	cp ${KERNEL_SRC}/firmware/WHENCE tmp/usr/share/doc/pve-firmware/WHENCE-${KERNEL_VER}
-	tar czf firmware-${KERNEL_VER}.tgz -C tmp lib/firmware usr/share/doc/pve-firmware
-	rm -rf tmp/lib/firmware tmp/usr/
+	# finalize
 	depmod -b tmp/ ${KVNAME}
 	mv tmp data
 
@@ -113,6 +113,7 @@
 	rm -rf ${KERNEL_SRC}
 	tar xf ${KERNEL_SRC_TAR}	
 	cd ${KERNEL_SRC}; patch -p1 <../${KERNEL_DEB_DIFF}
+	sdsd
 	./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch 
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
@@ -123,14 +124,6 @@
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 
-drbd.ko drbd: ${DRBDSRC} ${KERNEL_SRC}/README
-	rm -rf ${DRBDDIR} drbd.ko
-	tar xf ${DRBDSRC}
-	cd ${DRBDDIR}; patch -p1 <../drbd-8.3.4-compile-fix.diff 
-	cd ${DRBDDIR}; patch -p1 <../drbd-8.3.4-crypto-api.diff
-	cd ${DRBDDIR}/drbd; make KDIR=${TOP}/${KERNEL_SRC}
-	cp ${DRBDDIR}/drbd/drbd.ko drbd.ko
-
 aoe.ko aoe: .compile_mark ${AOESRC}
 	# aoe driver updates
 	rm -rf ${AOEDIR} aoe.ko
@@ -181,6 +174,7 @@
 	ejectcd.sh 				\
 	busybox.tar				\
 	proxmox_splash.dat			\
+	initrdfirmware.tar			\
 	create-initrd-dir
 
 pci.ids: /usr/share/misc/pci.ids
@@ -216,8 +210,29 @@
 	dpkg-deb --build $(headers_tmp) ${HDR_DEB}
 	#lintian ${HDR_DEB}
 
+linux-firmware.git/WHENCE:
+	git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git linux-firmware.git
+
+${FW_DEB} initrdfirmware.tar fw: control.firmware linux-firmware.git/WHENCE changelog.firmware
+	rm -rf fwdata
+	mkdir -p fwdata/lib
+	rsync -a --exclude .git linux-firmware.git/ fwdata/lib/firmware
+	install -d fwdata/usr/share/doc/pve-firmware
+	mv fwdata/lib/firmware/WHENCE fwdata/usr/share/doc/pve-firmware/README
+	install -d fwdata/usr/share/doc/pve-firmware/licenses
+	mv fwdata/lib/firmware/LICEN[CS]E* fwdata/usr/share/doc/pve-firmware/licenses
+	install -D -m 0644 changelog.firmware fwdata/usr/share/doc/pve-firmware/changelog.Debian
+	gzip -9 fwdata/usr/share/doc/pve-firmware/changelog.Debian	
+	install -d fwdata/DEBIAN
+	sed -e 's/@VERSION@/${FW_VER}-${FW_REL}/' <control.firmware >fwdata/DEBIAN/control
+	dpkg-deb --build fwdata ${FW_DEB}
+	mkdir -p fwdata/initrd/firmware
+	cp fwdata/lib/firmware/ql*_fw.bin fwdata/initrd/firmware
+	tar cf initrdfirmware.tar -C fwdata/initrd firmware
+
+
 .PHONY: upload
-upload: ${DST_DEB} ${PVE_DEB} ${HDR_DEB} firmware-${KERNEL_VER}.tgz
+upload: ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB}
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
 	mkdir -p /pve/${RELEASE}/extra
 	mkdir -p /pve/${RELEASE}/install
@@ -225,7 +240,7 @@
 	rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
 	rm -rf /pve/${RELEASE}/extra/${PVEPKG}_*.deb
 	rm -rf /pve/${RELEASE}/extra/Packages*
-	cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} /pve/${RELEASE}/extra
+	cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} /pve/${RELEASE}/extra
 	rm -rf /pve/${RELEASE}/install/firmware-${KERNEL_VER}.tgz
 	cp firmware-${KERNEL_VER}.tgz /pve/${RELEASE}/install/
 	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
@@ -233,10 +248,10 @@
 
 .PHONY: distclean
 distclean: clean
-	rm -rf ${KERNEL_SRC}.org
+	rm -rf linux-firmware.git	
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb pci.ids ${DRBDDIR} drbd.ko ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} iscsi-scst.ko scst-modules.tar ${SCSTDIR} firmware-${KERNEL_VER}.tgz put_page_callback-2.6.32.patch
+	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb ${DRBDDIR} ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata initrdfirmware.tar
 
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-08-03 12:37:20 UTC (rev 4922)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-08-04 06:54:22 UTC (rev 4923)
@@ -3,6 +3,11 @@
   * upgarde to debian squeeze kernel with openvz support (2.6.32-18)
   
   * removed DRBD code, because a backport was already included by debian.
+  
+  * add qlogic firmware to default initrd image 
+  
+  * create a firmware package using data from
+    git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
 
  -- Proxmox Support Team <support at proxmox.com>  Tue, 03 Aug 2010 13:14:22 +0200
 

Added: pve-kernel-2.6.32/trunk/changelog.firmware
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.firmware	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/changelog.firmware	2010-08-04 06:54:22 UTC (rev 4923)
@@ -0,0 +1,35 @@
+pve-firmware (1.0-5) unstable; urgency=low
+
+  * Conflict with firmware-linux-free and firmware-linux-nonfree (from 
+  squeeze or backports)
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 21 Apr 2010 10:05:36 +0200
+
+pve-firmware (1.0-4) unstable; urgency=low
+
+  * update from new 2.6.32 kernel
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 21 Apr 2010 10:04:42 +0200
+
+pve-firmware (1.0-3) unstable; urgency=low
+
+  * inlcude firmware from our 2.6.32 kernel
+  
+  * remove firmware from
+    git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+    - it is not up to date
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 29 Dec 2009 11:19:36 +0100
+
+pve-firmware (1.0-2) unstable; urgency=low
+
+  * include drivers from linux-firmware.git to support newer kernels.
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 11 Dec 2009 12:31:40 +0100
+
+pve-firmware (1.0-1) unstable; urgency=low
+
+  * initial release for kernel 2.6.24
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 11 Dec 2009 12:30:01 +0100
+

Added: pve-kernel-2.6.32/trunk/control.firmware
===================================================================
--- pve-kernel-2.6.32/trunk/control.firmware	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/control.firmware	2010-08-04 06:54:22 UTC (rev 4923)
@@ -0,0 +1,11 @@
+Package: pve-firmware
+Version: @VERSION@
+Section: misc
+Priority: optional
+Architecture: all
+Suggests: linux-image
+Conflicts: firmware-linux-free, firmware-linux-nonfree 
+Maintainer: Proxmox Support Team <support at proxmox.com>
+Description: Binary firmware code for the pve-kernel
+ This package contains the binary firmware for various modules used in
+ the pve-kernel.

Modified: pve-kernel-2.6.32/trunk/create-initrd-dir
===================================================================
--- pve-kernel-2.6.32/trunk/create-initrd-dir	2010-08-03 12:37:20 UTC (rev 4922)
+++ pve-kernel-2.6.32/trunk/create-initrd-dir	2010-08-04 06:54:22 UTC (rev 4923)
@@ -60,8 +60,8 @@
 
 depmod -b $BASE -v $KVNAME >/dev/null
 
-# include firmware ?
-#tar xf initrdfirmware.tar -C $BASE/lib/
+# include some firmware
+tar xf initrdfirmware.tar -C $BASE/lib/
 
 tar xpf busybox.tar -C $BASE

More information about the pve-devel mailing list