Revert of "Update linux sysroot from Wheezy to Jessie"

Revert of "Update linux sysroot from Wheezy to Jessie" (patchset #1 id:1 of https://codereview.chromium.org/2772503005/ )

Reason for revert:
Still breaks the Official Linux build, sorry. :(

FAILED: google-chrome-unstable_59.0.3051.0-1_amd64.deb 
python ../../chrome/installer/linux/flock_make_package.py linux_package.lock installer/debian/build.sh -o . -b . -a x64 -c unstable -d google_chrome -s /b/c/b/Google_Chrome_Linux_x64/src/build/linux/debian_jessie_amd64-sysroot
dpkg-shlibdeps: warning: binaries to analyze should already be installed in their package's directory
--- /b/c/b/Google_Chrome_Linux_x64/src/out/Release/installer/debian/expected_deps_x64_jessie	2017-03-24 12:47:31.781744635 -0700
+++ actual	2017-03-24 14:05:17.485075836 -0700
@@ -4,7 +4,7 @@
 libc6 (>= 2.15)
 libcairo2 (>= 1.6.0)
 libcups2 (>= 1.4.0)
-libdbus-1-3 (>= 1.2.14)
+libdbus-1-3 (>= 1.1.4)
 libexpat1 (>= 2.0.1)
 libfontconfig1 (>= 2.11)
 libfreetype6 (>= 2.3.9)

ERROR: Shared library dependencies changed!
If this is intentional, please update:
chrome/installer/linux/debian/expected_deps_ia32_jessie
chrome/installer/linux/debian/expected_deps_ia32_wheezy
chrome/installer/linux/debian/expected_deps_x64_jessie
chrome/installer/linux/debian/expected_deps_x64_wheezy


Original issue's description:
> Reland of "Update linux sysroot from Wheezy to Jessie"
> 
> The last version of this change was:
> https://codereview.chromium.org/2748183005
> 
> Which was reverted in:
> https://codereview.chromium.org/2776503002
> 
> I've updated the expected package deps again, this
> time being sure to use is_chrome_branded=true when
> testing (which oddly seems to effect the deps).
> 
> TBR=thestig (since this is effectively a reland)
> BUG=701894
> 
> Review-Url: https://codereview.chromium.org/2772503005
> Cr-Commit-Position: refs/heads/master@{#459492}
> Committed: https://chromium.googlesource.com/chromium/src/+/7f43e46a7830cb92c08b8245f7f48f0d3a2fab47

TBR=thakis@chromium.org,dpranke@chromium.org,thestig@chromium.org,sbc@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=701894

[Mike Wittman, 2017-03-24 21:15:31]

The CQ bit was checked by wittman@chromium.org

[Mike Wittman, 2017-03-24 21:15:31]

Created Revert of "Update linux sysroot from Wheezy to Jessie"

[commit-bot: I haz the power, 2017-03-24 21:16:13]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Nico, 2017-03-24 21:16:16]

RACE OF THE REVERTS vs https://codereview.chromium.org/2772113002/

On Fri, Mar 24, 2017 at 5:15 PM, <wittman@chromium.org> wrote:

> Reviewers: Nico, Dirk Pranke (slow until 28th), Lei Zhang, Sam Clegg
> CL: https://codereview.chromium.org/2774513006/
>
> Message:
> Created Revert of "Update linux sysroot from Wheezy to Jessie"
>
> Description:
> Revert of "Update linux sysroot from Wheezy to Jessie" (patchset #1 id:1 of
> https://codereview.chromium.org/2772503005/ )
>
> Reason for revert:
> Still breaks the Official Linux build, sorry. :(
>
> FAILED: google-chrome-unstable_59.0.3051.0-1_amd64.deb
> python ../../chrome/installer/linux/flock_make_package.py
> linux_package.lock
> installer/debian/build.sh -o . -b . -a x64 -c unstable -d google_chrome -s
> /b/c/b/Google_Chrome_Linux_x64/src/build/linux/debian_jessie_amd64-sysroot
> dpkg-shlibdeps: warning: binaries to analyze should already be installed in
> their package's directory
> ---
> /b/c/b/Google_Chrome_Linux_x64/src/out/Release/installer/
> debian/expected_deps_x64_jessie 2017-03-24
> 12:47:31.781744635 -0700
> +++ actual 2017-03-24 14:05:17.485075836 -0700
> @@ -4,7 +4,7 @@
> libc6 (>= 2.15)
> libcairo2 (>= 1.6.0)
> libcups2 (>= 1.4.0)
> -libdbus-1-3 (>= 1.2.14)
> +libdbus-1-3 (>= 1.1.4)
> libexpat1 (>= 2.0.1)
> libfontconfig1 (>= 2.11)
> libfreetype6 (>= 2.3.9)
>
> ERROR: Shared library dependencies changed!
> If this is intentional, please update:
> chrome/installer/linux/debian/expected_deps_ia32_jessie
> chrome/installer/linux/debian/expected_deps_ia32_wheezy
> chrome/installer/linux/debian/expected_deps_x64_jessie
> chrome/installer/linux/debian/expected_deps_x64_wheezy
>
>
> Original issue's description:
> > Reland of "Update linux sysroot from Wheezy to Jessie"
> >
> > The last version of this change was:
> > https://codereview.chromium.org/2748183005
> >
> > Which was reverted in:
> > https://codereview.chromium.org/2776503002
> >
> > I've updated the expected package deps again, this
> > time being sure to use is_chrome_branded=true when
> > testing (which oddly seems to effect the deps).
> >
> > TBR=thestig (since this is effectively a reland)
> > BUG=701894
> >
> > Review-Url: https://codereview.chromium.org/2772503005
> > Cr-Commit-Position: refs/heads/master@{#459492}
> > Committed:
> https://chromium.googlesource.com/chromium/src/+/
> 7f43e46a7830cb92c08b8245f7f48f0d3a2fab47
>
> TBR=thakis@chromium.org,dpranke@chromium.org,thestig@
> chromium.org,sbc@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=701894
>
> Affected files (+75, -60 lines):
> M build/config/sysroot.gni
> M build/linux/sysroot_scripts/install-sysroot.py
> M chrome/installer/linux/debian/expected_deps_ia32_jessie
> M chrome/installer/linux/debian/expected_deps_x64_jessie
> M chrome/installer/linux/rpm/expected_deps_i386
> M chrome/installer/linux/rpm/expected_deps_x86_64
> M tools/checklicenses/checklicenses.py
> M tools/copyright_scanner/copyright_scanner.py
> M tools/mb/mb_config.pyl
> M ui/ozone/platform/drm/gpu/drm_device.cc
>
>
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2017-03-24 21:17:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 21:17:46]

Failed to apply patch for build/config/sysroot.gni:
While running git apply --index -p1;
  error: patch failed: build/config/sysroot.gni:16
  error: build/config/sysroot.gni: patch does not apply

Patch:       build/config/sysroot.gni
Index: build/config/sysroot.gni
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index
5ea877752a790f7056c7493c10c8ace62a6092bc..2bcd6caae1e9a468e7b39f3613c41d2eac5b6ea9
100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -16,6 +16,10 @@
   target_sysroot_dir = ""
 
   use_sysroot = true
+
+  # TODO(tonikitoo): Remove this arg when wheezy is finally dropped and we
+  # can just use debian/jessie everywhere by default. crbug.com/564904.
+  use_jessie_sysroot = false
 }
 
 if (is_linux && target_sysroot_dir != "") {
@@ -53,18 +57,20 @@
     # functionality where possible) needs to run on the buliders, which are
     # running precise.  The precise build has a different set of dependencies
     # from the wheezy build, so we cannot use the wheezy sysroot.
-    # TODO(sbc): This condition can perhaps be eliminated now that we are
-    # using jessie rather than wheezy.
     sysroot = "//build/linux/ubuntu_precise_amd64-sysroot"
   } else {
     if (current_cpu == "x64") {
-      sysroot = "//build/linux/debian_jessie_amd64-sysroot"
+      sysroot = "//build/linux/debian_wheezy_amd64-sysroot"
+
+      if (use_jessie_sysroot) {
+        sysroot = "//build/linux/debian_jessie_amd64-sysroot"
+      }
     } else if (current_cpu == "x86") {
-      sysroot = "//build/linux/debian_jessie_i386-sysroot"
+      sysroot = "//build/linux/debian_wheezy_i386-sysroot"
     } else if (current_cpu == "mipsel") {
-      sysroot = "//build/linux/debian_jessie_mips-sysroot"
+      sysroot = "//build/linux/debian_wheezy_mips-sysroot"
     } else if (current_cpu == "arm") {
-      sysroot = "//build/linux/debian_jessie_arm-sysroot"
+      sysroot = "//build/linux/debian_wheezy_arm-sysroot"
     } else if (current_cpu == "arm64") {
       sysroot = "//build/linux/debian_jessie_arm64-sysroot"
     } else {

[Lei Zhang, 2017-03-29 01:40:04]

Closing since someone else reverted before you.

[Lei Zhang, 2017-03-29 01:40:09]

Description was changed from

==========
Revert of "Update linux sysroot from Wheezy to Jessie" (patchset #1 id:1 of
https://codereview.chromium.org/2772503005/ )

Reason for revert:
Still breaks the Official Linux build, sorry. :(

FAILED: google-chrome-unstable_59.0.3051.0-1_amd64.deb 
python ../../chrome/installer/linux/flock_make_package.py linux_package.lock
installer/debian/build.sh -o . -b . -a x64 -c unstable -d google_chrome -s
/b/c/b/Google_Chrome_Linux_x64/src/build/linux/debian_jessie_amd64-sysroot
dpkg-shlibdeps: warning: binaries to analyze should already be installed in
their package's directory
---
/b/c/b/Google_Chrome_Linux_x64/src/out/Release/installer/debian/expected_deps_x64_jessie	2017-03-24
12:47:31.781744635 -0700
+++ actual	2017-03-24 14:05:17.485075836 -0700
@@ -4,7 +4,7 @@
 libc6 (>= 2.15)
 libcairo2 (>= 1.6.0)
 libcups2 (>= 1.4.0)
-libdbus-1-3 (>= 1.2.14)
+libdbus-1-3 (>= 1.1.4)
 libexpat1 (>= 2.0.1)
 libfontconfig1 (>= 2.11)
 libfreetype6 (>= 2.3.9)

ERROR: Shared library dependencies changed!
If this is intentional, please update:
chrome/installer/linux/debian/expected_deps_ia32_jessie
chrome/installer/linux/debian/expected_deps_ia32_wheezy
chrome/installer/linux/debian/expected_deps_x64_jessie
chrome/installer/linux/debian/expected_deps_x64_wheezy


Original issue's description:
> Reland of "Update linux sysroot from Wheezy to Jessie"
> 
> The last version of this change was:
> https://codereview.chromium.org/2748183005
> 
> Which was reverted in:
> https://codereview.chromium.org/2776503002
> 
> I've updated the expected package deps again, this
> time being sure to use is_chrome_branded=true when
> testing (which oddly seems to effect the deps).
> 
> TBR=thestig (since this is effectively a reland)
> BUG=701894
> 
> Review-Url: https://codereview.chromium.org/2772503005
> Cr-Commit-Position: refs/heads/master@{#459492}
> Committed:
https://chromium.googlesource.com/chromium/src/+/7f43e46a7830cb92c08b8245f7f4...

TBR=thakis@chromium.org,dpranke@chromium.org,thestig@chromium.org,sbc@chromiu...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=701894
==========

to

==========
Revert of "Update linux sysroot from Wheezy to Jessie" (patchset #1 id:1 of
https://codereview.chromium.org/2772503005/ )

Reason for revert:
Still breaks the Official Linux build, sorry. :(

FAILED: google-chrome-unstable_59.0.3051.0-1_amd64.deb 
python ../../chrome/installer/linux/flock_make_package.py linux_package.lock
installer/debian/build.sh -o . -b . -a x64 -c unstable -d google_chrome -s
/b/c/b/Google_Chrome_Linux_x64/src/build/linux/debian_jessie_amd64-sysroot
dpkg-shlibdeps: warning: binaries to analyze should already be installed in
their package's directory
---
/b/c/b/Google_Chrome_Linux_x64/src/out/Release/installer/debian/expected_deps_x64_jessie	2017-03-24
12:47:31.781744635 -0700
+++ actual	2017-03-24 14:05:17.485075836 -0700
@@ -4,7 +4,7 @@
 libc6 (>= 2.15)
 libcairo2 (>= 1.6.0)
 libcups2 (>= 1.4.0)
-libdbus-1-3 (>= 1.2.14)
+libdbus-1-3 (>= 1.1.4)
 libexpat1 (>= 2.0.1)
 libfontconfig1 (>= 2.11)
 libfreetype6 (>= 2.3.9)

ERROR: Shared library dependencies changed!
If this is intentional, please update:
chrome/installer/linux/debian/expected_deps_ia32_jessie
chrome/installer/linux/debian/expected_deps_ia32_wheezy
chrome/installer/linux/debian/expected_deps_x64_jessie
chrome/installer/linux/debian/expected_deps_x64_wheezy


Original issue's description:
> Reland of "Update linux sysroot from Wheezy to Jessie"
> 
> The last version of this change was:
> https://codereview.chromium.org/2748183005
> 
> Which was reverted in:
> https://codereview.chromium.org/2776503002
> 
> I've updated the expected package deps again, this
> time being sure to use is_chrome_branded=true when
> testing (which oddly seems to effect the deps).
> 
> TBR=thestig (since this is effectively a reland)
> BUG=701894
> 
> Review-Url: https://codereview.chromium.org/2772503005
> Cr-Commit-Position: refs/heads/master@{#459492}
> Committed:
https://chromium.googlesource.com/chromium/src/+/7f43e46a7830cb92c08b8245f7f4...

TBR=thakis@chromium.org,dpranke@chromium.org,thestig@chromium.org,sbc@chromiu...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=701894
==========