Update Sysroots

This CL rolls the sysroots after 3b60716.  In addition, it also fixes
a bug in build-and-upload.py which would cause the script to fail if
not run in build/linux/sysroot-scripts.

BUG=668205
R=dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2599763004
Cr-Original-Commit-Position: refs/heads/master@{#441461}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 86897c091fdea39a61b4ff295414a3ea135d35a9

linux/sysroot_scripts/build_and_upload.py

@@ -45,8 +45,7 @@ def build_and_upload(script_path, distro, release, arch, lock):
   run_script([script_path, 'UploadSysroot%s' % arch, revision])
 
   tarball = '%s_%s_%s_sysroot.tgz' % (distro, release, arch.lower())
-  tgz_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                          "..", "..", "..", "out", "sysroot-build",
+  tgz_path = os.path.join(script_dir, "..", "..", "..", "out", "sysroot-build",
                           release, tarball)
   sha1sum = sha1sumfile(tgz_path)
   sysroot_dir = '%s_%s_%s-sysroot' % (distro, release, arch.lower())
@@ -58,7 +57,7 @@ def build_and_upload(script_path, distro, release, arch, lock):
       'SysrootDir': sysroot_dir
   }
   with lock:
-    with open('sysroots.json', 'rw+') as f:
+    with open(os.path.join(script_dir, 'sysroots.json'), 'rw+') as f:
       sysroots = json.load(f)
       sysroots["%s_%s" % (release, arch.lower())] = sysroot_metadata
       f.seek(0)

linux/sysroot_scripts/packagelist.precise.amd64

@@ -125,7 +125,7 @@ main/libx/libxt/libxt-dev_1.1.1-2ubuntu0.1_amd64.deb
 main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1_amd64.deb
 main/libx/libxtst/libxtst-dev_1.2.0-4ubuntu0.1_amd64.deb
 main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1_amd64.deb
-main/l/linux/linux-libc-dev_3.2.0-118.161_amd64.deb
+main/l/linux/linux-libc-dev_3.2.0-119.162_amd64.deb
 main/m/mesa/libegl1-mesa_8.0.4-0ubuntu0.7_amd64.deb
 main/m/mesa/libegl1-mesa-dev_8.0.4-0ubuntu0.7_amd64.deb
 main/m/mesa/libegl1-mesa-drivers_8.0.4-0ubuntu0.7_amd64.deb

linux/sysroot_scripts/packagelist.trusty.arm

@@ -113,7 +113,7 @@ main/libx/libxt/libxt-dev_1.1.4-1_armhf.deb
 main/libx/libxtst/libxtst6_1.2.2-1_armhf.deb
 main/libx/libxtst/libxtst-dev_1.2.2-1_armhf.deb
 main/libx/libxxf86vm/libxxf86vm1_1.1.3-1_armhf.deb
-main/l/linux/linux-libc-dev_3.13.0-105.152_armhf.deb
+main/l/linux/linux-libc-dev_3.13.0-106.153_armhf.deb
 main/m/mesa/libgl1-mesa-dev_10.1.3-0ubuntu0.6_armhf.deb
 main/m/mesa/libgl1-mesa-glx_10.1.3-0ubuntu0.6_armhf.deb
 main/m/mesa/libglapi-mesa_10.1.3-0ubuntu0.6_armhf.deb

linux/sysroot_scripts/sysroots.json

@@ -1,67 +1,67 @@
 {
     "jessie_amd64": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "4127ff46dea56a5f9afd049a9756bea2c888a63b",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "cc59aa719e061602e73a4868aad0ca160844b7fe",
         "SysrootDir": "debian_jessie_amd64-sysroot",
         "Tarball": "debian_jessie_amd64_sysroot.tgz"
     },
     "jessie_arm": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "75e5dfaf7e9dec30bb09acd53d222e4704e1ffd5",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "96f6f81439955d0c9db49419ff5e4a38d1825b90",
         "SysrootDir": "debian_jessie_arm-sysroot",
         "Tarball": "debian_jessie_arm_sysroot.tgz"
     },
     "jessie_arm64": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "b8a762473279d6c6dcd8a94fce9add40b1e79e2b",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "4a9d0ea988e6d816d6abc59b2674f6769b535012",
         "SysrootDir": "debian_jessie_arm64-sysroot",
         "Tarball": "debian_jessie_arm64_sysroot.tgz"
     },
     "jessie_i386": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "507214cbfe9a0a03d2b3899e4b1c9da2d93c4a61",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "34b122c9ca411beb957d157d5a6696c9fa93e1db",
         "SysrootDir": "debian_jessie_i386-sysroot",
         "Tarball": "debian_jessie_i386_sysroot.tgz"
     },
     "jessie_mips": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "76d8b35107b9b279e97e0a785f6f559d62c409ae",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "25e8df7da22f97f900765094228f77cb72bebd87",
         "SysrootDir": "debian_jessie_mips-sysroot",
         "Tarball": "debian_jessie_mips_sysroot.tgz"
     },
     "precise_amd64": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "86f4578a28f4049949dec824f081b0dd776beafb",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "42223d9e127dda8d1512160ee96de312ec533556",
         "SysrootDir": "ubuntu_precise_amd64-sysroot",
         "Tarball": "ubuntu_precise_amd64_sysroot.tgz"
     },
     "trusty_arm": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "44615cabcdc8061096f3e8892517d7f1da4d5439",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "418e471ed3a90ad731ef4c1e7a1ef76518a0f8ac",
         "SysrootDir": "ubuntu_trusty_arm-sysroot",
         "Tarball": "ubuntu_trusty_arm_sysroot.tgz"
     },
     "wheezy_amd64": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "f25a96cdd95baeedd470fe5b61639e02caee7df2",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "762e8a060f3c3f9e14f76db5ce982a232b55bcbd",
         "SysrootDir": "debian_wheezy_amd64-sysroot",
         "Tarball": "debian_wheezy_amd64_sysroot.tgz"
     },
     "wheezy_arm": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "0267c346d409155f7e085b0432c955fd69d5c692",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "2d356d060bf5017cc29d10bef4e09e4e9f65b0f0",
         "SysrootDir": "debian_wheezy_arm-sysroot",
         "Tarball": "debian_wheezy_arm_sysroot.tgz"
     },
     "wheezy_i386": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "c64a3fc44eb8628dd7d447c7cbb35f7714a07b78",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "9db92d45167d1b1cc78a338f49a84929ee3b1928",
         "SysrootDir": "debian_wheezy_i386-sysroot",
         "Tarball": "debian_wheezy_i386_sysroot.tgz"
     },
     "wheezy_mips": {
-        "Revision": "e387991beaf20018ff8b166ce5160d07bb77ca45",
-        "Sha1Sum": "405caee71abce5393aaffd4ceeb6bc3f5bae26b8",
+        "Revision": "165d7c5a152048a7ca8f55c44e0c2efae90d93dd",
+        "Sha1Sum": "1ed22cdb5b560e8c1581ab2c2b4593b4bcb620f3",
         "SysrootDir": "debian_wheezy_mips-sysroot",
         "Tarball": "debian_wheezy_mips_sysroot.tgz"
     }