[PATCH crda 1/4] do not run ldconfig

[PATCH crda 1/4] do not run ldconfig

[Mike Frysinger]

From: Mike Frysinger <vapier@chromium.org>

Let the distro/user deal with ldconfig updating.  Running it blindly like
this breaks DESTDIR installs as `ldconfig` only operates on system paths.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index a3ead30..46c683d 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,6 @@ install-libreg:
 	$(NQ) '  INSTALL  libreg'
 	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
 	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
-	$(Q)ldconfig
 
 %.o: %.c regdb.h $(LIBREG)
 	$(NQ) '  CC  ' $@
-- 
2.3.1

[PATCH crda 2/4] allow people to turn off -Werror

[Mike Frysinger]

From: Mike Frysinger <vapier@chromium.org>

Forcing -Werror at build time easily breaks across compiler settings,
compiler versions, architectures, C libraries, etc...  Add a knob so
distro peeps can turn it off.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 46c683d..5f988f4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,9 @@ UDEV_RULE_DIR?=/lib/udev/rules.d/
 PUBKEY_DIR?=pubkeys
 RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
 
+WERROR = -Werror
 CFLAGS += -O2 -fpic
-CFLAGS += -std=gnu99 -Wall -Werror -pedantic
+CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic
 CFLAGS += -Wall -g
 LDLIBREG += -lreg
 LDLIBS += $(LDLIBREG)
-- 
2.3.1

[PATCH crda 3/4] fix openssl generation

[Mike Frysinger]

From: Mike Frysinger <vapier@chromium.org>

This file uses BN_ULONG but doesn't include the openssl headers leading
to build failures:
keys-ssl.c:2:8: error: unknown type name 'BN_ULONG'
 static BN_ULONG e_0[1] = {

The large unqualified constants also break building:
keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow]
  0x63a2705416a0d8e1, 0xdc9fca11c8ba757b,
  ^

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 utils/key2pub.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/key2pub.py b/utils/key2pub.py
index 3e84cd2..c504aca 100755
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val):
     for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
         if not idx:
             output.write('\t')
-        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
+        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
         idx += 1
         if idx == 2:
             idx = 0
@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val):
 def print_ssl(output, name, val):
     import struct
     output.write('#include <stdint.h>\n')
+    output.write('#include <openssl/bn.h>\n')
     if len(struct.pack('@L', 0)) == 8:
         return print_ssl_64(output, name, val)
     else:
-- 
2.3.1

[PATCH crda 4/4] clean up CFLAGS handling

[Mike Frysinger]

From: Mike Frysinger <vapier@chromium.org>

Rather than append -O2 -g all the time to the user's CFLAGS (and thus
clobbering whatever they have set up), initialize the default value to
that and let the user override it entirely.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5f988f4..8e345a1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,9 @@ PUBKEY_DIR?=pubkeys
 RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
 
 WERROR = -Werror
-CFLAGS += -O2 -fpic
+CFLAGS ?= -O2 -g
+CFLAGS += -fpic
 CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic
-CFLAGS += -Wall -g
 LDLIBREG += -lreg
 LDLIBS += $(LDLIBREG)
 LDLIBS += -lm
-- 
2.3.1

Re: [PATCH crda 2/4] allow people to turn off -Werror

[Johannes Berg]

On Wed, 2015-03-04 at 14:51 -0500, Mike Frysinger wrote:
> From: Mike Frysinger <vapier@chromium.org>
> 
> Forcing -Werror at build time easily breaks across compiler settings,
> compiler versions, architectures, C libraries, etc...  Add a knob so
> distro peeps can turn it off.

> +WERROR = -Werror

Doesn't that need ?= ?

johannes

Re: [PATCH crda 2/4] allow people to turn off -Werror

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 631 bytes --]

On 04 Mar 2015 20:53, Johannes Berg wrote:
> On Wed, 2015-03-04 at 14:51 -0500, Mike Frysinger wrote:
> > From: Mike Frysinger <vapier@chromium.org>
> > 
> > Forcing -Werror at build time easily breaks across compiler settings,
> > compiler versions, architectures, C libraries, etc...  Add a knob so
> > distro peeps can turn it off.
> 
> > +WERROR = -Werror
> 
> Doesn't that need ?= ?

yes, if you wanted to support:
	WERROR= make

but the expectation is that you'd do:
	make WERROR=

in which case this code is working as i intended.  if the maintainers want to 
use ?= then it doesn't matter to me.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH crda 2/4] allow people to turn off -Werror

[Johannes Berg]

On Wed, 2015-03-04 at 15:22 -0500, Mike Frysinger wrote:

> yes, if you wanted to support:
> 	WERROR= make
> 
> but the expectation is that you'd do:
> 	make WERROR=
> 
> in which case this code is working as i intended.

Oh, interesting, I wasn't even really aware of this difference :)

Heh. Goes to show why I shouldn't work with build systems ;-)

johannes

Re: [PATCH crda 2/4] allow people to turn off -Werror

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

On 04 Mar 2015 21:31, Johannes Berg wrote:
> On Wed, 2015-03-04 at 15:22 -0500, Mike Frysinger wrote:
> > yes, if you wanted to support:
> > 	WERROR= make
> > 
> > but the expectation is that you'd do:
> > 	make WERROR=
> > 
> > in which case this code is working as i intended.
> 
> Oh, interesting, I wasn't even really aware of this difference :)
> 
> Heh. Goes to show why I shouldn't work with build systems ;-)

no worries ... most people shouldn't ;)
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]