mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ian Abbott <abbotti@mev.co.uk>
To: ptxdist@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>,
	Ian Abbott <abbotti@mev.co.uk>
Subject: [ptxdist] [PATCH] template-src-linux-driver: Fix condition for kernel.targetinstall.post
Date: Thu, 24 Jan 2019 10:34:13 +0000	[thread overview]
Message-ID: <20190124103413.6077-1-abbotti@mev.co.uk> (raw)

From: Michael Olbrich <m.olbrich@pengutronix.de>

The condition for including the rule to make
$(STATEDIR)/kernel.targetinstall.post depend on
$(STATEDIR)/@package@.targetinstall is broken because it uses
PTX_PACKAGES_SELECTED, which is always empty at the time this condition
is evaluated.

If PTX_COLLECTION is 'y', the rule should be included if
PTXCONF_@PACKAGE@ is 'y'.  If PTX_COLLECTION is unset, the rule should
be included if PTXCONF_@PACKAGE@ is either 'y' or 'm'.

Reported-by: Ian Abbott <abbotti@mev.co.uk>
---
See <https://www.mail-archive.com/ptxdist@pengutronix.de/msg13982.html>.
I credited the patch to Michael as he explained the cause of the problem
and came up with the most elegant fix. -- Ian Abbott

 rules/templates/template-src-linux-driver-make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/templates/template-src-linux-driver-make b/rules/templates/template-src-linux-driver-make
index c13857924..de1be78b2 100644
--- a/rules/templates/template-src-linux-driver-make
+++ b/rules/templates/template-src-linux-driver-make
@@ -22,7 +22,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_LICENSE	:= unknown
 
-ifneq ($(filter @package@,$(PTX_PACKAGES_SELECTED)),)
+ifneq ($(filter $(if $(PTX_COLLECTION),y,y m),$(PTXCONF_@PACKAGE@)),)
 $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/@package@.targetinstall
 endif
 
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

                 reply	other threads:[~2019-01-24 10:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20190124103413.6077-1-abbotti@mev.co.uk \
    --to=abbotti@mev.co.uk \
    --cc=m.olbrich@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