diff options
| author |   Frederic Marec <frederic.marec@iot.bzh> | 2019-04-05 09:35:29 +0200 |
|---|---|---|
| committer | Frédéric Marec <frederic.marec@iot.bzh> | 2019-04-30 07:20:40 +0000 |
| commit | 81359c788d04cd08ddbee9195267718037040c79 (patch) | |
| tree | 8ffab78807ac8ab7dd6ea7c1e8715a82e327e9f7 | |
| parent | 38b87769f16527b537c863529552330abd27b58a (diff) | |
Change agl-app-framework-binder.sh
Aligned the two different names from the two ways of packaging
From AGL-agl-app-framework-binder.sh to agl-app-framework-binder.sh for .rpm
From AGL-app-framework-binder.sh to agl-app-framework-binder.sh for .deb
Bug-AGL: SPEC-2365
Change-Id: Ie324ce159a55ccae7c051c97be5116d975e0da85
Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
(cherry picked from commit c80873f04c5122e579333b4cf363dd623200e822)
| -rw-r--r-- | conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install | 2 | ||||
| -rw-r--r-- | conf.d/packaging/deb/debian.rules | 14 | ||||
| -rw-r--r-- | conf.d/packaging/rpm/agl-app-framework-binder.spec | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install index 05d89166..82526ed0 100644 --- a/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install +++ b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install @@ -6,5 +6,5 @@ /opt/AGL/bin/afb-exprefs /opt/AGL/bin/afb-client-demo /opt/AGL/bin/afb-genskel -/etc/profile.d/AGL-app-framework-binder.sh +/etc/profile.d/agl-app-framework-binder.sh /opt/AGL/lib/*/afb/monitoring/* diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules index ba4aeb62..eaaf59d6 100644 --- a/conf.d/packaging/deb/debian.rules +++ b/conf.d/packaging/deb/debian.rules @@ -48,13 +48,13 @@ install: build # Add here commands to install the package into debian/tmp cd build;make install DESTDIR=/usr/src/packages/BUILD/debian/tmp mkdir -p debian/tmp/etc/profile.d - echo '#---------- AGL app-framework-binder options Start ---------" ' > debian/tmp/etc/profile.d/AGL-app-framework-binder.sh - echo '# Object: AGL cmake option for binder/bindings' >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh - echo 'export LD_LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LD_LIBRARY_PATH}' >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh - echo 'export LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LIBRARY_PATH}' >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh - echo 'export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:$${PKG_CONFIG_PATH}' >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh - echo 'export PATH=/opt/AGL/bin:$${PATH}' >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh - echo '#---------- AGL options End ---------' >> debian/tmp/etc/profile.d/AGL-app-framework-binder.sh + echo '#---------- AGL app-framework-binder options Start ---------" ' > debian/tmp/etc/profile.d/agl-app-framework-binder.sh + echo '# Object: AGL cmake option for binder/bindings' >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh + echo 'export LD_LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LD_LIBRARY_PATH}' >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh + echo 'export LIBRARY_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH):$${LIBRARY_PATH}' >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh + echo 'export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:$${PKG_CONFIG_PATH}' >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh + echo 'export PATH=/opt/AGL/bin:$${PATH}' >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh + echo '#---------- AGL options End ---------' >> debian/tmp/etc/profile.d/agl-app-framework-binder.sh # Move all files in their corresponding package dh_install --list-missing -s --sourcedir=debian/tmp # empty dependency_libs in .la files diff --git a/conf.d/packaging/rpm/agl-app-framework-binder.spec b/conf.d/packaging/rpm/agl-app-framework-binder.spec index 72a54150..e1f8020e 100644 --- a/conf.d/packaging/rpm/agl-app-framework-binder.spec +++ b/conf.d/packaging/rpm/agl-app-framework-binder.spec @@ -96,7 +96,7 @@ EOF #app-framework-binder demo %{_libdir}/afb/*.so -%config(noreplace) %{_sysconfdir}/profile.d/AGL-%{name}.sh +%config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh #app-framework-binder monitoring %dir %{_libdir}/afb/monitoring |