Deterministic dependencies II

PATCH In review Martin Jansa 3 participants 18 messages Oct 5, 2013 – Oct 7, 2013

lore

Share & tools

lore

Martin Jansa

author

2013-10-05 12:23 UTC #0 lore raw

v2 cover Deterministic dependencies II

The following changes since commit 796b7510853e71f158ad18dcea4cd1a10c7ef294:

dbus: fix QA error building nativesdk-dbus (2013-10-04 18:25:06 +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 (14):
gstreamer1.0-libav: Add PACKAGECONFIG for orc
libunique: Add PACKAGECONFIG for dbus
aspell: Add PACKAGECONFIG for curses
xf86-input-synaptics: Add dependency on libxtst
xdpyinfo: Add dependency on libxcomposite
matchbox-wm: Add dependency on libxfixes and libxcursor
telepathy-mission-control: Add PACKAGECONFIG for upower and
connectivity
tcl: Add dependency on zlib
wget: Add dependency on libpcre
x11vnc: Add PACKAGECONFIG for xinerama
glib-networking: Add PACKAGECONFIG for p11-kit
lame: Add dependency on ncurses
subversion: Add dependency on file for libmagic
systemd: Add PACKAGECONFIG for cryptsetup

 .../telepathy/telepathy-mission-control_5.15.0.bb            |  8 ++++++++
 meta/recipes-core/glib-networking/glib-networking_2.36.2.bb  |  3 +++
 meta/recipes-core/systemd/systemd_206.bb                     |  1 +
 meta/recipes-devtools/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/libunique/libunique_1.1.6.bb              |  5 ++++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb         |  2 +-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb         |  2 +-
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb                |  1 +
 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb             |  2 +-
 .../xorg-driver/xf86-input-synaptics_1.7.1.bb                |  2 +-
 .../recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb |  2 +-
 meta/recipes-multimedia/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 ++++++++----
 16 files changed, 36 insertions(+), 13 deletions(-)

Signature · 1 line

1.8.3.2

Martin Jansa

author

2013-10-05 12:23 UTC #1 lore raw

PATCH v2 1/14 gstreamer1.0-libav: Add PACKAGECONFIG for orc

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +1 -0

index c77a085..3d996bc 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #2 lore raw

PATCH v2 2/14 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

Signed-off-by Martin Jansa <[email protected]>

---
 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

index adb9525..31af658 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #3 lore raw

PATCH v2 3/14 aspell: Add PACKAGECONFIG for curses

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

index 64611cb..b196d96 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #4 lore raw

PATCH v2 4/14 xf86-input-synaptics: Add dependency on libxtst

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

index 9125613..f678e8b 100644
@@ -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

index 6dc5f8a..140f633 100644
@@ -15,4 +15,4 @@ PR = "${INC_PR}.1"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics"
 S = "${WORKDIR}/git"
 
-DEPENDS += "libxi mtdev"
+DEPENDS += "libxi mtdev libxtst"

Signature · 1 line

1.8.3.2

Martin Jansa

author

2013-10-05 12:23 UTC #5 lore raw

PATCH v2 5/14 xdpyinfo: Add dependency on libxcomposite

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

index c853926..3688e1b 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #6 lore raw

PATCH v2 6/14 matchbox-wm: Add dependency on libxfixes and libxcursor

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

index 09e8b7c..b009c4b 100644
@@ -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

index 55480d7..934719a 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #7 lore raw

PATCH v2 7/14 telepathy-mission-control: Add PACKAGECONFIG for upower and connectivity

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../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

index aa776a1..f1a1320 100644
@@ -14,6 +14,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

Martin Jansa

author

2013-10-05 12:23 UTC #8 lore raw

PATCH v2 8/14 tcl: Add dependency on zlib

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

index 7273182..8d4df30 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #9 lore raw

PATCH v2 9/14 wget: Add dependency on libpcre

In reply to 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 +1 -1

index de9b620..7af55c4 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #10 lore raw

PATCH v2 10/14 x11vnc: Add PACKAGECONFIG for xinerama

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +1 -0

index 24c42d1..7b3501d 100644
@@ -20,3 +20,4 @@ inherit autotools
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
 PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
+PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"

Signature · 1 line

1.8.3.2

Martin Jansa

author

2013-10-05 12:23 UTC #11 lore raw

PATCH v2 11/14 glib-networking: Add PACKAGECONFIG for p11-kit

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

index 863a4eb..5200b94 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #12 lore raw

PATCH v2 12/14 lame: Add dependency on ncurses

In reply to Martin Jansa

* it's autodetected and configure doesn't allow to explicitly disable it

Signed-off-by Martin Jansa <[email protected]>

---
 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

index 764fcc1..978636a 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #13 lore raw

PATCH v2 13/14 subversion: Add dependency on file for libmagic

In reply to 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 -1

index f77656b..4acd70b 100644
@@ -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

Martin Jansa

author

2013-10-05 12:23 UTC #14 lore raw

PATCH v2 14/14 systemd: Add PACKAGECONFIG for cryptsetup

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-core/systemd/systemd_206.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-core/systemd/systemd_206.bb +1 -0

index 02be793..a1a8bd7 100644
@@ -53,6 +53,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

Burton, Ross

2013-10-07 09:32 UTC #15 lore raw

In reply to Martin Jansa

Quoted 8 lines · Martin Jansa

Martin Jansa (14):
gstreamer1.0-libav: Add PACKAGECONFIG for orc
libunique: Add PACKAGECONFIG for dbus
aspell: Add PACKAGECONFIG for curses
xf86-input-synaptics: Add dependency on libxtst
xdpyinfo: Add dependency on libxcomposite
matchbox-wm: Add dependency on libxfixes and libxcursor
telepathy-mission-control: Add PACKAGECONFIG for upower and

Quoted 8 lines

connectivity
tcl: Add dependency on zlib
wget: Add dependency on libpcre
x11vnc: Add PACKAGECONFIG for xinerama
glib-networking: Add PACKAGECONFIG for p11-kit
lame: Add dependency on ncurses
subversion: Add dependency on file for libmagic
systemd: Add PACKAGECONFIG for cryptsetup

All looks good to me. Worth noting that the telepathy-mission-control changes will need changing when 5.15.1 onwards is integrated, and it's clear that matchbox-wm needs to share a .inc file.

Signed-off-by Ross Burton <[email protected]>

Ross

Martin Jansa

author

2013-10-07 13:16 UTC #16 lore raw

Quoted 18 lines · Ross

Quoted 8 lines · Martin Jansa
Martin Jansa (14):
gstreamer1.0-libav: Add PACKAGECONFIG for orc
libunique: Add PACKAGECONFIG for dbus
aspell: Add PACKAGECONFIG for curses
xf86-input-synaptics: Add dependency on libxtst
xdpyinfo: Add dependency on libxcomposite
matchbox-wm: Add dependency on libxfixes and libxcursor
telepathy-mission-control: Add PACKAGECONFIG for upower and
Quoted 8 lines
connectivity
tcl: Add dependency on zlib
wget: Add dependency on libpcre
x11vnc: Add PACKAGECONFIG for xinerama
glib-networking: Add PACKAGECONFIG for p11-kit
lame: Add dependency on ncurses
subversion: Add dependency on file for libmagic
systemd: Add PACKAGECONFIG for cryptsetup

Quoted 3 lines

All looks good to me. Worth noting that the telepathy-mission-control changes will need changing when 5.15.1 onwards is integrated, and it's clear that matchbox-wm needs to share a .inc file.

matchbox-wm and telepathy-mission-control weren't merged, should I send v3 for them?

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Richard Purdie

2013-10-07 20:57 UTC #17 lore raw

Quoted 19 lines · Martin Jansa

Quoted 18 lines · Ross
Quoted 16 lines · Martin Jansa
Martin Jansa (14):
gstreamer1.0-libav: Add PACKAGECONFIG for orc
libunique: Add PACKAGECONFIG for dbus
aspell: Add PACKAGECONFIG for curses
xf86-input-synaptics: Add dependency on libxtst
xdpyinfo: Add dependency on libxcomposite
matchbox-wm: Add dependency on libxfixes and libxcursor
telepathy-mission-control: Add PACKAGECONFIG for upower and
connectivity
tcl: Add dependency on zlib
wget: Add dependency on libpcre
x11vnc: Add PACKAGECONFIG for xinerama
glib-networking: Add PACKAGECONFIG for p11-kit
lame: Add dependency on ncurses
subversion: Add dependency on file for libmagic
systemd: Add PACKAGECONFIG for cryptsetup

Quoted 6 lines

Quoted 3 lines
All looks good to me. Worth noting that the telepathy-mission-control changes will need changing when 5.15.1 onwards is integrated, and it's clear that matchbox-wm needs to share a .inc file.
matchbox-wm and telepathy-mission-control weren't merged, should I send v3 for them?

The others seemed obvious so I took them into the 1.5 release. Those two were not as obvious so they didn't make the release. I haven't got around to worrying about 1.6 patches yet...

Cheers,

Richard