diff options
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 4f5a5b2a46..e80a83410e 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/" | |||
7 | SECTION = "devel" | 7 | SECTION = "devel" |
8 | DEPENDS += "m4-native" | 8 | DEPENDS += "m4-native" |
9 | DEPENDS_virtclass-native = "m4-native gnu-config-native" | 9 | DEPENDS_virtclass-native = "m4-native gnu-config-native" |
10 | DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" | 10 | DEPENDS_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config" |
11 | RDEPENDS_${PN} = "m4 gnu-config" | 11 | RDEPENDS_${PN} = "m4 gnu-config" |
12 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" | 12 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" |
13 | RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" | 13 | RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config" |
14 | 14 | ||
15 | SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ | 15 | SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ |
16 | file://program_prefix.patch" | 16 | 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 2a97bcc9aa..700592c6c9 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} += "\ | |||
28 | perl-module-vars " | 28 | perl-module-vars " |
29 | 29 | ||
30 | RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime" | 30 | RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime" |
31 | RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" | 31 | RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-autoconf" |
32 | 32 | ||
33 | PATHFIXPATCH = "file://path_prog_fixes.patch" | 33 | PATHFIXPATCH = "file://path_prog_fixes.patch" |
34 | PATHFIXPATCH_virtclass-native = "" | 34 | PATHFIXPATCH_virtclass-native = "" |
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index a23531ca23..4658badfa6 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_ | |||
4 | PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 4 | PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
5 | BPN = "binutils" | 5 | BPN = "binutils" |
6 | 6 | ||
7 | DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" | 7 | DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext" |
8 | EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ | 8 | EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ |
9 | " | 9 | " |
10 | do_install () { | 10 | do_install () { |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index cc0a3badb9..ef861ae6cb 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} | |||
4 | PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 4 | PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
5 | BPN = "gcc" | 5 | BPN = "gcc" |
6 | 6 | ||
7 | DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" | 7 | DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc gettext" |
8 | 8 | ||
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 308e6f5234..53c463264f 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 | |||
5 | require gcc-configure-sdk.inc | 5 | require gcc-configure-sdk.inc |
6 | require gcc-package-sdk.inc | 6 | require gcc-package-sdk.inc |
7 | 7 | ||
8 | DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" | 8 | DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" |
9 | RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" | 9 | RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" |
10 | 10 | ||
11 | SYSTEMHEADERS = "/usr/include" | 11 | SYSTEMHEADERS = "/usr/include" |
12 | SYSTEMLIBS = "${target_base_libdir}/" | 12 | SYSTEMLIBS = "${target_base_libdir}/" |
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc index 0fd82a6fdf..467a3f5d43 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}/" | |||
6 | 6 | ||
7 | GCCMULTILIB = "--disable-multilib" | 7 | GCCMULTILIB = "--disable-multilib" |
8 | 8 | ||
9 | DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native" | 9 | DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-${TARGET_PREFIX}libc-for-gcc gettext-native" |
10 | PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" | 10 | 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 c796253c82..5eaa515570 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" | |||
4 | 4 | ||
5 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" | 5 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" |
6 | 6 | ||
7 | PKGSUFFIX = "" | ||
8 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | ||
9 | |||
10 | PACKAGES = "\ | 7 | PACKAGES = "\ |
11 | ${PN} \ | 8 | ${PN} \ |
12 | ${PN}-dev \ | 9 | ${PN}-dev \ |
13 | ${PN}-dbg \ | 10 | ${PN}-dbg \ |
14 | libgcov${PKGSUFFIX}-dev \ | 11 | libgcov-dev \ |
15 | " | 12 | " |
16 | 13 | ||
17 | FILES_${PN} = "${base_libdir}/libgcc*.so.*" | 14 | FILES_${PN} = "${base_libdir}/libgcc*.so.*" |
@@ -19,7 +16,7 @@ FILES_${PN}-dev = " \ | |||
19 | ${base_libdir}/libgcc*.so \ | 16 | ${base_libdir}/libgcc*.so \ |
20 | ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ | 17 | ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ |
21 | ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" | 18 | ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" |
22 | FILES_libgcov${PKGSUFFIX}-dev = " \ | 19 | FILES_libgcov-dev = " \ |
23 | ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ | 20 | ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ |
24 | " | 21 | " |
25 | FILES_${PN}-dbg += "${base_libdir}/.debug/" | 22 | FILES_${PN}-dbg += "${base_libdir}/.debug/" |
@@ -72,4 +69,4 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" | |||
72 | BBCLASSEXTEND = "nativesdk" | 69 | BBCLASSEXTEND = "nativesdk" |
73 | 70 | ||
74 | INSANE_SKIP_${PN}-dev = "staticdev" | 71 | INSANE_SKIP_${PN}-dev = "staticdev" |
75 | INSANE_SKIP_${MLPREFIX}libgcov${PKGSUFFIX}-dev = "staticdev" | 72 | 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 2b6069883e..c947526e82 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" | |||
5 | PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 5 | PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
6 | BPN = "gdb" | 6 | BPN = "gdb" |
7 | 7 | ||
8 | DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk python-nativesdk" | 8 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python" |
9 | RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \ | 9 | RDEPENDS += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \ |
10 | python-nativesdk-codecs python-nativesdk-netclient" | 10 | nativesdk-python-codecs nativesdk-python-netclient" |
11 | 11 | ||
12 | EXTRA_OECONF_append = "--with-python=${WORKDIR}/python" | 12 | EXTRA_OECONF_append = "--with-python=${WORKDIR}/python" |
13 | 13 | ||
@@ -30,3 +30,4 @@ EOF | |||
30 | do_install_append() { | 30 | do_install_append() { |
31 | rm -rf ${D}${exec_prefix}/lib | 31 | rm -rf ${D}${exec_prefix}/lib |
32 | } | 32 | } |
33 | |||
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb index d4588daa81..f7313609a9 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 () { | |||
28 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ | 28 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ |
29 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize | 29 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize |
30 | # In the native case we want the system perl as perl-native can't have built yet | 30 | # In the native case we want the system perl as perl-native can't have built yet |
31 | if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then | 31 | if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then |
32 | sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize | 32 | sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize |
33 | fi | 33 | fi |
34 | chmod 755 ${D}${bindir}/gnu-configize | 34 | 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 4de479915b..73efbb0f91 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 () { | |||
29 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ | 29 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ |
30 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize | 30 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize |
31 | # In the native case we want the system perl as perl-native can't have built yet | 31 | # In the native case we want the system perl as perl-native can't have built yet |
32 | if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then | 32 | if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then |
33 | sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize | 33 | sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize |
34 | fi | 34 | fi |
35 | chmod 755 ${D}${bindir}/gnu-configize | 35 | 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 a540c0d8ff..78ea6d0514 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 | |||
117 | BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake" | 117 | BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake" |
118 | for pkg in $BASE_HOSTSDK_PKGNAMES; do | 118 | for pkg in $BASE_HOSTSDK_PKGNAMES; do |
119 | echo_info "Installing ${pkg} nativesdk ...\n" | 119 | echo_info "Installing ${pkg} nativesdk ...\n" |
120 | $OPKG_INSTALL_NATIVE_CMD ${pkg}-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE | 120 | $OPKG_INSTALL_NATIVE_CMD nativesdk-${pkg} &>> $YOCTOADT_INSTALL_LOG_FILE |
121 | check_result | 121 | check_result |
122 | done | 122 | done |
123 | 123 | ||
@@ -142,15 +142,15 @@ done | |||
142 | 142 | ||
143 | if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then | 143 | if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then |
144 | echo_info "\nInstalling qemu native ..." | 144 | echo_info "\nInstalling qemu native ..." |
145 | $OPKG_INSTALL_NATIVE_CMD qemu-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE | 145 | $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu &>> $YOCTOADT_INSTALL_LOG_FILE |
146 | check_result | 146 | check_result |
147 | $OPKG_INSTALL_NATIVE_CMD qemu-helper-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE | 147 | $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu-helper &>> $YOCTOADT_INSTALL_LOG_FILE |
148 | check_result | 148 | check_result |
149 | fi | 149 | fi |
150 | 150 | ||
151 | if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then | 151 | if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then |
152 | echo_info "\nInstalling unfs ..." | 152 | echo_info "\nInstalling unfs ..." |
153 | $OPKG_INSTALL_NATIVE_CMD unfs-server-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE | 153 | $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs-server &>> $YOCTOADT_INSTALL_LOG_FILE |
154 | check_result | 154 | check_result |
155 | fi | 155 | fi |
156 | 156 | ||
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 5c7cad3665..10cd9d8f30 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc | |||
@@ -8,7 +8,7 @@ LICENSE = "GPLv2+" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
9 | file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" | 9 | file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" |
10 | DEPENDS_virtclass-native = "curl-native" | 10 | DEPENDS_virtclass-native = "curl-native" |
11 | DEPENDS_virtclass-nativesdk = "curl-nativesdk" | 11 | DEPENDS_virtclass-nativesdk = "nativesdk-curl" |
12 | 12 | ||
13 | PE = "1" | 13 | PE = "1" |
14 | INC_PR = "r10" | 14 | INC_PR = "r10" |
@@ -41,12 +41,12 @@ RDEPENDS_${PN}_virtclass-nativesdk = "" | |||
41 | PACKAGE_ARCH_update-alternatives-cworth = "all" | 41 | PACKAGE_ARCH_update-alternatives-cworth = "all" |
42 | RREPLACES_${PN} = "opkg-nogpg" | 42 | RREPLACES_${PN} = "opkg-nogpg" |
43 | 43 | ||
44 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" | 44 | PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" |
45 | 45 | ||
46 | FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" | 46 | FILES_update-alternatives-cworth = "${bindir}/update-alternatives" |
47 | FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so" | 47 | FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so" |
48 | FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a" | 48 | FILES_libopkg-staticdev = "${libdir}/*.a" |
49 | FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" | 49 | FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" |
50 | 50 | ||
51 | # We need to create the lock directory | 51 | # We need to create the lock directory |
52 | do_install_append() { | 52 | do_install_append() { |
@@ -75,9 +75,6 @@ ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl" | |||
75 | 75 | ||
76 | BBCLASSEXTEND = "native nativesdk" | 76 | BBCLASSEXTEND = "native nativesdk" |
77 | 77 | ||
78 | PKGSUFFIX = "" | ||
79 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | ||
80 | |||
81 | # Define a variable to allow distros to run configure earlier. | 78 | # Define a variable to allow distros to run configure earlier. |
82 | # (for example, to enable loading of ethernet kernel modules before networking starts) | 79 | # (for example, to enable loading of ethernet kernel modules before networking starts) |
83 | POSTINSTALL_INITPOSITION ?= "98" | 80 | 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 561b30ed18..9db38055cb 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 () { | |||
302 | } | 302 | } |
303 | 303 | ||
304 | PACKAGES_DYNAMIC = "perl-module-*" | 304 | PACKAGES_DYNAMIC = "perl-module-*" |
305 | PACKAGES_DYNAMIC_virtclass-nativesdk = "nativesdk-perl-module-*" | ||
305 | 306 | ||
306 | RPROVIDES_perl-lib = "perl-lib" | 307 | RPROVIDES_perl-lib = "perl-lib" |
307 | 308 | ||
@@ -311,3 +312,4 @@ require perl-rprovides_${PV}.inc | |||
311 | 312 | ||
312 | SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" | 313 | SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" |
313 | 314 | ||
315 | 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 9c648fec15..3eb36fc9aa 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 | |||
148 | RPROVIDES_${PN}-core = "${PN}" | 148 | RPROVIDES_${PN}-core = "${PN}" |
149 | RRECOMMENDS_${PN}-core = "${PN}-readline" | 149 | RRECOMMENDS_${PN}-core = "${PN}-readline" |
150 | RRECOMMENDS_${PN}-crypt = "openssl" | 150 | RRECOMMENDS_${PN}-crypt = "openssl" |
151 | RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "openssl-nativesdk" | 151 | RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "nativesdk-openssl" |
152 | 152 | ||
153 | # package libpython2 | 153 | # package libpython2 |
154 | PACKAGES =+ "lib${BPN}2${PKGSUFFIX}" | 154 | PACKAGES =+ "lib${BPN}2" |
155 | FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*" | 155 | FILES_lib${BPN}2 = "${libdir}/libpython*.so.*" |
156 | 156 | ||
157 | # catch debug extensions (isn't that already in python-core-dbg?) | 157 | # catch debug extensions (isn't that already in python-core-dbg?) |
158 | FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" | 158 | FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" |
@@ -166,6 +166,3 @@ PACKAGES += "${PN}-man" | |||
166 | FILES_${PN}-man = "${datadir}/man" | 166 | FILES_${PN}-man = "${datadir}/man" |
167 | 167 | ||
168 | BBCLASSEXTEND = "nativesdk" | 168 | BBCLASSEXTEND = "nativesdk" |
169 | |||
170 | PKGSUFFIX = "" | ||
171 | 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 df0cae068e..fbf9e771df 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 @@ | |||
1 | SUMMARY = "Qemu helper scripts" | 1 | SUMMARY = "Qemu helper scripts" |
2 | DESCRIPTION = "Qemu helper scripts" | 2 | DESCRIPTION = "Qemu helper scripts" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | RDEPENDS_${PN} = "qemu-nativesdk" | 4 | RDEPENDS_${PN} = "nativesdk-qemu" |
5 | PR = "r9" | 5 | PR = "r9" |
6 | 6 | ||
7 | FILESPATH = "${FILE_DIRNAME}/qemu-helper" | 7 | FILESPATH = "${FILE_DIRNAME}/qemu-helper" |
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 9cb4aee458..bdb566d88f 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -22,7 +22,7 @@ inherit autotools | |||
22 | do_configure() { | 22 | do_configure() { |
23 | # Handle distros such as CentOS 5 32-bit that do not have kvm support | 23 | # Handle distros such as CentOS 5 32-bit that do not have kvm support |
24 | KVMOPTS="--disable-kvm" | 24 | KVMOPTS="--disable-kvm" |
25 | if [ "${PN}" != "qemu-native" -a "${PN}" != "qemu-nativesdk" ] \ | 25 | if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \ |
26 | || [ -f /usr/include/linux/kvm.h ] ; then | 26 | || [ -f /usr/include/linux/kvm.h ] ; then |
27 | KVMOPTS="--enable-kvm" | 27 | KVMOPTS="--enable-kvm" |
28 | fi | 28 | fi |
@@ -41,8 +41,8 @@ do_install () { | |||
41 | PACKAGECONFIG ??= "" | 41 | PACKAGECONFIG ??= "" |
42 | 42 | ||
43 | DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" | 43 | DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" |
44 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk" | 44 | DEPENDS_virtclass-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0" |
45 | RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" | 45 | RDEPENDS_virtclass-nativesdk = "nativesdk-libsdl" |
46 | EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ | 46 | EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ |
47 | --disable-curl \ | 47 | --disable-curl \ |
48 | " | 48 | " |
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 d03c153298..7480638889 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" | |||
5 | 5 | ||
6 | RDEPENDS_${PN} = "pseudo" | 6 | RDEPENDS_${PN} = "pseudo" |
7 | RDEPENDS_${PN}_virtclass-native = "pseudo-native" | 7 | RDEPENDS_${PN}_virtclass-native = "pseudo-native" |
8 | RDEPENDS_${PN}_virtclass-nativesdk = "pseudo-nativesdk" | 8 | RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-pseudo" |
9 | BASEPV = "2.2beta47" | 9 | BASEPV = "2.2beta47" |
10 | PR = "r1" | 10 | PR = "r1" |
11 | 11 | ||
@@ -73,6 +73,6 @@ python __anonymous () { | |||
73 | import re | 73 | import re |
74 | 74 | ||
75 | pn = d.getVar("PN", True) | 75 | pn = d.getVar("PN", True) |
76 | if not pn.endswith('-native') and not pn.endswith('-nativesdk'): | 76 | if not pn.endswith('-native') and not pn.startswith('nativesdk-'): |
77 | raise bb.parse.SkipPackage("unfs-server is intended for native/nativesdk builds only") | 77 | raise bb.parse.SkipPackage("unfs-server is intended for native/nativesdk builds only") |
78 | } | 78 | } |