icecc-create-env: rename to -native
PATCH 1/17 icecc-create-env: rename to -native
icecc-create-env(-native) is a native package. But if it doesn't have the -native suffix, some dependency tracking stuff in oe-core (in nativesdk.bbclass) get's crazy about it, trying to generate dependencies to icecc-create-env-native packages. To fix that simply add -native suffix to this package.
--- meta/classes/icecc.bbclass | 2 +- .../icecc-create-env-native/icecc-lto-update.patch | 103 ++++++++++++++++++++ .../icecc-create-env-native_0.1.bb | 29 ++++++ .../icecc-create-env/icecc-lto-update.patch | 103 -------------------- .../icecc-create-env/icecc-create-env_0.1.bb | 29 ------ 5 files changed, 133 insertions(+), 133 deletions(-) create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
meta/classes/icecc.bbclass +1 -1
@@ -33,7 +33,7 @@ def icecc_dep_prepend(d): # we need that built is the responsibility of the patch function / class, not # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): - return "icecc-create-env" + return "icecc-create-env-native" return "" DEPENDS_prepend += "${@icecc_dep_prepend(d)} "
meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch new file +103 -0
103 lines not on this page · raw message
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb new file +29 -0
@@ -0,0 +1,29 @@ +DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ +make it work with OE." +SECTION = "base" +PRIORITY = "optional" +# source file has just a "GPL" word, but upstream is GPLv2+. +# most probably just GPL would be a mistake +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" + +PR = "r1" + +DEPENDS = "" +INHIBIT_DEFAULT_DEPS = "1" + +inherit native + +PATCHTOOL = "patch" +SRC_URI = "http://www.digital-opsis.com/openembedded/icecc-create-env-${PV}.tar.gz \ + file://icecc-lto-update.patch " + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} +} + +SRC_URI[md5sum] = "641ec45fe377529c7fd914f77b11b44f" +SRC_URI[sha256sum] = "9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834"
meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch deleted +0 -103
103 lines not on this page · raw message
meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb deleted +0 -29
@@ -1,29 +0,0 @@ -DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ -make it work with OE." -SECTION = "base" -PRIORITY = "optional" -# source file has just a "GPL" word, but upstream is GPLv2+. -# most probably just GPL would be a mistake -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" - -PR = "r1" - -DEPENDS = "" -INHIBIT_DEFAULT_DEPS = "1" - -inherit native - -PATCHTOOL = "patch" -SRC_URI = "http://www.digital-opsis.com/openembedded/icecc-create-env-${PV}.tar.gz \ - file://icecc-lto-update.patch " - -S = "${WORKDIR}" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} -} - -SRC_URI[md5sum] = "641ec45fe377529c7fd914f77b11b44f" -SRC_URI[sha256sum] = "9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834"
Signature · 1 line
1.7.2.5
PATCH 2/17 icecc.bbclass: fix handling of nativesdk and cross-canadian packages
icecc.bbclass assumed that nativesdk and cross-canadian packages should use local icecc version. Instead those packages should use target-like scheme for toolchain tarball generation.
--- meta/classes/icecc.bbclass | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
meta/classes/icecc.bbclass +1 -3
@@ -113,9 +113,7 @@ def icc_is_kernel(bb, d): def icc_is_native(bb, d): return \ bb.data.inherits_class("cross", d) or \ - bb.data.inherits_class("cross-canadian", d) or \ - bb.data.inherits_class("native", d) or \ - bb.data.inherits_class("nativesdk", d); + bb.data.inherits_class("native", d); def icc_version(bb, d): if use_icc(bb, d) == "no":
Signature · 1 line
1.7.2.5
PATCH 3/17 insane.bbclass: don't warn on .so files in -nativesdk packages
In reply to Dmitry Eremin-SolenikovThere is no point in warning against .so symlinks in -nativesdk packages. They have to contain such links, so shut up the warning.
--- meta/classes/insane.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/insane.bbclass +2 -2
@@ -179,8 +179,8 @@ def package_qa_check_dev(path, name, d, elf, messages): Check for ".so" library symlinks in non-dev packages """ - if not name.endswith("-dev") and not name.endswith("-dbg") and path.endswith(".so") and os.path.islink(path): - messages.append("non -dev/-dbg package contains symlink .so: %s path '%s'" % \ + if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-nativesdk") and path.endswith(".so") and os.path.islink(path): + messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[debug-files] = "package_qa_check_dbg"
Signature · 1 line
1.7.2.5
PATCH 4/17 avahi: include dbus interfaces definitions into daemon package
In reply to Dmitry Eremin-Solenikov--- meta/recipes-connectivity/avahi/avahi.inc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +2 -1
@@ -14,7 +14,7 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r6" +INC_PR = "r7" DEPENDS = "expat libcap libdaemon dbus glib-2.0"
@@ -67,6 +67,7 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${datadir}/avahi/introspection/*.introspect \ ${datadir}/avahi/avahi-service.dtd \ ${datadir}/avahi/service-types \ + ${datadir}/dbus-1/interfaces \ ${datadir}/dbus-1/system-services" FILES_libavahi-client = "${libdir}/libavahi-client.so.*" FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
Signature · 1 line
1.7.2.5
PATCH 5/17 gst-plugins-base: add support for non-X11-enabled distros
In reply to Dmitry Eremin-SolenikovSeparate dependencies on X11 and them to DEPENDS only if DISTRO_FEATURES contain x11
--- .../gstreamer/gst-plugins-base_0.10.32.bb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb +2 -1
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" -DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor" +X11DEPENDS = "virtual/libx11 libxv" +DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" SRC_URI += " file://gst-plugins-base-tremor.patch"
Signature · 1 line
1.7.2.5
Re: [PATCH 05/17] gst-plugins-base: add support for non-X11-enabled distros
Op 21 sep. 2011, om 20:39 heeft Dmitry Eremin-Solenikov het volgende geschreven:
Quoted 20 lines
Separate dependencies on X11 and them to DEPENDS only if
DISTRO_FEATUREScontain x11Signed-off-by Dmitry Eremin-Solenikov <[email protected]>---
.../gstreamer/gst-plugins-base_0.10.32.bb | 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb +2
-1@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" -DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor" +X11DEPENDS = "virtual/libx11 libxv" +DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
Quoted 1 line
SRC_URI+= " file://gst-plugins-base-tremor.patch"
MIssing PR bump
PATCH 6/17 libgpg-error: drop common-lisp files
In reply to Dmitry Eremin-SolenikovOE doesn't have common-lisp neither in oe-core, nor in org.oe.dev. Stop this package from installing clisp-related files.
--- .../libgpg-error/libgpg-error_1.10.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-support/libgpg-error/libgpg-error_1.10.bb +6 -1
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SECTION = "libs" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch"
@@ -23,3 +23,8 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/*" inherit autotools binconfig pkgconfig gettext + +do_install_append() { + # we don't have common lisp in OE + rm -rf "${D}${datadir}/common-lisp/" +}
Signature · 1 line
1.7.2.5
PATCH 7/17 gtk+: packaging fixups
In reply to Dmitry Eremin-Solenikov1) Package gail modules into libgail package. .la files go into main gtk+-dev package, debug symbols to gtk+-dbg.
2) For completeness add printerbackends .la files to gtk+-dev
--- meta/recipes-gnome/gtk+/gtk+.inc | 10 ++++++++++ meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-)
meta/recipes-gnome/gtk+/gtk+.inc +10 -0
@@ -15,6 +15,8 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor \ inherit autotools pkgconfig +PACKAGES += "libgail" + FILES_${PN} = "${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-2.0 \ ${libdir}/lib*${SOLIBS} \
@@ -24,17 +26,25 @@ FILES_${PN} = "${bindir}/gtk-update-icon-cache \ FILES_${PN}-dev += " \ ${datadir}/gtk-2.0/include \ ${libdir}/gtk-2.0/include \ + ${libdir}/gtk-2.0/modules/*.la \ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ + ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ ${bindir}/gtk-builder-convert" FILES_${PN}-dbg += " \ + ${libdir}/gtk-2.0/modules/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" +FILES_libgail = " \ + ${libdir}/gtk-2.0/modules/libgail.so \ + ${libdir}/gtk-2.0/modules/libferret.so \ + " + GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r12" +PR = "r13" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r8" +PR = "r9" SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \
meta/recipes-gnome/gtk+/gtk+_2.22.1.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r3" +PR = "r4" SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \
Signature · 1 line
1.7.2.5
PATCH 8/17 polkit: fixup packaging
In reply to Dmitry Eremin-Solenikov1) Drop static versions of extensions, as there is no point in them
2) For completeness include .la files for extensions into polkit-dev
--- meta/recipes-extended/polkit/polkit_0.101.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-extended/polkit/polkit_0.101.bb +6 -1
@@ -11,7 +11,7 @@ SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://polkit-1_pam.patch" -PR = "r1" +PR = "r2" DEPENDS = "libpam expat dbus-glib eggdbus intltool-native" RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
@@ -22,6 +22,11 @@ FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \ ${datadir}/${PN}-1/actions/* \ ${datadir}/dbus-1/system-services/*" FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so" +FILES_${PN}-dev += "${libdir}/${PN}-1/extensions/*.la " + +do_install_append() { + rm -f ${D}${libdir}/${PN}-1/extensions/*.a +} SRC_URI[md5sum] = "f925ac93aba3c072977370c1e27feb7f" SRC_URI[sha256sum] = "927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b"
Signature · 1 line
1.7.2.5
PATCH 9/17 dbus-glib: disable bash-completion
In reply to Dmitry Eremin-SolenikovBash completion stuff isn't packaged and used. Stop building it by passing --disable-bash-completion to configure
--- meta/recipes-core/dbus/dbus-glib.inc | 3 ++- meta/recipes-core/dbus/dbus-glib_0.92.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus-glib.inc +2 -1
@@ -16,7 +16,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz inherit autotools pkgconfig gettext EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ - --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" + --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool \ + --disable-bash-completion" EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" FILES_${PN} = "${libdir}/lib*.so.*"
meta/recipes-core/dbus/dbus-glib_0.92.bb +1 -1
@@ -1,6 +1,6 @@ require dbus-glib.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "b595b36890c4f9f8f5d5dec131c495f8" SRC_URI[sha256sum] = "5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
Signature · 1 line
1.7.2.5
Re: [PATCH 09/17] dbus-glib: disable bash-completion
Op 21 sep. 2011, om 20:39 heeft Dmitry Eremin-Solenikov het volgende geschreven:
Quoted 2 lines
Bash completion stuff isn't packaged and used. Stop building it by passing --disable-bash-completion to configure
A better idea would be to package it
Re: [PATCH 09/17] dbus-glib: disable bash-completion
Quoted 8 lines · Koen Kooi
Op 21 sep. 2011, om 20:39 heeft Dmitry Eremin-Solenikov het volgende geschreven:
Quoted 2 lines
Bash completion stuff isn't packaged and used. Stop building it by passing --disable-bash-completion to configure
A better idea would be to package it
Then we need bash-completion. Would you like it in meta-oe/recipes-extended? meta-oe/recipes-support? meta-oe/recipes-whatever?
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH 09/17] dbus-glib: disable bash-completion
Op 21 sep. 2011, om 21:57 heeft Dmitry Eremin-Solenikov het volgende geschreven:
Quoted 5 lines · Koen Kooi
Quoted 4 lines
Op 21 sep. 2011, om 20:39 heeft Dmitry Eremin-Solenikov het volgende geschreven:
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Bash completion stuff isn't packaged and used. Stop building it by passing --disable-bash-completion to configure
A better idea would be to package it
Then we need bash-completion. Would you like it in meta-oe/recipes-extended? meta-oe/recipes-support? meta-oe/recipes-whatever?
Bash itself is in oe-core, so let's keep it in oe-core.
PATCH 10/17 gettext: shut up unshipped files warning
In reply to Dmitry Eremin-SolenikovIt seems nobody uses preloadable_libintl.so in OE world. It's not included in any package. To stop oe-core from emiting a unshipped files warning, remove that file in the end of do_install.
--- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-core/gettext/gettext_0.18.1.1.bb +6 -1
@@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r3" +PR = "r4" DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native" PROVIDES = "virtual/libintl virtual/gettext"
@@ -90,4 +90,9 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${docdir}/libasprintf/autosprintf.html \ ${infodir}/autosprintf.info \ " + +do_install_append() { + rm -f ${D}${libdir}/preloadable_libintl.so +} + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.2.5
PATCH 11/17 eglibc: fix packaging of some of nativesdk packages
In reply to Dmitry Eremin-Solenikoveglibc.inc contains packaging rules that depend on PKGSUFFIX expansion. However that variable wasn't expanded properly in some case. E.g.
PACKAGES = " ... nscd${PKGSUFFIX} ..."
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
would be expanded to
PACKAGES = " ... nscd-nativesdk ..."FILES_nscd = "${sbindir}/nscd*"
Thus leading to empty -nativesdk packages and missing files. To overcome that use python code blob to properly define PKGSUFFIX variable.
--- meta/recipes-core/eglibc/eglibc-locale.inc | 13 +++++++++---- meta/recipes-core/eglibc/eglibc-package.inc | 9 +++++++-- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-)
meta/recipes-core/eglibc/eglibc-locale.inc +9 -4
@@ -26,10 +26,15 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # set "0" for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" -PR = "r16" - -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" +PR = "r17" + +python __anonymous () { + import bb + if bb.data.inherits_class("nativesdk", d): + bb.data.setVar("PKGSUFFIX", "-nativesdk", d) + else: + bb.data.setVar("PKGSUFFIX", "", d) +} PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
meta/recipes-core/eglibc/eglibc-package.inc +7 -2
@@ -17,8 +17,13 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" +python __anonymous () { + import bb + if bb.data.inherits_class("nativesdk", d): + bb.data.setVar("PKGSUFFIX", "-nativesdk", d) + else: + bb.data.setVar("PKGSUFFIX", "", d) +} PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
meta/recipes-core/eglibc/eglibc_2.12.bb +1 -1
@@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r24" +PR = "r25" SRCREV = "14158"
meta/recipes-core/eglibc/eglibc_2.13.bb +1 -1
@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "14157" DEPENDS += "gperf-native" -PR = "r15" +PR = "r16" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"
Signature · 1 line
1.7.2.5
PATCH 12/17 glib-2.0: include glib-gettextize stuff
In reply to Dmitry Eremin-Solenikovglib-utils already includes glib-gettextize program. Include some files necessary for glib-gettextize to work.
--- meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb | 2 +- meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 2 +- meta/recipes-core/glib-2.0/glib.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -1
@@ -1,6 +1,6 @@ require glib.inc -PR = "r6" +PR = "r7" SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \ file://configure-libtool.patch \
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb +1 -1
@@ -1,6 +1,6 @@ require glib.inc -PR = "r3" +PR = "r4" PE = "1" SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
meta/recipes-core/glib-2.0/glib.inc +1 -1
@@ -19,7 +19,7 @@ DEPENDS_virtclass-nativesdk = "libtool-nativesdk" PACKAGES =+ "${PN}-utils " LEAD_SONAME = "libglib-2.0.*" -FILES_${PN}-utils = "${bindir}/*" +FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" inherit autotools pkgconfig gettext
Signature · 1 line
1.7.2.5
PATCH 13/17 libxml2: reinclude a -staticdev package
In reply to Dmitry Eremin-Solenikovlibxml2 provides a libxml2.a library, which wasn't included in any of the packages. Usually static libs are included into a -staticdev package, but this package wasn't generated for libxml2, due to libxml2.inc redeclaring PACKAGES variable (to include libxml2-utils). Replace PACKAGES setting with expansion to include all default packages (and so -staticdev package with libxml2.a).
--- meta/recipes-core/libxml/libxml2.inc | 2 +- meta/recipes-core/libxml/libxml2_2.7.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/libxml/libxml2.inc +1 -1
@@ -37,7 +37,7 @@ python populate_packages_prepend () { bb.data.setVar('PKG_libxml2', '${MLPREFIX}libxml2', d) } -PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" +PACKAGES += "${PN}-utils" FILES_${PN}-dev += "${bindir}/*-config ${libdir}/xml2Conf.sh" FILES_${PN}-utils += "${bindir}/*"
meta/recipes-core/libxml/libxml2_2.7.8.bb +1 -1
@@ -1,6 +1,6 @@ require libxml2.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
Signature · 1 line
1.7.2.5
PATCH 14/17 e2fsprogs: include devtools scripts
In reply to Dmitry Eremin-SolenikovSome scripts are necessary to develop programs with libcom_err and libss. Include those into e2fsprogs-dev package.
--- .../e2fsprogs/e2fsprogs_1.41.14.bb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb +2 -1
@@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r1" +PR = "r2" SRC_URI += "file://quotefix.patch \ file://acinclude.m4"
@@ -51,5 +51,6 @@ FILES_libcomerr = "${libdir}/libcom_err.so.*" FILES_libss = "${libdir}/libss.so.*" FILES_libe2p = "${libdir}/libe2p.so.*" FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*" +FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.2.5
PATCH 15/17 gcc: include plugin-related headers into packaged SDK
In reply to Dmitry Eremin-SolenikovInclude headers necessary to compile gcc plugins into cross-canadian gcc packages.
--- meta/recipes-devtools/gcc/gcc-4.5.1.inc | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/gcc-package-sdk.inc | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-devtools/gcc/gcc-4.5.1.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r9" +PR = "r10" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r10" +PR = "r11" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-package-sdk.inc +1 -0
@@ -13,6 +13,7 @@ FILES_${PN} = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ ${includedir}/c++/${BINV} \ ${prefix}/${TARGET_SYS}/bin/* \ ${prefix}/${TARGET_SYS}/lib/* \
Signature · 1 line
1.7.2.5
PATCH 16/17 gcc: fix possible problems with nscd compilation during eglibc-nativesdk build
In reply to Dmitry Eremin-SolenikovLong time ago a066e7ca90a28d5681c5fa895a29e999ed7c88b was committed to address possible problems with compilation of nscd during eglibc-nativesdk build. Problems were related to the way gcc searches for headers to check if it should enable it's own stack smash protection bits or it can relay on eglibc for it.
However after 934d38530c9a67562e53d4034aee5531f0f26750 things got broken, as for gcc-crosssdk{,-intermediate} packages:
1) EXTRA_OECONF is ignored
2) headers are installed in a different location than expected by that patch.
This results in eglibc-nativesdk build broken on some systems (e.g. mine Debian x86_64 squeeze). Fix that by providing with-headers options to crosssdk gcc configurations.
--- meta/recipes-devtools/gcc/gcc-4.5.1.inc | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../gcc/gcc-crosssdk-intermediate.inc | 2 ++ meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-devtools/gcc/gcc-4.5.1.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r10" +PR = "r11" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r11" +PR = "r12" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc +2 -0
@@ -7,3 +7,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk" PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk" + +EXTRA_OECONF += " --with-headers=${STAGING_DIR_TCBOOTSTRAP}${SYSTEMHEADERS} "
meta/recipes-devtools/gcc/gcc-crosssdk.inc +2 -0
@@ -8,3 +8,5 @@ GCCMULTILIB = "--disable-multilib" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" + +EXTRA_OECONF += " --with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} "
Signature · 1 line
1.7.2.5
Re: [PATCH 16s, Richard17] gcc: fix possible problems with nscd compilation during eglibc-nativesdk build
Quoted 63 lines · Dmitry Eremin-Solenikov
Long time ago
a066e7ca90a28d5681c5fa895a29e999ed7c88bwas committed to address possible problems with compilation of nscd during eglibc-nativesdk build. Problems were related to the way gcc searches for headers to check if it should enable it's own stack smash protection bits or it can relay on eglibc for it.However after
934d38530c9a67562e53d4034aee5531f0f26750things got broken, as for gcc-crosssdk{,-intermediate} packages:
1)EXTRA_OECONFis ignored
2) headers are installed in a different location than expected by that patch.This results in eglibc-nativesdk build broken on some systems (e.g. mine Debian
x86_64squeeze). Fix that by providing with-headers options to crosssdk gcc configurations.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- meta/recipes-devtools/gcc/gcc-4.5.1.inc | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../gcc/gcc-crosssdk-intermediate.inc | 2 ++ meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-)meta/recipes-devtools/gcc/gcc-4.5.1.inc +1
-1@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r10" +PR = "r11" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"meta/recipes-devtools/gcc/gcc-4.6.inc +1
-1@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r11" +PR = "r12" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc +2
-0@@ -7,3 +7,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk" PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk" + +EXTRA_OECONF += " --with-headers=${STAGING_DIR_TCBOOTSTRAP}${SYSTEMHEADERS} "meta/recipes-devtools/gcc/gcc-crosssdk.inc +0
-0
meta/recipes-devtools/gcc/gcc-crosssdk.inc GCCMULTILIB = "--disable-multilib" · line 12
Quoted 5 lines
meta/recipes-devtools/gcc/gcc-crosssdk.inc +2
-0@@ -8,3 +8,5 @@ GCCMULTILIB = "--disable-multilib" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" + +EXTRA_OECONF += " --with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} "
You are patching both gcc-crosssdk and gcc-crosssdk-intermediate here. I ran a check:
bitbake gcc-crosssdk -e | grep EXTRA_OECONF
and this suggested the second part of this change isn't needed and the real issue is in the intermediate step?
How about we add this line explicitly to gcc-cross-intermediate.inc?
Cheers,
Richard
PATCH 17/17 package.bbclass: make unshipped files a fatal error
In reply to Dmitry Eremin-SolenikovI belive that "files were installed but not shipped in any package" message should become a fatal error. While it's true that sometimes some files are generated by do_install task, which aren't necessary for our target systems. However in generic I think this is a very important and usually overlooked QA sign. E.g. recently I've found/fixed some bugs in eglibc packaging only due to making this a fatal error. Sometimes new versions of a software add new files, but then they are sometimes ignored, as this messages can be easily missed. You can come with more examples if you'd like to.
--- meta/classes/package.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/classes/package.bbclass +1 -0
@@ -948,6 +948,7 @@ python populate_packages () { bb.warn("For recipe %s, the following files were installed but not shipped in any package:" % pn) for f in unshipped: bb.warn(" " + f) + bb.fatal("Unshipped files found") bb.build.exec_func("package_name_hook", d)
Signature · 1 line
1.7.2.5
Re: [PATCH 17/17] package.bbclass: make unshipped files a fatal error
Quoted 20 lines · Dmitry Eremin-Solenikov
I belive that "files were installed but not shipped in any package" message should become a fatal error. While it's true that sometimes some files are generated by
do_installtask, which aren't necessary for our target systems. However in generic I think this is a very important and usually overlooked QA sign. E.g. recently I've found/fixed some bugs in eglibc packaging only due to making this a fatal error. Sometimes new versions of a software add new files, but then they are sometimes ignored, as this messages can be easily missed. You can come with more examples if you'd like to.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- meta/classes/package.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)meta/classes/package.bbclass +0
-0
meta/classes/package.bbclass python populate_packages () { · line 953
Quoted 6 lines
meta/classes/package.bbclass +1
-0@@ -948,6 +948,7 @@ python populate_packages () { bb.warn("For recipe %s, the following files were installed but not shipped in any package:" % pn) for f in unshipped: bb.warn(" " + f) + bb.fatal("Unshipped files found") bb.build.exec_func("package_name_hook", d)
One of thee post-release things I want to sort out is the QA warnings and I add this warning under that category. We introduced the ideas of warnings to error and warn on into the QA class already and I'd like to be able to control this warning in that way using the same variables.
Also, rather than being bb.fatal, this should be bb.error. An Error message will allow the build to complete but will set the bitbake exit code to show when errors have occurred. This means errors still light the autobuilder up red when they occur so we're usually pretty good about noticing and removing error messages.
Cheers,
Richard
Re: [PATCH 17/17] package.bbclass: make unshipped files a fatal error
Quoted 27 lines · Richard Purdie
Quoted 26 lines · Dmitry Eremin-Solenikov
I belive that "files were installed but not shipped in any package" message should become a fatal error. While it's true that sometimes some files are generated by
do_installtask, which aren't necessary for our target systems. However in generic I think this is a very important and usually overlooked QA sign. E.g. recently I've found/fixed some bugs in eglibc packaging only due to making this a fatal error. Sometimes new versions of a software add new files, but then they are sometimes ignored, as this messages can be easily missed. You can come with more examples if you'd like to.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- meta/classes/package.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)meta/classes/package.bbclass +1
-0@@ -948,6 +948,7 @@ python populate_packages () { bb.warn("For recipe %s, the following files were installed but not shipped in any package:" % pn) for f in unshipped: bb.warn(" " + f) + bb.fatal("Unshipped files found")
Quoted 6 lines
meta/classes/package.bbclass python populate_packages () { · line 953
Quoted 1 line
meta/classes/package.bbclass +0
-0bb.build.exec_func("package_name_hook", d)One of thee post-release things I want to sort out is the QA warnings and I add this warning under that category. We introduced the ideas of warnings to error and warn on into the QA class already and I'd like to be able to control this warning in that way using the same variables.
Nice idea! On the rights of a feature request:
It would be nice to allow user to:
1) specify the severity of the QA problems (warn, error, fatal) on a global + per-qa-check level
2) specify an override for some of the checks, so that the packager can specify that
e.g. QA check for .so links in a non-dev packages should be ignored for cgroups-pam package for /lib/security/pam*.so lib. (I get the idea from Debian lintian overrides. Hope
I was able to write what I mean).
Quoted 6 lines
Also, rather than being bb.fatal, this should be bb.error. An Error message will allow the build to complete but will set the bitbake exit code to show when errors have occurred. This means errors still light the autobuilder up red when they occur so we're usually pretty good about noticing and removing error messages.
Hmmm. If it's a bb.error, is it logged somewhere except in the task log file? Because even if I see a red state in my oestats installation (BTW:
what is the current way to track build statuses?), I don't think I'll be able to dig through multi-page oestats task output for some big image looking for erroneous-but-not-failed items.
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH 17/17] package.bbclass: make unshipped files a fatal error
Quoted 4 lines · On Thursday 22 September 2011 07:36:23 Dmitry Eremin-Solenikov wrote:
Nice idea! On the rights of a feature request:
It would be nice to allow user to:
1) specify the severity of the QA problems (warn, error, fatal) on a global + per-qa-check level
To affect the severity of warnings on a global basis you should be able to use ERROR_QA / WARN_QA, although I have not tried this.
Quoted 4 lines
2) specify an override for some of the checks, so that the packager can specify that
e.g. QA check for .so links in a non-dev packages should be ignored for cgroups-pam package for/lib/security/pam*.solib.
For per-package, you can set for example INSANE_SKIP_${PN} += "dev-so" to disable the .so links in non-dev package QA warning.
More details (e.g. the name for each QA check) can be found in insane.bbclass.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [PATCH 17/17] package.bbclass: make unshipped files a fatal error
Hello,
Quoted 14 lines · Paul Eggleton
Quoted 4 lines · On Thursday 22 September 2011 07:36:23 Dmitry Eremin-Solenikov wrote:
Nice idea! On the rights of a feature request:
It would be nice to allow user to:
1) specify the severity of the QA problems (warn, error, fatal) on a global + per-qa-check levelTo affect the severity of warnings on a global basis you should be able to use
ERROR_QA/WARN_QA, although I have not tried this.Quoted 4 lines
2) specify an override for some of the checks, so that the packager can specify that
e.g. QA check for .so links in a non-dev packages should be ignored for cgroups-pam package for/lib/security/pam*.solib.
Quoted 4 lines
For per-package, you can set for example INSANE_SKIP_${PN} += "dev-so" to disable the .so links in non-dev package QA warning.
More details (e.g. the name for each QA check) can be found in insane.bbclass.
This is a too big handle. Ideally I'd like to be able to whitelist on the file level, rather than on the package/test level.
Signature · 2 lines
With best wishes Dmitry
Quoted 8 lines · Dmitry Eremin-Solenikov
icecc-create-env(-native) is a native package. But if it doesn't have the -native suffix, some dependency tracking stuff in oe-core (in nativesdk.bbclass) get's crazy about it, trying to generate dependencies to icecc-create-env-native packages. To fix that simply add -native suffix to this package.
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>---
Thanks for some great cleanups. I've merged most of this to master, except where there has been feedback/discussion.
Cheers,
Richard
Quoted 7 lines · Richard Purdie
Quoted 6 lines · Dmitry Eremin-Solenikov
icecc-create-env(-native) is a native package. But if it doesn't have the -native suffix, some dependency tracking stuff in oe-core (in nativesdk.bbclass) get's crazy about it, trying to generate dependencies to icecc-create-env-native packages. To fix that simply add -native suffix to this package.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>---
Thanks for some great cleanups. I've merged most of this to master, except where there has been feedback/discussion.
Thanks! It seems icecc patch file got damaged somewhere in the loop. I think I'll just drop the patch and the not-so-upstream tarball and submit the script
to be included in the oe-core tree. Does that sound good?
Signature · 2 lines
With best wishes Dmitry