From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mail.openembedded.org (Postfix) with ESMTP id A595060DFA for ; Thu, 27 Mar 2014 22:08:09 +0000 (UTC) Received: by mail-vc0-f174.google.com with SMTP id ld13so5005222vcb.33 for ; Thu, 27 Mar 2014 15:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=y+JGLrlsDLLxfSeLAGkIhBssDIloO3FSS8iP64AOEyc=; b=wsP3V+tlXwmDZ33Nz4vxkQdPvEP5kYvfxvTGYVdRpY3tE9euttr0YDb7Z50Te5mVs4 779oK424HfQLFZ4qzbXlBO+lHnfqwq5ALwC5yj2vHifjSJpqpTsa7HrZKysLDcwuK4Nj 2zSgBBp7NfE1XTnO9Po6lQ1cR/bQuW/3/1P6g4Fpey5eSHsB/6z+Vtzt50AXJoqzafri pIM1RxB300f0m266h5B7+C4zW0JAukIeYap5FOPjMqyCSVFkPoxV+Id1GexfgxsGrzDL K0nIllR0o8/sVkXJvysVQh1i6xbZr62mIscvlRj06M7ml17aa1JeQpj0pMo/IxBE/swe m64Q== X-Received: by 10.58.57.67 with SMTP id g3mr3587989veq.3.1395958090381; Thu, 27 Mar 2014 15:08:10 -0700 (PDT) Received: from localhost.localdomain ([187.106.6.19]) by mx.google.com with ESMTPSA id am5sm5771903vdc.15.2014.03.27.15.08.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Mar 2014 15:08:09 -0700 (PDT) From: =?UTF-8?q?Jo=C3=A3o=20Henrique=20Ferreira=20de=20Freitas?= To: openembedded-core@lists.openembedded.org Date: Thu, 27 Mar 2014 19:07:51 -0300 Message-Id: <1395958078-5191-1-git-send-email-joaohf@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394918271-14153-1-git-send-email-joaohf@gmail.com> References: <1394918271-14153-1-git-send-email-joaohf@gmail.com> MIME-Version: 1.0 Cc: tom.zanussi@linux.intel.com Subject: [PATCH v3 0/7] wic: Add --rootfs option to --source param X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 22:08:11 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi, These patchs allows the user create the following directdisk-multi-rootfs.wks file: part /boot --source bootimg-pcbios --ondisk sda --fstype=msdos \ --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext3 --label primary --align 1024 part /standby --source rootfs --rootfs-dir= \ --ondisk sda --fstype=ext3 --label secondary --align 1024 bootloader --timeout=0 --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0" The special thing is the /standby partition. Which using rootfs with a extra '--rootfs' argument instruct the RootfsPlugin what should be the rootfs directory to be used to create the partition. Besides that, the user can specify a more generic connection between wic command-line --rootfs-dir and what is describing in .wks file. Like this: wic create ... --rootfs-dir rootfs1=/some/rootfs/dir --rootfs-dir rootfs2=/some/other/rootfs/dir part / --source rootfs --rootfs-dir="rootfs1" --ondisk sda --fstype=ext3 --label primary --align 1024 part /standby --source rootfs --rootfs-dir="rootfs2" \ --ondisk sda --fstype=ext3 --label secondary --align 1024 So no hard-coded path is used in .wks. The connection string could be any string that makes a link between the '--rootfs-dir' It is a very simple features that let users to customize your partition setup. I thought in the case where we have two rootfs (like active and standby, e.g used to software update). Or the odd cases when a special partition need to be create to hold whatever files. The workflow of wic use remains the same. All the config needs to be done in .wks file. To test I used as a rootfs created by 'bitbkae core-image-minimal-dev' (e.g: /srv/build/yocto/master/tmp/work/genericx86-poky-linux/core-image-minimal-dev/1.0-r0/rootfs). changes since previous version: v2: - in .wks syntax change --rootfs to --rootfs-dir - reporting all extra partitions in the output - use a connection string between --rootfs-dir from wic command-line and .wks v3: - fix when wic -e command-line param is used and no --rootfs-dir was passed João Henrique Ferreira de Freitas (7): wic: Add RootfsPlugin wic: Hook up RootfsPlugin plugin wic: Add rootfs_dir argument to do_prepare_partition() method wic: Use partition label to be part of rootfs filename wic: Add option --rootfs-dir to --source wic: Report all ROOTFS_DIR artifacts wic: Extend --rootfs-dir to connect rootfs-dirs scripts/lib/mic/imager/direct.py | 20 +++++-- .../lib/mic/kickstart/custom_commands/partition.py | 51 ++++++++++------ scripts/lib/mic/pluginbase.py | 2 +- scripts/lib/mic/plugins/imager/direct_plugin.py | 17 +++++- scripts/lib/mic/plugins/source/bootimg-efi.py | 2 +- scripts/lib/mic/plugins/source/bootimg-pcbios.py | 2 +- scripts/lib/mic/plugins/source/rootfs.py | 68 ++++++++++++++++++++++ scripts/wic | 36 +++++++++++- 8 files changed, 169 insertions(+), 29 deletions(-) create mode 100644 scripts/lib/mic/plugins/source/rootfs.py -- 1.8.3.2