New issue
Advanced search Search tips

Issue 807488 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Feb 2018
Cc:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

Clarify that a .patch file is not always needed in zlib changes

Project Member Reported by cblume@chromium.org, Jan 31 2018

Issue description

third_party/zlib/patches/README says that in the near future we will isolate changes to simplify adoption of upstream changes. But it doesn't specify HOW we will simplify adoption.

Any change inside the root directory of zlib has the potential to conflict with upstream changes. Additionally, changes in the root directory must match zlib's requirements (style, builds on ancient machines with ancient compilers, etc).

But changes inside contrib/ are not restricted in this way. They will not conflict with upstream changes by design. And zlib's owner made clear that contrib/ can specify its own build system and requirements.

Update third_party/zlib/patches/README to explain that changes should go inside contrib/ when possible. And a .patch file only needs to be generated when the changes to the root directory are not immediately clear.
 
Project Member

Comment 2 by bugdroid1@chromium.org, Feb 6 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1511a018f9fecad9c4c873b19156ad74d6c64eee

commit 1511a018f9fecad9c4c873b19156ad74d6c64eee
Author: Chris Blume <cblume@chromium.org>
Date: Tue Feb 06 19:33:29 2018

Clarify when a .patch file must be generated

The current README is unclear about when a .patch file must be generated
and how we intend to isolate our changes from upstream changes.

This patch clarifies how someone can contribute to third_party/zlib
while minimizing risk of conflicts with upstream changes.

BUG= 807488 

Change-Id: Iaa503b94f110cb83febbdd8d57527d606d3eb779
Reviewed-on: https://chromium-review.googlesource.com/894856
Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Chris Blume <cblume@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534751}
[modify] https://crrev.com/1511a018f9fecad9c4c873b19156ad74d6c64eee/third_party/zlib/patches/README

Comment 3 by cblume@chromium.org, Feb 12 2018

Status: Fixed (was: Started)

Sign in to add a comment