diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-22 17:43:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:52:06 -0700 |
commit | ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0 (patch) | |
tree | 9965e27a93c73af1ccf9cdb24c588faabc90370a /meta/recipes-devtools | |
parent | 58a8a38aa294edb74dde70d70a7e5faf49444b78 (diff) | |
download | ast2050-yocto-poky-ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0.zip ast2050-yocto-poky-ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0.tar.gz |
nativesdk: Switch to using nativesdk as a prefix, not a suffix
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
17 files changed, 38 insertions, 44 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 4f5a5b2..e80a834 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -7,10 +7,10 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/" SECTION = "devel" DEPENDS += "m4-native" DEPENDS_virtclass-native = "m4-native gnu-config-native" -DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config" RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" -RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" +RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ file://program_prefix.patch" diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb index 2a97bcc..700592c 100644 --- a/meta/recipes-devtools/automake/automake_1.12.1.bb +++ b/meta/recipes-devtools/automake/automake_1.12.1.bb @@ -28,7 +28,7 @@ RDEPENDS_${PN} += "\ perl-module-vars " RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime" -RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" +RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-autoconf" PATHFIXPATCH = "file://path_prog_fixes.patch" PATHFIXPATCH_virtclass-native = "" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index a23531c..4658bad 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc @@ -4,7 +4,7 @@ DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "binutils" -DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" +DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext" EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ " do_install () { diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index cc0a3ba..ef861ae 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -4,5 +4,5 @@ DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gcc" -DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" +DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc gettext" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb index 308e6f5..53c4632 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb @@ -5,8 +5,8 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" -RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" +DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" +RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" SYSTEMHEADERS = "/usr/include" SYSTEMLIBS = "${target_base_libdir}/" diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc index 0fd82a6..467a3f5 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc @@ -6,5 +6,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" GCCMULTILIB = "--disable-multilib" -DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native" +DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-${TARGET_PREFIX}libc-for-gcc gettext-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" diff --git a/meta/recipes-devtools/gcc/libgcc_4.7.bb b/meta/recipes-devtools/gcc/libgcc_4.7.bb index c796253..5eaa515 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.7.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.7.bb @@ -4,14 +4,11 @@ INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - PACKAGES = "\ ${PN} \ ${PN}-dev \ ${PN}-dbg \ - libgcov${PKGSUFFIX}-dev \ + libgcov-dev \ " FILES_${PN} = "${base_libdir}/libgcc*.so.*" @@ -19,7 +16,7 @@ FILES_${PN}-dev = " \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" -FILES_libgcov${PKGSUFFIX}-dev = " \ +FILES_libgcov-dev = " \ ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ " FILES_${PN}-dbg += "${base_libdir}/.debug/" @@ -72,4 +69,4 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" BBCLASSEXTEND = "nativesdk" INSANE_SKIP_${PN}-dev = "staticdev" -INSANE_SKIP_${MLPREFIX}libgcov${PKGSUFFIX}-dev = "staticdev" +INSANE_SKIP_${MLPREFIX}libgcov-dev = "staticdev" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 2b60698..c947526 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -5,9 +5,9 @@ DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger" PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb" -DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk python-nativesdk" -RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \ - python-nativesdk-codecs python-nativesdk-netclient" +DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python" +RDEPENDS += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \ + nativesdk-python-codecs nativesdk-python-netclient" EXTRA_OECONF_append = "--with-python=${WORKDIR}/python" @@ -30,3 +30,4 @@ EOF do_install_append() { rm -rf ${D}${exec_prefix}/lib } + diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb index d4588da..f731360 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb @@ -28,7 +28,7 @@ do_install () { sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet - if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then + if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi chmod 755 ${D}${bindir}/gnu-configize diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 4de4799..73efbb0 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -29,7 +29,7 @@ do_install () { sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet - if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then + if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi chmod 755 ${D}${bindir}/gnu-configize diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index a540c0d..78ea6d0 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -117,7 +117,7 @@ OPKG_INSTALL_NATIVE_CMD="$OPKG_INSTALL_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INST BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake" for pkg in $BASE_HOSTSDK_PKGNAMES; do echo_info "Installing ${pkg} nativesdk ...\n" - $OPKG_INSTALL_NATIVE_CMD ${pkg}-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-${pkg} &>> $YOCTOADT_INSTALL_LOG_FILE check_result done @@ -142,15 +142,15 @@ done if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then echo_info "\nInstalling qemu native ..." - $OPKG_INSTALL_NATIVE_CMD qemu-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu &>> $YOCTOADT_INSTALL_LOG_FILE check_result - $OPKG_INSTALL_NATIVE_CMD qemu-helper-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu-helper &>> $YOCTOADT_INSTALL_LOG_FILE check_result fi if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then echo_info "\nInstalling unfs ..." - $OPKG_INSTALL_NATIVE_CMD unfs-server-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs-server &>> $YOCTOADT_INSTALL_LOG_FILE check_result fi diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 5c7cad3..10cd9d8 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" DEPENDS_virtclass-native = "curl-native" -DEPENDS_virtclass-nativesdk = "curl-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-curl" PE = "1" INC_PR = "r10" @@ -41,12 +41,12 @@ RDEPENDS_${PN}_virtclass-nativesdk = "" PACKAGE_ARCH_update-alternatives-cworth = "all" RREPLACES_${PN} = "opkg-nogpg" -PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" +PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" -FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" -FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so" -FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a" -FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +FILES_update-alternatives-cworth = "${bindir}/update-alternatives" +FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so" +FILES_libopkg-staticdev = "${libdir}/*.a" +FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" # We need to create the lock directory do_install_append() { @@ -75,9 +75,6 @@ ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl" BBCLASSEXTEND = "native nativesdk" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - # Define a variable to allow distros to run configure earlier. # (for example, to enable loading of ethernet kernel modules before networking starts) POSTINSTALL_INITPOSITION ?= "98" diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index 561b30e..9db3805 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb @@ -302,6 +302,7 @@ python populate_packages_prepend () { } PACKAGES_DYNAMIC = "perl-module-*" +PACKAGES_DYNAMIC_virtclass-nativesdk = "nativesdk-perl-module-*" RPROVIDES_perl-lib = "perl-lib" @@ -311,3 +312,4 @@ require perl-rprovides_${PV}.inc SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index 9c648fe..3eb36fc 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb @@ -148,11 +148,11 @@ require python-${PYTHON_MAJMIN}-manifest.inc RPROVIDES_${PN}-core = "${PN}" RRECOMMENDS_${PN}-core = "${PN}-readline" RRECOMMENDS_${PN}-crypt = "openssl" -RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "openssl-nativesdk" +RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "nativesdk-openssl" # package libpython2 -PACKAGES =+ "lib${BPN}2${PKGSUFFIX}" -FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*" +PACKAGES =+ "lib${BPN}2" +FILES_lib${BPN}2 = "${libdir}/libpython*.so.*" # catch debug extensions (isn't that already in python-core-dbg?) FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" @@ -166,6 +166,3 @@ PACKAGES += "${PN}-man" FILES_${PN}-man = "${datadir}/man" BBCLASSEXTEND = "nativesdk" - -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index df0cae0..fbf9e77 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Qemu helper scripts" DESCRIPTION = "Qemu helper scripts" LICENSE = "GPLv2" -RDEPENDS_${PN} = "qemu-nativesdk" +RDEPENDS_${PN} = "nativesdk-qemu" PR = "r9" FILESPATH = "${FILE_DIRNAME}/qemu-helper" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 9cb4aee..bdb566d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -22,7 +22,7 @@ inherit autotools do_configure() { # Handle distros such as CentOS 5 32-bit that do not have kvm support KVMOPTS="--disable-kvm" - if [ "${PN}" != "qemu-native" -a "${PN}" != "qemu-nativesdk" ] \ + if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \ || [ -f /usr/include/linux/kvm.h ] ; then KVMOPTS="--enable-kvm" fi @@ -41,8 +41,8 @@ do_install () { PACKAGECONFIG ??= "" DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk" -RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0" +RDEPENDS_virtclass-nativesdk = "nativesdk-libsdl" EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ --disable-curl \ " diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb index d03c153..7480638 100644 --- a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb +++ b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" RDEPENDS_${PN} = "pseudo" RDEPENDS_${PN}_virtclass-native = "pseudo-native" -RDEPENDS_${PN}_virtclass-nativesdk = "pseudo-nativesdk" +RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-pseudo" BASEPV = "2.2beta47" PR = "r1" @@ -73,6 +73,6 @@ python __anonymous () { import re pn = d.getVar("PN", True) - if not pn.endswith('-native') and not pn.endswith('-nativesdk'): + if not pn.endswith('-native') and not pn.startswith('nativesdk-'): raise bb.parse.SkipPackage("unfs-server is intended for native/nativesdk builds only") } |