From: Dietmar Maurer Date: Sun, 11 Jan 2015 07:32:45 +0000 (+0100) Subject: add zfs modules X-Git-Url: https://git.proxmox.com/?p=pve-kernel-3.10.0.git;a=commitdiff_plain;h=b078c60278f6d2c50b69e1cf38e1d20f665b2110 add zfs modules and correctly call /etc/kernel hooks --- diff --git a/Makefile b/Makefile index 7c1939f..0d15c2c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ RELEASE=3.3 KERNEL_VER=3.10.0 -PKGREL=24 +PKGREL=25 # also include firmware of previous versrion into # the fw package: fwlist-2.6.32-PREV-pve KREL=6 @@ -61,6 +61,14 @@ ARECASRC=${ARECADIR}.zip #ISCSITARGETDIR=iscsitarget-1.4.20.2 #ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz +ZFSVER=0.6.3-1.2 +SPLDIR=spl-spl-${ZFSVER} +SPLSRC=spl-${ZFSVER}.tar.gz +ZFSDIR=zfs-zfs-${ZFSVER} +ZFSSRC=zfs-${ZFSVER}.tar.gz +ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko +SPL_MODULES=spl.ko splat.ko + DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb PVEPKG=proxmox-ve-${KERNEL_VER} @@ -81,9 +89,11 @@ else $(CC) --version|grep "4\.7" || false endif -${DST_DEB}: data control.in postinst.in postrm.in copyright changelog.Debian +${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian mkdir -p data/DEBIAN sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' data/DEBIAN/control + sed -e 's/@@KVNAME@@/${KVNAME}/g' data/DEBIAN/prerm + chmod 0755 data/DEBIAN/prerm sed -e 's/@@KVNAME@@/${KVNAME}/g' data/DEBIAN/postinst chmod 0755 data/DEBIAN/postinst sed -e 's/@@KVNAME@@/${KVNAME}/g' data/DEBIAN/postrm @@ -103,7 +113,7 @@ fwlist-${KVNAME}: data mv fwlist.tmp $@ # fixme: bnx2.ko cnic.ko bnx2x.ko -data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko +data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko ${SPL_MODULES} ${ZFS_MODULES} rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME} mkdir tmp/boot install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME} @@ -128,6 +138,9 @@ data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2 #install -m 644 rr272x_1x.ko -D tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/rr272x_1x/rr272x_1x.ko # install areca driver install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/ + # install zfs drivers + install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs + install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs # remove firmware rm -rf tmp/lib/firmware # strip debug info @@ -238,6 +251,29 @@ arcmsr.ko: .compile_mark ${ARECASRC} cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules cp ${ARECADIR}/arcmsr.ko arcmsr.ko +${SPL_MODULES}: .compile_mark ${SPLSRC} + rm -rf ${SPLDIR} + tar xf ${SPLSRC} + cd ${SPLDIR}; ./autogen.sh + cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC} + cd ${SPLDIR}; make + cp ${SPLDIR}/module/spl/spl.ko spl.ko + cp ${SPLDIR}/module/splat/splat.ko splat.ko + +${ZFS_MODULES}: .compile_mark ${ZFSSRC} + rm -rf ${ZFSDIR} + tar xf ${ZFSSRC} + cd ${ZFSDIR}; ./autogen.sh + cd ${ZFSDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC} + cd ${ZFSDIR}; make + cp ${ZFSDIR}/module/zfs/zfs.ko zfs.ko + cp ${ZFSDIR}/module/avl/zavl.ko zavl.ko + cp ${ZFSDIR}/module/nvpair/znvpair.ko znvpair.ko + cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko + cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko + cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko + + #iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC} # rm -rf ${ISCSITARGETDIR} # tar xf ${ISCSITARGETSRC} @@ -323,7 +359,8 @@ distclean: clean .PHONY: clean clean: - rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} + rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} + diff --git a/changelog.Debian b/changelog.Debian index 503e3eb..a51e2fe 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +pve-kernel-3.10.0 (3.10.0-25) unstable; urgency=low + + * add zfs modules + + -- Proxmox Support Team Sun, 11 Jan 2015 08:37:21 +0100 + pve-kernel-3.10.0 (3.10.0-24) unstable; urgency=low * update to kernel kernel-3.10.0-123.13.2.el7.src.rpm diff --git a/postinst.in b/postinst.in index 0d4971f..3340eee 100755 --- a/postinst.in +++ b/postinst.in @@ -14,10 +14,12 @@ my $version = "@@KVNAME@@"; system("depmod $version"); -system("update-initramfs -c -t -b $imagedir -k $version"); - -if (-x "/usr/sbin/update-grub") { - system("/usr/sbin/update-grub"); +if (-d "/etc/kernel/postinst.d") { + print STDERR "Examining /etc/kernel/postinst.d.\n"; + system ("run-parts --verbose --exit-on-error --arg=$version " . + "--arg=$imagedir/vmlinuz-$version " . + "/etc/kernel/postinst.d") && + die "Failed to process /etc/kernel/postinst.d"; } exit 0 diff --git a/postrm.in b/postrm.in index 8ccfd9a..f0f56f7 100644 --- a/postrm.in +++ b/postrm.in @@ -9,6 +9,14 @@ my $imagedir = "/boot"; my $version = "@@KVNAME@@"; +if (-d "/etc/kernel/postrm.d") { + print STDERR "Examining /etc/kernel/postrm.d.\n"; + system ("run-parts --verbose --exit-on-error --arg=$version " . + "--arg=$imagedir/vmlinuz-$version " . + "/etc/kernel/postrm.d") && + die "Failed to process /etc/kernel/postrm.d"; +} + unlink "$imagedir/initrd.img-$version"; unlink "$imagedir/initrd.img-$version.bak"; unlink "/var/lib/initramfs-tools/$version"; diff --git a/prerm.in b/prerm.in new file mode 100755 index 0000000..486f867 --- /dev/null +++ b/prerm.in @@ -0,0 +1,23 @@ +#!/usr/bin/perl -w + +use strict; + +# Ignore all invocations uxcept when called on to remove +exit 0 unless ($ARGV[0] && $ARGV[0] =~ /remove/) ; + +# do nothing if run from proxmox installer +exit 0 if -e "/proxmox_install_mode"; + +my $imagedir = "/boot"; + +my $version = "@@KVNAME@@"; + +if (-d "/etc/kernel/prerm.d") { + print STDERR "Examining /etc/kernel/prerm.d.\n"; + system ("run-parts --verbose --exit-on-error --arg=$version " . + "--arg=$imagedir/vmlinuz-$version " . + "/etc/kernel/prerm.d") && + die "Failed to process /etc/kernel/prerm.d"; +} + +exit 0 diff --git a/spl-0.6.3-1.2.tar.gz b/spl-0.6.3-1.2.tar.gz new file mode 100644 index 0000000..7a2adfa Binary files /dev/null and b/spl-0.6.3-1.2.tar.gz differ diff --git a/zfs-0.6.3-1.2.tar.gz b/zfs-0.6.3-1.2.tar.gz new file mode 100644 index 0000000..e351c0c Binary files /dev/null and b/zfs-0.6.3-1.2.tar.gz differ