On Tue, 2015-10-20 at 11:43 +0300, Joonas Lahtinen wrote: > Modularize the recipe to allow extending the recipe and also make the X11 > distro dependency optional. > > Signed-off-by: Joonas Lahtinen <[email protected]> > --- > .../intel-gpu-tools/intel-gpu-tools.inc | 44 > ++++++++++++++++++++++ > .../intel-gpu-tools/intel-gpu-tools_1.9.bb | 16 +-------
What other changes did you make here? Going from removing 16 lines in the .bb and creating the .inc with 44 means more that just x11, I would rather see this in 2 patches. I am also still not completely clear what your intent with creating a .inc for a single recipe. Some other notes below also. BTW, apologies for the delay on this, it got lost in post-vacation email transition. Sau! > 2 files changed, 45 insertions(+), 15 deletions(-) > create mode 100644 > common/recipes-graphics/intel-gpu-tools/intel-gpu-tools.inc > > diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools.inc > b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools.inc > new file mode 100644 > index 0000000..f6cfd22 > --- /dev/null > +++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools.inc > @@ -0,0 +1,44 @@ > +SUMMARY = "Intel GPU Tools" > +DESCRIPTION = "A collection of tools for development and testing of the > Intel DRM driver." > +HOMEPAGE = "https://01.org/linuxgraphics"; > +BUGTRACKER = "https://bugs.freedesktop.org"; > +SECTION = "devel" > + > +INC_PR = "r0" Where is this used? We don't use PR bumps any more. > + > +LICENSE = "MIT-X" > +LIC_FILES_CHKSUM = "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd" > + > +SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" > + > +inherit autotools pkgconfig distro_features_check gtk-doc > + > +DEPENDS = "\ > + util-macros-native libdrm libpciaccess udev glib-2.0 cairo \ > + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 libxv > libx11 libxext libxrandr", "",d)} \ > + " > + > +RDEPENDS_${PN} += "bash" > + > +PACKAGECONFIG ??= "" > +PACKAGECONFIG[libunwind] = > "--with-libunwind,--without-libunwind,libunwind,libunwind" > + > +EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger --disable-dumper" > +COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" > + > +libexecdir = "${libdir}" > + > +FILES_${PN} += " \ > + ${libdir}/intel_*.so \ > + " > + > +FILES_${PN}-dbg += " \ > + ${libexecdir}/${PN}/tests/.debug \ > + ${libexecdir}/${PN}/benchmarks/.debug \ > + " I think the 2 PN's in the FILES list should be ${BPN} incase of multilib > + > +gputools_sysroot_preprocess() { > + rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc > +} > +SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess" > + > diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb > b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb > index b98fc75..1053712 100644 > --- a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb > +++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb > @@ -1,19 +1,5 @@ > -require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc > - Why did you remove this and not including it in the .inc? The point of this line is to have the common xorg-app framework, if this is not part of that framework than we need to explain it. > -SUMMARY = "Intel GPU tools" > -DESCRIPTION = "Variety of small tools for testing intel graphics." > +require intel-gpu-tools.inc > > SRC_URI[md5sum] = "1e768f2b1edc8613911b1d33bb361a7f" > SRC_URI[sha256sum] = > "1de4c28ae0fe1e6c198ab559dbffcec6762798dc4adbdfdac54b2c7a9b0a1ed3" > > -LIC_FILES_CHKSUM = "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd" > - > -DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext > libxrandr" > - > -EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger --disable-dumper" > -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" > - > -gputools_sysroot_preprocess() { > - rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc > -} > -SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess" > -- > 2.4.3 > -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
