* [PATCH 1/4] gcc-package-target: Switch to TARGET_PREFIX in symlinks
2011-05-05 15:05 [PATCH 0/4] Misc sync up changes Tom Rini
@ 2011-05-05 15:05 ` Tom Rini
2011-05-08 1:04 ` Khem Raj
2011-05-05 15:05 ` [PATCH 2/4] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS Tom Rini
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Tom Rini @ 2011-05-05 15:05 UTC (permalink / raw)
To: openembedded-core
When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks we made
were invalid. TARGET_PREFIX is what we use when configuring so it's what we
should be using here.
This is 05143e9b5d0a42e32ee0dd3c7fde482ff8d63f63 from OE.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index d61e96b..e7f1b80 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -91,13 +91,13 @@ do_install () {
find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
# Symlinks so we can use these trivially on the target
- ln -sf ${TARGET_SYS}-g77 g77 || true
- ln -sf ${TARGET_SYS}-gfortran gfortran || true
- ln -sf ${TARGET_SYS}-g++ g++
- ln -sf ${TARGET_SYS}-gcc gcc
+ ln -sf ${TARGET_PREFIX}g77 g77 || true
+ ln -sf ${TARGET_PREFIX}gfortran gfortran || true
+ ln -sf ${TARGET_PREFIX}g++ g++
+ ln -sf ${TARGET_PREFIX}gcc gcc
ln -sf g77 f77 || true
ln -sf gfortran f95 || true
ln -sf g++ c++
ln -sf gcc cc
- ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
+ ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/4] gcc-package-target: Switch to TARGET_PREFIX in symlinks
2011-05-05 15:05 ` [PATCH 1/4] gcc-package-target: Switch to TARGET_PREFIX in symlinks Tom Rini
@ 2011-05-08 1:04 ` Khem Raj
0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2011-05-08 1:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On (05/05/11 08:05), Tom Rini wrote:
> When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks we made
> were invalid. TARGET_PREFIX is what we use when configuring so it's what we
> should be using here.
>
> This is 05143e9b5d0a42e32ee0dd3c7fde482ff8d63f63 from OE.
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
> index d61e96b..e7f1b80 100644
> --- a/meta/recipes-devtools/gcc/gcc-package-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
> @@ -91,13 +91,13 @@ do_install () {
> find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
>
> # Symlinks so we can use these trivially on the target
> - ln -sf ${TARGET_SYS}-g77 g77 || true
> - ln -sf ${TARGET_SYS}-gfortran gfortran || true
> - ln -sf ${TARGET_SYS}-g++ g++
> - ln -sf ${TARGET_SYS}-gcc gcc
> + ln -sf ${TARGET_PREFIX}g77 g77 || true
> + ln -sf ${TARGET_PREFIX}gfortran gfortran || true
> + ln -sf ${TARGET_PREFIX}g++ g++
> + ln -sf ${TARGET_PREFIX}gcc gcc
> ln -sf g77 f77 || true
> ln -sf gfortran f95 || true
> ln -sf g++ c++
> ln -sf gcc cc
> - ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
> + ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp
> }
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
-Khem
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/4] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS
2011-05-05 15:05 [PATCH 0/4] Misc sync up changes Tom Rini
2011-05-05 15:05 ` [PATCH 1/4] gcc-package-target: Switch to TARGET_PREFIX in symlinks Tom Rini
@ 2011-05-05 15:05 ` Tom Rini
2011-05-08 1:09 ` Khem Raj
2011-05-05 15:05 ` [PATCH 3/4] sysstat.inc: Switch to inherit gettext Tom Rini
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Tom Rini @ 2011-05-05 15:05 UTC (permalink / raw)
To: openembedded-core
When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks and
update-alternatives weren't working. TARGET_PREFIX is what we use when
configuring so it's what we should be using here.
This is 79b497edc0ce5d54db564818e59b690d3391d6ce from OE.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/recipes-devtools/binutils/binutils.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index d9e859e..882fe7b 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -110,7 +110,7 @@ do_install () {
# Symlinks for ease of running these on the native target
for p in ${TARGET_SYS}-* ; do
- ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+ ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
done
rm ${D}${bindir}/ar ${D}${bindir}/strings
@@ -139,11 +139,11 @@ do_install_virtclass-native () {
}
pkg_postinst_${PN}-symlinks () {
- update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100
- update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100
+ update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100
+ update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100
}
pkg_prerm_${PN}-symlinks () {
- update-alternatives --remove ar ${TARGET_SYS}-ar
- update-alternatives --remove strings ${TARGET_SYS}-strings
+ update-alternatives --remove ar ${TARGET_PREFIX}ar
+ update-alternatives --remove strings ${TARGET_PREFIX}strings
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/4] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS
2011-05-05 15:05 ` [PATCH 2/4] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS Tom Rini
@ 2011-05-08 1:09 ` Khem Raj
0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2011-05-08 1:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On (05/05/11 08:05), Tom Rini wrote:
> When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks and
> update-alternatives weren't working. TARGET_PREFIX is what we use when
> configuring so it's what we should be using here.
>
> This is 79b497edc0ce5d54db564818e59b690d3391d6ce from OE.
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-devtools/binutils/binutils.inc | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
> index d9e859e..882fe7b 100644
> --- a/meta/recipes-devtools/binutils/binutils.inc
> +++ b/meta/recipes-devtools/binutils/binutils.inc
> @@ -110,7 +110,7 @@ do_install () {
>
> # Symlinks for ease of running these on the native target
> for p in ${TARGET_SYS}-* ; do
> - ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
> + ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
> done
>
> rm ${D}${bindir}/ar ${D}${bindir}/strings
> @@ -139,11 +139,11 @@ do_install_virtclass-native () {
> }
>
> pkg_postinst_${PN}-symlinks () {
> - update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100
> - update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100
> + update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100
> + update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100
> }
>
> pkg_prerm_${PN}-symlinks () {
> - update-alternatives --remove ar ${TARGET_SYS}-ar
> - update-alternatives --remove strings ${TARGET_SYS}-strings
> + update-alternatives --remove ar ${TARGET_PREFIX}ar
> + update-alternatives --remove strings ${TARGET_PREFIX}strings
> }
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
-Khem
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] sysstat.inc: Switch to inherit gettext
2011-05-05 15:05 [PATCH 0/4] Misc sync up changes Tom Rini
2011-05-05 15:05 ` [PATCH 1/4] gcc-package-target: Switch to TARGET_PREFIX in symlinks Tom Rini
2011-05-05 15:05 ` [PATCH 2/4] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS Tom Rini
@ 2011-05-05 15:05 ` Tom Rini
2011-05-05 15:05 ` [PATCH 4/4] bash.inc: Add bison-native to DEPENDS Tom Rini
2011-05-09 16:03 ` [PATCH 0/4] Misc sync up changes Saul Wold
4 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2011-05-05 15:05 UTC (permalink / raw)
To: openembedded-core
This needs to use both virtual/libnl as well as gettext-native in order
to build. So we switch to using inherit gettext.
This is 4a022cf3fe3e39aab478bfc13332d358ed80348c from OE where it was tested
with qemuarm+angstrom-2010.x+eglibc and qemuarm+minimal-uclibc.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/recipes-extended/sysstat/sysstat.inc | 4 +---
meta/recipes-extended/sysstat/sysstat_9.1.5.bb | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index aeb33cf..a4cad0e 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -4,12 +4,10 @@ HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
LICENSE = "GPLv2+"
SECTION = "console/utils"
-DEPENDS = "virtual/libintl"
-
SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
file://99_sysstat"
-inherit autotools
+inherit autotools gettext
do_install() {
autotools_do_install
diff --git a/meta/recipes-extended/sysstat/sysstat_9.1.5.bb b/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
index a9071b3..49ac988 100644
--- a/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
+++ b/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
@@ -2,7 +2,7 @@ require sysstat.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r0"
+PR = "r1"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] bash.inc: Add bison-native to DEPENDS
2011-05-05 15:05 [PATCH 0/4] Misc sync up changes Tom Rini
` (2 preceding siblings ...)
2011-05-05 15:05 ` [PATCH 3/4] sysstat.inc: Switch to inherit gettext Tom Rini
@ 2011-05-05 15:05 ` Tom Rini
2011-05-09 16:03 ` [PATCH 0/4] Misc sync up changes Saul Wold
4 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2011-05-05 15:05 UTC (permalink / raw)
To: openembedded-core
This is f0652d96ff5c3b08b8e4c4972f7fb0296df6d898 from OE.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/recipes-extended/bash/bash.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index ecbd75d..e218304 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -5,7 +5,7 @@ SECTION = "base/shell"
# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "ncurses"
+DEPENDS = "ncurses bison-native"
inherit autotools gettext
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/4] Misc sync up changes
2011-05-05 15:05 [PATCH 0/4] Misc sync up changes Tom Rini
` (3 preceding siblings ...)
2011-05-05 15:05 ` [PATCH 4/4] bash.inc: Add bison-native to DEPENDS Tom Rini
@ 2011-05-09 16:03 ` Saul Wold
4 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-05-09 16:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 05/05/2011 08:05 AM, Tom Rini wrote:
> The following series brings in a few fixups I pushed to openembedded today.
> In short, in gcc/binutils we were referencing TARGET_SYS in places where we
> had told configure to mangle things based on TARGET_PREFIX and in the
> cases where they don't match, it wasn't working. I had also just run into
> some missing DEPENDS cases so they are included in this branch as well.
>
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
> Branch: trini/misc-sync-up
> Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/misc-sync-up
>
> Thanks,
> Tom Rini<tom_rini@mentor.com>
> ---
>
>
> Tom Rini (4):
> gcc-package-target: Switch to TARGET_PREFIX in symlinks
> binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS
> sysstat.inc: Switch to inherit gettext
> bash.inc: Add bison-native to DEPENDS
>
> meta/recipes-devtools/binutils/binutils.inc | 10 +++++-----
> meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +++++-----
> meta/recipes-extended/bash/bash.inc | 2 +-
> meta/recipes-extended/sysstat/sysstat.inc | 4 +---
> meta/recipes-extended/sysstat/sysstat_9.1.5.bb | 2 +-
> 5 files changed, 13 insertions(+), 15 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Pulled into oe-core
Thanks
Sau!
^ permalink raw reply [flat|nested] 8+ messages in thread