diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-04-24 12:57:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-24 12:57:04 +0000 |
| commit | e459c12feac09ca0259101dda3ec31f97ae759d8 (patch) | |
| tree | d5bcfe0b09f1afcee86daef464df82ef8515e3fc /packages | |
| parent | 07d17b04260013d429e6981cea821c791e79407f (diff) | |
| parent | 20edc7b042408a74564531a8128d9651739dfc4c (diff) | |
merge of 5992e9a1a1abd66e6753553c665d0e27fe718e72
and eeb83bff57693c86cc75c70bfc1f74e07ce2bf72
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gcc/gcc-package.inc | 5 | ||||
| -rw-r--r-- | packages/ixp425-eth/ixp400-eth_1.5.bb | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index b31a209b34..4dcc72e879 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -67,7 +67,7 @@ do_install () { rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools # Hack around specs file assumptions - sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs + sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs &>/dev/null || true # Move libgcc_s into /lib mkdir -p ${D}${base_libdir} @@ -79,7 +79,8 @@ do_install () { ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so # We don't need libtool libraries - rm ${D}${libdir}/libg2c.la + rm ${D}${libdir}/libg2c.la &>/dev/null || true + # Cleanup manpages.. rm -r ${D}${mandir}/man7 diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index 99851a8c12..4430e295fb 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -4,7 +4,7 @@ MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm" LICENSE = "GPL" -PR = "r9" +PR = "r10" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" @@ -15,7 +15,6 @@ SRC_URI += "file://2.6.15.patch;patch=1" SRC_URI += "file://device-name.patch;patch=1" SRC_URI += "file://poll-controller.patch;patch=1" SRC_URI += "file://le.patch;patch=1" -SRC_URI += "file://mac-address.patch;patch=1" SRC_URI += "file://int-random.patch;patch=1" SRC_URI += "file://stop-on-rmmod.patch;patch=1" SRC_URI += "file://continue-if-qmgr-init-fails.patch;patch=1" |