1. photon
  2. Commit 9c4dd4921432f973acf799e37411ae529805e22a
Browse code

Enabled debug filesystem, removed packaging of debug files and added devel packages

Change-Id: I8beb35489f76e32a0610f89a1dfd168790383ac7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1230
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>

dthaluru authored on 2016/07/29 03:09:29
Showing 11 changed files
SPECS/falco/falco.spec
History View file @ 9c4dd49
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:	The Behavioral Activity Monitor With Container Support
3 3 
 Name:		falco
4 4 
 Version:	0.2.0
5 
-Release:	1%{?dist}
5 
+Release:	2%{?dist}
6 6 
 License:	GPLv2
7 7 
 URL:		http://www.sysdig.org/falco/
8 8 
 Group:		Applications/System
... ... 
@@ -59,12 +59,13 @@ rm -rf %{buildroot}/*
59 59 
 %files
60 60 
 %defattr(-,root,root)
61 61 
 #/etc/bash_completion.d/*
62 
-%{_libdir}
63 
-%{_bindir}
64 
-%{_usrsrc}
62 
+%{_bindir}/*
63 
+%{_usrsrc}/*
65 64 
 /etc/*
66 
-%{_datadir}
65 
+%{_datadir}/*
67 66
68 67 
 %changelog
68 
+*	Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 0.2.0-2
69 
+-	Removed packaging of debug files
69 70 
 *	Tue Jun 28 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.2.0-1
70 71 
 -	Initial build.	First version
SPECS/filesystem/filesystem.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Default file system
2 2 
 Name:		filesystem
3 3 
 Version:	1.0
4 
-Release:	8%{?dist}
4 
+Release:	9%{?dist}
5 5 
 License:	GPLv3
6 6 
 Group:		System Environment/Base
7 7 
 Vendor:		VMware, Inc.
... ... 
@@ -31,17 +31,25 @@ install -vdm 755 %{buildroot}/usr/{,local/}share/{misc,terminfo,zoneinfo}
31 31 
 install -vdm 755 %{buildroot}/usr/libexec
32 32 
 install -vdm 755 %{buildroot}/usr/{,local/}share/man/man{1..8}
33 33 
 install -vdm 755 %{buildroot}/etc/profile.d
34 
+install -vdm 755 %{buildroot}/usr/lib/debug/{lib,bin,sbin,usr}
34 35
35 36 
 ln -svfn usr/lib %{buildroot}/lib
36 37 
 ln -svfn usr/bin %{buildroot}/bin
37 38 
 ln -svfn usr/sbin %{buildroot}/sbin
38 39 
 ln -svfn run/media %{buildroot}/media
39 40
41 
+ln -svfn ../bin %{buildroot}/usr/lib/debug/usr/bin
42 
+ln -svfn ../sbin %{buildroot}/usr/lib/debug/usr/sbin
43 
+ln -svfn ../lib %{buildroot}/usr/lib/debug/usr/lib
44 
+
40 45 
 #	Symlinks for AMD64
41 46 
 %ifarch x86_64
42 47 
 	ln -svfn usr/lib %{buildroot}/lib64
43 48 
 	ln -svfn lib %{buildroot}/usr/lib64
44 49 
 	ln -svfn ../lib %{buildroot}/usr/local/lib64
50 
+        ln -svfn lib %{buildroot}/usr/lib/debug/lib64
51 
+        ln -svfn ../lib %{buildroot}/usr/lib/debug/usr/lib64
52 
+
45 53 
 %endif
46 54 
 install -vdm 755 %{buildroot}/var/{log,mail,spool,mnt,srv}
47 55
... ... 
@@ -464,6 +472,13 @@ EOF
464 464 
 %dir /usr/bin
465 465 
 %dir /usr/include
466 466 
 %dir /usr/lib
467 
+%dir /usr/lib/debug
468 
+%dir /usr/lib/debug/bin
469 
+%dir /usr/lib/debug/lib
470 
+%dir /usr/lib/debug/sbin
471 
+/usr/lib/debug/usr/bin
472 
+/usr/lib/debug/usr/lib
473 
+/usr/lib/debug/usr/sbin
467 474 
 %dir /usr/libexec
468 475 
 %dir /usr/local
469 476 
 %dir /usr/local/bin
... ... 
@@ -533,8 +548,12 @@ EOF
533 533 
 /lib64
534 534 
 /usr/lib64
535 535 
 /usr/local/lib64
536 
+/usr/lib/debug/lib64
537 
+/usr/lib/debug/usr/lib64
536 538 
 %endif
537 539 
 %changelog
540 
+*   Tue Jul 12 2016 Divya Thaluru <dthaluru@vmware.com> 1.0-9
541 
+-   Added filesystem for debug libraries and binaries
538 542 
 *   Fri Jul 8 2016 Divya Thaluru <dthaluru@vmware.com> 1.0-8
539 543 
 -   Removing multiple entries of localhost in /etc/hosts file
540 544 
 *   Fri May 27 2016 Divya Thaluru <dthaluru@vmware.com> 1.0-7
SPECS/httpd/httpd.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    The Apache HTTP Server
2 2 
 Name:       httpd
3 3 
 Version:    2.4.18
4 
-Release:    5%{?dist}
4 
+Release:    6%{?dist}
5 5 
 License:    Apache License 2.0
6 6 
 URL:        http://httpd.apache.org/
7 7 
 Group:      Applications/System
... ... 
@@ -145,7 +145,7 @@ fi
145 145
146 146 
 %files
147 147 
 %defattr(-,root,root)
148 
-%{_libdir}/*
148 
+%{_libdir}/httpd/*
149 149 
 %{_bindir}/*
150 150 
 %exclude %{_bindir}/apxs
151 151 
 %exclude %{_bindir}/dbmmanage
... ... 
@@ -159,6 +159,7 @@ fi
159 159 
 %{_sysconfdir}/httpd/icons/*
160 160 
 %{_sysconfdir}/httpd/httpd.conf
161 161 
 %dir %{_sysconfdir}/httpd/logs
162 
+%{_libdir}/systemd/system/httpd.service
162 163
163 164 
 %files tools
164 165 
 %defattr(-,root,root)
... ... 
@@ -166,6 +167,8 @@ fi
166 166 
 %{_bindir}/dbmmanage
167 167
168 168 
 %changelog
169 
+*   Thu Jul 28 2016 Divya Thaluru <dthaluru@vmware.com> 2.4.18-6
170 
+-   Removed packaging of debug files
169 171 
 *   Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 2.4.18-5
170 172 
 -   Added patch for CVE-2016-5387
171 173 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.18-4
SPECS/libevent/libevent.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	An Event notification library.
2 2 
 Name:		libevent
3 3 
 Version:	2.0.22
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://libevent.org
7 7 
 Source0:        https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/%{name}-%{version}-stable.tar.gz
... ... 
@@ -35,12 +35,13 @@ make %{?_smp_mflags}
35 35
36 36 
 %install
37 37 
 %makeinstall
38 
+find %{buildroot} -name '*.la' -delete
38 39
39 40 
 %post -p /sbin/ldconfig
40 41
41 42 
 %files
42 43 
 %defattr(-,root,root)
43 
-%{_libdir}/*
44 
+%{_libdir}/*.so.*
44 45
45 46 
 %files devel
46 47 
 %defattr(-,root,root)
... ... 
@@ -52,6 +53,8 @@ make %{?_smp_mflags}
52 52 
 %{_libdir}/pkgconfig/libevent_openssl.pc
53 53
54 54 
 %changelog
55 
+*	Tue Jul 26 2016 Divya Thaluru <dthaluru@vmware.com> 2.0.22-4
56 
+-	Removed packaging of debug files
55 57 
 *	Wed Jul 13 2016 Alexey Makhalov <amakhalov@vmware.com> 2.0.22-3
56 58 
 -	Added openssl runtime requirement
57 59 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.22-2
SPECS/lttng-tools/lttng-tools.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary: LTTng is an open source tracing framework for Linux.
2 2 
 Name:    lttng-tools
3 3 
 Version: 2.7.1
4 
-Release: 2%{?dist}
4 
+Release: 3%{?dist}
5 5 
 License: GPLv2 and LGPLv2
6 6 
 URL: https://lttng.org/download/
7 7 
 Source: %{name}-%{version}.tar.bz2
... ... 
@@ -15,7 +15,7 @@ BuildRequires: nss-devel
15 15 
 BuildRequires: m4
16 16 
 BuildRequires: elfutils-devel
17 17 
 BuildRequires: popt-devel
18 
-BuildRequires: userspace-rcu
18 
+BuildRequires: userspace-rcu-devel
19 19 
 Requires:      userspace-rcu
20 20 
 Requires:      elfutils
21 21 
 Requires:      nss
... ... 
@@ -45,6 +45,8 @@ find %{buildroot} -name '*.la' -delete
45 45 
 %exclude %{_libdir}/debug
46 46
47 47 
 %changelog
48 
+*	Tue Jul 26 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.1-3
49 
+-	Added userspace-rcu-devel as build time dependent package
48 50 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.1-2
49 51 
 -	GA - Bump release of all rpms
50 52 
 *   Thu Jan 28 2016 Xiaolin Li <xiaolinl@vmware.com> 2.7.1-1
SPECS/netcat/netcat.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.
2 2 
 Name:		netcat
3 3 
 Version:	0.7.1
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		http://netcat.sourceforge.net/
7 7 
 Group:		Productivity/Networking/Other
... ... 
@@ -31,9 +31,10 @@ rm -rf %{buildroot}
31 31 
 %{_bindir}
32 32 
 /usr/info/
33 33 
 %{_datadir}
34 
-%{_libdir}
35 34 
 /usr/man
36 35 
 %changelog
36 
+*	Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 0.7.1-3
37 
+-	Removed packaging of debug files
37 38 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.1-2
38 39 
 -	GA - Bump release of all rpms
39 40 
 *	Tue Dec 08 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.7.1-1
SPECS/nfs-utils/nfs-utils.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	NFS client utils
2 2 
 Name:		nfs-utils
3 3 
 Version:	1.3.3
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://sourceforge.net/projects/nfs
7 7 
 Group:		Applications/Nfs-utils-client
... ... 
@@ -56,7 +56,6 @@ install -m644 systemd/nfs-mountd.service %{buildroot}/lib/systemd/system/
56 56
57 57 
 %files
58 58 
 %defattr(-,root,root)
59 
-%{_libdir}/*
60 59 
 %{_datadir}/*
61 60 
 /sbin/*
62 61 
 %{_sbindir}/*
... ... 
@@ -66,6 +65,8 @@ install -m644 systemd/nfs-mountd.service %{buildroot}/lib/systemd/system/
66 66 
 /lib/systemd/system/*
67 67
68 68 
 %changelog
69 
+*	Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 1.3.3-4
70 
+-	Removed packaging of debug files
69 71 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.3-3
70 72 
 -	GA - Bump release of all rpms
71 73 
 *   Thu Apr 28 2016 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-2
SPECS/nginx/nginx.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	High-performance HTTP server and reverse proxy
2 2 
 Name:		nginx
3 3 
 Version:	1.10.0
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	BSD-2-Clause
6 6 
 URL:		http://nginx.org/download/nginx-1.10.0.tar.gz
7 7 
 Group:		Applications/System
... ... 
@@ -44,10 +44,12 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
44 44 
 %defattr(-,root,root)
45 45 
 %{_sysconfdir}/*
46 46 
 %{_sbindir}/*
47 
-%{_libdir}/*
47 
+%{_libdir}/systemd/system/nginx.service
48 48 
 %dir %{_var}/log/nginx
49 49
50 50 
 %changelog
51 
+*   Wed Jul 27 2016 Divya Thaluru<dthaluru@vmware.com> 1.10.0-4
52 
+-   Removed packaging of debug files
51 53 
 *   Fri Jul 8 2016 Divya Thaluru<dthaluru@vmware.com> 1.10.0-3
52 54 
 -   Modified default pid filepath and fixed nginx systemd service
53 55 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.10.0-2
SPECS/pciutils/pciutils.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	System utilities to list pci devices
2 2 
 Name:		pciutils
3 3 
 Version:	3.3.1
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		https://www.kernel.org/pub/software/utils/pciutils/
7 7 
 Group:		System Environment/System Utilities
... ... 
@@ -11,6 +11,14 @@ Source0:	https://www.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.t
11 11 
 %define sha1 pciutils=cd93c519307addd542f6fdbcceaefc5a7d7f58bc
12 12 
 %description
13 13 
 The pciutils package contains a set of programs for listing PCI devices, inspecting their status and setting their configuration registers.
14 
+
15 
+%package devel
16 
+Summary: Development Libraries for openssl
17 
+Group: Development/Libraries
18 
+Requires: pciutils = %{version}-%{release}
19 
+%description devel
20 
+Library files for doing development with pciutils.
21 
+
14 22 
 %prep
15 23 
 %setup -q
16 24 
 %build
... ... 
@@ -29,14 +37,23 @@ chmod -v 766 %{buildroot}%{_libdir}/libpci.so
29 29
30 30 
 %clean
31 31 
 rm -rf %{buildroot}/*
32 
+
32 33 
 %files
33 34 
 %defattr(-,root,root)
34 35 
 %{_sbindir}/*
35 
-%{_libdir}/*
36 
+%{_libdir}/*.so.*
36 37 
 %{_includedir}/*
37 38 
 %{_datadir}/misc/*
38 39 
 %{_mandir}/*
40 
+
41 
+%files devel
42 
+%defattr(-,root,root)
43 
+%{_libdir}/pkgconfig/*
44 
+%{_libdir}/*.so
45 
+
39 46 
 %changelog
47 
+*	Mon Jul 25 2016 Divya Thaluru <dthaluru@vmware.com> 3.3.1-3
48 
+-	Added devel package and removed packaging of debug files
40 49 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.1-2
41 50 
 -	GA - Bump release of all rpms
42 51 
 *	Thu Jul 2 2015 Sharath George <sharathg@vmware.com> 3.3.1-1
SPECS/texinfo/texinfo.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Reading, writing, and converting info pages
2 2 
 Name:		texinfo
3 3 
 Version:	6.1
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://ftp.gnu.org/gnu/texinfo/texinfo-6.1.tar.xz
7 7 
 Group:		Applications/System
... ... 
@@ -19,13 +19,23 @@ and converting info pages.
19 19 
 	--prefix=%{_prefix} \
20 20 
 	--disable-silent-rules
21 21 
 make %{?_smp_mflags}
22 
+
22 23 
 %install
23 24 
 make DESTDIR=%{buildroot} install
24 25 
 make DESTDIR=%{buildroot} TEXMF=%{_datarootdir}/texmf install-tex
25 26 
 rm -rf %{buildroot}%{_infodir}
27 
+
26 28 
 %find_lang %{name} --all-name
29 
+
27 30 
 %check
28 31 
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
32 
+
33 
+%post
34 
+/sbin/ldconfig
35 
+
36 
+%postun
37 
+/sbin/ldconfig
38 
+
29 39 
 %files -f %{name}.lang
30 40 
 %defattr(-,root,root)
31 41 
 %{_bindir}/*
... ... 
@@ -34,8 +44,11 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
34 34 
 %{_datarootdir}/texinfo/*
35 35 
 %dir %{_datarootdir}/texmf
36 36 
 %{_datarootdir}/texmf/*
37 
-%{_libdir}/*
37 
+%{_libdir}/texinfo/*
38 
+
38 39 
 %changelog
40 
+*	Wed Jun 27 2016 Divya Thaluru <dthaluru@vmware.com> 6.1-3
41 
+-	Removed packaging of debug files
39 42 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.1-2
40 43 
 -	GA - Bump release of all rpms
41 44 
 *   Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 6.1-1
SPECS/userspace-rcu/userspace-rcu.spec
History View file @ 9c4dd49
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary: user space RCU (read-copy-update)
2 2 
 Name:    userspace-rcu
3 3 
 Version: 0.9.1
4 
-Release: 2%{?dist}
4 
+Release: 3%{?dist}
5 5 
 License: LGPLv2+
6 6 
 URL: http://liburcu.org
7 7 
 Source: %{name}-%{version}.tar.bz2
... ... 
@@ -19,6 +19,13 @@ BuildRequires: popt-devel
19 19 
 %description
20 20 
 This data synchronization library provides read-side access which scales linearly with the number of cores.
21 21
22 
+%package devel
23 
+Summary: Development Libraries for openssl
24 
+Group: Development/Libraries
25 
+Requires: userspace-rcu = %{version}-%{release}
26 
+%description devel
27 
+Library files for doing development with userspace-rcu.
28 
+
22 29 
 %prep
23 30 
 %setup -q
24 31
... ... 
@@ -32,13 +39,23 @@ make %{?_smp_mflags}
32 32 
 %install
33 33 
 make DESTDIR=%{buildroot} install
34 34
35 
+find %{buildroot} -name '*.la' -delete
36 
+
35 37 
 %files
36 
-%{_lib}/*
38 
+%{_lib}/*.so.*
37 39 
 %{_includedir}/*
38 40 
 %{_datadir}/*
39 41
42 
+%files devel
43 
+%defattr(-,root,root)
44 
+%{_libdir}/pkgconfig/*
45 
+%{_libdir}/*.so
46 
+%{_includedir}/*
47 
+
40 48
41 49 
 %changelog
50 
+*       Mon Jul 25 2016 Divya Thaluru <dthaluru@vmware.com> 0.9.1-3
51 
+-       Added devel package and removed packaging of debug files
42 52 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.9.1-2
43 53 
 -	GA - Bump release of all rpms
44 54 
 *	Tue Nov 24 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-1