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

Improve Ubuntu/Debian container configs, add Ubuntu 20.04 and update buildtools #43

Merged
merged 9 commits into from
Jun 15, 2020

Conversation

pbrkr
Copy link
Member

@pbrkr pbrkr commented May 4, 2020

  • Improve the Debian & Ubuntu container configs to resolve issues seen with my use cases.
  • Add a Dockerfile for Ubuntu 20.04
  • Updated to buildtools-extended tarball from Yocto 3.1 for Centos 7 & Ubuntu 16.04.

@pbrkr
Copy link
Member Author

pbrkr commented May 19, 2020

@rewitt1: Ping.

@rewitt1
Copy link
Contributor

rewitt1 commented May 19, 2020

@pbrkr Sorry this has been sitting for so long. I was on leave. I'll review it today.

Copy link
Contributor

@rewitt1 rewitt1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disregard, previous comment, should have been attached to corresponding change.

pbrkr added 6 commits May 24, 2020 09:51
Running apt-get in noninteractive mode ensures we will never be asked
any configuration questions when installing packages.

Signed-off-by: Paul Barker <[email protected]>
This allows 32-bit host tools and setup programs written in C++ to be
used on 64-bit host systems during the build.

Signed-off-by: Paul Barker <[email protected]>
Ubuntu defaults to using dash to provide /bin/sh. This is a lightweight
shell which doesn't handle some of the bashisms present in many Yocto
recipes from third-party layers, leading to weird and hard to debug
build failures when it is used.

Signed-off-by: Paul Barker <[email protected]>
Based on the existing Dockerfile for Ubuntu 18.04. Copyright year
updated as requested by Intel.

Signed-off-by: Paul Barker <[email protected]>
Python sets do not have a guaranteed sort order so the order of elements
in `intersection` may not match the order of elements in
`extraconflines`. To prevent random test failures the lists should be
sorted before comparison.

Signed-off-by: Paul Barker <[email protected]>
@pbrkr
Copy link
Member Author

pbrkr commented May 24, 2020

@rewitt1: The build is failing due to exactly the issue captured in #44. It looks like Yocto master branch no longer builds on Ubuntu 16.04 without using buildtools.

pbrkr added 3 commits May 24, 2020 10:42
By switching to buildtools-extended we no longer need to separately
install a newer gcc version in Centos 7.

Also switch to using sha256sum to validate the download instead of the
obsolete md5sum.

Signed-off-by: Paul Barker <[email protected]>
The new requirement for gcc 6.0 or later isn't met by Ubuntu 16.04.

The distro-entry script is also modified to enable buildtools whenever
they have been installed.

Signed-off-by: Paul Barker <[email protected]>
@pbrkr pbrkr changed the title Improve Ubuntu container configs and add Ubuntu 20.04 Improve Ubuntu/Debian container configs, add Ubuntu 20.04 and update buildtools May 24, 2020
@pbrkr
Copy link
Member Author

pbrkr commented May 24, 2020

@rewitt1: All green now, sorry for the noise there.

Copy link
Contributor

@rewitt1 rewitt1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you happen to have changes queued for distro-entry.sh in the https://github.com/crops/poky-container repo?

I wanted to check before I decided to that myself after merging these changes.

COPY install-buildtools.sh /
RUN bash /install-buildtools.sh && \
rm /install-buildtools.sh

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @pbrkr,

The commit message has

The distro-entry script is also modified to enable buildtools whenever
they have been installed.

That looks to be part of the next patch, but I wanted to clarify and be sure I'm not missing part of this patch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That may have got mixed up, I rebased the patches a few times.

Sorry for the late reply, gmail must have dropped the notification email for your comment there.

@rewitt1 rewitt1 merged commit 7f45b6a into crops:master Jun 15, 2020
@pbrkr
Copy link
Member Author

pbrkr commented Jun 15, 2020

@rewitt1: Sorry, looks like gmail dropped the notification email for your comments 12 days ago so I never replied.

poky-container will need updating now to include an Ubuntu 20.04 image and to enable buildtools if it's installed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants