CRDA_PATH fixes for wireless-regdb.git

PATCH Daniel Mierswa 2 participants 3 messages Mar 4, 2009 Kbuild

Share & tools

Daniel Mierswa

author

2009-03-04 02:43 UTC #0 lore raw

Heya, i just found that there was a typo in your Makefile and debian-examples dir.
I fixed those plus also give the user the chance to override CRDA_PATH (I use /lib64 since I like the idea of having all necessary stuff to get wireless connected in superuser reach). :)
Feedback welcomed.

Signature · 5 lines

Mierswa, Daniel

If you still don't like it, that's ok: that's why I'm boss. I simply
know better than you do.
               --- Linus Torvalds, comp.os.linux.advocacy, 1996/07/22

Quoted 1 line

From 14a0da690de4e8803809f5da970b42c953990f03 Mon Sep 17 00:00:00 2001

From: Daniel Mierswa <[email protected]>
Date: Thu, 5 Feb 2009 02:11:41 +0100
Subject: [PATCH] CDRA_PATH typo, also let user override CRDA_PATH

---
 Makefile             |    6 +++---
 debian-example/rules |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Makefile +3 -3

index a719f59..32626a1 100644
@@ -1,6 +1,6 @@
 # Install prefix
 PREFIX = /usr
-CDRA_PATH = $(PREFIX)/lib/crda
+CRDA_PATH ?= $(PREFIX)/lib/crda
 
 MANDIR ?= $(PREFIX)/share/man/

@@ -32,7 +32,7 @@ key.priv.pem:
 # Distributions wishing to just use John's database
 # can just call make install.
 install: regulatory.bin.5.gz
-	install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CDRA_PATH)
-	install -o 0 -g 0 -m 644 regulatory.bin $(DESTDIR)/$(CDRA_PATH)/regulatory.bin
+	install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CRDA_PATH)
+	install -o 0 -g 0 -m 644 regulatory.bin $(DESTDIR)/$(CRDA_PATH)/regulatory.bin
 	mkdir -p $(DESTDIR)/$(MANDIR)/man5/
 	install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz

debian-example/rules +3 -3

index dab9255..34a08a5 100755
@@ -3,8 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 PREFIX = /usr
-CDRA_LIB = $(PREFIX)/lib/crda
+CRDA_LIB ?= $(PREFIX)/lib/crda
 
 install/wireless-regdb::
-	install -o 0 -g 0 -m 755 -d debian/$(cdbs_curpkg)/$(CDRA_LIB)
-	install -o 0 -g 0 -m 644 regulatory.bin debian/$(cdbs_curpkg)/$(CDRA_LIB)/regulatory.bin
+	install -o 0 -g 0 -m 755 -d debian/$(cdbs_curpkg)/$(CRDA_LIB)
+	install -o 0 -g 0 -m 644 regulatory.bin debian/$(cdbs_curpkg)/$(CRDA_LIB)/regulatory.bin

Signature · 1 line

1.6.1.2

Luis R. Rodriguez

2009-03-04 02:52 UTC #1 lore raw

On Tue, Mar 3, 2009 at 6:44 PM, Daniel Mierswa <[email protected]> wr= ote:

Quoted 3 lines

Heya, i just found that there was a typo in your Makefile and debian-examples dir.
I fixed those plus also give the user the chance to override CRDA_PAT=

Quoted 1 line

(I use /lib64 since I like the idea of having all necessary stuff to =

get

Quoted 9 lines

wireless connected in superuser reach). :)
Feedback welcomed.
--
Mierswa, Daniel
If you still don't like it, that's ok: that's why I'm boss. I simply know better than you do.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --- Linus Torvalds, =

comp.os.linux.advocacy, 1996/07/22

Quoted 4 lines

From 14a0da690de4e8803809f5da970b42c953990f03 Mon Sep 17 00:00:00 200=

Quoted 6 lines

From: Daniel Mierswa <[email protected]>
Date: Thu, 5 Feb 2009 02:11:41 +0100
Subject: [PATCH] CDRA_PATH typo, also let user override CRDA_PATH
---
=C2=A0Makefile =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=

=A06 +++---

Quoted 16 lines

=C2=A0debian-example/rules | =C2=A0 =C2=A06 +++--- =C2=A02 files changed, 6 insertions(+), 6 deletions(-)
Makefile +0 -0
index a719f59..32626a1 100644
@@ -1,6 +1,6 @@
=C2=A0# Install prefix
=C2=A0PREFIX =3D /usr
Makefile +1 -1
-CDRA_PATH =3D $(PREFIX)/lib/crda
+CRDA_PATH ?=3D $(PREFIX)/lib/crda
=C2=A0MANDIR ?=3D $(PREFIX)/share/man/
Makefile +0 -0
@@ -32,7 +32,7 @@ key.priv.pem:

Quoted 4 lines

=C2=A0# Distributions wishing to just use John's database =C2=A0# can just call make install.
=C2=A0install: regulatory.bin.5.gz
- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CDRA_=

PATH)

Quoted 1 line

- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin $(DEST=

DIR)/$(CDRA_PATH)/regulatory.bin

Quoted 1 line

+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CRDA_=

PATH)

Quoted 1 line

+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin $(DEST=

DIR)/$(CRDA_PATH)/regulatory.bin

Quoted 2 lines

=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p $(DESTDIR)/$(MANDIR)/man5/ =C2=A0 =C2=A0 =C2=A0 =C2=A0install -m 644 -t $(DESTDIR)/$(MANDIR)/man=

5/ regulatory.bin.5.gz

Quoted 11 lines

debian-example/rules +0 -0
index dab9255..34a08a5 100755
@@ -3,8 +3,8 @@
=C2=A0include /usr/share/cdbs/1/rules/debhelper.mk
=C2=A0PREFIX =3D /usr
debian-example/rules +1 -1
-CDRA_LIB =3D $(PREFIX)/lib/crda
+CRDA_LIB ?=3D $(PREFIX)/lib/crda

Quoted 2 lines

=C2=A0install/wireless-regdb::
- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d debian/$(cdbs_curp=

kg)/$(CDRA_LIB)

Quoted 1 line

- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin debian=

/$(cdbs_curpkg)/$(CDRA_LIB)/regulatory.bin

Quoted 1 line

+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d debian/$(cdbs_curp=

kg)/$(CRDA_LIB)

Quoted 1 line

+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin debian=

/$(cdbs_curpkg)/$(CRDA_LIB)/regulatory.bin

Quoted 1 line

--

Patch doesn't apply.

mcgrof@tesla ~/devel/crda (git::master)$ git describe v1.0.1-10-g479ca1d

mcgrof@tesla ~/devel/crda (git::master)$ patch -p1 < =2E./../patches/crda-fix-path.patch
patching file Makefile
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 32.
2 out of 2 hunks FAILED -- saving rejects to file Makefile.rej patching file debian-example/rules
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file debian-example/rules.r= ej

Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Luis R. Rodriguez

2009-03-04 18:53 UTC #2 lore raw

On Tue, Mar 3, 2009 at 6:52 PM, Luis R. Rodriguez <[email protected]> wr= ote:

Quoted 1 line

On Tue, Mar 3, 2009 at 6:44 PM, Daniel Mierswa <[email protected]> =

Quoted 3 lines · wrote:

Quoted 3 lines
Heya, i just found that there was a typo in your Makefile and debian-examples dir.
I fixed those plus also give the user the chance to override CRDA_PA=

Quoted 1 line

Quoted 1 line
(I use /lib64 since I like the idea of having all necessary stuff to=

get

Quoted 9 lines

Quoted 9 lines
wireless connected in superuser reach). :)
Feedback welcomed.
--
Mierswa, Daniel
If you still don't like it, that's ok: that's why I'm boss. I simply know better than you do.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --- Linus Torvalds,=

comp.os.linux.advocacy, 1996/07/22

Quoted 4 lines

Quoted 4 lines
From 14a0da690de4e8803809f5da970b42c953990f03 Mon Sep 17 00:00:00 20=

Quoted 6 lines

Quoted 6 lines
From: Daniel Mierswa <[email protected]>
Date: Thu, 5 Feb 2009 02:11:41 +0100
Subject: [PATCH] CDRA_PATH typo, also let user override CRDA_PATH
---
=C2=A0Makefile =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=

=A06 +++---

Quoted 13 lines

Quoted 13 lines
=C2=A0debian-example/rules | =C2=A0 =C2=A06 +++--- =C2=A02 files changed, 6 insertions(+), 6 deletions(-)
Makefile +0 -0
index a719f59..32626a1 100644
@@ -1,6 +1,6 @@
=C2=A0# Install prefix
=C2=A0PREFIX =3D /usr
Makefile +1 -1
-CDRA_PATH =3D $(PREFIX)/lib/crda
+CRDA_PATH ?=3D $(PREFIX)/lib/crda

Quoted 7 lines

Quoted 7 lines
=C2=A0MANDIR ?=3D $(PREFIX)/share/man/
Makefile +0 -0
@@ -32,7 +32,7 @@ key.priv.pem:
=C2=A0# Distributions wishing to just use John's database =C2=A0# can just call make install.
=C2=A0install: regulatory.bin.5.gz
- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CDRA=

_PATH)

Quoted 1 line

Quoted 1 line
- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin $(DES=

TDIR)/$(CDRA_PATH)/regulatory.bin

Quoted 1 line

Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CRDA=

_PATH)

Quoted 1 line

Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin $(DES=

TDIR)/$(CRDA_PATH)/regulatory.bin

Quoted 2 lines

Quoted 2 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p $(DESTDIR)/$(MANDIR)/man5/ =C2=A0 =C2=A0 =C2=A0 =C2=A0install -m 644 -t $(DESTDIR)/$(MANDIR)/ma=

n5/ regulatory.bin.5.gz

Quoted 7 lines

Quoted 7 lines
debian-example/rules +0 -0
index dab9255..34a08a5 100755
@@ -3,8 +3,8 @@
=C2=A0include /usr/share/cdbs/1/rules/debhelper.mk

Quoted 6 lines

Quoted 6 lines
=C2=A0PREFIX =3D /usr
debian-example/rules +1 -1
-CDRA_LIB =3D $(PREFIX)/lib/crda
+CRDA_LIB ?=3D $(PREFIX)/lib/crda
=C2=A0install/wireless-regdb::
- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d debian/$(cdbs_cur=

pkg)/$(CDRA_LIB)

Quoted 1 line

Quoted 1 line
- =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin debia=

n/$(cdbs_curpkg)/$(CDRA_LIB)/regulatory.bin

Quoted 1 line

Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 755 -d debian/$(cdbs_cur=

pkg)/$(CRDA_LIB)

Quoted 1 line

Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 install -o 0 -g 0 -m 644 regulatory.bin debia=

n/$(cdbs_curpkg)/$(CRDA_LIB)/regulatory.bin

Quoted 7 lines

Quoted 1 line
--
Patch doesn't apply.
mcgrof@tesla ~/devel/crda (git::master)$ git describe v1.0.1-10-g479ca1d

Quoted 9 lines

mcgrof@tesla ~/devel/crda (git::master)$ patch -p1 < ../../patches/crda-fix-path.patch
patching file Makefile
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 32.
2 out of 2 hunks FAILED -- saving rejects to file Makefile.rej patching file debian-example/rules
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file debian-example/rules=

=2Erej

This patch is for John, not me.

Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html