functions: cleanup: use 'do_copy_overlays()' instead of multiple long commands

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I5749f9b8ed9c29c69928e04153b9c27d265f7b3f
This commit is contained in:
Dongjin Kim
2022-05-31 14:19:54 +09:00
parent 41cd09df44
commit 045638a5db

View File

@@ -451,17 +451,18 @@ get_install_fixups() {
echo `ls -A1 ${rootfs_mnt}${fixups_dir}/S* | sort`
}
do_copy_overlays() {
[ -d ${1} ] && rsync -a ${1}/* ${rootfs_mnt}/overlay/
}
do_run_fixups() {
mkdir -p ${rootfs_mnt}/overlay
[ -d ${TOPDIR}/overlay ] && rsync -a ${TOPDIR}/overlay/* ${rootfs_mnt}/overlay/
[ -d ${WORKDIR}/overlay ] && rsync -a ${WORKDIR}/overlay/* ${rootfs_mnt}/overlay/
[ -d ${TOPDIR}/distro/${DISTRO}/common/overlay ] \
&& rsync -a ${TOPDIR}/distro/${DISTRO}/common/overlay/* ${rootfs_mnt}/overlay
[ -d ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/overlay ] \
&& rsync -a ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/overlay/* ${rootfs_mnt}/overlay
[ -d ${TOPDIR}/custom/${CUSTOMOS}/overlay ] \
&& rsync -a ${TOPDIR}/custom/${CUSTOMOS}/overlay/* ${rootfs_mnt}/overlay/
do_copy_overlays ${TOPDIR}/overlay
do_copy_overlays ${WORKDIR}/overlay
do_copy_overlays ${TOPDIR}/distro/${DISTRO}/common/overlay
do_copy_overlays ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/overlay
do_copy_overlays ${TOPDIR}/custom/${CUSTOMOS}/overlay
for fixup in $(get_install_fixups); do
chroot ${rootfs_mnt} ${QEMU_BINARY} \