From 617e615193dd297f1cb5e4be29677c7e24803d97 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 9 Aug 2016 16:54:38 +0200 Subject: meta-openembedded layer bbappends Move the appends on recipe's which are not in an essential required layer into a target layer specific directory and add them only if said layer is active in build/conf/bblayers.conf. Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- .../recipes-multimedia/webm/libvpx_%.bbappend | 10 ++++ .../recipes-support/libusbg/libusbg/g1.schema | 65 ++++++++++++++++++++++ .../recipes-support/libusbg/libusbg/usbg.service | 17 ++++++ .../recipes-support/libusbg/libusbg_git.bbappend | 25 +++++++++ recipes-multimedia/webm/libvpx_%.bbappend | 10 ---- recipes-support/libusbg/libusbg/g1.schema | 65 ---------------------- recipes-support/libusbg/libusbg/usbg.service | 17 ------ recipes-support/libusbg/libusbg_git.bbappend | 25 --------- 8 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 openembedded-layer/recipes-multimedia/webm/libvpx_%.bbappend create mode 100644 openembedded-layer/recipes-support/libusbg/libusbg/g1.schema create mode 100644 openembedded-layer/recipes-support/libusbg/libusbg/usbg.service create mode 100644 openembedded-layer/recipes-support/libusbg/libusbg_git.bbappend delete mode 100644 recipes-multimedia/webm/libvpx_%.bbappend delete mode 100644 recipes-support/libusbg/libusbg/g1.schema delete mode 100644 recipes-support/libusbg/libusbg/usbg.service delete mode 100644 recipes-support/libusbg/libusbg_git.bbappend diff --git a/openembedded-layer/recipes-multimedia/webm/libvpx_%.bbappend b/openembedded-layer/recipes-multimedia/webm/libvpx_%.bbappend new file mode 100644 index 0000000..b5ebaf0 --- /dev/null +++ b/openembedded-layer/recipes-multimedia/webm/libvpx_%.bbappend @@ -0,0 +1,10 @@ +PACKAGE_ARCH = "${MACHINE_ARCH}" + +#T20 does not have neon, but the armv7-linux-gcc assumes that the target has a neon unit +VPXTARGET_armv7a_tegra2 = "armv6-linux-gcc" +VPXTARGET_armv7a_qemuarm = "armv6-linux-gcc" + +CFLAGS_append_tegra3 = " -mfpu=neon -funsafe-math-optimizations -ftree-vectorize " +CFLAGS_append_mx6 = " -mfpu=neon -funsafe-math-optimizations -ftree-vectorize " +CFLAGS_append_mx7 = " -mfpu=neon -funsafe-math-optimizations -ftree-vectorize " +CONFIGUREOPTS += " --enable-runtime-cpu-detect " diff --git a/openembedded-layer/recipes-support/libusbg/libusbg/g1.schema b/openembedded-layer/recipes-support/libusbg/libusbg/g1.schema new file mode 100644 index 0000000..ebe91b4 --- /dev/null +++ b/openembedded-layer/recipes-support/libusbg/libusbg/g1.schema @@ -0,0 +1,65 @@ +attrs : +{ + bcdUSB = 0x0; + bDeviceClass = 0x0; + bDeviceSubClass = 0x0; + bDeviceProtocol = 0x0; + bMaxPacketSize0 = 0x40; + idVendor = 0x1d6b; + idProduct = 0x0104; + bcdDevice = 0x400; +}; +strings = ( + { + lang = 0x409; + manufacturer = "Toradex"; + product = "Unknown"; + serialnumber = ""; + } ); +functions : +{ + acm_GS0 : + { + instance = "GS0"; + type = "acm"; + attrs : + { + port_num = 0; + }; + }; + rndis_0 : + { + instance = "0"; + type = "rndis"; + attrs : + { + dev_addr = "00:14:2d:ff:ff:ff"; + host_addr = "00:14:2d:ff:ff:fe"; + qmult = 5; + }; + }; +}; +configs = ( + { + id = 1; + name = "c"; + attrs : + { + bmAttributes = 0x80; + bMaxPower = 0x2; + }; + strings = ( + { + lang = 0x409; + configuration = "Conf 1"; + } ); + functions = ( + { + name = "acm.GS0"; + function = "acm_GS0"; + }, + { + name = "rndis.0"; + function = "rndis_0"; + } ); + } ); diff --git a/openembedded-layer/recipes-support/libusbg/libusbg/usbg.service b/openembedded-layer/recipes-support/libusbg/libusbg/usbg.service new file mode 100644 index 0000000..19863d0 --- /dev/null +++ b/openembedded-layer/recipes-support/libusbg/libusbg/usbg.service @@ -0,0 +1,17 @@ +[Unit] +Description=Load default USB gadget schema g1.schema +ConditionPathExists=/etc/usbg/g1.schema +Before=systemd-networkd.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/gadget-import g1 /etc/usbg/g1.schema +ExecStartPost=/bin/sh -c '/bin/cat /proc/device-tree/model > \ + /sys/kernel/config/usb_gadget/g1/strings/0x409/product' +ExecStartPost=/bin/sh -c '/bin/cat /proc/device-tree/serial-number > \ + /sys/kernel/config/usb_gadget/g1/strings/0x409/serialnumber' +ExecStartPost=/bin/sh -c '/bin/echo `ls /sys/class/udc/` > \ + /sys/kernel/config/usb_gadget/g1/UDC' + +[Install] +WantedBy=multi-user.target diff --git a/openembedded-layer/recipes-support/libusbg/libusbg_git.bbappend b/openembedded-layer/recipes-support/libusbg/libusbg_git.bbappend new file mode 100644 index 0000000..ceb009d --- /dev/null +++ b/openembedded-layer/recipes-support/libusbg/libusbg_git.bbappend @@ -0,0 +1,25 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/libusbg:" + +PV = "0.1.0-git" + +SRCREV = "93631e618436989ebd7e9df2c997c175feb14bda" +SRC_URI = "git://github.com/kopasiak/libusbg.git \ + file://usbg.service \ + file://g1.schema \ +" + +DEPENDS = "libconfig" + +inherit autotools pkgconfig systemd + +do_install_append () { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/usbg.service ${D}${systemd_unitdir}/system + + install -d ${D}${sysconfdir}/usbg/ + install -m 0644 ${WORKDIR}/g1.schema ${D}${sysconfdir}/usbg/g1.schema +} + +NATIVE_SYSTEMD_SUPPORT = "1" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "usbg.service" diff --git a/recipes-multimedia/webm/libvpx_%.bbappend b/recipes-multimedia/webm/libvpx_%.bbappend deleted file mode 100644 index b5ebaf0..0000000 --- a/recipes-multimedia/webm/libvpx_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -PACKAGE_ARCH = "${MACHINE_ARCH}" - -#T20 does not have neon, but the armv7-linux-gcc assumes that the target has a neon unit -VPXTARGET_armv7a_tegra2 = "armv6-linux-gcc" -VPXTARGET_armv7a_qemuarm = "armv6-linux-gcc" - -CFLAGS_append_tegra3 = " -mfpu=neon -funsafe-math-optimizations -ftree-vectorize " -CFLAGS_append_mx6 = " -mfpu=neon -funsafe-math-optimizations -ftree-vectorize " -CFLAGS_append_mx7 = " -mfpu=neon -funsafe-math-optimizations -ftree-vectorize " -CONFIGUREOPTS += " --enable-runtime-cpu-detect " diff --git a/recipes-support/libusbg/libusbg/g1.schema b/recipes-support/libusbg/libusbg/g1.schema deleted file mode 100644 index ebe91b4..0000000 --- a/recipes-support/libusbg/libusbg/g1.schema +++ /dev/null @@ -1,65 +0,0 @@ -attrs : -{ - bcdUSB = 0x0; - bDeviceClass = 0x0; - bDeviceSubClass = 0x0; - bDeviceProtocol = 0x0; - bMaxPacketSize0 = 0x40; - idVendor = 0x1d6b; - idProduct = 0x0104; - bcdDevice = 0x400; -}; -strings = ( - { - lang = 0x409; - manufacturer = "Toradex"; - product = "Unknown"; - serialnumber = ""; - } ); -functions : -{ - acm_GS0 : - { - instance = "GS0"; - type = "acm"; - attrs : - { - port_num = 0; - }; - }; - rndis_0 : - { - instance = "0"; - type = "rndis"; - attrs : - { - dev_addr = "00:14:2d:ff:ff:ff"; - host_addr = "00:14:2d:ff:ff:fe"; - qmult = 5; - }; - }; -}; -configs = ( - { - id = 1; - name = "c"; - attrs : - { - bmAttributes = 0x80; - bMaxPower = 0x2; - }; - strings = ( - { - lang = 0x409; - configuration = "Conf 1"; - } ); - functions = ( - { - name = "acm.GS0"; - function = "acm_GS0"; - }, - { - name = "rndis.0"; - function = "rndis_0"; - } ); - } ); diff --git a/recipes-support/libusbg/libusbg/usbg.service b/recipes-support/libusbg/libusbg/usbg.service deleted file mode 100644 index 19863d0..0000000 --- a/recipes-support/libusbg/libusbg/usbg.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Load default USB gadget schema g1.schema -ConditionPathExists=/etc/usbg/g1.schema -Before=systemd-networkd.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/gadget-import g1 /etc/usbg/g1.schema -ExecStartPost=/bin/sh -c '/bin/cat /proc/device-tree/model > \ - /sys/kernel/config/usb_gadget/g1/strings/0x409/product' -ExecStartPost=/bin/sh -c '/bin/cat /proc/device-tree/serial-number > \ - /sys/kernel/config/usb_gadget/g1/strings/0x409/serialnumber' -ExecStartPost=/bin/sh -c '/bin/echo `ls /sys/class/udc/` > \ - /sys/kernel/config/usb_gadget/g1/UDC' - -[Install] -WantedBy=multi-user.target diff --git a/recipes-support/libusbg/libusbg_git.bbappend b/recipes-support/libusbg/libusbg_git.bbappend deleted file mode 100644 index ceb009d..0000000 --- a/recipes-support/libusbg/libusbg_git.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/libusbg:" - -PV = "0.1.0-git" - -SRCREV = "93631e618436989ebd7e9df2c997c175feb14bda" -SRC_URI = "git://github.com/kopasiak/libusbg.git \ - file://usbg.service \ - file://g1.schema \ -" - -DEPENDS = "libconfig" - -inherit autotools pkgconfig systemd - -do_install_append () { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/usbg.service ${D}${systemd_unitdir}/system - - install -d ${D}${sysconfdir}/usbg/ - install -m 0644 ${WORKDIR}/g1.schema ${D}${sysconfdir}/usbg/g1.schema -} - -NATIVE_SYSTEMD_SUPPORT = "1" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "usbg.service" -- cgit v1.2.3