Browse code
Replace inetutils by iputils & net-tools
Change-Id: I4eca263031a4e2999cf36fe1af88a9deba61643a
Reviewed-on: http://photon-jenkins.eng.vmware.com/71
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George
harishspqr authored on 2015/10/27 03:29:49Showing 6 changed files
- SPECS/gnutls/gnutls.spec
- SPECS/iputils/iputils.spec
- SPECS/net-tools/net-tools.spec
- common/data/packages_micro.json
- common/data/packages_minimal.json
- common/data/packages_minimal_ova.json
| 22 | 22 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,66 @@ |
| 0 |
+Summary: Programs for basic networking |
|
| 1 |
+Name: iputils |
|
| 2 |
+Version: s20121221 |
|
| 3 |
+Release: 1%{?dist}
|
|
| 4 |
+License: GPLv2+ |
|
| 5 |
+URL: http://www.gnu.org/software/inetutils |
|
| 6 |
+Group: Applications/Communications |
|
| 7 |
+Vendor: VMware, Inc. |
|
| 8 |
+Distribution: Photon |
|
| 9 |
+Source0: http://www.skbuff.net/iputils/%{name}-%{version}.tar.bz2
|
|
| 10 |
+BuildRequires: libcap-devel openssl-devel gnutls-devel |
|
| 11 |
+Requires: libcap |
|
| 12 |
+Requires: openssl |
|
| 13 |
+Requires: gnutls |
|
| 14 |
+Obsoletes: inetutils |
|
| 15 |
+%define sha1 iputils=4d56d8c75d6a5d58f052e4056e975f01ebab9ba9 |
|
| 16 |
+%description |
|
| 17 |
+The Iputils package contains programs for basic networking. |
|
| 18 |
+%prep |
|
| 19 |
+%setup -q |
|
| 20 |
+ |
|
| 21 |
+%build |
|
| 22 |
+make %{?_smp_mflags}
|
|
| 23 |
+( |
|
| 24 |
+cd ninfod |
|
| 25 |
+./configure --prefix=%{_prefix}
|
|
| 26 |
+make %{?_smp_mflags}
|
|
| 27 |
+) |
|
| 28 |
+#make html |
|
| 29 |
+#make man |
|
| 30 |
+ |
|
| 31 |
+%install |
|
| 32 |
+rm -fr %{buildroot}
|
|
| 33 |
+mkdir -p %{buildroot}%{_sbindir}
|
|
| 34 |
+mkdir -p %{buildroot}%{_bindir}
|
|
| 35 |
+mkdir -p %{buildroot}/%{_unitdir}
|
|
| 36 |
+ |
|
| 37 |
+install -c clockdiff %{buildroot}%{_sbindir}/
|
|
| 38 |
+install -cp arping %{buildroot}%{_sbindir}/
|
|
| 39 |
+install -cp ping %{buildroot}%{_bindir}/
|
|
| 40 |
+install -cp rdisc %{buildroot}%{_sbindir}/
|
|
| 41 |
+install -cp ping6 %{buildroot}%{_bindir}/
|
|
| 42 |
+install -cp tracepath %{buildroot}%{_bindir}/
|
|
| 43 |
+install -cp tracepath6 %{buildroot}%{_bindir}/
|
|
| 44 |
+install -cp ninfod/ninfod %{buildroot}%{_sbindir}/
|
|
| 45 |
+ |
|
| 46 |
+ln -sf ../bin/ping6 %{buildroot}%{_sbindir}
|
|
| 47 |
+ln -sf ../bin/tracepath %{buildroot}%{_sbindir}
|
|
| 48 |
+ln -sf ../bin/tracepath6 %{buildroot}%{_sbindir}
|
|
| 49 |
+ |
|
| 50 |
+iconv -f ISO88591 -t UTF8 RELNOTES -o RELNOTES.tmp |
|
| 51 |
+touch -r RELNOTES RELNOTES.tmp |
|
| 52 |
+mv -f RELNOTES.tmp RELNOTES |
|
| 53 |
+ |
|
| 54 |
+%check |
|
| 55 |
+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
|
| 56 |
+ |
|
| 57 |
+%files |
|
| 58 |
+%defattr(-,root,root) |
|
| 59 |
+%doc RELNOTES |
|
| 60 |
+%{_sbindir}/*
|
|
| 61 |
+%{_bindir}/*
|
|
| 62 |
+ |
|
| 63 |
+%changelog |
|
| 64 |
+* Tue Oct 20 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.2-1 |
|
| 65 |
+- Initial build. First version |
| ... | ... |
@@ -12,6 +12,8 @@ Source0: http://www.tazenda.demon.co.uk/phil/net-tools/%{name}-%{version}.tar.bz
|
| 12 | 12 |
Patch0: http://www.linuxfromscratch.org/patches/blfs/6.3/net-tools-1.60-gcc34-3.patch |
| 13 | 13 |
Patch1: http://www.linuxfromscratch.org/patches/blfs/6.3/net-tools-1.60-kernel_headers-2.patch |
| 14 | 14 |
Patch2: http://www.linuxfromscratch.org/patches/blfs/6.3/net-tools-1.60-mii_ioctl-1.patch |
| 15 |
+Obsoletes: inetutils |
|
| 16 |
+Requires: iputils |
|
| 15 | 17 |
%description |
| 16 | 18 |
The Net-tools package is a collection of programs for controlling the network subsystem of the Linux kernel. |
| 17 | 19 |
%prep |
| ... | ... |
@@ -49,6 +51,8 @@ rm -rf %{buildroot}/*
|
| 49 | 49 |
%{_mandir}/man8/*
|
| 50 | 50 |
|
| 51 | 51 |
%changelog |
| 52 |
+* Thu Oct 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.60-3 |
|
| 53 |
+- Added changes to replace inetutils with net-tools |
|
| 52 | 54 |
* Thu Jul 30 2015 Divya Thaluru <dthaluru@vmware.com> 1.60-2 |
| 53 | 55 |
- Disable building with parallel threads |
| 54 | 56 |
* Mon Jul 13 2015 Divya Thaluru <dthaluru@vmware.com> 1.60-1 |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
{
|
| 2 | 2 |
"packages":["glibc", "zlib", "filesystem", |
| 3 |
- "pkg-config", "bash", "bzip2", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "inetutils", |
|
| 3 |
+ "pkg-config", "bash", "bzip2", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "net-tools", |
|
| 4 | 4 |
"findutils", "xz", "iproute2", "util-linux", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM", |
| 5 | 5 |
"systemd", "dbus", "file", "e2fsprogs", "rpm", |
| 6 | 6 |
"openssh", "gdbm", "python2", |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
{
|
| 2 | 2 |
"packages":["glibc", "zlib", "filesystem", |
| 3 |
- "pkg-config", "bash", "bzip2", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "inetutils", |
|
| 3 |
+ "pkg-config", "bash", "bzip2", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "net-tools", |
|
| 4 | 4 |
"findutils", "xz", "iproute2", "util-linux", "kmod", "linux-esx", "ca-certificates", "curl", "iptables", "Linux-PAM", |
| 5 | 5 |
"systemd", "dbus", "file", "e2fsprogs", "rpm", |
| 6 | 6 |
"openssh", "gdbm", "python2", |