Commit 2d1f32d8 authored by Aron Xu's avatar Aron Xu

Merge patches from Ubuntu

parent c8dd5630
Description: Block manual building in the DKMS source tree.
To avoid messing up future DKMS builds and the zfs installation,
block manual building of the DKMS source tree.
Author: unknown
Origin: ubuntu
Forwarded: no
Reviewed-By: Petter Reinholdtsen <pere@hungry.com>
Last-Update: 2016-05-12
Index: zfs-linux-0.6.5.6/config/dkms.m4
===================================================================
--- /dev/null
......
Index: zfs-linux-0.6.5.3/config/zfs-meta.m4
===================================================================
--- zfs-linux-0.6.5.3.orig/config/zfs-meta.m4 2015-10-27 14:33:15.636599881 -0600
+++ zfs-linux-0.6.5.3/config/zfs-meta.m4 2015-10-27 14:33:37.996600435 -0600
@@ -1,9 +1,10 @@
dnl #
dnl # DESCRIPTION:
-dnl # Read meta data from the META file. When building from a git repository
-dnl # the ZFS_META_RELEASE field will be overwritten if there is an annotated
-dnl # tag matching the form ZFS_META_NAME-ZFS_META_VERSION-*. This allows
-dnl # for working builds to be uniquely identified using the git commit hash.
+dnl # Read meta data from the META file or the debian/changelog file if it
+dnl # exists. When building from a git repository the ZFS_META_RELEASE field
+dnl # will be overwritten if there is an annotated tag matching the form
+dnl # ZFS_META_NAME-ZFS_META_VERSION-*. This allows for working builds to be
+dnl # uniquely identified using the git commit hash.
dnl #
dnl # The META file format is as follows:
dnl # ^[ ]*KEY:[ \t]+VALUE$
@@ -49,6 +50,7 @@
_zfs_ac_meta_type="none"
if test -f "$META"; then
_zfs_ac_meta_type="META file"
+ _dpkg_parsechangelog=$(dpkg-parsechangelog 2>/dev/null)
ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]);
if test -n "$ZFS_META_NAME"; then
@@ -66,8 +68,30 @@
AC_SUBST([ZFS_META_VERSION])
fi
+ if test -n "${_dpkg_parsechangelog}"; then
+ _dpkg_version=$(echo "${_dpkg_parsechangelog}" \
+ | $AWK '$[]1 == "Version:" { print $[]2; }' \
+ | cut -d- -f1)
+ if test "${_dpkg_version}" != "$ZFS_META_VERSION"; then
+ AC_MSG_ERROR([
+ *** Version $ZFS_META_VERSION in the META file is different than
+ *** version $_dpkg_version in the debian/changelog file. DKMS and DEB
+ *** packaging require that these files have the same version.
+ ])
+ fi
+ fi
+
ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]);
- if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
+
+ if test -n "${_dpkg_parsechangelog}"; then
+ _dpkg_release=$(echo "${_dpkg_parsechangelog}" \
+ | $AWK '$[]1 == "Version:" { print $[]2; }' \
+ | cut -d- -f2-)
+ if test -n "${_dpkg_release}"; then
+ ZFS_META_RELEASE=${_dpkg_release}
+ _zfs_ac_meta_type="dpkg-parsechangelog"
+ fi
+ elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
_alias=$(git describe --match=${_match} 2>/dev/null)
_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
Index: zfs-linux-0.6.5.3/lib/libzfs/Makefile.am
===================================================================
--- zfs-linux-0.6.5.3.orig/lib/libzfs/Makefile.am 2015-10-27 14:34:47.344602154 -0600
+++ zfs-linux-0.6.5.3/lib/libzfs/Makefile.am 2015-10-27 14:35:15.236602845 -0600
@@ -32,6 +32,7 @@
libzfs_la_LIBADD = \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
+ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libshare/libshare.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libzpool/libzpool.la
Index: zfs-linux-0.6.5.3/lib/libzfs_core/Makefile.am
===================================================================
--- zfs-linux-0.6.5.3.orig/lib/libzfs_core/Makefile.am 2015-10-27 14:34:47.344602154 -0600
+++ zfs-linux-0.6.5.3/lib/libzfs_core/Makefile.am 2015-10-27 14:35:15.236602845 -0600
@@ -16,7 +16,8 @@
$(KERNEL_C)
libzfs_core_la_LIBADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la
+ $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libuutil/libuutil.la
libzfs_core_la_LDFLAGS = -version-info 1:0:0
Description: Enable zed emails
The OpenZFS event daemon monitors pools. This patch enables the email
sending function by default (if zed is installed). This is consistent with
the default behavior of mdadm.
Author: Richard Laager <rlaager@wiktel.com>
Forwarded: no
Index: zfs-linux-0.6.5.3/cmd/zed/zed.d/zed.rc
===================================================================
--- zfs-linux-0.6.5.3.orig/cmd/zed/zed.d/zed.rc 2015-10-27 15:22:37.000000000 -0500
+++ zfs-linux-0.6.5.3/cmd/zed/zed.d/zed.rc 2016-01-31 23:13:49.826489152 -0600
@@ -15,7 +15,7 @@
# Email will only be sent if ZED_EMAIL_ADDR is defined.
# Disabled by default; uncomment to enable.
#
-#ZED_EMAIL_ADDR="root"
+ZED_EMAIL_ADDR="root"
##
# Name or path of executable responsible for sending notifications via email;
@@ -41,7 +41,7 @@
##
# Minimum number of seconds between notifications for a similar event.
#
-#ZED_NOTIFY_INTERVAL_SECS=3600
+ZED_NOTIFY_INTERVAL_SECS=3600
##
# Notification verbosity.
0001-Prevent-manual-builds-in-the-DKMS-source.patch
0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
1000-ppc64el-endian-support.patch
1002-fix-mips-build.patch
enable-zed.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment