From patchwork Fri Jun 7 17:05:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945186 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfT3b5yz20PW for ; Sat, 8 Jun 2024 03:06:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D369D42813; Fri, 7 Jun 2024 17:06:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id d1fpJQwndurp; Fri, 7 Jun 2024 17:06:21 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 961BF42815 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 961BF42815; Fri, 7 Jun 2024 17:06:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 01EF11BF479 for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D706A403FB for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id V8rtljZNtrz9 for ; Fri, 7 Jun 2024 17:06:06 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42f; helo=mail-wr1-x42f.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org EFE8040272 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EFE8040272 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by smtp2.osuosl.org (Postfix) with ESMTPS id EFE8040272 for ; Fri, 7 Jun 2024 17:06:04 +0000 (UTC) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-35dceef429bso1318622f8f.1 for ; Fri, 07 Jun 2024 10:06:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779962; x=1718384762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZpDXqCdd+h+Xpe4/uzs2mLFBfi8Oq6PCQxrusB237f0=; b=b1gMDa6ELoaZ/mFSjZJtu7v6cwNELXhlryJHQjfq/e8oW6MGM/zm13XXU16e2YfXqE b0C0gIpitZwc0R6jajUAtKch2A28OjjApiuuoiNPf5dnKBPyQXTCb5aVd+0JFx1bA8x6 VzspP/22HCAE8MUpnHpydNI3Vn6NQvYu2MIWjw1A91Kc9j8xHBKH2fipcdNzv/k+ZCC1 QGQ6oyOvU57obO6E4ZD7Upc3lampEqkKdpMz+gkm1nd/cE9a1D6zr/0uq6D1U5Set4Iw RWTDoGK5rdiIkjK9xPM+I6rrVWDQQRki3UYlaIp0PYkdLb2Mv//oyAKezVwCII6zTiQP njyg== X-Gm-Message-State: AOJu0YzaUmBtiIv1U7kIVA+Dm6efZwfQQcACHa8T57bdIOsQ6hcxrFKH z5scAwetmaFm2+gPNOe9awGyHdsu3j/MEtrxBTlOpFhtIO4Azc5zI7p9vw== X-Google-Smtp-Source: AGHT+IHorApc8e2YhLxwuvCM8XcdKVhWgjDVKl6rk6xkItxxZY7jFAi/3OadFZik/YPzkjColKZCKA== X-Received: by 2002:a5d:4dce:0:b0:35f:9ab:d06c with SMTP id ffacd0b85a97d-35f09abd1c7mr2027993f8f.5.1717779962318; Fri, 07 Jun 2024 10:06:02 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:02 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:42 +0200 Message-ID: <6117766a03aa81d15ba27d93bbd3ceb0db711db2.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779962; x=1718384762; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=ZpDXqCdd+h+Xpe4/uzs2mLFBfi8Oq6PCQxrusB237f0=; b=KjJRBJPRtD98fU+XxYpm2FFACnmKv3vD1PdMK1vcfYrch95Q/WfCikzRDPRCO0Dqjr hNPZvZGiuUmM4nxZ0gzpLhK6EgvcKaJHhpUrhaIyBTHtEVnRtD747M1S1frR3dkW+6/1 WaLEWOhDFTQAC3Jjqzr8ndKjQGw7o9peWCV+QcfRznmHNGWwqaF0WlufPQOWJk+79ItB lwKKhth2UZWpSMuD29uX4CHOLSWUYPaUxFdqCkH5n6ZEPn8CKBILp4Nvz1bNLut6phbs 6F5Ez7b7FQH/E5HWQD/DAPSHbCyz9+OdmNUZWam/Kz0zOCUNlck3AVlx85GqZTUKUNLA 7Adw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KjJRBJPR Subject: [Buildroot] [PATCH 01/20 v2] package/pkg-download: symplify calling parameters 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: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The DOWNLOAD macro is always called in package context, so the PKG variable is always set, and thus we do not need to pass the package as a parameter. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-download.mk | 33 ++++++++++++++++----------------- package/pkg-generic.mk | 6 +++--- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 7028d3917a..669d69fb3e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -102,32 +102,31 @@ endif # source from the list returned by DOWNLOAD_URIS. # # Argument 1 is the source location -# Argument 2 is the upper-case package name -# Argument 3 is a space-separated list of optional arguments +# Argument 2 is a space-separated list of optional arguments # ################################################################################ define DOWNLOAD - $(Q)mkdir -p $($(2)_DL_DIR) + $(Q)mkdir -p $($(PKG)_DL_DIR) $(Q)$(EXTRA_ENV) \ - $($(2)_DL_ENV) \ + $($(PKG)_DL_ENV) \ TAR="$(TAR)" \ BR_NO_CHECK_HASH_FOR="$(if $(BR2_DOWNLOAD_FORCE_CHECK_HASHES),,$(BR_NO_CHECK_HASH_FOR))" \ - flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ - -c '$($(2)_DL_VERSION)' \ - -d '$($(2)_DL_DIR)' \ + flock $($(PKG)_DL_DIR)/.lock $(DL_WRAPPER) \ + -c '$($(PKG)_DL_VERSION)' \ + -d '$($(PKG)_DL_DIR)' \ -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ - $(foreach f,$($(2)_HASH_FILES),-H '$(f)') \ - -n '$($(2)_DL_SUBDIR)-$($(2)_VERSION)' \ - -N '$($(2)_RAWNAME)' \ - -o '$($(2)_DL_DIR)/$(notdir $(1))' \ - $(if $(filter YES,$($(2)_SVN_EXTERNALS)),-r) \ - $(if $($(2)_GIT_SUBMODULES),-r) \ - $(if $($(2)_GIT_LFS),-l) \ - $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ - $(3) \ + $(foreach f,$($(PKG)_HASH_FILES),-H '$(f)') \ + -n '$($(PKG)_DL_SUBDIR)-$($(PKG)_VERSION)' \ + -N '$($(PKG)_RAWNAME)' \ + -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ + $(if $(filter YES,$($(PKG)_SVN_EXTERNALS)),-r) \ + $(if $($(PKG)_GIT_SUBMODULES),-r) \ + $(if $($(PKG)_GIT_LFS),-l) \ + $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(PKG)),-u $(uri)) \ + $(2) \ $(QUIET) \ -- \ - $($(2)_DL_OPTS) + $($(PKG)_DL_OPTS) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a2749320c3..da02cb2d32 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -182,8 +182,8 @@ $(BUILD_DIR)/%/.stamp_downloaded: break ; \ fi ; \ done - $(if $($(PKG)_MAIN_DOWNLOAD),$(call DOWNLOAD,$($(PKG)_MAIN_DOWNLOAD),$(PKG),$(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)))) - $(foreach p,$($(PKG)_ADDITIONAL_DOWNLOADS),$(call DOWNLOAD,$(p),$(PKG))$(sep)) + $(if $($(PKG)_MAIN_DOWNLOAD),$(call DOWNLOAD,$($(PKG)_MAIN_DOWNLOAD),$(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)))) + $(foreach p,$($(PKG)_ADDITIONAL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) @$(call step_end,download) @@ -192,7 +192,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: # Retrieve actual source archive, e.g. for prebuilt external toolchains $(BUILD_DIR)/%/.stamp_actual_downloaded: @$(call step_start,actual-download) - $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL),$(PKG)) + $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)) $(Q)mkdir -p $(@D) @$(call step_end,actual-download) $(Q)touch $@ From patchwork Fri Jun 7 17:05:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945183 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfK6VnSz20PW for ; Sat, 8 Jun 2024 03:06:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8E37E4277D; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id isb-_9Ia4tnE; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E2EAD42784 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id E2EAD42784; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EA0071BF95D for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D544A61562 for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id MZ7kwfQGiBYv for ; Fri, 7 Jun 2024 17:06:05 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42a; helo=mail-wr1-x42a.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org F23F76152F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F23F76152F Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp3.osuosl.org (Postfix) with ESMTPS id F23F76152F for ; Fri, 7 Jun 2024 17:06:04 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-35f0aeff7a8so568773f8f.2 for ; Fri, 07 Jun 2024 10:06:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779963; x=1718384763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KjeBcrt5mhqrhNXs58GPuWdUZSR/WmabG7UEviHQ1Ac=; b=nl1md6jDe2hY5KFZgweCd0HBlY+xXgMLy2TIO/OMD5aop6bNnXYphJMV3auKBY2dB1 q8W0p2OB1O7afhlGV602HdLykEHIh2SjcPBXRAeJQx46vKJ2xfYQz5LQX4AJxJ8XfBQF EUZQT6Y9w6sx+rg+Au/6WSecG75GZZTawhM1JyR+k2yoSfW23HgBaTC8joLAn77ZwydU vzLSa7v1H38V7IHVzoJXkvOpwbirdxRh2Cisr6KZ4KAgaasezG1i3cq4QNyoNgAokarr uQF2w9pt0XgUthqBe5oi68ndjnEbTdpLTD5it2M9Ut299XyF1l+yxdjEFeDUVsSoA7Ri laYg== X-Gm-Message-State: AOJu0YxZB70Me2YrUTRd1Gx4E299kjdIc8Gh8kT1lIZPU5gBtzMA46d4 /MJK8oMwxdM8pOAwhtr2eNlz8W4sv0l7RTUB012WYwNl1fCORmG8CtOmsQ== X-Google-Smtp-Source: AGHT+IGd/R0HUOPU2Lu4BupbDXXkqtDZRm104yduHxDLBDhn5cl+IbEqGjJIDRyNdOBMIKHhb1KZdA== X-Received: by 2002:a5d:52c2:0:b0:35f:6bd:e5bd with SMTP id ffacd0b85a97d-35f06bde69fmr1770026f8f.28.1717779962741; Fri, 07 Jun 2024 10:06:02 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:02 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:43 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779963; x=1718384763; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=KjeBcrt5mhqrhNXs58GPuWdUZSR/WmabG7UEviHQ1Ac=; b=Nxj/TYm8y+fC2SxLdgZB3qcHidH/7LAqtzZ68jVeTyJ8xSQkNVusaqcPRkCG12ytRf WBMJuz5IVDQVjlODVGZsphB7vLUMDt7tGVsZHHDYGMDPwslNY3NkQsmqtHle+DwjMhU8 Bt8Pn9WQMZpHKk95GA9KPc+AL7PWt4hPWkt5zEU+yFd0w8A1fE9TKdaCOJCjrPZ14nNZ DCC3C1bzW+nHxNQeAmI3CTaxWXkYXEqWX/fUSF1wWI/bcSHZo8u3b2U6qo18VuKN3ic4 BNRldvXRwrv3TEyyEkGbCC2TSgALKnZOHl5krA4br+3MDjc/nq529AfwKnNxYBlZ/HZz EyxQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Nxj/TYm8 Subject: [Buildroot] [PATCH 02/20 v2] package/pkg-generic: split long, unreadable DOWNLOAD line 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: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- Note: when \ is used for line continuation, make replaces all leading blanks on continuation lines, with a single space. This causes the second and following parameters to contain a single leading space, and the last one a single trailing space: FOO = $(info ARG1="$(1)" ARG2="$(2)") all: @:$(call FOO, \ blark, \ bleark \ ) $ make ARG1=" blark" ARG2=" bleark " So, this split must come *after* the change in the API of DOWNLOAD, otherwise it would try to expand $($(2)_PKGDIR) into $( PKGNAME_PKG_DIR) which would yield an empty string, causing mkdir to whine. --- package/pkg-generic.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index da02cb2d32..8f1e6dc8e5 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -182,7 +182,12 @@ $(BUILD_DIR)/%/.stamp_downloaded: break ; \ fi ; \ done - $(if $($(PKG)_MAIN_DOWNLOAD),$(call DOWNLOAD,$($(PKG)_MAIN_DOWNLOAD),$(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)))) + $(if $($(PKG)_MAIN_DOWNLOAD), \ + $(call DOWNLOAD, \ + $($(PKG)_MAIN_DOWNLOAD), \ + $(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)) \ + ) \ + ) $(foreach p,$($(PKG)_ADDITIONAL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) From patchwork Fri Jun 7 17:05:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945185 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfQ6L7Qz20QJ for ; Sat, 8 Jun 2024 03:06:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A7E0A427E2; Fri, 7 Jun 2024 17:06:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id QEf6QlA8P1Ac; Fri, 7 Jun 2024 17:06:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E3E7D427F5 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id E3E7D427F5; Fri, 7 Jun 2024 17:06:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 342BD1BF479 for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D43C884C8B for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 0hoQ8quBiZpo for ; Fri, 7 Jun 2024 17:06:06 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42d; helo=mail-wr1-x42d.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 273D284C87 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 273D284C87 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by smtp1.osuosl.org (Postfix) with ESMTPS id 273D284C87 for ; Fri, 7 Jun 2024 17:06:04 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-35e4d6f7c5cso2164880f8f.2 for ; Fri, 07 Jun 2024 10:06:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779963; x=1718384763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gXzEtc/Ruyflv/s7nHqAB3x0wgNuwk0WaxN+ap22Df0=; b=jTkrwDMcZyI16n55NKEiCRHRPc0C3nlrHz3SnPsgChboMQ3UldfZ+JomKbP0DR5Eun C9ac9oOMHEaMDaMu5PdpPXDNm++gHnOChiKopQoGy9Z6mXRm0swaI/ajq7tlgO4fcStg rxqrG2Yx4HYMWslQrWlgugxpNndDv+2QnmM/zIOlBVgT+kuM0MZ95J1WbWbUjc5vRQeL V6YRRhFDyl8/Osyq0lu7HVTDequm394Swckk5e385AVGazltVbUEAunFgTjdBQZIQLmw MLze+wHQxc1C03RunTIMC89+C28JGhsUMYish8eUJ2pM08LRzZ6jlF827o/xtlld12Xr B4rg== X-Gm-Message-State: AOJu0Yxk/Av6+8mr+NkNTmM77tepCmVYlA3jpSCCfrOox0/3Jf7sC2CC TlaOyfkzmIutV+yUreKQ+YhqA15jnu0N0EPZKsxqXaaQZgdH5PJc7EOpHw== X-Google-Smtp-Source: AGHT+IFuAhoRVYpEacIXz2IJk1U13M0cEP/vl3anrN4emCKS422pYLHzPnBQtaVH93DGoTIBNvHSqQ== X-Received: by 2002:a5d:648c:0:b0:354:d052:e485 with SMTP id ffacd0b85a97d-35efee48f85mr2800091f8f.63.1717779963142; Fri, 07 Jun 2024 10:06:03 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:02 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:44 +0200 Message-ID: <6bf853bc8b61fed824a99148786105fc038a5894.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779963; x=1718384763; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=gXzEtc/Ruyflv/s7nHqAB3x0wgNuwk0WaxN+ap22Df0=; b=IHZ77iGSby3Gk1jpWr6UvijF0bvwASGh0r0OsBhV2MdeH++xVy+YtsW2KYWM06MMHF ZYvuy1Hl37vr9gd5lIulaVrGwRNErcdU+4ssGPs1jDcuVLHoIGwD/7eeIw0xJJS8CjXb YDgvbVuFd+MtGnire14uuxwViixE9ixDvayfVxpP8I8ZpPM3OoPpBZVQMhL0NeGN5df4 jNJYUMcTDz9Q8e5Uwy00LbAuDJ/Kajnc86LXEDRfTqDnZLxfxeZi7lo4T4Unk53IOqlT LBwT5OI3T+B4xpxe6+LZg5/QzBTVSLLaeWuYzAk5XwGGEOd1jtfPX1Gy/IUjdJ+HaPvy qCag== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=IHZ77iGS Subject: [Buildroot] [PATCH 03/20 v2] utils/check-package: add option to run the test-suite 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: , Cc: "Yann E. MORIN" , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Currently, how to run the check-package test-suite is thoroughly under- documented. There is one hint in the commit log for commit fc254881e6df (utils/checkpackagelib: add unit tests), and another in commit 242e9d72e7d2 (utils/docker-run: new script); the former is hard to find, and the latter is about an unrelated script, so harder yet to find... Add a new option to check-package, that will make it run its test-suite. Since pytest is only needed for the test-suite, only import it in that case. pytest will be default create a cache of the tests (not sure what it is about, though), so instruct it not to (esp. since the tree can be read-only). Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski --- utils/check-package | 10 ++++++++++ utils/checkpackagelib/readme.txt | 1 + 2 files changed, 11 insertions(+) diff --git a/utils/check-package b/utils/check-package index cbb3613e19..f759d88a89 100755 --- a/utils/check-package +++ b/utils/check-package @@ -85,6 +85,9 @@ def parse_args(): parser.add_argument("--failed-only", action="store_true", help="print only" " the name of the functions that failed (debug)") + parser.add_argument("--test-suite", action="store_true", help="Run the" + " test-suite") + flags = parser.parse_args() flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) @@ -287,6 +290,13 @@ def __main__(): global flags flags = parse_args() + if flags.test_suite: + import pytest + return pytest.main( + # Disable writing/loading a cache with: -p no:cacheprovider + ["-v", "-p", "no:cacheprovider", os.path.dirname(__file__)] + ) + if flags.intree_only: # change all paths received to be relative to the base dir base_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) diff --git a/utils/checkpackagelib/readme.txt b/utils/checkpackagelib/readme.txt index 3bfe289607..b3e8c67100 100644 --- a/utils/checkpackagelib/readme.txt +++ b/utils/checkpackagelib/readme.txt @@ -23,6 +23,7 @@ How the scripts are structured: - lib_type.py contains check functions specific to files of this type. Some hints when changing this code: +- test your changes: utils/check-package --test-suite - prefer O(n) algorithms, where n is the total number of lines in the files processed. - when there is no other reason for ordering, use alphabetical order (e.g. keep From patchwork Fri Jun 7 17:05:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945182 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfF2DZkz20PW for ; Sat, 8 Jun 2024 03:06:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 55F344277C; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 4kg5hiXVr7Yb; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 156D04277F Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 156D04277F; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E6F211BF479 for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DBB444277B for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id oDNgMo90Xq53 for ; Fri, 7 Jun 2024 17:06:06 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42b; helo=mail-wr1-x42b.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CDCE24277C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CDCE24277C Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by smtp4.osuosl.org (Postfix) with ESMTPS id CDCE24277C for ; Fri, 7 Jun 2024 17:06:05 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-35e4d6f7c5cso2164883f8f.2 for ; Fri, 07 Jun 2024 10:06:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779964; x=1718384764; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YUVrcIXkKL9rqErODej2j/3g8E4koN0kFEHhkbNLxk0=; b=OM5CPM3Ah1GhQJTJ7VE78p0gQSKCSwcr9e7cPb5f0x+sasDD2iO78SyFIzom2O4oLj ev5g6Nak9BAEPNTW6z+hUTtfiyqE5WuPQWwyLkCUdDdsMwDURWdi3vbWgC8Fdm0trzlg RIsMOAkN5tQp23+Bw+zP8BrgpZj3pyiR3aWMBTZfeeFtgRDPn5sW6HLJdn+QIas/rLvL dJXWeANo0CRJSnKNINEDzimL675Q5YCCvIOUXth+VBeGGoUoZIvW6ogLNaiJ9wqZUMUH DaXavjUTONyWwYrMYNCmiAUQd/6MRoF6YaGr8OomNE43vZZrdKBbv5QKI/r+51URrHIu /cEQ== X-Gm-Message-State: AOJu0YyHQIbk+R7kObZynP4Z3UKJyIqtBk677FVNXxdAOFE4nOk2Hesq W7BN8glrYciSGmPa4LBLp6uDR8ujBk7kc8zg9AiI0L5FeuOX/qt+Xw1+lg== X-Google-Smtp-Source: AGHT+IEHv7BQsPQZM1Kftj7hFAwx3YAVesMhvK+Al/IdRFpPT1WcsphgnwQhqGLnqNQ1D/mVK2J5rw== X-Received: by 2002:adf:ee44:0:b0:35f:caa:1ebd with SMTP id ffacd0b85a97d-35f0caa1f5bmr965492f8f.8.1717779963645; Fri, 07 Jun 2024 10:06:03 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:03 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:45 +0200 Message-ID: <9d4bffd033df7518f8ce488faff9379f1f993591.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779964; x=1718384764; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=YUVrcIXkKL9rqErODej2j/3g8E4koN0kFEHhkbNLxk0=; b=P2K3YFVTvlc9AZqbodWSY64cKUP/eSx5UBItzn6xUYBbMZVar0wgd4SHNoXyH3vdPb tfD1hGrsFQdahDpS7dbCHkx7kJ/9/ga+Yr7RS9tWJzvjf3eWgT8GuqQfRKckqRb9Vqba O3bQkMPBQbcgvli3q0SvXcOSyH5BPKdj/pvI0Cw1l4NqLnghoFSLfNVh9iupVVba7/vf fdBWMTnyEf2BIA8zu2FCXc7I+Zr5TkExW2jzafBkps695FjHVEr5/liNsc9MXFbCn0bP A/b35i0xDnQ3P9VtTj8LgjAA0JeqdSS8TMtbxsvtxgka2hMPdA44mGnAaHmTp7vUtID+ ujFw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=P2K3YFVT Subject: [Buildroot] [PATCH 04/20 v2] utils/checkpackagelib: instruct shellcheck to follow included files 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: , Cc: "Yann E. MORIN" , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" We do have a few shell scripts that have source directives (either with 'source' or with '.'), and they all are currently either globally ignored in .checkpackageignore, or have shellcheck directives to ignore the source statement (SC1090). So, we can safely instruct shellcheck where to lookup for sourced files; that does not trigger any new error. This will alow fixing some shellcheck errors in later commits. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski --- utils/checkpackagelib/tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/tool.py b/utils/checkpackagelib/tool.py index 907ada704f..e12e1fa406 100644 --- a/utils/checkpackagelib/tool.py +++ b/utils/checkpackagelib/tool.py @@ -31,7 +31,7 @@ class Flake8(_Tool): class Shellcheck(_Tool): def run(self): - cmd = ['shellcheck', self.filename] + cmd = ['shellcheck', "-x", self.filename] try: p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout = p.communicate()[0] From patchwork Fri Jun 7 17:05:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945188 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfZ0zY5z20PW for ; Sat, 8 Jun 2024 03:06:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 84F2B427E5; Fri, 7 Jun 2024 17:06:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id B6q_U3HW9AVC; Fri, 7 Jun 2024 17:06:27 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4FA644282A Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4FA644282A; Fri, 7 Jun 2024 17:06:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EA2E51BF479 for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D498384C8D for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DDZ45jb7E2Gg for ; Fri, 7 Jun 2024 17:06:06 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::433; helo=mail-wr1-x433.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 577DC84C2D DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 577DC84C2D Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by smtp1.osuosl.org (Postfix) with ESMTPS id 577DC84C2D for ; Fri, 7 Jun 2024 17:06:06 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-35f0f4746c2so128896f8f.3 for ; Fri, 07 Jun 2024 10:06:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779964; x=1718384764; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s20i9Dp1L4MxZpPmz2Ga2DDptaPCZsxe9U7ttZUhQhE=; b=l04JftowwXCvxGHs4EMQjIZUsNBrLwCKDWHl75TjxfRG4Kz+gMcj1EM/il+QMFUMJV m7dyDm+QXtbSGMzv5DCDILqZuMGTX0dWWnl62NsJ/wQ9X+YvdwRfLSKzj2Kwva4Cv0Ed aWlqzI5M+rK+6SJ+iDmZmcDYeD3Zk3y8IrSOze6AXZannRzDxpQcfIgolSEpaKmigwRt L958RyS9G140MajZRH6ig+j/EvntjeGtny8KOBH4Rp+kiiOJyF4gSxqyMvqJmakhJtM3 5+1gcaXosYqGJOktx51LoIe9RdO7Co0N5Y7EkielS2ORbGWXD87ilezHPiJoRH295riF 0QCQ== X-Gm-Message-State: AOJu0Yzl91QFW2NZrfKkM+VjGA9TFPDwTkhvtdLfskviei7oD3O52qSm VGz5vnT78y7RA7i8uNOAc1tbColbom553wIu6B1Axn9PDmdouppT65aQ5g== X-Google-Smtp-Source: AGHT+IHNY05u5Mm+TAzPPSy7f1lkD+gEk6Stk06sh7DPZdjxmoSCfm6rOwQq6eBqBMT+yCSwXei5IQ== X-Received: by 2002:adf:e84c:0:b0:354:fc1a:239b with SMTP id ffacd0b85a97d-35efee07fc4mr2088538f8f.56.1717779964261; Fri, 07 Jun 2024 10:06:04 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:04 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:46 +0200 Message-ID: <57e8d056681a50d2ae7dede9077ab58d2519bb14.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779964; x=1718384764; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=s20i9Dp1L4MxZpPmz2Ga2DDptaPCZsxe9U7ttZUhQhE=; b=E5zlKqt/FDoZOOIu6EwQmQwsq8IuczXhiNkrRAoV0gyhoQR05ixcxr38zhmeTS2vLU zjGmRuqY6t+oBr/FsZ9Jwi5H2Dq+WZSMwUDE0kEJy6elfSnijvbCv0hE+x/nzu86b4rx VgpOwM8+A/T5sNhwT3tiFvMI2fOO/LdpYuiRJcAsmJpQjN7wXWt+/SE1D+eJd6zG090M m+MAuIMi2gl5nNI3m4BLFjgrBlH9qFj/0kFWdk3yvT+GvOWTSQLj9C7KgyZQXGf4kImT qR5K2+dyZdfvkuKv0KqxJoiF+Rsmm+pkrMYccGfDN08P7zHcxydYXFk3jl/OyunBmero Cbow== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=E5zlKqt/ Subject: [Buildroot] [PATCH 05/20 v2] support/download/dl-wrapper: fix shellcheck errors 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - support/download/dl-wrapper | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 8a21b3f155..00eafcd839 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1648,7 +1648,6 @@ support/dependencies/check-host-xzcat.sh Shellcheck support/dependencies/dependencies.sh Shellcheck support/download/bzr Shellcheck lib_shellscript.ConsecutiveEmptyLines support/download/cargo-post-process Shellcheck -support/download/dl-wrapper Shellcheck support/download/file Shellcheck support/download/go-post-process Shellcheck support/download/hg Shellcheck diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 35428faeef..67a9718d9d 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -22,7 +22,7 @@ export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" main() { local OPT OPTARG local backend output large_file recurse quiet rc - local -a uris hfiles + local -a uris hfiles backend_opts # Parse our options; anything after '--' is for the backend while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do @@ -58,6 +58,7 @@ main() { # If we can neither link nor copy, fallback to doing a download. # NOTE! This is not atomic, is subject to TOCTTOU, but the whole # dl-wrapper runs under an flock, so we're safe. + # shellcheck disable=SC2166 # -a works in this case if [ ! -e "${output}" -a -e "${old_dl_dir}/${filename}" ]; then ln "${old_dl_dir}/${filename}" "${output}" || \ cp "${old_dl_dir}/${filename}" "${output}" || \ @@ -111,6 +112,12 @@ main() { tmpd="$(mktemp -d "${BUILD_DIR}/.${output##*/}.XXXXXX")" tmpf="${tmpd}/output" + # shellcheck disable=SC2206 # all three are dash-options + backend_opts=( ${quiet} ${large_file} ${recurse} ) + if [ "${urlencode}" ]; then + backend_opts+=( -e ) + fi + # Helpers expect to run in a directory that is *really* trashable, so # they are free to create whatever files and/or sub-dirs they might need. # Doing the 'cd' here rather than in all backends is easier. @@ -121,7 +128,6 @@ main() { # the next URI until it succeeds. Once out of URI to try, we need to # cleanup and exit. if ! "${OLDPWD}/support/download/${backend}" \ - $([ -n "${urlencode}" ] && printf %s '-e') \ -c "${cset}" \ -d "${dl_dir}" \ -n "${raw_base_name}" \ @@ -129,7 +135,9 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${large_file} ${recurse} -- "${@}" + "${backend_opts[@]}" \ + -- \ + "${@}" then # cd back to keep path coherence cd "${OLDPWD}" @@ -193,8 +201,8 @@ main() { # Some backends (cp and scp) may create executable files, so we need to # carry the executable bit if needed. [ -x "${tmpf}" ] && new_mode=755 || new_mode=644 - new_mode=$(printf "%04o" $((0${new_mode} & ~0$(umask)))) - chmod ${new_mode} "${tmp_output}" + new_mode="$(printf "%04o" $((0${new_mode} & ~0$(umask))))" + chmod "${new_mode}" "${tmp_output}" # We must *not* unlink tmp_output, otherwise there is a small window # during which another download process may create the same tmp_output @@ -226,7 +234,7 @@ main() { trace() { local msg="${1}"; shift; printf "%s: ${msg}" "${my_name}" "${@}"; } warn() { trace "${@}" >&2; } -errorN() { local ret="${1}"; shift; warn "${@}"; exit ${ret}; } +errorN() { local ret="${1}"; shift; warn "${@}"; exit "${ret}"; } error() { errorN 1 "${@}"; } my_name="${0##*/}" From patchwork Fri Jun 7 17:05:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945184 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfN4XzLz20PW for ; Sat, 8 Jun 2024 03:06:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BCBDB42784; Fri, 7 Jun 2024 17:06:16 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LkiuuSZjOUlG; Fri, 7 Jun 2024 17:06:15 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5CC6742794 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 5CC6742794; Fri, 7 Jun 2024 17:06:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E4B891BF479 for ; Fri, 7 Jun 2024 17:06:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D75B5404A6 for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ABw9VbL82avD for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::429; helo=mail-wr1-x429.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org B14D2403B9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B14D2403B9 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by smtp2.osuosl.org (Postfix) with ESMTPS id B14D2403B9 for ; Fri, 7 Jun 2024 17:06:06 +0000 (UTC) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-35e573c0334so2078032f8f.1 for ; Fri, 07 Jun 2024 10:06:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779965; x=1718384765; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eWRpD3ifTwOGE6KBUMfNYktmpkDjD+wA2C/IWcvPSrg=; b=S5ZXlXvvLwpjnjhrU/v3P5SsMLSALSAW17/WLusFfnQzp6D0AT4Vd4300ky/VavKxn 4dTVf0li3XeU5zlj+I/KNluELOjXGMjZnPhaH1Hl88DvZYRYhC5k4Vn2RseS2i2g9ujC rSiaiqIDcN+umRIPYq6Rrkb+kNZk4OqrQh15kR8JS5+/Mvbqr4dTYYYfN87CoTUUOe4M 43lMiiAh3NbtmMS1WeyGGy4PIlGw0y9Wxy7d+z0CTLlytpW91mZXUDulhzf+/crQ9ETv 2NBiKfpS1rwzs4HI5gLvTYhRP9s06V+mMNDk44WwNGbHfMEJv1mMiiid66yGG8rb2H35 Uauw== X-Gm-Message-State: AOJu0YzxdRM1GAZJ6lKMeIrACXPP/TrvE/cID/9gnhFh3ZyOvLS8Ysx0 lKakg5abVUYFujUof0hgF1nfBdkB8tEx2MGiqxe4MzHwpau6OVe3Yiu/og== X-Google-Smtp-Source: AGHT+IGguj+HalZoQGCBZgmw9uFrjkeOChB9WFPQlSwJnDWdMN+eX1yp1QZp0mtpVrd0lhiNIXGoZQ== X-Received: by 2002:adf:a38d:0:b0:359:f17c:134f with SMTP id ffacd0b85a97d-35ef0ddab4emr5732405f8f.32.1717779964666; Fri, 07 Jun 2024 10:06:04 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:04 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:47 +0200 Message-ID: <2900c597be7d13966d3816d1b80c02696908f614.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779965; x=1718384765; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=eWRpD3ifTwOGE6KBUMfNYktmpkDjD+wA2C/IWcvPSrg=; b=NDMXq8nzlb+Ii6b7Eik9Ade/z2b+5NNxcXgp0HwLc1A+4+rZFCfFKoIeacBOKIe1MC 4yeQVZXbgaHGnwxsSK2khn6TPtp1pjYRrLaZv1/EBRSLSchRx8C1/4b59aNXAYjy92ED GVIT5udXHTwIMUpdSoExh1XdO9jMtB9Rwkv47oidD7iHe3pzaIfAWuc2gdFVOHDfhioa H2reT/JAqpaN1eYDF0qkP3n3E3x2ya/utoGp2o9g6uwtvImSQtarTkRPxRbs13OJH1C+ YgHVzJvXsSZ4Zyf591PVTdOkDGjkxoq5g9q3q7QnsTYjUZtlPjBj7PgPv2O2bVFaTndY up8A== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NDMXq8nz Subject: [Buildroot] [PATCH 06/20 v2] support/download/cargo-post-process: fix shellcheck 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - support/download/cargo-post-process | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 00eafcd839..750cbfa865 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1647,7 +1647,6 @@ support/dependencies/check-host-tar.sh Shellcheck support/dependencies/check-host-xzcat.sh Shellcheck support/dependencies/dependencies.sh Shellcheck support/download/bzr Shellcheck lib_shellscript.ConsecutiveEmptyLines -support/download/cargo-post-process Shellcheck support/download/file Shellcheck support/download/go-post-process Shellcheck support/download/hg Shellcheck diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 3f4666c006..b94b160315 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -2,6 +2,7 @@ set -e +# shellcheck source=helpers source-path=SCRIPTDIR . "${0%/*}/helpers" while getopts "n:o:" OPT; do @@ -28,7 +29,7 @@ mkdir -p .cargo/ mkdir -p "${CARGO_HOME}" flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ - --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ + --manifest-path "${BR_CARGO_MANIFEST_PATH-Cargo.toml}" \ --locked VENDOR \ > .cargo/config From patchwork Fri Jun 7 17:05:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945191 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwnfl6tgSz20PW for ; Sat, 8 Jun 2024 03:06:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 67591427F8; Fri, 7 Jun 2024 17:06:38 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id BIH6Xu3qpNvG; Fri, 7 Jun 2024 17:06:37 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2A736427D0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2A736427D0; Fri, 7 Jun 2024 17:06:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0870E1BF479 for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 000FD84C2D for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tA8TFjMXGYoR for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42e; helo=mail-wr1-x42e.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 4568684C2F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4568684C2F Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4568684C2F for ; Fri, 7 Jun 2024 17:06:07 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-35dcc681f70so1560864f8f.0 for ; Fri, 07 Jun 2024 10:06:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779965; x=1718384765; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=EipLOogFWAsXjG6lewbyN/qiz7lO7LwdNwJSurRPF8M=; b=D0bwkY54FSf2Plrw902oNRcYRLnD0WEW5Pe06y/RFEJHgaQaBWh/2dp9WHQWgFbxSk PRFL0QiVC2Cr70CSKMDviNXM7fP5xsbA4s/HnLS2XnuLlWni3i58BDZFsWYU4TDJQ7VW BMh3fnnaXl23VL+xoJPNnP6h4jbuhub6FZLKm47K/MMUH8MJdX8b+rbr1H0e5Nl0M7dB sD5yKDhUQP2qFHa7bJ7sQx938d10NXq3dHrq9HfOFKziIbAXfGWQPWBPjGh4wYEmGTRN aD7cW9Xx2nsQLDpgZz2XnBhcjRMK3yj5++uCvV/qvKZQv5Bs9lUEQCVaNncdiX7rD6sZ 5aqg== X-Gm-Message-State: AOJu0Ywvey5CwMOJTb8G6zy7gX18VMx9hq0SSlgbR6RSizhkKr1/6KSH vurD8EWpFDYCtpN5ULl0Fj4k0gZezzgovFoha+psga9+/iL0qpeMqCj/OQ== X-Google-Smtp-Source: AGHT+IFn+T7exFM4aITVwnQ3mUABz9QusiYjkpF7g/JpQ0Lq0mfwfinoUjeEKygv7939ZYNlHyiHzg== X-Received: by 2002:adf:ffc7:0:b0:35e:83f4:3e71 with SMTP id ffacd0b85a97d-35efee1669cmr2341439f8f.70.1717779965278; Fri, 07 Jun 2024 10:06:05 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:05 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:48 +0200 Message-ID: <5aafa76fbd12004df34d3e46bf302166f7b31ac7.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779965; x=1718384765; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=EipLOogFWAsXjG6lewbyN/qiz7lO7LwdNwJSurRPF8M=; b=BLM4u8vYrI+wL9KLPevKDu4p79z/yK/jULS9twYnE9Knk8l/K6T20LRqiKEwO7Yd3a XhCL/+Uhq/ppKnWP64eDDe44htZPDpPZ7LoPhVuBkHDW7B2oYHQkb35h1EUwHPsqTjRl H59Ndp//pSHELR4vkWdF7lRGSHA+68emX/dxXelkIbu2jMsuXMW+iXf6wIDnhKN74/ld 40VG9r8fEaogzZfTcNlOe1ucTw/Pzb9uTUpCJ4vLloz0jPHXKma0w5AqADCOAdiPRmCE TNeGkUBj4PJWQ0kjaEZ8s1I8tPrjoD3cjZSKaGGaaSiVzyDGMg66f9p6qpP7VYzuTRGG AsEg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=BLM4u8vY Subject: [Buildroot] [PATCH 07/20 v2] support/download: move tracing functions to helpers 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" errorN() was unused, drop it. Signed-off-by: Yann E. MORIN --- support/download/dl-wrapper | 8 +++----- support/download/helpers | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 67a9718d9d..713ce668ac 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -17,6 +17,9 @@ # We want to catch any unexpected failure, and exit immediately. set -e +# shellcheck source=helpers source-path=SCRIPTDIR +. "${0%/*}/helpers" + export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" main() { @@ -232,10 +235,5 @@ main() { return ${rc} } -trace() { local msg="${1}"; shift; printf "%s: ${msg}" "${my_name}" "${@}"; } -warn() { trace "${@}" >&2; } -errorN() { local ret="${1}"; shift; warn "${@}"; exit "${ret}"; } -error() { errorN 1 "${@}"; } - my_name="${0##*/}" main "${@}" diff --git a/support/download/helpers b/support/download/helpers index 5ed9078287..f4102e3b06 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -94,5 +94,9 @@ post_process_repack() { mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" } +trace() { local msg="${1}"; shift; printf "%s: ${msg}" "${my_name}" "${@}"; } +warn() { trace "${@}" >&2; } +error() { warn "${@}"; exit 1; } + # Keep this line and the following as last lines in this file. # vim: ft=bash From patchwork Fri Jun 7 17:05:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945196 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwng41NNRz20PW for ; Sat, 8 Jun 2024 03:06:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A3FA0427D6; Fri, 7 Jun 2024 17:06:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id lzj3L3LYh2Qj; Fri, 7 Jun 2024 17:06:53 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2838042893 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2838042893; Fri, 7 Jun 2024 17:06:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AFF591BF479 for ; Fri, 7 Jun 2024 17:06:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2292D84C8F for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id WXOSNp2cWYEu for ; Fri, 7 Jun 2024 17:06:08 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::133; helo=mail-lf1-x133.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 3A88E84C2F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3A88E84C2F Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3A88E84C2F for ; Fri, 7 Jun 2024 17:06:08 +0000 (UTC) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-52b938587a4so2752283e87.1 for ; Fri, 07 Jun 2024 10:06:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779966; x=1718384766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pADwqX2LnLnefKM1q89+/Fko7gnrTiXVxteue7Rwkmw=; b=Lm2pIh3aq+MVWaVDwLalLszvzhJyUMRO38xNXHRqbW4l4NYXx+IgSuof+Ba3ozVsLz kEYqXQSuxPcQcSYJ2Q31+8nnnVjItj5ZVpfFtdKzb468U0MKcsO+V4oje/0GpSgJfHsC QoqC7scHe6SZIW1bSGherQAfZI7drWCRBf8CDwirZIPZIF89vOnG/4KQ9wEImfepdcFv Xzxo2VN69wdhc33y8CMP2z1yMtato/4qHI6D33Zx5ASxjGVe0cXhTR8SvOjE+XNXNTA8 B2JQxMg97oc7ZDphd/Hfv19XLowhAEEj08ZCv1atlTICcaveyTJPOdC+9YcmFlccEdE1 +92w== X-Gm-Message-State: AOJu0YxzJi3uq0DCyYOI8cRWGv5jWit7/2zLR5yeHEYd+PMOFQ3fEbqB o0KWMHKzdwAaJ0GSUySVHA7nPKQJBn4nLrugkL0Iqk2ApNEiVHIG1l6x2A== X-Google-Smtp-Source: AGHT+IEgbAbJVxpN1rndqmjPU2Exu2WbMXg86U5yC1ITjq79fjl/44zucVaecqnbJ5LlMz+ZKF/w6Q== X-Received: by 2002:ac2:5e23:0:b0:51c:3e9e:98ee with SMTP id 2adb3069b0e04-52bb9f7acdbmr1698028e87.23.1717779965728; Fri, 07 Jun 2024 10:06:05 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:05 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:49 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779966; x=1718384766; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=pADwqX2LnLnefKM1q89+/Fko7gnrTiXVxteue7Rwkmw=; b=ZVIzIEigQOJETdOGdnJt3ki7WNDPqYKtj3lmrhJBFwgDF1JAuHk91Vlv7PFBzSpUQp GLDGhbbDtw78D/SXl9psNgguMGWu5fCfDsGt6K18t+BPvMQ7MA89oFkH00qJ3mjwJD3W +ilHL4mF18/pGs1Bkb1dh4pfWde3glJUI5pE8+f/v+19iltPniaSyRR3m+PRHuLFzOOC aojnypaYxF/fz1Y3/s1RYNDdcrAdYEbG7Jh7CoZesyxfEqY51Ku0ZTfImxFc0cpT1CLv B3n+B9mPh4U5T1+pJubvBU9VM0n3DM5fs/QAbJ16u4d/VFABZL4GodAQjBL1VidHGZgW hi/Q== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ZVIzIEig Subject: [Buildroot] [PATCH 08/20 v2] support/download: pass post-process options to post-process helper 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: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Currently, we have no explicit, dedicated way to pass information to the download post-process scripts, even though we do already need to pass the path to the manifest when it is not the default, which we do with an environment variable. We'll soon need to be able to pass additional information to post-process scripts, like instructing cargo to not use a lock file when the package is not locked. Extend the dl-wrapper with a new option with an argument, where the argument will be passed as-is to the post-process script. We explicitly do not document this new variable, as it is expected to only be used in our package infrastructures (although there is currently exactly one package that will directly need it, and we hope to drop that in the future). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-generic.mk | 1 + support/download/dl-wrapper | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 8f1e6dc8e5..edeaa1348d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -186,6 +186,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: $(call DOWNLOAD, \ $($(PKG)_MAIN_DOWNLOAD), \ $(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)) \ + $(patsubst %,-P '%',$($(PKG)_DOWNLOAD_POST_PROCESS_OPTS)) \ ) \ ) $(foreach p,$($(PKG)_ADDITIONAL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 713ce668ac..91e3fc092f 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,10 +25,10 @@ export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" main() { local OPT OPTARG local backend output large_file recurse quiet rc - local -a uris hfiles backend_opts + local -a uris hfiles backend_opts post_process_opts # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do + while getopts ":c:d:D:o:n:N:H:lrf:u:qp:P:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -42,6 +42,7 @@ main() { f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; p) post_process="${OPTARG}";; + P) post_process_opts+=( "${OPTARG}" );; q) quiet="-q";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; @@ -151,7 +152,8 @@ main() { if [ -n "${post_process}" ] ; then if ! "${OLDPWD}/support/download/${post_process}-post-process" \ -o "${tmpf}" \ - -n "${raw_base_name}" + -n "${raw_base_name}" \ + "${post_process_opts[@]}" then # cd back to keep path coherence cd "${OLDPWD}" From patchwork Fri Jun 7 17:05:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945199 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwngG0HW0z20PW for ; Sat, 8 Jun 2024 03:07:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 77A88428BA; Fri, 7 Jun 2024 17:07:04 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id TnFwwcRsZcUB; Fri, 7 Jun 2024 17:07:02 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 41B5D42830 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 41B5D42830; Fri, 7 Jun 2024 17:07:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D14D71BF479 for ; Fri, 7 Jun 2024 17:06:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D5ED084C2F for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id FCkpBXqsrQZr for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::12e; helo=mail-lf1-x12e.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org E88E084C87 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E88E084C87 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by smtp1.osuosl.org (Postfix) with ESMTPS id E88E084C87 for ; Fri, 7 Jun 2024 17:06:08 +0000 (UTC) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-52b87e8ba1eso3182860e87.3 for ; Fri, 07 Jun 2024 10:06:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779967; x=1718384767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C84M+3JQced14KoZJRrr/p2t+lgR4PQVqdRFeupsGd4=; b=K30FN1nnPG5eoB5V7JTn1bp5sOD3WGmEI/3VC9c3W+b5L7c7b1SlF2+cVQlwyRrsQR mDxat2ZfMRmN+TspBSpGznIzCJ5mwT+ENwX1JB+/j+r6g1LrLFG8aB7n9AJGuTPXCAoB ADxkHKAcalogJcvK/sAwUIFfINilJrSrgaKWMMO0ljzYHoxSQiUDdkqt7qdw8iMQgl7p 8Cd1XJtMMcwOWnjAzzbrth5XiVTsK6sHjTyiyIXeveQcOdcp+N6wtr1vqTx4D3m7c8dS ygja2KgHFLsEgddh5kAAYniowDc9H3hYSgdZVz1PCt31USCYjNnlq+8GRjcLP5ejszIR 9fjw== X-Gm-Message-State: AOJu0YzOL+OziAaSheFcc8avxbBIz1Hq6g2qaC7H6m9vuNL7zw64u6km fU41gvgeZAXUR3YnnePOvMvxmCCrQJbj2jBWtvTuZCV4rKwVDeR2IfLGnA== X-Google-Smtp-Source: AGHT+IHFYmkRJfOQ28LxOrfNtoP+45L01pOi1ZVqvtQpn+ZtV/sI2EAuT27wYTRvNVkvWfbgZ4D1BQ== X-Received: by 2002:a19:6b0d:0:b0:52b:bbdf:bfab with SMTP id 2adb3069b0e04-52bbbdfc083mr1819850e87.65.1717779966584; Fri, 07 Jun 2024 10:06:06 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:05 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:50 +0200 Message-ID: <988e6677f7328c33638a5e4b1063e17f5260b01c.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779967; x=1718384767; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=C84M+3JQced14KoZJRrr/p2t+lgR4PQVqdRFeupsGd4=; b=fuS8+26fQFsGtPGYNX2Dl+GE1FFFNYuOtQs2UrWQTzG1YOgTw/tyv+5rPB78JUuqae GaOrD0akajL/eFCqM4biL39jif3ElzK03ytHIrk+jpHTRnVv1s2dFVZn/P3AS+P2jBJF Pv1xOGiHXmvdQcRZlMYJT+S4TNhsHgz7aZiP+ESKAzrtUTFe9luVRojkCXvRhCQOz++x JA30bs+l4HVVA5GLIZSdDj6iqJlF9QjSXcgEzpXmxbbv0AI+FXaDc+MkJc5wRp09alAY 9anyG2n1yyTcT/kOqeMkwx5i3AimEelYXt+kotvaqHWxehLK7i+CmpOjXGkmmDowpJfQ RTJg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=fuS8+26f Subject: [Buildroot] [PATCH 09/20 v2] support/download: accept manifest path as a post-process option 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- support/download/cargo-post-process | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index b94b160315..a9fbced466 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -5,10 +5,12 @@ set -e # shellcheck source=helpers source-path=SCRIPTDIR . "${0%/*}/helpers" -while getopts "n:o:" OPT; do +manifest="${BR_CARGO_MANIFEST_PATH-Cargo.toml}" +while getopts "n:o:m:" OPT; do case "${OPT}" in o) output="${OPTARG}";; n) base_name="${OPTARG}";; + m) manifest="${OPTARG}";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac @@ -29,7 +31,7 @@ mkdir -p .cargo/ mkdir -p "${CARGO_HOME}" flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ - --manifest-path "${BR_CARGO_MANIFEST_PATH-Cargo.toml}" \ + --manifest-path "${manifest}" \ --locked VENDOR \ > .cargo/config From patchwork Fri Jun 7 17:05:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945187 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwnfW4ZRrz20PW for ; Sat, 8 Jun 2024 03:06:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6821A42820; Fri, 7 Jun 2024 17:06:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id uXOadBXWoflX; Fri, 7 Jun 2024 17:06:24 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E0E5342817 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id E0E5342817; Fri, 7 Jun 2024 17:06:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2DD7A1BF479 for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 195064277B for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id v0QMuVCtRp2n for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42b; helo=mail-wr1-x42b.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 0F1924277D DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0F1924277D Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0F1924277D for ; Fri, 7 Jun 2024 17:06:08 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-35dcff36522so2199667f8f.1 for ; Fri, 07 Jun 2024 10:06:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779967; x=1718384767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FE6CaGhI8bz9Ka2zxRHI4oBVPdmniC9tYmmMatqguXA=; b=m352AusgpBOdyAhIZH6HjGCRS01Puem0rUeb+KX0xDkkjOiN38d5ml5pdTPL/n4ZOD 0/NhNcTj9kOvZYtxON+jDIskSckq80LaTdr6RpszIf8TEIP9l2ofRKV+e17tQbd7TjPs UcwRVGEmY/dXRLIVgBX1gN8BY3p4wTE3oahTvw29nW76NipZhFYQvzXUGR1SLDD/JSuc BIvBbKMNEPNQ+vjGObFGinluV74GsJWTFLrsiqcs1i47GFKs90hORdR3OaJFmoIpakNX Qx3e0KkZ+oEHljDpib93ei3lM/8uU7ALPDAXx4v+ZMxGK2DCRzFOmCRmLYFPo98atyMR 39Jg== X-Gm-Message-State: AOJu0Yw4gwlML8rIRXcd9HcqG9/hEHOE5mUieorOraRsUNPrgOTm7ERY Bx5fhnSNEJcWuusbGmUvRwf7O1Vt89vKD1+9phk0aTYzDOkmNTwheoWp7g== X-Google-Smtp-Source: AGHT+IEWAInEbQmUlhzccb+iv4fkmwBPooNHDA7gfzxrP1VhHeWlC5iOLuntBZn12dZ60Ho2xnQWTA== X-Received: by 2002:a5d:4b05:0:b0:354:f190:9eb8 with SMTP id ffacd0b85a97d-35efed4d373mr2425466f8f.29.1717779967008; Fri, 07 Jun 2024 10:06:07 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:06 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:51 +0200 Message-ID: <39b3ed498086259b4e0ef8c48f0de724df05224e.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779967; x=1718384767; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=FE6CaGhI8bz9Ka2zxRHI4oBVPdmniC9tYmmMatqguXA=; b=k3f8LbsHMhXe6REWG2jK8Ob+J/oAs/CPknFUrEyLQQFpKjJz6dPVOxtl+i+z58uoLE Yw77SlCvgQg+xIB0GeBVOel1rOJS+xb/t9itzaNp6PfGh0iGEKpffdg2EzEMf/xHOhQs JoLC2SPvYIsLwtfNc8vEpc7gkXFkP1ThmUlkSJe3RZVRKIaDx2kLq29RttxZ0UGpm+qj 4skIRdakiW2X/ZdNrZ2pYtefIvPrUHm6NwrssElBV+MnawgEfcx05utMQcDmhkU/puWI 3T6XhwufyHEQcs1f1Z3BYlTBGZKvZX/F7R7vB3JD6HMLioIgFvZ5MCsDkfrp9DxdVqU9 zPIQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=k3f8LbsH Subject: [Buildroot] [PATCH 10/20 v2] pakcage/pkg-cargo: use post-process opts to pass manifest path 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 47ce68bf02..41dfcbd096 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -192,7 +192,7 @@ $(2)_DL_ENV += CARGO_HOME=$$(BR_CARGO_HOME) # If building in a sub directory, use that to find the Cargo.toml ifneq ($$($(2)_SUBDIR),) -$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -m$$($(2)_SUBDIR)/Cargo.toml endif # Because we append vendored info, we can't rely on the values being empty From patchwork Fri Jun 7 17:05:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945190 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwnfj0jJxz20PW for ; Sat, 8 Jun 2024 03:06:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 904D842821; Fri, 7 Jun 2024 17:06:35 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id t2NK6jF57pwi; Fri, 7 Jun 2024 17:06:34 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 58E324277D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 58E324277D; Fri, 7 Jun 2024 17:06:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 26A1F1BF479 for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9C30761562 for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id cG7dqPzUQRoV for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::135; helo=mail-lf1-x135.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org D13866152F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D13866152F Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by smtp3.osuosl.org (Postfix) with ESMTPS id D13866152F for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-52bc1261f45so781551e87.0 for ; Fri, 07 Jun 2024 10:06:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779968; x=1718384768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OOpxcpkq8kArxU13cB4h5chWXn6VzJCAngZf3mWpaNg=; b=n2zewFlE1eY4o+Xem6092YSqogN9bwisqmZ7ewjBElFwypH2bH8ZOPMOZbQJ1b6iqJ xM8SSpzvFQ+CxSh6ezzKb3BzHfmwKFIJGubHtjf1m/eApISjIdZ17/am+QClKoKrarzD XLxgM4VKIrM3wKVEOCgJqFz2GS9tN/9Wn21z/uvGy2rgLXOSDN+YRh9gjXL688sBKIui 5woZLPNclkXYy0bXaVjgxJ58/TPymFAktiQDZx/u9B8uAsd6hKkdKCZyBlVAunxIVUqo C95e1vKlKkr21c/i5U5cAbwEpup8w8wvPeSiT49LSxMjDMNLkugvtNxAFYMbgLdKSBex SViA== X-Gm-Message-State: AOJu0YzqPHAyRMOZOrJkY9mhzxivXy4Zek+Qs751DeYXsvWLLbbirI7T lstnqhwoc4ZBl78XNdGDfseWNMxaIdVY59ifX9CYdMhSjA+JYjok9DECcA== X-Google-Smtp-Source: AGHT+IF9VE93AAJx+lAcAn9WOCOLFOzmEhH7mKZ1HmbBS7DG8QOOdYxjbp7HYMMXojgiDd2qRlrjhw== X-Received: by 2002:a05:6512:e93:b0:52b:95c4:4641 with SMTP id 2adb3069b0e04-52bb9f9287cmr2606364e87.32.1717779967404; Fri, 07 Jun 2024 10:06:07 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:07 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:52 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779968; x=1718384768; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=OOpxcpkq8kArxU13cB4h5chWXn6VzJCAngZf3mWpaNg=; b=V14wOUMOx5P00Arq9gyABX3/kmkU62Jewvmur1QNErY/6kt/I572GMVvj7O2oCbhYE A8DvslVCYM+K/1kNsVWUcPCS7h1NCKUyNQHxrwgg+N23CcZdLGrjCMpkgpEH9LNitSwv g11oQtfRpjj/3l+9v5u+HO/LXWYy6OBKvefEGoCVYvsYCJkO9xqLYK7v/vYUxnsnW4bX QULxa8NiLpSbI8Kxq0i+M61y5v/bB8zMI6bEJRtpxhrrl/JDVz/UKpD/ajYbxjiz4NOv 4pHTeijQeS2Y9Rj61a77o9FjU32WMAYgiwcKUk7Y49YdskPemjEEc+6Q9quAxcXFZQJn 8CLA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=V14wOUMO Subject: [Buildroot] [PATCH 11/20 v2] package/pkg-python: use post-process opts to pass Cargo manifest path 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: , Cc: "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- package/pkg-python.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 88fadecd54..2c1641d170 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -275,14 +275,14 @@ $(2)_DL_ENV = $$(HOST_PKG_CARGO_ENV) endif ifndef $(2)_CARGO_MANIFEST_PATH ifdef $(3)_CARGO_MANIFEST_PATH -$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(3)_CARGO_MANIFEST_PATH) +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -m$$($(3)_CARGO_MANIFEST_PATH) else ifneq ($$($(2)_SUBDIR),) -$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -m$$($(2)_SUBDIR)/Cargo.toml endif endif else -$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_CARGO_MANIFEST_PATH) +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -m$$($(2)_CARGO_MANIFEST_PATH) endif endif From patchwork Fri Jun 7 17:05:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945194 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwnfy1rVQz20PW for ; Sat, 8 Jun 2024 03:06:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B72A04287E; Fri, 7 Jun 2024 17:06:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id TFJQNOK_Hcze; Fri, 7 Jun 2024 17:06:47 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7F22242881 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 7F22242881; Fri, 7 Jun 2024 17:06:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C08421BF479 for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EF9B8403FB for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 6wKOOFdpg7xl for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::430; helo=mail-wr1-x430.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org D80C14004A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D80C14004A Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by smtp2.osuosl.org (Postfix) with ESMTPS id D80C14004A for ; Fri, 7 Jun 2024 17:06:09 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-35dc0472b7eso2057934f8f.2 for ; Fri, 07 Jun 2024 10:06:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779968; x=1718384768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AxOi7Znm8e5Y3HVPxFJcN/1hPCnLaEc3juQ2n41eSxw=; b=rOtlNlzSVU+WFotxtiwJ/YLxABN0WQFSxwNZAlBHYn+Q5HKf+U6YJN5Cc9WMhC/vQb jegWhOEshRh9GKBBGJZM/8sYiGp0AwK8w6hKaKQwu2WmiWQ1S3MkZoKNSTmTknOuEhM3 2nWHZkvZDZZdLkoaGycT1XefCY55nM3RZyH3RiACAPGsBQsB7fYXelQjHVRSizfvwZO5 9hDZWxpLL6DWsIHD/7/KmgV8uX5azj1mzaYo9n1oUK5xsTHy2KtAMeWxqcog6gI67C9h zbqViDfsCnQi8PdUBcKXg4o3wBeTQOH8PgS5zbGGl6q0uAYzSYEDKk3TXhOSuDcboMP1 eVew== X-Gm-Message-State: AOJu0YwFPAo5zOzQpV+lPGQ8gjspg5DFqrkDPy7AQMszeT5Kgw33vaGW XQ88RtKz3vwNsPijLWH9k3prYSXgHks8J7VcXiDBy9CHtjYkVAEK1U7RyA== X-Google-Smtp-Source: AGHT+IHuoml33IeOtiL9PM4K/5D2drOY0Ggq19pu7+02Xw+tfhBRDbXIQ6LxSxMUvtwo/193sxCYpQ== X-Received: by 2002:a05:6000:bce:b0:354:fb50:c1ef with SMTP id ffacd0b85a97d-35efee8c5b8mr2123824f8f.68.1717779967881; Fri, 07 Jun 2024 10:06:07 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:07 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:53 +0200 Message-ID: <8f7f18c9f67543b5e6b534bc0562c4a8a44a73c4.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779968; x=1718384768; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=AxOi7Znm8e5Y3HVPxFJcN/1hPCnLaEc3juQ2n41eSxw=; b=PWBXW+qcYp4qBt69RIKEkGw6BfI4dxz7b1jAU4YBxzoCSFMDccf7dYij5XvAAEymqg 7e0LY+jN+L6NzSEmBWB5hwUuNe5SNCaCUhiePV+NqYNv0VPgZJqq0Q6M32rVQimNl7/E Ep8e6UfdI3+i/bft5uTxdIllzXFTX23dADU0vetu9sDGGlCsWdvHFpFrzUgPsBrqKL07 QlsLRjFewI4JKMLNm4g5sGnisXffu02mOwfZNrVdOc+v90Scd/xIl9rGH8It0AS39+VC HMcQ1uIO6UazO0k5MIfzRWgHI1zd4cqASWtNyVKDDmnQdf0+HvaWOCSWvclp2gYyuZmj ZHEg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PWBXW+qc Subject: [Buildroot] [PATCH 12/20 v2] package/python-bcrypt: use post-process opts to pass Cargo manifest path 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: , Cc: James Hilliard , "Yann E. MORIN" , Asaf Kahlon Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN Cc: Asaf Kahlon Cc: James Hilliard Cc: Yegor Yefremov --- package/python-bcrypt/python-bcrypt.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/python-bcrypt/python-bcrypt.mk b/package/python-bcrypt/python-bcrypt.mk index f3137401d7..f09c67441e 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -19,9 +19,8 @@ PYTHON_BCRYPT_ENV = \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_BCRYPT_DOWNLOAD_POST_PROCESS = cargo +PYTHON_BCRYPT_DOWNLOAD_POST_PROCESS_OPTS = -m src/_bcrypt/Cargo.toml PYTHON_BCRYPT_DOWNLOAD_DEPENDENCIES = host-rustc -PYTHON_BCRYPT_DL_ENV = \ - $(PKG_CARGO_ENV) \ - BR_CARGO_MANIFEST_PATH=src/_bcrypt/Cargo.toml +PYTHON_BCRYPT_DL_ENV = $(PKG_CARGO_ENV) $(eval $(python-package)) From patchwork Fri Jun 7 17:05:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945193 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwnft4mNhz20PW for ; Sat, 8 Jun 2024 03:06:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 18809427D3; Fri, 7 Jun 2024 17:06:45 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id OlpYFsVn4JWZ; Fri, 7 Jun 2024 17:06:44 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 865EC42850 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 865EC42850; Fri, 7 Jun 2024 17:06:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2D2D91BF95D for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 729CF61562 for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id zIJnRciAgd5O for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::136; helo=mail-lf1-x136.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org B8FB06152F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B8FB06152F Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by smtp3.osuosl.org (Postfix) with ESMTPS id B8FB06152F for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-52bc335e49aso586371e87.3 for ; Fri, 07 Jun 2024 10:06:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779968; x=1718384768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aW0KPdXqg31QOR1NgVyCotG7b7qyuH9mpNJstlewNSI=; b=f8WCG6OrU+0IjT8jvpPlFIPa9eRxOFoxGSE7/stm1MuTWNHHsIkRwToBXjVG8/ofxs UlkSLc3Z0CSDxB2KioEDwPSOwxrB2fHPiyqBEHyh8uS6QQ5j8tJjl2kVGUmGscp8HcPt gO5uXSfNzLLYjN8nMe1k1RKoOQk9HikRkxwTo74LU7eeuBL9E95LEjYWan9/D5ccsuf3 uQ2ypOwT5WOpfHbpLhX2dePJ7DH/W31AyfMkeFcUm1FFl3bk67TVLXxqk6w3djVY5pkN uA0NXw11Ump+gWOzT18Bxjo/yV95vowW6dVhPnaDv/GSA6n+r5ag2VeeCj1UHX6QM5N3 ZQxg== X-Gm-Message-State: AOJu0YwX5jCAF26Fn2MgVUfetwtCyJzoQfd2CSkfcRFmbQkhuKVI3xTd 7WTj1hZXI1jezQxxqGV8MXJZ/fPkUPF8qIQCTL3+EL6aU3lPSjPGQ9k2tw== X-Google-Smtp-Source: AGHT+IGqYu4rsv0HzBok5NeIbSPj0WrP064WSiE+Syn4Wbf1cmCJYQV/sjgM9U69VwKM5+0isz3I5Q== X-Received: by 2002:a05:6512:68a:b0:52a:4217:d6e1 with SMTP id 2adb3069b0e04-52bb9f5e45amr2897733e87.4.1717779968274; Fri, 07 Jun 2024 10:06:08 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:54 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779968; x=1718384768; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=aW0KPdXqg31QOR1NgVyCotG7b7qyuH9mpNJstlewNSI=; b=NCPfu8N5QALQ7dcjl1AsOdIeox5MpC5K9nVylg7G+1ApF2ogw3amFHPCD0SKpZtdr8 J1WuARWTI9rT7BAdv7uQHoVdOzx3n6CCNJ9feqwcotcwFXR/D69yoyPiVhrwTZIs2exZ zHfCQvrHSg7yG8iKGBd1J99lOrkaNGHrB3FZYsBXQXiYPh69UeHfQM5W1hsDpogC7yYt SQvXicWXrPJXGbRciItGiHXeZzxzl+gbrH7lZoq4Tiuk3eoLkuoXSd/jqvTsG4VQe+VF JwCRExqxbTxekaQcgRrKckZeT7uWrl2pOFI98pMjzrPOnYWaZGj8vyZbyJNNfh35Q2MU vbkw== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NCPfu8N5 Subject: [Buildroot] [PATCH 13/20 v2] support/download: no longer support BR_CARGO_MANIFEST_PATH in cargo post-process 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- support/download/cargo-post-process | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index a9fbced466..12198051a4 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -5,7 +5,12 @@ set -e # shellcheck source=helpers source-path=SCRIPTDIR . "${0%/*}/helpers" -manifest="${BR_CARGO_MANIFEST_PATH-Cargo.toml}" +if [ "${BR_CARGO_MANIFEST_PATH}" ]; then + printf 'Setting BR_CARGO_MANIFEST_PATH is no longer supported; use post-process options.\n' >&2 + exit 1 +fi + +manifest=Cargo.toml while getopts "n:o:m:" OPT; do case "${OPT}" in o) output="${OPTARG}";; From patchwork Fri Jun 7 17:05:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945197 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwng73GxKz20PW for ; Sat, 8 Jun 2024 03:06:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E1619428A3; Fri, 7 Jun 2024 17:06:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id P0d2Wnw_Z2xQ; Fri, 7 Jun 2024 17:06:57 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 73BDE42824 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 73BDE42824; Fri, 7 Jun 2024 17:06:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E15871BF479 for ; Fri, 7 Jun 2024 17:06:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B51304004A for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JGdiMZAjV7xp for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::433; helo=mail-wr1-x433.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org B330840272 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B330840272 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by smtp2.osuosl.org (Postfix) with ESMTPS id B330840272 for ; Fri, 7 Jun 2024 17:06:10 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-35f0aeff7a8so568845f8f.2 for ; Fri, 07 Jun 2024 10:06:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779969; x=1718384769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UlKapMSqe7mJ+Zngi6GkI2CYhk2hK+lDpJJPdVpmdVI=; b=BVnGbatVYRZ+7uS6fj6zElSHvTaYAygyPPDbWDXnQTQnrcJ7J1ev6FtF3KzjB08nJ1 GdCqxSKTGkltjcoawpaziNDW6lbLgQT+kPRNij6Eo8Oyoxxw73gRVwrzORIV9cEPuKzp wsBhclxWoMR4jW5AvZfdc3j8XV3a8zi0UeUCogcgZoY0ASptCn6uhi9hQBzzQPbzHM/v 4uQqOxbF0YsTQ0Wanzb+E4507MF29kVUq1NFXkAvzEH8nlo82WRhB4RBNkpRmEPuKykg 8xF3Lrut++IZjUWIOK1zaUfeioI3MZmM+DENd+MjQ/6AS61rJ4O4bxuqi/jDjmfCI9X8 Rf0Q== X-Gm-Message-State: AOJu0Yzzk2sXzunw8WOqHaur+ea3bSP4Z4PXwYqzHxjyaJlshNAh5ynL F4LqChxLiphRRLBkIYoiteVQjgFY1bge8iTGN1z/3f1SvcxB1KswdH+AWw== X-Google-Smtp-Source: AGHT+IGu64wmKVi4s7BiiKIseAWIzOQpMaiwLQfVcl2joPAUHvHBHIwRyeWWyabCxYGAiGflF8e/tA== X-Received: by 2002:a5d:68c1:0:b0:35e:f234:695a with SMTP id ffacd0b85a97d-35efedca55cmr2303935f8f.56.1717779968694; Fri, 07 Jun 2024 10:06:08 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:55 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779969; x=1718384769; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=UlKapMSqe7mJ+Zngi6GkI2CYhk2hK+lDpJJPdVpmdVI=; b=cafw35rtZ0JPAy2H0LY3bW4eEXXw0thxx84rJ4HIwWMThUR5dQUhZS4UIgqA04F5eH 3b7Ydyu0BEk+ZzdUpP2lw7jl0EK+G+UhTxX6isDbFxQscjr1PgGfgkPUpjWny2sqpcVQ Z2RACoTRwFfwRZS6X3NbE/fGdr20o/H5vy3LaG/QuMtZA3iqB5MW3oR0jLtg9eIXHHia OLwl70hDep+2384RZDG0oYf8Sb+ziS5omzv3gVOIkC7UvLBL1onZXNlj6iDie6oaofnU wgfdAeH6AdC2KBh39M88tlVQDyt/ftSuCs9nyBoB0OyzZI79+PhxzSDP7BZrcfPnRGFL 11eA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=cafw35rt Subject: [Buildroot] [PATCH 14/20 v2] docs/manual: rephrase end of vendoring section 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The current phrasing is dubious: the vendoring does not detect any change in the dependencies; quite the opposite, in fact: once the archive has been generated locally, no update to the vendored dependencies is ever done. Rephrase the end of the section to mention the term "vendoring", and to drop the dubious claim; retain the off-line build reference, though, as this is indeed correct. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-cargo.adoc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index e18fd9ce23..8a2292e7b6 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -93,8 +93,5 @@ repositories, listed in its +Cargo.toml+ file. Buildroot automatically takes care of downloading such dependencies as part of the download step of packages that use the +cargo-package+ infrastructure. Such dependencies are then kept together with the package source code in -the tarball cached in Buildroot's +DL_DIR+, and therefore the hash of -the package's tarball includes such dependencies. - -This mechanism ensures that any change in the dependencies will be -detected, and allows the build to be performed completely offline. +the tarball cached in Buildroot's +DL_DIR+. This is referred to as +_vendoring_. Vendoring allows for a completely off-line build. From patchwork Fri Jun 7 17:05:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945192 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwnfq0bq1z20PW for ; Sat, 8 Jun 2024 03:06:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 898DC42818; Fri, 7 Jun 2024 17:06:41 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Ap7Qi8pIEAHR; Fri, 7 Jun 2024 17:06:40 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8EB714285D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 8EB714285D; Fri, 7 Jun 2024 17:06:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2B2661BF479 for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0D2A1427D8 for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KWn5xkx1oHo9 for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::429; helo=mail-wr1-x429.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 3734D4277F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3734D4277F Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3734D4277F for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-35f0f4746c2so128959f8f.3 for ; Fri, 07 Jun 2024 10:06:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779969; x=1718384769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tOYr6ukBtbRFTfBieK8VjPZlZyn77YQs5b0NV9QV+80=; b=mk8lVnMUn9MMWOhACDk4UizDXFAD3MeFwxCH5wEuMKFQBjHU51swgoEcQw3MLqpqek bRx8f7aKCYdcpCVdZfHdBn3dBOy/mYb63FHXuSMKotKI+xsv1VdjTqXlDvw8B/hs0ECW 21BVSEjtEgxcClWS43SdV+l5RDrig37eBm6fnKBuB1IUDOblSfEH/Vj3EoTfzc0NG/eF GyERI/LjfOqw+IuqySBqKo2tZbjiAx07gJwJKrFn83CkZ83QakA7nJ5p5qGtnJUJNc1g SJjzGS8J1npolULgXW9acpwmlJaPvIBCOkaQXjfT7yHeZC/JaSQain6agKIccgWdflLP +U8w== X-Gm-Message-State: AOJu0YwdH8IxiWZqShCdh99mm5OCmq87JaUbG20e+Xs4MYnfQ3QhK4tj 4GVtCinBHyo6tytouUtsp2QHYStG+P0QWoh/hYaCFAeBhJ81KFUnU6YAEA== X-Google-Smtp-Source: AGHT+IEeRNw4YbktNXo4fjzF5Gr+cjhR67XybBbz1XYAXVlaHF4mc2TfyD52j6v9Tqq8carVXGZhYA== X-Received: by 2002:a5d:5482:0:b0:35f:e0f:69a6 with SMTP id ffacd0b85a97d-35f0e0f6d4cmr693012f8f.27.1717779969117; Fri, 07 Jun 2024 10:06:09 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:56 +0200 Message-ID: <6f348a101c8ae327cc78e6bac6f9b54fc20c6e2e.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779969; x=1718384769; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=tOYr6ukBtbRFTfBieK8VjPZlZyn77YQs5b0NV9QV+80=; b=VoOV/de3UM6Hv2Qf1BLOB1i4Nb/PIpGNALOMoP9pagP0ZZARent+1OhFrhF5oGg7ye exnj2jIbUcXee/7WeBkHnakX/n9eqkQMUMR0EJcOt1l30nM7gyJqF0BXIKoyYB5N+cmR VtxCRL1BBiNScLL+zJAB4Zq0K8IuFuqzaJdgxHhD5O0viBoRPuXw1NEN3Lr9D66V0qhl /6VeWZfzEneh3k50z32dPsNKIeKvU1+CIV/LrNFhUydeIkgzhI28JE1ffzi3G4S9vMel gQP4CMaxf0mwm1yxpuxCl2cHtb6d2q+aTxu94GW7FuFxtjlVUgOntG5bucKOhDb8HTpc PtCg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=VoOV/de3 Subject: [Buildroot] [PATCH 15/20 v2] package/pkg-cargo: add support for unlocked packages 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-cargo.adoc | 22 ++++++++++++++++ package/pkg-cargo.mk | 15 ++++++++++- support/download/cargo-post-process | 35 ++++++++++++++++++++++---- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index 8a2292e7b6..0ed529a770 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -82,12 +82,17 @@ typical packages will therefore only use a few of them. environment of +cargo+ invocations. It used at both build and installation time +* +FOO_CARGO_LOCKED+ can be set to +YES+ (the default) or +NO+, to + specify whether the source tree has been cargo-locked or not. See + below for xref:cargo-vendoring[more details]. + * +FOO_CARGO_BUILD_OPTS+ can be used to pass additional options to +cargo+ at build time. * +FOO_CARGO_INSTALL_OPTS+ can be used to pass additional options to +cargo+ at install time. +[[cargo-vendoring]] A crate can depend on other libraries from crates.io or git repositories, listed in its +Cargo.toml+ file. Buildroot automatically takes care of downloading such dependencies as part of the download @@ -95,3 +100,20 @@ step of packages that use the +cargo-package+ infrastructure. Such dependencies are then kept together with the package source code in the tarball cached in Buildroot's +DL_DIR+. This is referred to as _vendoring_. Vendoring allows for a completely off-line build. + +When a package source tree contains a +Cargo.lock+ file, the package has +been _locked_: cargo did store the versions for the complete dependency +chain in the +Cargo.lock+ file; that is then reused by cargo during the +vendoring, which yields a reproducible dependency chain, and thus a +reproducible tarball; therefore, it is possible to compute a hash for +that archive. If a package was however not locked, then the versions for +the dependencies are unknown, the dependency chain is not reproducible, +and the archive is then not reproducible, which implies there can be no +hash for that archive. + +Packages are normally locked, so Buildroot will by default instruct +cargo to atttempt a locked vendoring; for a package that was not locked, +this would fail; in that case, +FOO_CARGO_LOCKED+ must be set to +NO+ so +Buildroot does not request cargo to attempt a locked vendoring. It is an +error to set +FOO_CARGO_LOCKED+ to +NO+ for a locked package, as it is +to set it to +YES+ (or not set it at all) on an unlocked package. diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 41dfcbd096..90e4facf52 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -195,6 +195,18 @@ ifneq ($$($(2)_SUBDIR),) $(2)_DOWNLOAD_POST_PROCESS_OPTS += -m$$($(2)_SUBDIR)/Cargo.toml endif +ifndef $(2)_CARGO_LOCKED + ifdef $(3)_CARGO_LOCKED + $(2)_CARGO_LOCKED = $$($(3)_CARGO_LOCKED) + else + $(2)_CARGO_LOCKED = YES + endif +endif + +ifeq ($$($(2)_CARGO_LOCKED),NO) +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -u +endif + # Because we append vendored info, we can't rely on the values being empty # once we eventually get into the generic-package infra. So, we duplicate # the heuristics here @@ -225,7 +237,8 @@ endif # dependencies should have been built by the download post # process logic # * --locked to force cargo to use the Cargo.lock file, which ensures -# that a fixed set of dependency versions is used +# that cargo does not update the dependencies we got during the +# vendoring, at download time # # Build step. Only define it if not already defined by the package .mk diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 12198051a4..90155a2fad 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -11,11 +11,13 @@ if [ "${BR_CARGO_MANIFEST_PATH}" ]; then fi manifest=Cargo.toml -while getopts "n:o:m:" OPT; do +locked=true +while getopts "n:o:m:u" OPT; do case "${OPT}" in o) output="${OPTARG}";; n) base_name="${OPTARG}";; m) manifest="${OPTARG}";; + u) locked=false;; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac @@ -26,19 +28,42 @@ if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then exit 0 fi +declare -a vendor_opts +vendor_opts=( --manifest-path "${manifest}" ) +if ${locked}; then + vendor_opts+=( --locked ) +fi + post_process_unpack "${base_name}" "${output}" # Do the Cargo vendoring pushd "${base_name}" > /dev/null +# The lock file is somewhere from down next to the toml (when the rust +# package is the top-level, only rust package), up to the root of the +# source tree (when the rust package is part of a rust workspace, or +# is part of an other-language package, like python). +lock_dir="$(dirname "${manifest}")" +while [ "${lock_dir}" != "." ]; do + if [ -e "${lock_dir}/Cargo.lock" ]; then break; fi + lock_dir="$(dirname "${lock_dir}")" +done + +if [ -e "${lock_dir}/Cargo.lock" ] && ! ${locked}; then + printf 'Unlocked vendoring was requested, but source tree has %s/Cargo.lock\n' "${lock_dir}" + exit 1 +elif [ ! -e "${lock_dir}/Cargo.lock" ] && ${locked}; then + # Although cargo itself would check for that, and error out in such + # a case, the error message can be confusing, so do it ourselves + printf 'Locked vendoring was requested, but source tree has no Cargo.lock\n' + exit 1 +fi >&2 + # Create the local .cargo/config with vendor info mkdir -p .cargo/ mkdir -p "${CARGO_HOME}" flock "${CARGO_HOME}"/.br-lock \ -cargo vendor \ - --manifest-path "${manifest}" \ - --locked VENDOR \ - > .cargo/config +cargo vendor "${vendor_opts[@]}" VENDOR > .cargo/config # "cargo vendor' outputs on stderr a message directing to add some data # to the project's .cargo/config.toml, data that it outputs on stdout. From patchwork Fri Jun 7 17:05:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945200 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwngJ5B1sz20PW for ; Sat, 8 Jun 2024 03:07:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8DF6A4283D; Fri, 7 Jun 2024 17:07:06 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3cJsNLQPR5JL; Fri, 7 Jun 2024 17:07:05 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 70F0442824 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 70F0442824; Fri, 7 Jun 2024 17:07:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5896E1BF479 for ; Fri, 7 Jun 2024 17:06:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9825884C2D for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 12r7UU9GtfiO for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::134; helo=mail-lf1-x134.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org C54A284C87 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C54A284C87 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by smtp1.osuosl.org (Postfix) with ESMTPS id C54A284C87 for ; Fri, 7 Jun 2024 17:06:11 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-52c4b92c09bso16225e87.1 for ; Fri, 07 Jun 2024 10:06:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779970; x=1718384770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=enDG+4GCXmhDUoT11eOPCLvbVlOgrgKZhNyDwBnQ0sI=; b=HSdrUHni3GdVQQ2vjsiCgrBxaZ8L0ZGlZmpkROqvjEOtrd9C0XOr+yKpfmlQkbzbb0 GE1IYD9nBPS7UiCRH8wp/FWMasy++ZOYfIf/hjZ9yI6YyL8RkQ+LAn4NP8Z0p85PQlwf TGChYSyb7COeLCAXHCyFXW4sWWYeZ/AaFRpsr/jEXj8ScSz4WJpDnM1Kb/7fMspgklhi Z0rAC2dvjr46ZmbezjSsz5yU/N8sHek/v3FwDH/41eoupfypFbLQuqD1NcGcAuYyE5ZQ UN5tIH5qdG+s0FENMV0FbdEuz3H+ApYJ9q65A0UVtwAO5BWR/e18di7S83stl3P8MddE u7OQ== X-Gm-Message-State: AOJu0YyjPrAkOaLQ0ooZHYoA5SPVjb0pi1uN5wtbCoHEs2+bGfhVO8A2 1LZGgxTM0HZNmCzaBXYMiCnQc5VgYNM5f2eZLElc5Qtfha+cEpei1g6y6Q== X-Google-Smtp-Source: AGHT+IGSk9IwMA62x9u0JNt8QroVlgh46OU5i6IGHvzBTGFzMYqsLQe6Vc62sLH6jDnMI5xEfPgAeg== X-Received: by 2002:a19:2d12:0:b0:52c:2b7a:e516 with SMTP id 2adb3069b0e04-52c2b7ae54emr142677e87.46.1717779969559; Fri, 07 Jun 2024 10:06:09 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:09 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:57 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779970; x=1718384770; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=enDG+4GCXmhDUoT11eOPCLvbVlOgrgKZhNyDwBnQ0sI=; b=VUmKPZjCK81R2YDtI9ZD2pREHdzpu6wziU32wfP6NHiacQUITCT+Wy/puSf388znxD DXfW8T47zafshgyR6rQaAPfB6irO3AdXSHY42tSWFjqBpgBAaN/3gntmdn0fbFH5CCB8 Qr4ksgjO0m3D3PCs0v71Dqdm4sEcN0A+EdYeWrPiNs8OCMdKuWL2Tt9jRwLEJCL1im8e vuxCIQZ18ce3XnMA/Q8Mdz9vcWGop6G3OXf22bvk30wYWKkLzrNmEQkDs6eNuRm83hUI BHhUkjEGkp83ORcIHBVG5+ZYWp44owI+HUumzB3BNyhzkUa13KB+6pIIg+7/KCYqepHf p7yA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=VUmKPZjC Subject: [Buildroot] [PATCH 16/20 v2] utils/checkpackagelib: add test for default _CARGO_LOCKED 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: , Cc: "Yann E. MORIN" , Ricardo Martincoski Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski --- utils/checkpackagelib/lib_mk.py | 8 ++++++++ utils/checkpackagelib/test_lib_mk.py | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index ce2ab5157c..4e9264ba35 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -322,6 +322,8 @@ class UselessFlag(_CheckFunction): DEFAULT_AUTOTOOLS_FLAG = re.compile(r"^.*{}".format("|".join([ r"_AUTORECONF\s*=\s*NO", r"_LIBTOOL_PATCH\s*=\s*YES"]))) + DEFAULT_CARGO_FLAG = re.compile(r"^.*{}".format("|".join([ + r"_CARGO_LOCKED\s*=\s*YES"]))) DEFAULT_GENERIC_FLAG = re.compile(r"^.*{}".format("|".join([ r"_INSTALL_IMAGES\s*=\s*NO", r"_INSTALL_REDISTRIBUTE\s*=\s*YES", @@ -357,6 +359,12 @@ class UselessFlag(_CheckFunction): .format(self.filename, lineno, self.url_to_manual), text] + if self.DEFAULT_CARGO_FLAG.search(text): + return ["{}:{}: useless default value " + "({}#_infrastructure_for_cargo_based_packages)" + .format(self.filename, lineno, self.url_to_manual), + text] + class VariableWithBraces(_CheckFunction): VARIABLE_WITH_BRACES = re.compile(r"^[^#].*[^$]\${\w+}") diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 2086237ebb..bc26e16f8c 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -599,6 +599,24 @@ UselessFlag = [ 'any.mk', 'ANY_LIBTOOL_PATCH= \t NO\n', []), + ('cargo locked no', + 'any.mk', + 'ANY_CARGO_LOCKED=NO\n', + []), + ('host cargo locked no', + 'any.mk', + 'HOST_ANY_CARGO_LOCKED=NO\n', + []), + ('cargo locked yes', + 'any.mk', + 'HOST_ANY_CARGO_LOCKED=YES\n', + [['any.mk:1: useless default value (url#_infrastructure_for_cargo_based_packages)', + 'HOST_ANY_CARGO_LOCKED=YES\n']]), + ('host cargo locked yes', + 'any.mk', + 'ANY_CARGO_LOCKED=YES\n', + [['any.mk:1: useless default value (url#_infrastructure_for_cargo_based_packages)', + 'ANY_CARGO_LOCKED=YES\n']]), ('generic', 'any.mk', 'ANY_INSTALL_IMAGES = NO\n' From patchwork Fri Jun 7 17:05:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945195 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwng11bVXz20PW for ; Sat, 8 Jun 2024 03:06:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B78F24282B; Fri, 7 Jun 2024 17:06:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KNNZuO17qslg; Fri, 7 Jun 2024 17:06:50 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 39EA842881 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 39EA842881; Fri, 7 Jun 2024 17:06:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 14E951BF479 for ; Fri, 7 Jun 2024 17:06:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BC79C42782 for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8zFW7aWkV76r for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::431; helo=mail-wr1-x431.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 33907427D2 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 33907427D2 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by smtp4.osuosl.org (Postfix) with ESMTPS id 33907427D2 for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-35e573c0334so2078093f8f.1 for ; Fri, 07 Jun 2024 10:06:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779970; x=1718384770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=a3/c0kPGljHWAWKZOugtNG79rMb4zJwSUr93HA3/FOs=; b=SXyqCsFOrvr91zs/9UeBEwD98tDNxQqt26QRDf1SquFqMXk5achbBNRVToh6Iihm1y YUe0fr69m5BtmHAmT02Lu+3DlAe0W0ivaxkzei0y8eBlJD9qpM6RtF/s3fiPgOxE7/1T bBPxzCqqV0RE9YJZz4UoJ0SzRSmvYxqR3nFCvrArbLJrYgP1oTdr3YC8eKGvT6jf45kI sz3ro+MeooBYjVLy1Bv0eMlsSwdNvm4ixCjfOo8v75PLCApfiy3Yonvruf/HvLDwgY6d /FXlVJsMSoHR3rS5tJUFNPTtCigX9KicVzYOfWaR1/k8WwLT73XtskeqPj1GoJrXLo1M tAIw== X-Gm-Message-State: AOJu0YxpEMKgvwIFPFkUh/iLIJy8LMWDn3Ik5nLX7JwiArdkq2QBeBEj LqAbjcAe60HAJ7Z+AbczytfxsbkJgAwAgUQSCpvJw5Gun1fDUfeari4DuQ== X-Google-Smtp-Source: AGHT+IF0kxVZr+OfZZUG0DFJoxQjbRnN1bPoMMDo5ObIlXvoyMPS5hgVpI9zqFROhAsQqiaLn01wew== X-Received: by 2002:a5d:640a:0:b0:354:e22c:ea86 with SMTP id ffacd0b85a97d-35efea19068mr3081083f8f.9.1717779969971; Fri, 07 Jun 2024 10:06:09 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:09 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:58 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779970; x=1718384770; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=a3/c0kPGljHWAWKZOugtNG79rMb4zJwSUr93HA3/FOs=; b=WEWdmJhdAKT7pANbSPmHPie4sYyrgSUc6dFbLu7IWweTFzwHCtHJRlDO7SOjygP6GT Mi9h4/HapdkHR63kpYjSUx6O0fQKoAw0G6GN2u2Ee28vX86DSUnhI/VNOExdni9wp8sk wDwF6N7gmULw8bb4xZQYhNazWQbDMQ1Otqbq743xBblCuXjMajuIHOz17ON5GwOSlvm/ Ql19MgfUXFNWZLNPGYNYpH+T1WeGf69fhhUUJ1Ea8yGlDx721I4knuiahbqj7QmMMIsh CUTkXKjaBU6NoEZT74Qfz33UmjyGRoUvHrWAS6kv7qVqZTYQyAO4m4z0b4ysV+qlSAZ/ APtQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=WEWdmJhd Subject: [Buildroot] [PATCH 17/20 v2] RFC: package/anvil: new package 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Thie is an RFC, because it has only been build-tested to validate the cargo-unlocked case; there has been no runtime test of anvil. Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/anvil/Config.in | 20 ++++++++++++++++++++ package/anvil/anvil.mk | 30 ++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 package/anvil/Config.in create mode 100644 package/anvil/anvil.mk diff --git a/package/Config.in b/package/Config.in index bfbec1c21d..3f4fbf0543 100644 --- a/package/Config.in +++ b/package/Config.in @@ -313,6 +313,7 @@ endmenu menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" + source "package/anvil/Config.in" source "package/cage/Config.in" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" diff --git a/package/anvil/Config.in b/package/anvil/Config.in new file mode 100644 index 0000000000..eb65a9fb53 --- /dev/null +++ b/package/anvil/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_ANVIL + bool "anvil" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_PACKAGE_MESA3D_GBM + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_SEATD + select BR2_PACKAGE_WAYLAND + +comment "anvil needs udev /dev amangement, mesa3d w/ gbm, a toolchain w/ threads, shared libs" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_PACKAGE_HAS_UDEV \ + || !BR2_PACKAGE_MESA3D_GBM diff --git a/package/anvil/anvil.mk b/package/anvil/anvil.mk new file mode 100644 index 0000000000..7de9f3e06d --- /dev/null +++ b/package/anvil/anvil.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# anvil +# +################################################################################ + +ANVIL_VERSION = fb44b240ea4a3aa39a6b92f5bede23301ab9a26e +ANVIL_SITE = https://github.com/Smithay/smithay +ANVIL_SITE_METHOD = git + +# Upstream refuses to lock their package: +# https://github.com/Smithay/smithay/issues/496 +ANVIL_CARGO_LOCKED = NO + +ANVIL_SUBDIR = anvil + +ANVIL_DEPENDENCIES = \ + libinput \ + libxkbcommon \ + mesa3d \ + pixman \ + seatd \ + udev \ + wayland + +ifeq ($(BR2_PACKAGE_XWAYLAND),y) +ANVIL_DEPENDENCIES += xwayland +endif + +$(eval $(cargo-package)) From patchwork Fri Jun 7 17:05:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945198 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwngB400jz20PW for ; Sat, 8 Jun 2024 03:07:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A737042805; Fri, 7 Jun 2024 17:07:00 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id GkwkCWljdjNu; Fri, 7 Jun 2024 17:06:59 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 34E25428A4 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 34E25428A4; Fri, 7 Jun 2024 17:06:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 04C4E1BF969 for ; Fri, 7 Jun 2024 17:06:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 27F676158A for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 4JK5Cf73_lkU for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::331; helo=mail-wm1-x331.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 60ACC6152F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 60ACC6152F Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by smtp3.osuosl.org (Postfix) with ESMTPS id 60ACC6152F for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-421396e3918so27987525e9.0 for ; Fri, 07 Jun 2024 10:06:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779970; x=1718384770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5YQleT/TDJcFKTolFgGtJfr3uSBdKxReksMWVGli+Ew=; b=rAPMVPF1wL8jJMv5r0wMohUMrUl9RjazQjwHNP2y9hB5F3567aCeyuI+i4OOEAjjuz A29Kp+3ynC5GEpRMK/jcR/ghKrMn8LJsZ/KGrA+zuu/iHeeIqUFPDxSsqQ4xUSQc5p1C 2eiliYV3SkPC3F5yJGlVamZC4S9pxGfRkUjn2Vha+PnN0+cHOaiQBnvW0lYJI2+9LyzO XFrVv9g257GcAeEeRQiyHajI3gUUzCJl+qti7TUOdW1mWSEsVG9ChSNYCBNHod0Ru1pZ o8yl9+8KnKCY+S3Q/A/M/umDhMbAFh8Bb0J9TqJRyp+bM7EMly0TBYa94zqSO7bEAs3J 7NLQ== X-Gm-Message-State: AOJu0YyjyW05/XGWFH87Qy1owt0Yf0FTrMGEPR+20WZXAqjWkD7bddPq tYhBA0iO3y757xVNHbpUNMJIytK6L5HOCnSacOjVAYvHG1ifKFIjUdEfJQ== X-Google-Smtp-Source: AGHT+IE2eAmlOZXfZNtE8Pfd8ggtuxUO17y8Ur8YLUjLuzoD1lCNE1yby9P8tyDLZWDi1qjIsNt/9Q== X-Received: by 2002:a5d:64c1:0:b0:354:f8a9:351 with SMTP id ffacd0b85a97d-35efed15b7bmr3498658f8f.3.1717779970346; Fri, 07 Jun 2024 10:06:10 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:10 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:05:59 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779970; x=1718384770; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=5YQleT/TDJcFKTolFgGtJfr3uSBdKxReksMWVGli+Ew=; b=nOF6XszN1r20emnvFK4ToM7DzJCGkr/whBixDfKcNqM4zcVthPaIc6dBCIthpcRWxM FMQvDbmIMLzEARD+WvVjrlyCGC2RDWjL3jCVt142noMFHzJ+eCzby3yLrdcc1Pmqh9/5 Nv36rdFnkp9sB3YCmxmiODTV/x9luJae/xTAUSwwb5arfrE20+emIwQLGULSN63xyIHd KNc6w6xStnkKpTzZJKb+cQs1RofBURv3EoY8fTZEfLBr36/6+hzcG6if2/5lYVwE0KU2 jeSiThAmOvk8YbGYuRmF7Y7WAreD8CtomNAH4tlLsu+xI61BTcY7VB+tA59mpi5+hTUF oouQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=nOF6XszN Subject: [Buildroot] [PATCH 18/20 v2] package/pkg-utils: accept pacakge-specific archive format version 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- package/pkg-utils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index d1964299af..598ae6605e 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -47,8 +47,9 @@ pkgname = $(lastword $(subst /, ,$(pkgdir))) # Helper to build the extension for a package archive, based on various # conditions. +# NOTE! _EXTRA_FMT_VERSION should only be set by the infra, not individual packages! # $(1): upper-case package name -pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD))$(BR_FMT_VERSION_$($(1)_DOWNLOAD_POST_PROCESS)).tar.gz +pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD))$(BR_FMT_VERSION_$($(1)_DOWNLOAD_POST_PROCESS))$($(1)_EXTRA_FMT_VERSION).tar.gz # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) From patchwork Fri Jun 7 17:06:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945201 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwngM3l9Xz20PW for ; Sat, 8 Jun 2024 03:07:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8F2A6428C9; Fri, 7 Jun 2024 17:07:09 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 5PdikYSH_54J; Fri, 7 Jun 2024 17:07:08 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2408B428CE Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2408B428CE; Fri, 7 Jun 2024 17:07:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D7D351BF479 for ; Fri, 7 Jun 2024 17:06:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BA6FB6152F for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id xdr9pSyaYbUA for ; Fri, 7 Jun 2024 17:06:13 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42d; helo=mail-wr1-x42d.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org CFD526156D DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CFD526156D Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by smtp3.osuosl.org (Postfix) with ESMTPS id CFD526156D for ; Fri, 7 Jun 2024 17:06:12 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-354dfe54738so1797375f8f.3 for ; Fri, 07 Jun 2024 10:06:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779971; x=1718384771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=quIjhFLQ8vwmoBfl54WMMIyyStS7N4pIJXNOj8ezOqk=; b=HguJOz/8TvEEGL6SBoMHfYGs642lRNEuZJGPX3WkOWe96GNy+ruKg4eNg8p+Ws8AP1 u8+o7Vb+vpCL/WcsE+xDt8pMPRrgFJEgiU3qmfrLZ4PLjnqT+P+ynnIRMVEQhtUh51OL UyvAYcptiribWBpYMb4wIR91eRDTSOVyDIDpvvulMrtPzb7sJeytfIF+ybgE1PycG9j9 BEDSC0zWjN++tyCZmjyQPTZ0seWDLw+LvP8lbPxkvpvytsKBlJZRHhSN9JEwob7Qp7ms v9z8g4JKrC2+WyqNLH7PiBqwTor+I0QMEO5EGdP5tMuC27TynBmpE0TSkFCJ2GgIL/vc NGvg== X-Gm-Message-State: AOJu0YzQr8RyX+89uhlRV1E+2tLXcS+KQF3HMFo0pLHt/QG7UT27VBiM PU4j4WEB3c+hV2Www/WsJwns4eVGhEfeN95Q0BkycjXGuRNq1glC5ffk8g== X-Google-Smtp-Source: AGHT+IGO3AqAd9ILJVZWJLyD9I8wjbVR+9rDgazfeuzLtV6RjtevcK9jOb2UOKZ1dUe22ql86RYMPA== X-Received: by 2002:a5d:47a5:0:b0:359:b737:68d9 with SMTP id ffacd0b85a97d-35efed2033amr2526469f8f.12.1717779970790; Fri, 07 Jun 2024 10:06:10 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:10 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:06:00 +0200 Message-ID: <077431bc77b4c376129ceeb628367591bcd5e8ec.1717779951.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779971; x=1718384771; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=quIjhFLQ8vwmoBfl54WMMIyyStS7N4pIJXNOj8ezOqk=; b=diKvJq3Ac9MmDnCoqrq17/ysr6+EoZHqodT7tL+Blf0RW5dkEcMf3dSp4LtgPXDStF wvuN4oee7aLjXW96DXsm2f8Xj9TBagOTJWo7XuyeUZDYe6nCb5AIokjHHOLf+VEj7exO JW7TmDD/n+A67DnwZpTqrAmn4eANDAo6SdDv6G64xKmHQvebVGxSbjdGOi4w7BJUwmWY 2dyyUNHFeVMOEDMCwnezwlYrIVjWd/YvJqNQRhWr7qhwSW24+0wdNazPR5odmgp4U7gZ ziOszDey26SO0FJ4et3L+FCwFJa+q0+a5GDmSPdnCLTuDMvwLSmsFZniv4XcGPxR+haX kRag== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=diKvJq3A Subject: [Buildroot] [PATCH 19/20 v2] package/pkg-cargo: allow unlocked packages to provide local Cargo.lock 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-cargo.adoc | 27 ++++++++++++++++---------- package/pkg-cargo.mk | 14 +++++++++++++ support/download/cargo-post-process | 21 +++++++++++++++++++- 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/docs/manual/adding-packages-cargo.adoc b/docs/manual/adding-packages-cargo.adoc index 0ed529a770..e252c347ee 100644 --- a/docs/manual/adding-packages-cargo.adoc +++ b/docs/manual/adding-packages-cargo.adoc @@ -82,9 +82,23 @@ typical packages will therefore only use a few of them. environment of +cargo+ invocations. It used at both build and installation time -* +FOO_CARGO_LOCKED+ can be set to +YES+ (the default) or +NO+, to - specify whether the source tree has been cargo-locked or not. See - below for xref:cargo-vendoring[more details]. +* +FOO_CARGO_LOCKED+ to specify how the source tree has been + xref:cargo-vendoring[cargo-locked] by its upstream: ++ +** +YES+ (the default if unset): the package has been cargo-locked; it + is an error to set +FOO_CARGO_LOCKED=YES+ (or leave it unset) for an + unlocked package; +** +NO+: the package has not been cargo-locked, and no locking should + be attempted by Buildroot; it is an error to set +FOO_CARGO_LOCKED=NO+ + for a cargo-locked package; +** +buildroot+: the package has not been cargo-locked, but a `Cargo.lock` + is provided in the Buildroot package (next to the +.mk+ file); in that + situation, +FOO_CARGO_LOCK_VERSION+ must be set to a value that changes + everytime the +Cargo.lock+ in Buildroot is updated (e.g. by setting + +FOO_CARGO_LOCK_VERSION=1+ the first time, and incrementing it for + every change in +Cargo.lock+; reset it to +1+ when the package version + itself, +FOO_VERSION+, is updated); it is an error to set + +FOO_CARGO_LOCKED=buildroot+ for a cargo-locked package. * +FOO_CARGO_BUILD_OPTS+ can be used to pass additional options to +cargo+ at build time. @@ -110,10 +124,3 @@ that archive. If a package was however not locked, then the versions for the dependencies are unknown, the dependency chain is not reproducible, and the archive is then not reproducible, which implies there can be no hash for that archive. - -Packages are normally locked, so Buildroot will by default instruct -cargo to atttempt a locked vendoring; for a package that was not locked, -this would fail; in that case, +FOO_CARGO_LOCKED+ must be set to +NO+ so -Buildroot does not request cargo to attempt a locked vendoring. It is an -error to set +FOO_CARGO_LOCKED+ to +NO+ for a locked package, as it is -to set it to +YES+ (or not set it at all) on an unlocked package. diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 90e4facf52..034402c20e 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -203,8 +203,22 @@ ifndef $(2)_CARGO_LOCKED endif endif +ifndef $(2)_CARGO_LOCK_VERSION + ifdef $(3)_CARGO_LOCK_VERSION + $(2)_CARGO_LOCK_VERSION = $$($(3)_CARGO_LOCK_VERSION) + else + $(2)_CARGO_LOCK_VERSION = YES + endif +endif + ifeq ($$($(2)_CARGO_LOCKED),NO) $(2)_DOWNLOAD_POST_PROCESS_OPTS += -u +else ifeq ($$($(2)_CARGO_LOCKED),buildroot) +ifeq ($$($(2)_CARGO_LOCK_VERSION),) +$$(error $(1) uses a Cargo.lock bundled with Buildroot, but does not define $(2)_CARGO_LOCK_VERSION) +endif +$(2)_EXTRA_FMT_VERSION = -lock$$($(2)_CARGO_LOCK_VERSION) +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -L $$(abspath $$($(2)_PKGDIR)/Cargo.lock) endif # Because we append vendored info, we can't rely on the values being empty diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 90155a2fad..3431d04a72 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -12,12 +12,14 @@ fi manifest=Cargo.toml locked=true -while getopts "n:o:m:u" OPT; do +cargo_lock= +while getopts "n:o:m:uL:" OPT; do case "${OPT}" in o) output="${OPTARG}";; n) base_name="${OPTARG}";; m) manifest="${OPTARG}";; u) locked=false;; + L) cargo_lock="${OPTARG}";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac @@ -49,6 +51,23 @@ while [ "${lock_dir}" != "." ]; do lock_dir="$(dirname "${lock_dir}")" done +if [ "${cargo_lock}" ]; then + if [ -e "${lock_dir}/Cargo.lock" ]; then + printf 'Cannot override %s/Cargo.lock with custom %s\n' "${lock_dir}" "${cargo_lock}" + exit 1 + fi >&2 + # When the package had no Cargo.lock, we need to + # copy ours next to the top-most manifest. + dir="${manifest}" + while [ "${dir}" != "." ]; do + dir="$(dirname "${dir}")" + if [ -e "${dir}/Cargo.lock" ]; then + lock_dir="${dir}" + fi + done + cp "${cargo_lock}" "${lock_dir}/Cargo.lock" +fi + if [ -e "${lock_dir}/Cargo.lock" ] && ! ${locked}; then printf 'Unlocked vendoring was requested, but source tree has %s/Cargo.lock\n' "${lock_dir}" exit 1 From patchwork Fri Jun 7 17:06:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1945202 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vwngf6mPSz20PW for ; Sat, 8 Jun 2024 03:07:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E5E324280B; Fri, 7 Jun 2024 17:07:24 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id lTNhew7lFtG7; Fri, 7 Jun 2024 17:07:16 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C208F428E6 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id C208F428E6; Fri, 7 Jun 2024 17:07:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 064D51BF969 for ; Fri, 7 Jun 2024 17:06:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A55A061584 for ; Fri, 7 Jun 2024 17:06:17 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hqNGtxPkoU6v for ; Fri, 7 Jun 2024 17:06:14 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::434; helo=mail-wr1-x434.google.com; envelope-from=yann.morin.1998@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 44FA461562 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 44FA461562 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by smtp3.osuosl.org (Postfix) with ESMTPS id 44FA461562 for ; Fri, 7 Jun 2024 17:06:14 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-35f089e35e7so545098f8f.0 for ; Fri, 07 Jun 2024 10:06:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717779972; x=1718384772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YU3CBLUz8RJz7HURlVB/jMDfVKByFhGCN2u/ImIVdXs=; b=E52NEfqLpS+FVd8wKjavZX31HzxUN0eZhdxut/9LnLHzp41XSKGillfiIgIUnIkicV /IixpKA06wqqWQlp8XDFnLPfA0EYyDEnQVIElxkHpiGOg4l4bJsfGxKtBHH5YEE1qjwS wWWCe9R1jXmucWXuCvjsPhqIpv4uQKlKJhwH2XTb9cse++kAy5Lpnda3fyGmod2vRZ7I VLNiJdhGr8d+8D7UnX0Isg8HYlEVyKnF4ZnptsErOo59WMjiFKL4cOCdu4KRlrAnq7UG 1srVfHYnvlmlwd7rnZGKRzv/V4tpDHVnIz0pT1BUpxrpJL50wReLOEQ1mAl76hd+zsDE S6oA== X-Gm-Message-State: AOJu0YyoYg3Ru3G8X+AQVBfk+R2rG+0/JsjsfNSnlll6F7a9VSWiqqwU 54z3NsScU1XF0h4R2UwPSMH7b5u3zYJ+Vg2yvcpLT9NOqABFffm8LZHa2A== X-Google-Smtp-Source: AGHT+IH67qlWcwt16G2mCqCy7oYP0II+bKBF0EKFxnE0QYirYIlmcpYNSLypm93xlIntB6gJyDdpMg== X-Received: by 2002:a5d:5405:0:b0:354:f9d9:c374 with SMTP id ffacd0b85a97d-35efed2f23fmr2557407f8f.26.1717779971393; Fri, 07 Jun 2024 10:06:11 -0700 (PDT) Received: from landeda.home ([2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4355379f8f.73.2024.06.07.10.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 10:06:11 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 7 Jun 2024 19:06:01 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717779972; x=1718384772; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=YU3CBLUz8RJz7HURlVB/jMDfVKByFhGCN2u/ImIVdXs=; b=gMiQA08NzSGi742WzxWxpDuo32qfw497jTF3v5Em8cMh7EhmusBh1YZBu/COOXegvQ K00hWnLT+NHtzocYFWag/taWHmpwJel1Z3VXy83adWePDyHSFSw0B+L/8Tv9h1vhBqn8 U8CaQXa2BHBwdElX6YuZIfh0ZlIC0JVmfdDQIAI0lSc//bxWFuEfmeF52uzUS1HKqFlm MHb4fwBpYC8NKVyNJ5FAr0FcihUUW6IRBkNqGBdYqEpo9XdxDBSIa/jt5PjqBpEgina4 KGySjAdJJlMpd6WY9y7bGLi+fwLPoZuQQJgLkJ96FhFrBannH0j6j5zK7GhINRyzWBZv lueA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=fail (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=gMiQA08N Subject: [Buildroot] [PATCH 20/20 v2] RFC: package/anvil: add local Cargo.lock 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: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Yann E. MORIN --- package/anvil/Cargo.lock | 3464 ++++++++++++++++++++++++++++++++++++++ package/anvil/anvil.hash | 2 + package/anvil/anvil.mk | 5 +- 3 files changed, 3469 insertions(+), 2 deletions(-) create mode 100644 package/anvil/Cargo.lock create mode 100644 package/anvil/anvil.hash diff --git a/package/anvil/Cargo.lock b/package/anvil/Cargo.lock new file mode 100644 index 0000000000..c7656b19e4 --- /dev/null +++ b/package/anvil/Cargo.lock @@ -0,0 +1,3464 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anvil" +version = "0.0.1" +dependencies = [ + "bitflags 2.5.0", + "fps_ticker", + "gl_generator", + "image", + "profiling", + "puffin_http", + "rand", + "renderdoc", + "smithay", + "smithay-drm-extras", + "thiserror", + "tracing", + "tracing-subscriber", + "x11rb", + "xcursor", + "xkbcommon", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "appendlist" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitstream-io" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "built" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgmath" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" +dependencies = [ + "approx", + "num-traits", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.3", +] + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "container_of" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89f5bbeb86761f66a87f8e327265ea0111f82f1928a84037b9abedab9f79472b" +dependencies = [ + "memoffset 0.6.5", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.3", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "drm" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix", +] + +[[package]] +name = "drm-ffi" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" +dependencies = [ + "drm-sys", + "rustix", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" +dependencies = [ + "bindgen", + "libc", + "linux-raw-sys 0.6.4", + "pkg-config", +] + +[[package]] +name = "edid-rs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" + +[[package]] +name = "either" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "fps_ticker" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe164905ff69757d4bdc4c61d7df2930e47e2f5b4a132895a8f995990b2b9219" + +[[package]] +name = "gbm" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" +dependencies = [ + "bitflags 2.5.0", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" +dependencies = [ + "bindgen", + "libc", + "proc-macro2", + "regex", +] + +[[package]] +name = "generator" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb" +dependencies = [ + "cc", + "cfg-if", + "libc", + "log", + "rustversion", + "windows", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +dependencies = [ + "byteorder-lite", + "thiserror", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "input" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0" +dependencies = [ + "bitflags 2.5.0", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "udev", +] + +[[package]] +name = "input-sys" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" +dependencies = [ + "bindgen", + "proc-macro2", + "regex", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.5.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libseat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" +dependencies = [ + "errno", + "libseat-sys", + "log", +] + +[[package]] +name = "libseat-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "lz4_flex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pixman" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a24da0bec14f4e43a495c1837a3c358b87532e7fe66bd75c348b89f0451b6" +dependencies = [ + "drm-fourcc", + "paste", + "pixman-sys", + "thiserror", +] + +[[package]] +name = "pixman-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plotters" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" + +[[package]] +name = "plotters-svg" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", + "puffin 0.19.0", + "tracy-client", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "puffin" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "cfg-if", + "instant", + "lz4_flex", + "once_cell", + "parking_lot", + "serde", +] + +[[package]] +name = "puffin" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f76ad4bb049fded4e572df72cbb6381ff5d1f41f85c3a04b56e4eca287a02f" +dependencies = [ + "anyhow", + "byteorder", + "cfg-if", + "once_cell", + "parking_lot", +] + +[[package]] +name = "puffin_http" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13bffc600c35913d282ae1e96a6ffcdf36dc7a7cdb9310e0ba15914d258c8193" +dependencies = [ + "anyhow", + "crossbeam-channel", + "log", + "puffin 0.16.0", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "renderdoc" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12" +dependencies = [ + "bitflags 1.3.2", + "float-cmp", + "libloading 0.7.4", + "once_cell", + "renderdoc-sys", + "winapi", + "wio", +] + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scan_fmt" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smallvil" +version = "0.1.0" +dependencies = [ + "bitflags 2.5.0", + "smithay", + "tracing-subscriber", +] + +[[package]] +name = "smithay" +version = "0.3.0" +dependencies = [ + "appendlist", + "ash", + "bitflags 2.5.0", + "calloop 0.13.0", + "cc", + "cgmath", + "clap", + "criterion", + "cursor-icon", + "downcast-rs", + "drm", + "drm-ffi", + "drm-fourcc", + "encoding_rs", + "errno", + "gbm", + "gl_generator", + "glow", + "image", + "indexmap", + "input", + "lazy_static", + "libc", + "libloading 0.8.3", + "libseat", + "once_cell", + "pixman", + "pkg-config", + "profiling", + "rand", + "rustix", + "scan_fmt", + "scopeguard", + "smallvec", + "tempfile", + "thiserror", + "tracing", + "tracing-subscriber", + "udev", + "wayland-backend", + "wayland-egl", + "wayland-protocols 0.32.1", + "wayland-protocols-misc", + "wayland-protocols-wlr 0.3.1", + "wayland-server", + "wayland-sys", + "winit", + "x11rb", + "xkbcommon", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.5.0", + "calloop 0.12.4", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-drm-extras" +version = "0.1.0" +dependencies = [ + "drm", + "edid-rs", + "pkg-config", + "smithay", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "toml" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.13", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.9", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracy-client" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d" +dependencies = [ + "loom", + "once_cell", + "tracy-client-sys", +] + +[[package]] +name = "tracy-client-sys" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +dependencies = [ + "cc", +] + +[[package]] +name = "udev" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" +dependencies = [ + "io-lifetimes 1.0.11", + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wayland-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +dependencies = [ + "bitflags 2.5.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18cede1c33845ccd8fcebf7f107595170abf0ad0a28d47c50b444e06019b16e8" +dependencies = [ + "wayland-backend", + "wayland-sys", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-protocols 0.32.1", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-protocols 0.32.1", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559" +dependencies = [ + "bitflags 2.5.0", + "downcast-rs", + "io-lifetimes 2.0.3", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.1", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +dependencies = [ + "memchr", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "wlcs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d99c305ce368db32f0c675a3a17abbfd4123a59f4a1c56c0ee70b372cb7609e" +dependencies = [ + "container_of", + "memoffset 0.9.1", + "nix", + "wayland-sys", +] + +[[package]] +name = "wlcs_anvil" +version = "0.0.1" +dependencies = [ + "anvil", + "cgmath", + "libc", + "memoffset 0.9.1", + "smithay", + "wayland-sys", + "wlcs", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.3", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/package/anvil/anvil.hash b/package/anvil/anvil.hash new file mode 100644 index 0000000000..757ac1299d --- /dev/null +++ b/package/anvil/anvil.hash @@ -0,0 +1,2 @@ +sha256 8d856d94fd4a327426446072ca4ffdc0ad91511b3d928d90c50200f5acdc71c8 anvil-0afc33267ed17e516ec8db118fbb137c8add9c09-git4-cargo2-lock0.tar.gz +sha256 331891ba7afe9ea12e7f9834bdb37db7abd9131183ed85215f6b4109b0303877 LICENSE.txt diff --git a/package/anvil/anvil.mk b/package/anvil/anvil.mk index 7de9f3e06d..46d062e1de 100644 --- a/package/anvil/anvil.mk +++ b/package/anvil/anvil.mk @@ -4,13 +4,14 @@ # ################################################################################ -ANVIL_VERSION = fb44b240ea4a3aa39a6b92f5bede23301ab9a26e +ANVIL_VERSION = 0afc33267ed17e516ec8db118fbb137c8add9c09 ANVIL_SITE = https://github.com/Smithay/smithay ANVIL_SITE_METHOD = git # Upstream refuses to lock their package: # https://github.com/Smithay/smithay/issues/496 -ANVIL_CARGO_LOCKED = NO +ANVIL_CARGO_LOCKED = buildroot +ANVIL_CARGO_LOCK_VERSION = 0 ANVIL_SUBDIR = anvil