From 7045158df5a7bfe67eee7020d3218733f57c9182 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 27 Jun 2017 15:18:45 +0200 Subject: Change debian files packaging * rename package app-framework-binder to agl-app-framework-binder. * move packaging to conf.d/packaging as other packages Change-Id: Ia207345836fe3c44aef4d237c5785c537a725a81 Signed-off-by: Ronan Le Martret --- README.md | 2 +- conf.d/packaging/agl-app-framework-binder.dsc | 19 ++++ conf.d/packaging/agl-app-framework-binder.spec | 102 +++++++++++++++++++++ .../debian.agl-app-framework-binder-bin.install | 14 +++ .../debian.agl-app-framework-binder-dev.install | 3 + conf.d/packaging/debian.changelog | 5 + conf.d/packaging/debian.compat | 1 + conf.d/packaging/debian.control | 26 ++++++ conf.d/packaging/debian.rules | 87 ++++++++++++++++++ packaging/app-framework-binder.dsc | 18 ---- packaging/app-framework-binder.spec | 79 ---------------- packaging/debian.app-framework-binder-bin.install | 13 --- packaging/debian.app-framework-binder-dev.install | 20 ---- packaging/debian.changelog | 5 - packaging/debian.compat | 1 - packaging/debian.control | 25 ----- packaging/debian.rules | 80 ---------------- 17 files changed, 258 insertions(+), 242 deletions(-) create mode 100644 conf.d/packaging/agl-app-framework-binder.dsc create mode 100644 conf.d/packaging/agl-app-framework-binder.spec create mode 100644 conf.d/packaging/debian.agl-app-framework-binder-bin.install create mode 100644 conf.d/packaging/debian.agl-app-framework-binder-dev.install create mode 100644 conf.d/packaging/debian.changelog create mode 100644 conf.d/packaging/debian.compat create mode 100644 conf.d/packaging/debian.control create mode 100644 conf.d/packaging/debian.rules delete mode 100644 packaging/app-framework-binder.dsc delete mode 100644 packaging/app-framework-binder.spec delete mode 100644 packaging/debian.app-framework-binder-bin.install delete mode 100644 packaging/debian.app-framework-binder-dev.install delete mode 100644 packaging/debian.changelog delete mode 100644 packaging/debian.compat delete mode 100644 packaging/debian.control delete mode 100644 packaging/debian.rules diff --git a/README.md b/README.md index af499a15..27d0110f 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ $ sudo make install
VERSION=2.0 GIT_TAG=master PKG_NAME=app-framework-binder -git archive --format=tar.gz --prefix=${PKG_NAME}-${VERSION}/ ${GIT_TAG} -o ${PKG_NAME}_${VERSION}.orig.tar.gz +git archive --format=tar.gz --prefix=agl-${PKG_NAME}-${VERSION}/ ${GIT_TAG} -o agl-${PKG_NAME}_${VERSION}.orig.tar.gz ``` ### Testing/Debug diff --git a/conf.d/packaging/agl-app-framework-binder.dsc b/conf.d/packaging/agl-app-framework-binder.dsc new file mode 100644 index 00000000..96612fbe --- /dev/null +++ b/conf.d/packaging/agl-app-framework-binder.dsc @@ -0,0 +1,19 @@ +Format: 1.0 +Source: agl-app-framework-binder +Binary: agl-app-framework-binder-bin, agl-app-framework-binder-dev +Architecture: any +Version: 2.0-0 +Maintainer: unknown +Standards-Version: 3.8.2 +Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder +Build-Depends: debhelper (>= 5), + dpkg-dev, + libmicrohttpd-dev (>= 0.9.54), + cmake, + libsystemd-dev (>= 222), + libssl-dev, + uuid-dev, + libgcrypt20-dev, + libjson-c-dev, + libmagic-dev +Debtransform-Tar: agl-app-framework-binder_2.0.orig.tar.gz diff --git a/conf.d/packaging/agl-app-framework-binder.spec b/conf.d/packaging/agl-app-framework-binder.spec new file mode 100644 index 00000000..cc920a0c --- /dev/null +++ b/conf.d/packaging/agl-app-framework-binder.spec @@ -0,0 +1,102 @@ +# +# spec file for package app-framework-binder +# + +%define _prefix /opt/AGL +%define __cmake cmake + +Name: agl-app-framework-binder +Version: 2.0 +Release: 0 +License: GPL-2.0 +Summary: app-framework-binder +Group: Development/Libraries/C and C++ +Url: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder +Source: %{name}_%{version}.orig.tar.gz +#BuildRequires: gdb +BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.54 +BuildRequires: make +BuildRequires: cmake +BuildRequires: pkgconfig(libsystemd) >= 222 +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(uuid) +BuildRequires: libgcrypt-devel +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(json-c) +BuildRequires: file-devel + +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +app-framework-binder + +%package devel +Summary: app-framework-binder-devel +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} +Provides: pkgconfig(%{name}) = %{version} + +%description devel +app-framework-binder-devel + +%prep +%setup -q + +%build +export PKG_CONFIG_PATH=%{_libdir}/pkgconfig +%cmake +%__make %{?_smp_mflags} + + +%install +[ -d build ] && cd build +%make_install + +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/AGL_%{name}.sh +#---------- AGL %{name} options Start ---------" +# Object: AGL cmake option for binder/bindings +export LD_LIBRARY_PATH=%{_libdir}:\${LD_LIBRARY_PATH} +export LIBRARY_PATH=%{_libdir}:\${LIBRARY_PATH} +export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:\${PKG_CONFIG_PATH} +export PATH=%{_bindir}:\$PATH +#---------- AGL options End --------- +EOF + +%post + +%postun + +%files +%defattr(-,root,root) +%dir %{_bindir} +%{_bindir}/afb-client-demo +%{_bindir}/afb-daemon +%{_bindir}/afb-genskel +%{_bindir}/afb-exprefs +%{_bindir}/afb-json2c + +%dir %{_libdir} +%dir %{_libdir}/afb +%{_libdir}/afb/afb-dbus-binding.so +%{_libdir}/afb/authLogin.so +%{_libdir}/libafbwsc.so.1 +%{_libdir}/libafbwsc.so.1.0 + +#app-framework-binder demo +%{_libdir}/afb/demoContext.so +%{_libdir}/afb/demoPost.so +%{_libdir}/afb/helloWorld.so +%{_libdir}/afb/tic-tac-toe.so + +%{_sysconfdir}/profile.d/AGL_%{name}.sh + +%files devel +%defattr(-,root,root) +%dir %{_prefix} +%{_libdir}/libafbwsc.so +%dir %{_includedir} +%dir %{_includedir}/afb +%{_includedir}/afb/*.h +%dir %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/*.pc diff --git a/conf.d/packaging/debian.agl-app-framework-binder-bin.install b/conf.d/packaging/debian.agl-app-framework-binder-bin.install new file mode 100644 index 00000000..3faebfb3 --- /dev/null +++ b/conf.d/packaging/debian.agl-app-framework-binder-bin.install @@ -0,0 +1,14 @@ +/opt/AGL/lib/*/libafbwsc.so.1.0 +/opt/AGL/lib/*/libafbwsc.so.1 +/opt/AGL/lib/*/afb/authLogin.so +/opt/AGL/lib/*/afb/demoPost.so +/opt/AGL/lib/*/afb/afb-dbus-binding.so +/opt/AGL/lib/*/afb/tic-tac-toe.so +/opt/AGL/lib/*/afb/helloWorld.so +/opt/AGL/lib/*/afb/demoContext.so +/opt/AGL/bin/afb-json2c +/opt/AGL/bin/afb-daemon +/opt/AGL/bin/afb-exprefs +/opt/AGL/bin/afb-client-demo +/opt/AGL/bin/afb-genskel +/etc/profile.d/AGL_app-framework-binder.sh diff --git a/conf.d/packaging/debian.agl-app-framework-binder-dev.install b/conf.d/packaging/debian.agl-app-framework-binder-dev.install new file mode 100644 index 00000000..2d1a4016 --- /dev/null +++ b/conf.d/packaging/debian.agl-app-framework-binder-dev.install @@ -0,0 +1,3 @@ +/opt/AGL/include/afb/*.h +/opt/AGL/lib/*/pkgconfig/*.pc +/opt/AGL/lib/*/libafbwsc.so diff --git a/conf.d/packaging/debian.changelog b/conf.d/packaging/debian.changelog new file mode 100644 index 00000000..131bac4b --- /dev/null +++ b/conf.d/packaging/debian.changelog @@ -0,0 +1,5 @@ +agl-app-framework-binder (2.0-0) unstable; urgency=low + + * init build + + -- Ronan Le Martret Mon, 25 Dec 2007 10:50:38 +0100 diff --git a/conf.d/packaging/debian.compat b/conf.d/packaging/debian.compat new file mode 100644 index 00000000..45a4fb75 --- /dev/null +++ b/conf.d/packaging/debian.compat @@ -0,0 +1 @@ +8 diff --git a/conf.d/packaging/debian.control b/conf.d/packaging/debian.control new file mode 100644 index 00000000..948f3fe1 --- /dev/null +++ b/conf.d/packaging/debian.control @@ -0,0 +1,26 @@ +Priority: optional +Maintainer: unknown +Source: agl-app-framework-binder +Build-Depends: debhelper (>= 5), + libmicrohttpd-dev (>= 0.9.54), + cmake, + libsystemd-dev (>= 222), + libssl-dev, + uuid-dev, + libgcrypt20-dev, + libjson-c-dev, + libmagic-dev +Standards-Version: 3.8.2 +Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder + +Package: agl-app-framework-binder-bin +Section: libs +Architecture: any +Description: agl-app-framework-binder + +Package: agl-app-framework-binder-dev +Section: libs +Architecture: any +Depends: agl-app-framework-binder-bin +Description: agl-app-framework-binder-devel + diff --git a/conf.d/packaging/debian.rules b/conf.d/packaging/debian.rules new file mode 100644 index 00000000..4fcc791c --- /dev/null +++ b/conf.d/packaging/debian.rules @@ -0,0 +1,87 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + mkdir -p build + export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig;cd build;cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/opt/AGL -DCMAKE_INSTALL_LIBDIR:PATH=lib/$(DEB_HOST_MULTIARCH);$(MAKE) + touch build-stamp + +clean: + #dh_testdir + dh_testroot + rm -f configure-stamp build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + #dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + # 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 + # Move all files in their corresponding package + dh_install --list-missing -s --sourcedir=debian/tmp + # empty dependency_libs in .la files + #sed -i "/dependency_libs/ s/'.*'/''/" `find debian/ -name '*.la'` + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -V + dh_installdeb + #dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/packaging/app-framework-binder.dsc b/packaging/app-framework-binder.dsc deleted file mode 100644 index f0a97ebc..00000000 --- a/packaging/app-framework-binder.dsc +++ /dev/null @@ -1,18 +0,0 @@ -Format: 1.0 -Source: app-framework-binder -Binary: app-framework-binder-bin, app-framework-binder-dev -Architecture: any -Version: 2.0-0 -Maintainer: unknown -Standards-Version: 3.8.2 -Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder -Build-Depends: debhelper (>= 5), - libmicrohttpd-dev , - cmake, - libsystemd-dev, - libssl-dev, - uuid-dev, - libgcrypt20-dev, - libjson-c-dev, - libmagic-dev -Debtransform-Tar: app-framework-binder_2.0.orig.tar.gz diff --git a/packaging/app-framework-binder.spec b/packaging/app-framework-binder.spec deleted file mode 100644 index 3bdb7682..00000000 --- a/packaging/app-framework-binder.spec +++ /dev/null @@ -1,79 +0,0 @@ -# -# spec file for package app-framework-binder -# - -Name: app-framework-binder -Version: 2.0 -Release: 0 -License: GPL-2.0 -Summary: app-framework-binder -Group: Development/Libraries/C and C++ -Url: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder -Source: %{name}_%{version}.orig.tar.gz -#BuildRequires: gdb -BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.54 -BuildRequires: make -BuildRequires: cmake -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(uuid) -BuildRequires: libgcrypt-devel -BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(json-c) -BuildRequires: file-devel - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -app-framework-binder - -%package devel -Summary: app-framework-binder-devel -Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} - -%description devel -app-framework-binder-devel - -%prep -%setup -q - -%build -%cmake -%__make %{?_smp_mflags} - - -%install -[ -d build ] && cd build -%make_install - -%post - -%postun - -%files -%defattr(-,root,root) -%{_bindir}/afb-client-demo -%{_bindir}/afb-daemon -%{_bindir}/afb-genskel -%{_bindir}/afb-exprefs -%{_bindir}/afb-json2c - -%dir %{_libdir}/afb -%{_libdir}/afb/afb-dbus-binding.so -%{_libdir}/afb/authLogin.so -%{_libdir}/libafbwsc.so.1 -%{_libdir}/libafbwsc.so.1.0 - -#app-framework-binder demo -%{_libdir}/afb/demoContext.so -%{_libdir}/afb/demoPost.so -%{_libdir}/afb/helloWorld.so -%{_libdir}/afb/tic-tac-toe.so - -%files devel -%defattr(-,root,root) -%{_libdir}/libafbwsc.so -%dir %{_includedir}/afb -%{_includedir}/afb/*.h -%{_libdir}/pkgconfig/*.pc diff --git a/packaging/debian.app-framework-binder-bin.install b/packaging/debian.app-framework-binder-bin.install deleted file mode 100644 index dc404956..00000000 --- a/packaging/debian.app-framework-binder-bin.install +++ /dev/null @@ -1,13 +0,0 @@ -/usr/lib/*/libafbwsc.so.1.0 -/usr/lib/*/libafbwsc.so.1 -/usr/lib/*/afb/authLogin.so -/usr/lib/*/afb/demoPost.so -/usr/lib/*/afb/afb-dbus-binding.so -/usr/lib/*/afb/tic-tac-toe.so -/usr/lib/*/afb/helloWorld.so -/usr/lib/*/afb/demoContext.so -/usr/bin/afb-json2c -/usr/bin/afb-daemon -/usr/bin/afb-exprefs -/usr/bin/afb-client-demo -/usr/bin/afb-genskel diff --git a/packaging/debian.app-framework-binder-dev.install b/packaging/debian.app-framework-binder-dev.install deleted file mode 100644 index 28bedfd6..00000000 --- a/packaging/debian.app-framework-binder-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -/usr/include/afb/afb-daemon-v1.h -/usr/include/afb/afb-req-itf.h -/usr/include/afb/afb-session-v1.h -/usr/include/afb/afb-event-itf.h -/usr/include/afb/afb-auth.h -/usr/include/afb/afb-ws-client.h -/usr/include/afb/afb-session-v2.h -/usr/include/afb/afb-daemon-v2.h -/usr/include/afb/afb-service-itf.h -/usr/include/afb/afb-binding-v2.h -/usr/include/afb/afb-service-common.h -/usr/include/afb/afb-binding.h -/usr/include/afb/afb-binding-v1.h -/usr/include/afb/afb-wsj1.h -/usr/include/afb/afb-service-v2.h -/usr/include/afb/afb-service-v1.h -/usr/include/afb/afb-daemon-common.h -/usr/lib/*/pkgconfig/libafbwsc.pc -/usr/lib/*/pkgconfig/afb-daemon.pc -/usr/lib/*/libafbwsc.so diff --git a/packaging/debian.changelog b/packaging/debian.changelog deleted file mode 100644 index c1b0e043..00000000 --- a/packaging/debian.changelog +++ /dev/null @@ -1,5 +0,0 @@ -app-framework-binder (2.0-0) unstable; urgency=low - - * init build - - -- Ronan Le Martret Mon, 25 Dec 2007 10:50:38 +0100 diff --git a/packaging/debian.compat b/packaging/debian.compat deleted file mode 100644 index 45a4fb75..00000000 --- a/packaging/debian.compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/packaging/debian.control b/packaging/debian.control deleted file mode 100644 index e75a5be1..00000000 --- a/packaging/debian.control +++ /dev/null @@ -1,25 +0,0 @@ -Priority: optional -Maintainer: unknown -Source: app-framework-binder -Build-Depends: debhelper (>= 5), - libmicrohttpd-dev , - cmake, - libsystemd-dev, - libssl-dev, - uuid-dev, - libgcrypt20-dev, - libjson-c-dev, - libmagic-dev -Standards-Version: 3.8.2 -Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder - -Package: app-framework-binder-bin -Section: libs -Architecture: any -Description: app-framework-binder - -Package: app-framework-binder-dev -Section: libs -Architecture: any -Description: app-framework-binder-devel - diff --git a/packaging/debian.rules b/packaging/debian.rules deleted file mode 100644 index 560cf415..00000000 --- a/packaging/debian.rules +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - # - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - mkdir -p build - cd build;cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr;$(MAKE) - # - touch build-stamp - -clean: - #dh_testdir - dh_testroot - rm -f configure-stamp build-stamp - [ ! -f Makefile ] || $(MAKE) distclean - #dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - # Add here commands to install the package into debian/tmp - [ -d build ] && cd build;make install DESTDIR=/usr/src/packages/BUILD/debian/tmp - # Move all files in their corresponding package - dh_install --list-missing -s --sourcedir=debian/tmp - # empty dependency_libs in .la files - #sed -i "/dependency_libs/ s/'.*'/''/" `find debian/ -name '*.la'` - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_link - #dh_strip - dh_compress - dh_fixperms - dh_makeshlibs -V - #dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install -- cgit 1.2.3-korg