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,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id B235A1966D; Sat, 29 May 2021 14:42:18 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8A6AD19417; Sat, 29 May 2021 14:41:50 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 2FB391940D; Sat, 29 May 2021 14:41:47 +0000 (UTC) Received: from wforward1-smtp.messagingengine.com (wforward1-smtp.messagingengine.com [64.147.123.30]) by atuin.qyliss.net (Postfix) with ESMTPS id EAB681949E for ; Sat, 29 May 2021 14:41:42 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailforward.west.internal (Postfix) with ESMTP id 2A22111E6; Sat, 29 May 2021 10:41:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 29 May 2021 10:41:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=1iTtpj0G6H9Mr0O9u HWraG0uQI528G/gPFvjT4AUKqg=; b=oC6dcx/namfwND8lxCatYAA5QvpHWCDeB ttjzsNJ1RUNmluUnGspnauc9jhnDu3/pxLc7aeQFJyJL4ucJmZgpgpZg/tr9UppU ghaZAKRins4PK6M4cuDwHqKt8UltTU9wLdxaC0osGqAMNwmRG7OVdwS3dWiLmre0 iD1RMJ0Uqhjhthg6cEZotzIvnLkUjlVuGgFlz3gGAHYd/Gbu5DaU6enfvDJVp1O7 FOpZCbP9u0dQO/mv/7bZwJ/ZKB57OFtmCeWvhgeQXP+5YuKKCneu8iWnJfmjfuZO 5By5+QBSSpPaYX5VqySRM/KeblREt2mrpKXHyzyOWtXBeddfXnbXA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdekledgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhsrgcu tfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeeugeefhe ffuedtgfejueevieeiudffgfeljeevhfduiedvuedvtdduvdehiedujeenucffohhmrghi nhepshhpvggtthhruhhmqdhoshdrohhrghenucfkphepgeeirdektddrudefkedrjeefne cuuegrugftvghpuhhtgfhmrghilhepidditddiidesvghmrghilhdrrghmrgiiohhnshgv shdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p2e508a49.dip0.t-ipconnect.de [46.80.138.73]) by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 May 2021 10:41:40 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 23B2E1900; Sat, 29 May 2021 14:41:39 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1 Date: Sat, 29 May 2021 14:41:09 +0000 Message-Id: <20210529144117.571353-1-hi@alyssa.is> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZRP5PXDLAIFHC3SQ5PLURYAYK2K3FYL2 X-Message-ID-Hash: ZRP5PXDLAIFHC3SQ5PLURYAYK2K3FYL2 X-MailFrom: qyliss@x220.qyliss.net 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: 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/0100017891d36f4f-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 ...-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 => 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-setting-guest-MAC-from-tap-fd.patch => VIRTIO_NET_F_MAC.patch} (56%) rename pkgs/os-specific/linux/chromium-os/sommelier/{0004-sommelier-don-t-leak-source-absolute-paths.patch => 0003-sommelier-don-t-leak-source-absolute-paths.patch} (69%) rename pkgs/os-specific/linux/chromium-os/sommelier/{0005-sommelier-use-stable-xdg-shell-protocol.patch => 0004-Revert-Revert-vm_tools-sommelier-Switch-to-the-stabl.patch} (66%) delete mode 100644 pkgs/os-specific/linux/chromium-os/sommelier/0006-sommelier-make-building-demos-optional.patch delete mode 100644 pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch -- 2.31.1