From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 20CF01C976; Mon, 08 Sep 2025 18:54:04 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 607391C958; Mon, 08 Sep 2025 18:54:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) by atuin.qyliss.net (Postfix) with ESMTPS id 1F5E11C955 for ; Mon, 08 Sep 2025 18:54:00 +0000 (UTC) Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-e98a18faa25so3469682276.2 for ; Mon, 08 Sep 2025 11:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757357639; x=1757962439; darn=spectrum-os.org; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Lfe2j2awSaNjsPDR3RIjgzLpZUDZuVyPa1E++BEcduM=; b=dkv9znYmKf7Nsn+p0zNSv0miOdjOmpqZoy53T7Dfz/zl4rKzOvwNxSDnN2DBsoxf0A BDjnXx7aYm9Qy0oXDMpI/bP5VswUNPWc2FgGXXodqWSO6ZMQdHoOYAKB6YXfZNeU6r6N xRWH/uWA3V3WtEWednUnp/ANUuOiLKBciPE2r6bBmizvfJDFb/rgyahSL/s9vMWmmWcd 5WupO9pV+uZEPjkzhBe9FsA+xYb1lM06VG0rUxtCokDaGfeZjQt1cVXwO513kLVS03FT CVlwbnWW7CcjKUbYeBexEqNvVJQPGIlOX6vxFp7bC2aGfjUmtseKHArMdQmNxAaQ2CwG Uyng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757357639; x=1757962439; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Lfe2j2awSaNjsPDR3RIjgzLpZUDZuVyPa1E++BEcduM=; b=hCBuBpkChMea88a2PTp0kp1x43YfS5Nc1sX4JRR7MEglJSrt45tqfuglYp7i46g204 C6r/Cf1GgtwURmfoiSDrtkZB3fdwO4kNO0SQjFcj1wRCVwdj/7ImFak0cFPa1lxxDikR 8R4k3FaWC+x7UGzs/qd+4l3a2E1ZGE4DOMxEauaz2fTYan4CVqjxbtLDXvnP75BrtpOH 92aIhDBKJPdXZSgcrfEUnVPkjMN6ZBC9GVmpY3xyWjwBfnRDGxnBEuBSHdtTJN8YcTHp ZZro6RTqzAlyOAeYY3D4/A2PswpvqmMNdog+2QUBQ3oCtZwtZ2sv1LXUPKzgtdL8CTU7 uP4w== X-Gm-Message-State: AOJu0Yxr6tYQ6COaq2w8ZCjxjourCmTxJDSuzTvk2V9LGlZGju+izLXS hPhEpbjoFTiLEn/NUYlyCqhJsdo/5LVBL+FPXw7L3kG91n+dnVGOfdDmSHjtqQ== X-Gm-Gg: ASbGncsJlCFixBPhyxwcF7QojK09FrzbcakuYtGNSKizgAIsHcG37DZk1m2UaMpbDtW JiTekvUTggyQw4l6nwTfZPhh4YMrmEcPdU8bas2DRy1TrNSvOUjy9CewUDpqNBGHCBm7XVZ3gYL TPyB333Sd8C7QjQ3CLX1hxvh5+MoPYHAf8/Ofb5EuUS671f/Pb5qUKkBxa17B+YER2jQHkQpEr8 WV7nMaMwF1YQv8JWrvNB/FRlNX7vIhXN+fytvcDTpH0gitNJVKpKQXo6EEW+q4b0HzcwPgKZIwo GQYSgFeM5Dk0qY5HO8nERa/cwElCMOsA//ol9cXJ6iWZktlUU/v8fEYr0wadL5AN5BQaw1f2uSc f5nQLBKnswKLtFyvm0hgFaKU8qI48H4omseUi3mHO/Fs9GCOu8LdyVeGkA8ZGYRs7vm32gLO4Y3 0hjSVNXfmsjUNttXierKvf/SrVXFi6nr0YY7M= X-Google-Smtp-Source: AGHT+IHDomMLRxPrqfeoBPnfNRyFcTZyysMpush6nhPwFPRladIVST6GOxkHgYmIAdwdUa0RtIA3RQ== X-Received: by 2002:a05:6902:f89:b0:e96:d936:252b with SMTP id 3f1490d57ef6-e9f6926fa31mr9037054276.41.1757357638398; Mon, 08 Sep 2025 11:53:58 -0700 (PDT) Received: from [10.138.34.110] (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e9bbdf4bf45sm5941425276.12.2025.09.08.11.53.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Sep 2025 11:53:57 -0700 (PDT) Message-ID: Date: Mon, 8 Sep 2025 14:53:52 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/4] Common make rules for building erofs images To: Alyssa Ross References: <20250903-genfiles-v1-0-cc993fcb1e4c@gmail.com> <20250903-genfiles-v1-3-cc993fcb1e4c@gmail.com> <87wm69i7p9.fsf@alyssa.is> Content-Language: en-US From: Demi Marie Obenour Autocrypt: addr=demiobenour@gmail.com; keydata= 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 +MYSfkEjBz0E8CLOcAw7JIwAaeBT In-Reply-To: <87wm69i7p9.fsf@alyssa.is> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------gwn5xHtlnQufcpzk54GBsDB0" Message-ID-Hash: UO6637DGHMSXQY5KZOKPYNOXHTOGTIYK X-Message-ID-Hash: UO6637DGHMSXQY5KZOKPYNOXHTOGTIYK X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Spectrum OS Development X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------gwn5xHtlnQufcpzk54GBsDB0 Content-Type: multipart/mixed; boundary="------------M8Jrkqnx59pQz1LHrTYz1m10"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross Cc: Spectrum OS Development Message-ID: Subject: Re: [PATCH 3/4] Common make rules for building erofs images References: <20250903-genfiles-v1-0-cc993fcb1e4c@gmail.com> <20250903-genfiles-v1-3-cc993fcb1e4c@gmail.com> <87wm69i7p9.fsf@alyssa.is> In-Reply-To: <87wm69i7p9.fsf@alyssa.is> --------------M8Jrkqnx59pQz1LHrTYz1m10 Content-Type: multipart/mixed; boundary="------------YmgDegmjjgaKeArX5EJndDEW" --------------YmgDegmjjgaKeArX5EJndDEW Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 9/8/25 06:01, Alyssa Ross wrote: > Demi Marie Obenour writes: >=20 >> Instead of duplicating the logic in three different places, write comm= on >> code for all three makefiles to use instead. This will make future >> changes much easier. >> >> Signed-off-by: Demi Marie Obenour >=20 > Makes sense, and we could do this now for the s6-rc directory without > having to wait for the generated file list stuff. Does need to be > updated for my review comments from the previous patch though (stick to= > POSIX). If we are going to stick with POSIX, I think it is best to test with both= GNU make and BSD make. Otherwise, GNUisms are bound to creep in. As an aside, BSD make has an amazing feature ("meta" mode) that would be awesome to support in GNU make. >> --- >> host/rootfs/Makefile | 51 ++++------------------------------------= --------- >> host/rootfs/default.nix | 1 + >> img/app/Makefile | 42 ++++------------------------------------= >> img/app/default.nix | 1 + >> lib/erofs.mk | 51 ++++++++++++++++++++++++++++++++++++++++= +++++++++ >> vm/sys/net/Makefile | 35 +++------------------------------ >> vm/sys/net/default.nix | 1 + >> 7 files changed, 65 insertions(+), 117 deletions(-) >> >> diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile >> index 3560707d21bcf53e4f3ad5e916d21e8be56cc3a1..dce8315fe5be19d2569d6c= 9a429276e4abd696ad 100644 >> --- a/host/rootfs/Makefile >> +++ b/host/rootfs/Makefile >> @@ -4,11 +4,10 @@ >> .POSIX: >> =20 >> include ../../lib/common.mk >> +include ../../lib/erofs.mk >> include file-list.mk >> =20 >> -dest =3D build/rootfs.erofs >> - >> -DIRS =3D \ >> +override DIRS ::=3D \ >> dev \ >> etc/s6-linux-init/env \ >> etc/s6-linux-init/run-image/configs \ >> @@ -42,46 +41,9 @@ DIRS =3D \ >> proc \ >> sys >> =20 >> -FIFOS =3D etc/s6-linux-init/run-image/service/s6-svscan-log/fifo >> - >> -BUILD_FILES =3D build/etc/s6-rc >> - >> -$(dest): ../../scripts/make-erofs.sh $(PACKAGES_FILE) $(addprefix ima= ge/,$(FILES)) $(BUILD_FILES) build/empty build/fifo file-list.mk >> - ( \ >> - cat $(PACKAGES_FILE) ;\ >> - for file in $(FILES) $(LINKS); do printf 'image/%s\n%s\n' $$file= $$file; done ;\ >> - for file in $(BUILD_FILES); do printf '%s\n%s\n' $$file $${file#= build/}; done ;\ >> - printf 'build/empty\n%s\n' $(DIRS) ;\ >> - printf 'build/fifo\n%s\n' $(FIFOS) ;\ >> - ) | ../../scripts/make-erofs.sh $@ >> - >> -build/fifo: >> - mkdir -p build >> - mkfifo -m 0600 $@ >> - >> -build/empty: >> - mkdir -p $@ >> +override FIFOS ::=3D etc/s6-linux-init/run-image/service/s6-svscan-lo= g/fifo >> =20 >> -# s6-rc-compile's input is a directory, but that doesn't play nice >> -# with Make, because it won't know to update if some file in the >> -# directory is changed, or a file is created or removed in a >> -# subdirectory. Using the whole source directory could also end up >> -# including files that aren't intended to be part of the input, like >> -# temporary editor files or .license files. So for all these reasons= , >> -# only explicitly listed files are made available to s6-rc-compile. >> -build/etc/s6-rc: $(addprefix image/,$(S6_RC_FILES)) file-list.mk >> - mkdir -p $$(dirname $@) >> - rm -rf $@ >> - >> - dir=3D$$(mktemp -d) && \ >> - tar -C image -c $(S6_RC_FILES) | tar -C $$dir -x --strip-compone= nts 2 && \ >> - s6-rc-compile $@ $$dir; \ >> - exit=3D$$?; rm -r $$dir; exit $$exit >> - >> -clean: >> - -chmod -Rf +w build >> - rm -rf build >> -.PHONY: clean >> +all: $(dest) >> =20 >> # veritysetup format produces two files, but Make only (portably) >> # supports one output per rule, so we combine the two outputs then >> @@ -111,11 +73,6 @@ debug: >> $(VMLINUX) >> .PHONY: debug >> =20 >> -update-file-list: >> - ../../scripts/genfiles.awk image > file-list.mk >> - >> -.PHONY: update-file-list >> - >> run: build/live.img $(EXT_FS) build/rootfs.verity.roothash >> @set -x && \ >> ext=3D"$$(mktemp build/spectrum-rootfs-extfs.XXXXXXXXXX.img)" && \ >> diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix >> index 998220d7b6ed322f64ee52c704e71ec9b4643f59..561bf660829dcd5f5e2ee8= 41662727b262d43ed3 100644 >> --- a/host/rootfs/default.nix >> +++ b/host/rootfs/default.nix >> @@ -178,6 +178,7 @@ stdenvNoCC.mkDerivation { >> fileset =3D fileset.intersection src (fileset.unions [ >> ./. >> ../../lib/common.mk >> + ../../lib/erofs.mk >> ../../scripts/make-erofs.sh >> ]); >> }; >> diff --git a/img/app/Makefile b/img/app/Makefile >> index 5bb1a6a2f9acd13aba95abb0e918a7f21943b230..0c3a8311973f5f82eb2af6= ea3ba43f67d36dec2e 100644 >> --- a/img/app/Makefile >> +++ b/img/app/Makefile >> @@ -5,6 +5,7 @@ >> .POSIX: >> =20 >> include ../../lib/common.mk >> +include ../../lib/erofs.mk >> include file-list.mk >> =20 >> prefix =3D build/host >> @@ -18,7 +19,6 @@ HOST_BUILD_FILES =3D \ >> $(imgdir)/appvm/vmlinux >> =20 >> all: $(HOST_BUILD_FILES) >> -.PHONY: all >> =20 >> $(imgdir)/appvm/vmlinux: $(KERNEL) >> mkdir -p $$(dirname $@) >> @@ -30,38 +30,13 @@ $(imgdir)/appvm/blk/root.img: ../../scripts/make-g= pt.sh ../../scripts/sfdisk-fie >> build/rootfs.erofs:root:5460386f-2203-4911-8694-91400125c604:roo= t >> mv $@.tmp $@ >> =20 >> -VM_DIRS =3D dev run proc sys tmp \ >> +DIRS =3D dev run proc sys tmp \ >> etc/s6-linux-init/run-image/service \ >> etc/s6-linux-init/run-image/user \ >> etc/s6-linux-init/run-image/wait >> -VM_FIFOS =3D etc/s6-linux-init/run-image/service/s6-linux-init-shutdo= wnd/fifo >> +FIFOS =3D etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd= /fifo >> =20 >> -VM_BUILD_FILES =3D build/etc/s6-rc >> - >> -build/fifo: >> - mkdir -p build >> - mkfifo -m 0600 $@ >> - >> -build/empty: >> - mkdir -p $@ >> - >> -build/rootfs.erofs: ../../scripts/make-erofs.sh $(PACKAGES_FILE) $(ad= dprefix image/,$(FILES)) $(VM_BUILD_FILES) build/empty build/fifo file-li= st.mk >> - ( \ >> - cat $(PACKAGES_FILE) ;\ >> - for file in $(FILES) $(LINKS); do printf 'image/%s\n%s\n' $$file= $$file; done ;\ >> - for file in $(VM_BUILD_FILES); do printf '%s\n%s\n' $$file $${fi= le#build/}; done ;\ >> - printf 'build/empty\n%s\n' $(VM_DIRS) ;\ >> - printf 'build/fifo\n%s\n' $(VM_FIFOS) ;\ >> - ) | ../../scripts/make-erofs.sh $@ >> - >> -build/etc/s6-rc: $(addprefix image/,$(S6_RC_FILES)) file-list.mk >> - mkdir -p $$(dirname $@) >> - rm -rf $@ >> - >> - dir=3D$$(mktemp -d) && \ >> - tar -C image -c $(S6_RC_FILES) | tar -C $$dir -x --strip-compone= nts 2 && \ >> - s6-rc-compile $@ $$dir; \ >> - exit=3D$$?; rm -r $$dir; exit $$exit >> +BUILD_FILES =3D >> =20 >> debug: >> $(GDB) -q \ >> @@ -138,14 +113,5 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vh= ost-user-gpu start-virtiofsd >> $(KERNEL) >> .PHONY: run-crosvm >> =20 >> -update-file-list: >> - ../../scripts/genfiles.awk image > file-list.mk >> - >> -.PHONY: update-file-list >> - >> run: run-$(VMM) >> .PHONY: run >> - >> -clean: >> - rm -rf build >> -.PHONY: clean >> diff --git a/img/app/default.nix b/img/app/default.nix >> index d3eed1f0accdc8968d1ba5bdec74ab597789082f..cf10e712ab84a9e85cb137= 3024be5f64deef0370 100644 >> --- a/img/app/default.nix >> +++ b/img/app/default.nix >> @@ -107,6 +107,7 @@ stdenvNoCC.mkDerivation { >> fileset =3D lib.fileset.intersection src (lib.fileset.unions [ >> ./. >> ../../lib/common.mk >> + ../../lib/erofs.mk >> ../../scripts/make-erofs.sh >> ../../scripts/make-gpt.sh >> ../../scripts/sfdisk-field.awk >> diff --git a/lib/erofs.mk b/lib/erofs.mk >> new file mode 100644 >> index 0000000000000000000000000000000000000000..b3fc112f5e793725977cd8= c4b2e71d6ed8d888c4 >> --- /dev/null >> +++ b/lib/erofs.mk >> @@ -0,0 +1,51 @@ >> +override basedir ::=3D $(dir $(lastword $(MAKEFILE_LIST)))/.. This is one part that is not possible in POSIX make. Without this, there is no way for the included makefile to know where its wrapper scripts are. >> +override BUILD_FILES ::=3D $(BUILD_FILES) build/etc/s6-rc >> +# No override here so that it can be overridden in host/rootfs/defaul= t.nix. >> +dest ::=3D build/rootfs.erofs >> + >> +all: >> +.PHONY: all >> +$(dest): $(basedir)/scripts/make-erofs.sh $(PACKAGES_FILE) $(addprefi= x image/,$(FILES)) $(BUILD_FILES) build/empty build/fifo file-list.mk >> + set -euo pipefail; ( \ >> + cat $(PACKAGES_FILE) ;\ >> + for file in $(FILES) $(LINKS); do printf 'image/%s\n%s\n' "$$fil= e" "$$file"; done ;\ >> + for file in $(BUILD_FILES); do printf '%s\n%s\n' "$$file" "$${fi= le#build/}"; done ;\ >> + $(and $(DIRS),printf 'build/empty\n%s\n' $(DIRS);)\ >> + $(and $(FIFOS),printf 'build/fifo\n%s\n' $(FIFOS);)\ This also has no analog in POSIX make, though it might be possible to emulate it with some shell hacks. --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------YmgDegmjjgaKeArX5EJndDEW Content-Type: application/pgp-keys; name="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Disposition: attachment; filename="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsFNBFp+A0oBEADffj6anl9/BHhUSxGTICeVl2tob7hPDdhHNgPR4C8xlYt5q49y B+l2nipdaq+4Gk6FZfqC825TKl7eRpUjMriwle4r3R0ydSIGcy4M6eb0IcxmuPYf bWpr/si88QKgyGSVZ7GeNW1UnzTdhYHuFlk8dBSmB1fzhEYEk0RcJqg4AKoq6/3/ UorR+FaSuVwT7rqzGrTlscnTDlPWgRzrQ3jssesI7sZLm82E3pJSgaUoCdCOlL7M MPCJwI8JpPlBedRpe9tfVyfu3euTPLPxwcV3L/cfWPGSL4PofBtB8NUU6QwYiQ9H zx4xOyn67zW73/G0Q2vPPRst8LBDqlxLjbtx/WLR6h3nBc3eyuZ+q62HS1pJ5EvU T1vjyJ1ySrqtUXWQ4XlZyoEFUfpJxJoN0A9HCxmHGVckzTRl5FMWo8TCniHynNXs BtDQbabt7aNEOaAJdE7to0AH3T/Bvwzcp0ZJtBk0EM6YeMLtotUut7h2Bkg1b//r 6bTBswMBXVJ5H44Qf0+eKeUg7whSC9qpYOzzrm7+0r9F5u3qF8ZTx55TJc2g656C 9a1P1MYVysLvkLvS4H+crmxA/i08Tc1h+x9RRvqba4lSzZ6/Tmt60DPM5Sc4R0nS m9BBff0Nm0bSNRS8InXdO1Aq3362QKX2NOwcL5YaStwODNyZUqF7izjK4QARAQAB zTxEZW1pIE9iZW5vdXIgKElUTCBFbWFpbCBLZXkpIDxhdGhlbmFAaW52aXNpYmxl dGhpbmdzbGFiLmNvbT7CwY4EEwEIADgWIQR2h02fEza6IlkHHHGyiLVf/5wiwQUC X6YJvQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCyiLVf/5wiwWRhD/0Y R+YYC5Kduv/2LBgQJIygMsFiRHbR4+tWXuTFqgrxxFSlMktZ6gQrQCWe38WnOXkB oY6n/5lSJdfnuGd2UagZ/9dkaGMUkqt+5WshLFly4BnP7pSsWReKgMP7etRTwn3S zk1OwFx2lzY1EnnconPLfPBc6rWG2moA6l0WX+3WNR1B1ndqpl2hPSjT2jUCBWDV rGOUSX7r5f1WgtBeNYnEXPBCUUM51pFGESmfHIXQrqFDA7nBNiIVFDJTmQzuEqIy Jl67pKNgooij5mKzRhFKHfjLRAH4mmWZlB9UjDStAfFBAoDFHwd1HL5VQCNQdqEc /9lZDApqWuCPadZN+pGouqLysesIYsNxUhJ7dtWOWHl0vs7/3qkWmWun/2uOJMQh ra2u8nA9g91FbOobWqjrDd6x3ZJoGQf4zLqjmn/P514gb697788e573WN/MpQ5XI Fl7aM2d6/GJiq6LC9T2gSUW4rbPBiqOCeiUx7Kd/sVm41p9TOA7fEG4bYddCfDsN xaQJH6VRK3NOuBUGeL+iQEVF5Xs6Yp+U+jwvv2M5Lel3EqAYo5xXTx4ls0xaxDCu fudcAh8CMMqx3fguSb7Mi31WlnZpk0fDuWQVNKyDP7lYpwc4nCCGNKCj622ZSocH AcQmX28L8pJdLYacv9pU3jPy4fHcQYvmTavTqowGnM08RGVtaSBNYXJpZSBPYmVu b3VyIChsb3ZlciBvZiBjb2RpbmcpIDxkZW1pb2Jlbm91ckBnbWFpbC5jb20+wsF4 BBMBAgAiBQJafgNKAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCyiLVf /5wiwYa/EACv8a2+MMou9cSCNoZBQaU+fTmyzft9hUE+0d5W2UY1RY3OsjFIzm9R /4SVccfsqOYLEo+S0vQMIIIqFEq3FCpXXwPzyimotps05VA8U3Bd7yseojFygOgK sAMOAee2RCaDDOnoJue01dfZMzzHPO/TVdp3OvnpWipfv5G1Xg96rwbhMLE3tg6N xwAHa31Bv4/Xq8CJOoIWvx6fcmZQpz01/lSvsYn0KrfEbTKkuUf0vM9JrCTCP2oz VNN5BYzqaq2M4r+jmSyeXLim922VOWqGkUEQ85BSEemqrRS06IU6NtEMsF8EWt/b hWjk/9GDKTcnpdJHTrMxTspExBiNrvpI2t+YPU5B/dJJAUxvmhFrbSIbdB8umBZs I3AMYrEmpAbh5x7jEjoskUC7uN3o9vpg1oCLS2ePDLtAtyBtbHnkA4xGD7ar8mem xpH9lY/i+sC6CyyIUWcUDnnagKyJP0m9ks0GLsTeOCA0bft2XA6rD6aaCnMUsndT ctrab42CV5XypjmC4U1rPJ8JQJUh1/3P48/8sMH+3krxpJ06KNWNFaUbaMTGiltZ 7x9DngklSYrX0T+2G4kVXNmjaljwkoLahwLla2gUWwBSyofXdqyhQdwZsp01KXNQ UCyT/Pg+aDcm/E7OMV3d4lf7g/CSxiX2GSEe6BlhSz+Lmd7ZJ3g32M1ARGVtaSBN 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 EtJuZYM5blWncBOJCoWMnBEcTEo/viU3GgcVRw=3D=3D =3Dx94R -----END PGP PUBLIC KEY BLOCK----- --------------YmgDegmjjgaKeArX5EJndDEW-- --------------M8Jrkqnx59pQz1LHrTYz1m10-- --------------gwn5xHtlnQufcpzk54GBsDB0 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEopQtqVJW1aeuo9/sszaHOrMp8lMFAmi/JkEACgkQszaHOrMp 8lOdlw//Y+xd8zEobKkJbnaOfnZQG9JT0bhqU/ugUILfvaQlu3FCVBqf6/j/c2rt QXVyIdEc8bTYm9PvF7jQnrrLQl017z3IUsWnMfGGEJg3rKgIpuy4Os6ffVTPHE1d dBKKgNQtuPdTpNELYVEo0HrWyJehu8QPu21+Bgsv/l9/HoURB2+oxZNuT5gKK40t ZRxZBnzUaJZW3O5bypQy+bFTmqqiiYsXZs7Nkk4fVqHpdgejuknIgn+0KD/B5y0Q jrngVlCPeaD/elOH9MbyRKD1vzM12bjwnk1svjqrIowrCtMv4AHBqwdqHomkgyNM x1skedFhbRbXtu8HU9HzVoeRdM9MTJGTCPPHi46w43jmVhKJrkFbGHsv2FYNV4n+ PwL8K9Q9flJs8cQPUkD1aEfqDx8LVH6UsJDm68CDXB3bCDD5SI+Dym2kiCHvP6us Jhd/Ee5u5DwypUSEoIKXrMy5PCWrf+J4oOR5DTSm7Q4vSXfDSbecTUh3sy+hsDkc Mw7suUjfwR1vTfynERs99tbDN5pPzsokVojja2DS60UIgomATOjNLtDlmstSGA96 2iqkIfK5UrdypzWcZbjX2KuG+c+yugCZX3XFBkpQ08M+kfQ8afRk24/pMjT6ES8f WrdDhu9kcNZKQ2sR0785Vaj6ijS9qSKOKCnyE03i51U/cZFAvio= =awY2 -----END PGP SIGNATURE----- --------------gwn5xHtlnQufcpzk54GBsDB0--