diff options
author | Oliver Smith <osmith@sysmocom.de> | 2019-11-28 11:21:12 +0100 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2019-11-28 11:53:09 +0100 |
commit | 71cfc2b90d4088f7bb8a637eeabec49a25fa1d34 (patch) | |
tree | 9bd7f4954ac7b1c8d56736bf3bc606a5d542e5f9 | |
parent | 15e943ab8b2fcac3b20dd839e0e5c7d3d69f596c (diff) |
Fix topdir Makefile and debian packaging0.6.1
Make building the debian packages work again. I've verified that it
works in my own OBS namespace.
This patch also adds missing pkgconf variables in host/Makefile.am, so
libosmo-simtrace2.pc installs properly.
Related: OS#4283
Fixes: 964cda309dc699a293692d5e2549ae80b5b9bd11 ("host: use autotools and split shared code to libosmo-simtrace2")
Change-Id: I2377de1e8b149520922217a1ab16f6e22fe6462a
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 36 | ||||
-rw-r--r-- | debian/libosmo-simtrace2-0.install | 1 | ||||
-rw-r--r-- | debian/libosmo-simtrace2-dev.install | 5 | ||||
-rwxr-xr-x | debian/rules | 15 | ||||
-rw-r--r-- | host/Makefile.am | 3 |
7 files changed, 72 insertions, 3 deletions
@@ -17,10 +17,15 @@ fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem utils: - make -C host + (cd host && \ + autoreconf -fi && \ + ./configure --prefix=/usr --disable-werror && \ + make) clean: fw-clean - make -C host clean + if [ -e host/Makefile ]; then \ + make -C host clean; \ + fi install: make -C firmware install diff --git a/debian/changelog b/debian/changelog index a3da488..ccebd49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +simtrace2 (0.5.2) UNRELEASED; urgency=medium + + * adapt to host tools in autotools + + -- Harald Welte <lafore@gnumonks.org> Thu, 28 Nov 2019 00:44:57 +0100 + simtrace2 (0.5.1) unstable; urgency=medium * Backwards-compatibility with older (released, non-master) libosmocore diff --git a/debian/control b/debian/control index f30b1d3..cbe9f75 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,13 @@ Maintainer: Harald Welte <laforge@gnumonks.org> Section: devel Priority: optional Build-Depends: debhelper (>= 9), + autotools-dev, + autoconf, + automake, + libtool, + pkg-config, + git, + dh-autoreconf, libosmocore-dev, libpcsclite-dev, libnewlib-arm-none-eabi, @@ -26,6 +33,33 @@ Package: simtrace2-utils Section: devel Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libosmo-simtrace2-0 Recommends: simtrace2-firmware Description: Host utilities to communicate with SIMtrace2 USB Devices. + +Package: libosmo-simtrace2-0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmocom SIMtrace2 library + This library contains core "driver" functionality to interface with the + Osmocom SIMtrace2 (and compatible) USB device firmware. It enables + applications to implement SIM card / smart card tracing as well as + SIM / smart card emulation functions. + +Package: libosmo-simtrace2-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-simtrace2-0, ${misc:Depends} +Description: Development headers for Osmocom SIMtrace2 library + This library contains core "driver" functionality to interface with the + Osmocom SIMtrace2 (and compatible) USB device firmware. It enables + applications to implement SIM card / smart card tracing as well as + SIM / smart card emulation functions. + . + The header files provided by this package may be used to develop + with any of the libosmocore libraries. + . + Also static libraries are installed with this package. diff --git a/debian/libosmo-simtrace2-0.install b/debian/libosmo-simtrace2-0.install new file mode 100644 index 0000000..383b232 --- /dev/null +++ b/debian/libosmo-simtrace2-0.install @@ -0,0 +1 @@ +usr/lib/libosmo-simtrace2*.so.* diff --git a/debian/libosmo-simtrace2-dev.install b/debian/libosmo-simtrace2-dev.install new file mode 100644 index 0000000..eec0e15 --- /dev/null +++ b/debian/libosmo-simtrace2-dev.install @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/lib*.la +usr/lib/pkgconfig/* diff --git a/debian/rules b/debian/rules index 2d33f6a..2c615db 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,19 @@ #!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions + + %: dh $@ + +override_dh_autoreconf: + cd host && dh_autoreconf diff --git a/host/Makefile.am b/host/Makefile.am index d1b3b31..de76851 100644 --- a/host/Makefile.am +++ b/host/Makefile.am @@ -5,6 +5,9 @@ SUBDIRS = include lib src contrib #tests examples doc EXTRA_DIST = .version git-version-gen +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libosmo-simtrace2.pc + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version |