Change in osmo-remsim[master]: fix debian build after introducing hack around usbdropdir

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Wed Mar 4 15:50:04 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17360 )

Change subject: fix debian build after introducing hack around usbdropdir
......................................................................

fix debian build after introducing hack around usbdropdir

In Change-Id I87c68e8d14f8ddb6054178118ff1f96216483f5c we introduced
a hack to fix 'make distcheck' which in turn broke debian packaging.

Let's make sure the latter works while the formar also still does.

Change-Id: I16f7d0e8b7f63ed58dd4939c88e5276185bc3178
---
M debian/rules
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/debian/rules b/debian/rules
index a36fe36..2714cc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 
+USBDROPDIR := $(shell pkg-config --variable=usbdropdir libpcsclite)
+
 #export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -12,7 +14,9 @@
 	dh $@ --with=systemd --with autoreconf --fail-missing
 
 override_dh_auto_configure:
-	dh_auto_configure --  --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+	dh_auto_configure --	--with-systemdsystemunitdir=/lib/systemd/system \
+				--with-usbdropdir=$(USBDROPDIR) \
+				--enable-manuals
 
 #override_dh_clean:
 #	dh_clean

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17360
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I16f7d0e8b7f63ed58dd4939c88e5276185bc3178
Gerrit-Change-Number: 17360
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200304/d7cb56ed/attachment.htm>


More information about the gerrit-log mailing list