From 5e1b56acd6d86b499355b278d46c78cdcecfb57a Mon Sep 17 00:00:00 2001 From: Max Krummenacher 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 ---------- recipes-core/systemd/systemd_%.bbappend | 5 +++++ recipes-core/systemd/systemd_206.bbappend | 7 ------- recipes-gnome/gdk-pixbuf/gdk-pixbuf_%.bbappend | 2 ++ recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bbappend | 5 ----- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend | 14 ++++++++++++++ .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend | 14 -------------- recipes-support/libfm/libfm_%.bbappend | 3 +++ recipes-support/libfm/libfm_1.1.0.bbappend | 5 ----- 12 files changed, 38 insertions(+), 48 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 create mode 100644 recipes-core/systemd/systemd_%.bbappend delete mode 100644 recipes-core/systemd/systemd_206.bbappend create mode 100644 recipes-gnome/gdk-pixbuf/gdk-pixbuf_%.bbappend delete mode 100644 recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bbappend create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend create mode 100644 recipes-support/libfm/libfm_%.bbappend delete mode 100644 recipes-support/libfm/libfm_1.1.0.bbappend 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" diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 0000000..c099bda --- /dev/null +++ b/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://journald-conf.patch \ +" diff --git a/recipes-core/systemd/systemd_206.bbappend b/recipes-core/systemd/systemd_206.bbappend deleted file mode 100644 index b93053e..0000000 --- a/recipes-core/systemd/systemd_206.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -PRINC = "4" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://journald-conf.patch \ -" diff --git a/recipes-gnome/gdk-pixbuf/gdk-pixbuf_%.bbappend b/recipes-gnome/gdk-pixbuf/gdk-pixbuf_%.bbappend new file mode 100644 index 0000000..3e93d15 --- /dev/null +++ b/recipes-gnome/gdk-pixbuf/gdk-pixbuf_%.bbappend @@ -0,0 +1,2 @@ +# build for x11, at least lxpanel needs this +PACKAGECONFIG_append = " x11" diff --git a/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bbappend b/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bbappend deleted file mode 100644 index d28ef3c..0000000 --- a/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.2.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PRINC = "1" -# build for x11, at least lxpanel needs this -DEPENDS += "virtual/libx11" - -X11DEPENDS += "--with-x11" diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend new file mode 100644 index 0000000..690f420 --- /dev/null +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend @@ -0,0 +1,14 @@ +# meta package to pull in the libries, but not the (huge) samples +PACKAGES =+ "gpu-viv-bin-mx6q-libraries " +FILES_gpu-viv-bin-mx6q-libraries = "" +ALLOW_EMPTY_gpu-viv-bin-mx6q-libraries = "1" +RDEPENDS_gpu-viv-bin-mx6q-libraries = " \ + libclc-mx6 \ + libegl-mx6 \ + libgles-mx6 \ + libgles2-mx6 \ + libglslc-mx6 \ + libopencl-mx6 \ + libopenvg-mx6 \ + libvdk-mx6 \ +" \ No newline at end of file diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend deleted file mode 100644 index 690f420..0000000 --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -# meta package to pull in the libries, but not the (huge) samples -PACKAGES =+ "gpu-viv-bin-mx6q-libraries " -FILES_gpu-viv-bin-mx6q-libraries = "" -ALLOW_EMPTY_gpu-viv-bin-mx6q-libraries = "1" -RDEPENDS_gpu-viv-bin-mx6q-libraries = " \ - libclc-mx6 \ - libegl-mx6 \ - libgles-mx6 \ - libgles2-mx6 \ - libglslc-mx6 \ - libopencl-mx6 \ - libopenvg-mx6 \ - libvdk-mx6 \ -" \ No newline at end of file diff --git a/recipes-support/libfm/libfm_%.bbappend b/recipes-support/libfm/libfm_%.bbappend new file mode 100644 index 0000000..fc8b8e9 --- /dev/null +++ b/recipes-support/libfm/libfm_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://libfm_set_terminal.patch" diff --git a/recipes-support/libfm/libfm_1.1.0.bbappend b/recipes-support/libfm/libfm_1.1.0.bbappend deleted file mode 100644 index 19724f2..0000000 --- a/recipes-support/libfm/libfm_1.1.0.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PRINC = "1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://libfm_set_terminal.patch" -- cgit v1.2.3