From patchwork Fri Dec 22 06:03:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 10128825 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E2C56019D for ; Fri, 22 Dec 2017 06:03:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 102EE298AA for ; Fri, 22 Dec 2017 06:03:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04FC029909; Fri, 22 Dec 2017 06:03:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25CDD29D77 for ; Fri, 22 Dec 2017 06:03:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbdLVGDW (ORCPT ); Fri, 22 Dec 2017 01:03:22 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:38701 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752324AbdLVGDR (ORCPT ); Fri, 22 Dec 2017 01:03:17 -0500 Received: from mail-io0-f197.google.com ([209.85.223.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1eSGQO-0002et-2d for linux-wireless@vger.kernel.org; Fri, 22 Dec 2017 06:03:16 +0000 Received: by mail-io0-f197.google.com with SMTP id 79so3271469iou.19 for ; Thu, 21 Dec 2017 22:03:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vhz+HMspGakuunmxpiToZX+NhKQXnhMrrKG0vg0fUCo=; b=dYFrO2WVRuznKrzX7rY81zlgE7AY/8pct/7RbWtBwN+hGcq+2QbjC2tjRH4TlOX5lM vumTDAC6CtghHuag2GsYm4zMY4T2In0ZrRXqUWUjpQ+JRq1JRBHaQ4iMg8SN9e9LDbZt xBCxMggWIg3XFq2B/VboQLr3g+XspC5d58IH/A+4maYf7KZHyG3V6MwUh4qHQmBqbl48 th2qnriiiT9nIaeL6YVjpXnsz/haIzq3adRafLwrEW8Tp0xMOHrI53ylN5QbSFWwK1ss GCp3r5Mv9j/F/9BfsjrR0RA2tVU68r31gakgGBLepe41lQGQitWwLPAIRYy4sUMIY/CM k4Dw== X-Gm-Message-State: AKGB3mJshyTddBQM7EaVry3eUAmX1aQ2GZU+6Aa412VLWHRQQgmdHG/m z6LJbuhJ7S8qH+Fdjl/C9LY9BWgKpy97A0lsSlsyx/V2hzMRbS/HlzE10WhgxVJBwLdnV3UO4Cw 9TPnG995lEnZrzkgAjJ/VDJUWidz29xBm1ImzmpWEZ/V8 X-Received: by 10.36.150.67 with SMTP id z64mr17039137itd.72.1513922594824; Thu, 21 Dec 2017 22:03:14 -0800 (PST) X-Google-Smtp-Source: ACJfBosLF77C1BTUs/dnmx93woDRhob7oSGycbl86GOmMEMLNM4eUvXFhDpkXoRO8YbmGKFB9Ik86Q== X-Received: by 10.36.150.67 with SMTP id z64mr17039114itd.72.1513922594536; Thu, 21 Dec 2017 22:03:14 -0800 (PST) Received: from localhost ([2605:a601:aae:1b20:ed05:64dd:188e:d39c]) by smtp.gmail.com with ESMTPSA id q17sm885078ioi.54.2017.12.21.22.03.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Dec 2017 22:03:13 -0800 (PST) From: Seth Forshee To: linux-wireless@vger.kernel.org, wireless-regdb@lists.infradead.org Cc: Johannes Berg Subject: [PATCH 5/6] wireless-regdb: Install regulatory.db and regulatory.db.p7s to /lib/firmware Date: Fri, 22 Dec 2017 00:03:02 -0600 Message-Id: <20171222060303.14478-6-seth.forshee@canonical.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171222060303.14478-1-seth.forshee@canonical.com> References: <20171222060303.14478-1-seth.forshee@canonical.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP regulatory.db is being installed to the CRDA path, however the kernel expects it to be in /lib/firmware. Install it to the proper location. Also install the detached signature, which is needed for the kernel to check verify the database authenticity. Signed-off-by: Seth Forshee --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 044251f64785..1e8e84c64149 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ PREFIX ?= /usr CRDA_PATH ?= $(PREFIX)/lib/crda CRDA_KEY_PATH ?= $(CRDA_PATH)/pubkeys +FIRMWARE_PATH ?= /lib/firmware MANDIR ?= $(PREFIX)/share/man/ @@ -117,10 +118,12 @@ install-distro-key: maintainer-clean $(DISTRO_PRIVKEY) install: regulatory.bin.5.gz regulatory.db.5.gz install -m 755 -d $(DESTDIR)/$(CRDA_PATH) install -m 755 -d $(DESTDIR)/$(CRDA_KEY_PATH) + install -m 755 -d $(DESTDIR)/$(FIRMWARE_PATH) if [ -f .custom ]; then \ install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(shell cat .custom); \ fi install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(REGDB_UPSTREAM_PUBKEY) - install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin regulatory.db + install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin + install -m 644 -t $(DESTDIR)/$(FIRMWARE_PATH) regulatory.db regulatory.db.p7s install -m 755 -d $(DESTDIR)/$(MANDIR)/man5/ install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz