From: Alyssa Ross <hi@alyssa.is>
To: Jamie McClymont <jamie@kwiius.com>
Cc: devel@spectrum-os.org
Subject: Re: [RFC PATCH 6/8] chromiumOSPackages.sommelier: drop unneeded patches
Date: Fri, 02 Apr 2021 16:11:37 +0000 [thread overview]
Message-ID: <87im548y4m.fsf@alyssa.is> (raw)
In-Reply-To: <0100017891d37f9f-9a88c2a4-d5a3-4f89-94f1-f86a9a8c383f-000000@email.amazonses.com>
[-- Attachment #1: Type: text/plain, Size: 2722 bytes --]
Jamie McClymont <jamie@kwiius.com> writes:
> The xdg-shell thing has been integrated upstream, and the demos seem to
> no longer exist.
> ---
> ...melier-use-stable-xdg-shell-protocol.patch | 1748 -----------------
> ...mmelier-make-building-demos-optional.patch | 100 -
> .../linux/chromium-os/sommelier/default.nix | 2 -
> 3 files changed, 1850 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
This patch didn't apply for me. Looking at the message, it looks like
unlike your other patches this has been encoded as base64. I wouldn't
be surprised if this confuses things. Perhaps your mail provider
re-encodes outgoing mail that isn't 7-bit.
It also got held up for moderation by the mailing list because it was
such a big message. For big deletions like this, you might want to
consider using git-format-patch's --irreversible-delete option, that
will omit the actual content being deleted from the patch. I think this
might mean a little more work on my end when applying it (because the
man page suggests I can't just feed it to git am), but that's fine by
me if it'll mean messages don't get held up.
Anyway, I just redid the patch by hand since it's such a simple change,
and it looks like it does the job.
If the demos are gone, I think we should remove this line too:
gnArgs.use_demos = false;
since we get a warning that it now has no effect:
WARNING at the command-line "--args":1:400: Build argument has no effect.
ar="ar" cc="cc" cxx="c++" libdir="/nix/store/gn09lnn0v3nssy1xw8m2r3vm2iyanmay-sommelier-89.13729.0.0-rc1" pkg_config="pkg-config" platform2_root="." platform_subdir="vm_tools/sommelier" use={amd64=true arm=false asan=false coverage=false cros_host=false crypto=false dbus=false device_mapper=false fuzzer=false mojo=false profiling=false tcmalloc=false test=false timers=false udev=false} use_demos=false
^----
The variable "use_demos" was set as a build argument
but never appeared in a declare_args() block in any buildfile.
To view all possible args, run "gn args --list <out_dir>"
The build continued as if that argument was unspecified.
LGTM other than that.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2021-04-02 16:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210402090042.2020627-1-jamie@kwiius.com>
2021-04-02 9:04 ` [RFC PATCH 1/8] chromiumOSPackages: update 83->89 Jamie McClymont
2021-04-02 14:58 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 4/8] chromiumOSPackages.common-mk: update patches Jamie McClymont
2021-04-02 15:47 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 2/8] chromiumOSPackages.cros_linux: fix config Jamie McClymont
2021-04-02 15:35 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 3/8] chromiumOSPackages.vm_protos: drop GN patch Jamie McClymont
2021-04-02 15:53 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 5/8] chromiumOSPackages.common-mk: disable clang-only warnings Jamie McClymont
2021-04-02 15:54 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 8/8] chromiumOSPackages.crosvm: bump cargoSha256 Jamie McClymont
2021-04-02 9:04 ` [RFC PATCH 7/8] chromiumOSPackages.crosvm: add platform2 dep Jamie McClymont
2021-04-02 9:04 ` [RFC PATCH 6/8] chromiumOSPackages.sommelier: drop unneeded patches Jamie McClymont
2021-04-02 16:11 ` Alyssa Ross [this message]
2021-04-02 17:28 ` Alyssa Ross
2021-04-02 17:18 ` Thomas Leonard
2021-04-02 21:00 ` [PATCH platform2] Revert "Revert "vm_tools: sommelier: Switch to the stable version of xdg-shell"" Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87im548y4m.fsf@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
--cc=jamie@kwiius.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).