[oe-commits] Tom Rini : Revert "binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR"
GIT User account
git at amethyst.openembedded.net
Tue May 5 20:55:51 UTC 2009
Module: openembedded.git
Branch: stable/2009
Commit: c1495dd42f998988d72d1e39561704750bb7559e
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c1495dd42f998988d72d1e39561704750bb7559e
Author: Tom Rini <trini at embeddedalley.com>
Date: Tue May 5 13:50:44 2009 -0700
Revert "binutils-cross: Stage libbfd/opcodes/iberty correctly, bump PR"
Did not mean to push this yet.
This reverts commit b6164de06454054b1117857dd7a4786c6c7af935.
---
recipes/binutils/binutils-cross.inc | 28 +++++-------------------
recipes/binutils/binutils_2.14.90.0.6.bb | 2 +-
recipes/binutils/binutils_2.14.90.0.7.bb | 2 +-
recipes/binutils/binutils_2.15.94.0.1.bb | 2 +-
recipes/binutils/binutils_2.16.1.bb | 2 +-
recipes/binutils/binutils_2.16.91.0.6.bb | 2 +-
recipes/binutils/binutils_2.16.91.0.7.bb | 2 +-
recipes/binutils/binutils_2.16.bb | 2 +-
recipes/binutils/binutils_2.17.50.0.1.bb | 2 +-
recipes/binutils/binutils_2.17.50.0.12.bb | 2 +-
recipes/binutils/binutils_2.17.50.0.5.bb | 2 +-
recipes/binutils/binutils_2.17.50.0.8.bb | 2 +-
recipes/binutils/binutils_2.17.bb | 2 +-
recipes/binutils/binutils_2.18.50.0.7.bb | 2 +-
recipes/binutils/binutils_2.18.bb | 2 +-
recipes/binutils/binutils_2.19.1.bb | 2 +-
recipes/binutils/binutils_2.19.bb | 2 +-
recipes/binutils/binutils_csl-arm-20050416.bb | 2 +-
recipes/binutils/binutils_csl-arm-20050603.bb | 2 +-
recipes/binutils/binutils_cvs.bb | 2 +-
20 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc
index 872b04a..384d18c 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -23,28 +23,12 @@ do_stage () {
rmdir ${CROSS_DIR}/${libdir}64 || :
rmdir ${CROSS_DIR}/${prefix} || :
- LIBBFD_DIR_BASE=${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS}
- # We want to move libbfd and libopcodes to ${CROSS_DIR}/lib
- mkdir -p ${CROSS_DIR}/lib
- mv -f ${LIBBFD_DIR_BASE}/lib/* ${CROSS_DIR}/lib || \
- mv -f ${LIBBFD_DIR_BASE}/lib64/* ${CROSS_DIR}/lib
- rmdir ${LIBBFD_DIR_BASE}/lib || :
- rmdir ${LIBBFD_DIR_BASE}/lib64 || :
-
- # Adjust libbfd.la and libopcodes.la
- for i in libbfd.la libopcodes.la; do
- sed -i -e "s@${LIBBFD_DIR_BASE}/lib64@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i
- sed -i -e "s@${LIBBFD_DIR_BASE}/lib@${CROSS_DIR}/lib@" ${CROSS_DIR}/lib/$i
- done
-
- # libbfd headers should be moved as well
- mkdir -p ${CROSS_DIR}/include
- mv -f ${LIBBFD_DIR_BASE}/include/* ${CROSS_DIR}/include
- rmdir ${LIBBFD_DIR_BASE}/include
-
- # Remove empty directories
- rmdir ${CROSS_DIR}/${BUILD_SYS}/${TARGET_SYS} || :
- rmdir ${CROSS_DIR}/${BUILD_SYS} || :
+ # We want to move this into the target specific location
+ mkdir -p ${STAGING_DIR_TARGET}/lib
+ mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib || \
+ mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib
+ rmdir ${CROSS_DIR}/lib || :
+ rmdir ${CROSS_DIR}/lib64 || :
}
do_install () {
diff --git a/recipes/binutils/binutils_2.14.90.0.6.bb b/recipes/binutils/binutils_2.14.90.0.6.bb
index bdbbcff..eb72082 100644
--- a/recipes/binutils/binutils_2.14.90.0.6.bb
+++ b/recipes/binutils/binutils_2.14.90.0.6.bb
@@ -1,7 +1,7 @@
SECTION = "devel"
inherit autotools gettext
-PR = "r6"
+PR = "r5"
DESCRIPTION = "A GNU collection of binary utilities"
HOMEPAGE = "http://www.gnu.org/software/binutils/"
diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb
index e58d0cc..f940c87 100644
--- a/recipes/binutils/binutils_2.14.90.0.7.bb
+++ b/recipes/binutils/binutils_2.14.90.0.7.bb
@@ -4,7 +4,7 @@ inherit autotools gettext
DESCRIPTION = "A GNU collection of binary utilities"
HOMEPAGE = "http://www.gnu.org/software/binutils/"
LICENSE = "GPL"
-PR = "r7"
+PR = "r6"
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/recipes/binutils/binutils_2.15.94.0.1.bb b/recipes/binutils/binutils_2.15.94.0.1.bb
index b73e862..74a902b 100644
--- a/recipes/binutils/binutils_2.15.94.0.1.bb
+++ b/recipes/binutils/binutils_2.15.94.0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
HOMEPAGE = "http://www.gnu.org/software/binutils/"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r6"
+PR = "r5"
inherit autotools gettext
diff --git a/recipes/binutils/binutils_2.16.1.bb b/recipes/binutils/binutils_2.16.1.bb
index 64ae34d..8235300 100644
--- a/recipes/binutils/binutils_2.16.1.bb
+++ b/recipes/binutils/binutils_2.16.1.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r1"
CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/"
SRC_URI = \
diff --git a/recipes/binutils/binutils_2.16.91.0.6.bb b/recipes/binutils/binutils_2.16.91.0.6.bb
index d2701c2..b251149 100644
--- a/recipes/binutils/binutils_2.16.91.0.6.bb
+++ b/recipes/binutils/binutils_2.16.91.0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
HOMEPAGE = "http://www.gnu.org/software/binutils/"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r4"
+PR = "r3"
# glibc 2.3 has issues with this version
# of binutils.
diff --git a/recipes/binutils/binutils_2.16.91.0.7.bb b/recipes/binutils/binutils_2.16.91.0.7.bb
index 7a53dd0..76c1285 100644
--- a/recipes/binutils/binutils_2.16.91.0.7.bb
+++ b/recipes/binutils/binutils_2.16.91.0.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
SECTION = "devel"
LICENSE = "GPL"
DEFAULT_PREFERENCE = "-1"
-PR = "r3"
+PR = "r2"
inherit autotools gettext
diff --git a/recipes/binutils/binutils_2.16.bb b/recipes/binutils/binutils_2.16.bb
index c3dd6df..9035b44 100644
--- a/recipes/binutils/binutils_2.16.bb
+++ b/recipes/binutils/binutils_2.16.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r10"
SRC_URI = \
"${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/binutils/binutils_2.17.50.0.1.bb b/recipes/binutils/binutils_2.17.50.0.1.bb
index 7a53dd0..76c1285 100644
--- a/recipes/binutils/binutils_2.17.50.0.1.bb
+++ b/recipes/binutils/binutils_2.17.50.0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
SECTION = "devel"
LICENSE = "GPL"
DEFAULT_PREFERENCE = "-1"
-PR = "r3"
+PR = "r2"
inherit autotools gettext
diff --git a/recipes/binutils/binutils_2.17.50.0.12.bb b/recipes/binutils/binutils_2.17.50.0.12.bb
index 84f608b..d24d24e 100644
--- a/recipes/binutils/binutils_2.17.50.0.12.bb
+++ b/recipes/binutils/binutils_2.17.50.0.12.bb
@@ -1,5 +1,5 @@
require binutils.inc
-PR = "r3"
+PR = "r2"
SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/binutils/binutils_2.17.50.0.5.bb b/recipes/binutils/binutils_2.17.50.0.5.bb
index 041c5d7..1d1c3fb 100644
--- a/recipes/binutils/binutils_2.17.50.0.5.bb
+++ b/recipes/binutils/binutils_2.17.50.0.5.bb
@@ -1,6 +1,6 @@
require binutils.inc
-PR = "r4"
+PR = "r3"
SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/binutils/binutils_2.17.50.0.8.bb b/recipes/binutils/binutils_2.17.50.0.8.bb
index 1d1c3fb..f659b3b 100644
--- a/recipes/binutils/binutils_2.17.50.0.8.bb
+++ b/recipes/binutils/binutils_2.17.50.0.8.bb
@@ -1,6 +1,6 @@
require binutils.inc
-PR = "r3"
+PR = "r2"
SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/binutils/binutils_2.17.bb b/recipes/binutils/binutils_2.17.bb
index fdee8a5..0f0b5d6 100644
--- a/recipes/binutils/binutils_2.17.bb
+++ b/recipes/binutils/binutils_2.17.bb
@@ -1,7 +1,7 @@
require binutils.inc
require binutils-avr32.inc
-PR = "r7"
+PR = "r6"
SRC_URI = \
"http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/binutils/binutils_2.18.50.0.7.bb b/recipes/binutils/binutils_2.18.50.0.7.bb
index d9a9cec..a89431e 100644
--- a/recipes/binutils/binutils_2.18.50.0.7.bb
+++ b/recipes/binutils/binutils_2.18.50.0.7.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r6"
require binutils.inc
diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb
index b746f9b..9367196 100644
--- a/recipes/binutils/binutils_2.18.bb
+++ b/recipes/binutils/binutils_2.18.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r4"
require binutils.inc
diff --git a/recipes/binutils/binutils_2.19.1.bb b/recipes/binutils/binutils_2.19.1.bb
index aee5840..c399ab8 100644
--- a/recipes/binutils/binutils_2.19.1.bb
+++ b/recipes/binutils/binutils_2.19.1.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r0"
require binutils.inc
diff --git a/recipes/binutils/binutils_2.19.bb b/recipes/binutils/binutils_2.19.bb
index ef07600..aee5840 100644
--- a/recipes/binutils/binutils_2.19.bb
+++ b/recipes/binutils/binutils_2.19.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r1"
require binutils.inc
diff --git a/recipes/binutils/binutils_csl-arm-20050416.bb b/recipes/binutils/binutils_csl-arm-20050416.bb
index 342572d..2c7c207 100644
--- a/recipes/binutils/binutils_csl-arm-20050416.bb
+++ b/recipes/binutils/binutils_csl-arm-20050416.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
LICENSE = "GPL"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
PV = "2.15.99+csl-arm+cvs20050416"
-PR = "r4"
+PR = "r3"
OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_arm-linux = "-1"
diff --git a/recipes/binutils/binutils_csl-arm-20050603.bb b/recipes/binutils/binutils_csl-arm-20050603.bb
index 8a9c0ce..13759b4 100644
--- a/recipes/binutils/binutils_csl-arm-20050603.bb
+++ b/recipes/binutils/binutils_csl-arm-20050603.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
LICENSE = "GPL"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
PV = "2.15.99+csl-arm+cvs20050603"
-PR = "r4"
+PR = "r3"
OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
DEFAULT_PREFERENCE = "-1"
#DEFAULT_PREFERENCE_arm-linux = "1"
diff --git a/recipes/binutils/binutils_cvs.bb b/recipes/binutils/binutils_cvs.bb
index 0c2064b..75c8886 100644
--- a/recipes/binutils/binutils_cvs.bb
+++ b/recipes/binutils/binutils_cvs.bb
@@ -1,6 +1,6 @@
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
require binutils.inc
More information about the Openembedded-commits
mailing list