Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 11D9AC001B0 for ; Wed, 9 Aug 2023 22:05:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5F0504187B; Wed, 9 Aug 2023 22:05:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5F0504187B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YdsSbv4L_Q3i; Wed, 9 Aug 2023 22:05:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 354B741894; Wed, 9 Aug 2023 22:05:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 354B741894 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4A7E91BF82C for ; Wed, 9 Aug 2023 22:05:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2EF6941894 for ; Wed, 9 Aug 2023 22:05:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2EF6941894 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ukQY5LkcuEiu for ; Wed, 9 Aug 2023 22:05:28 +0000 (UTC) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp4.osuosl.org (Postfix) with ESMTPS id C1B994187B for ; Wed, 9 Aug 2023 22:05:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C1B994187B Received: by mail.gandi.net (Postfix) with ESMTPA id 8DEAC40002; Wed, 9 Aug 2023 22:05:25 +0000 (UTC) To: Buildroot List Date: Thu, 10 Aug 2023 00:05:14 +0200 Message-ID: <20230809220514.2089980-1-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-GND-Sasl: thomas.petazzoni@bootlin.com X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1691618726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=x+vnRbU8ZswJ+qSp16W1UwQfcrM5jO1zQosekW0loNY=; b=cWrSWR2PdFpitMbv5Bmnmy0TJ32CLO12+1EdtnW3DAC0rrt6X+HSlCRLB7oWapMmJZVjsD y1HVgf/UR1SxB1XJyuwX7KMuz1nmYruRUAGyssBTwxBS5reuJODQWRdjllTnxZ7KJrDEw/ ttj47ybvqaKL48GpaZCTjR6j1F9eCj1s6eKP6mU0kzKHHJz4m9y2+YzjXG+d4c46Lmebh8 NCeKV+zWsa3qPVuSMcjm8ExI72boohVAMoXZ3A9gT9UsjAEnX+iFuwGeLU28AebL2R41uC ne+KhG60D5AdIL2taK4AixTRfYqotLp0ebgzQqsA/rGCjx4SlEUMGB1Hc+VIWg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=cWrSWR2P Subject: [Buildroot] [PATCH] package/swupdate: install headers at the standard location X-BeenThere: buildroot@buildroot.org 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: , From: Thomas Petazzoni via buildroot Reply-To: Thomas Petazzoni Cc: Daniel Lang , Andrey Grafin , Thomas Petazzoni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" In commit eb2f2886b2364e5b6a0867f55106bf83acb064e7 ("package/swupdate: add staging install"), the swupdate package was changed to also be installed in the staging directory, as it provides an API to external programs, through libraries and headers. Back then the commit log said: This patch installs headers and libs to STAGING_DIR, to prevent a header name collision a subdirectory /usr/include/swupdate creates. And indeed a custom INCLUDEDIR was specified. However, installing swupdate headers in /usr/include/swupdate/ doesn't work well, as progress_ipc.h (installed by swupdate) does a #include , which doesn't work as swupdate_status.h is also in /usr/include/swupdate/ instead of /usr/include/. To address this Daniel Lang submitted a patch [0], which was proposed to upstream swupdate to fix this header inclusion. The patch was rejected by upstream saying that the swupdate header files should be installed in /usr/include. Currently, swupdate installs only 3 headers files: /usr/include/network_ipc.h /usr/include/swupdate_status.h /usr/include/progress_ipc.h To the best of our knowledge, this doesn't conflict with any other header files installed by other packages. A good proof of that is that even Debian (which has many more packages than Buildroot) also installs swupdate headers directly in /usr/include. In addition, the original submitter of eb2f2886b2364e5b6a0867f55106bf83acb064e7 said "I'm not remember what was a problem. Probably network_ipc.h but Im not sure now. I think it's safe to install this headers to /usr/include w/o subdir if this collision was met only in my environment. PS: currently I don't see any collisions with this files." So, we switch to installing swupdate into their standard location. [0] https://patchwork.ozlabs.org/project/buildroot/patch/VI1P190MB0493D233ECC579510F8C0FC69FB29@VI1P190MB0493.EURP190.PROD.OUTLOOK.COM/ Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 11a3946753..84905d2e0a 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -230,7 +230,7 @@ endef define SWUPDATE_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ - INCLUDEDIR=/usr/include/swupdate install + install endef define SWUPDATE_INSTALL_TARGET_CMDS -- 2.41.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot