From 299f84cceccacd84651c1cefc1c34e66fb598a96 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 22 Apr 2014 10:00:33 -0300
Subject: Use generic bbappend files

This uses the % wildcard for recipe matching, this easy the update of
recipe versions and maintenance.

 - udev-extraconf_1.0.bbappend
 - xserver-xf86-config_0.1.bbappend
 - lttng-modules_2.3.3.bbappend

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-core/udev/udev-extraconf_%.bbappend            | 12 ++++++++++++
 recipes-core/udev/udev-extraconf_1.0.bbappend          | 12 ------------
 .../xorg-xserver/xserver-xf86-config_%.bbappend        |  3 +++
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend      |  3 ---
 recipes-kernel/lttng/lttng-modules_%.bbappend          | 18 ++++++++++++++++++
 recipes-kernel/lttng/lttng-modules_2.3.3.bbappend      | 18 ------------------
 6 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 recipes-core/udev/udev-extraconf_%.bbappend
 delete mode 100644 recipes-core/udev/udev-extraconf_1.0.bbappend
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
 delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
 create mode 100644 recipes-kernel/lttng/lttng-modules_%.bbappend
 delete mode 100644 recipes-kernel/lttng/lttng-modules_2.3.3.bbappend

diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
new file mode 100644
index 0000000..056d037
--- /dev/null
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 2}"
+
+SRC_URI_append = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \
+    "72-fsl-dpaa-persistent-networking.rules", "71-fsl-dpaa-persistent-networking.rules", d)}"
+
+do_install_append () {
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/*-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d
+}
+
diff --git a/recipes-core/udev/udev-extraconf_1.0.bbappend b/recipes-core/udev/udev-extraconf_1.0.bbappend
deleted file mode 100644
index 056d037..0000000
--- a/recipes-core/udev/udev-extraconf_1.0.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-SRC_URI_append = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \
-    "72-fsl-dpaa-persistent-networking.rules", "71-fsl-dpaa-persistent-networking.rules", d)}"
-
-do_install_append () {
-    install -d ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/*-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d
-}
-
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
new file mode 100644
index 0000000..7ae4ec2
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index 7ae4ec2..0000000
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 1}"
diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend
new file mode 100644
index 0000000..5415f16
--- /dev/null
+++ b/recipes-kernel/lttng/lttng-modules_%.bbappend
@@ -0,0 +1,18 @@
+inherit distro_features_check
+
+REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch"
+
+python () {
+
+        promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
+
+        if promote_kernel == "1":
+                d.appendVar('KERNEL_CC', ' -m64')
+                d.appendVar('KERNEL_LD', ' -melf64ppc')
+
+        
+        error_qa = d.getVar('ERROR_QA', True)
+        if 'arch' in error_qa:
+            d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
+
+}
diff --git a/recipes-kernel/lttng/lttng-modules_2.3.3.bbappend b/recipes-kernel/lttng/lttng-modules_2.3.3.bbappend
deleted file mode 100644
index 5415f16..0000000
--- a/recipes-kernel/lttng/lttng-modules_2.3.3.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-inherit distro_features_check
-
-REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch"
-
-python () {
-
-        promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-        if promote_kernel == "1":
-                d.appendVar('KERNEL_CC', ' -m64')
-                d.appendVar('KERNEL_LD', ' -melf64ppc')
-
-        
-        error_qa = d.getVar('ERROR_QA', True)
-        if 'arch' in error_qa:
-            d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-
-}
-- 
cgit v1.2.3-54-g00ecf