Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update arm libs #347

Merged
merged 1 commit into from May 4, 2016
Merged

Update arm libs #347

merged 1 commit into from May 4, 2016

Conversation

@dati91
Copy link
Contributor

dati91 commented Apr 29, 2016

This should fix the servo/servo#10632 arm build errors.


This change is Reviewable

@dati91
Copy link
Contributor Author

dati91 commented Apr 29, 2016

@aneeshusa
Copy link
Member

aneeshusa commented Apr 29, 2016

This change wouldn't do anything; the list of packages you added libdbus-glib-1-dev to in the previous PR is installed on all of our builders, and this list is for additional packages that we need on the cross builders. This will require a little more investigation...

@aneeshusa
Copy link
Member

aneeshusa commented Apr 29, 2016

I think trying to install the armhf and arm64 versions in this file should work, so that they get picked up by pkg-config.

@dati91
Copy link
Contributor Author

dati91 commented Apr 30, 2016

@aneeshusa You are right, my current approach won't solve the problem. :(

It seems to me that this sysroot needs to be updated with the libdbus-1-dev library (not necessary with libdbus-glib-1-dev because we only use this because the other one isn't whitelisted on travis).

And we should do the same for the aarch64 rootfs as well.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 30, 2016

Yup, that sounds right! If you could please regenerate those two tarballs, I can work with @aneeshusa to upload them to s3 and use the versioned directory structures to roll it out and make them available.

@aneeshusa
Copy link
Member

aneeshusa commented Apr 30, 2016

@larsbergstrom Could you point to some instructions on how those tarballs are generated, or better yet a repo with the scripts? I think it would be valuable to link to that information from this repo for reproducibility (and I'm curious about how it's done!).

@mmatyas
Copy link

mmatyas commented May 2, 2016

Hi, I've regenerated the lib packages, you can find them here, with the _dbus suffix. It's based on this guide.

@aneeshusa
Copy link
Member

aneeshusa commented May 2, 2016

Thanks @mmatyas! I filed #352 about scripting that process.

@dati91, we'll need to wait for @larsbergstrom to upload the new tarballs to S3, but in the meantime can you update this PR to point our ARM builders to the new tarballs? Should be as easy as updating the version and sha512 fields in this file.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 2, 2016

I've made them available at the v2 directory, so updating the version number when updating the sha512 should work almost immediately. I kept the existing names for the files (omitting the _dbus suffix) when uploading them.

@aneeshusa
Copy link
Member

aneeshusa commented May 3, 2016

@larsbergstrom I checked S3 and you put the tarballs in the wrong place - can you please upload the new tarballs to https://servo-rust.s3.amazonaws.com/ARM/armhf-trusty-libs/v2/armhf-trusty-libs-v2.tgz and https://servo-rust.s3.amazonaws.com/ARM/arm64-trusty-libs/v2/arm64-trusty-libs-v2.tgz instead? This is where the state files are expecting to find them.

@dati91 dati91 force-pushed the dati91:add_dbus_arm branch from 4818e9a to 5303ab8 May 3, 2016
@dati91 dati91 changed the title Add libdbus-glib-1-dev to the list of servo arm dependencies Update arm libs May 3, 2016
@@ -36,7 +36,7 @@ arm-dependencies:
libs-{{ target.name }}:
archive.extracted:
- name: {{ common.servo_home }}/rootfs-trusty-{{ target.name }}/{{ target.version }}
- source: https://servo-rust.s3.amazonaws.com/ARM/{{ target.download_name }}/{{ target.version }}/{{ target.download_name }}-{{ target.version }}.tgz
- source: https://servo-rust.s3.amazonaws.com/ARM/{{ target.version }}/{{ target.download_name }}.tgz

This comment has been minimized.

@aneeshusa

aneeshusa May 3, 2016

Member

Please keep this URL the way it is - it's more verbose but it's more robust:

  • Can update arm32 and arm64 independently
  • If you download a bunch of tarballs from S3 , they'll have different names and will happily coexist on your filesystem

This comment has been minimized.

@dati91

dati91 May 3, 2016

Author Contributor

But currently the v2 lib can only be found on that specific url (and the others as well).

This comment has been minimized.

@larsbergstrom

larsbergstrom May 3, 2016

Contributor

I think I put them there now:

[larsberg@lbergstrom ~]$ s3cmd cp s3://servo-rust/ARM/v2/armhf* s3://servo-rust/ARM/armhf-trusty-libs/v2/
remote copy: 's3://servo-rust/ARM/v2/armhf-trusty-libs.tgz' -> 's3://servo-rust/ARM/armhf-trusty-libs/v2/armhf-trusty-libs.tgz'
[larsberg@lbergstrom ~]$ s3cmd cp s3://servo-rust/ARM/v2/arm64* s3://servo-rust/ARM/arm64-trusty-libs/v2/
remote copy: 's3://servo-rust/ARM/v2/arm64-trusty-libs.tgz' -> 's3://servo-rust/ARM/arm64-trusty-libs/v2/arm64-trusty-libs.tgz'
[larsberg@lbergstrom ~]$ 

This comment has been minimized.

@dati91

dati91 May 3, 2016

Author Contributor

if you want the original link, you still missing the *-{{target.version}}.tgz from the end

This comment has been minimized.

@larsbergstrom

larsbergstrom May 3, 2016

Contributor

Ugh, I'll try a third time later tonight.

On May 3, 2016, at 4:58 PM, Attila Dusnoki notifications@github.com wrote:

In servo-build-dependencies/arm.sls
#347 (comment):

@@ -36,7 +36,7 @@ arm-dependencies:
libs-{{ target.name }}:
archive.extracted:
- name: {{ common.servo_home }}/rootfs-trusty-{{ target.name }}/{{ target.version }}

if you want the original link, you still missing the
*-{{target.version}}.tgz from the end


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
https://github.com/servo/saltfs/pull/347/files/5303ab87b1e2bcb61ae42f3e27329ee677dd39d3#r61963556

@dati91 dati91 force-pushed the dati91:add_dbus_arm branch from 5303ab8 to d385ff2 May 3, 2016
@aneeshusa
Copy link
Member

aneeshusa commented May 4, 2016

The tarballs should be uploaded to the right place now, but I'd like to check this out in Vagrant before approving to make sure the upgrade will work smoothly.

@aneeshusa
Copy link
Member

aneeshusa commented May 4, 2016

Everything looked good in Vagrant, thanks for the PR.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented May 4, 2016

📌 Commit d385ff2 has been approved by aneeshusa

@bors-servo
Copy link
Contributor

bors-servo commented May 4, 2016

Testing commit d385ff2 with merge 093e804...

bors-servo added a commit that referenced this pull request May 4, 2016
Update arm libs

This should fix the servo/servo#10632 arm build errors.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/347)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 4, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit d385ff2 into servo:master May 4, 2016
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.