From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on atuin X-Spam-Level: X-Spam-Status: No, score=0.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FORGED_SPF_HELO,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.3 Received: by atuin.qyliss.net (Postfix, from userid 496) id 2C297235AA; Sun, 31 May 2020 23:54:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 63B46234FE; Sun, 31 May 2020 23:54:31 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 7768923584; Sun, 31 May 2020 23:54:28 +0000 (UTC) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2095.outbound.protection.outlook.com [40.92.18.95]) by atuin.qyliss.net (Postfix) with ESMTPS id 7C287234F6 for ; Sun, 31 May 2020 23:54:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DjXOMrbpstTTogP4jFgnelQXRm/fexA33eMsMZ5zTgeu8cCaf78imsn5dl7VHjVGK8vja48vPifdV7aaBPYXBIzw6QtAf/lp1WXzhZnpL3a5kRo97bS4Jb02rnY5ok1+CEoQFSi0H5kVfOgvYKvV2H/N8gL/2B5SuRdQfRVetuf3i/6pul/4AvCJEkinLEeOTBH2n03fuVindMqhmR66fdo5UpO20Pw8Ib80wBYFV/CFXLTNPf+6XI1xA7++VLTsePV4axVPm+nvlEBtihfIsS6U5cAZBH9bsmaZqLp3CQI7oieR9REVYXc1O1kQBjmt+zMKscYqSPf/0OTnD49HOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gv1+/6YX22NRnsrGpeCsEY1ffuKiBDvvKdeHGQC5kSw=; b=ZWYQJEbpwibgxK21+yr6ey7I1lGDBYm4k9GLxmkAEYjYcPkLc/hxWNnM/F66BXXg70ib6LyGEn8lriqgt3oQc9t4gOoyRmiA/SR2Le5R1+MYbz8aBBhyyfatVTmiYSkVwbZBlKoQAy2h0WX48DPOiRamCGHpp1F6R3uVTgl5FEwBm1TUdymhexBSyKC2RZfPcCcMWBHBT+BLtpCH7WWw3FvCc476uknfFqqHzXv45st3R9RAt7+mnqQug+3Lz/SBBw/lnc3bIWq9qOApWj5b3BtljOs0pvIoZ0qZHbqUAlQ2wLoZky7SRNHkbJ7F7T1rlMJ8UV5X0EnT31JEOL1IWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gv1+/6YX22NRnsrGpeCsEY1ffuKiBDvvKdeHGQC5kSw=; b=jM1ersUiR2BaNQv9KRGMqtfLhXaolxVQLLT2I0s6RQJHTDbh9qaE5U43nvHj5Cb/IF4ykpMpc1akD3Su/mvue3h3KITc15KLHbhxjH9Y4sq+2GAOYrbBctwv6ngF+QAKxrC71VWbC2iZjQcbbJN3Xj2O0HQ0Ex4CTPK0HuiSCYLpOdWIcSUa8pVUFlim9au4jcJ/9cFPk4qDZPInqJbSGWbOtx6X9r3+A2YYcfdx+PP96MmXPGq6lQfqw72e/MzTb9RQR5gPSUQp8yGkdGLYZPyr/r7stvRmJYMpe9Q0iOgiRvw65h7yeWgMJY0yf/u/F/+u4Lq1uLfcYqFbL+zOqg== Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2a01:111:e400:3861::4c) by CO1NAM11HT221.eop-nam11.prod.protection.outlook.com (2a01:111:e400:3861::435) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.22; Sun, 31 May 2020 23:54:20 +0000 Received: from CH2PR14MB3579.namprd14.prod.outlook.com (2a01:111:e400:3861::51) by CO1NAM11FT043.mail.protection.outlook.com (2a01:111:e400:3861::193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.22 via Frontend Transport; Sun, 31 May 2020 23:54:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:26BF3C5452751EFE75A98A337180A96B576C7C19C4199F863A25066405132FCF;UpperCasedChecksum:A24E7AFB9EDBA7D7D2DF1E6E267983F0FA6E6D91859F6AA8CDD5792FA073CA95;SizeAsReceived:8676;Count:47 Received: from CH2PR14MB3579.namprd14.prod.outlook.com ([fe80::2948:142c:3047:102c]) by CH2PR14MB3579.namprd14.prod.outlook.com ([fe80::2948:142c:3047:102c%5]) with mapi id 15.20.3045.024; Sun, 31 May 2020 23:54:20 +0000 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 In-Reply-To: <20200531030112.22029-1-hi@alyssa.is> Date: Sun, 31 May 2020 16:49:28 -0700 To: "Alyssa Ross" , Subject: Re: [PATCH v2 2/2] chromiumOSPackages: 81.12871.0.0-rc1 -> 83.13020.0.0-rc1 From: "Cole Helbling" Message-ID: X-ClientProxiedBy: BY3PR10CA0026.namprd10.prod.outlook.com (2603:10b6:a03:255::31) To CH2PR14MB3579.namprd14.prod.outlook.com (2603:10b6:610:62::18) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (67.187.170.40) by BY3PR10CA0026.namprd10.prod.outlook.com (2603:10b6:a03:255::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17 via Frontend Transport; Sun, 31 May 2020 23:54:19 +0000 X-Microsoft-Original-Message-ID: X-TMN: [g7sSAUFoLLj1P5FtkYeIbY514ECP+DeQ] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dc545260-d7b1-4dd3-4146-08d805bdefd8 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtx48ky6LpRAPrKJML4kAbJEpgMdf3NxYbS8p7r3vFyLuY5sZwXu+SqG6EMQuX63mEmgzY6LyiE3cyfPkUdatSUx6U9yA4Z7CJUW9rpwu1mqWiH5wsvTvd8YbJ983EOdrAHVK5DEcejldeqkDFVz7xYZLffzr00jEnnwiYBKHyAa1nro/WnAKLPMieS/+2kTG03PHJC3q+N77eMi1IapYDc9w6UGlpuedp2WlTuJ1yH8jnrZwydlWbhkZrSsGpUlBPTRkEkVqPgS4BoHk4TCe1FwqEquLzDtuUkeDesLX2ds8Hq216sEP/fONSEl4iA10Fuv1qN8IBOc02fkEXBjjEj5OMaCX0fJcgeeYJ2axE5wsR9gFMW/t7Itbm06gcMroW0fPCLIjxF43oYvhz3rmKBd9MLDD/W7YcCzIE/ya0lP95G7NYIFqWmOr83EnJOqRpN67j9UajMohM2He22UYyColnNJjIu9vqQvbmnuYVZMYpp06U8Vg7OXYKd5c2GVNPduvA/up9lzJtQ7ba/fHxJsFe5NH7yrWGC0VJETv5xdvikhf01y0kaONRSAAdNFp36P2PF2/XaonqC4PZOWK4syDUIOu8EqiZgjfU1L9b/O6ZNR2yKDSqW5sox2FunXEf741XYFqdjFkrAHx2lQ4rpLkA9K6KC18YfUewTcWqMX4EthcFlP1CFiaD6FBIM2RFVOBy/OunthxsLFCqSNeJ4bAFibvRtsp1pLdRG/JmalSBXY929NnMsp2LDr580dfcP0ZDmSaW+S7uaPirN3DgU X-MS-TrafficTypeDiagnostic: CO1NAM11HT221: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zk+1HxUQCKTivoWlcWXYuakl3LvLI6rMAYO0NWYCRwgCd6u/2pexQ+zzczAEBgZHgZP0ywDlj4Kh4yRwiYisSNRueK0mHwjTK2huZ0WlaLRTY1K6tZnb22g5Y9SWlZOeYgFo36HR8uXg9f4kBsu+tRJn47wcK62ppdT5TJbaMcOr4bEZ53jGEjD62lDWr4xmsXymnnBVF46x4FUt1FzOXA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR14MB3579.namprd14.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: 5JcbNyZjJmtpIIFQe1jYhfxNCuUYCR1zbky5USyzSd0QIDw9ZRHhUeiV0or+Ps2mpYFuu5Gmf3nT8OnxucsyEr3LArBwmOnErm7398I9IvYVf5qEaxuQaXjKue/fqN8y74fKzPARJPdbnRZJZC/pSw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc545260-d7b1-4dd3-4146-08d805bdefd8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2020 23:54:20.6956 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM11HT221 Message-ID-Hash: LRVEMJELVXP44ACY4YFYHSXVL67FHKHM X-Message-ID-Hash: LRVEMJELVXP44ACY4YFYHSXVL67FHKHM X-MailFrom: cole.e.helbling@outlook.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: Cole Helbling , Alyssa Ross X-Mailman-Version: 3.3.0 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: On Sun May 31, 2020 at 3:01 AM, Alyssa Ross wrote: > crosvm now needs the Minijail sources. However, it'll notice that a > Minijail package is provided via pkg-config, and then not actually use > those sources or build its own Minijail. It would be nice if the > Minijail we provide could be the same version as in Chromium OS, which > means bringing Minijail under chromiumOSPackages. > > A couple of backports are no longer required; one to common-mk and one > to Linux. > --- > v1 of this patch was corrupt, due to an editor misconfiguration that > made it strip trailing whitespace when I saved the patch after > annotating it. > > Additionally, I've now DRYed the fetchFromGitiles calls in crosvm. > > ...ommon-mk-.gn-don-t-hardcode-env-path.patch | 4 +- > ...-Suppress-Wrange-loop-analysis-warni.patch | 72 ----- > .../linux/chromium-os/common-mk/default.nix | 1 - > .../linux/chromium-os/crosvm/default.nix | 34 ++- > .../os-specific/linux/chromium-os/default.nix | 4 +- > .../linux/chromium-os/modem-manager/next.nix | 5 +- > ...er-don-t-leak-source-absolute-paths.patch} | 4 +- > ...elier-use-stable-xdg-shell-protocol.patch} | 54 ++-- > ...melier-make-building-demos-optional.patch} | 4 +- > ...er-Log-the-value-of-strerror-when-as.patch | 245 ------------------ > .../linux/chromium-os/sommelier/default.nix | 7 +- > pkgs/os-specific/linux/chromium-os/update.py | 1 + > .../linux/chromium-os/upstream-info.json | 42 +-- > ...virtwl-Support-multiple-host-sockets.patch | 126 --------- > pkgs/os-specific/linux/kernel/patches.nix | 5 - > 16 files changed, 83 insertions(+), 529 deletions(-) When running `nix-build . -A spectrumPackages.spectrum-vm` with these two patches applied, vm_protos fails to build: [23/52] ACTION //vm_tools/proto:fuzzer-protos_gen(//common-mk/toolchain= :toolchain) /usr/share/proto: warning: directory does not exist. [26/52] CXX obj/out/Release/gen/include/vm_protos/proto_bindings/libfuz= zer-protos.fuzzer.grpc.pb.o FAILED: obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-= protos.fuzzer.grpc.pb.o c++ -MMD -MF obj/out/Release/gen/include/vm_protos/proto_bindings/libfu= zzer-protos.fuzzer.grpc.pb.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D= _FILE_OFFSET_BITS=3D64 -Igen/include -I../../common-mk -I/usr/include -Igen= -Igen -Igen -Igen -Wall -Wunused -Wno-unused-parameter -Wunreachable-code = -ggdb3 -fstack-protector-strong -Wformat=3D2 -fvisibility=3Dinternal -Wa,--= noexecstack -Wimplicit-fallthrough -Werror --sysroot=3D -fPIE -fvisibility= =3Ddefault -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28= .1/include -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev= /include -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/inclu= de -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/inclu= de -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/include= -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/include -Wno-= unreachable-code -std=3Dgnu++14 -fno-exceptions -fno-unwind-tables -fno-asy= nchronous-unwind-tables -Wno-psabi -c gen/include/vm_protos/proto_bindings/= fuzzer.grpc.pb.cc -o obj/out/Release/gen/include/vm_protos/proto_bindings/l= ibfuzzer-protos.fuzzer.grpc.pb.o In file included from gen/include/vm_protos/proto_bindings/fuzzer.grpc.= pb.cc:5: gen/include/vm_protos/proto_bindings/fuzzer.pb.h:38:10: fatal error: vm= _crash.pb.h: No such file or directory 38 | #include "vm_crash.pb.h" | ^~~~~~~~~~~~~~~ compilation terminated. ninja: build stopped: subcommand failed. builder for '/nix/store/8asskz117p1nhirxaa4pwa0caayxg6c5-vm_protos-83.1= 3020.0.0-rc1.drv' failed with exit code 1 Cole