ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPP-474 Revert "FIX sysctl configuration directory"

Browse Source 
This reverts commit 822af5c95d.
Reason for revert is a bug in procps upstart script.

Change-Id: Ie9e501c9b52e65d8d0f31ce6600823021e89fb6f
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
This commit is contained in:
Miroslav Miklus
2016-10-11 13:35:26 +02:00
committed by Damjan Marion
parent 383740d102
commit 8e08e74ce0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-data/platforms.mk
View File

@ -52,7 +52,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
>> deb/debian/vpp.install ; \ >> deb/debian/vpp.install ; \
\ \
: and sysctl config ; \ : and sysctl config ; \
echo ../../vpp/conf/80-vpp.conf /usr/lib/sysctl.d \ echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d \
>> deb/debian/vpp.install ; \ >> deb/debian/vpp.install ; \
\ \
: dev package needs a couple of additions ; \ : dev package needs a couple of additions ; \

6
build-root/rpm/vpp.spec
View File

@ -95,10 +95,10 @@ install -p -m 755 ../../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
# configs # configs
# #
mkdir -p -m755 %{buildroot}/etc/vpp mkdir -p -m755 %{buildroot}/etc/vpp
mkdir -p -m755 %{buildroot}/usr/lib/sysctl.d mkdir -p -m755 %{buildroot}/etc/sysctl.d
install -p -m 644 vpp.service %{buildroot}%{_unitdir} install -p -m 644 vpp.service %{buildroot}%{_unitdir}
install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/usr/lib/sysctl.d install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
# #
# libraries # libraries
# #
@ -204,7 +204,7 @@ fi
/usr/bin/vpp* /usr/bin/vpp*
/usr/bin/svm* /usr/bin/svm*
/usr/bin/elftool /usr/bin/elftool
%config /usr/lib/sysctl.d/80-vpp.conf %config /etc/sysctl.d/80-vpp.conf
%config /etc/vpp/startup.conf %config /etc/vpp/startup.conf
%files lib %files lib