From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WGgqJL91TmcnXgEAe85BDQ:P1 (envelope-from ) for ; Tue, 03 Dec 2024 03:06:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id WGgqJL91TmcnXgEAe85BDQ (envelope-from ) for ; Tue, 03 Dec 2024 04:06:39 +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=O+DAZZ3e; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733195199; a=rsa-sha256; cv=none; b=aXVM50+6iu1uU/NQbl9vHs+FQd3Ts+++wrJev5+9HSaLqbfsFSTIi5QmZ3lq/4+k/WHkL8 R4bir5EydDWdR3+6VwA2z1m2pTcGOTol71ZDnppbRmHs4OhE9jCxKuTnn0+4lONnCrbqWf Trvfxtx3HNuKE63zAKeIilJusQaORM3EuqVji2UqZwWdOsVuDFEHgIY9BbpYCfjApux+uz WS2gAApPZatflZj1bmP/Dlfzw4GvUn7Co1p4R0IbAEo1ZCZRPywlgdIhpZKGjYDziENMkN XyyVoW6RfQ6ncB7cqHt8Ffc4kHHWM03KsU0UevTWZwkYP0Wt61yDnlbZOCXXoA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=O+DAZZ3e; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733195199; 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: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=Lxf/4O6x/CLmg+VFVKYlNatitEXClOLmDkbVuLideh8=; b=uIn9CI7jH8GqFohOzD/fqxWa0vmHrjGCa1KLXHLCp/dQd9WAQkDQSoGKYv0q2sri/lURvm j5OhOdnKG+4rp3XzmHWf1ysBCpwtiziwhv7/pLz/VyXrG+WQtWz/8Oy/QgVi0+xw5cMy3o aS1Fn0N0CO0IQQd6Qq84OpSBXk6fRo76tSjl0RxNzv13puFtM2DAdMi2IzGl3bAzBuZoIA PJpLnKu8KYFE9fKYCHBdpRTjOF8BTSY08wJfYM5sPWmILba5tbIS//CWKQDqKULIAI/1MD DWUEYx3lXBSuVQVU4o8OAwy5PLg3UYEtfZvfFXWvc88l/J/0r5AjpWt1DsbsOA== 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 5E6E6572B3 for ; Tue, 03 Dec 2024 04:06:39 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIJEl-0007iN-JR; Mon, 02 Dec 2024 22:06:07 -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 1tIJEi-0007ha-U0 for guix-patches@gnu.org; Mon, 02 Dec 2024 22:06: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 1tIJEi-0000ql-Lj for guix-patches@gnu.org; Mon, 02 Dec 2024 22:06: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:Date:References:In-Reply-To:From:To:Subject; bh=Lxf/4O6x/CLmg+VFVKYlNatitEXClOLmDkbVuLideh8=; b=O+DAZZ3eEfgqj9FVMZAjjg3EIU60wQbsTa77K+hp9ZDTcPHAkd6tILv9CmJMlbjL3r87/QKWC5RdhQbuBok5OOwNK0JtuI44gV0SWOWOIotInea3RaZ16qlekWgDB8htgGNZFC61B8rqgMhxzYG3AVPDXSU8+SCrUUjomG2BtNlznguES1wQHrNWzyUI8+8kG7kNNiq8QdsUyckfPFbd74JF6tcIpM3WgrJ1z9qBLBFnhuOyAMFOPYgIAPcoyRiAmkSIYHbpcT5AJsB++rYVLWJFLGzQs/Lm8xSaakCCvu0NVG3ZRy5SSZwRLowPYmxx78DBHJ38KIH2XHIqGQeYZw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIJEi-0000gT-GN for guix-patches@gnu.org; Mon, 02 Dec 2024 22:06:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74654] [PATCH 1/5] etc: Move manifests to a separate directory. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Dec 2024 03:06:04 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74654@debbugs.gnu.org Received: via spool by 74654-submit@debbugs.gnu.org id=B74654.17331951442521 (code B ref 74654); Tue, 03 Dec 2024 03:06:04 +0000 Received: (at 74654) by debbugs.gnu.org; 3 Dec 2024 03:05:44 +0000 Received: from localhost ([127.0.0.1]:57383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIJEN-0000eV-91 for submit@debbugs.gnu.org; Mon, 02 Dec 2024 22:05:44 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81]:33810 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIJEJ-0000dw-60 for 74654@debbugs.gnu.org; Mon, 02 Dec 2024 22:05:41 -0500 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowAD3l+1ydU5nIVBXBw--.12468S2; Tue, 03 Dec 2024 11:05:26 +0800 (CST) From: Z572 In-Reply-To: ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Mon, 2 Dec 2024 17:53:26 +0100") References: User-Agent: mu4e 1.12.7; emacs 30.0.92 Date: Tue, 03 Dec 2024 11:05:15 +0800 Message-ID: <874j3l5uvo.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAD3l+1ydU5nIVBXBw--.12468S2 X-Coremail-Antispam: 1UD129KBjvJXoW3AFW7Gw4rZFyDGF18XFW8JFb_yoW7XF17pw sakFWxtwn3CF1jqanxCFnxuF4Iyr15KF98Jr4qyr10yF1YvF4UXws3Kry3tF1Iqr1xX3s0 v3yktry5Jwn8uFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvCb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW8Jr0_Cr1UM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I2 62IYc4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbV WUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF 67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42 IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF 0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2Kf nxnUUI43ZEXa7IUeAHUPUUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 5E6E6572B3 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -9.29 X-Spam-Score: -9.29 X-TUID: EDWIoDYxJ+JO --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > * 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=E2=80=A6 > * etc/manifests: =E2=80=A6 here, and drop =E2=80=9C-manifest=E2=80=9D fro= m file name. > * Makefile.am (EXTRA_DIST, assert-binaries-available, check-system): > Adjust accordingly. Once these files are moved, it may be necessary to mention them in etc/news.scm to inform others that they need to update their cuirass specs. > > Change-Id: Iedee3d0cdd42e72ef8bbf654ea5d3b47dca95874 > --- > Makefile.am | 20 +++++++++---------- > .../disarchive.scm} | 2 +- > etc/{hurd-manifest.scm =3D> manifests/hurd.scm} | 0 > .../kernels.scm} | 0 > .../release.scm} | 0 > .../source.scm} | 0 > etc/{ =3D> manifests}/system-tests.scm | 0 > .../time-travel.scm} | 0 > .../upgrade.scm} | 0 > 9 files changed, 11 insertions(+), 11 deletions(-) > rename etc/{disarchive-manifest.scm =3D> manifests/disarchive.scm} (99%) > rename etc/{hurd-manifest.scm =3D> manifests/hurd.scm} (100%) > rename etc/{kernels-manifest.scm =3D> manifests/kernels.scm} (100%) > rename etc/{release-manifest.scm =3D> manifests/release.scm} (100%) > rename etc/{source-manifest.scm =3D> manifests/source.scm} (100%) > rename etc/{ =3D> manifests}/system-tests.scm (100%) > rename etc/{time-travel-manifest.scm =3D> manifests/time-travel.scm} (10= 0%) > rename etc/{upgrade-manifest.scm =3D> 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 >=20=20 > 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 >=20=20 > # Public keys used to sign substitutes. > dist_pkgdata_DATA =3D \ > @@ -733,17 +733,17 @@ EXTRA_DIST +=3D \ > 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=3D"https://ci.guix.gnu.org" \ > --display-missing >=20=20 > 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)) >=20=20 > -(include "source-manifest.scm") > +(include "source.scm") >=20=20 > (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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmdOdWsACgkQO1qpk+Gi 3/Cvig//bfDkGs8fN8fvXsIq7+UheB/sGhE6m+kO0L6JfzDG8M77v3t2K3JS6ok7 OJxF9IAArEy5Zgfk6t4R3vl93ELnt+eclO9+0GGkoJmhK7poHWl/ptYdNGoqX1f5 N19k0od8oMG3wRNAGbAddyjpRb+zS97VqVF/QROEkAK/jnQZakze2e4vNba/rK09 lYFJ2DjD6R9PS2RIuSN+VWWy4o0jc90fbn/gXqEF3XDi3DV1cAKV1FHBfI9o5NeL FeZnbve5Ry66M/AmH2iIkh881LQYsy2njAx7srKIkBUqzf1eM069Mgrt/6/cvO3+ WXPphIHN4lMb+L9IRDu402/DMhWWXDSrEh9IgH1PAVaB7UCEd+AUAOFFiAU73FoS kQBE+DO1RhDV3D3V8HC6oWBGYvrdHCXfVlgb/0ASSHNTHTtT0SmRjVUvA/yP4Dke G3JL5QNKVoRwNJ2hP7NGJeCOBPsCjAF4CNUcPxcpIJZlf+WrwijwjqUmUhEpQ7q2 57XMBBhGQubwVkWrieyx5RLfydL2wppGv4sKGsntVbPbXQ29RTLT/8hLZNeBE52q P3c7R1WYsJzJin/wqYd+3lCoDMAECvLZtUbgde1O9z1wY8LNNY69jsA7oKJfQcwW jJ5hWnezPUQh+HcnV3Z/KLVm/qnEMEZ4W26yPrWqW5NZ91zkhPU= =5HE1 -----END PGP SIGNATURE----- --=-=-=--