Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n7qyq-0000Mq-NF for mharc-grub-devel@gnu.org; Wed, 12 Jan 2022 22:40:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7qyo-0000MG-AO for grub-devel@gnu.org; Wed, 12 Jan 2022 22:40:50 -0500 Received: from [2607:f8b0:4864:20::832] (port=40545 helo=mail-qt1-x832.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7qym-0007QT-HR for grub-devel@gnu.org; Wed, 12 Jan 2022 22:40:49 -0500 Received: by mail-qt1-x832.google.com with SMTP id l17so5575397qtk.7 for ; Wed, 12 Jan 2022 19:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yN3kLswfkBIFNdj59g/hvsKiXIWNagbF8BE4Ud5kqJA=; b=rVDZ0gdQre6oKsyJaloMXUrFtppZb5iry/32rAy6KcP/uKRc2A+YIIfrlbfMDxZ6hs zCj0OwXEseVWtQ7qmOdVsVGgn2xNRRYuf9ui1KpndeQ1N7ajskqSCbQJgUijeb1ivsfz 2D6HefMRByjQposWXCAn2vVSh2sWo3jOx0Lrm0Fsb8XGzXklPuRRSFoqZcKf7dp9dy6n 6Wx1siAxqYFxU0biFZaAegimWk77m5CX5U5coMQztPNCznLvcMToB3vIJPUZufF/WVb3 d2scBDd1I3ypzNPZK4oBE5wZsjNU9fB524iAFRR4vHr06YEoa04OPbk0hY63ExHjBY+O 5z6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yN3kLswfkBIFNdj59g/hvsKiXIWNagbF8BE4Ud5kqJA=; b=iy7+qKSFinV9dLjZEzBsQ8BS1HBt9uVsQByq8XVKNp2V6f1zQIa1YLSdHtFgJ4sIdm dTdKFDGa9g+odRUt6CzO1v4LheSc6ZYytZ+TNc2DhHnGTLAAztWa7CuH9x1+tRChV9Za 86tN5ZJS5swfPVoqlXTQXex4mL9ot4Upz4unfUaIwgWjSn7bg2z1GX1fE1lB7CFnFeZn Y6wgPp+zbx2n3A7dXmm5RVWdyqD463DCTqk3I120PrA+pUUJsCg6K+R13p1MjpAAVNrQ vCN6a/W7xGDs6xgaL4mbWYYamr7XC/aZ5aZykGbdKsf6ymzcPgb8Poqctg9TP5/DDldl AgcQ== X-Gm-Message-State: AOAM531tt7ZK2jPYwal+QU6mmB/K6Fb2OmJZU5/ZGHaxdwCD8/SEmM51 BTjFOD2LpRE7Et3TuMKBiHrEYfLZkz4HkA== X-Google-Smtp-Source: ABdhPJwrENAkoPuWs2gkgrs61HY44qmp5OE4z60yjJdu0QDT6Uv//XIMaXt2owN1M+h/aaHKjftfNg== X-Received: by 2002:a05:622a:5d2:: with SMTP id d18mr2240008qtb.154.1642045247653; Wed, 12 Jan 2022 19:40:47 -0800 (PST) Received: from localhost.localdomain ([37.218.244.251]) by smtp.gmail.com with ESMTPSA id y15sm1159452qko.74.2022.01.12.19.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 19:40:47 -0800 (PST) From: Glenn Washburn To: Daniel Kiper , grub-devel@gnu.org Cc: Glenn Washburn Subject: [PATCH 1/2] gentpl.py: Fix issue where sometimes marker files have CPP defines Date: Wed, 12 Jan 2022 21:40:20 -0600 Message-Id: <575321ab1e44b830cce1fbabfabd35284c5523c5.1642044782.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::832 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::832; envelope-from=development@efficientek.com; helo=mail-qt1-x832.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2022 03:40:50 -0000 When generating video.lst, modules whose marker file contains the string VIDEO_LIST_MARKER are selected. But when the marker file contains the CPP defines, one of the defines is VIDEO_LIST_MARKER and is present in all marker files, so they are all selected. By removing the defines, the correct modules are selected. Signed-off-by: Glenn Washburn --- gentpl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gentpl.py b/gentpl.py index 28ec24209..9f51e4fb6 100644 --- a/gentpl.py +++ b/gentpl.py @@ -700,7 +700,7 @@ def module(defn, platform): output(""" """ + name + """.marker: $(""" + cname(defn) + """_SOURCES) $(nodist_""" + cname(defn) + """_SOURCES) $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + cname(defn) + """_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new + grep 'MARKER' $@.new | grep -v '^#' > $@; rm -f $@.new """) def kernel(defn, platform): -- 2.27.0