From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id 09DA171A9; Wed, 2 Jun 2021 12:30:58 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 583577196; Wed, 2 Jun 2021 12:30:40 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 262567180; Wed, 2 Jun 2021 12:30:38 +0000 (UTC) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by atuin.qyliss.net (Postfix) with ESMTPS id 3202270F9 for ; Wed, 2 Jun 2021 12:30:33 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id DDB3C1656; Wed, 2 Jun 2021 08:30:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 02 Jun 2021 08:30:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=nbjZdJb6iBlFWnh6dbD45rPh/r 1Aphvchkqzlywr36I=; b=cBa3RnYxFjaZZQMwyqOBaj4K9Iy1Jzna4ruHrV0p1r UkXjum/WzOFv/sJGmDOPox/bBOO7ep7BfxdoO62nbrCdkuWe52CugXQI/xX58pzt pOqS7FSSt6dGtR5IW2V2aje/KUCNPtzBRiUQd2ym1afX+wpgiM423Q+Uw1qfdRjc YijlYIuWXZzUXoSsvFo7qbs0d9NXgoiLCyzNw2aQuWiBwZe6ub9SH7A+DZQvO/M/ MiwIlKs8Nsf2apj0QDRjLvVhLqXa8Yf1mVBbM54/gcPmkw0/sPWz3hMykd6GZLda WwrWnxcaYOijBIw0mxmmXnyamGIKXGHyyc4d0Ludzdhw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=nbjZdJ b6iBlFWnh6dbD45rPh/r1Aphvchkqzlywr36I=; b=dtrWHmokW1/BpWKcyMKkm8 KOBZCBeZVjVmOGKEHM+SrwCVkVFAi6806mvLgVBx8cJ0OICasBceTVqQwE8EVbvJ 99ZG7Gyee7oI2OwKG7ghcL0oIMEIkYzR8J8r44r0uaFcJ8VvCy1CMh7EsFRa7vja Kdxcp06ed+PM/ON0xDU5L5ne6Y28c8x9Pw+sfcxfQVb6+x4EfJaf54hdpm07yXoU I9FYJVGEBkm+JRKpeO3yrJYEvChrwhBnAlt/KGjvU3YFNdz9vj3WrbgycjjVsXEJ NpyEpUXFsfdZfJh2Qd5/RzLde0v83FwtSGSkYVTjRJGCY0+31HQxTFeIZv0DEehg == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdeljedgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhffkfggtgesghdtreertddttdenucfhrhhomheptehlhihsshgr ucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepudffie euledtheevheefieetveevfffhvddutefhiedvgfehiedtfeefleevgfdunecuffhomhgr ihhnpehsphgvtghtrhhumhdqohhsrdhorhhgnecuuegrugftvghpuhhtgfhmrghilhepid ditddiidesvghmrghilhdrrghmrgiiohhnshgvshdrtghomhenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgrrdhish X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 2 Jun 2021 08:30:27 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 0F43D1E0C; Wed, 2 Jun 2021 12:30:26 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: Re: [PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 In-Reply-To: <20210529144117.571353-1-hi@alyssa.is> References: <20210529144117.571353-1-hi@alyssa.is> Date: Wed, 02 Jun 2021 12:30:23 +0000 Message-ID: <87mts8phy8.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Message-ID-Hash: YWEBFWUJW3X4IG3TASKRDUH5PUZXPQ3K X-Message-ID-Hash: YWEBFWUJW3X4IG3TASKRDUH5PUZXPQ3K X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Jamie McClymont , Puck Meerburg X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Alyssa Ross writes: > Hi everyone, > > This is a continuation of the effort to update our chromiumOSPackages, > which was started by Jamie a couple of months ago[1]. > > I've taken it over, and I think it should be good now. Specifically, > since Jamie's original submission I: > > * Re-enabled xdg-shell in Sommelier, using the reverted upstream > implementation[2] instead of Puck's. > > * Fixed the crosvm build by fixing its Cargo.lock, and stopping the > boot test trying to open /dev/log, which doesn't exist in Nix > builds. > > * Rebased a crosvm patch that was added to Spectrum in the meantime. > > * Removed a kernel patch that was added to Spectrum in the meantime > but this update makes obsolete. > > I've tested that everything in spectrumPackages and chromiumOSPackages > builds, and that spectrumPackages.spectrum-vm still runs. > > Jamie, thank you so much for getting us most of the way there with > this -- you saved me a lot of time and I really appreciate it. > > [1]: https://spectrum-os.org/lists/archives/spectrum-devel/0100017891d36f= 4f-0c348828-2ed6-4694-b75c-44d0d659c13c-000000@email.amazonses.com/ > [2]: https://spectrum-os.org/lists/archives/spectrum-devel/87wntkwq7z.fsf= @alyssa.is > > Alyssa Ross (3): > chromiumOSPackages.sommelier: update patches > crosvm: fix build > spectrumPackages.linux: drop evged patch > > Jamie McClymont (5): > chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 > chromiumOSPackages.linux: fix config > chromiumOSPackages.common-mk: update patches > chromiumOSPackages.vm_protos: drop GN patch > chromiumOSPackages.common-mk: disable clang-only warnings I've pushed this now, squashed into a single commit to not break bisection. Thanks again to Jamie. > ...-mk-don-t-leak-source-absolute-paths.patch | 115 +- > ...ommon-mk-.gn-don-t-hardcode-env-path.patch | 8 +- > .../linux/chromium-os/common-mk/default.nix | 6 +- > .../crosvm/Regenerate-Cargo.lock.patch | 681 ++++++++++++ > ...om-tap-fd.patch =3D> VIRTIO_NET_F_MAC.patch} | 202 ++-- > .../linux/chromium-os/crosvm/default.nix | 20 +- > ...er-don-t-leak-source-absolute-paths.patch} | 10 +- > ...tools-sommelier-Switch-to-the-stabl.patch} | 981 ++++++++++-------- > ...mmelier-make-building-demos-optional.patch | 100 -- > .../linux/chromium-os/sommelier/default.nix | 5 +- > .../linux/chromium-os/upstream-info.json | 44 +- > ...03-vm_tools-proto-fix-parallel-build.patch | 39 - > .../linux/chromium-os/vm_protos/default.nix | 2 - > pkgs/os-specific/linux/kernel/linux-cros.nix | 6 +- > pkgs/os-specific/linux/kernel/patches.nix | 9 - > pkgs/os-specific/linux/spectrum/linux/vm.nix | 3 - > 16 files changed, 1445 insertions(+), 786 deletions(-) > create mode 100644 pkgs/os-specific/linux/chromium-os/crosvm/Regenerate-= Cargo.lock.patch > rename pkgs/os-specific/linux/chromium-os/crosvm/{0001-crosvm-support-se= tting-guest-MAC-from-tap-fd.patch =3D> VIRTIO_NET_F_MAC.patch} (56%) > rename pkgs/os-specific/linux/chromium-os/sommelier/{0004-sommelier-don-= t-leak-source-absolute-paths.patch =3D> 0003-sommelier-don-t-leak-source-ab= solute-paths.patch} (69%) > rename pkgs/os-specific/linux/chromium-os/sommelier/{0005-sommelier-use-= stable-xdg-shell-protocol.patch =3D> 0004-Revert-Revert-vm_tools-sommelier-= Switch-to-the-stabl.patch} (66%) > delete mode 100644 pkgs/os-specific/linux/chromium-os/sommelier/0006-som= melier-make-building-demos-optional.patch > delete mode 100644 pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_= tools-proto-fix-parallel-build.patch > > --=20 > 2.31.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEH9wgcxqlHM/ARR3h+dvtSFmyccAFAmC3eeAACgkQ+dvtSFmy ccCYNw/9FOIHT8H3etOyCniwZmHDY5y3F2CzK6enKwSCUDaVq0WC4tROarTXpYmy aKoWshEodTTYog+Hh32ytbkZiFCkNK3rz7/xFbymQLWJU7vDvjkYnvw5XQ//NBCy vcHDJ5NGxLZYzzfgPYjzbD+5vvgdPeZ7JgMOmQxKyVverPHnTnTpcw96GMP+BGSM tTPMpU0seHrJHZ8Kpcz9E9qC0w8n3bYV0eBJRKrmKXM8ZeDLjpIBunUD0MdAHYCd AKiUbMm+ifdf6tf0jUIMNLUojEhjllxIgXG09k5o3AgJySyv0Sw0V2WUlUMzcjJ0 fX3EksgEgrG2JE11NFd9EbduauWLUufG/lmtFLEXNvXki0MMZfvQb4FPpmuB9tJz ylhQ9fLVzwHdM0x+H3IOYVm0xv+jOTS+AUQqCLMDmYb3cy8Wa3fWXm87MSsFH9XC xDikCgjpDqR3P2heRPxIR1yy2F6W+FxzYzPg+GdmNMk92ZD2J82kbdsNFNpwmMG3 RxkVm6+gHccKEYjUSuSZyPcBRwhN1JeupMvW5NeVbv6E5Y7nwPYJ3TlE9i8o6SXg /rERLmFGWeWecnWOjoDEUlXN3vRnR1Y4OC5vfwAdMAwc0UVcukiS0IFEY4OJSPXW VmjmgNOFmNyUtQ9PTFOOoQ26QrihUyAU98B5RSV2zQfyl2CA/2Q= =JjBW -----END PGP SIGNATURE----- --=-=-=--