From 457f051ba4a114f14f7bc72795a4835a94b8ddd4 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-core/systemd/systemd_%.bbappend | 5 +++++ recipes-core/systemd/systemd_206.bbappend | 7 ------- recipes-devtools/mtd/mtd-utils_%.bbappend | 3 +++ recipes-devtools/mtd/mtd-utils_1.5.0.bbappend | 3 --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend | 14 ++++++++++++++ .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend | 14 -------------- 6 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 recipes-core/systemd/systemd_%.bbappend delete mode 100644 recipes-core/systemd/systemd_206.bbappend create mode 100644 recipes-devtools/mtd/mtd-utils_%.bbappend delete mode 100644 recipes-devtools/mtd/mtd-utils_1.5.0.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 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-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend new file mode 100644 index 0000000..91e4c8f --- /dev/null +++ b/recipes-devtools/mtd/mtd-utils_%.bbappend @@ -0,0 +1,3 @@ +#EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" +#we want mkfs.ubifs binary to run on a 32 bit architecture, on x86-64 this requires the 32 bit compatibility libs +EXTRA_OEMAKE_class-native = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR -m32' 'BUILDDIR=${S}'" diff --git a/recipes-devtools/mtd/mtd-utils_1.5.0.bbappend b/recipes-devtools/mtd/mtd-utils_1.5.0.bbappend deleted file mode 100644 index 91e4c8f..0000000 --- a/recipes-devtools/mtd/mtd-utils_1.5.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -#EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" -#we want mkfs.ubifs binary to run on a 32 bit architecture, on x86-64 this requires the 32 bit compatibility libs -EXTRA_OEMAKE_class-native = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR -m32' 'BUILDDIR=${S}'" 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 -- cgit v1.2.3