Patchwork [base] dupdate: add use flag to set EXEFILE in init script

login
register
mail settings
Submitter Jacob Kjaergaard
Date Sept. 30, 2013, 8:13 a.m.
Message ID <1380528784-19126-1-git-send-email-jabk@prevas.dk>
Download mbox | patch
Permalink /patch/278940/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Jacob Kjaergaard - Sept. 30, 2013, 8:13 a.m.
From: Jacob Kjaergaard <jacob@barsoekjaergaard.dk>

conf/dupdate.conf is included from OE-core
we need to set RECIPE FLAGS and DEFAULT USE in case
conf/dupdate.conf is not present in meta/core,
e.g. when upgrading base but not core
---
 recipes/dupdate/dupdate.inc |    9 +++++++++
 1 file changed, 9 insertions(+)
Esben Haabendal - Oct. 14, 2013, 11:54 a.m.
<jabk@prevas.dk> writes:

> From: Jacob Kjaergaard <jacob@barsoekjaergaard.dk>
>
> conf/dupdate.conf is included from OE-core
> we need to set RECIPE FLAGS and DEFAULT USE in case
> conf/dupdate.conf is not present in meta/core,
> e.g. when upgrading base but not core
> ---
>  recipes/dupdate/dupdate.inc |    9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/recipes/dupdate/dupdate.inc b/recipes/dupdate/dupdate.inc
> index 64187e7..37f80a2 100644
> --- a/recipes/dupdate/dupdate.inc
> +++ b/recipes/dupdate/dupdate.inc
> @@ -11,6 +11,15 @@ S = "${SRCDIR}/dupdate"
>  
>  inherit autotools
>  
> +include conf/dupdate.conf
> +RECIPE_FLAGS += "dupdate_exefile"
> +DEFAULT_USE_dupdate_exefile ?= "run_update.sh"
> +
> +do_configure[postfuncs] =+ "do_configure_EXEFILE"
> +do_configure_EXEFILE() {
> +    sed 's/^EXEFILE.*/EXEFILE="${USE_dupdate_exefile}"/' -i ${S}/src/dupdate.sh
> +}
> +
>  INSTALL_SYSVINIT_POSTFUNC = ""
>  INSTALL_SYSVINIT_POSTFUNC:USE_sysvinit = "do_install_sysvinit_dupdate"
>  do_install[postfuncs] =+ "${INSTALL_SYSVINIT_POSTFUNC}"

Merged to master.  I have made a small change to the dupdate-image class
in OE-lite/core, moving the USE flag specification from
conf/dupdate.conf to dupdate-image.oeclass, and have modified this
commit accordingly.

/Esben

Patch

diff --git a/recipes/dupdate/dupdate.inc b/recipes/dupdate/dupdate.inc
index 64187e7..37f80a2 100644
--- a/recipes/dupdate/dupdate.inc
+++ b/recipes/dupdate/dupdate.inc
@@ -11,6 +11,15 @@  S = "${SRCDIR}/dupdate"
 
 inherit autotools
 
+include conf/dupdate.conf
+RECIPE_FLAGS += "dupdate_exefile"
+DEFAULT_USE_dupdate_exefile ?= "run_update.sh"
+
+do_configure[postfuncs] =+ "do_configure_EXEFILE"
+do_configure_EXEFILE() {
+    sed 's/^EXEFILE.*/EXEFILE="${USE_dupdate_exefile}"/' -i ${S}/src/dupdate.sh
+}
+
 INSTALL_SYSVINIT_POSTFUNC = ""
 INSTALL_SYSVINIT_POSTFUNC:USE_sysvinit = "do_install_sysvinit_dupdate"
 do_install[postfuncs] =+ "${INSTALL_SYSVINIT_POSTFUNC}"