Re: [OE-core] devshell spawning twice
I met the same problem on openSUSE 12.1 64 bit. I used ssh -X to opensuse, and my client is Ubuntu 11.10 32bit // Robert On 10/28/2012 07:55 AM, Andrea Adami wrote: Since commit c76da87511d2668479745c2f18b8a9b8116c7489 (terminal: Add support for running custom terminals.) screen opens also in the master terminal, waiting for input. Reverting the patch fixes the funny behavior. This on Gentoo, using xterm. Regards Andrea ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] autotools: Attempt to clean build directory when rerunning configure
On Mon, 2012-10-29 at 18:14 +, Phil Blundell wrote: Existing logic in autotools_preconfigure() will clean the build directory before rerunning configure in the case where ${S} != ${B}. It is, however, desirable to make at least some attempt to clean the build artifacts for in-tree builds since many packages lack the appropriate dependency rules to force a recompile if (for example) CFLAGS has changed. Making distclean would be better but is not practical because many packages don't support it properly. Even make clean is not universally available, so we ignore any failure from that command and just carry on regardless. Signed-off-by: Phil Blundell ph...@gnu.org --- meta/classes/autotools.bbclass | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) How extensively has this been tested? I have a suspicion that we might run into a number of issues doing this throughout the tree :( I'm wondering how many recipes will suffer from issues with make clean verses how many recipes would struggle if we defaulted ${B} != ${S}? Cheers, Richard diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index b97d74b..6539df9 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -93,10 +93,15 @@ CONFIGURESTAMPFILE = ${WORKDIR}/configure.sstate autotools_preconfigure() { if [ -n ${CONFIGURESTAMPFILE} -a -e ${CONFIGURESTAMPFILE} ]; then - if [ `cat ${CONFIGURESTAMPFILE}` != ${BB_TASKHASH} -a ${S} != ${B} ]; then - echo Previously configured separate build directory detected, cleaning ${B} - rm -rf ${B} - mkdir ${B} + if [ `cat ${CONFIGURESTAMPFILE}` != ${BB_TASKHASH} ]; then + if [ ${S} != ${B} ]; then + echo Previously configured separate build directory detected, cleaning ${B} + rm -rf ${B} + mkdir ${B} + else + echo Previously configured source directory detected, cleaning ${S} + ( oe_runmake clean ) || true + fi fi fi } ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk)
The following overrides are deprecated: virtclass-native virtclass-nativesdk We should use the new overrides: class-target class-native class-nativesdk class-cross class-crosssdk class-multilib These patches replace the old ways with the new ones, but keep the compatibility with the old ways, which means that the virtclass-native and virtclass-nativesdk still work correctly. Test info: # With MACHINE=qemux86/qemux86-64/qemuarm/qemumips/qemuppc $ bitbake core-image-minimal core-image-sato core-image-sato-sdk # With MACHINE=qemux86 $ bitbake meta-toolchain-sdk world Used the buildhistory.bbclass to verify that there isn't any apparent changes which is caused by these patches. Will send the patch for meta-yocto to its mailing list sooner. // Robert The following changes since commit 93c04c16e45a3c8f60f8ffc0b26a78c24bda71da: bitbake: hob: reordering the layers in the Hob Layers dialog (2012-10-27 09:55:55 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/virtclass http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/virtclass Robert Yang (11): classes: replace virtclass-native(sdk) with class-native(sdk) multilib.bbclass: add class-multilib to override conf: replace virtclass-native(sdk) with class-native(sdk) recipes-core: replace virtclass-native(sdk) with class-native(sdk) recipes-devtools: replace virtclass-native(sdk) with class-native(sdk) recipes-extended: replace virtclass-native(sdk) with class-native(sdk) recipes-graphics: replace virtclass-native(sdk) with class-native(sdk) recipes-support: replace virtclass-native(sdk) with class-native(sdk) recipes-gnome: replace virtclass-native(sdk) with class-native(sdk) recipes-kernel: replace virtclass-native(sdk) with class-native(sdk) recipes-connectivity: replace virtclass-native(sdk) with class-native(sdk) meta/classes/cross.bbclass | 2 +- meta/classes/insane.bbclass| 4 ++-- meta/classes/multilib.bbclass | 4 +++- meta/classes/multilib_global.bbclass | 4 ++-- meta/classes/native.bbclass| 6 +++--- meta/classes/populate_sdk_rpm.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass| 2 +- meta/classes/sanity.bbclass| 3 ++- meta/classes/update-rc.d.bbclass | 6 +++--- meta/classes/useradd.bbclass | 24 +++--- meta/conf/distro/include/default-distrovars.inc| 2 +- meta/recipes-connectivity/openssl/openssl.inc | 2 +- meta/recipes-core/coreutils/coreutils_6.9.bb | 4 ++-- meta/recipes-core/coreutils/coreutils_8.14.bb | 4 ++-- meta/recipes-core/dbus/dbus-glib.inc | 4 ++-- meta/recipes-core/dbus/dbus.inc| 12 +-- meta/recipes-core/eglibc/eglibc-initial.inc| 2 +- meta/recipes-core/eglibc/eglibc.inc| 6 +++--- meta/recipes-core/eglibc/eglibc_2.16.bb| 2 +- meta/recipes-core/gettext/gettext_0.16.1.bb| 4 ++-- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 6 +++--- meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 6 +++--- meta/recipes-core/glib-2.0/glib.inc| 6 +++--- meta/recipes-core/jpeg/jpeg_8d.bb | 2 +- meta/recipes-core/libxml/libxml2.inc | 6 +++--- meta/recipes-core/ncurses/ncurses.inc | 4 ++-- meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb | 2 +- meta/recipes-core/uclibc/uclibc-initial_git.bb | 2 +- meta/recipes-core/uclibc/uclibc_0.9.33.bb | 2 +- meta/recipes-core/uclibc/uclibc_git.bb | 2 +- meta/recipes-core/util-linux/util-linux.inc| 6 +++--- meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 +- meta/recipes-devtools/autoconf/autoconf.inc| 6 +++--- meta/recipes-devtools/autoconf/autoconf_2.69.bb| 2 +- meta/recipes-devtools/automake/automake_1.12.3.bb | 8 meta/recipes-devtools/binutils/binutils_2.22.bb| 4 ++-- meta/recipes-devtools/bison/bison_2.3.bb | 6 +++--- meta/recipes-devtools/bison/bison_2.5.1.bb | 6 +++--- meta/recipes-devtools/chrpath/chrpath_0.14.bb | 4 ++-- meta/recipes-devtools/dpkg/dpkg.inc| 10 - meta/recipes-devtools/elfutils/elfutils_0.148.bb | 6 +++--- meta/recipes-devtools/file/file_5.11.bb| 4 ++-- meta/recipes-devtools/flex/flex.inc| 2 +- meta/recipes-devtools/git/git.inc | 4 ++-- .../gnu-config/gnu-config_20120814.bb | 2 +- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +- meta/recipes-devtools/guile/guile_2.0.6.bb | 2 +- meta/recipes-devtools/insserv/insserv_1.14.0.bb| 2 +- meta/recipes-devtools/intltool/intltool.inc| 8
[OE-core] [PATCH 01/11] classes: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/cross.bbclass| 2 +- meta/classes/insane.bbclass | 4 ++-- meta/classes/multilib.bbclass | 2 +- meta/classes/multilib_global.bbclass | 4 ++-- meta/classes/native.bbclass | 6 +++--- meta/classes/populate_sdk_rpm.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 2 +- meta/classes/update-rc.d.bbclass | 6 +++--- meta/classes/useradd.bbclass | 24 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index e998307..735f6d2 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -7,7 +7,7 @@ EXCLUDE_FROM_WORLD = 1 CLASSOVERRIDE = class-cross PACKAGES = PACKAGES_DYNAMIC = -PACKAGES_DYNAMIC_virtclass-native = +PACKAGES_DYNAMIC_class-native = HOST_ARCH = ${BUILD_ARCH} HOST_VENDOR = ${BUILD_VENDOR} diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 2dc9ba3..d51d1a1 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -24,8 +24,8 @@ PACKAGEFUNCS += do_package_qa # unsafe-references-in-binaries requires prelink-rtld from # prelink-native, but we don't want this DEPENDS for -native builds QADEPENDS = prelink-native -QADEPENDS_virtclass-native = -QADEPENDS_virtclass-nativesdk = +QADEPENDS_class-native = +QADEPENDS_class-nativesdk = # # dictionary for elf headers diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index c249925..77ccce4 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -44,7 +44,7 @@ python multilib_virtclass_handler () { e.data.setVar(MLPREFIX, variant + -) e.data.setVar(PN, variant + - + e.data.getVar(PN, False)) -e.data.setVar(SHLIBSDIR_virtclass-multilib- + variant ,e.data.getVar(SHLIBSDIR, False) + / + variant) +e.data.setVar(SHLIBSDIR_class-multilib- + variant ,e.data.getVar(SHLIBSDIR, False) + / + variant) e.data.setVar(OVERRIDES, e.data.getVar(OVERRIDES, False) + override) } diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index f55e3a2..3b5faa0 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -4,8 +4,8 @@ python multilib_virtclass_handler_global () { if isinstance(e, bb.event.RecipePreFinalise): for v in e.data.getVar(MULTILIB_VARIANTS, True).split(): -if e.data.getVar(TARGET_VENDOR_virtclass-multilib- + v, False) is None: - e.data.setVar(TARGET_VENDOR_virtclass-multilib- + v, e.data.getVar(TARGET_VENDOR, False) + ml + v) +if e.data.getVar(TARGET_VENDOR_class-multilib- + v, False) is None: + e.data.setVar(TARGET_VENDOR_class-multilib- + v, e.data.getVar(TARGET_VENDOR, False) + ml + v) variant = e.data.getVar(BBEXTENDVARIANT, True) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 93f96f5..6314ba1 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -6,14 +6,14 @@ inherit relocatable EXCLUDE_FROM_WORLD = 1 PACKAGES = -PACKAGES_virtclass-native = +PACKAGES_class-native = PACKAGES_DYNAMIC = -PACKAGES_DYNAMIC_virtclass-native = +PACKAGES_DYNAMIC_class-native = PACKAGE_ARCH = ${BUILD_ARCH} # used by cmake class OECMAKE_RPATH = ${libdir} -OECMAKE_RPATH_virtclass-native = ${libdir} +OECMAKE_RPATH_class-native = ${libdir} # When this class has packaging enabled, setting # RPROVIDES becomes unnecessary. diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index 1c54049..d4c880e 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass @@ -128,7 +128,7 @@ python () { eext = ext.split(':') if len(eext) 1 and eext[0] == 'multilib': localdata = bb.data.createCopy(d) -default_tune = localdata.getVar(DEFAULTTUNE_virtclass-multilib- + eext[1], False) +default_tune = localdata.getVar(DEFAULTTUNE_class-multilib- + eext[1], False) if default_tune: localdata.setVar(DEFAULTTUNE, default_tune) package_archs = localdata.getVar(PACKAGE_ARCHS, True) or diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index c86cd09..16b7779 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -194,7 +194,7 @@ python () { eext = ext.split(':') if len(eext) 1 and eext[0] == 'multilib': localdata = bb.data.createCopy(d) -default_tune = localdata.getVar(DEFAULTTUNE_virtclass-multilib- + eext[1], False) +default_tune =
[OE-core] [PATCH 03/11] conf: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/conf/distro/include/default-distrovars.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index ef8232d..9002fd6 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -18,7 +18,7 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= ipv4 ipv6 libc-backtrace libc-big-macros libc-b libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ libc-posix-wchar-io DISTRO_FEATURES_LIBC ?= ${DISTRO_FEATURES_LIBC_DEFAULT} -DISTRO_FEATURES_LIBC_virtclass-nativesdk = ${DISTRO_FEATURES_LIBC_DEFAULT} +DISTRO_FEATURES_LIBC_class-nativesdk = ${DISTRO_FEATURES_LIBC_DEFAULT} DISTRO_FEATURES ?= alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} IMAGE_FEATURES ?= -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/11] recipes-extended: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-extended/bzip2/bzip2_1.0.6.bb| 4 ++-- meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 10 +- meta/recipes-extended/groff/groff_1.20.1.bb | 4 ++-- meta/recipes-extended/gzip/gzip_1.5.bb| 2 +- meta/recipes-extended/perl/libtimedate-perl_1.20.bb | 2 +- meta/recipes-extended/pigz/pigz.inc | 2 +- meta/recipes-extended/stat/stat_3.3.bb| 2 +- meta/recipes-extended/texinfo/texinfo_4.13a.bb| 6 +++--- meta/recipes-extended/unzip/unzip_6.0.bb | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb index d03b57d..6e160cd 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb @@ -25,7 +25,7 @@ ALTERNATIVE_PRIORITY = 100 ALTERNATIVE_${PN} = bunzip2 bzcat #install binaries to bzip2-native under sysroot for replacement-native -EXTRA_OECONF_virtclass-native += --bindir=${STAGING_BINDIR_NATIVE}/${PN} +EXTRA_OECONF_class-native += --bindir=${STAGING_BINDIR_NATIVE}/${PN} do_configure_prepend () { cp ${WORKDIR}/configure.ac ${S}/ cp ${WORKDIR}/Makefile.am ${S}/ @@ -42,6 +42,6 @@ FILES_libbz2-staticdev = ${libdir}/*.a SECTION_libbz2-staticdev = devel RDEPENDS_libbz2-staticdev = libbz2-dev (= ${EXTENDPKGV}) -PROVIDES_append_virtclass-native = bzip2-replacement-native +PROVIDES_append_class-native = bzip2-replacement-native BBCLASSEXTEND = native nativesdk diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb index 1c18b21..1fdcb99 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = file://LICENSE;md5=c5326026692dbed183f0558f926580f8 PR = r3 DEPENDS = ghostscript-native tiff jpeg fontconfig cups -DEPENDS_virtclass-native = +DEPENDS_class-native = SRC_URI_BASE = http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz; @@ -30,7 +30,7 @@ SRC_URI = ${SRC_URI_BASE} \ file://ghostscript-9.05-NOT-check-endian.patch \ -SRC_URI_virtclass-native = ${SRC_URI_BASE} +SRC_URI_class-native = ${SRC_URI_BASE} SRC_URI[md5sum] = f7c6f0431ca8d44ee132a55d583212c1 SRC_URI[sha256sum] = 593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207 @@ -80,18 +80,18 @@ do_install_append () { chown -R root:lp ${D}${sysconfdir}/cups } -python do_patch_virtclass-native () { +python do_patch_class-native () { pass } -do_compile_virtclass-native () { +do_compile_class-native () { mkdir -p obj for i in genarch genconf mkromfs echogs gendev genht; do oe_runmake obj/aux/$i done } -do_install_virtclass-native () { +do_install_class-native () { install -d ${D}${bindir}/ghostscript-${PV} for i in genarch genconf mkromfs echogs gendev genht; do install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb index c7da1b4..157365b 100644 --- a/meta/recipes-extended/groff/groff_1.20.1.bb +++ b/meta/recipes-extended/groff/groff_1.20.1.bb @@ -14,7 +14,7 @@ SRC_URI[md5sum] = 48fa768dd6fdeb7968041dd5ae8e2b02 SRC_URI[sha256sum] = b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805 DEPENDS = groff-native -DEPENDS_virtclass-native = +DEPENDS_class-native = inherit autotools @@ -44,7 +44,7 @@ do_install_append() { done } -do_install_append_virtclass-native() { +do_install_append_class-native() { # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location # for target as /usr/bin/perl, so fix it to /usr/bin/perl. for i in afmtodit mmroff; do diff --git a/meta/recipes-extended/gzip/gzip_1.5.bb b/meta/recipes-extended/gzip/gzip_1.5.bb index 2c6917d..f7b8593 100644 --- a/meta/recipes-extended/gzip/gzip_1.5.bb +++ b/meta/recipes-extended/gzip/gzip_1.5.bb @@ -2,7 +2,7 @@ require gzip.inc PR = r0 -PROVIDES_append_virtclass-native = gzip-replacement-native +PROVIDES_append_class-native = gzip-replacement-native NATIVE_PACKAGE_PATH_SUFFIX = /${PN} BBCLASSEXTEND = native diff --git a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb index 12439cf..780f774 100644 --- a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb +++ b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb @@ -13,7 +13,7 @@ inherit cpan allarch BBCLASSEXTEND = native -RDEPENDS_${PN}_virtclass-native = +RDEPENDS_${PN}_class-native = RDEPENDS_${PN}
[OE-core] [PATCH 02/11] multilib.bbclass: add class-multilib to override
Add the new override way CLASSOVERRIDE = class-multilib to multilib.bbclass, and add the check code to sanity.bbclass, we keep both the old and new way, which means, both of the following are supported: virtclass-multilib class-multilib [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/multilib.bbclass | 2 ++ meta/classes/sanity.bbclass | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 77ccce4..2dd2f85 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -1,3 +1,5 @@ +CLASSOVERRIDE = class-multilib + python multilib_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): return diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 3806bc5..ba1cd6d 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -122,7 +122,8 @@ def check_toolchain(data): tune_error_set.append(The multilib '%s' appears more than once. % lib) else: seen_libs.append(lib) -tune = data.getVar(DEFAULTTUNE_virtclass-multilib-%s % lib, True) +tune = data.getVar(DEFAULTTUNE_virtclass-multilib-%s % lib, True) or \ + data.getVar(DEFAULTTUNE_class-multilib-%s % lib, True) if tune in seen_tunes: tune_error_set.append(The tuning '%s' appears in more than one multilib. % tune) else: -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/11] recipes-core: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-core/coreutils/coreutils_6.9.bb | 4 ++-- meta/recipes-core/coreutils/coreutils_8.14.bb | 4 ++-- meta/recipes-core/dbus/dbus-glib.inc | 4 ++-- meta/recipes-core/dbus/dbus.inc | 12 ++-- meta/recipes-core/eglibc/eglibc-initial.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 6 +++--- meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +- meta/recipes-core/gettext/gettext_0.16.1.bb | 4 ++-- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 6 +++--- meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 6 +++--- meta/recipes-core/glib-2.0/glib.inc | 6 +++--- meta/recipes-core/jpeg/jpeg_8d.bb | 2 +- meta/recipes-core/libxml/libxml2.inc | 6 +++--- meta/recipes-core/ncurses/ncurses.inc | 4 ++-- meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb | 2 +- meta/recipes-core/uclibc/uclibc-initial_git.bb| 2 +- meta/recipes-core/uclibc/uclibc_0.9.33.bb | 2 +- meta/recipes-core/uclibc/uclibc_git.bb| 2 +- meta/recipes-core/util-linux/util-linux.inc | 6 +++--- meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 +- 20 files changed, 42 insertions(+), 42 deletions(-) diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index 20d8120..ffdd2af 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/recipes-core/coreutils/coreutils_6.9.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e PR = r3 DEPENDS = coreutils-native-${PV} -DEPENDS_virtclass-native = gettext-native +DEPENDS_class-native = gettext-native inherit autotools gettext @@ -28,7 +28,7 @@ SRC_URI_BASE = ${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ SRC_URI = ${SRC_URI_BASE} file://fix_for_manpage_building.patch -SRC_URI_virtclass-native = ${SRC_URI_BASE} +SRC_URI_class-native = ${SRC_URI_BASE} SRC_URI[md5sum] = c9607d8495f16e98906e7ed2d9751a06 SRC_URI[sha256sum] = 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0 diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb index 178bd67..3f58cfd 100644 --- a/meta/recipes-core/coreutils/coreutils_8.14.bb +++ b/meta/recipes-core/coreutils/coreutils_8.14.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad PR = r5 DEPENDS = gmp libcap -DEPENDS_virtclass-native = +DEPENDS_class-native = inherit autotools gettext @@ -21,7 +21,7 @@ SRC_URI = ${GNU_MIRROR}/coreutils/${BP}.tar.xz \ SRC_URI[md5sum] = bcb135ce553493a45aba01b39eb3920a SRC_URI[sha256sum] = 0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d -EXTRA_OECONF_virtclass-native = --without-gmp +EXTRA_OECONF_class-native = --without-gmp # [ df mktemp base64 gets a special treatment and is not included in this bindir_progs = basename chcon cksum comm csplit cut dir dircolors dirname du \ diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 3469a4f..dff30c7 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ SECTION = base DEPENDS = expat glib-2.0 virtual/libintl dbus-glib-native dbus -DEPENDS_virtclass-native = glib-2.0-native dbus-native +DEPENDS_class-native = glib-2.0-native dbus-native SRC_URI = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ file://no-examples.patch \ @@ -24,7 +24,7 @@ PACKAGECONFIG[tests] = --enable-tests,,, EXTRA_OECONF = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool -EXTRA_OECONF_virtclass-native = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml +EXTRA_OECONF_class-native = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml PACKAGES += ${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 550eb0a..d165cdd 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5 X11DEPENDS = virtual/libx11 libsm
[OE-core] [PATCH 11/11] recipes-connectivity: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-connectivity/openssl/openssl.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 089b9a4..c88b77a 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -23,7 +23,7 @@ CFLAG = ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_END # Avoid binaries being marked as requiring an executable stack (which causes # issues with SELinux on the host) -CFLAG_append_virtclass-native = -Wa,--noexecstack +CFLAG_append_class-native = -Wa,--noexecstack # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom CFLAG_mtx-1 := ${@'${CFLAG}'.replace('-O2', '')} -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/11] recipes-kernel: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 3f94e98..9e88ee9 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -3,8 +3,8 @@ DESCRIPTION = SystemTap - script-directed dynamic tracing and performance analy require systemtap_git.inc DEPENDS = elfutils sqlite3 systemtap-native -DEPENDS_virtclass-native = elfutils-native sqlite3-native gettext-native -DEPENDS_virtclass-nativesdk = nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext +DEPENDS_class-native = elfutils-native sqlite3-native gettext-native +DEPENDS_class-nativesdk = nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext PR = r0 -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/11] recipes-graphics: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-graphics/freetype/freetype_2.4.10.bb | 4 ++-- meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +- meta/recipes-graphics/pango/pango.inc | 2 +- meta/recipes-graphics/xcb/xcb-proto.inc | 2 +- meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 2 +- meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 +- meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/freetype/freetype_2.4.10.bb b/meta/recipes-graphics/freetype/freetype_2.4.10.bb index cf2a78e..9365475 100644 --- a/meta/recipes-graphics/freetype/freetype_2.4.10.bb +++ b/meta/recipes-graphics/freetype/freetype_2.4.10.bb @@ -27,7 +27,7 @@ inherit autotools pkgconfig binconfig LIBTOOL = ${S}/builds/unix/${HOST_SYS}-libtool EXTRA_OEMAKE = 'LIBTOOL=${LIBTOOL}' -EXTRA_OEMAKE_virtclass-native = +EXTRA_OEMAKE_class-native = EXTRA_OECONF = --without-zlib --without-bzip2 do_configure() { @@ -40,7 +40,7 @@ do_configure() { oe_runconf } -do_configure_virtclass-native() { +do_configure_class-native() { (cd builds/unix gnu-configize) || die failure running gnu-configize oe_runconf } diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index d5c127d..e25c597 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -16,7 +16,7 @@ DEPENDS = ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ tslib -DEPENDS_virtclass-nativesdk = ${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)} +DEPENDS_class-nativesdk = ${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)} PR = r1 diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index b361978..839c00d 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -16,7 +16,7 @@ PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} PACKAGECONFIG[x11] = --with-x,--without-x,${X11DEPENDS} BBCLASSEXTEND = native -DEPENDS_virtclass-native = glib-2.0-native cairo-native +DEPENDS_class-native = glib-2.0-native cairo-native PACKAGES_DYNAMIC += ^pango-module-.* diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc index feb9e4d..2e1b57b 100644 --- a/meta/recipes-graphics/xcb/xcb-proto.inc +++ b/meta/recipes-graphics/xcb/xcb-proto.inc @@ -21,5 +21,5 @@ FILES_python-xcbgen = ${libdir}/python* RDEPENDS_${PN}-dev = RRECOMMENDS_${PN}-dbg = ${PN}-dev (= ${EXTENDPKGV}) -DEPENDS_append_virtclass-native = python-native +DEPENDS_append_class-native = python-native BBCLASSEXTEND = native nativesdk diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb index 6637326..a453e24 100644 --- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb @@ -12,7 +12,7 @@ PE = 1 PR = ${INC_PR}.0 RDEPENDS_${PN} += mkfontscale -RDEPENDS_${PN}_virtclass-native += mkfontscale-native +RDEPENDS_${PN}_class-native += mkfontscale-native BBCLASSEXTEND = native diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb index a212f19..2c51cbb 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb @@ -13,7 +13,7 @@ SRC_URI += file://nocompiler.patch DEPENDS = util-macros-native RDEPENDS_${PN} = encodings font-util -RDEPENDS_${PN}_virtclass-native = font-util-native +RDEPENDS_${PN}_class-native = font-util-native inherit allarch diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb index 180c7dd..723cb0c 100644 --- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \ file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34 DEPENDS = encodings util-macros -DEPENDS_virtclass-native = util-macros-native +DEPENDS_class-native = util-macros-native RDEPENDS_${PN} = mkfontdir mkfontscale encodings -RDEPENDS_${PN}_virtclass-native =
[OE-core] [PATCH 08/11] recipes-support: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. NOTE: There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native should be BUILD_LDFLAGS_virtclass-native (the _ should be -), otherwise it doesn't work, and the value was: -Wl,rpath=..., this is incorrect, it shoudl be: -Wl,-rpath=... (lacked a - ), but we don't need this line, since it is already in the default BUILD_LDFLAGS. Remove it and we don't need to bump the PR since we just removed a unused line. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-support/apr/apr-util_1.4.1.bb | 4 ++-- meta/recipes-support/attr/ea-acl.inc | 4 ++-- meta/recipes-support/boost/boost.inc | 12 ++-- meta/recipes-support/createrepo/createrepo_0.4.11.bb | 4 ++-- meta/recipes-support/curl/curl_7.26.0.bb | 8 meta/recipes-support/icu/icu-3.6.inc | 4 ++-- meta/recipes-support/libcap/libcap.inc | 8 +++- meta/recipes-support/neon/neon_0.29.6.bb | 2 +- meta/recipes-support/shared-mime-info/shared-mime-info.inc | 4 ++-- meta/recipes-support/sqlite/sqlite3.inc| 4 ++-- 10 files changed, 26 insertions(+), 28 deletions(-) diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb index 238af97..7ee3de5 100644 --- a/meta/recipes-support/apr/apr-util_1.4.1.bb +++ b/meta/recipes-support/apr/apr-util_1.4.1.bb @@ -37,10 +37,10 @@ do_configure_append() { cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk fi } -do_configure_prepend_virtclass-native() { +do_configure_prepend_class-native() { cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk } -do_configure_append_virtclass-native() { +do_configure_append_class-native() { sed -i s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}# ${S}/build/rules.mk # sometimes there isn't SHELL sed -i s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}# ${S}/build/rules.mk diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 0f506bc..bcc7acc 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -9,7 +9,7 @@ inherit autotools gettext # overwritten by autoheader export AUTOHEADER = true EXTRA_OECONF = INSTALL_USER=root INSTALL_GROUP=root -EXTRA_OECONF_append_virtclass-native = --enable-gettext=no +EXTRA_OECONF_append_class-native = --enable-gettext=no EXTRA_OEMAKE = PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir} @@ -55,4 +55,4 @@ fix_symlink () { ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la fi } -SSTATEPOSTINSTFUNCS_virtclass-native += fix_symlink +SSTATEPOSTINSTFUNCS_class-native += fix_symlink diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index ec602a6..36a94e1 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -7,7 +7,7 @@ DESCRIPTION = Free peer-reviewed portable C++ source libraries HOMEPAGE = http://www.boost.org/; SECTION = libs DEPENDS = boost-native zlib -DEPENDS_virtclass-native = +DEPENDS_class-native = LICENSE = BSL-1.0 MIT Python-2.0 ARM_INSTRUCTION_SET = arm @@ -73,7 +73,7 @@ FILES_${PN}-staticdev = ${libdir}/libboost_*.a # boost is a metapackage which pulls in all boost librabries PACKAGES += ${PN} RRECOMMENDS_${PN} += ${BOOST_PACKAGES} -RRECOMMENDS_${PN}_virtclass-native = +RRECOMMENDS_${PN}_class-native = ALLOW_EMPTY_${PN} = 1 # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works @@ -176,15 +176,15 @@ do_install() { BBCLASSEXTEND = native -do_configure_virtclass-native() { +do_configure_class-native() { : } -do_boostconfig_virtclass-native() { +do_boostconfig_class-native() { : } -do_compile_virtclass-native() { +do_compile_class-native() { set -ex cd ${S}/tools/build/v2/engine rm -rf bin.* @@ -194,7 +194,7 @@ do_compile_virtclass-native() { # This is too terrible - the build script doesn't give any good # way I can see to find out where the binaries are placed, so # rely on only one bin.foo directory being created. -do_install_virtclass-native () { +do_install_class-native () { set -ex cd ${S}/tools/build/v2/engine install -d ${D}${bindir}/ diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb index 344cc77..8d2dcdf 100644 --- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb @@ -4,7 +4,7 @@ HOMEPAGE = http://createrepo.baseurl.org/; LICENSE = GPLv2+
[OE-core] [PATCH 09/11] recipes-gnome: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 6 +++--- meta/recipes-gnome/gnome/gconf_3.2.3.bb| 6 +++--- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 ++-- meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 4 ++-- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb index a77eee1..65a2d68 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb @@ -35,7 +35,7 @@ EXTRA_OECONF = \ X11DEPENDS = --without-x11 X11DEPENDS_linuxstdbase = ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)} -X11DEPENDS_virtclass-native = --without-x11 +X11DEPENDS_class-native = --without-x11 PACKAGES =+ ${PN}-xlib @@ -73,7 +73,7 @@ fi } PACKAGES_DYNAMIC += ^gdk-pixbuf-loader-.* -PACKAGES_DYNAMIC_virtclass-native = +PACKAGES_DYNAMIC_class-native = python populate_packages_prepend () { postinst_pixbufloader = d.getVar(postinst_pixbufloader, True) @@ -83,7 +83,7 @@ python populate_packages_prepend () { do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) } -do_install_append_virtclass-native() { +do_install_append_class-native() { #Use wrapper script rather than binary as required libtool library is not installed now GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index 4d77a14..f80c910 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb @@ -7,7 +7,7 @@ POLKIT = polkit POLKIT_libc-uclibc = DEPENDS = glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub -DEPENDS_virtclass-native = glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native +DEPENDS_class-native = glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native PR = r12 @@ -22,7 +22,7 @@ SRC_URI[archive.sha256sum] = 52008a82a847527877d9e1e549a351c86cc53cada4733b8a70 S = ${WORKDIR}/GConf-${PV} POLKIT_OECONF = --enable-defaults-service -POLKIT_OECONF_virtclass-native = --disable-defaults-service +POLKIT_OECONF_class-native = --disable-defaults-service POLKIT_OECONF_libc-uclibc = --disable-default-service EXTRA_OECONF = --enable-shared --disable-static --enable-debug=yes \ @@ -39,7 +39,7 @@ do_install_append() { # disable dbus-x11 when x11 isn't in DISTRO_FEATURES RDEPENDS_${PN} += ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} -RDEPENDS_${PN}_virtclass-native = +RDEPENDS_${PN}_class-native = FILES_${PN} += ${libdir}/GConf/* \ ${libdir}/gio/*/*.so \ diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc index b2570d6..8ea0b96 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc +++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc @@ -1,6 +1,6 @@ LICENSE = GPLv2 LGPLv2.1 DEPENDS = libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0 -DEPENDS_virtclass-native = libxml2-native libxslt-native intltool-native glib-2.0-native +DEPENDS_class-native = libxml2-native libxslt-native intltool-native glib-2.0-native inherit gnome gettext python-dir pythonnative @@ -20,6 +20,6 @@ do_install_append_class-native () { FILES_${PN} += ${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/* RDEPENDS_${PN} = bash -RDEPENDS_${PN}_virtclass-native = +RDEPENDS_${PN}_class-native = BBCLASSEXTEND = native diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb index 5481f82..bbf765b 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb @@ -38,8 +38,8 @@ LIBV = 2.10.0 PACKAGES_DYNAMIC += ^gtk-immodule-.* ^gtk-printbackend-.* BBCLASSEXTEND = native -RRECOMMENDS_${PN}_virtclass-native = -DEPENDS_virtclass-native = glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native +RRECOMMENDS_${PN}_class-native = +DEPENDS_class-native = glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native python populate_packages_prepend () { prologue = d.getVar(postinst_prologue, True) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
Re: [OE-core] [PATCH 02/11] multilib.bbclass: add class-multilib to override
On Tue, 2012-10-30 at 17:33 +0800, Robert Yang wrote: Add the new override way CLASSOVERRIDE = class-multilib to multilib.bbclass, and add the check code to sanity.bbclass, we keep both the old and new way, which means, both of the following are supported: virtclass-multilib class-multilib [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/multilib.bbclass | 2 ++ meta/classes/sanity.bbclass | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 77ccce4..2dd2f85 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -1,3 +1,5 @@ +CLASSOVERRIDE = class-multilib + python multilib_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): return diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 3806bc5..ba1cd6d 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -122,7 +122,8 @@ def check_toolchain(data): tune_error_set.append(The multilib '%s' appears more than once. % lib) else: seen_libs.append(lib) -tune = data.getVar(DEFAULTTUNE_virtclass-multilib-%s % lib, True) +tune = data.getVar(DEFAULTTUNE_virtclass-multilib-%s % lib, True) or \ + data.getVar(DEFAULTTUNE_class-multilib-%s % lib, True) if tune in seen_tunes: tune_error_set.append(The tuning '%s' appears in more than one multilib. % tune) else: Sorry but this isn't right. The multilib case is special since it sets class-multilib-xxx, not class-multilib without the suffix. The above changes are just going to confuse people and depending on what you do in other patches, may or may not work. Can you resend the patch set just changing the native/nativesdk values please? We can then look at multilib specifically as a follow up. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
This commit made pulseaudio unbuildable for builds with no GPLv3 packages. Andrei On Wed, Oct 24, 2012 at 7:37 PM, Ross Burton ross.bur...@intel.com wrote: Add explicit build-dependency on GConf as currently it's an implicit dependency and so vunerable to races at build time. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc|2 +- meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 463777d..ab70c7e 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = file://GPL;md5=4325afd396febcb659c36b49533135d4 \ DEPENDS = libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)} # optional -DEPENDS += udev alsa-lib glib-2.0 dbus \ +DEPENDS += udev alsa-lib glib-2.0 dbus gconf \ ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} SRC_URI = http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bbb/meta/recipes-multimedia/pulseaudio/ pulseaudio_2.1.bb index a10b953..d25b424 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = r7 +PR = r8 DEPENDS += libjson gdbm speex libxml-parser-perl-native -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On 30 October 2012 09:59, Andrei Gherzan and...@gherzan.ro wrote: This commit made pulseaudio unbuildable for builds with no GPLv3 packages. What causes gconf to not build without GPLv3? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On Tue, Oct 30, 2012 at 12:02 PM, Burton, Ross ross.bur...@intel.comwrote: On 30 October 2012 09:59, Andrei Gherzan and...@gherzan.ro wrote: This commit made pulseaudio unbuildable for builds with no GPLv3 packages. What causes gconf to not build without GPLv3? pulseaudio depends on gconf (because of that racing issues). Now, gconf inherits gnomebase which adds to gconf's DEPENDS gnome-common package which is GPLv3. So this is the chain. ag ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Removing netbase from an image
I am attempting to remove netbase from a custom image. I would like to replace it with connman. I have added connman through EXTRA_IMAGE_INSTALL, however netbase is brought in via packagegroup-core-boot.bb which funnily enough has some very important features and I would like to keep. What would be the best way to make this replacement. Should I copy packagegroup-core-boot.bb and keep a local copy, while keeping it in sync manually? Alternatively, I notice quite a few packages in packagegroup-core-boot have a VIRTUAL-RUNTIME_* define. Would it be worth having a VIRTUAL-RUNTIME_network ?= netbase which could be overridden? Thoughts? -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On 30 October 2012 10:10, Andrei Gherzan and...@gherzan.ro wrote: What causes gconf to not build without GPLv3? pulseaudio depends on gconf (because of that racing issues). Now, gconf inherits gnomebase which adds to gconf's DEPENDS gnome-common package which is GPLv3. So this is the chain. Oh joy, one of those instances where GPLv3 isn't actually a problem. gnome-common is some scripts and tools used at configure time, so there isn't any linkage, so there isn't any GPLv3 in the images, so there isn't a problem. The question is how do we express this? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Removing netbase from an image
On 30 October 2012 10:17, Jack Mitchell m...@communistcode.co.uk wrote: I am attempting to remove netbase from a custom image. I would like to replace it with connman. I have added connman through EXTRA_IMAGE_INSTALL, however netbase is brought in via packagegroup-core-boot.bb which funnily enough has some very important features and I would like to keep. What would be the best way to make this replacement. Should I copy packagegroup-core-boot.bb and keep a local copy, while keeping it in sync manually? Alternatively, I notice quite a few packages in packagegroup-core-boot have a VIRTUAL-RUNTIME_* define. Would it be worth having a VIRTUAL-RUNTIME_network ?= netbase which could be overridden? You don't want to remove netbase, you just want to remove the /etc/network/interfaces file. The rest of netbase is very important to have. Dig on the list and you'll find patches to split that file out but they didn't get into 1.3. Unless you're working against master and willing to help get those patches tested and merged, the easy solution is to use a .bbappend and ship an empty interfaces file (meta-guacamayo does this if you want prior art). Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On Tue, Oct 30, 2012 at 12:19 PM, Burton, Ross ross.bur...@intel.comwrote: On 30 October 2012 10:10, Andrei Gherzan and...@gherzan.ro wrote: What causes gconf to not build without GPLv3? pulseaudio depends on gconf (because of that racing issues). Now, gconf inherits gnomebase which adds to gconf's DEPENDS gnome-common package which is GPLv3. So this is the chain. Oh joy, one of those instances where GPLv3 isn't actually a problem. gnome-common is some scripts and tools used at configure time, so there isn't any linkage, so there isn't any GPLv3 in the images, so there isn't a problem. The question is how do we express this? Should it be whitelisted? ag ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On 30/10/12 10:31, Andrei Gherzan wrote: gnome-common is some scripts and tools used at configure time, so there isn't any linkage, so there isn't any GPLv3 in the images, so there isn't a problem. The question is how do we express this? Should it be whitelisted? The problem with whitelisting is that if the usage changes from the assumptions the whitelisting was originally made on, this will not automatically remove the whitelisting -- if whitlisting is the solution here, it needs to be left to the Yocto users to do it locally based on their own review of the situation. I think to handle this scenario properly, you would need two sets of license controls, one for 'build tools' and one for 'things that ship'. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On 30 October 2012 10:31, Andrei Gherzan and...@gherzan.ro wrote: Oh joy, one of those instances where GPLv3 isn't actually a problem. gnome-common is some scripts and tools used at configure time, so there isn't any linkage, so there isn't any GPLv3 in the images, so there isn't a problem. The question is how do we express this? Should it be whitelisted? So I did some digging. The file in git that is explicitly v3 only appeared in 3.6, so I considered reverting to 3.5.5 before it appeared. Then I noticed that we're still shipping gnome-common 2.28 from 2009, which doesn't have any v3 code in (to be honest it barely has any license at all, but it's definitely not v3. I've pinged upstream. The v3 license in the metadata came from: commit 8a2b4e2a5e85f4937e72f03e579b1aaa264074a1 Author: Zhai Edwin edwin.z...@intel.com Date: Thu Jul 1 15:35:11 2010 +0800 gnome-common: Fix the metadata Signed-off-by: Zhai Edwin edwin.z...@intel.com diff --git a/meta/packages/gnome/gnome-common_2.20.0.bb b/meta/packages/gnome/gnome-common_2.20.0.bb index 075ac14..c2eae72 100644 --- a/meta/packages/gnome/gnome-common_2.20.0.bb +++ b/meta/packages/gnome/gnome-common_2.20.0.bb @@ -1,7 +1,11 @@ -LICENSE = GPL +DESCRIPTION = Common macros for building GNOME applications +HOMEPAGE = http://www.gnome.org/; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = GPLv3 Looks like a misguided attempt at fixing a warning from not specifying what version of GPL was in use. Traditionally the bulk of GNOME is LGPLv2.1 But following the dependencies, gnomebase adds DEPENDS=gnome-common. Shouldn't that be gnome-common-native? It won't make much difference to the structure of the sysroot as it's allarch already, but it makes it clear that in this instance it's a build dependency only. (patch coming) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnomebase: depend on gnome-common-native
gnome-common is a build-only dependency so we should depend on the native variant. This also resolves an (incorrect) GPLv3 license issue in gnome-common at build-time. This will also remove the pointless gnome-common-dev RRECOMMENDS in any -dev package that uses gnomebase. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/gnomebase.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass index 19c7f71..91c476c 100644 --- a/meta/classes/gnomebase.bbclass +++ b/meta/classes/gnomebase.bbclass @@ -7,7 +7,7 @@ GNOME_COMPRESS_TYPE ?= bz2 SECTION ?= x11/gnome SRC_URI = ${GNOME_MIRROR}/${BPN}/${@gnome_verdir(${PV})}/${BPN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive -DEPENDS += gnome-common +DEPENDS += gnome-common-native FILES_${PN} += ${datadir}/application-registry \ ${datadir}/mime-info \ -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnome-common: Fix license
gnome-common 2.28 is GPLv2+. From Christian Persch, upstream: The licence is presumed GPL2+, although it's not there explicitly. GPL2+ because as far as I could figure out when I tried to, gnome-autogen started in gnome-core which had a GPL2 COPYING file. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-gnome/gnome/gnome-common_2.28.0.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb index 8936dbd..e094ccf 100644 --- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb +++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb @@ -2,11 +2,11 @@ DESCRIPTION = Common macros for building GNOME applications HOMEPAGE = http://www.gnome.org/; BUGTRACKER = https://bugzilla.gnome.org/; -LICENSE = GPLv3 +LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 SECTION = x11/gnome -PR = r1 +PR = r3 inherit gnome allarch # The omf.make file failed if scrollkeeper doesn't happen to be -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnome-common: Fix license
Ack On Tue, Oct 30, 2012 at 2:02 PM, Ross Burton ross.bur...@intel.com wrote: gnome-common 2.28 is GPLv2+. From Christian Persch, upstream: The licence is presumed GPL2+, although it's not there explicitly. GPL2+ because as far as I could figure out when I tried to, gnome-autogen started in gnome-core which had a GPL2 COPYING file. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-gnome/gnome/gnome-common_2.28.0.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bbb/meta/recipes-gnome/gnome/ gnome-common_2.28.0.bb index 8936dbd..e094ccf 100644 --- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb +++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb @@ -2,11 +2,11 @@ DESCRIPTION = Common macros for building GNOME applications HOMEPAGE = http://www.gnome.org/; BUGTRACKER = https://bugzilla.gnome.org/; -LICENSE = GPLv3 +LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 SECTION = x11/gnome -PR = r1 +PR = r3 inherit gnome allarch # The omf.make file failed if scrollkeeper doesn't happen to be -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] autotools: Attempt to clean build directory when rerunning configure
On Tue, 2012-10-30 at 08:10 +, Richard Purdie wrote: How extensively has this been tested? I have a suspicion that we might run into a number of issues doing this throughout the tree :( I've had this in my tree for a few weeks and the only package I've found so far that went wrong was polkit, see separate patch for that. (There a few other packages for which make clean fails in a harmless manner.) But it's true that I haven't built the whole of world this way yet. I'm wondering how many recipes will suffer from issues with make clean verses how many recipes would struggle if we defaulted ${B} != ${S}? My guess is that make clean is slightly more likely to work (or, at least, not break anything) on average. But defaulting ${B} != ${S} would definitely be a desirable thing in the longer term and I would certainly be in favour of moving in that direction. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/11] multilib.bbclass: add class-multilib to override
Hi Richard, I've pushed the new patches again (removed the old branch, and create a new one): git://git.pokylinux.org/poky-contrib robert/virtclass Now only change the native/nativesdk values. I think that the virtclass-cross should be changed to class-cross, too, but I didn't do it in these patches, I will send another pull request for the virtclass-cross if it is fine. // Robert On 10/30/2012 05:54 PM, Richard Purdie wrote: On Tue, 2012-10-30 at 17:33 +0800, Robert Yang wrote: Add the new override way CLASSOVERRIDE = class-multilib to multilib.bbclass, and add the check code to sanity.bbclass, we keep both the old and new way, which means, both of the following are supported: virtclass-multilib class-multilib [YOCTO #3297] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/multilib.bbclass | 2 ++ meta/classes/sanity.bbclass | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 77ccce4..2dd2f85 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -1,3 +1,5 @@ +CLASSOVERRIDE = class-multilib + python multilib_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): return diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 3806bc5..ba1cd6d 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -122,7 +122,8 @@ def check_toolchain(data): tune_error_set.append(The multilib '%s' appears more than once. % lib) else: seen_libs.append(lib) -tune = data.getVar(DEFAULTTUNE_virtclass-multilib-%s % lib, True) +tune = data.getVar(DEFAULTTUNE_virtclass-multilib-%s % lib, True) or \ + data.getVar(DEFAULTTUNE_class-multilib-%s % lib, True) if tune in seen_tunes: tune_error_set.append(The tuning '%s' appears in more than one multilib. % tune) else: Sorry but this isn't right. The multilib case is special since it sets class-multilib-xxx, not class-multilib without the suffix. The above changes are just going to confuse people and depending on what you do in other patches, may or may not work. Can you resend the patch set just changing the native/nativesdk values please? We can then look at multilib specifically as a follow up. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Removing netbase from an image
On Tue, Oct 30, 2012 at 8:17 AM, Jack Mitchell m...@communistcode.co.uk wrote: I am attempting to remove netbase from a custom image. I would like to replace it with connman. I have added connman through EXTRA_IMAGE_INSTALL, however netbase is brought in via packagegroup-core-boot.bb which funnily enough has some very important features and I would like to keep. What would be the best way to make this replacement. Should I copy packagegroup-core-boot.bb and keep a local copy, while keeping it in sync manually? Alternatively, I notice quite a few packages in packagegroup-core-boot have a VIRTUAL-RUNTIME_* define. Would it be worth having a VIRTUAL-RUNTIME_network ?= netbase which could be overridden? Thoughts? Even though I agree with Ross that you most probably want to override the interfaces file I think it is nice to be able to override it and the VIRTUAL-RUNTIME_network-base would be a good addition for it. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Removing netbase from an image
On Tue, 2012-10-30 at 10:22 +, Burton, Ross wrote: You don't want to remove netbase, you just want to remove the /etc/network/interfaces file. The rest of netbase is very important to have. Well, FSVO very important. There's very little in there which is actually indispensible; /etc/hosts is probably the only file that I'd consider to be all that important, and arguably it's a libc bug that this one is necessary. I don't use netbase itself in any of my own images. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
Op 30 okt. 2012, om 12:00 heeft Burton, Ross ross.bur...@intel.com het volgende geschreven: On 30 October 2012 10:31, Andrei Gherzan and...@gherzan.ro wrote: Oh joy, one of those instances where GPLv3 isn't actually a problem. gnome-common is some scripts and tools used at configure time, so there isn't any linkage, so there isn't any GPLv3 in the images, so there isn't a problem. The question is how do we express this? Should it be whitelisted? So I did some digging. The file in git that is explicitly v3 only appeared in 3.6, so I considered reverting to 3.5.5 before it appeared. Then I noticed that we're still shipping gnome-common 2.28 from 2009, which doesn't have any v3 code in (to be honest it barely has any license at all, but it's definitely not v3. I've pinged upstream. The v3 license in the metadata came from: commit 8a2b4e2a5e85f4937e72f03e579b1aaa264074a1 Author: Zhai Edwin edwin.z...@intel.com Date: Thu Jul 1 15:35:11 2010 +0800 gnome-common: Fix the metadata Signed-off-by: Zhai Edwin edwin.z...@intel.com diff --git a/meta/packages/gnome/gnome-common_2.20.0.bb b/meta/packages/gnome/gnome-common_2.20.0.bb index 075ac14..c2eae72 100644 --- a/meta/packages/gnome/gnome-common_2.20.0.bb +++ b/meta/packages/gnome/gnome-common_2.20.0.bb @@ -1,7 +1,11 @@ -LICENSE = GPL +DESCRIPTION = Common macros for building GNOME applications +HOMEPAGE = http://www.gnome.org/; +BUGTRACKER = https://bugzilla.gnome.org/; + +LICENSE = GPLv3 Looks like a misguided attempt at fixing a warning from not specifying what version of GPL was in use. Traditionally the bulk of GNOME is LGPLv2.1 But following the dependencies, gnomebase adds DEPENDS=gnome-common. Shouldn't that be gnome-common-native? No, it checks for the files in the target sysroot. I can't say it that's a bug or not, though. regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Thu, Oct 18, 2012 at 8:33 AM, Bruce Ashfield bruce.ashfi...@gmail.com wrote: On Thu, Oct 18, 2012 at 5:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: This is a /dev/crypto device driver, equivalent to those in OpenBSD or FreeBSD. The main idea is to access of existing ciphers in kernel space from userspace, thus enabling re-use of a hardware implementation of a cipher. I always use OCF for an overlapping set of functionality. To make this external module gracefully deal with a situation such as this, maybe a check for OCF in the kernel config ? The same thing could be said about having a kernel with this functionality already integrated (I have several of those as well). That's a more general question about what's the best way to gracefully deal with out of tree modules detecting that they are being built against a kernel that already has the functionality merged. The easy answer is that it's something the distro maintainer needs to know, and manage, and maybe that's the final answer. But I'm more wondering about this with respect to inter-operability of layers, if something in a layer depends/rdepends on this module, it will be pulled in, and won't that limit the mix/match/stacking of the various layers ? I added Richard for comment on the above. But that of course raises the question, why should this be in oe-core versus something like OCF ? This is definitely simpler, but OCF has it's use cases and advantages as well, that are an overlapping set of functionality. I don't have all the answers, just plenty of questions :) I'm not overly familiar with OCF. Does this just RCONFLICT with ocf-linux? -M Cheers, Bruce Signed-off-by: Yashpal Dutta yashpal.du...@freescale.com --- meta/recipes-kernel/cryptodev/cryptodev_1.5.bb | 18 + .../cryptodev/files/makefile_fixup.patch | 26 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.5.bb create mode 100644 meta/recipes-kernel/cryptodev/files/makefile_fixup.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb new file mode 100644 index 000..5125710 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb @@ -0,0 +1,18 @@ +SECTION = devel +SUMMARY = Linux Cryptodev KERNEL MODULE +DESCRIPTION = The Cryptodev package contains the kernel /dev/crypto module +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +DEPENDS = virtual/kernel + +inherit module + +SRCREV = 1c24a0aa996630518d47826a2e3fea129ea094c7 + +SRC_URI = git://repo.or.cz/cryptodev-linux.git;protocol=git \ + file://makefile_fixup.patch + +EXTRA_OEMAKE='KERNEL_DIR=${STAGING_KERNEL_DIR} PREFIX=${D}' + +S = ${WORKDIR}/git diff --git a/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch new file mode 100644 index 000..323aacd --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 2be8825..b36d68c 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,7 @@ + KBUILD_CFLAGS += -I$(src) + KERNEL_DIR = /lib/modules/$(shell uname -r)/build + VERSION = 1.5 ++PREFIX = + + cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o + +@@ -12,10 +13,10 @@ build: version.h + version.h: Makefile + @echo #define VERSION \$(VERSION)\ version.h + +-install: ++modules_install: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +- @echo Installing cryptodev.h in /usr/include/crypto ... +- @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++ @echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++ @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + + clean: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Thu, Oct 18, 2012 at 3:16 PM, Darren Hart dvh...@linux.intel.com wrote: +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb @@ -0,0 +1,18 @@ +SECTION = devel +SUMMARY = Linux Cryptodev KERNEL MODULE +DESCRIPTION = The Cryptodev package contains the kernel /dev/crypto module +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +DEPENDS = virtual/kernel This DEPENDS in inherited from the module.bbclass, no need to duplicate + +inherit module + +SRCREV = 1c24a0aa996630518d47826a2e3fea129ea094c7 + +SRC_URI = git://repo.or.cz/cryptodev-linux.git;protocol=git \ + file://makefile_fixup.patch Tabs to indent, spaces to align. Spaces here please. Yashpal, Can you address these two comments and submit a v2 of the patch if required. -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] gtk+ native recipe question
My first post, chose -core over -devel somewhat arbitrarily as I don't understand distinction of OE-classic yet. In order to get an existing OE system (builds on Fedora) to build correctly on 64-bit Ubuntu 12.04 I had to modify a number of recipe files. In order to get native gtk+ to build I had to add no-demos.patch to SRC_URI_append. The patch file already existed in recipes tree but wasn't being referenced in the .bb file. Second change was adding glib-2.0-native to DEPEND_virtclass-native in same file. Problem was manifested with unresolved reference to g_bytes_unref when building gtk+ native. Ubuntu 12.04 has more recent glib install than in OE project I'm building and g_bytes_unref is visible in host glib but not OE version. With this change and a few other similar minor changes in .bb files, the system builds. However, the bitbake build line has to be invoked twice. For example, let's say I'm building foo-image and foo1-image, and I run: bitbake foo-image foo1-image This command fails building gtk+ native. I re-run exact same command: bitbake foo-image foo1-image and this time gtk+ native builds correctly and whole system builds. Any suggestions on what I should be looking at to get the dependency info correct so first build doesn't fail? Cheers, T.mike ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm: Slightly change the way python-rpm is constructed
If python support is enabled we want to make sure that the RPM python support is packaged properly. Move the components into the site-packages directory, move the .la files to a new -dev package. Add rpm as a dependency of python-rpm, otherwise rpm and the associated libraries won't be available. Fixup python wrapper to handle automatic relocation, as supported by the vendor WINDRIVER configuration. (Based on a patch from Paul Eggleton) Signed-off-by: Mark Hatle mark.ha...@windriver.com --- meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 27 +++ meta/recipes-devtools/rpm/rpm_5.4.9.bb | 16 - 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-py-init.patch diff --git a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch b/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch new file mode 100644 index 000..b65abc24 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch @@ -0,0 +1,27 @@ +python/rpmmodules.c: Change the way the python module loads the RPM config + +In order to support the RPM_VENDOR_WINDRIVER enhancement of dynamic +runtime relocation paths, we need to call rpmcliInit instead of +rpmReadConfigFiles. The rpmcliInit will end up calling rpmReadConfigFiles +after the necessary relocation processing (if enabled). + +Code derived from changes suggested by Paul Eggleton. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle mark.ha...@windriver.com + +diff --git a/python/rpmmodule.c b/python/rpmmodule.c +index f7282bc..dde68ca 100644 +--- a/python/rpmmodule.c b/python/rpmmodule.c +@@ -392,7 +392,8 @@ void init_rpm(void) + if (Py_AtExit(rpm_exithook) == -1) + return; + +-rpmReadConfigFiles(NULL, NULL); ++const char *argv[1] = {rpmmodule, 0}; ++rpmcliInit(1, argv, NULL); + + d = PyModule_GetDict(m); + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index e838f40..ee28061 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -43,7 +43,7 @@ LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 DEPENDS = libpcre attr acl popt ossp-uuid file bison-native -PR = r52 +PR = r53 # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -80,6 +80,7 @@ SRC_URI = http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex file://makefile-am-exec-hook.patch \ file://rpm-stub-out-git_strerror.patch \ file://rpm-db_buffer_small.patch \ + file://rpm-py-init.patch \ SRC_URI[md5sum] = 60d56ace884340c1b3fcac6a1d58e768 @@ -107,7 +108,7 @@ PACKAGECONFIG[xar] = --with-xar,--without-xar,xar, WITH_PYTHON = --with-python=${PYTHON_BASEVERSION} \ --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ - --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION} \ + --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ --without-pythonembed PACKAGECONFIG[python] = ${WITH_PYTHON},--without-python,python, @@ -189,7 +190,7 @@ CFLAGS_append = -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE LDFLAGS_append_libc-uclibc = -lrt -lpthread -PACKAGES = ${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale +PACKAGES = ${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale SOLIBS = 5.4.so @@ -302,9 +303,12 @@ RDEPENDS_${PN} = base-files RDEPENDS_${PN}_class-native = RDEPENDS_${PN}-build = file -FILES_python-rpm-dbg = ${libdir}/python*/rpm/.debug/_* -FILES_python-rpm-staticdev = ${libdir}/python*/rpm/*.a -FILES_python-rpm = ${libdir}/python*/rpm +RDEPENDS_python-rpm = ${PN} + +FILES_python-rpm-dbg = ${libdir}/python*/site-packages/rpm/.debug/_* +FILES_python-rpm-dev = ${libdir}/python*/site-packages/rpm/*.la +FILES_python-rpm-staticdev = ${libdir}/python*/site-packages/rpm/*.a +FILES_python-rpm = ${libdir}/python*/site-packages/rpm FILES_perl-module-rpm = ${libdir}/perl/*/* \ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnomebase: depend on gnome-common-native
Acked. On Tue, Oct 30, 2012 at 1:30 PM, Ross Burton ross.bur...@intel.com wrote: gnome-common is a build-only dependency so we should depend on the native variant. This also resolves an (incorrect) GPLv3 license issue in gnome-common at build-time. This will also remove the pointless gnome-common-dev RRECOMMENDS in any -dev package that uses gnomebase. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/gnomebase.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass index 19c7f71..91c476c 100644 --- a/meta/classes/gnomebase.bbclass +++ b/meta/classes/gnomebase.bbclass @@ -7,7 +7,7 @@ GNOME_COMPRESS_TYPE ?= bz2 SECTION ?= x11/gnome SRC_URI = ${GNOME_MIRROR}/${BPN}/${@gnome_verdir(${PV})}/${BPN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive -DEPENDS += gnome-common +DEPENDS += gnome-common-native FILES_${PN} += ${datadir}/application-registry \ ${datadir}/mime-info \ -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core