Patchwork [meta-oe] rng-tools: Fixes for latest OE layouts

login
register
mail settings
Submitter Gary Thomas
Date Dec. 14, 2012, 9:05 p.m.
Message ID <1355519149-23005-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/41049/
State Changes Requested
Headers show

Comments

Gary Thomas - Dec. 14, 2012, 9:05 p.m.
The current recipe has a few installation errors:
  * The manipulation of configurable paths drops a '/'
  * The init script defaults are placed in the wrong file
  * Finer control over init script start/stop
  * The default device is non-standard

This patch fixes these little nits and makes the package usable again.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
 meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)
Martin Jansa - Dec. 16, 2012, 6 p.m.
On Fri, Dec 14, 2012 at 02:05:48PM -0700, Gary Thomas wrote:
> The current recipe has a few installation errors:
>   * The manipulation of configurable paths drops a '/'
>   * The init script defaults are placed in the wrong file
>   * Finer control over init script start/stop
>   * The default device is non-standard
> 
> This patch fixes these little nits and makes the package usable again.
> 
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> ---
>  meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
>  meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
> index ab7cd93..7aede9b 100644
> --- a/meta-oe/recipes-support/rng-tools/files/default
> +++ b/meta-oe/recipes-support/rng-tools/files/default
> @@ -1,2 +1,3 @@
>  # Specify rng device
> -RNG_DEVICE=/dev/hwrng
> +#RNG_DEVICE=/dev/hwrng
> +RNG_DEVICE=/dev/urandom
> diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> index ef753cf..b94854a 100644
> --- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> +++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> @@ -15,12 +15,13 @@ inherit autotools update-rc.d
>  do_install_append() {
>          install -d "${D}${sysconfdir}/init.d"
>          install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
> -        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
> +        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
>              ${D}${sysconfdir}/init.d/rng-tools
>  
>          install -d "${D}${sysconfdir}/default"
> -        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
> +        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools
>  }
>  
>  INITSCRIPT_NAME = "rng-tools"
>  INITSCRIPT_PARAMS = "defaults"
> +INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."

Why do you add 2nd INITSCRIPT_PARAMS ?

Cheers,
Martin Jansa - Jan. 9, 2013, 2:21 p.m.
On Sun, Dec 16, 2012 at 07:00:22PM +0100, Martin Jansa wrote:
> On Fri, Dec 14, 2012 at 02:05:48PM -0700, Gary Thomas wrote:
> > The current recipe has a few installation errors:
> >   * The manipulation of configurable paths drops a '/'
> >   * The init script defaults are placed in the wrong file
> >   * Finer control over init script start/stop
> >   * The default device is non-standard
> > 
> > This patch fixes these little nits and makes the package usable again.
> > 
> > Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> > ---
> >  meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
> >  meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
> >  2 files changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
> > index ab7cd93..7aede9b 100644
> > --- a/meta-oe/recipes-support/rng-tools/files/default
> > +++ b/meta-oe/recipes-support/rng-tools/files/default
> > @@ -1,2 +1,3 @@
> >  # Specify rng device
> > -RNG_DEVICE=/dev/hwrng
> > +#RNG_DEVICE=/dev/hwrng
> > +RNG_DEVICE=/dev/urandom
> > diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> > index ef753cf..b94854a 100644
> > --- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> > +++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> > @@ -15,12 +15,13 @@ inherit autotools update-rc.d
> >  do_install_append() {
> >          install -d "${D}${sysconfdir}/init.d"
> >          install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
> > -        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
> > +        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
> >              ${D}${sysconfdir}/init.d/rng-tools
> >  
> >          install -d "${D}${sysconfdir}/default"
> > -        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
> > +        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools
> >  }
> >  
> >  INITSCRIPT_NAME = "rng-tools"
> >  INITSCRIPT_PARAMS = "defaults"
> > +INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."
> 
> Why do you add 2nd INITSCRIPT_PARAMS ?

ping :)
Gary Thomas - Jan. 9, 2013, 2:34 p.m.
On 2013-01-09 07:21, Martin Jansa wrote:
> On Sun, Dec 16, 2012 at 07:00:22PM +0100, Martin Jansa wrote:
>> On Fri, Dec 14, 2012 at 02:05:48PM -0700, Gary Thomas wrote:
>>> The current recipe has a few installation errors:
>>>    * The manipulation of configurable paths drops a '/'
>>>    * The init script defaults are placed in the wrong file
>>>    * Finer control over init script start/stop
>>>    * The default device is non-standard
>>>
>>> This patch fixes these little nits and makes the package usable again.
>>>
>>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>>> ---
>>>   meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
>>>   meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
>>>   2 files changed, 5 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
>>> index ab7cd93..7aede9b 100644
>>> --- a/meta-oe/recipes-support/rng-tools/files/default
>>> +++ b/meta-oe/recipes-support/rng-tools/files/default
>>> @@ -1,2 +1,3 @@
>>>   # Specify rng device
>>> -RNG_DEVICE=/dev/hwrng
>>> +#RNG_DEVICE=/dev/hwrng
>>> +RNG_DEVICE=/dev/urandom
>>> diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
>>> index ef753cf..b94854a 100644
>>> --- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
>>> +++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
>>> @@ -15,12 +15,13 @@ inherit autotools update-rc.d
>>>   do_install_append() {
>>>           install -d "${D}${sysconfdir}/init.d"
>>>           install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
>>> -        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
>>> +        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
>>>               ${D}${sysconfdir}/init.d/rng-tools
>>>
>>>           install -d "${D}${sysconfdir}/default"
>>> -        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
>>> +        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools
>>>   }
>>>
>>>   INITSCRIPT_NAME = "rng-tools"
>>>   INITSCRIPT_PARAMS = "defaults"
>>> +INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."
>>
>> Why do you add 2nd INITSCRIPT_PARAMS ?
>
> ping :)

Sorry, must have missed your query (holidays).

That second line should really replace the first for finer grain
control over the start/stop choice.  I can fix this and resend the patch.
Martin Jansa - Jan. 10, 2013, 11:27 a.m.
On Wed, Jan 09, 2013 at 07:34:05AM -0700, Gary Thomas wrote:
> On 2013-01-09 07:21, Martin Jansa wrote:
> > On Sun, Dec 16, 2012 at 07:00:22PM +0100, Martin Jansa wrote:
> >> On Fri, Dec 14, 2012 at 02:05:48PM -0700, Gary Thomas wrote:
> >>> The current recipe has a few installation errors:
> >>>    * The manipulation of configurable paths drops a '/'
> >>>    * The init script defaults are placed in the wrong file
> >>>    * Finer control over init script start/stop
> >>>    * The default device is non-standard
> >>>
> >>> This patch fixes these little nits and makes the package usable again.
> >>>
> >>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> >>> ---
> >>>   meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
> >>>   meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
> >>>   2 files changed, 5 insertions(+), 3 deletions(-)
> >>>
> >>> diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
> >>> index ab7cd93..7aede9b 100644
> >>> --- a/meta-oe/recipes-support/rng-tools/files/default
> >>> +++ b/meta-oe/recipes-support/rng-tools/files/default
> >>> @@ -1,2 +1,3 @@
> >>>   # Specify rng device
> >>> -RNG_DEVICE=/dev/hwrng
> >>> +#RNG_DEVICE=/dev/hwrng
> >>> +RNG_DEVICE=/dev/urandom
> >>> diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> >>> index ef753cf..b94854a 100644
> >>> --- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> >>> +++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> >>> @@ -15,12 +15,13 @@ inherit autotools update-rc.d
> >>>   do_install_append() {
> >>>           install -d "${D}${sysconfdir}/init.d"
> >>>           install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
> >>> -        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
> >>> +        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
> >>>               ${D}${sysconfdir}/init.d/rng-tools
> >>>
> >>>           install -d "${D}${sysconfdir}/default"
> >>> -        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
> >>> +        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools
> >>>   }
> >>>
> >>>   INITSCRIPT_NAME = "rng-tools"
> >>>   INITSCRIPT_PARAMS = "defaults"
> >>> +INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."
> >>
> >> Why do you add 2nd INITSCRIPT_PARAMS ?
> >
> > ping :)
> 
> Sorry, must have missed your query (holidays).
> 
> That second line should really replace the first for finer grain
> control over the start/stop choice.  I can fix this and resend the patch.

Yes, please do if you want it applied.

Cheers,
Martin Jansa - Feb. 25, 2013, 7:26 p.m.
On Thu, Jan 10, 2013 at 12:27:54PM +0100, Martin Jansa wrote:
> On Wed, Jan 09, 2013 at 07:34:05AM -0700, Gary Thomas wrote:
> > On 2013-01-09 07:21, Martin Jansa wrote:
> > > On Sun, Dec 16, 2012 at 07:00:22PM +0100, Martin Jansa wrote:
> > >> On Fri, Dec 14, 2012 at 02:05:48PM -0700, Gary Thomas wrote:
> > >>> The current recipe has a few installation errors:
> > >>>    * The manipulation of configurable paths drops a '/'
> > >>>    * The init script defaults are placed in the wrong file
> > >>>    * Finer control over init script start/stop
> > >>>    * The default device is non-standard
> > >>>
> > >>> This patch fixes these little nits and makes the package usable again.
> > >>>
> > >>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> > >>> ---
> > >>>   meta-oe/recipes-support/rng-tools/files/default  |    3 ++-
> > >>>   meta-oe/recipes-support/rng-tools/rng-tools_2.bb |    5 +++--
> > >>>   2 files changed, 5 insertions(+), 3 deletions(-)
> > >>>
> > >>> diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
> > >>> index ab7cd93..7aede9b 100644
> > >>> --- a/meta-oe/recipes-support/rng-tools/files/default
> > >>> +++ b/meta-oe/recipes-support/rng-tools/files/default
> > >>> @@ -1,2 +1,3 @@
> > >>>   # Specify rng device
> > >>> -RNG_DEVICE=/dev/hwrng
> > >>> +#RNG_DEVICE=/dev/hwrng
> > >>> +RNG_DEVICE=/dev/urandom
> > >>> diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> > >>> index ef753cf..b94854a 100644
> > >>> --- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> > >>> +++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
> > >>> @@ -15,12 +15,13 @@ inherit autotools update-rc.d
> > >>>   do_install_append() {
> > >>>           install -d "${D}${sysconfdir}/init.d"
> > >>>           install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
> > >>> -        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
> > >>> +        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
> > >>>               ${D}${sysconfdir}/init.d/rng-tools
> > >>>
> > >>>           install -d "${D}${sysconfdir}/default"
> > >>> -        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
> > >>> +        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools
> > >>>   }
> > >>>
> > >>>   INITSCRIPT_NAME = "rng-tools"
> > >>>   INITSCRIPT_PARAMS = "defaults"
> > >>> +INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."
> > >>
> > >> Why do you add 2nd INITSCRIPT_PARAMS ?
> > >
> > > ping :)
> > 
> > Sorry, must have missed your query (holidays).
> > 
> > That second line should really replace the first for finer grain
> > control over the start/stop choice.  I can fix this and resend the patch.
> 
> Yes, please do if you want it applied.

Last call for update. Next week I'll remove it from my queue and mark it
as "Changes requested" on patchwork when not updated.

> 
> Cheers,
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Patch

diff --git a/meta-oe/recipes-support/rng-tools/files/default b/meta-oe/recipes-support/rng-tools/files/default
index ab7cd93..7aede9b 100644
--- a/meta-oe/recipes-support/rng-tools/files/default
+++ b/meta-oe/recipes-support/rng-tools/files/default
@@ -1,2 +1,3 @@ 
 # Specify rng device
-RNG_DEVICE=/dev/hwrng
+#RNG_DEVICE=/dev/hwrng
+RNG_DEVICE=/dev/urandom
diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
index ef753cf..b94854a 100644
--- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
+++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
@@ -15,12 +15,13 @@  inherit autotools update-rc.d
 do_install_append() {
         install -d "${D}${sysconfdir}/init.d"
         install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
-        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
+        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
             ${D}${sysconfdir}/init.d/rng-tools
 
         install -d "${D}${sysconfdir}/default"
-        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
+        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/rng-tools
 }
 
 INITSCRIPT_NAME = "rng-tools"
 INITSCRIPT_PARAMS = "defaults"
+INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."