Deterministic dependencies II
cover Deterministic dependencies II
WIP because verification build is still running and I must admit that I'm mostly testing that all dependencies are correctly "disabled" and in the end deterministic.
I'm not testing if every possible combination of PACKAGECONFIG options provide sufficient dependency tree.
But it would be nice to get some review in advance and be able to get this in 1.5 if I manage to fix all possible review comments and/or issues discovered in my builds in time.
The following changes since commit 7d93288117e7054472d8a01dde0b38bc0ff98c27:
buildtools-tarball: Add python-pkgutil (2013-08-29 00:22:49 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/deps
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/deps
Martin Jansa (20):
gstreamer1.0-libav: Add PACKAGECONFIG for orc
libunique: Add PACKAGECONFIG for dbus
aspell: Add PACKAGECONFIG for curses
xf86-input-synaptics: Add dependency on libxtst
xdypinfo: Add dependency on libxcomposite
libmatchbox: Add PACKAGECONFIG for png
matchbox-wm: Add dependency on libxfixes and libxcursor
telepathy-mission-control: Add PACKAGECONFIG for upower and
connectivity
tcl: Add dependency on zlib
weston: Add PACKAGECONFIG for poppler
wget: Add dependency on libpcre
x11vnc: Add PACKAGECONFIG for xfixes, xinerama, xrandr and xdamage
guile: Add PACKAGECONFIG for readline
consolekit: Add patch to explicitly disable polkit when not enabled
glib-networking: Add PACKAGECONFIG for p11-kit
lame: Add dependency on ncurses
librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf
subversion: Add dependency on file for libmagic
systemd: Add PACKAGECONFIG for cryptsetup
qemu: Add PACKAGECONFIG for nss, uuid, tls and curses
.../telepathy/telepathy-mission-control_5.15.0.bb | 8 ++++ .../glib-networking/glib-networking_2.36.2.bb | 3 ++ meta/recipes-core/systemd/systemd_206.bb | 1 + meta/recipes-devtools/guile/guile_2.0.9.bb | 3 ++ meta/recipes-devtools/qemu/qemu.inc | 4 ++ .../subversion/subversion_1.7.10.bb | 2 +- meta/recipes-devtools/tcltk/tcl_8.6.0.bb | 2 +- meta/recipes-extended/wget/wget.inc | 2 +- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +- meta/recipes-gnome/libunique/libunique_1.1.6.bb | 5 ++- .../libmatchbox/libmatchbox_1.11.bb | 3 ++ .../matchbox-wm/matchbox-wm_1.2.bb | 2 +- .../matchbox-wm/matchbox-wm_git.bb | 2 +- .../0001-configure-Allow-to-disable-poppler.patch | 43 ++++++++++++++++++++++ meta/recipes-graphics/wayland/weston_1.1.0.bb | 2 + meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 6 +++ meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb | 2 +- .../xorg-driver/xf86-input-synaptics_1.7.1.bb | 2 +- .../xorg-driver/xf86-input-synaptics_git.bb | 2 +- .../gstreamer/gstreamer1.0-libav.inc | 1 + meta/recipes-multimedia/lame/lame_3.99.5.bb | 2 + meta/recipes-support/aspell/aspell_0.60.6.1.bb | 12 ++++-- .../allow.to.disable.polkit.support.patch | 33 +++++++++++++++++ .../recipes-support/consolekit/consolekit_0.4.6.bb | 4 +- 24 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch create mode 100644 meta/recipes-support/consolekit/consolekit/allow.to.disable.polkit.support.patch
Signature · 1 line
1.8.3.2
PATCH 1/20 gstreamer1.0-libav: Add PACKAGECONFIG for orc
--- meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +1 -0
@@ -17,6 +17,7 @@ PACKAGECONFIG ??= " " PACKAGECONFIG[libav] = "--with-system-libav,,libav" PACKAGECONFIG[lgpl] = "--enable-lgpl,," PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" +PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" GSTREAMER_1_0_DEBUG ?= "--disable-debug"
Signature · 1 line
1.8.3.2
PATCH 2/20 libunique: Add PACKAGECONFIG for dbus
In reply to Martin Jansa* dbus-glib was missing in DEPENDS in order to enable dbus backend but because dbus was in DEPENDS lets enable this PACKAGECONFIG by default
--- meta/recipes-gnome/libunique/libunique_1.1.6.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-gnome/libunique/libunique_1.1.6.bb +4 -1
@@ -12,7 +12,10 @@ SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66c PR = "r7" -DEPENDS = "glib-2.0 gtk+ dbus" +DEPENDS = "glib-2.0 gtk+" + +PACKAGECONFIG ??= "dbus" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
Signature · 1 line
1.8.3.2
PATCH 3/20 aspell: Add PACKAGECONFIG for curses
In reply to Martin Jansa--- meta/recipes-support/aspell/aspell_0.60.6.1.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
meta/recipes-support/aspell/aspell_0.60.6.1.bb +8 -4
@@ -1,12 +1,16 @@ -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" - -SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7" -SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" DESCRIPTION = "GNU Aspell spell-checker" SECTION = "console/utils" LICENSE="LGPLv2 | LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" PR = "r1" + +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7" +SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" + PACKAGES += "libaspell libpspell libpspell-dev aspell-utils" FILES_${PN}-dbg += "${libdir}/aspell-0.60/.debu*"
Signature · 1 line
1.8.3.2
PATCH 4/20 xf86-input-synaptics: Add dependency on libxtst
In reply to Martin Jansa--- meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.7.1.bb | 2 +- meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.7.1.bb +1 -1
@@ -15,6 +15,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" SRC_URI[md5sum] = "6505de717972b6a24b8eb13e69eb996c" SRC_URI[sha256sum] = "db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e" -DEPENDS += "libxi mtdev" +DEPENDS += "libxi mtdev libxtst" FILES_${PN} += "${datadir}/X11/xorg.conf.d"
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb +1 -1
@@ -15,4 +15,4 @@ PR = "${INC_PR}.1" SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git" S = "${WORKDIR}/git" -DEPENDS += "libxi mtdev" +DEPENDS += "libxi mtdev libxtst"
Signature · 1 line
1.8.3.2
PATCH 5/20 xdypinfo: Add dependency on libxcomposite
In reply to Martin Jansa--- meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb +1 -1
@@ -9,7 +9,7 @@ clients and the server, and the different types of screens and visuals \ that are available." LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" PE = "1" SRC_URI += "file://disable-xkb.patch"
Signature · 1 line
1.8.3.2
PATCH 6/20 libmatchbox: Add PACKAGECONFIG for png
In reply to Martin Jansa* enable it by default, because it's more likely that people were building libmatchbox after libpng than before
* with png disabled it also fails, because of missing csetjmp include | mbpixbuf.c:128:3: error: unknown type name 'jmp_buf'
| jmp_buf setjmp_buffer; /* for return to caller */
--- meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb +3 -0
@@ -16,4 +16,7 @@ SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534 inherit autotools pkgconfig +PACKAGECONFIG ??= "png" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" + EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"
Signature · 1 line
1.8.3.2
PATCH 7/20 matchbox-wm: Add dependency on libxfixes and libxcursor
In reply to Martin Jansa--- meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | 2 +- meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +1 -1
@@ -1,7 +1,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPLv2.0+" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat" PR = "r5" SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +1 -1
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" SECTION = "x11/wm" -DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" +DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" SRCREV = "29544f0e61cc281fc60061443a537271e1081b78" PV = "1.2+git${SRCPV}"
Signature · 1 line
1.8.3.2
PATCH 8/20 telepathy-mission-control: Add PACKAGECONFIG for upower and connectivity
In reply to Martin Jansa--- .../telepathy/telepathy-mission-control_5.15.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/recipes-connectivity/telepathy/telepathy-mission-control_5.15.0.bb +8 -0
@@ -12,6 +12,14 @@ SRC_URI[sha256sum] = "88800d1b5f385e94b34721319ff4fe65c493632954d7229b36e57af5b4 inherit autotools pkgconfig pythonnative +PACKAGECONFIG ??= "" +PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower" + +# to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both +PACKAGECONFIG[connectvity] = ",--with-connectivity=no" +PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" +PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" + PACKAGES =+ " \ libmissioncontrol \ libmissioncontrol-config \
Signature · 1 line
1.8.3.2
PATCH 9/20 tcl: Add dependency on zlib
In reply to Martin Jansa--- meta/recipes-devtools/tcltk/tcl_8.6.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/tcltk/tcl_8.6.0.bb +1 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language" LICENSE = "BSD-3-Clause" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -DEPENDS = "tcl-native" +DEPENDS = "tcl-native zlib" LIC_FILES_CHKSUM = "file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
Signature · 1 line
1.8.3.2
PATCH 10/20 weston: Add PACKAGECONFIG for poppler
In reply to Martin Jansa--- .../0001-configure-Allow-to-disable-poppler.patch | 43 ++++++++++++++++++++++ meta/recipes-graphics/wayland/weston_1.1.0.bb | 2 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch
meta/recipes-graphics/wayland/weston/0001-configure-Allow-to-disable-poppler.patch new file +43 -0
@@ -0,0 +1,43 @@ +From d409b069a97e0d76016d3bfd34d6fae96dcf5d9d Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Mon, 26 Aug 2013 00:51:31 +0200 +Subject: [PATCH] configure: Allow to disable poppler + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <[email protected]> +--- + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d5fea9d..53e0c0b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -221,6 +221,11 @@ if test x$enable_simple_egl_clients = xyes -a x$enable_egl = xyes; then + [egl >= 7.10 glesv2 wayland-client wayland-egl wayland-cursor]) + fi + ++AC_ARG_ENABLE(poppler, ++ AS_HELP_STRING([--disable-poppler], ++ [disable poppler support]),, ++ enable_popper=yes) ++ + AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes) + AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes) + if test x$enable_clients = xyes; then +@@ -229,8 +234,10 @@ if test x$enable_clients = xyes; then + PKG_CHECK_MODULES(CLIENT, [wayland-client cairo >= 1.10.0 xkbcommon wayland-cursor]) + PKG_CHECK_MODULES(WESTON_INFO, [wayland-client]) + ++ AS_IF([test "x$enable_poppler" != "no"], [ + PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ], +- [have_poppler=yes], [have_poppler=no]) ++ [have_poppler=yes], [have_poppler=no])], ++ [have_poppler=no]) + PKG_CHECK_MODULES(CAIRO_EGL, [wayland-egl egl >= 7.10 cairo-egl >= 1.11.3 $cairo_modules], + [have_cairo_egl=yes], [have_cairo_egl=no]) + AS_IF([test "x$have_cairo_egl" = "xyes"], +-- +1.8.3.2 +
meta/recipes-graphics/wayland/weston_1.1.0.bb +2 -0
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-configure-Allow-to-disable-poppler.patch \ file://install-examples.patch \ file://weston-launch-shell.patch \ file://groups.patch \
@@ -49,6 +50,7 @@ PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/l PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" # Weston on framebuffer PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" +PACKAGECONFIG[poppler] = "--enable-poppler,--disable-poppler,poppler" # Use cairo-gl or cairo-glesv2 PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
Signature · 1 line
1.8.3.2
PATCH 11/20 wget: Add dependency on libpcre
In reply to Martin Jansa--- meta/recipes-extended/wget/wget.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/wget/wget.inc +1 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." SECTION = "console/network" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "openssl zlib" +DEPENDS = "openssl zlib libpcre" INC_PR = "r16"
Signature · 1 line
1.8.3.2
PATCH 12/20 x11vnc: Add PACKAGECONFIG for xfixes, xinerama, xrandr and xdamage
In reply to Martin Jansa--- meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 6 ++++++ 1 file changed, 6 insertions(+)
meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +6 -0
@@ -18,5 +18,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" +PACKAGECONFIG ??= "" +PACKAGECONFIG[xfixes] = "--with-xfixes,--without-xfixes,libxfixes" +PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" +PACKAGECONFIG[xrandr] = "--with-xrandr,--without-xrandr,libxrandr" +PACKAGECONFIG[xdamage] = "--with-xdamage,--without-xdamage,libxdamage" + inherit autotools
Signature · 1 line
1.8.3.2
PATCH 13/20 guile: Add PACKAGECONFIG for readline
In reply to Martin Jansa--- meta/recipes-devtools/guile/guile_2.0.9.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-devtools/guile/guile_2.0.9.bb +3 -0
@@ -40,6 +40,9 @@ RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1" EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}" +PACKAGECONFIG ??= "" +PACKAGECONFIG[readline] = "--with-libreadline,--without-libreadline-support,readline" + do_configure_prepend() { mkdir -p po }
Signature · 1 line
1.8.3.2
PATCH 14/20 consolekit: Add patch to explicitly disable polkit when not enabled
In reply to Martin Jansa--- .../allow.to.disable.polkit.support.patch | 33 ++++++++++++++++++++++ .../recipes-support/consolekit/consolekit_0.4.6.bb | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/consolekit/consolekit/allow.to.disable.polkit.support.patch
meta/recipes-support/consolekit/consolekit/allow.to.disable.polkit.support.patch new file +33 -0
@@ -0,0 +1,33 @@ +Polkit is autodetected from sysroot. + +We need to explicitly disable it to get deterministic behavior +when following sequence is used: +bitbake consolekit +bitbake polkit +bitbake consolekit + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <[email protected]> + +--- a/configure.ac 2013-08-26 15:43:00.770168252 +0200 ++++ b/configure.ac 2013-08-26 15:45:15.816173094 +0200 +@@ -56,13 +56,16 @@ + gthread-2.0 >= $GLIB_REQUIRED_VERSION + ) + +-PKG_CHECK_MODULES(POLKIT, ++AC_ARG_ENABLE(polkit, ++ [AS_HELP_STRING([--enable-polkit],[build polkit support])], ++[PKG_CHECK_MODULES(POLKIT, + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION, + have_polkit=yes, + have_polkit=no) + if test "x$have_polkit" = "xyes" ; then + AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit]) +-fi ++fi], [have_polkit=no]) ++ + AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes) + AC_SUBST(HAVE_POLKIT) +
meta/recipes-support/consolekit/consolekit_0.4.6.bb +2 -2
@@ -12,6 +12,7 @@ RDEPENDS_${PN} += "base-files" inherit autotools pkgconfig SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \ + file://allow.to.disable.polkit.support.patch \ file://sepbuildfix.patch" SRC_URI[md5sum] = "611792b4d616253a5bdec9175f8b7678"
@@ -23,8 +24,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" -# No option to turn it on or off, so rely on the build dependency for now. -PACKAGECONFIG[policykit] = ",,polkit" +PACKAGECONFIG[policykit] = "--enable-polkit,--disable-polkit,polkit" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
Signature · 1 line
1.8.3.2
PATCH 15/20 glib-networking: Add PACKAGECONFIG for p11-kit
In reply to Martin Jansa--- meta/recipes-core/glib-networking/glib-networking_2.36.2.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-core/glib-networking/glib-networking_2.36.2.bb +3 -0
@@ -13,6 +13,9 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "fb9121742ed36d1723f296eea19dbb3c" SRC_URI[sha256sum] = "2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9" +PACKAGECONFIG ??= "" +PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit" + EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy" inherit autotools pkgconfig
Signature · 1 line
1.8.3.2
PATCH 16/20 lame: Add dependency on ncurses
In reply to Martin Jansa* it's autodetected and configure doesn't allow to explicitly disable it
--- meta/recipes-multimedia/lame/lame_3.99.5.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-multimedia/lame/lame_3.99.5.bb +2 -0
@@ -5,6 +5,8 @@ SECTION = "console/utils" LICENSE = "LGPLv2+" LICENSE_FLAGS = "commercial" +DEPENDS = "ncurses" + LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \ "
Signature · 1 line
1.8.3.2
PATCH 17/20 librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf
In reply to Martin Jansa* without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
--- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +1 -1
@@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf" # Support embedded CSS stylesheets (recommended upstream) PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" # gdk-pixbuf loader -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf" # GTK+ 2 theme engine PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
Signature · 1 line
1.8.3.2
PATCH 18/20 subversion: Add dependency on file for libmagic
In reply to Martin Jansa--- meta/recipes-devtools/subversion/subversion_1.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/subversion/subversion_1.7.10.bb +1 -1
@@ -1,6 +1,6 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" -DEPENDS = "apr-util neon sqlite3" +DEPENDS = "apr-util neon sqlite3 file" RDEPENDS_${PN} = "neon" LICENSE = "Apache-2" HOMEPAGE = "http://subversion.tigris.org"
Signature · 1 line
1.8.3.2
PATCH 19/20 systemd: Add PACKAGECONFIG for cryptsetup
In reply to Martin Jansa--- meta/recipes-core/systemd/systemd_206.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_206.bb +1 -0
@@ -50,6 +50,7 @@ DEPENDS += "libgcrypt" # Compress the journal PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" PACKAGECONFIG[tcp-wrappers] = "--enable-tcpwrap,--disable-tcpwrap,tcp-wrappers" +PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
Signature · 1 line
1.8.3.2
PATCH 20/20 qemu: Add PACKAGECONFIG for nss, uuid, tls and curses
In reply to Martin Jansa--- meta/recipes-devtools/qemu/qemu.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +4 -0
@@ -82,6 +82,10 @@ do_install_append() { PACKAGECONFIG ??= "" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," +PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss," +PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," +PACKAGECONFIG[tls] = "--enable-vnc-tls,--disable-vnc-tls,gnutls," +PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," # Qemu target will not build in world build for ARM or Mips BROKEN_qemuarm = "1"
Signature · 1 line
1.8.3.2
Re: [WIP][PATCH 17/20] librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf
In reply to Martin JansaQuoted 12 lines · Martin Jansa
* without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +0
-0
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb PACKAGECONFIG ??= "croco gdkpixbuf" · line 32
Quoted 5 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +1
-1@@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf" # Support embedded CSS stylesheets (recommended upstream) PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" # gdk-pixbuf loader -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"
I think this needs to be a target only PACKAGECONFIG, as it will try to depend on gtk+-native when building the librsvg-native.
Sau!
Quoted 4 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +0
-0# GTK+ 2 theme engine PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
Re: [WIP][PATCH 17/20] librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf
Quoted 8 lines · Saul Wold
Quoted 7 lines · Martin Jansa
* without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb PACKAGECONFIG ??= "croco gdkpixbuf" · line 32
Quoted 10 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +1
-1@@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf" # Support embedded CSS stylesheets (recommended upstream) PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" # gdk-pixbuf loader -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"I think this needs to be a target only PACKAGECONFIG, as it will try to depend on gtk+-native when building the librsvg-native.
Yes I've noticed it couple minutes after sending this patchset and it's already fixed in branch (just not squashed yet - waiting for next build).
Thanks for review
Quoted 7 lines
Sau!
Quoted 4 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +0
-0# GTK+ 2 theme engine PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [WIP][PATCH 17/20] librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf
In reply to Saul WoldQuoted 8 lines · Saul Wold
Quoted 7 lines · Martin Jansa
* without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb PACKAGECONFIG ??= "croco gdkpixbuf" · line 32
Quoted 10 lines
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +1
-1@@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf" # Support embedded CSS stylesheets (recommended upstream) PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" # gdk-pixbuf loader -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"I think this needs to be a target only PACKAGECONFIG, as it will try to depend on gtk+-native when building the librsvg-native.
Also do we really need gtk for the pixbuf loader? gtk2 theme engine pulls in gtk+ elsewhere?
Cheers,
Richard
Re: [WIP][PATCH 06/20] libmatchbox: Add PACKAGECONFIG for png
In reply to Martin JansaQuoted 3 lines · Martin Jansa
* with png disabled it also fails, because of missing csetjmp include | mbpixbuf.c:128:3: error: unknown type name '
jmp_buf'
|jmp_bufsetjmp_buffer; /* for return to caller */
FWIW, I've just fixed this in libmatchbox.
Ross
Re: [WIP][PATCH 06/20] libmatchbox: Add PACKAGECONFIG for png
In reply to Martin JansaQuoted 1 line · Martin Jansa
+PACKAGECONFIG ??= "png"
For completeness consider adding "jpeg", although I doubt anyone actually uses the JPEG support...
Ross
Re: [WIP][PATCH 12/20] x11vnc: Add PACKAGECONFIG for xfixes, xinerama, xrandr and xdamage
In reply to Martin Jansameta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ · line 25
Quoted 5 lines · Martin Jansa
meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +5
-0+PACKAGECONFIG ??= "" +PACKAGECONFIG[xfixes] = "--with-xfixes,--without-xfixes,libxfixes" +PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" +PACKAGECONFIG[xrandr] = "--with-xrandr,--without-xrandr,libxrandr" +PACKAGECONFIG[xdamage] = "--with-xdamage,--without-xdamage,libxdamage"
xfixes/xdamage are incredibly useful for VNC servers. Can you make xfixes/xrandr/xdamage dependencies, leaving just xinerama a disabled option.
Ross
Re: [WIP][PATCH 08/20] telepathy-mission-control: Add PACKAGECONFIG for upower and connectivity
In reply to Martin Jansameta/recipes-connectivity/telepathy/telepathy-mission-control_5.15.0.bb SRC_URI[sha256sum] = "88800d1b5f385e94b34721319ff4fe65c493632954d7229b36e57af5b4 · line 21
Quoted 2 lines · Martin Jansa
meta/recipes-connectivity/telepathy/telepathy-mission-control_5.15.0.bb +2
-0+PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" +PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager"
Were those meant to be runtime dependencies? At least for connman a build dependency doesn't make any sense (no headers).
Ross
Re: [WIP][PATCH 05/20] xdypinfo: Add dependency on libxcomposite
In reply to Martin JansaTypo (transposition in recipe name) in short log.
Ross
Re: [WIP][PATCH 17/20] librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf
In reply to Richard PurdieQuoted 5 lines · Richard Purdie
Quoted 2 lines
I think this needs to be a target only PACKAGECONFIG, as it will try to depend on gtk+-native when building the librsvg-native.
Also do we really need gtk for the pixbuf loader? gtk2 theme engine pulls in gtk+ elsewhere?
gdk-pixbuf should be sufficient.
Ross
Re: [WIP][PATCH 05/20] xdypinfo: Add dependency on libxcomposite
In reply to Burton, RossQuoted 1 line · Ross
Typo (transposition in recipe name) in short log.
Thanks, fixed in jansa/deps branch.
Quoted 2 lines
Ross
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [WIP][PATCH 08/20] telepathy-mission-control: Add PACKAGECONFIG for upower and connectivity
In reply to Burton, RossQuoted 6 lines · Ross
meta/recipes-connectivity/telepathy/telepathy-mission-control_5.15.0.bb SRC_URI[sha256sum] = "88800d1b5f385e94b34721319ff4fe65c493632954d7229b36e57af5b4 · line 21
Quoted 2 lines · Martin Jansa
meta/recipes-connectivity/telepathy/telepathy-mission-control_5.15.0.bb +2
-0+PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" +PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager"Were those meant to be runtime dependencies? At least for connman a build dependency doesn't make any sense (no headers).
It is using pkg-config in build time to enable support for it:
http://cgit.collabora.com/git/user/cassidy/telepathy-mission-control/tree/configure.ac?h=offline-38366#n330
and it has to conditionally link with them (otherwise test-dependencies script wouldn't detect it).
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [WIP][PATCH 06/20] libmatchbox: Add PACKAGECONFIG for png
In reply to Burton, RossQuoted 5 lines · Ross
Quoted 1 line · Martin Jansa
+PACKAGECONFIG ??= "png"
For completeness consider adding "jpeg", although I doubt anyone actually uses the JPEG support...
jpeg is already in DEPENDS
Quoted 2 lines
Ross
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [WIP][PATCH 06/20] libmatchbox: Add PACKAGECONFIG for png
Quoted 8 lines · Martin Jansa
Quoted 5 lines · Ross
Quoted 1 line · Martin Jansa
+PACKAGECONFIG ??= "png"
For completeness consider adding "jpeg", although I doubt anyone actually uses the JPEG support...
jpeg is already in DEPENDS
I meant as a PACKAGECONFIG option as it's an optional dependency (and to be honest, jpeg could probably default to disabled).
Ross
Re: [WIP][PATCH 08/20] telepathy-mission-control: Add PACKAGECONFIG for upower and connectivity
In reply to Martin JansaQuoted 5 lines · Martin Jansa
It is using pkg-config in build time to enable support for it:
http://cgit.collabora.com/git/user/cassidy/telepathy-mission-control/tree/configure.ac?h=offline-38366#n330and it has to conditionally link with them (otherwise test-dependencies script wouldn't detect it).
Ah, so mission-control is Doing It Wrong - that .pc file is for connman plugins. I'll harass upstream but I do wonder what the script is detecting as there isn't anything like a libconnman.so to link against.
Ross
Re: [WIP][PATCH 08/20] telepathy-mission-control: Add PACKAGECONFIG for upower and connectivity
Quoted 4 lines · Ross
Ah, so mission-control is Doing It Wrong - that .pc file is for connman plugins. I'll harass upstream but I do wonder what the script is detecting as there isn't anything like a libconnman.so to link against.
So upstream has already fixed this by deleting all of the code and using GLib instead. A worthy approach, and when they release we can ditch the PACKAGECONFIGs.
Ross
Re: [WIP][PATCH 18/20] subversion: Add dependency on file for libmagic
In reply to Martin JansaQuoted 20 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-devtools/subversion/subversion_1.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-devtools/subversion/subversion_1.7.10.bb +1
-2@@ -1,6 +1,6 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" -DEPENDS = "apr-util neon sqlite3" +DEPENDS = "apr-util neon sqlite3 file" RDEPENDS_${PN} = "neon" LICENSE = "Apache-2" HOMEPAGE = "http://subversion.tigris.org" --1.8.3.2
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
This fixes a subversion build error I was having a couple of weeks ago.
Regards,
Jonathan
Quoted 9 lines · Martin Jansa
WIP because verification build is still running and I must admit that I'm mostly testing that all dependencies are correctly "disabled" and in the end deterministic.
I'm not testing if every possible combination of PACKAGECONFIG options provide sufficient dependency tree.
But it would be nice to get some review in advance and be able to get this in 1.5 if I manage to fix all possible review comments and/or issues discovered in my builds in time.
FYI: I didn't have time to finish this in last 2 weeks and will be very busy for next 2 weeks so I'm OK with leaving this for 1.5.1 or something like that after 1.5 release. I did some changes from review comments, so the branch has slightly newer versions.
If you see something you really want to have in release please speak up and review/confirm it for me.
The same does apply for longer meta-openembedded patchset with dependencies.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [WIP][PATCH 11/20] wget: Add dependency on libpcre
In reply to Martin JansaQuoted 11 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-extended/wget/wget.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-extended/wget/wget.inc +0
-0
meta/recipes-extended/wget/wget.inc DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." · line 8
Quoted 8 lines
meta/recipes-extended/wget/wget.inc +1
-1@@ -2,7 +2,7 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." SECTION = "console/network" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "openssl zlib" +DEPENDS = "openssl zlib libpcre" INC_PR = "r16"
I haven't looked at the other patches yet but this seems to be valid since my image construction failed with:
Computing transaction...error: Can't install wget-1.14-r16.0.0@core2: no package provides libpcre >= 8.33
Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350
Re: [WIP][PATCH 11/20] wget: Add dependency on libpcre
Quoted 28 lines · Randy MacLeod
Quoted 18 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-extended/wget/wget.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-extended/wget/wget.inc +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "A console URL download utility featuringHTTP, FTP, and more."
SECTION = "console/network"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM= "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"meta/recipes-extended/wget/wget.inc DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." · line 7
Quoted 4 lines
meta/recipes-extended/wget/wget.inc +1
-1-DEPENDS = "openssl zlib" +DEPENDS = "openssl zlib libpcre" INC_PR = "r16"I haven't looked at the other patches yet but this seems to be valid since my image construction failed with:
Quoted 2 lines
Computing transaction...error: Can't install wget-1.14-r16.0.0@core2: no package provides libpcre >= 8.33
this is a typical floating dependency order case. it should be turned into a PACKAGECONFIG, pcre is not a commonly shipped library and you dont
want such hard dependency on it.
Quoted 9 lines
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 16 lines · Martin Jansa
Quoted 9 lines · Martin Jansa
WIP because verification build is still running and I must admit that I'm mostly testing that all dependencies are correctly "disabled" and in the end deterministic.
I'm not testing if every possible combination of PACKAGECONFIG options provide sufficient dependency tree.
But it would be nice to get some review in advance and be able to get this in 1.5 if I manage to fix all possible review comments and/or issues discovered in my builds in time.
FYI: I didn't have time to finish this in last 2 weeks and will be very busy for next 2 weeks so I'm OK with leaving this for 1.5.1 or something like that after 1.5 release. I did some changes from review comments, so the branch has slightly newer versions.
Quoted 5 lines
If you see something you really want to have in release please speak up and review/confirm it for me.
The same does apply for longer meta-openembedded patchset with dependencies.
These patches:
pick 6467505 librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf pick db92df6 libmatchbox: Add PACKAGECONFIG for png
pick 7c66af8 weston: Add PACKAGECONFIG for poppler
pick 6284f74 guile: Add PACKAGECONFIG for readline
pick 2cb5d37 consolekit: Add patch to explicitly disable polkit when not enabled pick fa00e58 qemu: Add PACKAGECONFIG for nss, uuid, tls and curses
need a bit more work, but others are ready for merge (verified in last test-dependencies build).
I'll send v2 in a minute.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]