From b18475d4d6af396ea535d485d64b9d95ea5398fa Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 19 Mar 2017 22:35:18 +0100 Subject: meta-handheld: use wildcards for the bbappend files This approach is a little more robust than pinning specific versions from other layers. Signed-off-by: Andrea Adami --- recipes-bsp/formfactor/formfactor_%.bbappend | 14 ++++++++++++ recipes-bsp/formfactor/formfactor_0.0.bbappend | 14 ------------ recipes-bsp/kexecboot/kexecboot_%.bbappend | 3 +++ recipes-bsp/kexecboot/kexecboot_0.6.bbappend | 3 --- recipes-bsp/keymaps/keymaps_%.bbappend | 25 ++++++++++++++++++++++ recipes-bsp/keymaps/keymaps_1.0.bbappend | 25 ---------------------- .../xorg-xserver/xserver-xf86-config_%.bbappend | 1 + .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 - 8 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 recipes-bsp/formfactor/formfactor_%.bbappend delete mode 100644 recipes-bsp/formfactor/formfactor_0.0.bbappend create mode 100644 recipes-bsp/kexecboot/kexecboot_%.bbappend delete mode 100644 recipes-bsp/kexecboot/kexecboot_0.6.bbappend create mode 100644 recipes-bsp/keymaps/keymaps_%.bbappend delete mode 100644 recipes-bsp/keymaps/keymaps_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 diff --git a/recipes-bsp/formfactor/formfactor_%.bbappend b/recipes-bsp/formfactor/formfactor_%.bbappend new file mode 100644 index 0000000..5c85433 --- /dev/null +++ b/recipes-bsp/formfactor/formfactor_%.bbappend @@ -0,0 +1,14 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +do_install_prepend () { + # provide machine-specific /etc/rotation for psplash + sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation +} + +do_install_append () { + # Only install file if it has a content + if [ -s "${S}/rotation" ]; then + install -d ${D}${sysconfdir} + install -m 0644 ${S}/rotation ${D}${sysconfdir}/rotation + fi +} diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644 index 5c85433..0000000 --- a/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -do_install_prepend () { - # provide machine-specific /etc/rotation for psplash - sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation -} - -do_install_append () { - # Only install file if it has a content - if [ -s "${S}/rotation" ]; then - install -d ${D}${sysconfdir} - install -m 0644 ${S}/rotation ${D}${sysconfdir}/rotation - fi -} diff --git a/recipes-bsp/kexecboot/kexecboot_%.bbappend b/recipes-bsp/kexecboot/kexecboot_%.bbappend new file mode 100644 index 0000000..61ba802 --- /dev/null +++ b/recipes-bsp/kexecboot/kexecboot_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +require kexecboot-handhelds.inc diff --git a/recipes-bsp/kexecboot/kexecboot_0.6.bbappend b/recipes-bsp/kexecboot/kexecboot_0.6.bbappend deleted file mode 100644 index 61ba802..0000000 --- a/recipes-bsp/kexecboot/kexecboot_0.6.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -require kexecboot-handhelds.inc diff --git a/recipes-bsp/keymaps/keymaps_%.bbappend b/recipes-bsp/keymaps/keymaps_%.bbappend new file mode 100644 index 0000000..e9f0159 --- /dev/null +++ b/recipes-bsp/keymaps/keymaps_%.bbappend @@ -0,0 +1,25 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append_c7x0 = " file://keymap-2.6.map" +SRC_URI_append_tosa = " file://keymap-2.6.map" +SRC_URI_append_akita = " file://keymap-2.6.map" +SRC_URI_append_spitz = " file://keymap-2.6.map" +SRC_URI_append_collie = " file://keymap-2.6.map" +SRC_URI_append_poodle = " file://keymap-2.6.map" +SRC_URI_append_hx4700 = " file://keymap-2.6.map" + +# we still use keymap-2.6.map files +do_configure_append () { + sed -i -e 's/KERNEL_MAJMIN=.*$/KERNEL_MAJMIN="2.6"/' ${WORKDIR}/keymap.sh +} + +do_install_append () { + case ${MACHINE} in + c7x0 | tosa | akita | spitz | collie | poodle | hx4700 ) + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} + ;; + *) + ;; + esac +} diff --git a/recipes-bsp/keymaps/keymaps_1.0.bbappend b/recipes-bsp/keymaps/keymaps_1.0.bbappend deleted file mode 100644 index e9f0159..0000000 --- a/recipes-bsp/keymaps/keymaps_1.0.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append_c7x0 = " file://keymap-2.6.map" -SRC_URI_append_tosa = " file://keymap-2.6.map" -SRC_URI_append_akita = " file://keymap-2.6.map" -SRC_URI_append_spitz = " file://keymap-2.6.map" -SRC_URI_append_collie = " file://keymap-2.6.map" -SRC_URI_append_poodle = " file://keymap-2.6.map" -SRC_URI_append_hx4700 = " file://keymap-2.6.map" - -# we still use keymap-2.6.map files -do_configure_append () { - sed -i -e 's/KERNEL_MAJMIN=.*$/KERNEL_MAJMIN="2.6"/' ${WORKDIR}/keymap.sh -} - -do_install_append () { - case ${MACHINE} in - c7x0 | tosa | akita | spitz | collie | poodle | hx4700 ) - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} - ;; - *) - ;; - esac -} 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..72d991c --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 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 72d991c..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -- cgit 1.2.3-korg