Skip to content

Commit f81bbeb

Browse files
committed
build_sysext: run package inventorisation before mangle script
Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
1 parent 65bf2bf commit f81bbeb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

build_sysext

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,17 @@ if [[ "$FLAGS_generate_pkginfo" = "${FLAGS_TRUE}" ]] ; then
227227
-noappend -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
228228
fi
229229

230+
info "Writing ${SYSEXTNAME}_packages.txt"
231+
ROOT="${BUILD_DIR}/install-root" PORTAGE_CONFIGROOT="${BUILD_DIR}/install-root" \
232+
equery --no-color list --format '$cpv::$repo' '*' > "${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
233+
230234
if [[ -n "${FLAGS_manglefs_script}" ]]; then
231235
if [[ ! -x "${FLAGS_manglefs_script}" ]]; then
232236
die "${FLAGS_manglefs_script} is not executable"
233237
fi
234238
"${FLAGS_manglefs_script}" "${BUILD_DIR}/install-root"
235239
fi
236240

237-
info "Writing ${SYSEXTNAME}_packages.txt"
238-
ROOT="${BUILD_DIR}/install-root" PORTAGE_CONFIGROOT="${BUILD_DIR}/install-root"\
239-
equery --no-color list --format '$cpv::$repo' '*' > "${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
240-
241241
info "Removing non-/usr directories from sysext image"
242242
for entry in "${BUILD_DIR}/install-root"/*; do
243243
if [[ "${entry}" = */usr ]]; then

0 commit comments

Comments
 (0)