From 6b0b9047228c0da38458217c28190ff0c28e73a9 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 15 Oct 2018 17:54:40 +0200 Subject: [PATCH] Make profile.d file consistent between rpm and debian The file /etc/profile.d/AGL-app-framework-binder.sh must have the same name for all distro / packages, all the more that a reference of this file is given in the online documentation: http://docs.automotivelinux.org/docs/devguides/en/dev/ reference/host-configuration/docs/2_AGL_Application_Framework.html Change-Id: If3bd2d87bdce7af2f625eeb9a7b230f11520b9e9 Signed-off-by: Sebastien Douheret --- .../deb/debian.agl-app-framework-binder-bin.install | 2 +- 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 -- 2.16.6