diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-10-19 07:52:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-10-19 07:52:38 +0000 |
| commit | 07999dabb949585b961ef39a3d6d636149fbebec (patch) | |
| tree | 922c2f1f21190ea50887ba0a2ef60260791cd4a6 /conf.d | |
| parent | 5ee4995733cc3f53b8b55d045530918b2125e78a (diff) | |
| parent | 6b0b9047228c0da38458217c28190ff0c28e73a9 (diff) | |
Merge "Make profile.d file consistent between rpm and debian"
Diffstat (limited to 'conf.d')
| -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 |
2 files changed, 8 insertions, 8 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 17c19520..1932a1e3 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 @@ -11,5 +11,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 f9576409..ba4aeb62 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 |