Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| feca6913f4 | |||
| 751aa23b36 | |||
| ef94c5ecdc | |||
| 79bfa1e66d | |||
| 1bc507a7ee | |||
| 522a29d09c |
@@ -2,10 +2,10 @@ RELEASE=5.0
|
||||
|
||||
# also update proxmox-ve/changelog if you change KERNEL_VER or KREL
|
||||
KERNEL_VER=4.10.17
|
||||
PKGREL=23
|
||||
PKGREL=25
|
||||
# also include firmware of previous version into
|
||||
# the fw package: fwlist-2.6.32-PREV-pve
|
||||
KREL=3
|
||||
KREL=5
|
||||
|
||||
KERNEL_SRC=ubuntu-zesty
|
||||
KERNEL_SRC_SUBMODULE=submodules/ubuntu-zesty
|
||||
@@ -49,7 +49,7 @@ SPLSRC=submodules/spl-module
|
||||
ZFSDIR=pkg-zfs
|
||||
ZFSSRC=submodules/zfs-module
|
||||
ZFS_KO=zfs.ko
|
||||
ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
|
||||
ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko
|
||||
ZFS_MODULES=$(ZFS_KO) $(ZFS_KO_REST)
|
||||
SPL_KO=spl.ko
|
||||
SPL_KO_REST=splat.ko
|
||||
@@ -232,7 +232,7 @@ PVE_CONFIG_OPTS= \
|
||||
touch $@
|
||||
|
||||
${KERNEL_CFG_ORG}: ${KERNEL_SRC}/README
|
||||
${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodules
|
||||
${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodule
|
||||
rm -rf ${KERNEL_SRC}
|
||||
cp -a ${KERNEL_SRC_SUBMODULE} ${KERNEL_SRC}
|
||||
cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
|
||||
@@ -305,6 +305,7 @@ $(ZFS_KO): .compile_mark ${ZFSSRC}
|
||||
cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko
|
||||
cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
|
||||
cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
|
||||
cp ${ZFSDIR}/module/icp/icp.ko icp.ko
|
||||
|
||||
headers_tmp := $(CURDIR)/tmp-headers
|
||||
headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
|
||||
@@ -346,12 +347,12 @@ distclean: clean
|
||||
|
||||
# upgrade to current master
|
||||
.PHONY: update_modules
|
||||
update_modules: submodules
|
||||
update_modules: submodule
|
||||
git submodule foreach 'git pull --ff-only origin master'
|
||||
|
||||
# make sure submodules were initialized
|
||||
.PHONY: submodules
|
||||
submodules:
|
||||
.PHONY: submodule
|
||||
submodule:
|
||||
test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init
|
||||
test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
|
||||
test -f "${SPLSRC}/debian/changelog" || git submodule update --init
|
||||
|
||||
+6138
-6138
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,19 @@
|
||||
pve-kernel (4.10.17-25) unstable; urgency=medium
|
||||
|
||||
* update ZFS/SPL to 0.7.3
|
||||
|
||||
* bump ABI to 4.10.17-5-pve
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 6 Nov 2017 12:37:43 +0100
|
||||
|
||||
pve-kernel (4.10.17-24) unstable; urgency=medium
|
||||
|
||||
* update to Ubuntu-4.10.0-37.41
|
||||
|
||||
* bump ABI to 4.10.17-4-pve
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 10 Oct 2017 14:12:14 +0200
|
||||
|
||||
pve-kernel (4.10.17-23) unstable; urgency=medium
|
||||
|
||||
* update to Ubuntu-4.10.0-35.39
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
proxmox-ve (5.0-24) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.17-4-pve kernel
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 10 Oct 2017 14:39:55 +0200
|
||||
|
||||
proxmox-ve (5.0-21) unstable; urgency=medium
|
||||
|
||||
* depend on newest 4.10.17-3-pve kernel
|
||||
|
||||
+1
-1
Submodule submodules/spl-module updated: b6358351cc...785f8eda81
+1
-1
Submodule submodules/ubuntu-zesty updated: 0f390669d7...cc8f26e2f0
+1
-1
Submodule submodules/zfs-module updated: a540f8d7ef...ab6f41b56c
Reference in New Issue
Block a user