Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp6162008ybi; Wed, 31 Jul 2019 09:20:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzpSKw33Ayk0R3u3OiOdIKbJ1L3UU2OBv+IqOM8G1++JplxvXveY67ifP0e30+q7THQDePe X-Received: by 2002:a17:90a:1ae2:: with SMTP id p89mr3598280pjp.26.1564590007854; Wed, 31 Jul 2019 09:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564590007; cv=none; d=google.com; s=arc-20160816; b=fbOhpsMTIUSFokLCqdtPDtybAHl33uGxMD/c8GxbaEFFaPJ7+WKLmr12X2aZgIlfjA Fqa85aK8EL7ujUgLe0rKrJWux04VyLbRUoKu8qnX0F1/cotEBFRNoFoo6XzfgmMi/Eoi bMrLYWWc3/xPyLZVHKQWUzSX8LJr+J0TUqZ1cm7fcRzvuqL5QXMtZHCGLlqBj2GycdgR om+Hrs7+VJcip8nKCINqS9jGmjlYz5l/69VDe4sZZ3Tq60rVPraIdUQ9rLfpSr8brSfs OFBnm9233cly8K61fdV5SVIn46VmW6oHxXKRo+owHfUbeoXRPGQoe+W5C+AI7je+JB9N i+Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=R0QS2Kop47uMKikWLOp9xdydfC/BthlPKwj29QGBB7c=; b=u/Iopm/ePqW9ys0hYopdklKaBFyuz8paa1UbAM06MRyIwMHFntN/hDhj/n+mAmkje4 CjBzGnUBDb+GEadz7vXyQCeX8QolttxXNqIft+bvSn3bMgUIeu+WLf1vx8weEB+Aqgq1 k7VePjeBcacTSFEP5+vPNaH6EQdM0m3udDURpuKrw5w++nW0go/Gs+N5Py/jC6os95um ADyongWcX1dQyoRTnH3lEQ5vkFtGv4t7oAuENo7QEKAx9nWyP0F6RS/2ZQ/E6KpE3N6g nAIZEds5ukGNswNuPiir4qM3HS9VDX+sYyhvFKK83cMGaSiDC/EHp6oRX6Mfl0oJq0ch l1aw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c7si34881445pfi.253.2019.07.31.09.19.52; Wed, 31 Jul 2019 09:20:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728650AbfGaQRr (ORCPT + 99 others); Wed, 31 Jul 2019 12:17:47 -0400 Received: from mx2.suse.de ([195.135.220.15]:59890 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726962AbfGaQRq (ORCPT ); Wed, 31 Jul 2019 12:17:46 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C3600ADE0; Wed, 31 Jul 2019 16:17:45 +0000 (UTC) From: Takashi Iwai To: linux-firmware@kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH linux-firmware] Install only listed firmware files Date: Wed, 31 Jul 2019 18:17:44 +0200 Message-Id: <20190731161744.3612-1-tiwai@suse.de> X-Mailer: git-send-email 2.16.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current make-install procedure leaves lots of garbage files that aren't really firmware files in /lib/firmware. Instead of copy-all-and-prune approach, copy only the listed files and links in WHENCE by make-install for assuring only the proper firmware files. Signed-off-by: Takashi Iwai --- Makefile | 5 +---- copy-firmware.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100755 copy-firmware.sh diff --git a/Makefile b/Makefile index d1163b871096..16b5b1a02a49 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,4 @@ check: install: mkdir -p $(DESTDIR)$(FIRMWAREDIR) - cp -r * $(DESTDIR)$(FIRMWAREDIR) - rm -rf $(DESTDIR)$(FIRMWAREDIR)/usbdux - find $(DESTDIR)$(FIRMWAREDIR) \( -name 'WHENCE' -or -name 'LICENSE.*' -or \ - -name 'LICENCE.*' \) -exec rm -- {} \; + ./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR) diff --git a/copy-firmware.sh b/copy-firmware.sh new file mode 100755 index 000000000000..7b276e271cfa --- /dev/null +++ b/copy-firmware.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Copy firmware files based on WHENCE list +# + +verbose=: +if [ x"$1" = x"-v" ]; then + verbose=echo + shift +fi + +destdir="$1" + +grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do + test -f "$f" || continue + $verbose "copying file $f" + mkdir -p $destdir/$(dirname "$f") + cp -d "$f" $destdir/"$f" +done + +grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; do + test -L "$f" || continue + test -f "$destdir/$f" && continue + $verbose "copying link $f" + mkdir -p $destdir/$(dirname "$f") + cp -d "$f" $destdir/"$f" +done + +exit 0 -- 2.16.4