manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Including architecture in binary output filenames.

This commit is contained in:
Daniel Baumann 2012-12-19 13:36:38 +01:00
parent fee335bed5
commit 87008965a1
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/binary_checksums
View File

@ -80,7 +80,7 @@ done
# File list # File list
cd binary 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}" cd "${OLDPWD}"
# Creating stage file # Creating stage file

2
scripts/build/binary_hdd
View File

@ -294,7 +294,7 @@ then
mv chroot/dev.tmp chroot/dev mv chroot/dev.tmp chroot/dev
fi fi
mv chroot/binary.img ${LIVE_IMAGE_NAME} mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}
# Saving cache # Saving cache
Save_cache cache/packages.binary Save_cache cache/packages.binary

4
scripts/build/binary_iso
View File

@ -26,11 +26,11 @@ Set_defaults
case "${LIVE_IMAGE_TYPE}" in case "${LIVE_IMAGE_TYPE}" in
iso) iso)
IMAGE="${LIVE_IMAGE_NAME}.iso" IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso"
;; ;;
iso-hybrid) iso-hybrid)
IMAGE="${LIVE_IMAGE_NAME}.hybrid.iso" IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso"
;; ;;
*) *)

2
scripts/build/binary_manifest
View File

@ -60,7 +60,7 @@ cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \ echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \
> "binary/${INITFS}/filesystem.${SUFFIX}-remove" > "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 # Creating stage file
Create_stagefile .build/binary_manifest Create_stagefile .build/binary_manifest

12
scripts/build/binary_netboot
View File

@ -119,7 +119,7 @@ then
fi fi
# Remove old binary # 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 # Creating image file
ROOT_DIR=$(basename ${LB_NET_ROOT_PATH}) ROOT_DIR=$(basename ${LB_NET_ROOT_PATH})
@ -142,23 +142,23 @@ cd binary.tmp
mkdir tftpboot/live mkdir tftpboot/live
mv */live/vmlinuz* */live/initrd* 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 case "${LB_COMPRESSION}" in
bzip2) bzip2)
bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
;; ;;
gzip) gzip)
gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
;; ;;
lzip) lzip)
lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
;; ;;
xz) xz)
xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}.netboot.tar xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
;; ;;
none) none)

12
scripts/build/binary_tar
View File

@ -44,24 +44,24 @@ Check_lockfile .lock
Create_lockfile .lock Create_lockfile .lock
# Remove old binary # 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 case "${LB_COMPRESSION}" in
bzip2) bzip2)
bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
;; ;;
gzip) gzip)
gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
;; ;;
lzip) lzip)
lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
;; ;;
xz) xz)
xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}.tar.tar xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
;; ;;
none) none)

10
scripts/build/binary_zsync
View File

@ -59,23 +59,23 @@ Install_package
case "${LIVE_IMAGE_TYPE}" in case "${LIVE_IMAGE_TYPE}" in
iso) iso)
_IMAGES="${LIVE_IMAGE_NAME}.iso" _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso"
;; ;;
iso-hybrid) iso-hybrid)
_IMAGES="${LIVE_IMAGE_NAME}.hybrid.iso" _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso"
;; ;;
hdd) hdd)
_IMAGES="${LIVE_IMAGE_NAME}.img" _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.img"
;; ;;
net) net)
_IMAGES="${LIVE_IMAGE_NAME}.netboot.tar*" _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar*"
;; ;;
tar) tar)
_IMAGES="${LIVE_IMAGE_NAME}.tar*" _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar*"
;; ;;
esac esac