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

Stop putting system.base at the front of the order #74

Merged
merged 3 commits into from
Jul 19, 2024
Merged

Stop putting system.base at the front of the order #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c1394d
Stop putting system.base at the front of the order
ermo Jun 29, 2024
155a829
venv: BRANCH variable can be used as an override
ermo Jun 29, 2024
515f101
build_chroot: Add --debug to eopkg calls
ermo Jun 29, 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
7 changes: 5 additions & 2 deletions build_chroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ basicSetup () {
local chroot="sudo systemd-nspawn --as-pid2 --quiet -D ${SOLROOT}" # better chroot essentially
#local chroot="sudo chroot ${SOLROOT}"
# necessary cruft for sudo to work with the eopkg_venv
local eopkg_py3="sudo -E env PATH=${PATH} eopkg.py3"
local eopkg_bin='eopkg.bin'
local eopkg_py3="sudo -E env PATH=${PATH} eopkg.py3 --debug"
local eopkg_bin='eopkg.bin --debug'
local mkdir='sudo mkdir -pv'

local eopkg_py3_path="$(command -v eopkg.py3)"
Expand Down Expand Up @@ -171,6 +171,9 @@ basicSetup () {
printInfo "${MSG}"
${eopkg_py3} remove-repo Solus -D "${SOLROOT}" || die "${MSG}"

MSG="Listing enabled repositories ..."
printInfo "${MSG}"
${eopkg_py3} list-repo -D "${SOLROOT}" || die "${MSG}"
#MSG="Installing baselayout ..."
#${eopkg_py3} install -y -D "${SOLROOT}" --ignore-safety --ignore-comar baselayout || die "${MSG}"

Expand Down
5 changes: 4 additions & 1 deletion eopkg_venv_functions.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ set -euo pipefail

source shared_functions.bash

# allow user to override branch name
EOPKG_BRANCH="${BRANCH:-main}"

function prepare_venv () {
if [[ -z "${PY3}" ]]; then
die "Couldn't find supported python3 (3.11 || 3.12 || 3.10) interpreter, exiting!"
Expand All @@ -15,7 +18,7 @@ function prepare_venv () {
# Assume the user starts in the eopkg dir
printInfo "Updating the eopkg git repo ..."
# ensure we show the current branch
git fetch && git checkout main && git pull && git branch
git fetch && git checkout "${EOPKG_BRANCH}" && git pull && git branch

printInfo "Set up a clean eopkg_venv venv ..."
${PY3} -m venv --system-site-packages --clear eopkg_venv
Expand Down
14 changes: 13 additions & 1 deletion pisi/operations/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import pisi.db


def reorder_base_packages(order):
def reorder_base_packages_old(order):
componentdb = pisi.db.componentdb.ComponentDB()

"""system.base packages must be first in order"""
Expand All @@ -34,6 +34,18 @@ def reorder_base_packages(order):
ctx.ui.info(_("install_order: %s" % install_order))
return install_order

def reorder_base_packages(order):
"""Dummy function that doesn't actually re-order system.base in front.

We now use OrderedSets, which keep the original topological sort,
so this shouldn't actually be necessary now.

This also implies that the only function of system.base is for the
packages in it to be un-removable.
"""
if len(order) > 1 and ctx.config.get_option("debug"):
ctx.ui.info(_("order: %s" % order))
return order

def check_conflicts(order, packagedb):
"""check if upgrading to the latest versions will cause havoc
Expand Down