mirror of https://gerrit.osmocom.org/simtrace2
Fix topdir Makefile and debian packaging
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: 964cda309d
("host: use autotools and split shared code to libosmo-simtrace2")
Change-Id: I2377de1e8b149520922217a1ab16f6e22fe6462a
This commit is contained in:
parent
15e943ab8b
commit
71cfc2b90d
9
Makefile
9
Makefile
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
usr/lib/libosmo-simtrace2*.so.*
|
|
@ -0,0 +1,5 @@
|
|||
usr/include/*
|
||||
usr/lib/lib*.a
|
||||
usr/lib/lib*.so
|
||||
usr/lib/lib*.la
|
||||
usr/lib/pkgconfig/*
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue