* [PATCH 1/2] connman: upgrade to 1.31
@ 2016-01-12 16:20 Maxin B. John
2016-01-12 16:20 ` [PATCH 2/2] sqlite3: upgrade to version 3.10.0 Maxin B. John
0 siblings, 1 reply; 4+ messages in thread
From: Maxin B. John @ 2016-01-12 16:20 UTC (permalink / raw)
To: openembedded-core
1.30 -> 1.31
Included newly introduced connman-wait-online service.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 14 +++++++++++---
.../connman/{connman_1.30.bb => connman_1.31.bb} | 4 ++--
2 files changed, 13 insertions(+), 5 deletions(-)
rename meta/recipes-connectivity/connman/{connman_1.30.bb => connman_1.31.bb} (77%)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 76e61b4..856ba44 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -43,7 +43,7 @@ PACKAGECONFIG ??= "wispr \
# local.conf or distro config
# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
-PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
+PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''"
PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant"
PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}"
PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
@@ -68,6 +68,7 @@ python __anonymous () {
SYSTEMD_SERVICE_${PN} = "connman.service"
SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
+SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service"
SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup"
do_compile_append() {
@@ -156,11 +157,12 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
${libdir}/connman/plugins \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
- ${datadir}/dbus-1/system-services/*"
+ ${datadir}/dbus-1/system-services/* \
+ ${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
FILES_${PN}-dev += "${libdir}/connman/*/*.la"
-PACKAGES =+ "${PN}-vpn"
+PACKAGES =+ "${PN}-vpn ${PN}-wait-online"
SUMMARY_${PN}-vpn = "A daemon for managing VPN connections within embedded devices"
DESCRIPTION_${PN}-vpn = "The ConnMan VPN provides a daemon for \
@@ -174,6 +176,12 @@ FILES_${PN}-vpn += "${sbindir}/connman-vpnd \
${datadir}/dbus-1/system-services/net.connman.vpn.service \
${systemd_unitdir}/system/connman-vpn.service"
+SUMMARY_${PN}-wait-online = "A program that will return once ConnMan has connected to a network"
+DESCRIPTION_${PN}-wait-online = "A service that can be enabled so that \
+the system waits until a network connection is established."
+FILES_${PN}-wait-online += "${sbindir}/connmand-wait-online \
+ ${systemd_unitdir}/system/connman-wait-online.service"
+
SUMMARY_${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN"
DESCRIPTION_${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses openvpn client \
to create a VPN connection to OpenVPN server."
diff --git a/meta/recipes-connectivity/connman/connman_1.30.bb b/meta/recipes-connectivity/connman/connman_1.31.bb
similarity index 77%
rename from meta/recipes-connectivity/connman/connman_1.30.bb
rename to meta/recipes-connectivity/connman/connman_1.31.bb
index 7d65ac9..7b6bcfb 100644
--- a/meta/recipes-connectivity/connman/connman_1.30.bb
+++ b/meta/recipes-connectivity/connman/connman_1.31.bb
@@ -7,8 +7,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://0003-Fix-header-inclusions-for-musl.patch \
file://connman \
"
-SRC_URI[md5sum] = "4a3efdbd6796922db9c6f66da57887fa"
-SRC_URI[sha256sum] = "5c5e464bacc9c27ed4e7269fb9b5059f07947f5be26433b59212133663ffa991"
+SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c"
+SRC_URI[sha256sum] = "88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2"
RRECOMMENDS_${PN} = "connman-conf"
--
2.4.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] sqlite3: upgrade to version 3.10.0
2016-01-12 16:20 [PATCH 1/2] connman: upgrade to 1.31 Maxin B. John
@ 2016-01-12 16:20 ` Maxin B. John
2016-01-12 18:44 ` Burton, Ross
0 siblings, 1 reply; 4+ messages in thread
From: Maxin B. John @ 2016-01-12 16:20 UTC (permalink / raw)
To: openembedded-core
3.9.2 -> 3.10.0
Fixed a parallel build problem.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-support/sqlite/sqlite3/parallel.patch | 24 ++++++++++++++++++++++
.../sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} | 8 +++++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-support/sqlite/sqlite3/parallel.patch
rename meta/recipes-support/sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} (71%)
diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch
new file mode 100644
index 0000000..87471f0
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch
@@ -0,0 +1,24 @@
+build: Fix parallel build problems
+
+Avoid parallel build errors related to sqlite3.o target.
+
+Upstream-Status: Pending
+
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am
+--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200
++++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200
+@@ -6,10 +6,8 @@
+ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+
+ bin_PROGRAMS = sqlite3
+-sqlite3_SOURCES = shell.c sqlite3.h
+-EXTRA_sqlite3_SOURCES = sqlite3.c
+-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
+-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
++sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
++sqlite3_LDADD = @READLINE_LIBS@
+ sqlite3_CFLAGS = $(AM_CFLAGS)
+
+ include_HEADERS = sqlite3.h sqlite3ext.h
diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb
similarity index 71%
rename from meta/recipes-support/sqlite/sqlite3_3.9.2.bb
rename to meta/recipes-support/sqlite/sqlite3_3.10.0.bb
index 18b1a2b..092f782 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb
@@ -10,10 +10,12 @@ def sqlite_download_version(d):
PE = "3"
SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz"
+SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ file://parallel.patch \
+ "
-SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca"
-SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b"
+SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26"
+SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042"
UPSTREAM_CHECK_URI = "http://www.sqlite.org/"
UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html"
--
2.4.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] sqlite3: upgrade to version 3.10.0
2016-01-12 16:20 ` [PATCH 2/2] sqlite3: upgrade to version 3.10.0 Maxin B. John
@ 2016-01-12 18:44 ` Burton, Ross
2016-01-13 10:24 ` Maxin B. John
0 siblings, 1 reply; 4+ messages in thread
From: Burton, Ross @ 2016-01-12 18:44 UTC (permalink / raw)
To: Maxin B. John; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
On 12 January 2016 at 16:20, Maxin B. John <maxin.john@intel.com> wrote:
> 3.9.2 -> 3.10.0
>
> Fixed a parallel build problem.
>
buildhistory-diff reports:
packages/corei7-64-poky-linux/sqlite3/sqlite3-dbg: RRECOMMENDS: removed
"readline-dbg"
packages/corei7-64-poky-linux/sqlite3/sqlite3: RDEPENDS: removed all items
"readline (['>= 6.3'])"
Which indicates that sqlite3 has a non-deterministic and autodetected
dependency on readline. Can you add a PACKAGECONFIG or similar for this
please?
Ross
[-- Attachment #2: Type: text/html, Size: 1203 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] sqlite3: upgrade to version 3.10.0
2016-01-12 18:44 ` Burton, Ross
@ 2016-01-13 10:24 ` Maxin B. John
0 siblings, 0 replies; 4+ messages in thread
From: Maxin B. John @ 2016-01-13 10:24 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
Hi Ross,
On Tue, Jan 12, 2016 at 06:44:35PM +0000, Burton, Ross wrote:
>>On 12 January 2016 at 16:20, Maxin B. John <maxin.john@intel.com> wrote:
>>
>> 3.9.2 -> 3.10.0
>>
>> Fixed a parallel build problem.
>>
>
> buildhistory-diff reports:
>
> packages/corei7-64-poky-linux/sqlite3/sqlite3-dbg: RRECOMMENDS: removed "readline-dbg"
> packages/corei7-64-poky-linux/sqlite3/sqlite3: RDEPENDS: removed all items "readline (['>= 6.3'])"
>
> Which indicates that sqlite3 has a non-deterministic and autodetected dependency on readline. Can you add a PACKAGECONFIG or similar for this please?
Sure. Thanks for noticing it. I will send v2 with PACKAGECONFIG for readline.
> Ross
Thanks and Regards,
Maxin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-13 10:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-12 16:20 [PATCH 1/2] connman: upgrade to 1.31 Maxin B. John
2016-01-12 16:20 ` [PATCH 2/2] sqlite3: upgrade to version 3.10.0 Maxin B. John
2016-01-12 18:44 ` Burton, Ross
2016-01-13 10:24 ` Maxin B. John
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.