Fix to use package install directories

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I31cd885620a0cdc37794e514dc6088a64e774ec7
This commit is contained in:
Dongjin Kim
2020-03-31 11:34:06 +09:00
parent 4b3807b53c
commit 0472009f75
2 changed files with 9 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
boot_mnt=${TOPDIR}/boot
rootfs_mnt=${TOPDIR}/rootfs
boot_mnt=${WORKDIR}/boot
rootfs_mnt=${WORKDIR}/rootfs
fixups_dir=/host/fixups
do_unmount() {
@@ -176,7 +176,7 @@ do_preinstall() {
echo "I: running preinstall scripts and copy default files..."
mkdir -p ${rootfs_mnt}${fixups_dir}
cp -a fixups/* ${rootfs_mnt}${fixups_dir}
cp -a ${TOPDIR}/fixups/* ${rootfs_mnt}${fixups_dir}
FIXUPS=`ls -A1 ${rootfs_mnt}${fixups_dir}/*`
for fixup in ${FIXUPS}; do
@@ -204,8 +204,8 @@ do_preinstall() {
cp ${QEMU_BINARY} ${rootfs_mnt}/${QEMU_BINARY} || panic "error"
fi
cp -a overlay/root/firstboot.sh ${rootfs_mnt}/root/
cp -a overlay/boot/boot-logo.bmp.gz ${rootfs_mnt}/boot/
cp -a ${TOPDIR}/overlay/root/firstboot.sh ${rootfs_mnt}/root/
cp -a ${TOPDIR}/overlay/boot/boot-logo.bmp.gz ${rootfs_mnt}/boot/
}
do_postinstall() {
@@ -214,7 +214,6 @@ do_postinstall() {
rm -f ${rootfs_mnt}/${QEMU_BINARY}
fi
rm -rf ${rootfs_mnt}${fixups_dir}
rm -f /etc/flash-kernel/machine
}
do_cleanup() {

View File

@@ -4,13 +4,13 @@
ODROID_STAMPER_DIR="/usr/share/odroid-stamper"
#TOPDIR=${ODROID_STAMPER_CHECKOUT:-${ODROID_STAMPER_DIR}}
TOPDIR=$PWD
TOPDIR=${ODROID_STAMPER_CHECKOUT:-${ODROID_STAMPER_DIR}}
WORKDIR=$PWD
DEFAULT_CONFIG=${TOPDIR}/.config
DEFAULT_CONFIG=${WORKDIR}/.config
download_dir="/var/cache/odroid-stamper/downloads"
out_dir=${PWD}
out_dir=${WORKDIR}
. ${TOPDIR}/menu
. ${TOPDIR}/default