[Toybox] [PATCH] setenforce takes exactly one argument

[enh]

On Wed, Apr 8, 2015 at 11:45 PM, Rob Landley <rob at landley.net> wrote:
> On Tue, Apr 7, 2015 at 3:13 PM, enh <enh at google.com> wrote:
>> submitted to AOSP as
>> https://android-review.googlesource.com/#/c/145667/ (SHA
>> ec13b088cdaf133e4fa5e7a94ed90eb0af59c126).
>
> Do you have a tree I can pull from with just changes to go upstream?
>
> I can't pull from
> https://android.googlesource.com/platform/external/toybox because it's
> got checked in generated files and top level .config.

no. i've been keeping "changes to go upstream" separate from
"configuration changes", so you can at least cherrypick, but i hadn't
thought of how you'd work out which changes to cherrypick and which
not.

i don't think i imagined you merging because i assumed you'd want to
review every change anyway. i don't _plan_ on making changes to the
non-Android parts of the tree without getting them upstream first, but
if the release team's breathing down my neck and we were supposed to
have shipped two weeks ago, i might have to. i'd worry too about what
happens if i "git rm" the existing uptime.c and add an Android one to
toys/android/. again, i'm not planning on it (read: "would like to
avoid that kind of mess at all costs"), but what if i go under a bus,
or someone else thinks it's a good idea while i'm on vacation?

is there some kind of "git merge --interactive" that makes it easy to
go through all the patches and skip the useless ones? actually, if you
skip my modification of the .gitignore file, will merge drop future
changes to the generated files on the floor automatically? or is that
a conflict?

> (I'd be ok with
> having android.mk be in scripts or in toys/android but would prefer
> not to have it at the top level. Presumably your local tree could add
> a symlink, but I dunno if that would be useful to you _without_ the
> checked in .config and generated files... :)

losing the generated files is just a matter of work. i could have a
much more complicated Android.mk that has all your scripts generate
their output into the build system's intermediates directory, then
adds that to the include path for building the source. that would be
better for me too, but i haven't had time to look into how hard that
would be. does your current setup support writing the generated files
to an arbitrary directory?

i don't see a way around the Android.mk or the .config file though.
the build system will stop at a directory without an Android.mk, so we
can't easily hide it. and the need for the .config file is obvious
(unless i use "git rm" as my configuration tool, but i assume that
would be far more painful on your end!).

 -e

 1428590746.0