[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#728030: live-build's binary_syslinux step refers to and old binary in librsvg2-bin



Package: live-build
Version: 4.0~alpha27-1

This script is using old 'librsvg2-bin' binary path which was '/usr/bin/rsvg'. Nowadays is '/usr/bin/rsvg-convert'.

In addition, 'rsvg' syntax must be changed, we need to add '-o' before the output png filename.

I do attach a patch fixing the problem.
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 7e97ff7..8e20ff7 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -105,7 +105,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 
 		if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
 		then
-			Check_package chroot/usr/bin/rsvg-convert librsvg2-bin
+			Check_package chroot/usr/bin/rsvg librsvg2-bin
 		fi
 		;;
 
@@ -126,10 +126,10 @@ case "${LB_BUILD_WITH_CHROOT}" in
 
 		if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
 		then
-			if [ ! -e /usr/bin/rsvg-convert ]
+			if [ ! -e /usr/bin/rsvg ]
 			then
 				# librsvg2-bin
-				Echo_error "/usr/bin/rsvg-convert - no such file"
+				Echo_error "/usr/bin/rsvg - no such file"
 				exit 1
 			fi
 		fi
@@ -273,13 +273,13 @@ then
 	case "${LB_BUILD_WITH_CHROOT}" in
 		true)
 			cp "${_TARGET}/splash.svg" chroot
-			Chroot chroot "rsvg-convert --format png --height 480 --width 640 splash.svg -o splash.png"
+			Chroot chroot "rsvg --format png --height 480 --width 640 splash.svg splash.png"
 			mv chroot/splash.png "${_TARGET}"
 			rm -f chroot/splash.svg
 			;;
 
 		false)
-			rsvg-convert --format png --height 480 --width 640 "${_TARGET}/splash.svg" -o "${_TARGET}/splash.png"
+			rsvg --format png --height 480 --width 640 "${_TARGET}/splash.svg" "${_TARGET}/splash.png"
 			;;
 	esac
 

Reply to: