[meta-virtualization] [PATCH] bbappend: switch to use a wildcard beyond major version
Bruce Ashfield
bruce.ashfield at gmail.com
Tue Sep 8 07:02:41 PDT 2015
merged.
Bruce
On Thu, Sep 3, 2015 at 4:00 PM, Mark Asselstine
<mark.asselstine at windriver.com> wrote:
> Using a wildcard will simplify things when using meta-virtualization
> against different yocto or oe branches and prevent having to make
> future updates to keep in step with package uprevs.
>
> The changes found within these bbappend tend to be generic and
> non-version specific, thus safe for 'porting' via wildcard.
>
> Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> ---
> recipes-core/base-files/base-files_3.%.bbappend | 5 +++++
> recipes-core/base-files/base-files_3.0.14.bbappend | 5 -----
> recipes-core/initscripts/initscripts_1.%.bbappend | 16 ++++++++++++++++
> recipes-core/initscripts/initscripts_1.0.bbappend | 16 ----------------
> recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend | 6 ++++++
> recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 6 ------
> recipes-devtools/python/python_2.%.bbappend | 8 ++++++++
> recipes-devtools/python/python_2.7.9.bbappend | 8 --------
> recipes-extended/iptables/iptables_1.%.bbappend | 8 ++++++++
> recipes-extended/iptables/iptables_1.4.21.bbappend | 8 --------
> 10 files changed, 43 insertions(+), 43 deletions(-)
> create mode 100644 recipes-core/base-files/base-files_3.%.bbappend
> delete mode 100644 recipes-core/base-files/base-files_3.0.14.bbappend
> create mode 100644 recipes-core/initscripts/initscripts_1.%.bbappend
> delete mode 100644 recipes-core/initscripts/initscripts_1.0.bbappend
> create mode 100644 recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
> delete mode 100644 recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> create mode 100644 recipes-devtools/python/python_2.%.bbappend
> delete mode 100644 recipes-devtools/python/python_2.7.9.bbappend
> create mode 100644 recipes-extended/iptables/iptables_1.%.bbappend
> delete mode 100644 recipes-extended/iptables/iptables_1.4.21.bbappend
>
> diff --git a/recipes-core/base-files/base-files_3.%.bbappend b/recipes-core/base-files/base-files_3.%.bbappend
> new file mode 100644
> index 0000000..eb973ad
> --- /dev/null
> +++ b/recipes-core/base-files/base-files_3.%.bbappend
> @@ -0,0 +1,5 @@
> +do_install_append() {
> + if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
> + echo "xenfs /proc/xen xenfs defaults 0 0" >> ${D}${sysconfdir}/fstab
> + fi
> +}
> diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
> deleted file mode 100644
> index eb973ad..0000000
> --- a/recipes-core/base-files/base-files_3.0.14.bbappend
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -do_install_append() {
> - if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
> - echo "xenfs /proc/xen xenfs defaults 0 0" >> ${D}${sysconfdir}/fstab
> - fi
> -}
> diff --git a/recipes-core/initscripts/initscripts_1.%.bbappend b/recipes-core/initscripts/initscripts_1.%.bbappend
> new file mode 100644
> index 0000000..0600ab2
> --- /dev/null
> +++ b/recipes-core/initscripts/initscripts_1.%.bbappend
> @@ -0,0 +1,16 @@
> +do_install_append() {
> +
> + echo >> ${D}${sysconfdir}/init.d/functions
> + echo success \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> + echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> + echo \} >> ${D}${sysconfdir}/init.d/functions
> + echo failure \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> + echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> + echo \} >> ${D}${sysconfdir}/init.d/functions
> + echo warning \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> + echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> + echo \} >> ${D}${sysconfdir}/init.d/functions
> + echo begin \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> + echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> + echo \} >> ${D}${sysconfdir}/init.d/functions
> +}
> diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
> deleted file mode 100644
> index 0600ab2..0000000
> --- a/recipes-core/initscripts/initscripts_1.0.bbappend
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -do_install_append() {
> -
> - echo >> ${D}${sysconfdir}/init.d/functions
> - echo success \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> - echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> - echo \} >> ${D}${sysconfdir}/init.d/functions
> - echo failure \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> - echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> - echo \} >> ${D}${sysconfdir}/init.d/functions
> - echo warning \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> - echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> - echo \} >> ${D}${sysconfdir}/init.d/functions
> - echo begin \(\) \{ >> ${D}${sysconfdir}/init.d/functions
> - echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
> - echo \} >> ${D}${sysconfdir}/init.d/functions
> -}
> diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
> new file mode 100644
> index 0000000..1b89aec
> --- /dev/null
> +++ b/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
> @@ -0,0 +1,6 @@
> +do_install_append() {
> + if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
> + echo "" >> ${D}${sysconfdir}/inittab
> + echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
> + fi
> +}
> diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> deleted file mode 100644
> index 1b89aec..0000000
> --- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -do_install_append() {
> - if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
> - echo "" >> ${D}${sysconfdir}/inittab
> - echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
> - fi
> -}
> diff --git a/recipes-devtools/python/python_2.%.bbappend b/recipes-devtools/python/python_2.%.bbappend
> new file mode 100644
> index 0000000..55301c7
> --- /dev/null
> +++ b/recipes-devtools/python/python_2.%.bbappend
> @@ -0,0 +1,8 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +DEPENDS += " ncurses"
> +
> +do_compile_prepend() {
> + export LIBRARY_PATH=${STAGING_DIR_TARGET}/lib
> +}
> +
> diff --git a/recipes-devtools/python/python_2.7.9.bbappend b/recipes-devtools/python/python_2.7.9.bbappend
> deleted file mode 100644
> index 55301c7..0000000
> --- a/recipes-devtools/python/python_2.7.9.bbappend
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -DEPENDS += " ncurses"
> -
> -do_compile_prepend() {
> - export LIBRARY_PATH=${STAGING_DIR_TARGET}/lib
> -}
> -
> diff --git a/recipes-extended/iptables/iptables_1.%.bbappend b/recipes-extended/iptables/iptables_1.%.bbappend
> new file mode 100644
> index 0000000..52a4c4f
> --- /dev/null
> +++ b/recipes-extended/iptables/iptables_1.%.bbappend
> @@ -0,0 +1,8 @@
> +RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
> + kernel-module-ip6table-filter \
> + kernel-module-xt-tcpudp \
> + kernel-module-ipt-reject \
> + kernel-module-iptable-mangle \
> + kernel-module-xt-checksum \
> + kernel-module-xt-state \
> + "
> diff --git a/recipes-extended/iptables/iptables_1.4.21.bbappend b/recipes-extended/iptables/iptables_1.4.21.bbappend
> deleted file mode 100644
> index 52a4c4f..0000000
> --- a/recipes-extended/iptables/iptables_1.4.21.bbappend
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
> - kernel-module-ip6table-filter \
> - kernel-module-xt-tcpudp \
> - kernel-module-ipt-reject \
> - kernel-module-iptable-mangle \
> - kernel-module-xt-checksum \
> - kernel-module-xt-state \
> - "
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
More information about the meta-virtualization
mailing list