diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-23 23:39:02 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-23 23:39:02 +0000 |
| commit | 2cd500dfe9b9777b022ad3e9f7f0b0b2eb7267b6 (patch) | |
| tree | 7bc85e61765a2f23a3bf0e5758fc7c5017f80aed | |
| parent | 9d7869061375488858389c37229acc709bc13b1b (diff) | |
| parent | c058e136fb5fa00332077cc9526f2b1ae28bae17 (diff) | |
propagate from branch 'org.openembedded.nslu2-linux' (head 822ad5fc7fe817f48926a5ab26f7f2eb03ab8e8a)
to branch 'org.openembedded.dev' (head 0611278e5844c7164c17cccf825de9a906ef469c)
| -rw-r--r-- | packages/coreutils/coreutils_5.1.3.bb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb index 47c734446f..0d7a783663 100644 --- a/packages/coreutils/coreutils_5.1.3.bb +++ b/packages/coreutils/coreutils_5.1.3.bb @@ -3,7 +3,7 @@ SECTION = "base" DESCRIPTION = "A collection of core GNU utilities." RREPLACES = "textutils shellutils fileutils" RPROVIDES = "textutils shellutils fileutils" -PR = "r2" +PR = "r3" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ @@ -31,7 +31,10 @@ do_install () { # Renaming the utilities that should go in /usr/bin for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - mv ${D}${bindir}/[ ${D}${bindir}/[.${PN} + # [ requires special handling because [.coreutils will cause the sed stuff + # in update-alternatives to fail, therefore use lbracket - the name used + # for the actual source file. + mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} # Renaming and moving the utilities that should go in /bin (FHS) install -d ${D}${base_bindir} @@ -45,7 +48,7 @@ do_install () { pkg_postinst_${PN} () { # The utilities in /usr/bin for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done - update-alternatives --install "${bindir}/\[" "\[" "\[.${PN}" 100 + update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 # The utilities in /bin for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done @@ -57,7 +60,7 @@ pkg_postinst_${PN} () { pkg_prerm_${PN} () { # The utilities in /usr/bin for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - update-alternatives --remove "\[" "\[.${PN}" + update-alternatives --remove '[' 'lbracket.${PN}' # The utilities in /bin for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done |