diff --git a/Build/Fissile.pm b/Build/Fissile.pm index 07a336a9..ab16086e 100644 --- a/Build/Fissile.pm +++ b/Build/Fissile.pm @@ -22,7 +22,7 @@ package Build::Fissile; use strict; -eval { require YAML::XS; }; +eval { require YAML::XS; $YAML::XS::LoadBlessed = 0; }; *YAML::XS::LoadFile = sub {die("YAML::XS is not available\n")} unless defined &YAML::XS::LoadFile; sub parse { diff --git a/build-recipe-fissile b/build-recipe-fissile index dd795a94..001543d7 100644 --- a/build-recipe-fissile +++ b/build-recipe-fissile @@ -108,7 +108,7 @@ recipe_build_fissile() { # Save the resulting images to tarballs. mkdir -p $BUILD_ROOT$TOPDIR/FISSILE - non_built_images=$(perl -MYAML::XS -e "print join('|', @{YAML::XS::LoadFile('$BUILD_ROOT$TOPDIR/SOURCES/fissile.yml')->{'DockerImageDeps'}})") + non_built_images=$(perl -MYAML::XS -e "$YAML::XS::LoadBlessed = 0; print join('|', @{YAML::XS::LoadFile('$BUILD_ROOT$TOPDIR/SOURCES/fissile.yml')->{'DockerImageDeps'}})") for image in $(chroot $BUILD_ROOT docker images --format "{{.Repository}}:{{.Tag}}" | grep -v $non_built_images); do echo "Saving image $image"