From 5e1b56acd6d86b499355b278d46c78cdcecfb57a Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sun, 8 Jun 2014 15:04:17 +0200
Subject: Use generic bbappend files

This uses the % wildcard for recipe matching.
remove the deprecated PRINC variable while at it.
---
 recipes-connectivity/connman/connman_%.bbappend     |  5 +++++
 recipes-connectivity/connman/connman_1.17.bbappend  |  7 -------
 recipes-connectivity/openssh/openssh_%.bbappend     |  9 +++++++++
 recipes-connectivity/openssh/openssh_6.2p2.bbappend | 10 ----------
 4 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 recipes-connectivity/connman/connman_%.bbappend
 delete mode 100644 recipes-connectivity/connman/connman_1.17.bbappend
 create mode 100644 recipes-connectivity/openssh/openssh_%.bbappend
 delete mode 100644 recipes-connectivity/openssh/openssh_6.2p2.bbappend

(limited to 'recipes-connectivity')

diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
new file mode 100644
index 0000000..8eef424
--- /dev/null
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+    file://dont_start_connman_on_nfsboot.patch \
+"
diff --git a/recipes-connectivity/connman/connman_1.17.bbappend b/recipes-connectivity/connman/connman_1.17.bbappend
deleted file mode 100644
index 94fcfd6..0000000
--- a/recipes-connectivity/connman/connman_1.17.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-PRINC = "1"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-    file://dont_start_connman_on_nfsboot.patch \
-"
diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend
new file mode 100644
index 0000000..c83c4f48
--- /dev/null
+++ b/recipes-connectivity/openssh/openssh_%.bbappend
@@ -0,0 +1,9 @@
+PACKAGES =+ "${PN}-scp-dev ${PN}-sftp-dev ${PN}-sftp-server-dev"
+PACKAGES =+ "${PN}-scp-dbg ${PN}-sftp-dbg ${PN}-sftp-server-dbg"
+
+FILES_${PN}-scp-dev = ""
+FILES_${PN}-sftp-dev = ""
+FILES_${PN}-sftp-server-dev = ""
+FILES_${PN}-scp-dbg = "${bindir}/.debug/scp.${BPN}"
+FILES_${PN}-sftp-dbg = "${bindir}/.debug/sftp"
+FILES_${PN}-sftp-server-dbg = "${libexecdir}/.debug/sftp-server"
diff --git a/recipes-connectivity/openssh/openssh_6.2p2.bbappend b/recipes-connectivity/openssh/openssh_6.2p2.bbappend
deleted file mode 100644
index aa7013a..0000000
--- a/recipes-connectivity/openssh/openssh_6.2p2.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-PRINC := "${@int(PRINC) + 3}"
-PACKAGES =+ "${PN}-scp-dev ${PN}-sftp-dev ${PN}-sftp-server-dev"
-PACKAGES =+ "${PN}-scp-dbg ${PN}-sftp-dbg ${PN}-sftp-server-dbg"
-
-FILES_${PN}-scp-dev = ""
-FILES_${PN}-sftp-dev = ""
-FILES_${PN}-sftp-server-dev = ""
-FILES_${PN}-scp-dbg = "${bindir}/.debug/scp.${BPN}"
-FILES_${PN}-sftp-dbg = "${bindir}/.debug/sftp"
-FILES_${PN}-sftp-server-dbg = "${libexecdir}/.debug/sftp-server"
-- 
cgit v1.2.3