From daca4c746927c0179ec63c0ac98daeb71281ed69 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Mon, 18 Oct 2010 17:38:32 +0800 Subject: sed: use ALTERNATIVE_LINK update-alternatives.bbclass assumes /usr/bin/sed if ALTERNATIVE_LINK is not specified, however sed has changed its default installation directory to /bin/sed. This causes below errors at the first boot of lsb image: update-alternatives: Error: cannot register alternative sed to /usr/bin/sed since it is already registered to /bin/sed This fixes [BUGID #478] Signed-off-by: Kevin Tian --- meta/recipes-extended/sed/sed_4.1.2.bb | 3 ++- meta/recipes-extended/sed/sed_4.2.1.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended/sed') diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb index e243f3e25f..80d4b034f9 100644 --- a/meta/recipes-extended/sed/sed_4.1.2.bb +++ b/meta/recipes-extended/sed/sed_4.1.2.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407" SECTION = "console/utils" -PR = "r4" +PR = "r5" DEPENDS = "gettext" @@ -21,6 +21,7 @@ do_install () { ALTERNATIVE_NAME = "sed" ALTERNATIVE_PATH = "sed.${PN}" +ALTERNATIVE_LINK = "${base_bindir}/sed" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb index 5147b0d12e..734b1e0fcd 100644 --- a/meta/recipes-extended/sed/sed_4.2.1.bb +++ b/meta/recipes-extended/sed/sed_4.2.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f" SECTION = "console/utils" -PR = "r0" +PR = "r1" DEPENDS = "gettext" @@ -20,6 +20,7 @@ do_install () { ALTERNATIVE_NAME = "sed" ALTERNATIVE_PATH = "sed.${PN}" +ALTERNATIVE_LINK = "${base_bindir}/sed" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf