mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 22:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_image_util: fix generation of packages.txt

Browse Source 
The passing ROOT= as an environment variable to board wrapper scripts
doesn't work, the script unconditionally overrides it. This means so far
our packages.txt files have listed the contents of /build/amd64-usr
instead of the image. Fix this by calling equery directly instead.
This commit is contained in:
Michael Marineau 2014-09-04 15:06:28 -07:00
parent 3e4c29957c
commit 9580ea4086
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_library/build_image_util.sh
View File

@ -147,9 +147,8 @@ write_contents() {
write_packages() { write_packages() {
local profile="${BUILD_DIR}/configroot/etc/portage/profile" local profile="${BUILD_DIR}/configroot/etc/portage/profile"
info "Writing ${2##*/}" info "Writing ${2##*/}"
ROOT="$1" equery-$BOARD --no-color \ ROOT="$1" PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \
list '*' --format '$cpv::$repo' \ equery --no-color list '*' --format '$cpv::$repo' > "$2"
> "$2"
if [[ -f "${profile}/package.provided" ]]; then if [[ -f "${profile}/package.provided" ]]; then
cat "${profile}/package.provided" >> "$2" cat "${profile}/package.provided" >> "$2"
fi fi