From: Markus Pargmann <mpa@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Markus Pargmann <mpa@pengutronix.de>
Subject: [ptxdist] [PATCH 3/4] crda: Fix udev rule
Date: Tue, 17 Jun 2014 10:25:17 +0200 [thread overview]
Message-ID: <1402993518-27068-3-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1402993518-27068-1-git-send-email-mpa@pengutronix.de>
The first udev event that is received by udev, is called without a
COUNTRY environment variable. This udev rule change fixes this
behavior by setting the COUNTRY environment variable for add events to
00, world regulatory domain.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch | 2 +-
patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch | 2 +-
patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch | 9 +++++----
patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch | 2 +-
patches/crda-3.13/0005-fix-linking-libreg.patch | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch b/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
index 74473b0c4a38..e3fe28c75b5b 100644
--- a/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
+++ b/patches/crda-3.13/0001-key2pub-Fix-ssl-keys.c-generation.patch
@@ -11,7 +11,7 @@ Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/key2pub.py b/utils/key2pub.py
-index 3e84cd2..7de45f7 100755
+index 3e84cd2a934d..7de45f7b9603 100755
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -59,7 +59,7 @@ def print_ssl_32(output, name, val):
diff --git a/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch b/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch
index c6405de89dc9..813ad4275984 100644
--- a/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch
+++ b/patches/crda-3.13/0002-Pregenerate-keys-ssl.c.patch
@@ -10,7 +10,7 @@ Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
diff --git a/keys-ssl.c b/keys-ssl.c
new file mode 100644
-index 0000000..7318c03
+index 000000000000..7318c036a1f9
--- /dev/null
+++ b/keys-ssl.c
@@ -0,0 +1,41 @@
diff --git a/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch b/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
index 68e85094880d..551b84bf68ad 100644
--- a/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
+++ b/patches/crda-3.13/0003-udev-Fix-rule-for-initial-setup.patch
@@ -4,16 +4,17 @@ Subject: [PATCH] udev: Fix rule for initial setup
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
- udev/regulatory.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ udev/regulatory.rules | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/udev/regulatory.rules b/udev/regulatory.rules
-index 3d6add8..90ac539 100644
+index 3d6add895784..98296961f0ed 100644
--- a/udev/regulatory.rules
+++ b/udev/regulatory.rules
-@@ -2,4 +2,4 @@
+@@ -2,4 +2,5 @@
# For more information see:
# http://wireless.kernel.org/en/developers/Regulatory/CRDA
-KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)crda"
++KERNEL=="regulatory*", ACTION=="add", SUBSYSTEM=="platform", ENV{COUNTRY}="00"
+KERNEL=="regulatory*", ACTION=="add|change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)crda"
diff --git a/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch b/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
index ceaa19f2ef75..ef02358d6e4e 100644
--- a/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
+++ b/patches/crda-3.13/0004-Makefile-Fix-libreg-build.patch
@@ -8,7 +8,7 @@ Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
-index 4a351c6..b07d8ad 100644
+index 4a351c645bf4..b07d8ad8b690 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.g
diff --git a/patches/crda-3.13/0005-fix-linking-libreg.patch b/patches/crda-3.13/0005-fix-linking-libreg.patch
index 0229c09f24ce..fdb78ceaade2 100644
--- a/patches/crda-3.13/0005-fix-linking-libreg.patch
+++ b/patches/crda-3.13/0005-fix-linking-libreg.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
-index b07d8ad..2d6747c 100644
+index b07d8ad8b690..2d6747cd6cde 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
--
2.0.0
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-06-17 8:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 8:25 [ptxdist] [PATCH 1/4] radvd: Initial commit Markus Pargmann
2014-06-17 8:25 ` [ptxdist] [PATCH 2/4] alfred: " Markus Pargmann
2014-06-17 8:25 ` Markus Pargmann [this message]
2014-06-17 8:25 ` [ptxdist] [PATCH 4/4] cppzmq: zmq header for C++ Markus Pargmann
2014-06-17 12:26 ` Alexander Aring
2014-06-18 9:09 ` Markus Pargmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402993518-27068-3-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox