aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Marec <frederic.marec@iot.bzh>2019-05-27 09:38:41 +0200
committerFrederic Marec <frederic.marec@iot.bzh>2019-05-27 13:54:25 +0200
commitb1e9583e8605cb7058a6655080e43a7084cdf629 (patch)
tree81dd9b70db0b352d9f5ffa8e9124545f51a196d0
parent773296ffd0bd0f2457adc0c815b5deca43b0101b (diff)
Remove useless directory creation Remove useless move Fix tree installation Bug-AGL: SPEC-2363 Change-Id: I683dd0a7844863c99a02295f80ff3585b17e3e66 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
-rw-r--r--conf.d/packaging/deb/debian.rules1
-rw-r--r--conf.d/packaging/rpm/agl-app-afb-test.spec23
2 files changed, 10 insertions, 14 deletions
diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index 26975a7..4fe1d6f 100644
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -14,6 +14,5 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install --destdir=/usr/src/packages/BUILD/debian/tmp
mkdir -p debian/tmp/opt/AGL/
- mv debian/tmp/opt/AGL/afTest/ debian/tmp/opt/AGL/
override_dh_auto_test:
diff --git a/conf.d/packaging/rpm/agl-app-afb-test.spec b/conf.d/packaging/rpm/agl-app-afb-test.spec
index 380e967..782df80 100644
--- a/conf.d/packaging/rpm/agl-app-afb-test.spec
+++ b/conf.d/packaging/rpm/agl-app-afb-test.spec
@@ -55,9 +55,7 @@ cmake -DCMAKE_BUILD_TYPE=DEBUG -DVERSION=%{version} ..
%install
[ -d build ] && cd build
%make_install
-mkdir -p %{buildroot}%{_prefix}/
-mv %{buildroot}%{_prefix}/afTest/* %{buildroot}/%{_prefix}/
-rmdir %{buildroot}/%{_prefix}/afTest
+mkdir -p %{buildroot}%{_prefix}/afm-test
%post
@@ -70,16 +68,15 @@ rmdir %{buildroot}/%{_prefix}/afTest
%{_bindir}/afm-test
%dir %{_prefix}/
%dir %{_prefix}/afTest/
-%dir %{_prefix}/
-%dir %{_prefix}/etc
-%{_prefix}/etc/aft-afbtest.json
-%dir %{_prefix}/bin
-%dir %{_prefix}/lib
-%{_prefix}/lib/aft.so
-%dir %{_prefix}/htdocs
-%dir %{_prefix}/var
-%{_prefix}/var/aft.lua
-%{_prefix}/var/luaunit.lua
+%dir %{_prefix}/afTest/etc
+%{_prefix}/afTest/etc/aft-afbtest.json
+%dir %{_prefix}/afTest/bin
+%dir %{_prefix}/afTest/lib
+%{_prefix}/afTest/lib/aft.so
+%dir %{_prefix}/afTest/htdocs
+%dir %{_prefix}/afTest/var
+%{_prefix}/afTest/var/aft.lua
+%{_prefix}/afTest/var/luaunit.lua
%files devel
%defattr(-,root,root)