From patchwork Wed Feb 27 08:43:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 223554 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 2CC532C0085 for ; Wed, 27 Feb 2013 19:43:39 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id D21BC3FDC8 for ; Wed, 27 Feb 2013 09:43:37 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id D35713FDC8 for ; Wed, 27 Feb 2013 09:43:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2860; q=dns/txt; s=ironport1; t=1361954615; x=1393490615; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MvSA99Rp8SzEGvZWKKcit7Af2HydznsHHlND7hppdGQ=; b=uz+eck0iTz+aFhUvqmAQUkC3VRxN+9SwgYb34MqsVjwaI4DgC5g6OYr1 L1qLEVqbon5Mc09Im+beK5T2+X0FkeKu9B1trd2syZv/XtaqXDh+UfDiI 3NiGM93bozSBJSwp2BQBdlBSTs5saR9IP7UVt6LWVyv59yZRNktR2yy8e M=; X-IronPort-AV: E=Sophos;i="4.84,746,1355094000"; d="scan'208";a="2825743" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 27 Feb 2013 09:43:35 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.342.3; Wed, 27 Feb 2013 09:43:35 +0100 Received: by localhost (Postfix, from userid 30007) id 552BC684400; Wed, 27 Feb 2013 08:43:35 +0000 (UTC) From: To: Subject: [PATCH 2/4] cpio-image: added lzma support Date: Wed, 27 Feb 2013 08:43:32 +0000 Message-ID: <661ceb69fa3e2b050d7afc2917298b13294eafd2.1361954556.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 1.8.0.3 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen --- classes/cpio-image.oeclass | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/classes/cpio-image.oeclass b/classes/cpio-image.oeclass index 0b28940..13356dd 100644 --- a/classes/cpio-image.oeclass +++ b/classes/cpio-image.oeclass @@ -3,17 +3,24 @@ IMAGE_BASENAME ?= "${PN}-${TARGET_MACHINE_ID}" inherit image image_mdev image_inetd image_crontab image_makedevs image_inittab image_fstab RECIPE_FLAGS += "ramdisk_image \ - ramdisk_image_name ramdisk_image_compression" + ramdisk_image_name ramdisk_image_compression \ + cpio_compress_image cpio_image_compression" + DEFAULT_USE_ramdisk_image = "0" DEFAULT_USE_ramdisk_image_name = "${IMAGE_BASENAME}" DEFAULT_USE_ramdisk_image_compression = "none" +DEFAULT_USE_cpio_compress_image = "00" +DEFAULT_USE_cpio_image_compression = "none" + IMAGE_CREATE_FUNCS += "cpio_image" inherit kernel-arch IMAGE_CREATE_FUNCS:>USE_ramdisk_image = " cpio_mkimage" CLASS_DEPENDS:>USE_ramdisk_image = " native:u-boot-tools-mkimage" +IMAGE_CREATE_FUNCS:>USE_cpio_compress_image = " cpio_compress_image" + cpio_image () { ( cd ${IMAGE_DIR} @@ -22,23 +29,31 @@ cpio_image () { ) } -cpio_mkimage () { - ( - case "${USE_ramdisk_image_compression}" in +cpio_compress() { + case "$1" in none) cp ${B}/${IMAGE_BASENAME}.cpio ${B}/image.bin ;; - bzip2) echo "TODO: ${USE_ramdisk_image_compression}" + bzip2) echo "TODO: $1" ;; gzip) gzip ${B}/${IMAGE_BASENAME}.cpio -c > ${B}/image.bin ;; - lzma) echo "TODO: ${USE_ramdisk_image_compression}" + lzma) lzma ${B}/${IMAGE_BASENAME}.cpio -c > ${B}/image.bin ;; - lzo) echo "TODO: ${USE_ramdisk_image_compression}" + lzo) echo "TODO: $1" ;; - *) echo "ERROR: mkimage compression ${USE_ramdisk_image_compression} not supported" + *) echo "ERROR: mkimage compression $1 not supported" ;; esac +} + +cpio_compress_image(){ + cpio_compress ${USE_cpio_image_compression} + cp ${B}/image.bin ${B}/${IMAGE_BASENAME}.${USE_cpio_image_compression} +} +cpio_mkimage () { + ( + cpio_compress ${USE_ramdisk_image_compression} mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk \ -C none \ -a 0x0 -e 0x0 \ @@ -49,6 +64,7 @@ cpio_mkimage () { EXT = ".cpio" EXT:>USE_ramdisk_image = " .img" +EXT:>USE_cpio_compress_image = " .${USE_cpio_image_compression}" do_install[postfuncs] += "do_install_cpio_image" do_install_cpio_image () { @@ -57,7 +73,7 @@ do_install_cpio_image () { done } -FILES_${PN} += "/*.cpio /*.img" +FILES_${PN} += "/*.cpio /*.img /*.${USE_cpio_image_compression}" do_deploy[postfuncs] += "do_deploy_cpio_image" do_deploy_cpio_image () {