mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-10 13:11:34 +01:00
build_sysext: run package inventorisation before mangle script
Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
This commit is contained in:
parent
65bf2bfd0c
commit
f81bbebddf
@ -227,6 +227,10 @@ if [[ "$FLAGS_generate_pkginfo" = "${FLAGS_TRUE}" ]] ; then
|
|||||||
-noappend -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
|
-noappend -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
info "Writing ${SYSEXTNAME}_packages.txt"
|
||||||
|
ROOT="${BUILD_DIR}/install-root" PORTAGE_CONFIGROOT="${BUILD_DIR}/install-root" \
|
||||||
|
equery --no-color list --format '$cpv::$repo' '*' > "${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
|
||||||
|
|
||||||
if [[ -n "${FLAGS_manglefs_script}" ]]; then
|
if [[ -n "${FLAGS_manglefs_script}" ]]; then
|
||||||
if [[ ! -x "${FLAGS_manglefs_script}" ]]; then
|
if [[ ! -x "${FLAGS_manglefs_script}" ]]; then
|
||||||
die "${FLAGS_manglefs_script} is not executable"
|
die "${FLAGS_manglefs_script} is not executable"
|
||||||
@ -234,10 +238,6 @@ if [[ -n "${FLAGS_manglefs_script}" ]]; then
|
|||||||
"${FLAGS_manglefs_script}" "${BUILD_DIR}/install-root"
|
"${FLAGS_manglefs_script}" "${BUILD_DIR}/install-root"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
info "Writing ${SYSEXTNAME}_packages.txt"
|
|
||||||
ROOT="${BUILD_DIR}/install-root" PORTAGE_CONFIGROOT="${BUILD_DIR}/install-root"\
|
|
||||||
equery --no-color list --format '$cpv::$repo' '*' > "${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
|
|
||||||
|
|
||||||
info "Removing non-/usr directories from sysext image"
|
info "Removing non-/usr directories from sysext image"
|
||||||
for entry in "${BUILD_DIR}/install-root"/*; do
|
for entry in "${BUILD_DIR}/install-root"/*; do
|
||||||
if [[ "${entry}" = */usr ]]; then
|
if [[ "${entry}" = */usr ]]; then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user