rebase to the latest git snapshot next-20140219

- KVP, VSS: removed inclusion of linux/types.h
- VSS: Ignore VFAT mounts during freeze operation

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2014-02-19 09:26:29 +01:00
parent ab595aaab4
commit 065701e961
3 changed files with 15 additions and 19 deletions

View File

@ -3,38 +3,38 @@
# HyperV VSS daemon binary name # HyperV VSS daemon binary name
%global hv_vss_daemon hypervvssd %global hv_vss_daemon hypervvssd
# snapshot version # snapshot version
%global snapver .20131022git %global snapver .20140219git
# use hardened build # use hardened build
%global _hardened_build 1 %global _hardened_build 1
Name: hyperv-daemons Name: hyperv-daemons
Version: 0 Version: 0
Release: 0.4%{?snapver}%{?dist} Release: 0.5%{?snapver}%{?dist}
Summary: HyperV daemons suite Summary: HyperV daemons suite
Group: System Environment/Daemons Group: System Environment/Daemons
License: GPLv2 License: GPLv2
URL: http://www.kernel.org URL: http://www.kernel.org
# Source files obtained from kernel upstream 2013-10-22. # Source files obtained from kernel upstream 2014-02-19.
# git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git # git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
# The daemon and scripts are located in "master branch - /tools/hv" # The daemon and scripts are located in "master branch - /tools/hv"
# COPYING -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/COPYING?id=refs/tags/next-20130822 # COPYING -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/COPYING?id=refs/tags/next-20130822
Source0: COPYING Source0: COPYING
# HYPERV KVP DAEMON # HYPERV KVP DAEMON
# hv_kvp_daemon.c -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_kvp_daemon.c?id=refs/tags/next-20130927 # hv_kvp_daemon.c -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_kvp_daemon.c?id=refs/tags/next-20140219
Source1: hv_kvp_daemon.c Source1: hv_kvp_daemon.c
# hv_get_dhcp_info.sh -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_get_dhcp_info.sh?id=refs/tags/next-20130927 # hv_get_dhcp_info.sh -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_get_dhcp_info.sh?id=refs/tags/next-20140219
Source2: hv_get_dhcp_info.sh Source2: hv_get_dhcp_info.sh
# hv_get_dns_info.sh -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_get_dns_info.sh?id=refs/tags/next-20130927 # hv_get_dns_info.sh -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_get_dns_info.sh?id=refs/tags/next-20140219
Source3: hv_get_dns_info.sh Source3: hv_get_dns_info.sh
# hv_set_ifconfig.sh -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_set_ifconfig.sh?id=refs/tags/next-20130927 # hv_set_ifconfig.sh -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_set_ifconfig.sh?id=refs/tags/next-20140219
Source4: hv_set_ifconfig.sh Source4: hv_set_ifconfig.sh
Source5: hypervkvpd.service Source5: hypervkvpd.service
# HYPERV VSS DAEMON # HYPERV VSS DAEMON
# hv_vss_daemon.c -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_vss_daemon.c?id=refs/tags/next-20130927 # hv_vss_daemon.c -> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/tools/hv/hv_vss_daemon.c?id=refs/tags/next-20140219
Source100: hv_vss_daemon.c Source100: hv_vss_daemon.c
Source101: hypervvssd.service Source101: hypervvssd.service
@ -227,6 +227,11 @@ fi
%doc COPYING %doc COPYING
%changelog %changelog
* Wed Feb 19 2014 Tomas Hozza <thozza@redhat.com> - 0-0.5.20140219git
- rebase to the latest git snapshot next-20140219
- KVP, VSS: removed inclusion of linux/types.h
- VSS: Ignore VFAT mounts during freeze operation
* Fri Jan 10 2014 Tomas Hozza <thozza@redhat.com> - 0-0.4.20131022git * Fri Jan 10 2014 Tomas Hozza <thozza@redhat.com> - 0-0.4.20131022git
- provide 'hyperv-daemons' package for convenient installation of all daemons - provide 'hyperv-daemons' package for convenient installation of all daemons

View File

@ -1,15 +1,6 @@
diff -up hypervkvpd-0/hv_kvp_daemon.c.include hypervkvpd-0/hv_kvp_daemon.c diff -up hypervkvpd-0/hv_kvp_daemon.c.include hypervkvpd-0/hv_kvp_daemon.c
--- hypervkvpd-0/hv_kvp_daemon.c.include 2013-03-20 14:47:30.812899613 +0100 --- hypervkvpd-0/hv_kvp_daemon.c.include 2013-03-20 14:47:30.812899613 +0100
+++ hypervkvpd-0/hv_kvp_daemon.c 2013-03-20 14:47:42.337896971 +0100 +++ hypervkvpd-0/hv_kvp_daemon.c 2013-03-20 14:47:42.337896971 +0100
@@ -26,7 +26,7 @@
#include <sys/socket.h>
#include <sys/poll.h>
#include <sys/utsname.h>
-#include <linux/types.h>
+/* #include <linux/types.h> */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include <errno.h> #include <errno.h>
#include <arpa/inet.h> #include <arpa/inet.h>

View File

@ -1,6 +1,6 @@
5a1b4a81be9d5bbbf8869976408354e8 hv_get_dhcp_info.sh 5a1b4a81be9d5bbbf8869976408354e8 hv_get_dhcp_info.sh
dbb5cc7ec83ccc7b1c39458a7521c9b4 hv_get_dns_info.sh dbb5cc7ec83ccc7b1c39458a7521c9b4 hv_get_dns_info.sh
e04660a9ca3b04e844ce3d4f6c56ee1c hv_kvp_daemon.c 28b370a30d044ebe78fdbcd6d6051f5d hv_kvp_daemon.c
da7f77aa7507e950851cbb53673ce5d4 hv_set_ifconfig.sh da7f77aa7507e950851cbb53673ce5d4 hv_set_ifconfig.sh
cdc00e984ac8f3fcd1bca4fd31ce8d21 hv_vss_daemon.c 18e75bce02aea146307877ebc4e5b45f hv_vss_daemon.c
d7810fab7487fb0aad327b76f1be7cd7 COPYING d7810fab7487fb0aad327b76f1be7cd7 COPYING