debian: Add packaging to master taken from fairwaves/master
diff mbox

Message ID 1458328571-87908-1-git-send-email-holger@freyther.de
State New
Headers show

Commit Message

Holger Freyther March 18, 2016, 7:16 p.m. UTC
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>

There doesn't seem to be a reason why this shouldn't be in master.
The fairwaves/master branch is removing --march=native as well that
looks like a good idea as well.
---
 debian/changelog        | 11 +++++++++++
 debian/compat           |  1 +
 debian/control          | 24 ++++++++++++++++++++++++
 debian/copyright        | 25 +++++++++++++++++++++++++
 debian/osmo-trx.install |  1 +
 debian/rules            | 15 +++++++++++++++
 debian/source/format    |  1 +
 7 files changed, 78 insertions(+)
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/osmo-trx.install
 create mode 100755 debian/rules
 create mode 100644 debian/source/format

Comments

Sylvain Munaut March 18, 2016, 7:18 p.m. UTC | #1
> dh_auto_configure -- --without-sse CFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2" CXXFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2"

This seem awfully specific.

Cheers,

   Sylvain
Holger Freyther March 18, 2016, 7:22 p.m. UTC | #2
> On 18 Mar 2016, at 20:18, Sylvain Munaut <246tnt@gmail.com> wrote:

Hi!


>> dh_auto_configure -- --without-sse CFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2" CXXFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2"
> 
> This seem awfully specific.


you are right. To make it worse the Makefile.am is having an -march=native in it as well. I should probably post without these flags and for now we will end up by the caps whatever the kvm builder has.

I had sent a separate mail in regard to using the ifunc function attribute to determine which routines to you.

holger
Holger Freyther March 20, 2016, 5:26 p.m. UTC | #3
> On 19 Mar 2016, at 22:48, Alexander Chemeris <alexander.chemeris@gmail.com> wrote:
> 
> On Fri, Mar 18, 2016 at 10:22 PM, Holger Freyther <holger@freyther.de> wrote:
>> 
>>> On 18 Mar 2016, at 20:18, Sylvain Munaut <246tnt@gmail.com> wrote:
>>>> dh_auto_configure -- --without-sse CFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2" CXXFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2"
>>> 
>>> This seem awfully specific.
>> 
>> 
>> you are right. To make it worse the Makefile.am is having an -march=native in it as well. I should probably post without these flags and for now we will end up by the caps whatever the kvm builder has.
> 
> AFAIR the detection of capabilities in osmo-trx is based on CPUID, so
> you'll get whatever your real CPU is having. If you're running on
> anything decent, you'll get SSE4.1 detected and it'll crash on Atoms.
> That's why we had those flags built in. With those flags it builds
> without SSE4.1 optimizations and can run on both Atoms and Core's,
> since Atom is a kind of a lowest common denominator. So I suggest you
> leave them until a runtime detection is implemented.


#ifdef HAVE_SSE3 doesn't look like a lot like runtime detection based on CPU capabilities, my interest right now is limited to make packages available to a greater community, performance will then probably come next.

holger
Neels Hofmeyr March 21, 2016, 11:15 a.m. UTC | #4
On Fri, Mar 18, 2016 at 08:16:11PM +0100, Holger Hans Peter Freyther wrote:
> There doesn't seem to be a reason why this shouldn't be in master.
> The fairwaves/master branch is removing --march=native as well that
> looks like a good idea as well.

This log message is really hard to read.

> --- /dev/null
> +++ b/debian/changelog
> @@ -0,0 +1,11 @@
> +osmo-trx (0.1.9) trusty; urgency=medium
> +
> +  * Ask Ivan, really

this is not changelog worthy

> + -- Kirill Zakharenko <earwin@gmail.com>  Thu, 16 Jul 2015 12:13:46 +0000
> +
> +osmo-trx (0.1.8) precise; urgency=low
> +
> +     * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP
> +

#nnnn and a truncated line??


I would appreciate if you would at least read the English in your commits
once. There's a point in not wasting too much time on these details, but
it's not balanced if N people have to figure out what the author meant :)

~Neels
Holger Freyther March 21, 2016, 2:59 p.m. UTC | #5
> On 21 Mar 2016, at 12:15, Neels Hofmeyr <nhofmeyr@sysmocom.de> wrote:
> 
> On Fri, Mar 18, 2016 at 08:16:11PM +0100, Holger Hans Peter Freyther wrote:
>> There doesn't seem to be a reason why this shouldn't be in master.
>> The fairwaves/master branch is removing --march=native as well that
>> looks like a good idea as well.
> 
> This log message is really hard to read.

Okay, I had pushed this morning but I see the double negations. "There is no reason to keep this in a vendor branch" is more clear.



> 
>> --- /dev/null
>> +++ b/debian/changelog
>> @@ -0,0 +1,11 @@
>> +osmo-trx (0.1.9) trusty; urgency=medium
>> +
>> +  * Ask Ivan, really
> 
> this is not changelog worthy

Well, I had the option to start with a clean slate or takes this from Fairwaves as well. It is not a great changelog entry but I thought it is better than omitting it.


> I would appreciate if you would at least read the English in your commits
> once. There's a point in not wasting too much time on these details, but
> it's not balanced if N people have to figure out what the author meant :)

sure.

Patch
diff mbox

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..511fcb7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,11 @@ 
+osmo-trx (0.1.9) trusty; urgency=medium
+
+  * Ask Ivan, really
+
+ -- Kirill Zakharenko <earwin@gmail.com>  Thu, 16 Jul 2015 12:13:46 +0000
+
+osmo-trx (0.1.8) precise; urgency=low
+
+     * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP
+
+ -- Ivan Klyuchnikov <Ivan.Kluchnikov@fairwaves.ru>  Sun, 9 Mar 2014 14:10:10 +0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@ 
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0aef88e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@ 
+Source: osmo-trx
+Maintainer: Ivan Klyuchnikov <ivan.kluchnikov@fairwaves.ru>
+Section: net
+Priority: optional
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), autotools-dev, libdbd-sqlite3, pkg-config, dh-autoreconf, libuhd-dev, libusb-1.0-0-dev, libboost-all-dev, hardening-wrapper
+Homepage: http://openbsc.osmocom.org/trac/wiki/OsmoTRX
+Vcs-Git: git://git.osmocom.org/osmo-trx
+Vcs-Browser: http://cgit.osmocom.org/osmo-trx
+
+Package: osmo-trx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-sqlite3
+Description: OsmoTRX is a software-defined radio transceiver that implements the Layer 1 physical layer of a BTS
+
+Package: osmo-trx-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: osmo-trx (= ${binary:Version}), ${misc:Depends}
+Description: Debug symbols for the osmo-trx
+ Make debugging possible
+
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5f8836d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,25 @@ 
+The Debian packaging is:
+
+    Copyright (C) 2014 Max <max.suraev@fairwaves.ru>
+
+It was downloaded from:
+
+    git://git.osmocom.org/osmo-trx
+
+Upstream Authors:
+
+    Thomas Tsou <tom@tsou.cc>
+    David A. Burgess <dburgess@kestrelsp.com>
+    Harvind S. Samra <hssamra@kestrelsp.com>
+    Raffi Sevlian <raffisev@gmail.com>
+
+Copyright:
+
+     Copyright (C) 2012-2013 Thomas Tsou <tom@tsou.cc>
+     Copyright (C) 2011 Range Networks, Inc.
+     Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+License:
+
+    GNU Affero General Public License, Version 3
+
diff --git a/debian/osmo-trx.install b/debian/osmo-trx.install
new file mode 100644
index 0000000..574e915
--- /dev/null
+++ b/debian/osmo-trx.install
@@ -0,0 +1 @@ 
+/usr/bin/osmo-trx
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4f7cf6c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,15 @@ 
+#!/usr/bin/make -f
+
+DEB_BUILD_HARDENING=1
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	dh_auto_configure -- --without-sse CFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2" CXXFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2"
+
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
+override_dh_strip:
+	dh_strip --dbg-package=osmo-trx-dbg
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..9f67427
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@ 
+3.0 (native)
\ No newline at end of file