From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EOVoGuAwUF/NPwAA0tVLHw (envelope-from ) for ; Wed, 02 Sep 2020 23:55:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0J5IFuAwUF96UQAAB5/wlQ (envelope-from ) for ; Wed, 02 Sep 2020 23:55:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BD5E5940390 for ; Wed, 2 Sep 2020 23:55:11 +0000 (UTC) Received: from localhost ([::1]:43794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDcar-00005G-Hn for larch@yhetil.org; Wed, 02 Sep 2020 19:55:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDcak-00004s-OP for guix-patches@gnu.org; Wed, 02 Sep 2020 19:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDcak-0007qE-Fl for guix-patches@gnu.org; Wed, 02 Sep 2020 19:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDcak-0003UK-EQ for guix-patches@gnu.org; Wed, 02 Sep 2020 19:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 23:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Famulari Cc: maxim.cournoyer@gmail.com, 43173@debbugs.gnu.org X-Debbugs-Original-Cc: Maxim Cournoyer , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159909086213359 (code B ref -1); Wed, 02 Sep 2020 23:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2020 23:54:22 +0000 Received: from localhost ([127.0.0.1]:32874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDca2-0003TK-Kv for submit@debbugs.gnu.org; Wed, 02 Sep 2020 19:54:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:51612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDca1-0003TD-1i for submit@debbugs.gnu.org; Wed, 02 Sep 2020 19:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDca0-0008Kf-PO for guix-patches@gnu.org; Wed, 02 Sep 2020 19:54:16 -0400 Received: from world.peace.net ([64.112.178.59]:39498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDcZx-0007ir-SC for guix-patches@gnu.org; Wed, 02 Sep 2020 19:54:16 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kDcZv-0007fZ-Jc; Wed, 02 Sep 2020 19:54:11 -0400 From: Mark H Weaver In-Reply-To: <20200902221552.GA32317@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> <87363z28fs.fsf@netris.org> <20200902221552.GA32317@jasmine.lan> Date: Wed, 02 Sep 2020 19:53:02 -0400 Message-ID: <87zh67zqfa.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=64.112.178.59; envelope-from=mhw@netris.org; helo=world.peace.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 19:54:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: 5piXj5aC22Pk Hi Leo, Leo Famulari writes: > We would still be able to use that method, by effectively reverting this > patch, as desired. I suppose that's true. Fair enough :) > The intended effect of this patch is that it will not be possible to > accidentally use the incorrect deblob scripts. I agree that it would be good to prevent this. > I think we should try to make it harder to make mistakes, but not forget > that we can remove the guardrails when we want to. That makes sense. I withdraw my objection to the overall approach, but I have a suggestion regarding the file organization: Instead of having all 'linux-libre-*-version' definitions in one section, all 'deblob-scripts-*' definitions in a second section, and all 'linux-libre-*-pristine-source' definitions in a third, I suggest putting, for each kernel version, all three of these definitions together in one place. That way, when performing the most common kernel updates, everything that needs to be changed is in one place, and the corresponding patch to Guix would have just one hunk. More concretely, this would mean moving each 'deblob-scripts-X.Y' definition down, between the corresponding 'linux-libre-X.Y-version' and 'linux-libre-X.Y-pristine-source' definitions. What do you think? Mark