From patchwork Tue Feb 6 12:59:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 869757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="QCuTFOCJ"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zbPgl5Zgqz9sRV for ; Wed, 7 Feb 2018 00:00:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2A896860D3; Tue, 6 Feb 2018 13:00:01 +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 YPVYIoOaoeRa; Tue, 6 Feb 2018 12:59:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D25EE85A57; Tue, 6 Feb 2018 12:59:58 +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 D81DF1BFF5F for ; Tue, 6 Feb 2018 12:59:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D3D7F2FF0F for ; Tue, 6 Feb 2018 12:59:57 +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 b5TooaRLIDa6 for ; Tue, 6 Feb 2018 12:59:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0093.outbound.protection.outlook.com [104.47.0.93]) by silver.osuosl.org (Postfix) with ESMTPS id 96E0B2FF09 for ; Tue, 6 Feb 2018 12:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=2ICjrNyuvWwTwNJXnwXbj2D2NW8rbYTOZIfg97cpdos=; b=QCuTFOCJTNBB3T5EaZuVpidle6BYNx4FuAgDevPXzK4EVBiJy3PUYw95i7OZNFB00691+SEhIkbqltJlKV3Y2bchO+kyaQGppqOHkTzpqYe4Rf35Tzi7enjdBrnLFgM4WGETC/1d01BdWXRsIfEGLBvKuU5JBRRtGiDDLVtH8Hs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=thomas.de_schampheleire@nokia.com; Received: from australia.be.alcatel-lucent.com (2620:0:1055:fd00:7a10:f49f:78c7:5bac) by AM4PR07MB3106.eurprd07.prod.outlook.com (2603:10a6:205:7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.485.3; Tue, 6 Feb 2018 12:59:51 +0000 Date: Tue, 6 Feb 2018 13:59:23 +0100 From: Thomas De Schampheleire To: buildroot@buildroot.org Message-ID: <20180206125923.GB20598@australia.be.alcatel-lucent.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) X-Originating-IP: [2620:0:1055:fd00:7a10:f49f:78c7:5bac] X-ClientProxiedBy: VI1PR0202CA0026.eurprd02.prod.outlook.com (2603:10a6:803:14::39) To AM4PR07MB3106.eurprd07.prod.outlook.com (2603:10a6:205:7::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 17fed1e2-3eab-4a23-4438-08d56d618328 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7193020); SRVR:AM4PR07MB3106; X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB3106; 3:80kc2VxFdxjVUEWnIe8kF1/JR+6SAlTM0MqpgsM0956u0SMPlpTapPdbi3OP2a8dg3v/jlLsoIvuXI/vijG7ZOFpbQFqBKvl/PbLM3YvRY1pCC8WdgtjDPw7yExYdbB5a+OJ4AvrRFfqiHepFWSbeYw9XK8aYvdy4To1PoXmf4pGDejHWMtJllz+WrXPy0NsPGykcs+3m4y30IQl0D9BrMT5wOWDPPcn6KCSJ/0FZSMwbPtQpH5i/JWnAYfYwyAO; 25:rEN9kHTqOCPITMGRENjKkG++rE3oluriXieWdPCd1F6UUDSNiHzPQDgqkExZ0J4UmBxXNdx5CkMnFKCpv19gHSmwhWL/R9Ld4Vj5kG4V/Giu1fMFuShzxAju5N+UV4DExXVWPA4HXMw4VU+5iF7IAsawt6MBosJChfOxHmssu3WIamFE/93WYMic0C3qFD1J8PhKP/wQyghPGYCXo/MtQNH2JnOJikVHmbMsd1+COTLo1u1aO54KyGTEPgSRmGHLDZU9P5+Q+fVYTgyXJANTLEMbdgFQcrisAE9/KkjQ/4gbt8VNy2kT/ybeS+6R/EXsyNAU7Ojvii5fT5Ofk2I5VA==; 31:v815+ZwhvqyHhD5tg2FO/4x8UK8bL2BkSNDipake1d8E2q/CNHBXbnGp7OpaSDUV4swhWmcWptZI/Swto1DZeqXbPXyrvixy0BqPJ3AnnaqQ7PZlMBdMkvyl+m5s1zPjQbpLRDbzoEuWEOCC9lAr5XwvQlInz4alQLTJ/3NPKtna9VsKVUzaY5fiVKQxCgVBkHeswzMjsP1snOYo9/8cYQUdvJQAShN69bYujYqRaSc= X-MS-TrafficTypeDiagnostic: AM4PR07MB3106: X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB3106; 20:3Av5j7OhvncKhL/jCUDx2b9sKWxSSjVdqqNRKTDRYTIJOGAXwJzO9d2nP8f+DCDxbG7K6ZuziljIjjoFckvlifRHbmf0HQMFsYfXvRSEncc28TH5w+a6bgUck6JqiQhZJ0gSKVHyjSspnBOQFkzLgdMjMsdnVWJHuCZaQ3hNpo/uV/iOTAQbYJE1ATTojS1k/kuDuBPa4518ACe2ctTeQqk1FYVbaw9bfjVbFUbQ4DY/SGS4Zt7VLbKvRTtk7JXZlkAtfFS3Zl6BjNlBRZy4NN/yUq3j76udKFI11lJJHdI0fR8jy9FRieaY3sjZZD5fWMXP2GQyDG0+ez2IdmhOeZ5Eyx0/QX6Ai+dlNPjFVknJqfhj/Qiv5WZJOHNHJZWs1DeSbU5IJhQ9e4Jekuw6e7QMdOIRk1SZVlZcazGc7YWV7xk5qCeKv1UA9D+3EC6vyJrasQ1iF8GvBgZMhErEteStiHmroVEhhBkuzga3l2VlU+ugB5He5r6KkRkvm3v9; 4:n2n2kneDuyu8/qWjuPYW+2l78fUjVp1wtRy4q7DEOFagpu9Rt8C+0+yY2Ss/gdrjQofWmy45hrIh3PkFuGH1IJchf4q0I2zElW8i+iDMK0//rfFxdGcwn7ZCwEHnAxWa0qWgzyYHbaKokCY1+OJljPSydvGT1dDpNYshcT6heidXLN4bqfdXzS78K06Vu5zrnIUzaKiPl4hxPpkaLJ5mnW5sP6p9uG2zTBVdgdGLhzJXYJcpeFOuKvZsQsJRD2pvNO1vk+QMyJELa13j/S1aHXNTOxQqqEMltHgEjxur2zX7IDWurEiqCHSSF3A2/h7a X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231101)(11241501184)(806099)(2400082)(944501161)(93006095)(93001095)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:AM4PR07MB3106; BCL:0; PCL:0; RULEID:; SRVR:AM4PR07MB3106; X-Forefront-PRVS: 0575F81B58 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(366004)(39860400002)(346002)(39380400002)(189003)(199004)(53936002)(81166006)(305945005)(6116002)(68736007)(25786009)(33656002)(81156014)(47776003)(478600001)(4326008)(9686003)(2361001)(2351001)(186003)(106356001)(2906002)(105586002)(16526019)(55016002)(6506007)(86362001)(386003)(5660300001)(50466002)(16586007)(1076002)(6916009)(58126008)(97736004)(7736002)(7696005)(23676004)(6666003)(83506002)(52396003)(8936002)(52116002)(2486003)(8676002)(52146003)(59450400001)(316002)(54906003)(18370500001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM4PR07MB3106; H:australia.be.alcatel-lucent.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BAM4PR07MB3106=3B23=3ASjxs?= =?utf-8?q?+NCku5I2J+gCrH911+AWabbufmmEbYAf9BU3qploH3Ob113666Dq2L1D?= =?utf-8?q?fboGSvpeaRiepEjvBeorh0oCqAAMqh174W38XXbkhJ+HZBMkiwGCI/gm?= =?utf-8?q?hxnb4vfOIB4Q36CBEz9XJvTBEb8kTpq+3NBulnj5iu0Yx27xIBM2+QbU?= =?utf-8?q?kTqVwmEK383ZivhXgTFwQPJv2qZZ7K9R296OzpWtilJndW2QIwD7MxpL?= =?utf-8?q?rCeyBHPgVeTeEpi2EXPgitGIaKYPIAogUv+/Bg09MrXDWN8o/y7M+RQW?= =?utf-8?q?GKhZZdSFPpmqxnwAWFkYPI2uypcTVwJnGiqdxO17kz1uY8GAVLadajbj?= =?utf-8?q?lC2ofg+wQHYX1Fouvbj+hs+Ac9NcZALKANT/Phccf884csUZEzgqLsJf?= =?utf-8?q?xzRBug4h7R4pJdGBWLlQAtM7bedJO1JwHkEGEAkTZNYHG1CycaHA7B0W?= =?utf-8?q?oIPQcXd8CH/HNiOlnLlAWLFHulXOIETe1HPzvMq957kso8uH3b0LWyXN?= =?utf-8?q?aLMK33e1zHdKfvv1m6Pm5r5HinUIfCuZ9FBdRMAwpkHK5jFG661x/8Jw?= =?utf-8?q?uYLI08bSikrAg38j5JZlxzlPohYexWxwS7l3T88Boz2qsa+XmpejAyKQ?= =?utf-8?q?23Um224z2pN3U53KaG4ZxR2aVg9hkrmynFajnrrcC+e7kuDExwYGjLL8?= =?utf-8?q?EdVUiBS+2f0sJNo736Cnqg21GDu7fZEY3mNHjqiB+lLXmeTTxeTdXQuP?= =?utf-8?q?WvoODEMjCWrRYHskATrnUA94AMdc6HuOoXxNPdP4kKxk7LdOMpyUXsmF?= =?utf-8?q?mt3oB3/OabvXjsAG+Y/CKdxH/6GrW9HIuyeE1OJBQEc9X8caT8RkQaiJ?= =?utf-8?q?SIz+1MiPqcCWkS7M/Go1zfVCYkAq8DL8Is3VYjAKzVk1SVSf17DFw2Nv?= =?utf-8?q?CQ5v9xE3VXaOdsoc5kFAiv/uQ0MPzfVU15meTxwenOBIZnkcrQCeLg3G?= =?utf-8?q?tUIe7CySDaWFXfkvPjgNruzfuPY9X9FGdvM5UuVx4DxH93da/IGJyp0B?= =?utf-8?q?FN5uVlx0Ra8hTrxoL6wfYct84lS1IZyR9U6gU6RvFxEU8pvhNHmOHYl3?= =?utf-8?q?d1ARyww0Im5thhgLO+oMaj2alSJYYiImo7zJO68Jepn+i0BMDF8YIDv3?= =?utf-8?q?WbicV2fdWS8oZ2ju2vNjkYmqkn2hVLf6IKGcj9vF5DZvLWo1CrQR92uk?= =?utf-8?q?5z8ZkRQLkJ+Mv744vj7MxKDc2qpVuPmmmyYM?= X-Microsoft-Antispam-Message-Info: xaS+iWg9O2TJ2kBet4WXA/b4ZPIs++3B2uZ7POYb6xF0/S7eg7OT0DzcRqgjWHkKFBxPlz57CrxBBX1Q/hKT5Q== X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB3106; 6:o/l1TZd4cv53gIKL3WTsoSrAUp16I/+k7InOLEtL+EkhfMzC4doS2w0fMUnIspgnJ1bJPt1eCDGGJq5gQw9skZqxsu6aX61Ys0FSr+Z+3dCgET1GtTyKRPTYtu6tQn4JbapqqAEm4VlnlGbMypDfeyue5rVEScmhPZ4RP8MXSbV4gcRA7gmIWpI9cSGTtOTVrZpgMY0Dd+q+u7LfyjnFJeReF6KxyYE8nkrslM323PQ/RuD1w49NXPUTvofBznt+yl+xrYJAeKHxmUg0g5EukUFlsI1UsFilEEuJ9DWiyZmsLy8dcKmfZyG0LzkJJRiYJ9jJcCTd2TcckM80CxgtSnvBYMd480kEPyDk6ql+l/4=; 5:7ynp81U4RR2YJW/07ebaj1E5qGCEb+ET9KjPMjvDKkeMQiVFJ0FsCEIrun8zxG+EMJ/vkq9KXY3HHkcep2E9nzsUOZdl+nmh9BPElpLKz4BOhPlrx9ECimQE+TNeQm/ZM2YlO36fp+dpYu4ToTceMVhERd2fhlyD5Lw65FnrR+U=; 24:CScPYHv08qep6hPvxrSU/7mHY+kQ6UIvdSOMilNh+hf6cJiyfqOIzqkQAe7WjBNzzcae5gQtTNpK8bHejv71vBzqOVEdAKNhYtyFKGEgJlI=; 7:Ya3Xgb7lvBK6n/OER0OucjIXbzYskNDf5GvOdpQEVV7fciAJnQPC8y8qouUesaZ7YiGEwOta61gNdAAhgTZsq4gXwQNoOQyZ5cAftbTFlZ/AMDz7YwayMXJcP2TlRctut/DetND21EduSNiM+EM3K4N7zk6fvtJAtcZ0b/p2BeKrOw802+VFTDrDqvpzLaBR5MjyVEx0enjZXXNvQeACQOjpR4YL07N/aC3FSlnL1acPMQDZMm9M4p7YwW5gDVn+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2018 12:59:51.7346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17fed1e2-3eab-4a23-4438-08d56d618328 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR07MB3106 Subject: [Buildroot] [PATCH v2 1/1] core: rename FOO_BASE_NAME to FOO_BASENAME to avoid clashes X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cam Hutchison , "Yann E. Morin" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In current Buildroot, clashes occur between the variables _NAME and _BASE_NAME for two packages called foo and foo-base, i.e. Package foo: FOO_NAME = foo FOO_BASE_NAME = foo-1.2.3 Package foo-base: FOO_BASE_NAME = foo-base FOO_BASE_BASE_NAME = foo-base-4.5.6 where variable FOO_BASE_NAME is clashing between these two packages. Specific cases where this clash is already existing are: - alljoyn-base - alljoyn-tcl-base - perl-xml-sax-base The problem is generic and can occur for a number of variables in Buildroot. A non-exhaustive list: _BASE and _BASE_NAME _BASE_NAME and _RAW_BASE_NAME _DIR and _DL_DIR _VERSION and _DL_VERSION _SOURCE and _TARGET_SOURCE _INSTALL_IMAGES and _TARGET_INSTALL_IMAGES (same for _STAGING and _TARGET) _LICENSE_FILES and _MANIFEST_LICENSE_FILES _DEPENDENCIES and _FINAL_DEPENDENCIES One solution is to use another separator than '_' to separate the package name from the rest of the variable name. For example, a double underscore: FOO__NAME FOO__BASE_NAME FOO_BASE__NAME FOO_BASE__BASE_NAME However, making that change for only this case means that the variable naming is no longer consistent. And making the change for all variables has a large impact, also on certain user scripts. For now, keep it simple, and rename FOO_BASE_NAME into FOO_BASENAME, so that the variables become: FOO_NAME FOO_BASENAME FOO_BASE_NAME FOO_BASE_BASENAME For consistency, also adapt FOO_RAW_BASE_NAME. Since FOO_RAW_BASENAME would still pose a conflict with a package called 'foo-raw', take the opportunity to rename it into FOO_BASENAME_RAW instead, which does not pose a conflict as we have no variable called FOO_RAW. Signed-off-by: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" Reviewed-by: Sam Voss --- package/pkg-download.mk | 10 +++++----- package/pkg-generic.mk | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 3712b9ccc6..6f15deba28 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -79,7 +79,7 @@ define DOWNLOAD_GIT -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -90,7 +90,7 @@ define DOWNLOAD_BZR -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -102,7 +102,7 @@ define DOWNLOAD_CVS $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ $($(PKG)_DL_VERSION) \ $($(PKG)_RAWNAME) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -113,7 +113,7 @@ define DOWNLOAD_SVN -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef @@ -137,7 +137,7 @@ define DOWNLOAD_HG -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ + $($(PKG)_BASENAME_RAW) \ $($(PKG)_DL_OPTS) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a2a12e7b56..97c580541d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -452,10 +452,10 @@ ifdef $(3)_OVERRIDE_SRCDIR $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) endif -$(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) -$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) +$(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) +$(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) $(2)_DL_DIR = $$(DL_DIR) -$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) +$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) ifndef $(2)_SUBDIR ifdef $(3)_SUBDIR @@ -484,7 +484,7 @@ ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $$($(3)_SOURCE) else ifdef $(2)_VERSION - $(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz + $(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz endif endif @@ -558,7 +558,7 @@ endif $(2)_REDISTRIBUTE ?= YES -$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME) +$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW) # When a target package is a toolchain dependency set this variable to # 'NO' so the 'toolchain' dependency is not added to prevent a circular @@ -864,9 +864,9 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) # is that the license still applies to the files distributed as part # of the rootfs, even if the sources are not themselves redistributed. ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) - $(Q)$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined)) + $(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined)) else - $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_RAW_BASE_NAME),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local)