patch for binary_tar and initrd compression
Hello
This is a patch for the binary_tar bug (reported by punky earlier) and for a bug with initramfs custom compression in live-build 4.0.3. You may apply them in /usr/lib/live/build/.
Regards
Axel
--- chroot_hacks.orig 2014-11-19 10:05:10.288667885 +0100
+++ chroot_hacks 2014-11-19 10:14:15.396693007 +0100
@@ -84,11 +84,16 @@
# way.
case "${LB_INITRAMFS_COMPRESSION}" in
gzip)
+ for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
+ gzip -c ${GZIP_OPTIONS} "${INITRAMFS}" > "${INITRAMFS}.new"
+ mv "${INITRAMFS}.new" "${INITRAMFS}"
+ echo "$(sha1sum ${INITRAMFS} | awk '{ print $1 }') /boot/$(basename ${INITRAMFS})" > chroot/var/lib/initramfs-tools/$(basename ${INITRAMFS} | sed -e 's|initrd.img-||')
+ done
;;
bzip2)
for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
- zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new"
+ bzip2 -c ${BZIP2_OPTIONS} "${INITRAMFS}" > "${INITRAMFS}.new"
mv "${INITRAMFS}.new" "${INITRAMFS}"
echo "$(sha1sum ${INITRAMFS} | awk '{ print $1 }') /boot/$(basename ${INITRAMFS})" > chroot/var/lib/initramfs-tools/$(basename ${INITRAMFS} | sed -e 's|initrd.img-||')
done
@@ -96,7 +101,7 @@
lzma)
for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
- zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new"
+ lzma -c ${LZMA_OPTIONS} "${INITRAMFS}" > "${INITRAMFS}.new"
mv "${INITRAMFS}.new" "${INITRAMFS}"
echo "$(sha1sum ${INITRAMFS} | awk '{ print $1 }') /boot/$(basename ${INITRAMFS})" > chroot/var/lib/initramfs-tools/$(basename ${INITRAMFS} | sed -e 's|initrd.img-||')
done
--- binary_tar.orig 2014-11-18 10:40:53.280124451 +0100
+++ binary_tar 2014-11-18 10:39:22.252125401 +0100
@@ -46,22 +46,22 @@
# Remove old binary
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}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.
+tar cf ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar binary
case "${LB_COMPRESSION}" in
bzip2)
- bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
+ bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar
;;
gzip)
- gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
+ gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar
;;
lzip)
- lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
+ lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar
;;
xz)
- xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar
+ xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar
;;
none)
Reply to: