New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 679477 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Last visit 15 days ago
Closed: Feb 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment

branch libweave for jetstream projects

Project Member Reported by ejcaruso@chromium.org, Jan 9 2017

Issue description

I want to branch libweave so that I can make an invasive local refactoring change without having to epatch a massive patch in. It would be easier if this could just go through normal code review.

The current libweave ebuild pulls in git commit 4bbb8ff94abf5db26396db9fac5c1df2c998a54a (tree f9e10ea4218ad59cfa7ba41fc35e23289ff0a115) of the weave/libweave project, so that should be the head for this branch. The branch should probably point to chromium-review since the weave people don't need to worry about this and they've deprecated libweave anyway.
 
Cc: zhihongyu@chromium.org
https://weave.googlesource.com/weave/libweave/

While I agree with Eric's concern about epatch being a PITA, I'm definitely NOT a fan of cloning a dead project for local development work.

However, since this is a dead project, maybe the former maintainers will give you (and us) commit access so we can directly drop changes into the dead project on it's own branch?

I'm not sure how the code review would work - but hopefully this is easier than dealing with epatchs for as long as we are still using libweave. Zhihong?
OP: What would you like the branch to be named?
Aviv, I don't care the name is. Pick one you can live with.

It seems that libchrome (features.h specifically) is causing build failures for gale/whirlwind (and I'm going to assume arkham soon - once it looses it's cache).

See https://bugs.chromium.org/p/chromium/issues/detail?id=678811 .
As far as I can see, there is no prior existing libweave repo on either chromium or chrome-internal-review gerrits. Is that as expected?

Would you like a new project in one of those two gerrit hosts?

If not, I may have overpromised. Not sure if I have admin rights on the weave gerrit. I can check.
The term "branch" was use rather loosely here. "clone" might be more accurate. Can you clone the libweave project under src/third_party/ ?
Eric, is that what you meant?
Summary: clone libweave for jetstream projects (was: Branch libweave for jetstream projects)
Summary: branch libweave for jetstream projects (was: clone libweave for jetstream projects)
Interesting - I didn't realize weave project had it's own gerrit instance:
   https://weave-review.googlesource.com
I have branch creation rights, but I don't have admin rights on the weave gerrit (nor do I know how they are acquired; any ideas?) so I can't chance the ACL on the branch to grant force push.

If you just want another checkout of the repo somewhere in the chrom[e/ium]os tree then you can accomplish that by editing the manifest.
This shouldn't be a problem; we're already pulling from weave.googlesource.com as it is, so the branch should be fine.

I think we can get this done by applying the epatched stuff and letting it go through the weave gerrit.
Status: Started (was: Untriaged)
Eric, do you have a time line for how soon libchrome can be uprev'd?
Or any advice on how I should fix features.h (libchrome)?
Owner: ejcaruso@chromium.org
My mistake, I do in fact have admin rights on weave-review. Let me know if you need access that you don't have.

Reassigning to OP.
nevermind regarding libchrome... looks like liblightcontrol/Makefile (for whirlwind and gale) is directly the problem. features.h is likely just the first use of _BSD_SOURCES.
Project Member

Comment 14 by bugdroid1@chromium.org, Jan 25 2017

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/c99fc3e0bd7daa410a1c326d9c0bb12f92dca2f5

commit c99fc3e0bd7daa410a1c326d9c0bb12f92dca2f5
Author: Eric Caruso <ejcaruso@google.com>
Date: Wed Jan 25 00:58:49 2017

Project Member

Comment 15 by bugdroid1@chromium.org, Jan 25 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/manifest/+/8c2d5955c5e9c3e406db7bcbac06a2ea1189b25c

commit 8c2d5955c5e9c3e406db7bcbac06a2ea1189b25c
Author: Eric Caruso <ejcaruso@chromium.org>
Date: Wed Jan 25 00:56:57 2017

manifest: change libweave branch to refactor branch

BUG= chromium:679477 
TEST=repo sync

Change-Id: I42779fac97402ed37a7f049a531224656d8f3524
Reviewed-on: https://chromium-review.googlesource.com/431967
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/8c2d5955c5e9c3e406db7bcbac06a2ea1189b25c/full.xml

Project Member

Comment 16 by bugdroid1@chromium.org, Jan 27 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/2127e9ba57d991af1610f5f67eb70ee2ca186975

commit 2127e9ba57d991af1610f5f67eb70ee2ca186975
Author: Eric Caruso <ejcaruso@chromium.org>
Date: Wed Jan 25 21:16:39 2017

libweave: fix lint error

The linter complains -Dint64=int64_t should be in defines instead
of cflags, but we already have a patch which converted int64 to
int64_t, so it's no longer necessary.

BUG= chromium:679477 
TEST=emerge-arkham libweave

Change-Id: Ib61a9e44ee6c230c17f10a10fc2c1a56ee9d11f2
Reviewed-on: https://chromium-review.googlesource.com/433198
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>

[modify] https://crrev.com/2127e9ba57d991af1610f5f67eb70ee2ca186975/libweave/libweave.gyp

Project Member

Comment 17 by bugdroid1@chromium.org, Jan 27 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/b513d812fcbef2ebf8f38bd38e25e9be9623dd10

commit b513d812fcbef2ebf8f38bd38e25e9be9623dd10
Author: Eric Caruso <ejcaruso@chromium.org>
Date: Wed Jan 25 20:52:25 2017

libweave: fix test compilation

We copy in this gyp file to compile libweave, but there is a small
discrepancy between this one and the one in the libweave git repo
which leaves out one source file during FEATURES=test compilation.
This fixes the undefined vtable for weave::test::MockCommand.

In addition, the file containing the main function for the
test runner was not included in the gyp file, leading to another
undefined reference.

BUG= chromium:679477 
TEST=FEATURES=test emerge-arkham libweave

Change-Id: Ic1349c550282efa39d844186e261d60ad85a490a
Reviewed-on: https://chromium-review.googlesource.com/433199
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/b513d812fcbef2ebf8f38bd38e25e9be9623dd10/libweave/libweave.gyp

Project Member

Comment 18 by bugdroid1@chromium.org, Feb 11 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/669df2aa0163d22df8c0419780950835eb13adb5

commit 669df2aa0163d22df8c0419780950835eb13adb5
Author: Eric Caruso <ejcaruso@chromium.org>
Date: Sat Feb 11 17:26:24 2017

libweave: drop from blacklist and remove epatches

We can now compile this from source since we're checking out
the refactor branch and all of the patches are applied there
already. This means we can let it uprev automatically.

BUG= chromium:679477 
TEST=FEATURES=test emerge-{arkham, whirlwind} libweave
  (cr) $ cros_mark_as_stable --debug -p chromeos-base/libweave \
    -o ~/trunk/src/third_party/chromiumos-overlay \
    commit --verbose --force

Change-Id: I221b3186a3dd7f1ef02bc98491cde268429edead
Reviewed-on: https://chromium-review.googlesource.com/433081
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[delete] https://crrev.com/30720e9608fb2a3eb4a700df5e3b0cfbcb3818c3/chromeos-base/libweave/files/patches/libweave-dont-update-when-offline.patch
[delete] https://crrev.com/30720e9608fb2a3eb4a700df5e3b0cfbcb3818c3/chromeos-base/libweave/files/patches/libweave-include-algorithm.patch
[modify] https://crrev.com/669df2aa0163d22df8c0419780950835eb13adb5/chromeos-base/libweave/libweave-0.0.1-r108.ebuild
[delete] https://crrev.com/30720e9608fb2a3eb4a700df5e3b0cfbcb3818c3/chromeos-base/libweave/files/patches/libweave-device-manager-dependencies.patch
[delete] https://crrev.com/30720e9608fb2a3eb4a700df5e3b0cfbcb3818c3/chromeos-base/libweave/files/patches/libweave-int64.patch
[modify] https://crrev.com/669df2aa0163d22df8c0419780950835eb13adb5/chromeos-base/libweave/libweave-9999.ebuild
[delete] https://crrev.com/30720e9608fb2a3eb4a700df5e3b0cfbcb3818c3/chromeos-base/libweave/files/patches/libweave-fix-395517.patch

Status: Fixed (was: Started)
libweave is building from the branch now. We should be good here.

Sign in to add a comment