From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id C0E7B1ACA7; Fri, 2 Apr 2021 09:05:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4AB801AAAE; Fri, 2 Apr 2021 09:04:31 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 51A3C1AA5A; Fri, 2 Apr 2021 09:04:28 +0000 (UTC) Received: from a48-91.smtp-out.amazonses.com (a48-91.smtp-out.amazonses.com [54.240.48.91]) by atuin.qyliss.net (Postfix) with ESMTPS id 70AEE1AA1A for ; Fri, 2 Apr 2021 09:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1617354256; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Transfer-Encoding:Feedback-ID; bh=GpiUCfCjD6i0r9TGtdeBUdChdXSfWut4Ol2r6mrISwY=; b=i2Mjqv7064WlOeBNmuQOsOFzC/eWdhtHHKviKyPp6tViarDcfwypj1X8oIZmafr3 g/Z3scIBYhJiER2lX8w9O/qnIzLBEfbHpCnzmrldbrDBXQYih+aFLhNOCNXm63EQdeT qaBvHHNzz7ZjqDwbxYsAsTKDl5SaGOBEfeLxpx3o= From: Jamie McClymont To: devel@spectrum-os.org Subject: [RFC PATCH 0/8] Update chromiumPacakges Date: Fri, 2 Apr 2021 09:04:16 +0000 Message-ID: <0100017891d36f4f-0c348828-2ed6-4694-b75c-44d0d659c13c-000000@email.amazonses.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SES-Outgoing: 2021.04.02-54.240.48.91 Feedback-ID: 1.us-east-1.9pXRggpcNqPasnyFcFNFQXAg6PTGO6hwgAZOzryQyDc=:AmazonSES Message-ID-Hash: 7PWVBIZXKYNYT4GDZJSA4RGHV4OWIPGM X-Message-ID-Hash: 7PWVBIZXKYNYT4GDZJSA4RGHV4OWIPGM X-MailFrom: 0100017891d36f4f-0c348828-2ed6-4694-b75c-44d0d659c13c-000000@amazonses.com 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; suspicious-header CC: Jamie McClymont X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Hi all Here's a nearly-complete(?) attempt at bumping chromiumOSPackages. Everything under chromiumOSPackages and spectrumPackages builds except crosvm (and therefore spectrum-vm). I've added platform2 as a dependency (a few rust crates from there are now used) and bumped the cargoSha256, so the vendor FOD now builds happily, but the actual `cargo build` fails with: > error: the lock file /build/src/platform/crosvm/Cargo.lock needs to be updated but --frozen was passed to prevent this > If you want to try to generate the lock file without accessing the network, use the --offline flag. I haven't dealt with buildRustPackage before, so I'm not sure if this is a standard thing that any frequent buildRustPackage user will know how to fix, or if we're running in to an odd edge-case - emailing it in as-is in the hopes that it's the former :) Thanks! Jamie McClymont Jamie McClymont (8): chromiumOSPackages: update 83->89 chromiumOSPackages.cros_linux: fix config chromiumOSPackages.vm_protos: drop GN patch chromiumOSPackages.common-mk: update patches chromiumOSPackages.common-mk: disable clang-only warnings chromiumOSPackages.sommelier: drop unneeded patches chromiumOSPackages.crosvm: add platform2 dep chromiumOSPackages.crosvm: bump cargoSha256 ...-mk-don-t-leak-source-absolute-paths.patch | 14 +- .../linux/chromium-os/common-mk/default.nix | 6 +- .../linux/chromium-os/crosvm/default.nix | 3 +- ...melier-use-stable-xdg-shell-protocol.patch | 1748 ----------------- ...mmelier-make-building-demos-optional.patch | 100 - .../linux/chromium-os/sommelier/default.nix | 2 - .../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 +- 10 files changed, 40 insertions(+), 1924 deletions(-) delete mode 100644 pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch 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