summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-10-28 08:31:02 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-10-28 08:31:02 +0100
commitd83a3d3c302c50c6958a2ffd088787a9bcab8605 (patch)
tree0ca7f00ab9ac3545fdbca7215298f8ed2aa68480 /scripts/build
parent006e38d9558e0d8359cfd01ed22a8e84839df10a (diff)
downloadvyos-live-build-d83a3d3c302c50c6958a2ffd088787a9bcab8605.tar.gz
vyos-live-build-d83a3d3c302c50c6958a2ffd088787a9bcab8605.zip
Updating rsvg calls in binary_syslinux for newer versions of librsvg2-bin, thanks to Roberto Carlos Morano <rcmorano@emergya.com> (Closes: #728030).
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/binary_syslinux10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 8e20ff730..7e97ff7e5 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 librsvg2-bin
+ Check_package chroot/usr/bin/rsvg-convert 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 ]
+ if [ ! -e /usr/bin/rsvg-convert ]
then
# librsvg2-bin
- Echo_error "/usr/bin/rsvg - no such file"
+ Echo_error "/usr/bin/rsvg-convert - 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 --format png --height 480 --width 640 splash.svg splash.png"
+ Chroot chroot "rsvg-convert --format png --height 480 --width 640 splash.svg -o splash.png"
mv chroot/splash.png "${_TARGET}"
rm -f chroot/splash.svg
;;
false)
- rsvg --format png --height 480 --width 640 "${_TARGET}/splash.svg" "${_TARGET}/splash.png"
+ rsvg-convert --format png --height 480 --width 640 "${_TARGET}/splash.svg" -o "${_TARGET}/splash.png"
;;
esac