* [meta-networking][PATCH] quagga: unify volatiles file name
@ 2020-11-02 9:13 Yi Zhao
2020-11-02 16:26 ` [oe] " Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Yi Zhao @ 2020-11-02 9:13 UTC (permalink / raw)
To: openembedded-devel
Make the volatiles file name starts with digital.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 11b7d576a..6df72427b 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -81,7 +81,7 @@ do_install () {
install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
- install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
+ install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga
# Install sample configurations for the daemons
for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
@@ -106,7 +106,7 @@ do_install () {
sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
- sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
+ sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga
sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [oe] [meta-networking][PATCH] quagga: unify volatiles file name
2020-11-02 9:13 [meta-networking][PATCH] quagga: unify volatiles file name Yi Zhao
@ 2020-11-02 16:26 ` Khem Raj
2020-11-03 2:31 ` Yi Zhao
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-11-02 16:26 UTC (permalink / raw)
To: Yi Zhao; +Cc: openembeded-devel
On Mon, Nov 2, 2020 at 1:13 AM Yi Zhao <yi.zhao@windriver.com> wrote:
>
> Make the volatiles file name starts with digital.
what does this get us ?
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
> meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
> index 11b7d576a..6df72427b 100644
> --- a/meta-networking/recipes-protocols/quagga/quagga.inc
> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc
> @@ -81,7 +81,7 @@ do_install () {
> install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
> install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
> install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
> - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
> + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga
>
> # Install sample configurations for the daemons
> for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
> @@ -106,7 +106,7 @@ do_install () {
> sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
> sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
> sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
> - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
> + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga
> sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
> sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
>
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [oe] [meta-networking][PATCH] quagga: unify volatiles file name
2020-11-02 16:26 ` [oe] " Khem Raj
@ 2020-11-03 2:31 ` Yi Zhao
2020-11-03 2:33 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Yi Zhao @ 2020-11-03 2:31 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On 11/3/20 12:26 AM, Khem Raj wrote:
> On Mon, Nov 2, 2020 at 1:13 AM Yi Zhao <yi.zhao@windriver.com> wrote:
>> Make the volatiles file name starts with digital.
> what does this get us ?
Just want to make all volatiles file names uniform. I searched oe-core
and meta-openembedded, only pulseaudio and quagga volatiles file names
are not start with number value.
$ ls /etc/default/volatiles
00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant
volatiles.03_quagga volatiles.04_pulse
//Yi
>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> ---
>> meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
>> index 11b7d576a..6df72427b 100644
>> --- a/meta-networking/recipes-protocols/quagga/quagga.inc
>> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc
>> @@ -81,7 +81,7 @@ do_install () {
>> install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
>> install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
>> install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
>> - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
>> + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga
>>
>> # Install sample configurations for the daemons
>> for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
>> @@ -106,7 +106,7 @@ do_install () {
>> sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
>> sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
>> sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
>> - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
>> + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga
>> sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
>> sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
>>
>> --
>> 2.17.1
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [oe] [meta-networking][PATCH] quagga: unify volatiles file name
2020-11-03 2:31 ` Yi Zhao
@ 2020-11-03 2:33 ` Khem Raj
2020-11-03 2:49 ` Yi Zhao
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-11-03 2:33 UTC (permalink / raw)
To: Yi Zhao; +Cc: openembeded-devel
On Mon, Nov 2, 2020 at 6:31 PM Yi Zhao <yi.zhao@windriver.com> wrote:
>
>
> On 11/3/20 12:26 AM, Khem Raj wrote:
> > On Mon, Nov 2, 2020 at 1:13 AM Yi Zhao <yi.zhao@windriver.com> wrote:
> >> Make the volatiles file name starts with digital.
> > what does this get us ?
>
>
> Just want to make all volatiles file names uniform. I searched oe-core
> and meta-openembedded, only pulseaudio and quagga volatiles file names
> are not start with number value.
> $ ls /etc/default/volatiles
> 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant
> volatiles.03_quagga volatiles.04_pulse
this will change the order of their execution, is the new order still
working without other side effects
>
> //Yi
>
>
> >
> >> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> >> ---
> >> meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
> >> index 11b7d576a..6df72427b 100644
> >> --- a/meta-networking/recipes-protocols/quagga/quagga.inc
> >> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc
> >> @@ -81,7 +81,7 @@ do_install () {
> >> install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
> >> install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
> >> install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
> >> - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
> >> + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga
> >>
> >> # Install sample configurations for the daemons
> >> for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
> >> @@ -106,7 +106,7 @@ do_install () {
> >> sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
> >> sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
> >> sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
> >> - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
> >> + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga
> >> sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
> >> sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
> >>
> >> --
> >> 2.17.1
> >>
> >>
> >>
> >>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [oe] [meta-networking][PATCH] quagga: unify volatiles file name
2020-11-03 2:33 ` Khem Raj
@ 2020-11-03 2:49 ` Yi Zhao
2020-11-03 4:32 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Yi Zhao @ 2020-11-03 2:49 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On 11/3/20 10:33 AM, Khem Raj wrote:
> On Mon, Nov 2, 2020 at 6:31 PM Yi Zhao <yi.zhao@windriver.com> wrote:
>>
>> On 11/3/20 12:26 AM, Khem Raj wrote:
>>> On Mon, Nov 2, 2020 at 1:13 AM Yi Zhao <yi.zhao@windriver.com> wrote:
>>>> Make the volatiles file name starts with digital.
>>> what does this get us ?
>>
>> Just want to make all volatiles file names uniform. I searched oe-core
>> and meta-openembedded, only pulseaudio and quagga volatiles file names
>> are not start with number value.
>> $ ls /etc/default/volatiles
>> 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant
>> volatiles.03_quagga volatiles.04_pulse
> this will change the order of their execution, is the new order still
> working without other side effects
I have tested the changes and didn't find any side effects:
1. The volatile file only creates directories under /var/run or /var/log
for its own package. It doesn't impact other packages.
2. The populate-volatile.sh service runs on RCS.d
3. The 00_create volatile file always run first to make sure the base
directories /var/log, /var/run are created.
//Yi
>> //Yi
>>
>>
>>>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>>>> ---
>>>> meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++--
>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
>>>> index 11b7d576a..6df72427b 100644
>>>> --- a/meta-networking/recipes-protocols/quagga/quagga.inc
>>>> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc
>>>> @@ -81,7 +81,7 @@ do_install () {
>>>> install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
>>>> install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
>>>> install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
>>>> - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
>>>> + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga
>>>>
>>>> # Install sample configurations for the daemons
>>>> for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
>>>> @@ -106,7 +106,7 @@ do_install () {
>>>> sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
>>>> sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
>>>> sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
>>>> - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
>>>> + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga
>>>> sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
>>>> sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>>
>>>>
>>>>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [oe] [meta-networking][PATCH] quagga: unify volatiles file name
2020-11-03 2:49 ` Yi Zhao
@ 2020-11-03 4:32 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2020-11-03 4:32 UTC (permalink / raw)
To: Yi Zhao; +Cc: openembeded-devel
[-- Attachment #1: Type: text/plain, Size: 3393 bytes --]
Ok, thanks.
On Mon, Nov 2, 2020 at 6:50 PM Yi Zhao <yi.zhao@windriver.com> wrote:
>
> On 11/3/20 10:33 AM, Khem Raj wrote:
> > On Mon, Nov 2, 2020 at 6:31 PM Yi Zhao <yi.zhao@windriver.com> wrote:
> >>
> >> On 11/3/20 12:26 AM, Khem Raj wrote:
> >>> On Mon, Nov 2, 2020 at 1:13 AM Yi Zhao <yi.zhao@windriver.com> wrote:
> >>>> Make the volatiles file name starts with digital.
> >>> what does this get us ?
> >>
> >> Just want to make all volatiles file names uniform. I searched oe-core
> >> and meta-openembedded, only pulseaudio and quagga volatiles file names
> >> are not start with number value.
> >> $ ls /etc/default/volatiles
> >> 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant
> >> volatiles.03_quagga volatiles.04_pulse
> > this will change the order of their execution, is the new order still
> > working without other side effects
>
>
> I have tested the changes and didn't find any side effects:
> 1. The volatile file only creates directories under /var/run or /var/log
> for its own package. It doesn't impact other packages.
> 2. The populate-volatile.sh service runs on RCS.d
> 3. The 00_create volatile file always run first to make sure the base
> directories /var/log, /var/run are created.
>
>
> //Yi
>
>
> >> //Yi
> >>
> >>
> >>>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> >>>> ---
> >>>> meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++--
> >>>> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>>>
> >>>> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc
> b/meta-networking/recipes-protocols/quagga/quagga.inc
> >>>> index 11b7d576a..6df72427b 100644
> >>>> --- a/meta-networking/recipes-protocols/quagga/quagga.inc
> >>>> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc
> >>>> @@ -81,7 +81,7 @@ do_install () {
> >>>> install -m 0644 ${WORKDIR}/watchquagga.default
> ${D}${sysconfdir}/default/watchquagga
> >>>> install -m 0755 ${WORKDIR}/quagga.init
> ${D}${sysconfdir}/init.d/quagga
> >>>> install -m 0755 ${WORKDIR}/watchquagga.init
> ${D}${sysconfdir}/init.d/watchquagga
> >>>> - install -m 0644 ${WORKDIR}/volatiles.03_quagga
> ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
> >>>> + install -m 0644 ${WORKDIR}/volatiles.03_quagga
> ${D}${sysconfdir}/default/volatiles/03_quagga
> >>>>
> >>>> # Install sample configurations for the daemons
> >>>> for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
> >>>> @@ -106,7 +106,7 @@ do_install () {
> >>>> sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
> >>>> sed -i 's!/usr/bin/!${bindir}/!g'
> ${D}${sysconfdir}/init.d/quagga
> >>>> sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/*
> ${D}${sysconfdir}/default/watchquagga
> >>>> - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/*
> ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
> >>>> + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/*
> ${D}${sysconfdir}/default/volatiles/03_quagga
> >>>> sed -i
> 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!'
> ${D}${sysconfdir}/init.d/*
> >>>> sed -i 's!--with-libtool-sysroot=[^ "]*!!'
> ${D}${includedir}/quagga/version.h
> >>>>
> >>>> --
> >>>> 2.17.1
> >>>>
> >>>>
> >>>>
> >>>>
>
[-- Attachment #2: Type: text/html, Size: 4644 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-03 4:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-02 9:13 [meta-networking][PATCH] quagga: unify volatiles file name Yi Zhao
2020-11-02 16:26 ` [oe] " Khem Raj
2020-11-03 2:31 ` Yi Zhao
2020-11-03 2:33 ` Khem Raj
2020-11-03 2:49 ` Yi Zhao
2020-11-03 4:32 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.