diff options
| author |   Frederic Marec <frederic.marec@iot.bzh> | 2019-05-14 14:46:33 +0200 |
|---|---|---|
| committer | Frédéric Marec <frederic.marec@iot.bzh> | 2019-05-14 13:28:30 +0000 |
| commit | 773296ffd0bd0f2457adc0c815b5deca43b0101b (patch) | |
| tree | d23c0191f2b75f31b38a91df33dcef80471c462e | |
| parent | a10ca53e48a01d57037551dcadad24d29b809e24 (diff) | |
Change packaging files
Remove version variable
Remove afm/application from tree to fix packaging on guppy
Bug-AGL: SPEC-2363
Change-Id: I8475d69b21f5c789faac85f7b71126623438cef0
Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
| -rw-r--r-- | conf.d/packaging/deb/debian.agl-app-afb-test-bin.install | 2 | ||||
| -rw-r--r-- | conf.d/packaging/deb/debian.rules | 4 | ||||
| -rw-r--r-- | conf.d/packaging/rpm/agl-app-afb-test.spec | 29 |
3 files changed, 17 insertions, 18 deletions
diff --git a/conf.d/packaging/deb/debian.agl-app-afb-test-bin.install b/conf.d/packaging/deb/debian.agl-app-afb-test-bin.install index 4a7a01e..e581d53 100644 --- a/conf.d/packaging/deb/debian.agl-app-afb-test-bin.install +++ b/conf.d/packaging/deb/debian.agl-app-afb-test-bin.install @@ -1,2 +1,2 @@ -/opt/AGL/afm/applications/afTest/* +/opt/AGL/afTest/* /opt/AGL/bin/afm-test diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules index 4a8e8f5..26975a7 100644 --- a/conf.d/packaging/deb/debian.rules +++ b/conf.d/packaging/deb/debian.rules @@ -13,7 +13,7 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install --destdir=/usr/src/packages/BUILD/debian/tmp - mkdir -p debian/tmp/opt/AGL/afm/applications/ - mv debian/tmp/opt/AGL/afTest/ debian/tmp/opt/AGL/afm/applications/ + 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 c570b55..380e967 100644 --- a/conf.d/packaging/rpm/agl-app-afb-test.spec +++ b/conf.d/packaging/rpm/agl-app-afb-test.spec @@ -55,8 +55,8 @@ cmake -DCMAKE_BUILD_TYPE=DEBUG -DVERSION=%{version} .. %install [ -d build ] && cd build %make_install -mkdir -p %{buildroot}%{_prefix}/afm/applications/afTest/%{version} -mv %{buildroot}%{_prefix}/afTest/* %{buildroot}/%{_prefix}/afm/applications/afTest/%{version} +mkdir -p %{buildroot}%{_prefix}/ +mv %{buildroot}%{_prefix}/afTest/* %{buildroot}/%{_prefix}/ rmdir %{buildroot}/%{_prefix}/afTest %post @@ -68,19 +68,18 @@ rmdir %{buildroot}/%{_prefix}/afTest %dir %{_prefix} %dir %{_bindir} %{_bindir}/afm-test -%dir %{_prefix}/afm/ -%dir %{_prefix}/afm/applications/ -%dir %{_prefix}/afm/applications/afTest/ -%dir %{_prefix}/afm/applications/afTest/%{version}/ -%dir %{_prefix}/afm/applications/afTest/%{version}/etc -%{_prefix}/afm/applications/afTest/%{version}/etc/aft-afbtest.json -%dir %{_prefix}/afm/applications/afTest/%{version}/bin -%dir %{_prefix}/afm/applications/afTest/%{version}/lib -%{_prefix}/afm/applications/afTest/%{version}/lib/aft.so -%dir %{_prefix}/afm/applications/afTest/%{version}/htdocs -%dir %{_prefix}/afm/applications/afTest/%{version}/var -%{_prefix}/afm/applications/afTest/%{version}/var/aft.lua -%{_prefix}/afm/applications/afTest/%{version}/var/luaunit.lua +%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 %files devel %defattr(-,root,root) |