From 5e01906b8433bc6a8c03be2e31758589641124c9 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 23 Jul 2005 13:36:38 +0000 Subject: Updated to use update-alternatives and fix some FHS bugs --- packages/binutils/binutils.inc | 17 +++++++++++++++-- packages/binutils/binutils_2.16.bb | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'packages/binutils') diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 731f58ba2c..e544e9ef53 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -16,7 +16,6 @@ FILES_${PN}-dev = " \ FILES_${PN}-symlinks = " \ ${bindir}/addr2line \ - ${bindir}/ar \ ${bindir}/as \ ${bindir}/c++filt \ ${bindir}/gprof \ @@ -27,7 +26,6 @@ FILES_${PN}-symlinks = " \ ${bindir}/ranlib \ ${bindir}/readelf \ ${bindir}/size \ - ${bindir}/strings \ ${bindir}/strip" EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ @@ -101,4 +99,19 @@ do_install () { for p in ${TARGET_SYS}-* ; do ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` done + + rm ${D}${bindir}/ar ${D}${bindir}/strings +} + + +pkg_postinst_${PN}-symlinks () { + update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100 + update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100 } + + +pkg_prerm_${PN}-symlinks () { + update-alternatives --remove ar ${TARGET_SYS}-ar + update-alternatives --remove strings ${TARGET_SYS}-strings +} + diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index 27e2f8983c..bb280f0fb5 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton " -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE_linux-uclibc = "-1" -- cgit v1.2.3