From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yCx9FUPmTWfkHgEAe85BDQ:P1 (envelope-from ) for ; Mon, 02 Dec 2024 16:54:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id yCx9FUPmTWfkHgEAe85BDQ (envelope-from ) for ; Mon, 02 Dec 2024 17:54:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=udrtZtk9; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=mVjoToqf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733158467; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=72H0MEOIOZV3ywbvcvlFNa7uFIJ6RNCLLfYC1cm7UAI=; b=QxjV0bT4pezDL88gcd2n+nUAfCIxlsWZlJ6a8l0aJ8km56rbpOBlbB5BhSlBMZGZn/VvbM rRfD6+L+0FveunBixTJwVfDdIPvSLY0kQPkd3uCxbUO7RCFXMIEqhejsrI/BJ+D7SU7AbM IAoOB9qcUd0+k5PWIjhX8mC1lfIq1qG6atY26khwxtE0W+T99DeikYwIJmRtvGk1amZfF1 bCVNE7NfOgRS5od22wujWG9GWd79yXnuvRRpAK49/VliKhBdx7u8KaLvCSEX/ztTN3CYfH 0HCZ3TrsfrtZ3zAhNfc4LR77hXOPj+GJu4aB8TqzUD9Waz/JLhZR42jnPqtzEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=udrtZtk9; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=mVjoToqf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733158467; a=rsa-sha256; cv=none; b=Vmo2MQSdg6D7t3ir3Tco2kELhgm6dn2Ro0Mv3B2YOLvcQAjJsw9uKN2ATUXez87vvqKNJw Pi7A8zhpqiTtA91XxEbk4g8suYah3pexn9WaPn3ZQYIpvVoQlnVpszgSUOkptnBuBtNQEF j1IcdhpyhnR3Rv72yVw/jhEfeH6HmmRAVZTonAK5sscIOnuwKs4loSgPpPTohAoklGjUza vI4zfknmoYnKhuS8HeMoElEYqQJyQVAUWLNyGReMMc2Y/4FVYwR/tiR3LuxI6ts3C/ysRM dqeAKS8QRde6idb7sFSM4UhE28QOlWKdnOsZtayaHTZXQezE9jOxAbMUSDySHg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 27BA77921E for ; Mon, 02 Dec 2024 17:54:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tI9gY-0003C1-AV; Mon, 02 Dec 2024 11:54:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tI9gS-0003B9-Uu for guix-patches@gnu.org; Mon, 02 Dec 2024 11:54:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI9gR-0007MT-Hc for guix-patches@gnu.org; Mon, 02 Dec 2024 11:54:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=72H0MEOIOZV3ywbvcvlFNa7uFIJ6RNCLLfYC1cm7UAI=; b=udrtZtk9DYpnpUz+7VjVkACuH7g19ZCywMKFH6M0DnfQtydJsmNHe1asKqzIaZQKq5RQ88JtIII1C8+URUFjF7D6j20+WTj0qvi/IkrXwWNShsVG+LnFqhjVfXYNEUG4ELJbACq2yWjCCeQ2pkJ2NzspdqFu4L1g3gty/cx3J6o09zEfJ5Qf6tnzp+2WZhVweS8g0bQNh24GuSnvYuAoHAqt/YI/Ie/bnFbdrTnE6u9H8uLQZWC/7UHiEbTwUo8tKyHc4YgL3GT1+6CRcLptTQQeJlXKTEXYsVPRqWjHhLWFkrleA+8elQkiaODvsMxpUAiq2P+qSCOKhwO9WADStw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tI9gR-00032g-C2 for guix-patches@gnu.org; Mon, 02 Dec 2024 11:54:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74654] [PATCH 1/5] etc: Move manifests to a separate directory. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2024 16:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74654 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74654@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74654-submit@debbugs.gnu.org id=B74654.173315843511669 (code B ref 74654); Mon, 02 Dec 2024 16:54:03 +0000 Received: (at 74654) by debbugs.gnu.org; 2 Dec 2024 16:53:55 +0000 Received: from localhost ([127.0.0.1]:56345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI9gI-000328-5n for submit@debbugs.gnu.org; Mon, 02 Dec 2024 11:53:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49076) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI9gE-00031b-RL for 74654@debbugs.gnu.org; Mon, 02 Dec 2024 11:53:51 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tI9g9-0007Ik-L6; Mon, 02 Dec 2024 11:53:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=72H0MEOIOZV3ywbvcvlFNa7uFIJ6RNCLLfYC1cm7UAI=; b=mVjoToqfS8Fy3B4MDS5W +ltlofOI0tSjCuifWuU3hrPf9hCd57KbcazenIP9+gTIabMpkaUyHzOx4svnJsP8JSuIyLonw75Am K+oumWRTj1wFkBGqqLbH+JtwN+ysCK7tted2AHG7TM3EkFHKwFSxyjo13Yq9rJkFlrNuew/ANKMCi OQvbftUIjQdgf/8URCTsY2Z0Xny5xPpBao/QZEHwtsmxXyYSw6/B9uHuO1RDEC7alPmoIz80UKvMd Da3GccVfOSKjm1bUxZ8MwIh9S5ziDZyhFOYAKyS31iwab6klhEK7CG8LSTSX+Ly4GK23NbgKHyhLB +bOg82dkRFlclg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 2 Dec 2024 17:53:26 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -2.05 X-Spam-Score: -2.05 X-Migadu-Queue-Id: 27BA77921E X-TUID: 8Ffs5FNUwB06 * etc/disarchive-manifest.scm, etc/hurd-manifest.scm, etc/kernels-manifest.scm, etc/release-manifest.scm, etc/source-manifest.scm, etc/system-tests.scm, etc/time-travel-manifest.scm, etc/upgrade-manifest.scm: Move to… * etc/manifests: … here, and drop “-manifest” from file name. * Makefile.am (EXTRA_DIST, assert-binaries-available, check-system): Adjust accordingly. Change-Id: Iedee3d0cdd42e72ef8bbf654ea5d3b47dca95874 --- Makefile.am | 20 +++++++++---------- .../disarchive.scm} | 2 +- etc/{hurd-manifest.scm => manifests/hurd.scm} | 0 .../kernels.scm} | 0 .../release.scm} | 0 .../source.scm} | 0 etc/{ => manifests}/system-tests.scm | 0 .../time-travel.scm} | 0 .../upgrade.scm} | 0 9 files changed, 11 insertions(+), 11 deletions(-) rename etc/{disarchive-manifest.scm => manifests/disarchive.scm} (99%) rename etc/{hurd-manifest.scm => manifests/hurd.scm} (100%) rename etc/{kernels-manifest.scm => manifests/kernels.scm} (100%) rename etc/{release-manifest.scm => manifests/release.scm} (100%) rename etc/{source-manifest.scm => manifests/source.scm} (100%) rename etc/{ => manifests}/system-tests.scm (100%) rename etc/{time-travel-manifest.scm => manifests/time-travel.scm} (100%) rename etc/{upgrade-manifest.scm => manifests/upgrade.scm} (100%) diff --git a/Makefile.am b/Makefile.am index 0cff32c607..8c763c68aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -686,7 +686,7 @@ endif !CAN_RUN_TESTS check-system: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ - guix build -m $(top_srcdir)/etc/system-tests.scm -K + guix build -m $(top_srcdir)/etc/manifests/system-tests.scm -K # Public keys used to sign substitutes. dist_pkgdata_DATA = \ @@ -733,17 +733,17 @@ EXTRA_DIST += \ build-aux/update-guix-package.scm \ build-aux/xgettext.scm \ doc/build.scm \ - etc/disarchive-manifest.scm \ etc/guix-install.sh \ etc/historical-authorizations \ etc/news.scm \ - etc/hurd-manifest.scm \ - etc/kernels-manifest.scm \ - etc/release-manifest.scm \ - etc/source-manifest.scm \ - etc/system-tests.scm \ - etc/time-travel-manifest.scm \ - etc/upgrade-manifest.scm \ + etc/manifests/disarchive.scm \ + etc/manifests/hurd.scm \ + etc/manifests/kernels.scm \ + etc/manifests/release.scm \ + etc/manifests/source.scm \ + etc/manifests/system-tests.scm \ + etc/manifests/time-travel.scm \ + etc/manifests/upgrade.scm \ scripts/guix.in \ tests/cve-sample.json \ tests/keys/civodul.pub \ @@ -1194,7 +1194,7 @@ assert-no-store-file-names: # server so that '--display-missing' doesn't print two lists. assert-binaries-available: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ - guix weather -m "$(top_srcdir)/etc/release-manifest.scm" \ + guix weather -m "$(top_srcdir)/etc/manifests/release.scm" \ --substitute-urls="https://ci.guix.gnu.org" \ --display-missing diff --git a/etc/disarchive-manifest.scm b/etc/manifests/disarchive.scm similarity index 99% rename from etc/disarchive-manifest.scm rename to etc/manifests/disarchive.scm index 3dbfa356df..a7f71414b6 100644 --- a/etc/disarchive-manifest.scm +++ b/etc/manifests/disarchive.scm @@ -24,7 +24,7 @@ (guix base16) (gnu packages)) -(include "source-manifest.scm") +(include "source.scm") (define (tarball-origin? origin) (match (origin-actual-file-name origin) diff --git a/etc/hurd-manifest.scm b/etc/manifests/hurd.scm similarity index 100% rename from etc/hurd-manifest.scm rename to etc/manifests/hurd.scm diff --git a/etc/kernels-manifest.scm b/etc/manifests/kernels.scm similarity index 100% rename from etc/kernels-manifest.scm rename to etc/manifests/kernels.scm diff --git a/etc/release-manifest.scm b/etc/manifests/release.scm similarity index 100% rename from etc/release-manifest.scm rename to etc/manifests/release.scm diff --git a/etc/source-manifest.scm b/etc/manifests/source.scm similarity index 100% rename from etc/source-manifest.scm rename to etc/manifests/source.scm diff --git a/etc/system-tests.scm b/etc/manifests/system-tests.scm similarity index 100% rename from etc/system-tests.scm rename to etc/manifests/system-tests.scm diff --git a/etc/time-travel-manifest.scm b/etc/manifests/time-travel.scm similarity index 100% rename from etc/time-travel-manifest.scm rename to etc/manifests/time-travel.scm diff --git a/etc/upgrade-manifest.scm b/etc/manifests/upgrade.scm similarity index 100% rename from etc/upgrade-manifest.scm rename to etc/manifests/upgrade.scm -- 2.46.0