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.

Sign up for GitHub

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

Move and rename repos, upgrade to Catalyst 4, support SDK on arm64 #2093

Closed
wants to merge 6 commits into from
Closed

Move and rename repos, upgrade to Catalyst 4, support SDK on arm64 #2093

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d08fcef
Move and rename repos, upgrade to Catalyst 4, support SDK on arm64
chewi May 20, 2024
9539132
Drop Python path override hack in profile.bashrc
chewi Jun 28, 2024
a3015b1
Don't use repo snapshots for stage1 by updating seed the new way
chewi Jul 5, 2024
1a1c4df
Skip Catalyst stage2 as recommended by upstream Gentoo
chewi Jul 5, 2024
1033aa0
Stop trying to create lib->lib64 symlink
chewi Jul 5, 2024
a344b7e
Stop creating /usr/lib64/os-release compatibility symlink
chewi Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions repos/flatcar-overlay/profiles/coreos/base/profile.bashrc
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

Reading this it is not obvious to someone why this is no longer needed and how it breaks something. Which "modules" are installed in /usr/lib64? Why hasn't this been needed for a while? Error messages?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do want the cross-compilation to stay, but I wasn't aware that it relied on QEMU like this. We'd have to find a different way of doing it. I've been brewing up an eclass to help with cases like this, so that's one option.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Regarding the Python modules: The hack is not needed now because the way Gentoo handles Python modules has totally changed since this was written. This was largely driven by PEP 517, which made it much easier for Gentoo to cross-compile Python modules. The util-linux package installs the libmount module. It's only now needed because of Catalyst 4. We previously disabled the python USE flag.

Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,6 @@ cros_setup_hooks() {
}
cros_setup_hooks

# Packages that use python will run a small python script to find the
# pythondir. Unfortunately, they query the host python to find out the
# paths for things, which means they inevitably guess wrong. Export
# the cached values ourselves and since we know these are going through
# autoconf, we can leverage ${libdir} that econf sets up automatically.
cros_pre_src_unpack_python_multilib_setup() {
# Avoid executing multiple times in a single build.
[[ ${am_cv_python_version:+set} == "set" ]] && return

local py=${PYTHON:-python}
local py_ver=$(${py} -c 'import sys;sys.stdout.write(sys.version[:4])')

export am_cv_python_version=${py_ver}
export am_cv_python_pythondir="\${libdir}/python${py_ver}/site-packages"
export am_cv_python_pyexecdir=${am_cv_python_pythondir}
}

# Since we're storing the wrappers in a board sysroot, make sure that
# is actually in our PATH.
cros_pre_pkg_setup_sysroot_build_bin_dir() {
Expand Down