Patchwork [V7,6/6] volatile-conf-sato: add recipe

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Jan. 14, 2013, 8:35 a.m.
Message ID <3fcca17cd3080e160104a92b0ca812c3c49c257f.1358152182.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/42555/
State New
Headers show

Comments

Qi.Chen@windriver.com - Jan. 14, 2013, 8:35 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

This recipe provides a config file for core-image-sato.
The config file is used to handle volatile storage in case of a
read-only-rootfs image.

Also, let core-image-sato.bb depend on this recipe.

[YOCTO #3406]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-sato/images/core-image-sato.bb        |    3 +++
 .../files/volatiles-readonly-sato                  |   14 ++++++++++++++
 .../volatile-conf-sato_1.0.bb                      |   15 +++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato
 create mode 100644 meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb
Qi.Chen@windriver.com - Jan. 15, 2013, 2:11 a.m.
I've got to apologize.
This patch has a serious problem.

The fact that the IMAGE_INSTALL statement was before the 'inherit' 
statement caused an override of IMAGE_INSTALL variable in image.bbclass, 
thus resulting a bunch of packaged not installed on target.

A new patch will be sent soon.
Sorry for that.

Chen Qi

On 01/14/2013 04:35 PM, Qi.Chen@windriver.com wrote:
> From: Chen Qi<Qi.Chen@windriver.com>
>
> This recipe provides a config file for core-image-sato.
> The config file is used to handle volatile storage in case of a
> read-only-rootfs image.
>
> Also, let core-image-sato.bb depend on this recipe.
>
> [YOCTO #3406]
>
> Signed-off-by: Chen Qi<Qi.Chen@windriver.com>
> ---
>   meta/recipes-sato/images/core-image-sato.bb        |    3 +++
>   .../files/volatiles-readonly-sato                  |   14 ++++++++++++++
>   .../volatile-conf-sato_1.0.bb                      |   15 +++++++++++++++
>   3 files changed, 32 insertions(+)
>   create mode 100644 meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato
>   create mode 100644 meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb
>
> diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
> index f52a1a5..8aaeaf8 100644
> --- a/meta/recipes-sato/images/core-image-sato.bb
> +++ b/meta/recipes-sato/images/core-image-sato.bb
> @@ -6,6 +6,9 @@ IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbe
>   
>   LICENSE = "MIT"
>   
> +RDEPENDS += "volatile-conf-sato"
> +IMAGE_INSTALL += "volatile-conf-sato"
> +
>   inherit core-image
>   
>   IMAGE_INSTALL += "packagegroup-core-x11-sato-games"
> diff --git a/meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato b/meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato
> new file mode 100644
> index 0000000..4a56b81
> --- /dev/null
> +++ b/meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato
> @@ -0,0 +1,14 @@
> +# This configuration file lists filesystem objects specific to sato image
> +# with read-only rootfs.
> +# This configuration file will only be applied if the image is sato and the
> +# rootfs is read-only.
> +# For the detailed format information, refer to /etc/default/volatiles/00_core.
> +d root root 0755 /var/volatile/lib/ none
> +d root root 0755 /var/volatile/lib/urandom/ none
> +d root root 0755 /var/volatile/lib/dropbear/ none
> +d root root 0755 /var/volatile/lib/nfs/ none
> +d root root 0755 /var/volatile/lib/dbus/ none
> +l root root 0755 /var/lib/urandom /var/volatile/lib/urandom
> +l root root 0755 /var/lib/dropbear /var/volatile/lib/dropbear
> +l root root 0755 /var/lib/nfs /var/volatile/lib/nfs
> +l root root 0755 /var/lib/dbus /var/volatile/lib/dbus
> diff --git a/meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb b/meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb
> new file mode 100644
> index 0000000..acc8901
> --- /dev/null
> +++ b/meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb
> @@ -0,0 +1,15 @@
> +SUMMARY = "Provide config files for core-image-sato"
> +DESCRIPTION = "This package contains a config file for core-image-sato. \
> +It is used to handle volatile storage in case of a read-only rootfs."
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM ="file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +SRC_URI ="file://volatiles-readonly-sato"
> +
> +PR = "r1"
> +
> +do_install () {
> +	install -d ${D}${sysconfdir}/default/volatiles
> +	install -m 0644 ${WORKDIR}/volatiles-readonly-sato ${D}${sysconfdir}/default/volatiles/00_core_readonly
> +}

Patch

diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index f52a1a5..8aaeaf8 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -6,6 +6,9 @@  IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbe
 
 LICENSE = "MIT"
 
+RDEPENDS += "volatile-conf-sato"
+IMAGE_INSTALL += "volatile-conf-sato"
+
 inherit core-image
 
 IMAGE_INSTALL += "packagegroup-core-x11-sato-games"
diff --git a/meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato b/meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato
new file mode 100644
index 0000000..4a56b81
--- /dev/null
+++ b/meta/recipes-sato/readonly-volatile-conf/files/volatiles-readonly-sato
@@ -0,0 +1,14 @@ 
+# This configuration file lists filesystem objects specific to sato image
+# with read-only rootfs.
+# This configuration file will only be applied if the image is sato and the
+# rootfs is read-only.
+# For the detailed format information, refer to /etc/default/volatiles/00_core.
+d root root 0755 /var/volatile/lib/ none
+d root root 0755 /var/volatile/lib/urandom/ none
+d root root 0755 /var/volatile/lib/dropbear/ none
+d root root 0755 /var/volatile/lib/nfs/ none
+d root root 0755 /var/volatile/lib/dbus/ none
+l root root 0755 /var/lib/urandom /var/volatile/lib/urandom
+l root root 0755 /var/lib/dropbear /var/volatile/lib/dropbear
+l root root 0755 /var/lib/nfs /var/volatile/lib/nfs
+l root root 0755 /var/lib/dbus /var/volatile/lib/dbus
diff --git a/meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb b/meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb
new file mode 100644
index 0000000..acc8901
--- /dev/null
+++ b/meta/recipes-sato/readonly-volatile-conf/volatile-conf-sato_1.0.bb
@@ -0,0 +1,15 @@ 
+SUMMARY = "Provide config files for core-image-sato"
+DESCRIPTION = "This package contains a config file for core-image-sato. \
+It is used to handle volatile storage in case of a read-only rootfs."
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = "file://volatiles-readonly-sato"
+
+PR = "r1"
+
+do_install () {
+	install -d ${D}${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/volatiles-readonly-sato ${D}${sysconfdir}/default/volatiles/00_core_readonly
+}