Open jcormier opened 7 years ago
This pull request is wayyy too big of a mess. Pull requests need to be clear and concise. Unfortunately this looks like it merges everything and then breaks it and then attempts to unbreak it.
That's fair. Would you prefer a rebase, excluding all the patches which don't work for the 4.4-kitkat build?
Cherry-picking the exact fixes would be preferred like the way the linux mainline and linux-stable kernl operates.
The thing is there are a large number of fixes in the main branch which could apply to the 4.4 branch. In fact pretty much every commit except the 3 I reverted which is why I went with this approach. Otherwise, I'm pretty much cherry-picking every commit which is similar to a rebase.
I'm not sure if these branches really apply to the kernel backporting workflow. I see the 4.4 branch not as an older version of the software but instead as an alternative configuration which should mostly be kept in sync with the master branch.
List of applicable commits starting from oldest. I'm ignoring all the README changes as they don't directly affect the build.
tests: Update bash script to call bash
Dockerfile: Add "aosp" group
Add convenience Makefile to easily rebuild image
Dockerfile: Prefer COPY instead of ADD
Dockerfile: Fix ownership of .gitconfig and .ssh
Dockerfile: Change ownership of /tmp/cache and /aosp directories
utils/aosp: trim trailing slash of directories
utils/aosp: Refactor code to display status message and remove chmod call
utils/aosp: Update script and Dockerfile to work with any host user uid/gid
docker_entrypoint: Default to 'bash' if no arguments are provided
utils/aosp: If no AOSP_VOL is set, create aosp volume in current home
Update `Dockerfile` and `utils/aosp` to work with arbitrary uid gid
utils: Fix harmless entrypoint msg typo
entrypoint: Preserve ENV variables
utils/aosp: Only pass UID and GID arguments if NOT root
Dockerfile: Install graphviz to enable product-graph
aosp: Check that SSH_AUTH_SOCK points to a socket
Add docker compose file and update README
CCache doesn't seem to be working -- add this in the entrypoint
store ccache volume in the source directory
[master] CCache doesn't seem to be working -- add this in the entrypoint
Its your project so I'll do it however you think works best.
Merged master branch into the 4.4-kitkat branch and then reverted several commits which break building for kitkat.
Note because oracle stopped allowing downloading of the jdk 6u45 installer this commit is much bigger than it would otherwise have to be. Don't know of another way around this.
Note this should make it easy to merge future commits to master back into the 4.4-kitkat branch.