Browse code

Modified log directory structure (PR 1963047)

Change-Id: Ie383e7d0c3678b73dbc8577b4a797a0630e5fd11
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4579
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

dthaluru authored on 2018/01/03 03:19:59
Showing 10 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Name:           WALinuxAgent
2 2
 Summary:        The Windows Azure Linux Agent
3 3
 Version:        2.2.14
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        Apache License Version 2.0
6 6
 Group:          System/Daemons
7 7
 Url:            https://github.com/Azure/WALinuxAgent
... ...
@@ -51,7 +51,10 @@ python2 setup.py build -b py2
51 51
 python2 -tt setup.py build -b py2 install --prefix=%{_prefix} --lnx-distro='photonos' --root=%{buildroot} --force
52 52
 mkdir -p  %{buildroot}/%{_localstatedir}/log
53 53
 mkdir -p -m 0700 %{buildroot}/%{_sharedstatedir}/waagent
54
-touch %{buildroot}/%{_localstatedir}/log/waagent.log
54
+mkdir -p %{buildroot}/%{_localstatedir}/opt/waagent/log
55
+mkdir -p %{buildroot}/%{_localstatedir}/log/
56
+touch %{buildroot}/%{_localstatedir}/opt/waagent/log/waagent.log
57
+ln -sfv /opt/waagent/log/waagent.log %{buildroot}%{_localstatedir}/log/waagent.log
55 58
 
56 59
 %check
57 60
 python2 setup.py check && python2 setup.py test
... ...
@@ -73,11 +76,15 @@ python2 setup.py check && python2 setup.py test
73 73
 %attr(0755,root,root) %{_bindir}/waagent
74 74
 %attr(0755,root,root) %{_bindir}/waagent2.0
75 75
 %config %{_sysconfdir}/waagent.conf
76
-%ghost %{_localstatedir}/log/waagent.log
76
+%dir %{_localstatedir}/opt/waagent/log
77
+%{_localstatedir}/log/waagent.log
78
+%ghost %{_localstatedir}/opt/waagent/log/waagent.log
77 79
 %dir %attr(0700, root, root) %{_sharedstatedir}/waagent
78 80
 /usr/lib/python2.7/site-packages/*
79 81
 
80 82
 %changelog
83
+* Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  2.2.14-3
84
+- Fixed the log file directory structure
81 85
 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.14-2
82 86
 - Requires /bin/grep, /bin/sed and util-linux or toybox
83 87
 * Thu Jul 13 2017 Anish Swaminathan <anishs@vmware.com> 2.2.14-1
... ...
@@ -91,7 +98,7 @@ python2 setup.py check && python2 setup.py test
91 91
 * Thu Apr 28 2016 Anish Swaminathan <anishs@vmware.com> 2.0.18-1
92 92
 - Update to 2.0.18
93 93
 * Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 2.0.14-3
94
-- Removed redundant requires 
94
+- Removed redundant requires
95 95
 * Thu Aug 6 2015 Anish Swaminathan <anishs@vmware.com>
96 96
 - Added sha1sum
97 97
 * Fri Mar 13 2015 - mbassiouny@vmware.com
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        Kernel Audit Tool
5 5
 Name:           audit
6 6
 Version:        2.7.5
7
-Release:        3%{?dist}
7
+Release:        4%{?dist}
8 8
 Source0:        http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
9 9
 %define sha1    audit=7aaae7ea80f2280b25f243916e8d18b7338b5f53
10 10
 License:        GPLv2+
... ...
@@ -88,8 +88,10 @@ make %{?_smp_mflags}
88 88
 
89 89
 %install
90 90
 mkdir -p %{buildroot}/{etc/audispd/plugins.d,etc/audit/rules.d}
91
-mkdir -p %{buildroot}/%{_var}/log/audit
91
+mkdir -p %{buildroot}/%{_var}/opt/audit/log
92
+mkdir -p %{buildroot}/%{_var}/log
92 93
 mkdir -p %{buildroot}/%{_var}/spool/audit
94
+ln -sfv %{_var}/opt/audit/log %{buildroot}/%{_var}/log/audit
93 95
 make install DESTDIR=%{buildroot}
94 96
 
95 97
 install -vdm755 %{buildroot}%{_libdir}/systemd/system-preset
... ...
@@ -109,7 +111,7 @@ make %{?_smp_mflags} check
109 109
 %preun
110 110
 %systemd_preun auditd.service
111 111
 
112
-%files 
112
+%files
113 113
 %defattr(-,root,root)
114 114
 %{_bindir}/*
115 115
 %{_sbindir}/*
... ...
@@ -120,6 +122,7 @@ make %{?_smp_mflags} check
120 120
 %{_mandir}/man5/*
121 121
 %{_mandir}/man7/*
122 122
 %{_mandir}/man8/*
123
+%dir %{_var}/opt/audit/log
123 124
 %{_var}/log/audit
124 125
 %{_var}/spool/audit
125 126
 %attr(750,root,root) %dir %{_sysconfdir}/audit
... ...
@@ -158,6 +161,8 @@ make %{?_smp_mflags} check
158 158
 %{python3_sitelib}/*
159 159
 
160 160
 %changelog
161
+*   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  2.7.5-4
162
+-   Fixed the log file directory structure
161 163
 *   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  2.7.5-3
162 164
 -   Disabled audit service by default
163 165
 *   Thu May 18 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.5-2
... ...
@@ -13,7 +13,7 @@
13 13
 #################################################################################
14 14
 Name:       ceph
15 15
 Version:    11.2.0
16
-Release:    10%{?dist}
16
+Release:    11%{?dist}
17 17
 Epoch:      1
18 18
 Summary:    User space components of the Ceph file system
19 19
 License:    LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
... ...
@@ -506,7 +506,8 @@ install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-o
506 506
 #set up placeholder directories
507 507
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
508 508
 mkdir -p %{buildroot}%{_localstatedir}/run/ceph
509
-mkdir -p %{buildroot}%{_localstatedir}/log/ceph
509
+mkdir -p %{buildroot}%{_localstatedir}/opt/ceph/log
510
+mkdir -p %{buildroot}%{_localstatedir}/log
510 511
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/tmp
511 512
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon
512 513
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd
... ...
@@ -516,6 +517,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw
516 516
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
517 517
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
518 518
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
519
+ln -sfv %{_localstatedir}/opt/ceph/log  %{buildroot}%{_localstatedir}/log/ceph
519 520
 
520 521
 %clean
521 522
 rm -rf %{buildroot}
... ...
@@ -613,7 +615,8 @@ rm -rf %{buildroot}
613 613
 %{python_sitelib}/ceph_daemon.py*
614 614
 %dir %{_udevrulesdir}
615 615
 %{_udevrulesdir}/50-rbd.rules
616
-%attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
616
+%attr(3770,ceph,ceph) %dir %{_localstatedir}/opt/ceph/log
617
+%attr(3770,ceph,ceph) %{_localstatedir}/log/ceph
617 618
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/
618 619
 
619 620
 %pre common
... ...
@@ -997,6 +1000,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
997 997
 # actually build this meta package.
998 998
 
999 999
 %changelog
1000
+*   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  11.2.0-11
1001
+-   Fixed the log file directory structure
1000 1002
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 11.2.0-10
1001 1003
 -   Requires /bin/grep, /usr/bin/which, or toybox
1002 1004
 *   Tue Aug 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 11.2.0-9
... ...
@@ -5,7 +5,7 @@
5 5
 
6 6
 Name:           dracut
7 7
 Version:        045
8
-Release:        5%{?dist}
8
+Release:        6%{?dist}
9 9
 Group:          System Environment/Base
10 10
 # The entire source code is GPLv2+
11 11
 # except install/* which is LGPLv2+
... ...
@@ -89,7 +89,9 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
89 89
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
90 90
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
91 91
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
92
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
92
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/opt/dracut/log
93
+touch $RPM_BUILD_ROOT%{_localstatedir}/opt/dracut/log/dracut.log
94
+ln -sfv %{_localstatedir}/opt/dracut/log/dracut.log $RPM_BUILD_ROOT%{_localstatedir}/log/
93 95
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
94 96
 
95 97
 rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse*
... ...
@@ -136,8 +138,9 @@ rm -rf -- $RPM_BUILD_ROOT
136 136
 %config(noreplace) %{_sysconfdir}/dracut.conf
137 137
 %dir %{_sysconfdir}/dracut.conf.d
138 138
 %dir %{dracutlibdir}/dracut.conf.d
139
-
140
-%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
139
+%dir %{_localstatedir}/opt/dracut/log
140
+%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/opt/dracut/log/dracut.log
141
+%{_localstatedir}/log/dracut.log
141 142
 %dir %{_sharedstatedir}/initramfs
142 143
 %{_unitdir}/dracut-shutdown.service
143 144
 %{_unitdir}/sysinit.target.wants/dracut-shutdown.service
... ...
@@ -165,6 +168,8 @@ rm -rf -- $RPM_BUILD_ROOT
165 165
 %dir /var/lib/dracut/overlay
166 166
 
167 167
 %changelog
168
+*   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  045-6
169
+-   Fixed the log file directory structure
168 170
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 045-5
169 171
 -   Requires coreutils/util-linux/findutils or toybox,
170 172
     /bin/grep, /bin/sed
... ...
@@ -188,4 +193,3 @@ rm -rf -- $RPM_BUILD_ROOT
188 188
 -   Fix incorrect systemd directory.
189 189
 *   Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 044-1
190 190
 -   Updating Version.
191
-
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        High-performance HTTP server and reverse proxy
2 2
 Name:           nginx
3 3
 Version:        1.13.5
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        BSD-2-Clause
6 6
 URL:            http://nginx.org/download/nginx-%{version}.tar.gz
7 7
 Group:          Applications/System
... ...
@@ -13,7 +13,7 @@ Source1:        nginx.service
13 13
 BuildRequires:  openssl-devel
14 14
 BuildRequires:  pcre-devel
15 15
 %description
16
-NGINX is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server. 
16
+NGINX is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server.
17 17
 
18 18
 %prep
19 19
 %setup -q
... ...
@@ -36,7 +36,9 @@ make %{?_smp_mflags}
36 36
 %install
37 37
 make DESTDIR=%{buildroot} install
38 38
 install -vdm755 %{buildroot}/usr/lib/systemd/system
39
-install -vdm755 %{buildroot}%{_var}/log/nginx
39
+install -vdm755 %{buildroot}%{_var}/log
40
+install -vdm755 %{buildroot}%{_var}/opt/nginx/log
41
+ln -sfv %{_var}/opt/nginx/log %{buildroot}%{_var}/log/nginx
40 42
 install -p -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/nginx.service
41 43
 
42 44
 %files
... ...
@@ -44,9 +46,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/nginx.service
44 44
 %{_sysconfdir}/*
45 45
 %{_sbindir}/*
46 46
 %{_libdir}/systemd/system/nginx.service
47
-%dir %{_var}/log/nginx
47
+%dir %{_var}/opt/nginx/log
48
+%{_var}/log/nginx
48 49
 
49 50
 %changelog
51
+*   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  1.13.5-2
52
+-   Fixed the log file directory structure
50 53
 *   Wed Oct 04 2017 Xiaolin Li <xiaolinl@vmware.com> 1.13.5-1
51 54
 -   Update to version 1.13.5
52 55
 *   Mon May 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.11.13-2
... ...
@@ -9,7 +9,7 @@
9 9
 Summary:	Photon Management Daemon
10 10
 Name:		pmd
11 11
 Version:	0.0.5
12
-Release:	4%{?dist}
12
+Release:	5%{?dist}
13 13
 Vendor:		VMware, Inc.
14 14
 Distribution:	Photon
15 15
 License:	Apache 2.0
... ...
@@ -120,7 +120,9 @@ rm -f %{buildroot}%{python_sitearch}/pmd.so
120 120
 python3 setup.py install --skip-build --root %{buildroot}
121 121
 popd
122 122
 
123
-install -d $RPM_BUILD_ROOT/var/log/pmd
123
+install -d $RPM_BUILD_ROOT/var/log
124
+install -d $RPM_BUILD_ROOT/var/opt/pmd/log
125
+ln -sfv /var/opt/pmd/log $RPM_BUILD_ROOT/var/log/pmd
124 126
 install -vdm755 %{buildroot}%{_unitdir}
125 127
 install -D -m 444 pmd.service %{buildroot}%{_unitdir}
126 128
 install -D -m 444 pmdprivsepd.service %{buildroot}%{_unitdir}
... ...
@@ -285,7 +287,8 @@ rm -rf %{buildroot}/*
285 285
     /etc/pmd/api_sddl.conf
286 286
     /etc/pmd/restapispec.json
287 287
     /etc/pmd/restconfig.txt
288
-    %attr(0766, %{name}, %{name}) %dir /var/log/%{name}
288
+    %attr(0766, %{name}, %{name}) %dir /var/opt/%{name}/log
289
+    %attr(0766, %{name}, %{name}) /var/log/%{name}
289 290
     %_tmpfilesdir/%{name}.conf
290 291
 
291 292
 %files libs
... ...
@@ -307,6 +310,8 @@ rm -rf %{buildroot}/*
307 307
     %{_python3_sitearch}/%{name}_python-*.egg-info
308 308
 
309 309
 %changelog
310
+*       Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  0.0.5-5
311
+-       Fixed the log file directory structure
310 312
 *       Thu Nov 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-4
311 313
 -       update to use c-rest-engine-1.11
312 314
 *       Tue Oct 24 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-3
... ...
@@ -1,7 +1,7 @@
1 1
 Name:          rabbitmq-server
2 2
 Summary:       RabbitMQ messaging server
3 3
 Version:       3.6.10
4
-Release:       2%{?dist}
4
+Release:       3%{?dist}
5 5
 Group:         Applications
6 6
 Vendor:        VMware, Inc.
7 7
 Distribution:  Photon
... ...
@@ -38,7 +38,9 @@ make install DESTDIR=$RPM_BUILD_ROOT \
38 38
 install -vdm755 %{buildroot}/var/lib/rabbitmq/
39 39
 install -vdm755 %{buildroot}/%{_sysconfdir}/rabbitmq/
40 40
 install -vdm755 %{buildroot}/usr/lib/systemd/system/
41
-mkdir -p %{buildroot}/var/log/rabbitmq
41
+mkdir -p %{buildroot}/var/log
42
+mkdir -p %{buildroot}/var/opt/rabbitmq/log
43
+ln -sfv /var/opt/rabbitmq/log %{buildroot}/var/log/rabbitmq
42 44
 
43 45
 cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/rabbitmq/
44 46
 mkdir -p %{buildroot}/usr/lib/systemd/system
... ...
@@ -89,12 +91,15 @@ rm -rf $RPM_BUILD_ROOT
89 89
 
90 90
 %files
91 91
 %defattr(-,root,root)
92
-%dir %attr(0750, rabbitmq, rabbitmq) /var/log/rabbitmq
92
+%dir %attr(0750, rabbitmq, rabbitmq) /var/opt/rabbitmq/log
93
+%attr(0750, rabbitmq, rabbitmq) /var/log/rabbitmq
93 94
 %{_libdir}/*
94 95
 %{_sysconfdir}/*
95 96
 /var/lib/*
96 97
 
97 98
 %changelog
99
+* Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  3.6.10-3
100
+- Fixed the log file directory structure
98 101
 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.6.10-2
99 102
 - Remove shadow from requires and use explicit tools for post actions
100 103
 * Wed May 31 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.6.10-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	advanced key-value store
2 2
 Name:		redis
3 3
 Version:	3.2.8
4
-Release:	4%{?dist}
4
+Release:	5%{?dist}
5 5
 License:	BSD
6 6
 URL:		http://redis.io/
7 7
 Group:		Applications/Databases
... ...
@@ -15,7 +15,7 @@ BuildRequires:  systemd
15 15
 BuildRequires:  make
16 16
 Requires:	systemd
17 17
 Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
18
-	
18
+
19 19
 %description
20 20
 Redis is an in-memory data structure store, used as database, cache and message broker.
21 21
 
... ...
@@ -31,7 +31,9 @@ install -vdm 755 %{buildroot}
31 31
 make PREFIX=%{buildroot}/usr install
32 32
 install -D -m 0640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
33 33
 mkdir -p %{buildroot}/var/lib/redis
34
-mkdir -p %{buildroot}/var/log/redis
34
+mkdir -p %{buildroot}/var/log
35
+mkdir -p %{buildroot}/var/opt/%{name}/log
36
+ln -sfv /var/opt/%{name}/log %{buildroot}/var/log/%{name}
35 37
 mkdir -p %{buildroot}/usr/lib/systemd/system
36 38
 cat << EOF >>  %{buildroot}/usr/lib/systemd/system/redis.service
37 39
 [Unit]
... ...
@@ -72,12 +74,15 @@ exit 0
72 72
 %files
73 73
 %defattr(-,root,root)
74 74
 %dir %attr(0750, redis, redis) /var/lib/redis
75
-%dir %attr(0750, redis, redis) /var/log/redis
75
+%dir %attr(0750, redis, redis) /var/opt/%{name}/log
76
+%attr(0750, redis, redis) %{_var}/log/%{name}
76 77
 %{_bindir}/*
77 78
 %{_libdir}/systemd/*
78 79
 %config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/redis.conf
79 80
 
80 81
 %changelog
82
+* Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  3.2.8-5
83
+- Fixed the log file directory structure
81 84
 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.8-4
82 85
 - Remove shadow from requires and use explicit tools for post actions
83 86
 * Wed May 31 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.8-3
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:          Systemd-236
2 2
 Name:             systemd
3 3
 Version:          236
4
-Release:          1%{?dist}
4
+Release:          2%{?dist}
5 5
 License:          LGPLv2+ and GPLv2+ and MIT
6 6
 URL:              http://www.freedesktop.org/wiki/Software/systemd/
7 7
 Group:            System Environment/Security
... ...
@@ -121,7 +121,9 @@ sed -i "s:0775 root lock:0755 root root:g" %{buildroot}/usr/lib/tmpfiles.d/legac
121 121
 sed -i "s:NamePolicy=kernel database onboard slot path:NamePolicy=kernel database:g" %{buildroot}/lib/systemd/network/99-default.link
122 122
 sed -i "s:#LLMNR=yes:LLMNR=false:g" %{buildroot}/etc/systemd/resolved.conf
123 123
 rm -f %{buildroot}%{_var}/log/README
124
-mkdir -p %{buildroot}%{_localstatedir}/log/journal
124
+mkdir -p %{buildroot}%{_localstatedir}/opt/journal/log
125
+mkdir -p %{buildroot}%{_localstatedir}/log
126
+ln -sfv %{_localstatedir}/opt/journal/log %{buildroot}%{_localstatedir}/log/journal
125 127
 
126 128
 find %{buildroot} -name '*.la' -delete
127 129
 install -Dm 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d
... ...
@@ -211,7 +213,8 @@ rm -rf %{buildroot}/*
211 211
 %{_datadir}/polkit-1
212 212
 %{_datadir}/systemd
213 213
 %{_datadir}/zsh/*
214
-%dir %{_localstatedir}/log/journal
214
+%dir %{_localstatedir}/opt/journal/log
215
+%{_localstatedir}/log/journal
215 216
 
216 217
 %files devel
217 218
 %dir %{_includedir}/systemd
... ...
@@ -228,6 +231,8 @@ rm -rf %{buildroot}/*
228 228
 %files lang -f %{name}.lang
229 229
 
230 230
 %changelog
231
+*    Wed Jan 17 2018 Divya Thaluru <dthaluru@vmware.com>  236-2
232
+-    Fixed the log file directory structure
231 233
 *    Fri Dec 29 2017 Anish Swaminathan <anishs@vmware.com>  236-1
232 234
 -    Update systemd to 236
233 235
 *    Thu Nov 09 2017 Vinay Kulkarni <kulkarniv@vmware.com>  233-11
... ...
@@ -337,13 +342,13 @@ rm -rf %{buildroot}/*
337 337
 *    Tue Aug 25 2015 Alexey Makhalov <amakhalov@vmware.com> 216-9
338 338
 -    Reduce systemd-networkd boot time (exclude if-rename patch).
339 339
 *    Mon Jul 20 2015 Divya Thaluru <dthaluru@vmware.com> 216-8
340
--    Adding sysvinit support 
340
+-    Adding sysvinit support
341 341
 *    Mon Jul 06 2015 Kumar Kaushik <kaushikk@vmware.com> 216-7
342 342
 -    Fixing networkd/udev race condition for renaming interface.
343 343
 *    Thu Jun 25 2015 Sharath George <sharathg@vmware.com> 216-6
344 344
 -    Remove debug files.
345 345
 *    Tue Jun 23 2015 Divya Thaluru <dthaluru@vmware.com> 216-5
346
--    Building compat libs 
346
+-    Building compat libs
347 347
 *    Mon Jun 1 2015 Alexey Makhalov <amakhalov@vmware.com> 216-4
348 348
 -    gudev support
349 349
 *    Wed May 27 2015 Divya Thaluru <dthaluru@vmware.com> 216-3
... ...
@@ -8,7 +8,7 @@
8 8
 
9 9
 Name:          systemtap
10 10
 Version:       3.1
11
-Release:       4%{?dist}
11
+Release:       5%{?dist}
12 12
 Summary:       Programmable system-wide instrumentation system
13 13
 Group:         Development/System
14 14
 Vendor:	       VMware, Inc.
... ...
@@ -31,7 +31,7 @@ BuildRequires: libxml2-devel
31 31
 BuildRequires: perl
32 32
 BuildRequires: python-setuptools
33 33
 BuildRequires: nss
34
-%if %with_boost 
34
+%if %with_boost
35 35
 BuildRequires: boost-devel
36 36
 %endif
37 37
 %if %with_crash
... ...
@@ -176,8 +176,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/stap-server
176 176
 mkdir -p %{buildroot}%{_sysconfdir}/stap-server/conf.d
177 177
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
178 178
 install -m 644 initscript/config.stap-server %{buildroot}%{_sysconfdir}/sysconfig/stap-server
179
-mkdir -p %{buildroot}%{_localstatedir}/log/stap-server
180
-touch %{buildroot}%{_localstatedir}/log/stap-server/log
179
+mkdir -p %{buildroot}%{_localstatedir}/log
180
+mkdir -p %{buildroot}%{_localstatedir}/opt/stap-server/log
181
+ln -sfv %{_localstatedir}/opt/stap-server/log %{buildroot}%{_localstatedir}/log/stap-server
182
+touch %{buildroot}%{_localstatedir}/opt/stap-server/log/log
181 183
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
182 184
 install -m 644 initscript/logrotate.stap-server %{buildroot}%{_sysconfdir}/logrotate.d/stap-server
183 185
 
... ...
@@ -341,13 +343,16 @@ fi
341 341
 %dir %{_sysconfdir}/stap-server
342 342
 %dir %{_sysconfdir}/stap-server/conf.d
343 343
 %config(noreplace) %{_sysconfdir}/sysconfig/stap-server
344
-%dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server
345
-%ghost %config %attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log
344
+%dir %attr(0755,stap-server,stap-server) %{_localstatedir}/opt/stap-server/log
345
+%attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server
346
+%ghost %config %attr(0644,stap-server,stap-server) %{_localstatedir}/opt/stap-server/log/log
346 347
 %{_mandir}/man7/error::*.7stap*
347 348
 %{_mandir}/man7/warning::debuginfo.7stap*
348 349
 %{_mandir}/man8/stap-server.8*
349 350
 
350 351
 %changelog
352
+*   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  3.1-5
353
+-   Fixed the log file directory structure
351 354
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1-4
352 355
 -   Remove shadow from requires and use explicit tools for post actions
353 356
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1-3
... ...
@@ -362,18 +367,18 @@ fi
362 362
 -   Use sqlite-{devel,libs}
363 363
 *   Tue Oct 04 2016 ChangLee <changlee@vmware.com> 3.0-2
364 364
 -   Modified %check
365
-*   Fri Jul 22 2016 Divya Thaluru <dthaluru@vmware.com> 3.0-1 
365
+*   Fri Jul 22 2016 Divya Thaluru <dthaluru@vmware.com> 3.0-1
366 366
 -   Updated version to 3.0
367 367
 -   Removing patch to enable kernel (fix is present in upstream)
368 368
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-5
369 369
 -   GA - Bump release of all rpms
370 370
 *   Mon May 23 2016 Harish Udaiya KUmar <hudaiyakumar@vmware.com> 2.9-4
371 371
 -   Added the patch to enable kernel building with Kernel 4.4
372
-*   Fri May 20 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-3 
372
+*   Fri May 20 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-3
373 373
 -   Fixed the stap-prep script to be compatible with Photon
374 374
 *   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-2
375 375
 -   Fix for upgrade issues
376
-*   Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-1 
376
+*   Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-1
377 377
 -   Updated version to 2.9
378 378
 *   Fri Dec 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7-2
379 379
 -   Move dtrace to the main package.