From b825f32ccdb4a5873b1cf5941849f2d95a8c32d2 Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Tue, 19 Jun 2018 14:24:44 +0100 Subject: meta-raspberrypi: use `_%` suffix instead of specific versions for bbappends Keep naming consistency and ensure they are still applied when the upstream recipes are updated. Signed-off-by: Hugo Hromic --- recipes-bsp/formfactor/formfactor_%.bbappend | 1 + recipes-bsp/formfactor/formfactor_0.0.bbappend | 1 - recipes-core/psplash/psplash_%.bbappend | 4 ++++ recipes-core/psplash/psplash_git.bbappend | 4 ---- .../xorg-xserver/xserver-xf86-config_%.bbappend | 21 +++++++++++++++++++++ .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 21 --------------------- recipes-multimedia/x264/x264_%.bbappend | 2 ++ recipes-multimedia/x264/x264_git.bbappend | 2 -- 8 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 recipes-bsp/formfactor/formfactor_%.bbappend delete mode 100644 recipes-bsp/formfactor/formfactor_0.0.bbappend create mode 100644 recipes-core/psplash/psplash_%.bbappend delete mode 100644 recipes-core/psplash/psplash_git.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-multimedia/x264/x264_%.bbappend delete mode 100644 recipes-multimedia/x264/x264_git.bbappend diff --git a/recipes-bsp/formfactor/formfactor_%.bbappend b/recipes-bsp/formfactor/formfactor_%.bbappend new file mode 100644 index 0000000..72d991c --- /dev/null +++ b/recipes-bsp/formfactor/formfactor_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644 index 72d991c..0000000 --- a/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes-core/psplash/psplash_%.bbappend b/recipes-core/psplash/psplash_%.bbappend new file mode 100644 index 0000000..698564b --- /dev/null +++ b/recipes-core/psplash/psplash_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SPLASH_IMAGES_append_rpi = " file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" +ALTERNATIVE_PRIORITY_psplash-raspberrypi[psplash] = "10" + diff --git a/recipes-core/psplash/psplash_git.bbappend b/recipes-core/psplash/psplash_git.bbappend deleted file mode 100644 index 698564b..0000000 --- a/recipes-core/psplash/psplash_git.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SPLASH_IMAGES_append_rpi = " file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" -ALTERNATIVE_PRIORITY_psplash-raspberrypi[psplash] = "10" - 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..919e95e --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_rpi = " \ + file://xorg.conf.d/98-pitft.conf \ + file://xorg.conf.d/99-calibration.conf \ + file://xorg.conf.d/10-noglamor.conf \ +" +do_install_append_rpi () { + PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" + VC4="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" + if [ "${PITFT}" = "1" ]; then + install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ + install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ + install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ + fi + if [ "${VC4}" = "1" ]; then + install -Dm 0644 ${WORKDIR}/xorg.conf.d/10-noglamor.conf ${D}/${sysconfdir}/X11/xorg.conf.d/10-noglamor.conf + fi +} + +FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" 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 919e95e..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_rpi = " \ - file://xorg.conf.d/98-pitft.conf \ - file://xorg.conf.d/99-calibration.conf \ - file://xorg.conf.d/10-noglamor.conf \ -" -do_install_append_rpi () { - PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" - VC4="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" - if [ "${PITFT}" = "1" ]; then - install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ - install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ - install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ - fi - if [ "${VC4}" = "1" ]; then - install -Dm 0644 ${WORKDIR}/xorg.conf.d/10-noglamor.conf ${D}/${sysconfdir}/X11/xorg.conf.d/10-noglamor.conf - fi -} - -FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" diff --git a/recipes-multimedia/x264/x264_%.bbappend b/recipes-multimedia/x264/x264_%.bbappend new file mode 100644 index 0000000..505719e --- /dev/null +++ b/recipes-multimedia/x264/x264_%.bbappend @@ -0,0 +1,2 @@ +EXTRA_OECONF_append_raspberrypi = " --disable-asm" +EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm" diff --git a/recipes-multimedia/x264/x264_git.bbappend b/recipes-multimedia/x264/x264_git.bbappend deleted file mode 100644 index 505719e..0000000 --- a/recipes-multimedia/x264/x264_git.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_OECONF_append_raspberrypi = " --disable-asm" -EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm" -- cgit v1.2.3-54-g00ecf