[meta-freescale] [meta-fsl-ppc][PATCH 1/2] udev-extraconf: add fsl specific rules back

[ting.liu at freescale.com]

> -----Original Message-----
> From: otavio.salvador at gmail.com [mailto:otavio.salvador at gmail.com] On Behalf
> Of Otavio Salvador
> Sent: Friday, January 16, 2015 7:41 PM
> To: Liu Ting-B28495
> Cc: meta-freescale at yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 1/2] udev-extraconf: add
> fsl specific rules back
> 
> Hello,
> 
> On Fri, Jan 16, 2015 at 8:22 AM,  <ting.liu at freescale.com> wrote:
> > From: Ting Liu <ting.liu at freescale.com>
> >
> > If both udev-extraconf and udev-rules-qoriq installed, file clashes
> > will happen. move fsl specific rules back to udev-extraconf
> >
> > Signed-off-by: Ting Liu <ting.liu at freescale.com>
> > ---
> >  conf/machine/include/qoriq-base.inc                              | 2 +-
> >  .../qoriq-ppc/automount.rules                                    | 1 +
> >  recipes-core/udev/udev-extraconf_%.bbappend                      | 9
> +++++++++
> >  recipes-core/udev/udev-rules-qoriq.bb                            | 5 -----
> >  4 files changed, 11 insertions(+), 6 deletions(-)  rename
> > recipes-core/udev/{udev-rules-qoriq =>
> > udev-extraconf}/qoriq-ppc/automount.rules (89%)  create mode 100644
> > recipes-core/udev/udev-extraconf_%.bbappend
> >
> > diff --git a/conf/machine/include/qoriq-base.inc
> > b/conf/machine/include/qoriq-base.inc
> > index 35ca79c..acb4e83 100644
> > --- a/conf/machine/include/qoriq-base.inc
> > +++ b/conf/machine/include/qoriq-base.inc
> > @@ -11,7 +11,7 @@ PREFERRED_VERSION_openssl = "1.0.1i"
> >
> >  # settings
> >  MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
> > -MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules"
> > +MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-
> modules"
> >  MACHINEOVERRIDES .= ":qoriq-ppc"
> >
> >  IMAGE_CLASSES += "image_types_uboot"
> > diff --git
> > a/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules
> > b/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules
> > similarity index 89%
> > rename from
> > recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules
> > rename to recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules
> > index a47efda..e1d75d7 100644
> > --- a/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules
> > +++ b/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules
> > @@ -18,6 +18,7 @@ SUBSYSTEM=="block", ENV{DEVTYPE}=="partition",
> GOTO="automount_end"
> >  # Media automounting
> >  SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
> >  SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
> > +SUBSYSTEM=="block", ACTION=="change", ENV{DISK_MEDIA_CHANGE}=="1"
> RUN+="/etc/udev/scripts/mount.sh"
> 
> You can avoid this and add a new 'automount-qoriq.rules' file with this.
[Liu Ting-B28495] will this file override automount.rules completely?

> 
> But could you explain what DISK_MEDIA_CHANGE will handle?
[Liu Ting-B28495] just sync with oe-core updates.

> 
> >  LABEL="automount_end"
> >
> > diff --git a/recipes-core/udev/udev-extraconf_%.bbappend
> > b/recipes-core/udev/udev-extraconf_%.bbappend
> > new file mode 100644
> > index 0000000..2b09465
> > --- /dev/null
> > +++ b/recipes-core/udev/udev-extraconf_%.bbappend
> > @@ -0,0 +1,9 @@
> > +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
> > +
> > +do_install_append_qoriq-ppc () {
> > +    # skip mmc rpmb partitions
> > +    echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist
> 
> Shouldn't rpmb partitions to be blacklisted in OE-Core?
[Liu Ting-B28495] will send the patch to oe-core.

> 
> > +    # skip nbd (network block device)
> > +    echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist
> > +}
> 
> Same here.
> 
> > diff --git a/recipes-core/udev/udev-rules-qoriq.bb
> > b/recipes-core/udev/udev-rules-qoriq.bb
> > index 546f9e8..6f06c02 100644
> > --- a/recipes-core/udev/udev-rules-qoriq.bb
> > +++ b/recipes-core/udev/udev-rules-qoriq.bb
> > @@ -14,10 +14,5 @@ RULE_t1024 = "72-fsl-dpaa-persistent-networking.rules"
> >  do_install () {
> >      install -d ${D}${sysconfdir}/udev/rules.d/
> >      install -m 0644 ${WORKDIR}/${RULE}
> > ${D}${sysconfdir}/udev/rules.d/
> > -
> > -    # skip mmc rpmb partitions
> > -    echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist
> > -    # skip nbd (network block device)
> > -    echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist
> >  }
> >
> > --
> > 1.9.1
> >
> > --
> > _______________________________________________
> > meta-freescale mailing list
> > meta-freescale at yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-freescale
> 
> 
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750