From efeecdfaf38cbb1dd97fb2d5f11057054b5d2fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 30 Sep 2018 15:53:37 +0200 Subject: [PATCH] Replace MORTSGNA_PKG_FORMAT by IMAGE_PKGTYPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/distro/include/mortsgna.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/mortsgna.inc b/conf/distro/include/mortsgna.inc index 27698d6..8f83aec 100644 --- a/conf/distro/include/mortsgna.inc +++ b/conf/distro/include/mortsgna.inc @@ -57,9 +57,7 @@ BUILDHISTORY_COMMIT = "1" #have a shared state a.k.a package-staging2 INHERIT += "sstate" -MORTSGNA_PKG_FORMAT ?= "ipk" - -#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +# Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales @@ -77,8 +75,8 @@ INHERIT += "image-buildinfo" # Prelink images INHERIT += "image-prelink" -#Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${TCLIBC}-${MORSTGNA_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +# Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${TCLIBC}-${IMAGE_PKGTYPE}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Prefer ext4 images where possible