diff options
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/binary_checksums | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_hdd | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_iso | 4 | ||||
| -rwxr-xr-x | scripts/build/binary_manifest | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_netboot | 12 | ||||
| -rwxr-xr-x | scripts/build/binary_tar | 12 | ||||
| -rwxr-xr-x | scripts/build/binary_zsync | 10 |
7 files changed, 22 insertions, 22 deletions
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums index af69add68..17fce0a42 100755 --- a/scripts/build/binary_checksums +++ b/scripts/build/binary_checksums @@ -80,7 +80,7 @@ done # File list cd binary -find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}.contents +find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.contents cd "${OLDPWD}" # Creating stage file diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index 3d429d22a..170bc62c2 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -294,7 +294,7 @@ then mv chroot/dev.tmp chroot/dev fi -mv chroot/binary.img ${LIVE_IMAGE_NAME} +mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE} # Saving cache Save_cache cache/packages.binary diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 3a63a574a..2c83a9bec 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -26,11 +26,11 @@ Set_defaults case "${LIVE_IMAGE_TYPE}" in iso) - IMAGE="${LIVE_IMAGE_NAME}.iso" + IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso" ;; iso-hybrid) - IMAGE="${LIVE_IMAGE_NAME}.hybrid.iso" + IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso" ;; *) diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest index c40f2c50d..701aefb5a 100755 --- a/scripts/build/binary_manifest +++ b/scripts/build/binary_manifest @@ -60,7 +60,7 @@ cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}" echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \ > "binary/${INITFS}/filesystem.${SUFFIX}-remove" -cp chroot.packages.live ${LIVE_IMAGE_NAME}.packages +cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.packages # Creating stage file Create_stagefile .build/binary_manifest diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot index a9b8e52e7..093586c53 100755 --- a/scripts/build/binary_netboot +++ b/scripts/build/binary_netboot @@ -119,7 +119,7 @@ then fi # Remove old binary -rm -f ${LIVE_IMAGE_NAME}.netboot.tar ${LIVE_IMAGE_NAME}.netboot.tar.gz ${LIVE_IMAGE_NAME}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}.netboot.tar.xz ${LIVE_IMAGE_NAME}.netboot.tar.xz +rm -f ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz # Creating image file ROOT_DIR=$(basename ${LB_NET_ROOT_PATH}) @@ -142,23 +142,23 @@ cd binary.tmp mkdir tftpboot/live mv */live/vmlinuz* */live/initrd* tftpboot/live -tar cf ../${LIVE_IMAGE_NAME}.netboot.tar * +tar cf ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar * case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar + bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ;; gzip) - gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar + gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ;; lzip) - lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar + lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ;; xz) - xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar + xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ;; none) diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar index e5523012d..150e15917 100755 --- a/scripts/build/binary_tar +++ b/scripts/build/binary_tar @@ -44,24 +44,24 @@ Check_lockfile .lock Create_lockfile .lock # Remove old binary -rm -f ${LIVE_IMAGE_NAME}.tar.bz2 ${LIVE_IMAGE_NAME}.tar.gz ${LIVE_IMAGE_NAME}.tar.lz ${LIVE_IMAGE_NAME}.tar +rm -f ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.bz2 ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.gz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.lz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar -tar cf ${LIVE_IMAGE_NAME}.tar.tar ${LIVE_IMAGE_NAME}. +tar cf ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}. case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar + bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ;; gzip) - gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar + gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ;; lzip) - lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar + lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ;; xz) - xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar + xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ;; none) diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync index aa5dcd5da..720362be3 100755 --- a/scripts/build/binary_zsync +++ b/scripts/build/binary_zsync @@ -59,23 +59,23 @@ Install_package case "${LIVE_IMAGE_TYPE}" in iso) - _IMAGES="${LIVE_IMAGE_NAME}.iso" + _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso" ;; iso-hybrid) - _IMAGES="${LIVE_IMAGE_NAME}.hybrid.iso" + _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso" ;; hdd) - _IMAGES="${LIVE_IMAGE_NAME}.img" + _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.img" ;; net) - _IMAGES="${LIVE_IMAGE_NAME}.netboot.tar*" + _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar*" ;; tar) - _IMAGES="${LIVE_IMAGE_NAME}.tar*" + _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar*" ;; esac |