mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 05:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_package: fix loop between two loop breaking steps

Browse Source 
If util-linux has a binary package it will be used, but if that binary
package has +udev it will pull in systemd. systemd has a loop that needs
to be broken too so if the util-linux loop breaker doesn't also handle
the systemd one it all falls apart.

In short the comment above the loop breaker code noting that we can try
this until it gets wonky. Well, it is wonky and we need to re-do how
build_packages works as a result. This is just a temporary workaround
until we figure out a larger restructuring.
This commit is contained in:
Michael Marineau 2014-07-22 14:49:52 -07:00
parent aac815e449
commit a518dc8df1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_packages
View File

@ -174,6 +174,7 @@ fi
break_dep_loop() { break_dep_loop() {
local pkg="$1" local pkg="$1"
local flag="$2" local flag="$2"
shift 2
local flag_file="${BOARD_ROOT}/etc/portage/package.use/break_dep_loop" local flag_file="${BOARD_ROOT}/etc/portage/package.use/break_dep_loop"
# Be sure to clean up use flag hackery from previous failed runs # Be sure to clean up use flag hackery from previous failed runs
@ -194,6 +195,13 @@ break_dep_loop() {
info "Merging ${pkg} wtih USE=-${flag}" info "Merging ${pkg} wtih USE=-${flag}"
sudo mkdir -p "${flag_file%/*}" sudo mkdir -p "${flag_file%/*}"
sudo_clobber "${flag_file}" <<<"${pkg} -${flag}" sudo_clobber "${flag_file}" <<<"${pkg} -${flag}"
# Disable any other problematic flags
extra_args=""
while [[ $# -gt 0 ]]; do
sudo_append "${flag_file}" <<<"$1 -$2"
extra_args+=" --buildpkg-exclude=$1 --useoldpkg-atoms=$1"
shift 2
done
# rebuild-if-unbuilt is disabled to prevent portage from needlessly # rebuild-if-unbuilt is disabled to prevent portage from needlessly
# rebuilding zlib for some unknown reason, in turn triggering more rebuilds. # rebuilding zlib for some unknown reason, in turn triggering more rebuilds.
sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" \ sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" \
@ -201,12 +209,12 @@ break_dep_loop() {
--binpkg-respect-use=n \ --binpkg-respect-use=n \
--buildpkg-exclude="${pkg}" \ --buildpkg-exclude="${pkg}" \
--useoldpkg-atoms="${pkg}" \ --useoldpkg-atoms="${pkg}" \
"${pkg}" ${extra_args} "${pkg}"
sudo rm -f "${flag_file}" sudo rm -f "${flag_file}"
} }
# util-linux[udev] -> virtual->udev -> systemd -> util-linux # util-linux[udev] -> virtual->udev -> systemd -> util-linux
break_dep_loop sys-apps/util-linux udev break_dep_loop sys-apps/util-linux udev sys-apps/systemd cryptsetup
# systemd[cryptsetup] -> cryptsetup -> lvm2 -> virtual/udev -> systemd # systemd[cryptsetup] -> cryptsetup -> lvm2 -> virtual/udev -> systemd
break_dep_loop sys-apps/systemd cryptsetup break_dep_loop sys-apps/systemd cryptsetup