[OE-core] [PATCH 1/1] lsbinitscripts: Add a linking for functions.lsbinitscripts
Saul Wold
sgw at linux.intel.com
Wed Jun 27 16:53:15 UTC 2012
On 06/26/2012 11:04 PM, Kang Kai wrote:
> From: Xiaofeng Yan<xiaofeng.yan at windriver.com>
>
> The linking will fail when an original file "functions" exists.
> So using the new linking replace the previous "functions".
>
> [YOCTO #2133]
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan at windriver.com>
> ---
> meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 11 ++++-------
> 1 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> index dd92a92..990da2e 100644
> --- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "SysV init scripts which only is used in an LSB image"
> SECTION = "base"
> LICENSE = "GPLv2"
> DEPENDS = "popt"
> -PR = "r0"
> +PR = "r1"
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
>
> @@ -13,15 +13,12 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}
>
> SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
> SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a"
> -inherit update-alternatives
> -
> -ALTERNATIVE_PRIORITY = "10"
> -ALTERNATIVE_${PN} = "functions"
> -ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
>
> do_configure[noexec] = "1"
>
> do_install(){
> install -d ${D}/etc/init.d/
> - install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
> + install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions.lsbinitscripts
> + cd ${D}/etc/init.d/
> + ln -sf functions.lsbinitscripts functions
> }
This is still not correct, you are disabling the usage update
ALTERNATIVE here. What you should really be doing is adding that
support to the original initscripts_1.0.bb recipes for the function file
and give this a higher ALTERNATIVE_PRIORITY, so that when it is
installed it will do the right thing (tm) via the update alternative
functionality.
Sau!
More information about the Openembedded-core
mailing list