From patchwork Sat Nov 9 18:55:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgUk9TRU4=?= X-Patchwork-Id: 1192474 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="nBJLX7Rs"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 479RD74z1nz9sNx for ; Sun, 10 Nov 2019 05:55:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 43D7585FC7; Sat, 9 Nov 2019 18:55:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8QNT7IDHt0IB; Sat, 9 Nov 2019 18:55:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5BDEB851CB; Sat, 9 Nov 2019 18:55:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 615FD1BF59C for ; Sat, 9 Nov 2019 18:55:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 56DAA1FC94 for ; Sat, 9 Nov 2019 18:55:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zd6IESSH5sFr for ; Sat, 9 Nov 2019 18:55:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id E9C39204A5 for ; Sat, 9 Nov 2019 18:55:24 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id q70so9372280wme.1 for ; Sat, 09 Nov 2019 10:55:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9scvmgDu+1hgJw30KneNipaKIEYXbqF8hs2arr39Nvc=; b=nBJLX7RsWSAvAox0kHMmBrvBG4QQdwDlXGYALLlwyi77rTH9csUvLIbzjHxgelxD6D PDLReBzH29IEZidm8UPxjF1HcQgwyIuaejker9kY9aTMpGnG0hJZkltEvqHdiwb8GEHV Ad/Fkzzllr0BqCMsgs58ZFyfHB7yURHPhP4j966SBmO48/jK8IHKFIzhdTzR3b2Z8V+L 7JNJlevOZtGaXOSE718Jdzq2D3ZNwRSWsc4IU4RxEdyhJKJR1rmFjgSf9j+eQCE68B4j ry7VsyxD79M4Hce5yxesXBC0kCwRObyPdKOX6SxoYkQWxHeiWaEpHC+2HuDgRsVqE4Ug 0N4A== 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:mime-version:content-transfer-encoding; bh=9scvmgDu+1hgJw30KneNipaKIEYXbqF8hs2arr39Nvc=; b=r/tkNnXQSbwE5cn6h2PIMOvU4WfcHFdFOg94RlpL5KzJ5d1+2xnZ486IfcrnFO+9mw SmdwHoRXlU6sDmZtnbakknZueJ6rpdMhTBT8yYapYsp2K/bRZCtWUWBBprJ51Ra2SIng tG6ypleZsF8MIo6K5U75/ZsfKNXbm9pxWpCgD9sYtMacw78XyZFwzpand1K2MmW5chjB 0hYbOMG1DzH4LPcKHH440RhHjyRMBWd5tzTu7Y3Af1OI9oYTAbSc/f7lA8gM+YPpRcAi j9J5X9IAcrmFZ9SXEsga6T/hQ9euJwg/741YduXj/qjpPaw6kfM4pJjTcLsGxfdwwaW7 jk4Q== X-Gm-Message-State: APjAAAUUcZ7xeAdRhHWlTbFDIgAbjTuNtRPxQx/CrffsFZUZcDDytHOJ WyEu7umB3V/mw+RQhSJAXN+fhPoSXQ== X-Google-Smtp-Source: APXvYqzzZyHtz8+8Cti91ydOHpa1bfN7QRXZYgRE4aC4Y4hz30oPxKLnpUW8hooRqMduaqnPftR2zQ== X-Received: by 2002:a7b:c84b:: with SMTP id c11mr12584742wml.158.1573325723138; Sat, 09 Nov 2019 10:55:23 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id 65sm18456520wrs.9.2019.11.09.10.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 10:55:22 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sat, 9 Nov 2019 19:55:11 +0100 Message-Id: <20191109185512.24139-2-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0.rc1 In-Reply-To: <20191109185512.24139-1-jeremy.rosen@smile.fr> References: <20191109185512.24139-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/2] allow .smk files as includes in packages X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, when using the include directive in a package's .mk, buildroot will create a new package. It is impossible to include a makefile for the normal inclusion purpose This is hardwired in many places, both in buildroot-core and in the way makefiles are included in BR2_EXTERNAL. This can't be changed without breaking external code Instead, use a different extension for "normal" includes and filter them out in pkgdir Signed-off-by: Jérémy Rosen --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 63b19e812b..ebab55a0fd 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -30,7 +30,7 @@ endef # directory from its makefile directory, using the $(MAKEFILE_LIST) # variable provided by make. This is used by the *-package macros to # automagically find where the package is located. -pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) +pkgdir = $(dir $(lastword $(filter-out %.smk,$(MAKEFILE_LIST)))) pkgname = $(lastword $(subst /, ,$(pkgdir))) # Define extractors for different archive suffixes