From 0bad0369f0ee880f68478f4752efd6395f095c68 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 08:33:20 -0700 Subject: [PATCH] Adjust for poky switching to glibc Signed-off-by: Christopher Larson --- README.md | 2 +- .../tcmode-external-sourcery-rebuild-libc.inc | 10 +++---- .../include/tcmode-external-sourcery.inc | 2 +- recipes/eglibc/eglibc-package-adjusted.inc | 26 ------------------- .../glibc-locale_%.bbappend} | 0 recipes/glibc/glibc-package-adjusted.inc | 26 +++++++++++++++++++ .../glibc-sourcery.bb} | 6 ++--- .../glibc-sourcery}/etc/ld.so.conf | 0 .../glibc-sourcery}/generate-supported.mk | 0 recipes/meta/external-sourcery-toolchain.bb | 4 +-- 10 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 recipes/eglibc/eglibc-package-adjusted.inc rename recipes/{eglibc/eglibc-locale_%.bbappend => glibc/glibc-locale_%.bbappend} (100%) create mode 100644 recipes/glibc/glibc-package-adjusted.inc rename recipes/{eglibc/eglibc-sourcery.bb => glibc/glibc-sourcery.bb} (94%) rename recipes/{eglibc/eglibc-sourcery => glibc/glibc-sourcery}/etc/ld.so.conf (100%) rename recipes/{eglibc/eglibc-sourcery => glibc/glibc-sourcery}/generate-supported.mk (100%) diff --git a/README.md b/README.md index 0c778d3..6fe75ea 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Usage & Instructions Optional Functionality ---------------------- -- If the user chooses to, they may optionally decide to rebuild the Sourcery G++ eglibc +- If the user chooses to, they may optionally decide to rebuild the Sourcery G++ glibc from source, if they have downloaded the corresponding source archive from Mentor Graphics. To so, set `TCMODE = "external-sourcery-rebuild-libc"`, rather than relying on the default value of `external-sourcery`. After setting TCMODE appropriately, you diff --git a/conf/distro/include/tcmode-external-sourcery-rebuild-libc.inc b/conf/distro/include/tcmode-external-sourcery-rebuild-libc.inc index b7dd1d2..f8a7fc5 100644 --- a/conf/distro/include/tcmode-external-sourcery-rebuild-libc.inc +++ b/conf/distro/include/tcmode-external-sourcery-rebuild-libc.inc @@ -1,9 +1,9 @@ require conf/distro/include/tcmode-external-sourcery.inc -PREFERRED_PROVIDER_virtual/libc = "eglibc-sourcery" -PREFERRED_PROVIDER_virtual/libiconv = "eglibc-sourcery" -PREFERRED_PROVIDER_virtual/libintl = "eglibc-sourcery" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-sourcery" -PREFERRED_PROVIDER_eglibc = "eglibc-sourcery" +PREFERRED_PROVIDER_virtual/libc = "glibc-sourcery" +PREFERRED_PROVIDER_virtual/libiconv = "glibc-sourcery" +PREFERRED_PROVIDER_virtual/libintl = "glibc-sourcery" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-sourcery" +PREFERRED_PROVIDER_glibc = "glibc-sourcery" CSL_SRC_URI ?= "file://${CSL_SRC_FILE}" CSL_SRC_FILE ?= "${@bb.fatal('Please set CSL_SRC_FILE to the path to your sourcery src tarball')}" diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 89f578b..6647ae5 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -59,7 +59,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc ?= "external-sourcery-to PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "external-sourcery-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain" PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain" -PREFERRED_PROVIDER_eglibc ?= "external-sourcery-toolchain" +PREFERRED_PROVIDER_glibc ?= "external-sourcery-toolchain" PREFERRED_PROVIDER_virtual/libc ?= "external-sourcery-toolchain" PREFERRED_PROVIDER_virtual/libintl ?= "external-sourcery-toolchain" PREFERRED_PROVIDER_virtual/libiconv ?= "external-sourcery-toolchain" diff --git a/recipes/eglibc/eglibc-package-adjusted.inc b/recipes/eglibc/eglibc-package-adjusted.inc deleted file mode 100644 index d4d6b45..0000000 --- a/recipes/eglibc/eglibc-package-adjusted.inc +++ /dev/null @@ -1,26 +0,0 @@ -require recipes-core/eglibc/eglibc-package.inc - -PKG_${PN} = "eglibc" -RPROVIDES_${PN} += "${TCLIBC} eglibc" -PKG_${PN}-dbg = "eglibc-dbg" -RPROVIDES_${PN}-dbg += "${TCLIBC}-dbg eglibc-dbg" -PKG_${PN}-dev = "eglibc-dev" -RPROVIDES_${PN}-dev += "${TCLIBC}-dev eglibc-dev" -PKG_${PN}-doc = "eglibc-doc" -RPROVIDES_${PN}-doc += "${TCLIBC}-doc eglibc-doc" -PKG_${PN}-extra-nss = "eglibc-extra-nss" -RPROVIDES_${PN}-extra-nss += "${TCLIBC}-extra-nss eglibc-extra-nss" -PKG_${PN}-gconv = "eglibc-gconv" -RPROVIDES_${PN}-gconv += "${TCLIBC}-gconv eglibc-gconv" -PKG_${PN}-mtrace = "eglibc-mtrace" -RPROVIDES_${PN}-mtrace += "${TCLIBC}-mtrace eglibc-mtrace" -PKG_${PN}-pcprofile = "eglibc-pcprofile" -RPROVIDES_${PN}-pcprofile += "${TCLIBC}-pcprofile eglibc-pcprofile" -PKG_${PN}-pic = "eglibc-pic" -RPROVIDES_${PN}-pic += "${TCLIBC}-pic eglibc-pic" -PKG_${PN}-staticdev = "eglibc-staticdev" -RPROVIDES_${PN}-staticdev += "${TCLIBC}-staticdev eglibc-staticdev" -PKG_${PN}-thread-db = "eglibc-thread-db" -RPROVIDES_${PN}-thread-db += "${TCLIBC}-thread-db eglibc-thread-db" -PKG_${PN}-utils = "eglibc-utils" -RPROVIDES_${PN}-utils += "${TCLIBC}-utils eglibc-utils" diff --git a/recipes/eglibc/eglibc-locale_%.bbappend b/recipes/glibc/glibc-locale_%.bbappend similarity index 100% rename from recipes/eglibc/eglibc-locale_%.bbappend rename to recipes/glibc/glibc-locale_%.bbappend diff --git a/recipes/glibc/glibc-package-adjusted.inc b/recipes/glibc/glibc-package-adjusted.inc new file mode 100644 index 0000000..f6e911a --- /dev/null +++ b/recipes/glibc/glibc-package-adjusted.inc @@ -0,0 +1,26 @@ +require recipes-core/glibc/glibc-package.inc + +PKG_${PN} = "glibc" +RPROVIDES_${PN} += "${TCLIBC} glibc" +PKG_${PN}-dbg = "glibc-dbg" +RPROVIDES_${PN}-dbg += "${TCLIBC}-dbg glibc-dbg" +PKG_${PN}-dev = "glibc-dev" +RPROVIDES_${PN}-dev += "${TCLIBC}-dev glibc-dev" +PKG_${PN}-doc = "glibc-doc" +RPROVIDES_${PN}-doc += "${TCLIBC}-doc glibc-doc" +PKG_${PN}-extra-nss = "glibc-extra-nss" +RPROVIDES_${PN}-extra-nss += "${TCLIBC}-extra-nss glibc-extra-nss" +PKG_${PN}-gconv = "glibc-gconv" +RPROVIDES_${PN}-gconv += "${TCLIBC}-gconv glibc-gconv" +PKG_${PN}-mtrace = "glibc-mtrace" +RPROVIDES_${PN}-mtrace += "${TCLIBC}-mtrace glibc-mtrace" +PKG_${PN}-pcprofile = "glibc-pcprofile" +RPROVIDES_${PN}-pcprofile += "${TCLIBC}-pcprofile glibc-pcprofile" +PKG_${PN}-pic = "glibc-pic" +RPROVIDES_${PN}-pic += "${TCLIBC}-pic glibc-pic" +PKG_${PN}-staticdev = "glibc-staticdev" +RPROVIDES_${PN}-staticdev += "${TCLIBC}-staticdev glibc-staticdev" +PKG_${PN}-thread-db = "glibc-thread-db" +RPROVIDES_${PN}-thread-db += "${TCLIBC}-thread-db glibc-thread-db" +PKG_${PN}-utils = "glibc-utils" +RPROVIDES_${PN}-utils += "${TCLIBC}-utils glibc-utils" diff --git a/recipes/eglibc/eglibc-sourcery.bb b/recipes/glibc/glibc-sourcery.bb similarity index 94% rename from recipes/eglibc/eglibc-sourcery.bb rename to recipes/glibc/glibc-sourcery.bb index 9ca1ca0..d9ffabd 100644 --- a/recipes/eglibc/eglibc-sourcery.bb +++ b/recipes/glibc/glibc-sourcery.bb @@ -1,6 +1,6 @@ -require recipes-core/eglibc/eglibc.inc +require recipes-core/glibc/glibc.inc -PROVIDES += "eglibc" +PROVIDES += "glibc" TOOLCHAIN_OPTIONS = "" @@ -62,7 +62,7 @@ do_configure () { CPPFLAGS="" oe_runconf } -require recipes/eglibc/eglibc-package-adjusted.inc +require recipes/glibc/glibc-package-adjusted.inc CSL_VER_MAIN ?= "" CSL_VER_LIBC ?= "" diff --git a/recipes/eglibc/eglibc-sourcery/etc/ld.so.conf b/recipes/glibc/glibc-sourcery/etc/ld.so.conf similarity index 100% rename from recipes/eglibc/eglibc-sourcery/etc/ld.so.conf rename to recipes/glibc/glibc-sourcery/etc/ld.so.conf diff --git a/recipes/eglibc/eglibc-sourcery/generate-supported.mk b/recipes/glibc/glibc-sourcery/generate-supported.mk similarity index 100% rename from recipes/eglibc/eglibc-sourcery/generate-supported.mk rename to recipes/glibc/glibc-sourcery/generate-supported.mk diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 36780e2..1e9db48 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -1,6 +1,6 @@ ORIG_PACKAGES := "${PACKAGES}" -require recipes/eglibc/eglibc-package-adjusted.inc +require recipes/glibc/glibc-package-adjusted.inc INHIBIT_DEFAULT_DEPS = "1" @@ -108,7 +108,7 @@ do_install() { fi } -# These files are picked up out of the sysroot by eglibc-locale, so we don't +# These files are picked up out of the sysroot by glibc-locale, so we don't # need to keep them around ourselves. do_install_locale_append() { rm -fr ${D}${exec_prefix}/lib/locale