[RFC][PATCH 1/2] systemd: port our own custom rules from old udev

[RFC][PATCH 1/2] systemd: port our own custom rules from old udev

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/systemd/systemd/local.rules       | 26 ++++++++++++++++++++++
 .../recipes-core/systemd/systemd/usb1-rules.sh     |  3 +++
 .../recipes-core/systemd/systemd/usb2-rules.sh     |  3 +++
 .../recipes-core/systemd/systemd_%.bbappend        | 17 +++++++++++---
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 meta-arago-distro/recipes-core/systemd/systemd/local.rules
 create mode 100755 meta-arago-distro/recipes-core/systemd/systemd/usb1-rules.sh
 create mode 100755 meta-arago-distro/recipes-core/systemd/systemd/usb2-rules.sh

diff --git a/meta-arago-distro/recipes-core/systemd/systemd/local.rules b/meta-arago-distro/recipes-core/systemd/systemd/local.rules
new file mode 100644
index 0000000..689e093
--- /dev/null
+++ b/meta-arago-distro/recipes-core/systemd/systemd/local.rules
@@ -0,0 +1,26 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", SYMLINK+="input/touchscreen0"
+
+# Auto-mount any SD cards
+ACTION=="add", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
+ACTION=="remove", KERNEL=="mmcblk[0-9]p[0-9]", SUBSYSTEM=="block", RUN+="/etc/udev/scripts/mount.sh"
+ACTION=="add", DEVPATH=="/devices/44000000\.ocp/48880000\.omap_dwc3_1/48890000\.usb/udc*", RUN+="/usr/bin/usb1-rules.sh"
+ACTION=="add", DEVPATH=="/devices/44000000\.ocp/488c0000\.omap_dwc3_2/488d0000\.usb/udc*", RUN+="/usr/bin/usb2-rules.sh"
diff --git a/meta-arago-distro/recipes-core/systemd/systemd/usb1-rules.sh b/meta-arago-distro/recipes-core/systemd/systemd/usb1-rules.sh
new file mode 100755
index 0000000..51dfd71
--- /dev/null
+++ b/meta-arago-distro/recipes-core/systemd/systemd/usb1-rules.sh
@@ -0,0 +1,3 @@
+#!bin/sh
+/sbin/modprobe g_ncm -r
+/sbin/modprobe g_ncm
diff --git a/meta-arago-distro/recipes-core/systemd/systemd/usb2-rules.sh b/meta-arago-distro/recipes-core/systemd/systemd/usb2-rules.sh
new file mode 100755
index 0000000..f00565e
--- /dev/null
+++ b/meta-arago-distro/recipes-core/systemd/systemd/usb2-rules.sh
@@ -0,0 +1,3 @@
+#!bin/sh
+/sbin/modprobe g_zero -r
+/sbin/modprobe g_zero
diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
index 5556eea..3fbe57e 100644
--- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
@@ -1,6 +1,17 @@
-PR_append = ".arago0"
+PR_append = ".arago1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " \
+                  file://local.rules \
+                  file://usb1-rules.sh \
+                  file://usb2-rules.sh"
 
 do_install_append() {
-    install -d ${D}/${base_libdir}
-    ln -sf libudev.so.1 ${D}${base_libdir}/libudev.so.0
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/
+
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/usb1-rules.sh ${D}${bindir}/usb1-rules.sh
+    install -m 0755 ${WORKDIR}/usb2-rules.sh ${D}${bindir}/usb2-rules.sh
 }
-- 
2.2.0

[RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Touchscreen calibration and other customizations are required from initscript

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend  | 5 ++++-
 meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 78a839f..041e5ab 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago6"
+PR_append = ".arago7"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -9,4 +9,7 @@ SRC_URI_append = " \
 do_install_append() {
     install -d ${D}${bindir}
     install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
+    rm -rf ${D}${systemd_system_unitdir}
 }
+
+SYSTEMD_SERVICE_${PN} = ""
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
index 6ef574a..aed5d5f 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 clear
 cat << EOF
-- 
2.2.0

Re: [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

[Balagopalakrishnan, Anand]

Instead of the following: 
> +    rm -rf ${D}${systemd_system_unitdir}

should you have this line:
rm -f ${D}${systemd_system_unitdir}/weston.service

Regards,
Anand

-----Original Message-----
From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
Sent: Tuesday, May 17, 2016 10:31 AM
To: meta-arago@arago-project.org
Subject: [meta-arago] [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

From: Denys Dmytriyenko <denys@ti.com>

Touchscreen calibration and other customizations are required from initscript

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend  | 5 ++++-  meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 78a839f..041e5ab 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago6"
+PR_append = ".arago7"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -9,4 +9,7 @@ SRC_URI_append = " \
 do_install_append() {
     install -d ${D}${bindir}
     install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
+    rm -rf ${D}${systemd_system_unitdir}
 }
+
+SYSTEMD_SERVICE_${PN} = ""
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
index 6ef574a..aed5d5f 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 clear
 cat << EOF
--
2.2.0

_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

[Denys Dmytriyenko]

On Wed, May 18, 2016 at 07:23:59AM +0000, Balagopalakrishnan, Anand wrote:
> Instead of the following: 
> > +    rm -rf ${D}${systemd_system_unitdir}
> 
> should you have this line:
> rm -f ${D}${systemd_system_unitdir}/weston.service

Why?


> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> Sent: Tuesday, May 17, 2016 10:31 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript
> 
> From: Denys Dmytriyenko <denys@ti.com>
> 
> Touchscreen calibration and other customizations are required from initscript
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend  | 5 ++++-  meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston | 2 +-
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> index 78a839f..041e5ab 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> @@ -1,4 +1,4 @@
> -PR_append = ".arago6"
> +PR_append = ".arago7"
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
> @@ -9,4 +9,7 @@ SRC_URI_append = " \
>  do_install_append() {
>      install -d ${D}${bindir}
>      install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
> +    rm -rf ${D}${systemd_system_unitdir}
>  }
> +
> +SYSTEMD_SERVICE_${PN} = ""
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> index 6ef574a..aed5d5f 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>  
>  clear
>  cat << EOF
> --
> 2.2.0
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

[Balagopalakrishnan, Anand]

On the target filesystem, I see that weston.service is installed to /lib/systemd/system. If you delete ${systemd_system_unitdir}, will those files also be removed?

Regards,
Anand
________________________________________
From: Dmytriyenko, Denys
Sent: Wednesday, May 18, 2016 9:29 PM
To: Balagopalakrishnan, Anand
Cc: Denys Dmytriyenko; meta-arago@arago-project.org
Subject: Re: [meta-arago] [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

On Wed, May 18, 2016 at 07:23:59AM +0000, Balagopalakrishnan, Anand wrote:
> Instead of the following:
> > +    rm -rf ${D}${systemd_system_unitdir}
>
> should you have this line:
> rm -f ${D}${systemd_system_unitdir}/weston.service

Why?


> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> Sent: Tuesday, May 17, 2016 10:31 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Touchscreen calibration and other customizations are required from initscript
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend  | 5 ++++-  meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston | 2 +-
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> index 78a839f..041e5ab 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> @@ -1,4 +1,4 @@
> -PR_append = ".arago6"
> +PR_append = ".arago7"
>
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> @@ -9,4 +9,7 @@ SRC_URI_append = " \
>  do_install_append() {
>      install -d ${D}${bindir}
>      install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
> +    rm -rf ${D}${systemd_system_unitdir}
>  }
> +
> +SYSTEMD_SERVICE_${PN} = ""
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> index 6ef574a..aed5d5f 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
>  clear
>  cat << EOF
> --
> 2.2.0
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript

[Denys Dmytriyenko]

On Wed, May 18, 2016 at 12:19:05PM -0400, Balagopalakrishnan, Anand wrote:
> On the target filesystem, I see that weston.service is installed to 
> /lib/systemd/system. If you delete ${systemd_system_unitdir}, will those 
> files also be removed?

There are no other files in that directory coming from this package. So, this 
package doesn't need that directory, as it will be empty. The package is only 
responsible for the files and directories it provides, not for the entire 
rootfs.

-- 
Denys


> ________________________________________
> From: Dmytriyenko, Denys
> Sent: Wednesday, May 18, 2016 9:29 PM
> To: Balagopalakrishnan, Anand
> Cc: Denys Dmytriyenko; meta-arago@arago-project.org
> Subject: Re: [meta-arago] [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript
> 
> On Wed, May 18, 2016 at 07:23:59AM +0000, Balagopalakrishnan, Anand wrote:
> > Instead of the following:
> > > +    rm -rf ${D}${systemd_system_unitdir}
> >
> > should you have this line:
> > rm -f ${D}${systemd_system_unitdir}/weston.service
> 
> Why?
> 
> 
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> > Sent: Tuesday, May 17, 2016 10:31 AM
> > To: meta-arago@arago-project.org
> > Subject: [meta-arago] [RFC][PATCH 2/2] weston-init: disable systemd service to fall back to old initscript
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Touchscreen calibration and other customizations are required from initscript
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >  meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend  | 5 ++++-  meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston | 2 +-
> >  2 files changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> > index 78a839f..041e5ab 100644
> > --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> > +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
> > @@ -1,4 +1,4 @@
> > -PR_append = ".arago6"
> > +PR_append = ".arago7"
> >
> >  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >
> > @@ -9,4 +9,7 @@ SRC_URI_append = " \
> >  do_install_append() {
> >      install -d ${D}${bindir}
> >      install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
> > +    rm -rf ${D}${systemd_system_unitdir}
> >  }
> > +
> > +SYSTEMD_SERVICE_${PN} = ""
> > diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> > index 6ef574a..aed5d5f 100644
> > --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> > +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston
> > @@ -1,4 +1,4 @@
> > -#!/bin/bash
> > +#!/bin/sh
> >
> >  clear
> >  cat << EOF
> > --
> > 2.2.0
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>