c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix changelogs

Browse Source
This commit is contained in:
Dietmar Maurer 2015-04-14 07:55:45 +02:00
parent cefdaf9301
commit 2f2b265609
7 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -2,9 +2,11 @@ RELEASE=3.4
# source form https://github.com/zfsonlinux/ # source form https://github.com/zfsonlinux/
# also update version in
# zfs-changelog.Debian and spl-changelog.Debian
ZFSVER=0.6.4 ZFSVER=0.6.4
ZFSPKGREL=1~wheezy ZFSPKGREL=2~wheezy
SPLPKGREL=1~wheezy SPLPKGREL=2~wheezy
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL}
@ -38,6 +40,8 @@ dinstall: ${DEBS}
spl ${SPL_DEBS}: ${SPLSRC} spl ${SPL_DEBS}: ${SPLSRC}
rm -rf ${SPLDIR} rm -rf ${SPLDIR}
tar xf ${SPLSRC} tar xf ${SPLSRC}
mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
cd ${SPLDIR}; ln -s ../spl-patches patches cd ${SPLDIR}; ln -s ../spl-patches patches
cd ${SPLDIR}; quilt push -a cd ${SPLDIR}; quilt push -a
cd ${SPLDIR}; rm -rf .pc ./patches cd ${SPLDIR}; rm -rf .pc ./patches
@ -48,6 +52,8 @@ spl ${SPL_DEBS}: ${SPLSRC}
zfs ${ZFS_DEBS}: ${ZFSSRC} zfs ${ZFS_DEBS}: ${ZFSSRC}
rm -rf ${ZFSDIR} rm -rf ${ZFSDIR}
tar xf ${ZFSSRC} tar xf ${ZFSSRC}
mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
cd ${ZFSDIR}; ln -s ../zfs-patches patches cd ${ZFSDIR}; ln -s ../zfs-patches patches
cd ${ZFSDIR}; quilt push -a cd ${ZFSDIR}; quilt push -a
cd ${ZFSDIR}; rm -rf .pc ./patches cd ${ZFSDIR}; rm -rf .pc ./patches

17
spl-changelog.Debian Normal file
View File

@ -0,0 +1,17 @@
spl-linux (0.6.4-2~wheezy) unstable; urgency=low
* include original zol changelog files
-- Proxmox Support Team <support@proxmox.com> Tue, 14 Apr 2015 07:38:02 +0200
spl-linux (0.6.4-1~wheezy) unstable; urgency=low
* update to 0.6.4 (keep Proxmox VE versioning schema)
-- Proxmox Support Team <support@proxmox.com> Sun, 12 Apr 2015 09:32:24 +0200
spl-linux (0.6.3-1~wheezy) unstable; urgency=low
* first version for Proxmox VE
-- Proxmox Support Team <support@proxmox.com> Sat, 10 Jan 2015 14:06:34 +0100

14
spl-patches/fix-changelog-patch
View File

@ -1,14 +0,0 @@
Index: new-spl/debian/changelog
===================================================================
--- new-spl.orig/debian/changelog 2015-04-12 14:06:48.000000000 +0200
+++ new-spl/debian/changelog 2015-04-12 17:09:48.000000000 +0200
@@ -1,3 +1,9 @@
+spl-linux (0.6.4-1~wheezy) unstable; urgency=low
+
+ * recompile for Proxmox VE, keep Proxmox VE versioning schema
+
+ -- Proxmox Support Team <support@proxmox.com> Sun, 12 Apr 2015 17:09:48 +0200
+
spl-linux (0.6.4-1-wheezy) wheezy; urgency=low
* New upstream release.

1
spl-patches/series
View File

@ -1,2 +1 @@
fix-control fix-control
fix-changelog-patch

33
zfs-changelog.Debian Normal file
View File

@ -0,0 +1,33 @@
zfs-linux (0.6.4-2~wheezy) unstable; urgency=low
* cleanup /etc/default/zfs
* include orignial zol changelog files
-- Proxmox Support Team <support@proxmox.com> Tue, 14 Apr 2015 07:30:59 +0200
zfs-linux (0.6.4-1~wheezy) unstable; urgency=low
* update to 0.6.4
-- Proxmox Support Team <support@proxmox.com> Sun, 12 Apr 2015 09:33:13 +0200
zfs-linux (0.6.3-3~wheezy) unstable; urgency=low
* install init.d file for zed daemon
-- Proxmox Support Team <support@proxmox.com> Sun, 15 Mar 2015 14:57:30 +0100
zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
* use /sbin/modprobe to avoid warning inside initrd
* fix warning about undefined values inside initrd
-- Proxmox Support Team <support@proxmox.com> Wed, 14 Jan 2015 19:03:04 +0100
zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
* first version for Proxmox VE
-- Proxmox Support Team <support@proxmox.com> Sat, 10 Jan 2015 14:06:34 +0100

14
zfs-patches/fix-changelog.patch
View File

@ -1,14 +0,0 @@
Index: new-zfs/debian/changelog
===================================================================
--- new-zfs.orig/debian/changelog 2015-04-12 14:06:48.000000000 +0200
+++ new-zfs/debian/changelog 2015-04-12 17:07:09.000000000 +0200
@@ -1,3 +1,9 @@
+zfs-linux (0.6.4-1~wheezy) unstable; urgency=low
+
+ * recompile for Proxmox VE, keep Proxmox VE versioning schema
+
+ -- Proxmox Support Team <support@proxmox.com> Sun, 12 Apr 2015 17:06:15 +0200
+
zfs-linux (0.6.4-1-2-wheezy) wheezy; urgency=low
* Replace apparently broken nfs.c with one that works on my Primary.

1
zfs-patches/series
View File

@ -1,2 +1 @@
fix-control.patch fix-control.patch
fix-changelog.patch