Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
2903253005:
Linux: Make manual libnss3 version dependency work again. (Closed)
|
Created:
3 years, 6 months ago by Lei Zhang Modified:
3 years, 6 months ago Reviewers:
Tom Anderson CC:
chromium-reviews, grt+watch_chromium.org, pennymac+watch_chromium.org, Michael Moss, wfh+watch_chromium.org, Ryan Sleevi Target Ref:
refs/heads/master Project:
chromium Visibility:
Public. |
DescriptionLinux: Make manual libnss3 version dependency work again.
When libnss3 is specified as a dependency both manually and via
dpkg-shlibdeps, only the dpkg-shlibdeps dependency actually makes it
into the .deb file's Depends section. To work around this, remove the
entry generated by dpkg-shlibdeps, after comparing it to expectations.
This used to work, but something changed during the Jessie sysroot
update.
BUG=691261, 726858
Review-Url: https://codereview.chromium.org/2903253005
Cr-Commit-Position: refs/heads/master@{#475215}
Committed: https://chromium.googlesource.com/chromium/src/+/1c02ea390c65d2292b64ffbb57c4a4d4873c34b4
Patch Set 1 #Patch Set 2 : Add a check, remove unneeded manual libstdc++6 dep #
Total comments: 6
Messages
Total messages: 21 (9 generated)
thestig@chromium.org changed reviewers: + thomasanderson@chromium.org
This should bump the actual requirement in the .deb file up from 2:3.13.4-2 to 3.17.2.
Hang on, there's something weird going on. I downloaded google-chrome-stable_current_amd64.deb (M58) and it has: ... libnss3 (>= 2:3.13.4-2~) | libnss3-1d (>= 3.12.4), ... libnss3 (>= 3.17.2) but the .deb files I generate locally do not. Not sure why that's happening.
On 2017/05/26 21:18:00, Lei Zhang wrote: > Hang on, there's something weird going on. I downloaded > google-chrome-stable_current_amd64.deb (M58) and it has: > > ... libnss3 (>= 2:3.13.4-2~) | libnss3-1d (>= 3.12.4), ... libnss3 (>= 3.17.2) > > but the .deb files I generate locally do not. Not sure why that's happening. The 60.0.3112.0 .deb files only have the 2:3.13.4-2~ dependency. So I'm not going crazy.
lgtm as a quick fix, but I think we should try to better understand the problem in the long-term
Let me see if I can tack on a dpkg -I check...
Description was changed from ========== Linux: Make manual libnss3 version dependency work. When libnss3 is specified as a dependency both manually and via dpkg-shlibdeps, only the dpkg-shlibdeps dependency actually makes it into the .deb file's Depends section. To work around this, remove the entry generated by dpkg-shlibdeps, after comparing it to expectations. BUG=691261 ========== to ========== Linux: Make manual libnss3 version dependency work again. When libnss3 is specified as a dependency both manually and via dpkg-shlibdeps, only the dpkg-shlibdeps dependency actually makes it into the .deb file's Depends section. To work around this, remove the entry generated by dpkg-shlibdeps, after comparing it to expectations. This used to work, but something changed during the Jessie sysroot update. BUG=691261,726858 ==========
On 2017/05/26 21:57:22, Lei Zhang wrote: > Let me see if I can tack on a dpkg -I check... Patch set 2.
https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... File chrome/installer/linux/debian/build.sh (left): https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... chrome/installer/linux/debian/build.sh:308: # libstdc++6: For C++11 support. No longer needed. The expectation files already have an entry for: libstdc++6 (>= 4.8.1)
The CQ bit was checked by thestig@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
still lgtm https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... File chrome/installer/linux/debian/build.sh (right): https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... chrome/installer/linux/debian/build.sh:117: DEPENDS="${COMMON_DEPS}" # This needs to match do_package() above. Is DEPENDS just here for the comment? It's only used on line 118 https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... chrome/installer/linux/debian/build.sh:118: echo ${DEPENDS} | sed 's/, /\n/g' | LANG=C sort > expected_deb_depends Does this file get created in the out directory? If not, maybe /tmp/expected_deb_depends?
https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... File chrome/installer/linux/debian/build.sh (right): https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... chrome/installer/linux/debian/build.sh:117: DEPENDS="${COMMON_DEPS}" # This needs to match do_package() above. On 2017/05/26 23:56:16, Tom Anderson wrote: > Is DEPENDS just here for the comment? It's only used on line 118 It's just here to help readers better understand what it is, and it mirrors do_package(). https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... chrome/installer/linux/debian/build.sh:118: echo ${DEPENDS} | sed 's/, /\n/g' | LANG=C sort > expected_deb_depends On 2017/05/26 23:56:15, Tom Anderson wrote: > Does this file get created in the out directory? If not, maybe > /tmp/expected_deb_depends? Yes it does. Is that a problem? We do the same with the other diff below on line 302.
https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... File chrome/installer/linux/debian/build.sh (right): https://codereview.chromium.org/2903253005/diff/20001/chrome/installer/linux/... chrome/installer/linux/debian/build.sh:118: echo ${DEPENDS} | sed 's/, /\n/g' | LANG=C sort > expected_deb_depends On 2017/05/27 00:22:38, Lei Zhang wrote: > On 2017/05/26 23:56:15, Tom Anderson wrote: > > Does this file get created in the out directory? If not, maybe > > /tmp/expected_deb_depends? > > Yes it does. Ok good, just wanted to make sure it wasn't getting created in the src directory
The CQ bit was checked by thestig@chromium.org
CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch.
Bot data: {"patchset_id": 20001, "attempt_start_ts": 1495848502278270,
"parent_rev": "9963b64bffbccabb05118813832442b9ac1a437c", "commit_rev":
"1c02ea390c65d2292b64ffbb57c4a4d4873c34b4"}
Message was sent while issue was closed.
Description was changed from ========== Linux: Make manual libnss3 version dependency work again. When libnss3 is specified as a dependency both manually and via dpkg-shlibdeps, only the dpkg-shlibdeps dependency actually makes it into the .deb file's Depends section. To work around this, remove the entry generated by dpkg-shlibdeps, after comparing it to expectations. This used to work, but something changed during the Jessie sysroot update. BUG=691261,726858 ========== to ========== Linux: Make manual libnss3 version dependency work again. When libnss3 is specified as a dependency both manually and via dpkg-shlibdeps, only the dpkg-shlibdeps dependency actually makes it into the .deb file's Depends section. To work around this, remove the entry generated by dpkg-shlibdeps, after comparing it to expectations. This used to work, but something changed during the Jessie sysroot update. BUG=691261,726858 Review-Url: https://codereview.chromium.org/2903253005 Cr-Commit-Position: refs/heads/master@{#475215} Committed: https://chromium.googlesource.com/chromium/src/+/1c02ea390c65d2292b64ffbb57c4... ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001) as https://chromium.googlesource.com/chromium/src/+/1c02ea390c65d2292b64ffbb57c4... |
