Patchwork [meta-fsl-ppc,master/dylan] eth-config: use pattern match for xml files installation

login
register
mail settings
Submitter Zhenhua Luo
Date May 17, 2013, 8:50 a.m.
Message ID <1368780603-4898-1-git-send-email-zhenhua.luo@freescale.com>
Download mbox | patch
Permalink /patch/50025/
State Superseded
Headers show

Comments

Zhenhua Luo - May 17, 2013, 8:50 a.m.
Use pattern match to install xml files and no need to update recipe if xml
files are added, renamed or deleted.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 recipes-tools/eth-config/eth-config_git.bb |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
Otavio Salvador - May 17, 2013, 1:16 p.m.
On Fri, May 17, 2013 at 5:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
> Use pattern match to install xml files and no need to update recipe if xml
> files are added, renamed or deleted.
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>

Has it been applied in master already?

It seems your process is inverted. You must send it to master and
*later* ask for backporting it to dylan.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Zhenhua Luo - May 17, 2013, 1:27 p.m.
Since the patch can be applied on both dylan and master correctly, so I stated both branches in the subject. 

It has not been applied in master, I will resend it for master. 

What's the process if it needs to be applied for dylan?


Best Regards,

Zhenhua

> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On
> Behalf Of Otavio Salvador
> Sent: Friday, May 17, 2013 9:16 PM
> To: Luo Zhenhua-B19537
> Cc: meta-freescale@yoctoproject.org; Yu Zongchun-B40527
> Subject: Re: [meta-freescale] [meta-fsl-ppc master/dylan][PATCH] eth-
> config: use pattern match for xml files installation
> 
> On Fri, May 17, 2013 at 5:50 AM, Zhenhua Luo <zhenhua.luo@freescale.com>
> wrote:
> > Use pattern match to install xml files and no need to update recipe if
> > xml files are added, renamed or deleted.
> >
> > Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> 
> Has it been applied in master already?
> 
> It seems your process is inverted. You must send it to master and
> *later* ask for backporting it to dylan.
> 
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Otavio Salvador - May 17, 2013, 1:33 p.m.
On Fri, May 17, 2013 at 10:27 AM, Luo Zhenhua-B19537
<B19537@freescale.com> wrote:
> Since the patch can be applied on both dylan and master correctly, so I stated both branches in the subject.
>
> It has not been applied in master, I will resend it for master.
>
> What's the process if it needs to be applied for dylan?

You should wait it to be applied in master and later send a request to
backport it. Not at same time.

Except for critical fixes, it'd be better to wait some time for
testing in master before backporting it.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/recipes-tools/eth-config/eth-config_git.bb b/recipes-tools/eth-config/eth-config_git.bb
index f1e957c..3ed50a5 100644
--- a/recipes-tools/eth-config/eth-config_git.bb
+++ b/recipes-tools/eth-config/eth-config_git.bb
@@ -3,7 +3,7 @@  SECTION = "eth-config"
 LICENSE = "Freescale EULA"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cf02dc8eb5ac4a76f3812826520dea87"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/eth-config.git"
 SRCREV = "c1400695e56aa80f2f4c88c4e0582028248ae06f"
@@ -12,11 +12,8 @@  S = "${WORKDIR}/git"
 
 do_install() {
 	install -d ${D}/etc/fmc/config
-	install -m 644 ${S}/8c-128fq-p.xml ${D}/etc/fmc/config
-	install -m 644 ${S}/cfg-8c.xml ${D}/etc/fmc/config
+	install -m 644 ${S}/*.xml ${D}/etc/fmc/config
 	install -d ${D}/etc/fmc/config/shared_mac
-	install -m 644 ${S}/shared_mac/hv2p_config_p4_shared_mac.xml ${D}/etc/fmc/config/shared_mac
-	install -m 644 ${S}/shared_mac/hv2p_policy_shared_mac.xml ${D}/etc/fmc/config/shared_mac
-	install -m 644 ${S}/shared_mac/hv2p_swparser_shared_mac.xml ${D}/etc/fmc/config/shared_mac
+	install -m 644 ${S}/shared_mac/*.xml ${D}/etc/fmc/config/shared_mac
 	install -m 644 ${S}/shared_mac/README ${D}/etc/fmc/config/shared_mac
 }