[PATCH] tzdata: Add marking for config files in recipe

[PATCH] tzdata: Add marking for config files in recipe

[Li Zhou]

The tzdata recipe does not mark the /etc/timezone file and
/etc/localtime link as configuration files. An on target update would
then overwite the user modified versions of those files.
Add those files in CONFFILES_${PN}.

Signed-off-by: Li Zhou <li.zhou@windriver.com>
---
 meta/recipes-extended/tzdata/tzdata.inc |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/tzdata/tzdata.inc b/meta/recipes-extended/tzdata/tzdata.inc
index ee56d36..25743f6 100644
--- a/meta/recipes-extended/tzdata/tzdata.inc
+++ b/meta/recipes-extended/tzdata/tzdata.inc
@@ -198,3 +198,5 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
                 ${datadir}/zoneinfo/zone.tab             \
                 ${datadir}/zoneinfo/iso3166.tab          \
                 ${datadir}/zoneinfo/Etc/*"
+
+CONFFILES_${PN} += "${sysconfdir}/timezone ${sysconfdir}/localtime"
-- 
1.7.9.5

Re: [PATCH] tzdata: Add marking for config files in recipe

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

On 29 July 2015 at 02:49, Li Zhou <li.zhou@windriver.com> wrote:

>  meta/recipes-extended/tzdata/tzdata.inc |    2 ++
>

This inc file was removed last month, please rebase to master.

Ross

[-- Attachment #2: Type: text/html, Size: 610 bytes --]

Re: [PATCH] tzdata: Add marking for config files in recipe

[Zhou, Li]

[-- Attachment #1: Type: text/plain, Size: 734 bytes --]

I have setup up poky as below doc described:
http://www.yoctoproject.org/docs/1.8/yocto-project-qs/yocto-project-qs.html

      $ git clone http://git.yoctoproject.org/git/poky
      $ cd poky
      $ git checkout -b fido origin/fido
      $ source oe-init-build-env

Do you mean that I should use branch master instead of fido? Has fido 
been abandoned?
Thanks.

On 07/29/2015 08:26 PM, Burton, Ross wrote:
>
> On 29 July 2015 at 02:49, Li Zhou <li.zhou@windriver.com 
> <mailto:li.zhou@windriver.com>> wrote:
>
>      meta/recipes-extended/tzdata/tzdata.inc |    2 ++
>
>
> This inc file was removed last month, please rebase to master.
>
> Ross

-- 
Best Regards!
Zhou Li
Phone number: 86-10-84778511


[-- Attachment #2: Type: text/html, Size: 2109 bytes --]

Re: [PATCH] tzdata: Add marking for config files in recipe

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

On 30 July 2015 at 03:05, Zhou, Li <li.zhou@windriver.com> wrote:

> Do you mean that I should use branch master instead of fido? Has fido been
> abandoned?
> Thanks.
>

For patch submissions you generally submit to master and then request a
backport to the stable branches.

Ross

[-- Attachment #2: Type: text/html, Size: 674 bytes --]

Re: [PATCH] tzdata: Add marking for config files in recipe

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]

On Thu, Jul 30, 2015 at 10:05:30AM +0800, Zhou, Li wrote:
> I have setup up poky as below doc described:
> http://www.yoctoproject.org/docs/1.8/yocto-project-qs/yocto-project-qs.html
> 
>       $ git clone http://git.yoctoproject.org/git/poky
>       $ cd poky
>       $ git checkout -b fido origin/fido
>       $ source oe-init-build-env
> 
> Do you mean that I should use branch master instead of fido? Has fido 
> been abandoned?

You're sending patch for master, so you should prepare and test in in
master not in fido branch.

If you want to get it applied in fido, then first get it merged in
master branch and then ask for backport/resend for fido or other release
branches.

> Thanks.
> 
> On 07/29/2015 08:26 PM, Burton, Ross wrote:
> >
> > On 29 July 2015 at 02:49, Li Zhou <li.zhou@windriver.com 
> > <mailto:li.zhou@windriver.com>> wrote:
> >
> >      meta/recipes-extended/tzdata/tzdata.inc |    2 ++
> >
> >
> > This inc file was removed last month, please rebase to master.
> >
> > Ross
> 
> -- 
> Best Regards!
> Zhou Li
> Phone number: 86-10-84778511
> 

> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]