build/rename: add support for image types, clean up clean

This commit is contained in:
Franco Fichtner 2017-04-24 06:43:10 +02:00
parent a0cfbdd627
commit 2a509bae72
2 changed files with 35 additions and 8 deletions

View File

@ -37,10 +37,6 @@ for ARG in ${@}; do
echo ">>> Removing base set"
rm -f ${SETSDIR}/base-*-${PRODUCT_ARCH}.*
;;
dvd)
echo ">>> Removing dvd image"
rm -f ${IMAGESDIR}/*-dvd-${PRODUCT_ARCH}.*
;;
core)
echo ">>> Removing core from packages set"
setup_stage ${STAGEDIR}
@ -53,6 +49,10 @@ for ARG in ${@}; do
echo ">>> Removing distfiles set"
rm -f ${SETSDIR}/distfiles-*.tar
;;
dvd)
echo ">>> Removing dvd image"
rm -f ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-dvd-${PRODUCT_ARCH}.iso
;;
images)
setup_stage ${IMAGESDIR}
;;
@ -62,7 +62,7 @@ for ARG in ${@}; do
;;
nano)
echo ">>> Removing nano image"
rm -f ${IMAGESDIR}/*-nano-${PRODUCT_ARCH}.*
rm -f ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-nano-${PRODUCT_ARCH}.img
;;
obj)
if [ -d ${STAGEDIRPREFIX}${TOOLSDIR} ]; then
@ -94,7 +94,7 @@ for ARG in ${@}; do
;;
serial)
echo ">>> Removing serial image"
rm -f ${IMAGESDIR}/*-serial-${PRODUCT_ARCH}.*
rm -f ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-serial-${PRODUCT_ARCH}.img
;;
sets)
setup_stage ${SETSDIR}
@ -107,11 +107,11 @@ for ARG in ${@}; do
;;
vga)
echo ">>> Removing vga image"
rm -f ${IMAGESDIR}/*-vga-${PRODUCT_ARCH}.*
rm -f ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-vga-${PRODUCT_ARCH}.img
;;
vm)
echo ">>> Removing vm image"
rm -f ${IMAGESDIR}/*-vm-${PRODUCT_ARCH}.*
rm -f ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-vm-${PRODUCT_ARCH}.*
;;
xtools)
echo ">>> Removing xtools set"

View File

@ -54,6 +54,11 @@ for ARG in ${@}; do
mv ${SETSDIR}/distfiles-*.tar \
${SETSDIR}/distfiles-${VERSION}.tar
;;
dvd)
echo ">>> Renaming dvd image: ${VERSION}"
mv ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-dvd-${PRODUCT_ARCH}.iso \
${IMAGESDIR}/${PRODUCT_NAME}-${VERSION}-${PRODUCT_FLAVOUR}-dvd-${PRODUCT_ARCH}.iso
;;
kernel)
setup_stage ${STAGEDIR}
echo ">>> Repacking kernel set..."
@ -70,6 +75,11 @@ for ARG in ${@}; do
mv ${FILE} ${SETSDIR}/kernel-${VERSION}-${FILE##*-}
done
;;
nano)
echo ">>> Renaming nano image: ${VERSION}"
mv ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-nano-${PRODUCT_ARCH}.img \
${IMAGESDIR}/${PRODUCT_NAME}-${VERSION}-${PRODUCT_FLAVOUR}-nano-${PRODUCT_ARCH}.img
;;
packages)
echo ">>> Renaming packages set: ${VERSION}"
for FILE in $(find ${SETSDIR} -name \
@ -77,5 +87,22 @@ for ARG in ${@}; do
mv ${FILE} ${SETSDIR}/packages-${VERSION}-${PRODUCT_FLAVOUR}-${FILE##*-}
done
;;
serial)
echo ">>> Renaming serial image: ${VERSION}"
mv ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-serial-${PRODUCT_ARCH}.img \
${IMAGESDIR}/${PRODUCT_NAME}-${VERSION}-${PRODUCT_FLAVOUR}-serial-${PRODUCT_ARCH}.img
;;
vga)
echo ">>> Renaming vga image: ${VERSION}"
mv ${IMAGESDIR}/*-${PRODUCT_FLAVOUR}-vga-${PRODUCT_ARCH}.img \
${IMAGESDIR}/${PRODUCT_NAME}-${VERSION}-${PRODUCT_FLAVOUR}-vga-${PRODUCT_ARCH}.img
;;
vm)
echo ">>> Renaming vm set: ${VERSION}"
for FILE in $(find ${SETSDIR} -name \
"*-${PRODUCT_FLAVOUR}-vm-${PRODUCT_ARCH}.*"); do
mv ${FILE} ${SETSDIR}/${PRODUCT_NAME}-${VERSION}-${PRODUCT_FLAVOUR}-vm-${FILE##*-}
done
;;
esac
done