[OE-core] [PATCH] libinput: fix building with debug-gui option
From: Marc Ferland When building libinput with the 'gui' PACKAGECONFIG option, it fails with: | Run-time dependency x11 found: YES 1.8.9 | Run-time dependency wayland-client found: YES 1.22.0 | Run-time dependency wayland-protocols found: YES 1.34 | Program wayland-scanner found: NO | | ../git/meson.build:578:20: ERROR: Program 'wayland-scanner' not found or not executable | | A full log can be found at /home/marc/mnt/yocto-latest/build/tmp/work/core2-64-poky-linux/libinput/1.25.0/build/meson-logs/meson-log.txt | ERROR: meson failed | WARNING: exit code 1 from a shell command. Adding a build dependency on wayland-native fixes the issue. Signed-off-by: Marc Ferland --- meta/recipes-graphics/wayland/libinput_1.25.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/libinput_1.25.0.bb b/meta/recipes-graphics/wayland/libinput_1.25.0.bb index 517b247fed..894858e361 100644 --- a/meta/recipes-graphics/wayland/libinput_1.25.0.bb +++ b/meta/recipes-graphics/wayland/libinput_1.25.0.bb @@ -32,7 +32,7 @@ do_configure:append() { PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" +PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3 wayland-native" PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" UDEVDIR = "`pkg-config --variable=udevdir udev`" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198588): https://lists.openembedded.org/g/openembedded-core/message/198588 Mute This Topic: https://lists.openembedded.org/mt/105670153/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] connman: fix warning by specifying runstatedir at configure time
From: Marc Ferland Without this patch, systemd complains on startup with messages similar to: systemd-tmpfiles[128]: /etc/tmpfiles.d/connman_resolvconf.conf:1: Line references path below legacy directory /var/run/, updating /var/run/connman → /run/connman; please update the tmpfiles.d/ drop-in file accordingly. systemd-tmpfiles[172]: /etc/tmpfiles.d/connman_resolvconf.conf:1: Line references path below legacy directory /var/run/, updating /var/run/connman → /run/connman; please update the tmpfiles.d/ drop-in file accordingly. By default, connman will use "/var/run/connman" for runstatedir instead of the now recommended "/run/connman". Signed-off-by: Marc Ferland --- meta/recipes-connectivity/connman/connman.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index d7af94f792..7487ca0d0c 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -27,6 +27,7 @@ EXTRA_OECONF += "\ --enable-ethernet \ --enable-tools \ --disable-polkit \ +--runstatedir=/run \ " # For smooth operation it would be best to start only one wireless daemon at a time. # If wpa-supplicant is running, connman will use it preferentially. -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181942): https://lists.openembedded.org/g/openembedded-core/message/181942 Mute This Topic: https://lists.openembedded.org/mt/99226643/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Python3 and HTTPS issue
On Fri, Oct 5, 2018 at 5:22 PM Burton, Ross wrote: > > Did you install ca-certificates? > Looks like it did the trick, thanks. Just wondering: why isn't ca-certificates not RRECOMMENDed by openssl or maybe python3? Marc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Python3 and HTTPS issue
Hi everyone, I'm currently having a strange issue with python3 and https (using sumo branch, commit 161eaa28ed16f93d57f3d1c4be84f894e99ab72e). Whenever I try to connect to an https server I get: ssl.SSLError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:719) The following python script reproduces the issue: >>> import http.client >>> conn = http.client.HTTPSConnection('www.python.org') >>> conn.request('GET', '/') Any idea? python3-certifi is correctly installed. Marc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bluez5: Upgrade 5.46 -> 5.47
This release includes: - SDP fix for CVE-2017-1000250. - New bluetooth mesh profile. - Various fixes to GATT, A2DP and BR/EDR vs LE bearer handling. This commit also drops the following two patches which are included in 5.47: - 0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch - cve-2017-1000250.patch Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc| 3 +- ...cm43xx-fix-the-delay-timer-for-firmware-d.patch | 36 -- .../bluez5/bluez5/cve-2017-1000250.patch | 34 .../bluez5/{bluez5_5.46.bb => bluez5_5.47.bb} | 4 +-- 4 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch rename meta/recipes-connectivity/bluez5/{bluez5_5.46.bb => bluez5_5.47.bb} (91%) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 2ae4553d48..3a8d3476ea 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -41,6 +41,7 @@ PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis" PACKAGECONFIG[tools] = "--enable-tools,--disable-tools" PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated" +PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -49,8 +50,6 @@ SRC_URI = "\ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ -file://0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch \ -file://cve-2017-1000250.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch deleted file mode 100644 index 46794381f7..00 --- a/meta/recipes-connectivity/bluez5/bluez5/0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3b341fb421ef61db7782bf1314ec693828467de9 Mon Sep 17 00:00:00 2001 -From: Andy Duan <fugang.d...@nxp.com> -Date: Wed, 23 Nov 2016 17:12:12 +0800 -Subject: [PATCH] hciattach: bcm43xx: fix the delay timer for firmware download - -From the log in .bcm43xx_load_firmware(): -/* Wait 50ms to let the firmware placed in download mode */ -nanosleep(_mode, NULL); - -But timespec tm_mode is real is 50us. Correct the delayed timer count. - -Upstream-Status: Accepted [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=76255f732d68aef2b90d36d9c7be51a9e1739ce7] - -Signed-off-by: Fugang Duan <fugang.d...@nxp.com> - tools/hciattach_bcm43xx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c -index 81f38cb..ac1b3c1 100644 a/tools/hciattach_bcm43xx.c -+++ b/tools/hciattach_bcm43xx.c -@@ -228,8 +228,8 @@ static int bcm43xx_set_speed(int fd, struct termios *ti, uint32_t speed) - static int bcm43xx_load_firmware(int fd, const char *fw) - { - unsigned char cmd[] = { HCI_COMMAND_PKT, 0x2e, 0xfc, 0x00 }; -- struct timespec tm_mode = { 0, 5 }; -- struct timespec tm_ready = { 0, 200 }; -+ struct timespec tm_mode = { 0, 5000 }; -+ struct timespec tm_ready = { 0, 2 }; - unsigned char resp[CC_MIN_SIZE]; - unsigned char tx_buf[1024]; - int len, fd_fw, n; --- -1.9.1 - diff --git a/meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch b/meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch deleted file mode 100644 index 9fac961bcf..00 --- a/meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch +++ /dev/null @@ -1,34 +0,0 @@ -All versions of the SDP server in BlueZ 5.46 and earlier are vulnerable to an -information disclosure vulnerability which allows remote attackers to obtain -sensitive information from the bluetoothd process memory. This vulnerability -lies in the processing of SDP search attribute requests. - -CVE: CVE-2017-1000250 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.bur...@intel.com> - -From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.de...@intel.com> -Date: Wed, 13 Sep 2017 10:01:40 +0300 -Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function -
Re: [OE-core] [PATCH 4/6] bluez5: upgrade to 5.46
On Wed, Jul 19, 2017 at 11:01 AM, Maxin B. Johnwrote: > 5.45 -> 5.46 > > Signed-off-by: Maxin B. John > --- > meta/recipes-connectivity/bluez5/{bluez5_5.45.bb => bluez5_5.46.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-connectivity/bluez5/{bluez5_5.45.bb => bluez5_5.46.bb} > (91%) > > diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.45.bb > b/meta/recipes-connectivity/bluez5/bluez5_5.46.bb > similarity index 91% > rename from meta/recipes-connectivity/bluez5/bluez5_5.45.bb > rename to meta/recipes-connectivity/bluez5/bluez5_5.46.bb > index d5f516c..93f4be3 100644 > --- a/meta/recipes-connectivity/bluez5/bluez5_5.45.bb > +++ b/meta/recipes-connectivity/bluez5/bluez5_5.46.bb > @@ -2,8 +2,8 @@ require bluez5.inc > > REQUIRED_DISTRO_FEATURES = "bluez5" > > -SRC_URI[md5sum] = "20d936917afc7e1ffa091f5213081c55" > -SRC_URI[sha256sum] = > "4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa85364e9" > +SRC_URI[md5sum] = "913f35d6fa4ca5772c53adb936bf1947" > +SRC_URI[sha256sum] = > "ddab3d3837c1afb8ae228a94ba17709a4650bd4db24211b6771ab735c8908e28" > A new testing utility, advtest, has been added and should be installed along with the rest of the tools listed in NOINST_TOOLS_BT. See: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fedb7f6eaba7bc4ac879d1762ff267789c4db552 Marc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] bluez5: add more PACKAGECONFIG options
This patch adds missing PACKAGECONFIG options and allow for a more fine-grained build of bluez5. I took care of providing a default configuration that matches the previous default config. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 28 + meta/recipes-connectivity/bluez5/bluez5_5.45.bb | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 5fc49f3..f267c66 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -12,13 +12,35 @@ RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "obex-profiles \ +readline \ +${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +a2dp-profiles \ +avrcp-profiles \ +network-profiles \ +hid-profiles \ +hog-profiles \ +tools \ +deprecated \ +" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups" +PACKAGECONFIG[nfc] = "--enable-nfc,--disable-nfc" +PACKAGECONFIG[sap-profiles] = "--enable-sap,--disable-sap" +PACKAGECONFIG[a2dp-profiles] = "--enable-a2dp,--disable-a2dp" +PACKAGECONFIG[avrcp-profiles] = "--enable-avrcp,--disable-avrcp" +PACKAGECONFIG[network-profiles] = "--enable-network,--disable-network" +PACKAGECONFIG[hid-profiles] = "--enable-hid,--disable-hid" +PACKAGECONFIG[hog-profiles] = "--enable-hog,--disable-hog" +PACKAGECONFIG[health-profiles] = "--enable-health,--disable-health" +PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis" +PACKAGECONFIG[tools] = "--enable-tools,--disable-tools" +PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" +PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -33,8 +55,6 @@ S = "${WORKDIR}/bluez-${PV}" inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ - --enable-tools \ - --enable-deprecated \ --enable-test \ --enable-datafiles \ --enable-library \ @@ -48,7 +68,7 @@ NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ -${NOINST_TOOLS_BT} \ +${@bb.utils.contains('PACKAGECONFIG', 'tools', '${NOINST_TOOLS_BT}', '', d)} \ " do_install_append() { diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.45.bb b/meta/recipes-connectivity/bluez5/bluez5_5.45.bb index ee5e88f..d5f516c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.45.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.45.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa8 # noinst programs in Makefile.tools that are conditional on READLINE # support NOINST_TOOLS_READLINE ?= " \ -attrib/gatttool \ +${@bb.utils.contains('PACKAGECONFIG', 'deprecated', 'attrib/gatttool', '', d)} \ tools/obex-client-tool \ tools/obex-server-tool \ tools/bluetooth-player \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] bluez5: remove libusb dependency
Not a dependency since version 5.9. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 01ade7d..5fc49f3 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -6,7 +6,7 @@ LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" -DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck" +DEPENDS = "udev dbus-glib glib-2.0 libcheck" PROVIDES += "bluez-hcidump" RPROVIDES_${PN} += "bluez-hcidump" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] pciutils: upgrade 3.5.2 -> 3.5.4
On Fri, May 12, 2017 at 2:00 PM, Denys Dmytriyenkowrote: > Can this be generated as a diff between versions? You may need to use "git > mv" > and/or pass -M to "git format-patch"... > oops, I did forgot to specify -M, v2 coming up... -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 2/2] nasm: upgrade 2.12.02 -> 2.13.01
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-devtools/nasm/{nasm_2.12.02.bb => nasm_2.13.01.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/nasm/{nasm_2.12.02.bb => nasm_2.13.01.bb} (77%) diff --git a/meta/recipes-devtools/nasm/nasm_2.12.02.bb b/meta/recipes-devtools/nasm/nasm_2.13.01.bb similarity index 77% rename from meta/recipes-devtools/nasm/nasm_2.12.02.bb rename to meta/recipes-devtools/nasm/nasm_2.13.01.bb index 3280b84..b17bb53 100644 --- a/meta/recipes-devtools/nasm/nasm_2.12.02.bb +++ b/meta/recipes-devtools/nasm/nasm_2.13.01.bb @@ -3,10 +3,10 @@ SECTION = "devel" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" -SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 " +SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.xz; -SRC_URI[md5sum] = "d15843c3fb7db39af80571ee27ec6fad" -SRC_URI[sha256sum] = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324" +SRC_URI[md5sum] = "b3ae134bd1b5ead73d659286f568da95" +SRC_URI[sha256sum] = "aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9a5e" inherit autotools-brokensep -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 1/2] pciutils: upgrade 3.5.2 -> 3.5.4
Upgrade to 3.5.4 and fix libkmod detection (was missing pkgconfig bbclass). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- .../pciutils/{pciutils_3.5.2.bb => pciutils_3.5.4.bb} | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.5.2.bb => pciutils_3.5.4.bb} (86%) diff --git a/meta/recipes-bsp/pciutils/pciutils_3.5.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb similarity index 86% rename from meta/recipes-bsp/pciutils/pciutils_3.5.2.bb rename to meta/recipes-bsp/pciutils/pciutils_3.5.4.bb index 9a7297e..0faa501 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.5.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb @@ -1,6 +1,6 @@ SUMMARY = "PCI utilities" -DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ -to PCI bus configuration space and several utilities based on this library.' +DESCRIPTION = "The PCI Utilities package contains a library for portable access \ +to PCI bus configuration space and several utilities based on this library." HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml; SECTION = "console/utils" @@ -13,10 +13,10 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://guess-fix.patch \ file://makefile.patch" -SRC_URI[md5sum] = "1bf5b068bd9f7512e8c68b060b25a1b2" -SRC_URI[sha256sum] = "3a99141a9f40528d0a0035665a06dc37ddb1ae341658e51b50a76ecf86235efc" +SRC_URI[md5sum] = "e82537cd2194111c45fa7e684b52252e" +SRC_URI[sha256sum] = "64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe66" -inherit multilib_header +inherit multilib_header pkgconfig PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] nasm: upgrade 2.12.02 -> 2.13.01
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-devtools/nasm/nasm_2.12.02.bb | 28 meta/recipes-devtools/nasm/nasm_2.13.01.bb | 28 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-devtools/nasm/nasm_2.12.02.bb create mode 100644 meta/recipes-devtools/nasm/nasm_2.13.01.bb diff --git a/meta/recipes-devtools/nasm/nasm_2.12.02.bb b/meta/recipes-devtools/nasm/nasm_2.12.02.bb deleted file mode 100644 index 3280b84..000 --- a/meta/recipes-devtools/nasm/nasm_2.12.02.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "General-purpose x86 assembler" -SECTION = "devel" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" - -SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 " - -SRC_URI[md5sum] = "d15843c3fb7db39af80571ee27ec6fad" -SRC_URI[sha256sum] = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324" - -inherit autotools-brokensep - -do_configure_prepend () { - if [ -f ${S}/aclocal.m4 ] && [ ! -f ${S}/acinclude.m4 ]; then - mv ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${mandir}/man1 - - oe_runmake 'INSTALLROOT=${D}' install -} - -BBCLASSEXTEND = "native" - -DEPENDS = "groff-native" diff --git a/meta/recipes-devtools/nasm/nasm_2.13.01.bb b/meta/recipes-devtools/nasm/nasm_2.13.01.bb new file mode 100644 index 000..b17bb53 --- /dev/null +++ b/meta/recipes-devtools/nasm/nasm_2.13.01.bb @@ -0,0 +1,28 @@ +SUMMARY = "General-purpose x86 assembler" +SECTION = "devel" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=90904486f8fbf1861cf42752e1a39efe" + +SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.xz; + +SRC_URI[md5sum] = "b3ae134bd1b5ead73d659286f568da95" +SRC_URI[sha256sum] = "aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9a5e" + +inherit autotools-brokensep + +do_configure_prepend () { + if [ -f ${S}/aclocal.m4 ] && [ ! -f ${S}/acinclude.m4 ]; then + mv ${S}/aclocal.m4 ${S}/acinclude.m4 + fi +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir}/man1 + + oe_runmake 'INSTALLROOT=${D}' install +} + +BBCLASSEXTEND = "native" + +DEPENDS = "groff-native" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] pciutils: upgrade 3.5.2 -> 3.5.4
Upgrade to 3.5.4 and fix libkmod detection (was missing pkgconfig bbclass). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-bsp/pciutils/pciutils_3.5.2.bb | 60 - meta/recipes-bsp/pciutils/pciutils_3.5.4.bb | 60 + 2 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-bsp/pciutils/pciutils_3.5.2.bb create mode 100644 meta/recipes-bsp/pciutils/pciutils_3.5.4.bb diff --git a/meta/recipes-bsp/pciutils/pciutils_3.5.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.2.bb deleted file mode 100644 index 9a7297e..000 --- a/meta/recipes-bsp/pciutils/pciutils_3.5.2.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "PCI utilities" -DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ -to PCI bus configuration space and several utilities based on this library.' -HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml; -SECTION = "console/utils" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "zlib kmod" - -SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ - file://configure.patch \ - file://guess-fix.patch \ - file://makefile.patch" - -SRC_URI[md5sum] = "1bf5b068bd9f7512e8c68b060b25a1b2" -SRC_URI[sha256sum] = "3a99141a9f40528d0a0035665a06dc37ddb1ae341658e51b50a76ecf86235efc" - -inherit multilib_header - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" -PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" - -PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" - -# see configure.patch -do_configure () { - ( - cd lib && \ - # PACKAGECONFIG_CONFARGS for this recipe could only possibly contain 'HWDB=yes/no', - # so we put it before ./configure - ${PCI_CONF_FLAG} ${PACKAGECONFIG_CONFARGS} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} - ) -} - -export PREFIX = "${prefix}" -export SBINDIR = "${sbindir}" -export SHAREDIR = "${datadir}" -export MANDIR = "${mandir}" - -EXTRA_OEMAKE = "-e MAKEFLAGS= ${PCI_CONF_FLAG}" - -# The configure script breaks if the HOST variable is set -HOST[unexport] = "1" - -do_install () { - oe_runmake DESTDIR=${D} install install-lib - - install -d ${D}${bindir} - ln -s ../sbin/lspci ${D}${bindir}/lspci - - oe_multilib_header pci/config.h -} - -PACKAGES =+ "${PN}-ids libpci" -FILES_${PN}-ids = "${datadir}/pci.ids*" -FILES_libpci = "${libdir}/libpci.so.*" -SUMMARY_${PN}-ids = "PCI utilities - device ID database" -DESCRIPTION_${PN}-ids = "Package providing the PCI device ID database for pciutils." -RDEPENDS_${PN} += "${PN}-ids" diff --git a/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb new file mode 100644 index 000..0faa501 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils_3.5.4.bb @@ -0,0 +1,60 @@ +SUMMARY = "PCI utilities" +DESCRIPTION = "The PCI Utilities package contains a library for portable access \ +to PCI bus configuration space and several utilities based on this library." +HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml; +SECTION = "console/utils" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "zlib kmod" + +SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ + file://configure.patch \ + file://guess-fix.patch \ + file://makefile.patch" + +SRC_URI[md5sum] = "e82537cd2194111c45fa7e684b52252e" +SRC_URI[sha256sum] = "64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe66" + +inherit multilib_header pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" +PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" + +PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" + +# see configure.patch +do_configure () { + ( + cd lib && \ + # PACKAGECONFIG_CONFARGS for this recipe could only possibly contain 'HWDB=yes/no', + # so we put it before ./configure + ${PCI_CONF_FLAG} ${PACKAGECONFIG_CONFARGS} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} + ) +} + +export PREFIX = "${prefix}" +export SBINDIR = "${sbindir}" +export SHAREDIR = "${datadir}" +export MANDIR = "${mandir}" + +EXTRA_OEMAKE = "-e MAKEFLAGS= ${PCI_CONF_FLAG}" + +# The configure script breaks if the HOST variable is set +HOST[unexport] = "1" + +do_install () { +
Re: [OE-core] [PATCH] speex: upgrade 1.2rc2 -> 1.2.0
On Fri, Apr 28, 2017 at 12:30 PM, Burton, Rosswrote: > > On 28 April 2017 at 14:58, Burton, Ross wrote: > >> dpkg thinks that 1.2rc2 is less than 1.2.0, I suspect the RRS doesn't use >> the same algorithm. Not sure what opkg and dpkg think of it. >> > > I meant opkg and rpm, obviously. > > Good news is that RPM says 1.2rc2 < 1.2.0 too. > Looks good with opkg: $ opkg compare-versions '1.2rc2' '<<' '1.2.0'; echo $? 0 Tested with opkg HEAD revision. I also tested with 0.3.0 but it seems the 'compare-versions' command was broken... Marc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] speex: upgrade 1.2rc2 -> 1.2.0
Upgrade speex to 1.2.0. Very small diff between 1.2rc2 and 1.2.0, mostly compiler warning fixes, tabs vs spaces, trailing whitespaces and one liners. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-multimedia/speex/speex_1.2.0.bb | 19 +++ meta/recipes-multimedia/speex/speex_1.2rc2.bb | 19 --- 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-multimedia/speex/speex_1.2.0.bb delete mode 100644 meta/recipes-multimedia/speex/speex_1.2rc2.bb diff --git a/meta/recipes-multimedia/speex/speex_1.2.0.bb b/meta/recipes-multimedia/speex/speex_1.2.0.bb new file mode 100644 index 000..fc020a2 --- /dev/null +++ b/meta/recipes-multimedia/speex/speex_1.2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Speech Audio Codec" +DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech." +HOMEPAGE = "http://www.speex.org; +SECTION = "libs" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \ + file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50" +DEPENDS = "libogg speexdsp" + +SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz; + +SRC_URI[md5sum] = "8ab7bb2589110dfaf0ed7fa7757dc49c" +SRC_URI[sha256sum] = "eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "\ +${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api --disable-vbr', '', d)} \ +" diff --git a/meta/recipes-multimedia/speex/speex_1.2rc2.bb b/meta/recipes-multimedia/speex/speex_1.2rc2.bb deleted file mode 100644 index f7d23db..000 --- a/meta/recipes-multimedia/speex/speex_1.2rc2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Speech Audio Codec" -DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech." -HOMEPAGE = "http://www.speex.org; -SECTION = "libs" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \ - file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50" -DEPENDS = "libogg speexdsp" - -SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz; - -SRC_URI[md5sum] = "6ae7db3bab01e1d4b86bacfa8ca33e81" -SRC_URI[sha256sum] = "caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891" - -inherit autotools pkgconfig lib_package - -EXTRA_OECONF = "\ -${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point --disable-float-api --disable-vbr', '', d)} \ -" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd
On Tue, Apr 25, 2017 at 11:13 AM, Martin Jansa <martin.ja...@gmail.com> wrote: > > On Tue, Apr 25, 2017 at 10:48:37AM -0400, Marc Ferland wrote: > > Signed-off-by: Marc Ferland <ferla...@amotus.ca> > > --- > > meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc > > index 687656e..71a5016 100644 > > --- a/meta/recipes-connectivity/bluez5/bluez5.inc > > +++ b/meta/recipes-connectivity/bluez5/bluez5.inc > > @@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump" > > > > RCONFLICTS_${PN} = "bluez4" > > > > -PACKAGECONFIG ??= "obex-profiles readline" > > +PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" > > PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" > > PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," > > PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" > > PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" > > +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" > > > > SRC_URI = "\ > > ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ > > @@ -36,7 +37,6 @@ EXTRA_OECONF = "\ > >--disable-cups \ > >--enable-test \ > >--enable-datafiles \ > > - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \ > > Why not use just the options from PACKAGECONFIG? > > >--enable-library \ > > " enable-library builds and installs the libbluetooth library along with the header files. I guess it's something pretty much everyone wants/expects, a sane default, probably also why it was "hard-coded" in EXTRA_OECONF. There are many other build options in bluez5 which aren't exposed as PACKAGECONFIG options. The majority of them being for more finer grained stuff (the current options are mostly for obvious external dependencies). I'll take a look at it and come up with a separate patch if that's okay. Marc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 7/7] bluez5: cleanup tabs and spaces
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 30 ++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 47d8f22..01ade7d 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -57,24 +57,24 @@ do_install_append() { install -d ${D}${sysconfdir}/bluetooth/ if [ -f ${S}/profiles/network/network.conf ]; then - install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ fi if [ -f ${S}/profiles/input/input.conf ]; then - install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ fi - if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then -sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth - fi + if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth + fi # Install desired tools that upstream leaves in build area -for f in ${NOINST_TOOLS} ; do - install -m 755 ${B}/$f ${D}/${bindir} + for f in ${NOINST_TOOLS} ; do + install -m 755 ${B}/$f ${D}/${bindir} done -# Patch python tools to use Python 3; they should be source compatible, but -# still refer to Python 2 in the shebang -sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* + # Patch python tools to use Python 3; they should be source compatible, but + # still refer to Python 2 in the shebang + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" @@ -84,8 +84,8 @@ FILES_${PN} += " \ ${systemd_unitdir}/ ${datadir}/dbus-1 \ ${libdir}/cups \ " -FILES_${PN}-dev += "\ - ${libdir}/bluetooth/plugins/*.la \ +FILES_${PN}-dev += " \ +${libdir}/bluetooth/plugins/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ @@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth" EXCLUDE_FROM_WORLD = "1" do_compile_ptest() { -oe_runmake buildtests + oe_runmake buildtests } do_install_ptest() { -cp -r ${B}/unit/ ${D}${PTEST_PATH} -rm -f ${D}${PTEST_PATH}/unit/*.o + cp -r ${B}/unit/ ${D}${PTEST_PATH} + rm -f ${D}${PTEST_PATH}/unit/*.o } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 5/7] bluez5: add PACKAGECONFIG option for cups
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 71a5016..c8a240f 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -18,6 +18,7 @@ PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -34,7 +35,6 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ --enable-deprecated \ - --disable-cups \ --enable-test \ --enable-datafiles \ --enable-library \ @@ -82,7 +82,11 @@ do_install_append() { PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES_${PN} += " \ +${libdir}/bluetooth/plugins/*.so \ +${systemd_unitdir}/ ${datadir}/dbus-1 \ +${libdir}/cups \ +" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 6/7] bluez5: do not install audio.conf
The audio.conf file has been removed, stop installing it. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index c8a240f..47d8f22 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -56,9 +56,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth install -d ${D}${sysconfdir}/bluetooth/ - if [ -f ${S}/profiles/audio/audio.conf ]; then - install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ - fi if [ -f ${S}/profiles/network/network.conf ]; then install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ fi -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 0/7] bluez: upgrade and refactoring
V4: * dropped the "rename readline 'config' option to 'client'" changes (reported by Ross Burton) * make references to libasound-module-bluez depend on bluez4 only (reported by Ross burton) V3: * shell functions use tabs not spaces (reported by Khem Raj) V2: * upgrades to version 5.44 * renames variables and configure options to better reflect bluez options * adds midi, cups and systemd as PACKAGECONFIG options * removes references from files that are no longer part of bluez * cleanups tabs/spaces usage V1: * https://patchwork.openembedded.org/patch/138995/ Regards, Marc Ferland (7): bluez5: Upgrade 5.43 -> 5.44 bluez5: remove libasound-module references bluez5: add PACKAGECONFIG option for midi bluez5: add PACKAGECONFIG option for systemd bluez5: add PACKAGECONFIG option for cups bluez5: do not install audio.conf bluez5: cleanup tabs and spaces meta/conf/distro/include/default-providers.inc | 1 - meta/recipes-connectivity/bluez5/bluez5.inc| 60 ++- meta/recipes-connectivity/bluez5/bluez5_5.43.bb| 55 - meta/recipes-connectivity/bluez5/bluez5_5.44.bb| 68 ++ .../packagegroups/packagegroup-base.bb | 2 +- 5 files changed, 100 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 3/7] bluez5: add PACKAGECONFIG option for midi
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 4244fc8..687656e 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -16,6 +16,7 @@ PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" +PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 687656e..71a5016 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "obex-profiles readline" +PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -36,7 +37,6 @@ EXTRA_OECONF = "\ --disable-cups \ --enable-test \ --enable-datafiles \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \ --enable-library \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 2/7] bluez5: remove libasound-module references
Cleanup references to libasound-module since this code has been completly removed from Bluez. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/conf/distro/include/default-providers.inc | 1 - meta/recipes-connectivity/bluez5/bluez5.inc | 5 + meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index ece4d8b..e1cb2f9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -46,7 +46,6 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" -PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 11cf8fb..4244fc8 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -79,14 +79,11 @@ do_install_append() { sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } -ALLOW_EMPTY_libasound-module-bluez = "1" -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ - ${libdir}/alsa-lib/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 0069e3e..f9e6e2e 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -204,7 +204,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" RDEPENDS_packagegroup-base-bluetooth = "\ ${BLUEZ} \ -${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ +${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \ " RRECOMMENDS_packagegroup-base-bluetooth = "\ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 1/7] bluez5: Upgrade 5.43 -> 5.44
New feautures/fixes in this version: * fixes to BLE * a new midi plugin * support for single-mode controllers w/o public address * most of the experimental tools have been promoted and are now part of the official tools * 'experimental' has been renamed to 'testing' (hence the addition of the 'testing' package config option) * classic command line tools like hciattach and hciconfig are now enabled by the "--enable-deprecated" configure option (enabled by default for backward compatibility). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 9 ++-- meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 + 3 files changed, 74 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index ed75db2..11cf8fb 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4" PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ + --enable-deprecated \ --disable-cups \ --enable-test \ --enable-datafiles \ @@ -41,10 +42,12 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" -NOINST_TOOLS_EXPERIMENTAL ??= "" +NOINST_TOOLS_TESTING ??= "" +NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ -${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ +${NOINST_TOOLS_BT} \ " do_install_append() { diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.43.bb deleted file mode 100644 index e10b82d..000 --- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb +++ /dev/null @@ -1,55 +0,0 @@ -require bluez5.inc - -REQUIRED_DISTRO_FEATURES = "bluez5" - -SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350" -SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15" - -# noinst programs in Makefile.tools that are conditional on READLINE -# support -NOINST_TOOLS_READLINE ?= " \ -attrib/gatttool \ -tools/obex-client-tool \ -tools/obex-server-tool \ -tools/bluetooth-player \ -tools/obexctl \ -tools/btmgmt \ -" - -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL -# support -NOINST_TOOLS_EXPERIMENTAL ?= " \ -emulator/btvirt \ -emulator/b1ee \ -emulator/hfp \ -tools/3dsp \ -tools/mgmt-tester \ -tools/gap-tester \ -tools/l2cap-tester \ -tools/sco-tester \ -tools/smp-tester \ -tools/hci-tester \ -tools/rfcomm-tester \ -tools/bdaddr \ -tools/avinfo \ -tools/avtest \ -tools/scotest \ -tools/amptest \ -tools/hwdb \ -tools/hcieventmask \ -tools/hcisecfilter \ -tools/btinfo \ -tools/btattach \ -tools/btsnoop \ -tools/btproxy \ -tools/btiotest \ -tools/mcaptest \ -tools/cltest \ -tools/oobtest \ -tools/seq2bseq \ -tools/ibeacon \ -tools/btgatt-client \ -tools/btgatt-server \ -tools/gatt-service \ -profiles/iap/iapd \ -" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb new file mode 100644 index 000..1095f88 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb @@ -0,0 +1,68 @@ +require bluez5.inc + +REQUIRED_DISTRO_FEATURES = "bluez5" + +SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" +SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" + +# noinst programs in Makefile.tools that are conditional on READLINE +# support +NOINST_TOOLS_READLINE ?= " \ +attrib/gatttool \ +tools/obex-client-tool \ +tools/obex-server-tool \
Re: [OE-core] [PATCHv3 2/8] bluez5: remove libasound-module references
Noted. Thanks for the input. Marc On Fri, Apr 21, 2017 at 11:33 AM, Burton, Ross <ross.bur...@intel.com> wrote: > > On 18 April 2017 at 14:20, Marc Ferland <ferla...@amotus.ca> wrote: > >> -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex >> ${PN}-noinst-tools" >> +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" >> > > packagegroup-base still refers to this package though: > > - nothing provides libasound-module-bluez needed by > packagegroup-base-bluetooth-1.0-r83.0.qemux86_64 > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3 7/8] bluez5: cleanup tabs and spaces
On Tue, Apr 18, 2017 at 9:20 AM, Marc Ferland <ferla...@amotus.ca> wrote: > --- > meta/recipes-connectivity/bluez5/bluez5.inc | 30 > ++--- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc > b/meta/recipes-connectivity/bluez5/bluez5.inc > index 47d8f22..01ade7d 100644 > --- a/meta/recipes-connectivity/bluez5/bluez5.inc > +++ b/meta/recipes-connectivity/bluez5/bluez5.inc > @@ -57,24 +57,24 @@ do_install_append() { > > install -d ${D}${sysconfdir}/bluetooth/ > if [ -f ${S}/profiles/network/network.conf ]; then > - install -m 0644 ${S}/profiles/network/network.conf > ${D}/${sysconfdir}/bluetooth/ > + install -m 0644 ${S}/profiles/network/network.conf > ${D}/${sysconfdir}/bluetooth/ > fi > if [ -f ${S}/profiles/input/input.conf ]; then > - install -m 0644 ${S}/profiles/input/input.conf > ${D}/${sysconfdir}/bluetooth/ > + install -m 0644 ${S}/profiles/input/input.conf > ${D}/${sysconfdir}/bluetooth/ > fi > > - if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then > -sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/ > bluetooth > - fi > + if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then > + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' > ${D}/${sysconfdir}/init.d/bluetooth > + fi > > # Install desired tools that upstream leaves in build area > -for f in ${NOINST_TOOLS} ; do > - install -m 755 ${B}/$f ${D}/${bindir} > + for f in ${NOINST_TOOLS} ; do > + install -m 755 ${B}/$f ${D}/${bindir} > done > > -# Patch python tools to use Python 3; they should be source > compatible, but > -# still refer to Python 2 in the shebang > -sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' > ${D}${libdir}/bluez/test/* > + # Patch python tools to use Python 3; they should be source > compatible, but > + # still refer to Python 2 in the shebang > + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' > ${D}${libdir}/bluez/test/* > } > > PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" > @@ -84,8 +84,8 @@ FILES_${PN} += " \ > ${systemd_unitdir}/ ${datadir}/dbus-1 \ > ${libdir}/cups \ > " > -FILES_${PN}-dev += "\ > - ${libdir}/bluetooth/plugins/*.la \ > +FILES_${PN}-dev += " \ > +${libdir}/bluetooth/plugins/*.la \ > " > > FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ > @@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth" > EXCLUDE_FROM_WORLD = "1" > > do_compile_ptest() { > -oe_runmake buildtests > + oe_runmake buildtests > } > > do_install_ptest() { > -cp -r ${B}/unit/ ${D}${PTEST_PATH} > -rm -f ${D}${PTEST_PATH}/unit/*.o > + cp -r ${B}/unit/ ${D}${PTEST_PATH} > + rm -f ${D}${PTEST_PATH}/unit/*.o > } > -- > 2.7.4 > > Oops my bad: Signed-off-by: Marc Ferland <ferla...@amotus.ca> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3 8/8] bluez5: rename "readline" config option to "client"
On Tue, Apr 18, 2017 at 10:14 AM, Burton, Ross <ross.bur...@intel.com> wrote: > > On 18 April 2017 at 14:20, Marc Ferland <ferla...@amotus.ca> wrote: > >> The configure option is "enable-client" not "enable-readline" (the >> latter does exists and is automatically enabled when enable-client is >> passed). >> > > The point of this was to remove dependencies on the GPLv3 readline > library, so this explicitly is readline-using-clients not all clients. > > Ross > Did not see that, will fix in next version. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 7/8] bluez5: cleanup tabs and spaces
--- meta/recipes-connectivity/bluez5/bluez5.inc | 30 ++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 47d8f22..01ade7d 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -57,24 +57,24 @@ do_install_append() { install -d ${D}${sysconfdir}/bluetooth/ if [ -f ${S}/profiles/network/network.conf ]; then - install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ fi if [ -f ${S}/profiles/input/input.conf ]; then - install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ fi - if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then -sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth - fi + if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth + fi # Install desired tools that upstream leaves in build area -for f in ${NOINST_TOOLS} ; do - install -m 755 ${B}/$f ${D}/${bindir} + for f in ${NOINST_TOOLS} ; do + install -m 755 ${B}/$f ${D}/${bindir} done -# Patch python tools to use Python 3; they should be source compatible, but -# still refer to Python 2 in the shebang -sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* + # Patch python tools to use Python 3; they should be source compatible, but + # still refer to Python 2 in the shebang + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" @@ -84,8 +84,8 @@ FILES_${PN} += " \ ${systemd_unitdir}/ ${datadir}/dbus-1 \ ${libdir}/cups \ " -FILES_${PN}-dev += "\ - ${libdir}/bluetooth/plugins/*.la \ +FILES_${PN}-dev += " \ +${libdir}/bluetooth/plugins/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ @@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth" EXCLUDE_FROM_WORLD = "1" do_compile_ptest() { -oe_runmake buildtests + oe_runmake buildtests } do_install_ptest() { -cp -r ${B}/unit/ ${D}${PTEST_PATH} -rm -f ${D}${PTEST_PATH}/unit/*.o + cp -r ${B}/unit/ ${D}${PTEST_PATH} + rm -f ${D}${PTEST_PATH}/unit/*.o } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 8/8] bluez5: rename "readline" config option to "client"
The configure option is "enable-client" not "enable-readline" (the latter does exists and is automatically enabled when enable-client is passed). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 8 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 01ade7d..0485343 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -12,9 +12,9 @@ RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "obex-profiles client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" @@ -42,11 +42,11 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. -NOINST_TOOLS_READLINE ??= "" +NOINST_TOOLS_CLIENT ??= "" NOINST_TOOLS_TESTING ??= "" NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ -${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'client', '${NOINST_TOOLS_CLIENT}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ ${NOINST_TOOLS_BT} \ " diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb index 1095f88..5cb44fc 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb @@ -5,9 +5,9 @@ REQUIRED_DISTRO_FEATURES = "bluez5" SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" -# noinst programs in Makefile.tools that are conditional on READLINE +# noinst programs in Makefile.tools that are conditional on CLIENT # support -NOINST_TOOLS_READLINE ?= " \ +NOINST_TOOLS_CLIENT ?= " \ attrib/gatttool \ tools/obex-client-tool \ tools/obex-server-tool \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 6/8] bluez5: do not install audio.conf
The audio.conf file has been removed, stop installing it. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index c8a240f..47d8f22 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -56,9 +56,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth install -d ${D}${sysconfdir}/bluetooth/ - if [ -f ${S}/profiles/audio/audio.conf ]; then - install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ - fi if [ -f ${S}/profiles/network/network.conf ]; then install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ fi -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 4/8] bluez5: add PACKAGECONFIG option for systemd
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 687656e..71a5016 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "obex-profiles readline" +PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -36,7 +37,6 @@ EXTRA_OECONF = "\ --disable-cups \ --enable-test \ --enable-datafiles \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \ --enable-library \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 3/8] bluez5: add PACKAGECONFIG option for midi
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 4244fc8..687656e 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -16,6 +16,7 @@ PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" +PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 5/8] bluez5: add PACKAGECONFIG option for cups
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 71a5016..c8a240f 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -18,6 +18,7 @@ PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -34,7 +35,6 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ --enable-deprecated \ - --disable-cups \ --enable-test \ --enable-datafiles \ --enable-library \ @@ -82,7 +82,11 @@ do_install_append() { PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES_${PN} += " \ +${libdir}/bluetooth/plugins/*.so \ +${systemd_unitdir}/ ${datadir}/dbus-1 \ +${libdir}/cups \ +" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 1/8] bluez5: Upgrade 5.43 -> 5.44
New feautures/fixes in this version: * fixes to BLE * a new midi plugin * support for single-mode controllers w/o public address * most of the experimental tools have been promoted and are now part of the official tools * 'experimental' has been renamed to 'testing' (hence the addition of the 'testing' package config option) * classic command line tools like hciattach and hciconfig are now enabled by the "--enable-deprecated" configure option (enabled by default for backward compatibility). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 9 ++-- meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 + 3 files changed, 74 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index ed75db2..11cf8fb 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4" PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ + --enable-deprecated \ --disable-cups \ --enable-test \ --enable-datafiles \ @@ -41,10 +42,12 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" -NOINST_TOOLS_EXPERIMENTAL ??= "" +NOINST_TOOLS_TESTING ??= "" +NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ -${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ +${NOINST_TOOLS_BT} \ " do_install_append() { diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.43.bb deleted file mode 100644 index e10b82d..000 --- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb +++ /dev/null @@ -1,55 +0,0 @@ -require bluez5.inc - -REQUIRED_DISTRO_FEATURES = "bluez5" - -SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350" -SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15" - -# noinst programs in Makefile.tools that are conditional on READLINE -# support -NOINST_TOOLS_READLINE ?= " \ -attrib/gatttool \ -tools/obex-client-tool \ -tools/obex-server-tool \ -tools/bluetooth-player \ -tools/obexctl \ -tools/btmgmt \ -" - -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL -# support -NOINST_TOOLS_EXPERIMENTAL ?= " \ -emulator/btvirt \ -emulator/b1ee \ -emulator/hfp \ -tools/3dsp \ -tools/mgmt-tester \ -tools/gap-tester \ -tools/l2cap-tester \ -tools/sco-tester \ -tools/smp-tester \ -tools/hci-tester \ -tools/rfcomm-tester \ -tools/bdaddr \ -tools/avinfo \ -tools/avtest \ -tools/scotest \ -tools/amptest \ -tools/hwdb \ -tools/hcieventmask \ -tools/hcisecfilter \ -tools/btinfo \ -tools/btattach \ -tools/btsnoop \ -tools/btproxy \ -tools/btiotest \ -tools/mcaptest \ -tools/cltest \ -tools/oobtest \ -tools/seq2bseq \ -tools/ibeacon \ -tools/btgatt-client \ -tools/btgatt-server \ -tools/gatt-service \ -profiles/iap/iapd \ -" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb new file mode 100644 index 000..1095f88 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb @@ -0,0 +1,68 @@ +require bluez5.inc + +REQUIRED_DISTRO_FEATURES = "bluez5" + +SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" +SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" + +# noinst programs in Makefile.tools that are conditional on READLINE +# support +NOINST_TOOLS_READLINE ?= " \ +attrib/gatttool \ +tools/obex-client-tool \ +tools/obex-server-tool \
[OE-core] [PATCHv3 2/8] bluez5: remove libasound-module references
Cleanup references to libasound-module since this code has been completly removed from Bluez. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 11cf8fb..4244fc8 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -79,14 +79,11 @@ do_install_append() { sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } -ALLOW_EMPTY_libasound-module-bluez = "1" -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ - ${libdir}/alsa-lib/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 0/8] bluez: upgrade and refactoring
V3: * shell functions use tabs not spaces (as pointed by Khem Raj) V2: This patch series: * upgrades to version 5.44 * renames variables and configure options to better reflect bluez options * adds midi, cups and systemd as PACKAGECONFIG options * removes references from files that are no longer part of bluez * cleanups tabs/spaces usage Please drop the changes from my previous patch: https://patchwork.openembedded.org/patch/138995/ Regards, Marc Ferland (8): bluez5: Upgrade 5.43 -> 5.44 bluez5: remove libasound-module references bluez5: add PACKAGECONFIG option for midi bluez5: add PACKAGECONFIG option for systemd bluez5: add PACKAGECONFIG option for cups bluez5: do not install audio.conf bluez5: cleanup tabs and spaces bluez5: rename "readline" config option to "client" meta/recipes-connectivity/bluez5/bluez5.inc | 66 meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 + 3 files changed, 102 insertions(+), 87 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 5/8] bluez5: add PACKAGECONFIG option for cups
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 71a5016..c8a240f 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -18,6 +18,7 @@ PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -34,7 +35,6 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ --enable-deprecated \ - --disable-cups \ --enable-test \ --enable-datafiles \ --enable-library \ @@ -82,7 +82,11 @@ do_install_append() { PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES_${PN} += " \ +${libdir}/bluetooth/plugins/*.so \ +${systemd_unitdir}/ ${datadir}/dbus-1 \ +${libdir}/cups \ +" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 6/8] bluez5: do not install audio.conf
The audio.conf file has been removed, stop installing it. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index c8a240f..47d8f22 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -56,9 +56,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth install -d ${D}${sysconfdir}/bluetooth/ - if [ -f ${S}/profiles/audio/audio.conf ]; then - install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ - fi if [ -f ${S}/profiles/network/network.conf ]; then install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ fi -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 4/8] bluez5: add PACKAGECONFIG option for systemd
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 687656e..71a5016 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "obex-profiles readline" +PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -36,7 +37,6 @@ EXTRA_OECONF = "\ --disable-cups \ --enable-test \ --enable-datafiles \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \ --enable-library \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 7/8] bluez5: cleanup tabs and spaces
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 56 ++--- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 47d8f22..98fb9b3 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -52,29 +52,29 @@ NOINST_TOOLS = " \ " do_install_append() { - install -d ${D}${INIT_D_DIR} - install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth - - install -d ${D}${sysconfdir}/bluetooth/ - if [ -f ${S}/profiles/network/network.conf ]; then - install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ - fi - if [ -f ${S}/profiles/input/input.conf ]; then - install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ - fi - - if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then -sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth - fi - - # Install desired tools that upstream leaves in build area -for f in ${NOINST_TOOLS} ; do - install -m 755 ${B}/$f ${D}/${bindir} - done - -# Patch python tools to use Python 3; they should be source compatible, but -# still refer to Python 2 in the shebang -sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* +install -d ${D}${INIT_D_DIR} +install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth + +install -d ${D}${sysconfdir}/bluetooth/ +if [ -f ${S}/profiles/network/network.conf ]; then +install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ +fi +if [ -f ${S}/profiles/input/input.conf ]; then +install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ +fi + +if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then +sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth +fi + +# Install desired tools that upstream leaves in build area +for f in ${NOINST_TOOLS} ; do +install -m 755 ${B}/$f ${D}/${bindir} +done + +# Patch python tools to use Python 3; they should be source compatible, but +# still refer to Python 2 in the shebang +sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" @@ -84,8 +84,8 @@ FILES_${PN} += " \ ${systemd_unitdir}/ ${datadir}/dbus-1 \ ${libdir}/cups \ " -FILES_${PN}-dev += "\ - ${libdir}/bluetooth/plugins/*.la \ +FILES_${PN}-dev += " \ +${libdir}/bluetooth/plugins/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ @@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth" EXCLUDE_FROM_WORLD = "1" do_compile_ptest() { -oe_runmake buildtests +oe_runmake buildtests } do_install_ptest() { -cp -r ${B}/unit/ ${D}${PTEST_PATH} -rm -f ${D}${PTEST_PATH}/unit/*.o +cp -r ${B}/unit/ ${D}${PTEST_PATH} +rm -f ${D}${PTEST_PATH}/unit/*.o } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 8/8] bluez5: rename "readline" config option to "client"
The configure option is "enable-client" not "enable-readline" (the latter does exists and is automatically enabled when enable-client is passed). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 8 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 98fb9b3..3183e9d 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -12,9 +12,9 @@ RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "obex-profiles client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd" @@ -42,11 +42,11 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. -NOINST_TOOLS_READLINE ??= "" +NOINST_TOOLS_CLIENT ??= "" NOINST_TOOLS_TESTING ??= "" NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ -${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'client', '${NOINST_TOOLS_CLIENT}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ ${NOINST_TOOLS_BT} \ " diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb index 1095f88..5cb44fc 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb @@ -5,9 +5,9 @@ REQUIRED_DISTRO_FEATURES = "bluez5" SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" -# noinst programs in Makefile.tools that are conditional on READLINE +# noinst programs in Makefile.tools that are conditional on CLIENT # support -NOINST_TOOLS_READLINE ?= " \ +NOINST_TOOLS_CLIENT ?= " \ attrib/gatttool \ tools/obex-client-tool \ tools/obex-server-tool \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 3/8] bluez5: add PACKAGECONFIG option for midi
Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 4244fc8..687656e 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -16,6 +16,7 @@ PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" +PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 1/8] bluez5: Upgrade 5.43 -> 5.44
New feautures/fixes in this version: * fixes to BLE * a new midi plugin * support for single-mode controllers w/o public address * most of the experimental tools have been promoted and are now part of the official tools * 'experimental' has been renamed to 'testing' (hence the addition of the 'testing' package config option) * classic command line tools like hciattach and hciconfig are now enabled by the "--enable-deprecated" configure option (enabled by default for backward compatibility). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 9 ++-- meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 + 3 files changed, 74 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index ed75db2..11cf8fb 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4" PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ + --enable-deprecated \ --disable-cups \ --enable-test \ --enable-datafiles \ @@ -41,10 +42,12 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" -NOINST_TOOLS_EXPERIMENTAL ??= "" +NOINST_TOOLS_TESTING ??= "" +NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ -${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ +${NOINST_TOOLS_BT} \ " do_install_append() { diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.43.bb deleted file mode 100644 index e10b82d..000 --- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb +++ /dev/null @@ -1,55 +0,0 @@ -require bluez5.inc - -REQUIRED_DISTRO_FEATURES = "bluez5" - -SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350" -SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15" - -# noinst programs in Makefile.tools that are conditional on READLINE -# support -NOINST_TOOLS_READLINE ?= " \ -attrib/gatttool \ -tools/obex-client-tool \ -tools/obex-server-tool \ -tools/bluetooth-player \ -tools/obexctl \ -tools/btmgmt \ -" - -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL -# support -NOINST_TOOLS_EXPERIMENTAL ?= " \ -emulator/btvirt \ -emulator/b1ee \ -emulator/hfp \ -tools/3dsp \ -tools/mgmt-tester \ -tools/gap-tester \ -tools/l2cap-tester \ -tools/sco-tester \ -tools/smp-tester \ -tools/hci-tester \ -tools/rfcomm-tester \ -tools/bdaddr \ -tools/avinfo \ -tools/avtest \ -tools/scotest \ -tools/amptest \ -tools/hwdb \ -tools/hcieventmask \ -tools/hcisecfilter \ -tools/btinfo \ -tools/btattach \ -tools/btsnoop \ -tools/btproxy \ -tools/btiotest \ -tools/mcaptest \ -tools/cltest \ -tools/oobtest \ -tools/seq2bseq \ -tools/ibeacon \ -tools/btgatt-client \ -tools/btgatt-server \ -tools/gatt-service \ -profiles/iap/iapd \ -" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb new file mode 100644 index 000..1095f88 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb @@ -0,0 +1,68 @@ +require bluez5.inc + +REQUIRED_DISTRO_FEATURES = "bluez5" + +SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" +SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" + +# noinst programs in Makefile.tools that are conditional on READLINE +# support +NOINST_TOOLS_READLINE ?= " \ +attrib/gatttool \ +tools/obex-client-tool \ +tools/obex-server-tool \
[OE-core] [PATCHv2 2/8] bluez5: remove libasound-module references
Cleanup references to libasound-module since this code has been completly removed from Bluez. Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 11cf8fb..4244fc8 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -79,14 +79,11 @@ do_install_append() { sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } -ALLOW_EMPTY_libasound-module-bluez = "1" -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ - ${libdir}/alsa-lib/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 0/8] bluez: upgrade and refactoring
This patch series: * upgrades to version 5.44 * renames variables and configure options to better reflect bluez options * adds midi, cups and systemd as PACKAGECONFIG options * removes references from files that are no longer part of bluez * cleanups tabs/spaces usage Please drop the changes from my previous patch: https://patchwork.openembedded.org/patch/138995/ Regards, Marc Ferland (8): bluez5: Upgrade 5.43 -> 5.44 bluez5: remove libasound-module references bluez5: add PACKAGECONFIG option for midi bluez5: add PACKAGECONFIG option for systemd bluez5: add PACKAGECONFIG option for cups bluez5: do not install audio.conf bluez5: cleanup tabs and spaces bluez5: rename "readline" config option to "client" meta/recipes-connectivity/bluez5/bluez5.inc | 92 + meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 --- meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 ++ 3 files changed, 115 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bluez5: Upgrade 5.43 -> 5.44
On Thu, Apr 13, 2017 at 9:22 AM, Felipe Ferreri Tonello < e...@felipetonello.com> wrote: > Hi Marc, > > On 10/04/17 20:02, Marc Ferland wrote: > > Mostly fixes to BLE. > > > > Also in this commit: > > > > - Experimental tools are no longer experimental and are part of the > > official tools. > > - Experimental was renamed to "testing" (hence the addition of the > > "testing" pacakge config option). > > - Classic command line tools like hciattach, hciconfig are now enabled > > by the "--enable-deprecated" configure option (enabled by default for > > backward compatibility). > > You could enable the new MIDI functionality as well, or at least allow > easy bbappends to it, perhaps a new PACKAGECONFIG[midi] since it adds > alsa-lib dependency to it. > > Already have a patch exactly for this, just didn't have time to send it yet. Marc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bluez5: Upgrade 5.43 -> 5.44
Mostly fixes to BLE. Also in this commit: - Experimental tools are no longer experimental and are part of the official tools. - Experimental was renamed to "testing" (hence the addition of the "testing" pacakge config option). - Classic command line tools like hciattach, hciconfig are now enabled by the "--enable-deprecated" configure option (enabled by default for backward compatibility). Signed-off-by: Marc Ferland <ferla...@amotus.ca> --- meta/recipes-connectivity/bluez5/bluez5.inc| 9 ++--- .../bluez5/{bluez5_5.43.bb => bluez5_5.44.bb} | 23 +- 2 files changed, 24 insertions(+), 8 deletions(-) rename meta/recipes-connectivity/bluez5/{bluez5_5.43.bb => bluez5_5.44.bb} (64%) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index ed75db2..76b87a2 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4" PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[testing] = "--enable-testing,--disable-testing,," SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ + --enable-deprecated \ --disable-cups \ --enable-test \ --enable-datafiles \ @@ -41,10 +42,12 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" -NOINST_TOOLS_EXPERIMENTAL ??= "" +NOINST_TOOLS_TESTING ??= "" +NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ -${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ +${NOINST_TOOLS_BT} \ " do_install_append() { diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb similarity index 64% rename from meta/recipes-connectivity/bluez5/bluez5_5.43.bb rename to meta/recipes-connectivity/bluez5/bluez5_5.44.bb index e10b82d..1095f88 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb @@ -2,8 +2,8 @@ require bluez5.inc REQUIRED_DISTRO_FEATURES = "bluez5" -SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350" -SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15" +SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" +SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" # noinst programs in Makefile.tools that are conditional on READLINE # support @@ -16,12 +16,13 @@ NOINST_TOOLS_READLINE ?= " \ tools/btmgmt \ " -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL +# noinst programs in Makefile.tools that are conditional on TESTING # support -NOINST_TOOLS_EXPERIMENTAL ?= " \ +NOINST_TOOLS_TESTING ?= " \ emulator/btvirt \ emulator/b1ee \ emulator/hfp \ +peripheral/btsensor \ tools/3dsp \ tools/mgmt-tester \ tools/gap-tester \ @@ -30,6 +31,13 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \ tools/smp-tester \ tools/hci-tester \ tools/rfcomm-tester \ +tools/bnep-tester \ +tools/userchan-tester \ +" + +# noinst programs in Makefile.tools that are conditional on TOOLS +# support +NOINST_TOOLS_BT ?= " \ tools/bdaddr \ tools/avinfo \ tools/avtest \ @@ -39,17 +47,22 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \ tools/hcieventmask \ tools/hcisecfilter \ tools/btinfo \ -tools/btattach \ tools/btsnoop \ tools/btproxy \ tools/btiotest \ +tools/bneptest \ tools/mcaptest \ tools/cltest \ tools/oobtest \ tools/seq2bseq \ +tools/nokfw \ +tools/create-image \ +tools/eddystone \ tools/ibeacon \ tools/btgatt-client \ tools/btgatt-server \ +tools/test-runner \ +tools/check-selftest \ tools/gatt-service \ profiles/iap/iapd \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: fix initscript restart command
start-stop-daemon should be called with '--oknodo' instead of '-oknodo'. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-connectivity/openssh/openssh-6.2p2/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init b/meta/recipes-connectivity/openssh/openssh-6.2p2/init index cde52ef..6beec84 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/init @@ -76,7 +76,7 @@ case $1 in check_keys check_config echo -n Restarting OpenBSD Secure Shell server: sshd - start-stop-daemon -K -oknodo -x /usr/sbin/sshd + start-stop-daemon -K --oknodo -x /usr/sbin/sshd check_for_no_start check_privsep_dir sleep 2 -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] lmsensors: fix fancontrol init script
Make the 'fancontrol stop' command work again by using the fancontrol pid file instead of matching the process by name. While at it, also do a bit of cleaning. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init index f179310..4433020 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init +++ b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh ### BEGIN INIT INFO # Provides: fancontrol # Required-Start:$local_fs @@ -16,8 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC=fan control daemon NAME=fancontrol FANCONTROL=`which $NAME` - -. /etc/init.d/functions || exit 1 +PIDFILE=/var/run/fancontrol.pid # Exit if the package is not installed [ -x $FANCONTROL ] || exit 0 @@ -25,12 +24,12 @@ FANCONTROL=`which $NAME` case $1 in start) echo -n Starting $DESC: $NAME... -/sbin/start-stop-daemon -S -x $FANCONTROL -b -- $FANCONTROL_ARGS +start-stop-daemon -S -p $PIDFILE -b -x $FANCONTROL echo done. ;; stop) echo -n Stopping $DESC: $NAME... -/sbin/start-stop-daemon -K -x $FANCONTROL +start-stop-daemon -K -p $PIDFILE echo done. ;; restart) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lmsensors: Initial commit.
Martin Jansa martin.ja...@gmail.com writes: On Wed, Oct 17, 2012 at 12:29:21AM +, Patrick Turley wrote: On Oct 16, 2012, at 6:28 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: On Wednesday 17 October 2012 00:37:39 Martin Jansa wrote: On Tue, Oct 16, 2012 at 05:47:26PM -0400, Marc Ferland wrote: Adds the lm_sensors applications. These consists of: Is it really needed in oe-core? why not meta-oe? I'm thinking meta-oe is the place for this. As a bonus, rrdtool is already there. I am not qualified to have an opinion either way - but I *am* curious about the motivating rationale. What are the reasons that this should appear in meta-oe? oe-core as *core* for other layers, should have only the most important metadata which are needed for all other layers, like toolchain etc. A lot of embedded images does not include or need lmsensors, so it's kind of extra package which does not need to be included in *core*. Thanks for the clarification Martin. But looking at oe-core/meta/recipe-bsp I see things like acpid, libacpi, pcimciautils, etc. I am wondering what makes lmsensors so much different than these tools? Regards, Marc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lmsensors: Initial commit (cover letter)
Hi, This is a first attempt at getting lm_sensors included in oe-core. Comments are very welcomed! Regards, Marc Marc Ferland (1): lmsensors: Initial commit. meta/recipes-bsp/lm_sensors/files/fancontrol |2 + meta/recipes-bsp/lm_sensors/files/fancontrol.sh| 48 ++ meta/recipes-bsp/lm_sensors/files/sensord.cgi | 10 ++ meta/recipes-bsp/lm_sensors/files/sensord.conf | 16 ++ meta/recipes-bsp/lm_sensors/files/sensord.sh | 49 +++ meta/recipes-bsp/lm_sensors/files/sensors.conf |2 + meta/recipes-bsp/lm_sensors/lmsensors_3.3.2.bb | 150 meta/recipes-support/rrdtool/files/automake.patch | 15 ++ meta/recipes-support/rrdtool/files/configure.patch | 19 +++ meta/recipes-support/rrdtool/rrdtool_1.4.7.bb | 31 10 files changed, 342 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-bsp/lm_sensors/files/fancontrol create mode 100644 meta/recipes-bsp/lm_sensors/files/fancontrol.sh create mode 100644 meta/recipes-bsp/lm_sensors/files/sensord.cgi create mode 100644 meta/recipes-bsp/lm_sensors/files/sensord.conf create mode 100644 meta/recipes-bsp/lm_sensors/files/sensord.sh create mode 100644 meta/recipes-bsp/lm_sensors/files/sensors.conf create mode 100644 meta/recipes-bsp/lm_sensors/lmsensors_3.3.2.bb create mode 100644 meta/recipes-support/rrdtool/files/automake.patch create mode 100644 meta/recipes-support/rrdtool/files/configure.patch create mode 100644 meta/recipes-support/rrdtool/rrdtool_1.4.7.bb -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lmsensors: Initial commit.
Adds the lm_sensors applications. These consists of: *libsensors: the main application library *sensors: cmd line tool to list current sensors values *sensord: sensors logging daemon *fancontrol: fan speed regulation daemon *sensorsdetect: script to autodetect sensors *sensorsconfconvert: converts lm_sensorsv2 to lm_sensorsv3 config files *pwmconfig: script to configure fancontrol *isatools: get/set isa registers This patch also adds the rrdtool program which is needed by sensord. --- meta/recipes-bsp/lm_sensors/files/fancontrol |2 + meta/recipes-bsp/lm_sensors/files/fancontrol.sh| 48 ++ meta/recipes-bsp/lm_sensors/files/sensord.cgi | 10 ++ meta/recipes-bsp/lm_sensors/files/sensord.conf | 16 ++ meta/recipes-bsp/lm_sensors/files/sensord.sh | 49 +++ meta/recipes-bsp/lm_sensors/files/sensors.conf |2 + meta/recipes-bsp/lm_sensors/lmsensors_3.3.2.bb | 150 meta/recipes-support/rrdtool/files/automake.patch | 15 ++ meta/recipes-support/rrdtool/files/configure.patch | 19 +++ meta/recipes-support/rrdtool/rrdtool_1.4.7.bb | 31 10 files changed, 342 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-bsp/lm_sensors/files/fancontrol create mode 100644 meta/recipes-bsp/lm_sensors/files/fancontrol.sh create mode 100644 meta/recipes-bsp/lm_sensors/files/sensord.cgi create mode 100644 meta/recipes-bsp/lm_sensors/files/sensord.conf create mode 100644 meta/recipes-bsp/lm_sensors/files/sensord.sh create mode 100644 meta/recipes-bsp/lm_sensors/files/sensors.conf create mode 100644 meta/recipes-bsp/lm_sensors/lmsensors_3.3.2.bb create mode 100644 meta/recipes-support/rrdtool/files/automake.patch create mode 100644 meta/recipes-support/rrdtool/files/configure.patch create mode 100644 meta/recipes-support/rrdtool/rrdtool_1.4.7.bb diff --git a/meta/recipes-bsp/lm_sensors/files/fancontrol b/meta/recipes-bsp/lm_sensors/files/fancontrol new file mode 100644 index 000..1f03a2b --- /dev/null +++ b/meta/recipes-bsp/lm_sensors/files/fancontrol @@ -0,0 +1,2 @@ +# fancontrol configuration file. +# Place your device specific configuration in this file. diff --git a/meta/recipes-bsp/lm_sensors/files/fancontrol.sh b/meta/recipes-bsp/lm_sensors/files/fancontrol.sh new file mode 100644 index 000..f179310 --- /dev/null +++ b/meta/recipes-bsp/lm_sensors/files/fancontrol.sh @@ -0,0 +1,48 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: fancontrol +# Required-Start:$local_fs +# Should-Start: +# Required-Stop: $local_fs +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: fancontrol initscript +# Description: Starts and controls the fancontrol daemon +### END INIT INFO + +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC=fan control daemon +NAME=fancontrol +FANCONTROL=`which $NAME` + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x $FANCONTROL ] || exit 0 + +case $1 in +start) +echo -n Starting $DESC: $NAME... +/sbin/start-stop-daemon -S -x $FANCONTROL -b -- $FANCONTROL_ARGS +echo done. +;; +stop) +echo -n Stopping $DESC: $NAME... +/sbin/start-stop-daemon -K -x $FANCONTROL +echo done. +;; +restart) +echo Restarting $DESC: $NAME... +$0 stop +$0 start +echo done. +;; +*) +echo Usage: $0 {start|stop|restart} +exit 1 +;; +esac + +exit 0 diff --git a/meta/recipes-bsp/lm_sensors/files/sensord.cgi b/meta/recipes-bsp/lm_sensors/files/sensord.cgi new file mode 100644 index 000..b1aad05 --- /dev/null +++ b/meta/recipes-bsp/lm_sensors/files/sensord.cgi @@ -0,0 +1,10 @@ +#!/usr/bin/rrdcgi + +html +head +titlesensord/title +/head +body +Generate a valid sensord.cgi script and install it in your BSP. +/body +/html diff --git a/meta/recipes-bsp/lm_sensors/files/sensord.conf b/meta/recipes-bsp/lm_sensors/files/sensord.conf new file mode 100644 index 000..6b48cf6 --- /dev/null +++ b/meta/recipes-bsp/lm_sensors/files/sensord.conf @@ -0,0 +1,16 @@ +# Default sensord configuration file +# Syntax: sensord {options} {chips} +# -i, --interval time -- interval between scanning alarms (default 60s) +# -l, --log-interval time -- interval between logging sensors (default 30m) +# -t, --rrd-interval time -- interval between updating RRD file (default 5m) +# -T, --rrd-no-average -- switch RRD in non-average mode +# -r, --rrd-file file -- RRD file (default none) +# -c, --config-file file -- configuration file +# -p, --pid-file file -- PID file (default /var/run/sensord.pid) +# -f, --syslog-facility f -- syslog facility to use (default local4) +# -g, --rrd-cgi img-dir -- output an RRD CGI script and exit +# -a, --load-average-- include load average in RRD file +# -d, --debug -- display some debug information +# -v, --version -- display version
[OE-core] [PATCH] sysstat: Explicitly disable sensors support.
Since no lmsensors recipe exists by default in oe-core, explicitly disable support for it in sysstat. In my case sysstat would fail linking complaining about undefined references when adding my own lmsensors recipe. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-extended/sysstat/sysstat.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 9da40a7..76c9252 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -9,6 +9,7 @@ SRC_URI = http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ inherit autotools gettext +EXTRA_OECONF += --disable-sensors EXTRA_OEMAKE += 'LFLAGS=' do_install() { -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2] sysstat: Explicitly disable sensors support.
Since no lmsensors recipe exists by default in oe-core, explicitly disable support for it in sysstat. In my case sysstat would fail linking complaining about undefined references when adding my own lmsensors recipe. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-extended/sysstat/sysstat.inc |2 ++ meta/recipes-extended/sysstat/sysstat_10.0.3.bb |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 9da40a7..a89109c 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -3,12 +3,14 @@ DESCRIPTION = The sysstat utilities are a collection of performance monitoring HOMEPAGE = http://sebastien.godard.pagesperso-orange.fr/; LICENSE = GPLv2+ SECTION = console/utils +INC_PR = r0 SRC_URI = http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ file://99_sysstat inherit autotools gettext +EXTRA_OECONF += --disable-sensors EXTRA_OEMAKE += 'LFLAGS=' do_install() { diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb index 7ef6c60..e9b95d8 100644 --- a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb +++ b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb @@ -2,7 +2,7 @@ require sysstat.inc LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b -PR = r1 +PR = ${INC_PR}.1 SRC_URI[md5sum] = 0e1ed5200f31f69a3b90ff1e81c07745 SRC_URI[sha256sum] = 7c0dd172f09edaff100b33db29ef502e15e71867b505c6d519f76a24fabcc1f5 -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3] sysstat: Explicitly disable sensors support.
Since no lmsensors recipe exists by default in oe-core, explicitly disable support for it in sysstat. In my case sysstat would fail linking complaining about undefined references when adding my own lmsensors recipe. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-extended/sysstat/sysstat.inc |2 ++ meta/recipes-extended/sysstat/sysstat_10.0.3.bb |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 9da40a7..287bb54 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -3,12 +3,14 @@ DESCRIPTION = The sysstat utilities are a collection of performance monitoring HOMEPAGE = http://sebastien.godard.pagesperso-orange.fr/; LICENSE = GPLv2+ SECTION = console/utils +INC_PR = r1 SRC_URI = http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ file://99_sysstat inherit autotools gettext +EXTRA_OECONF += --disable-sensors EXTRA_OEMAKE += 'LFLAGS=' do_install() { diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb index 7ef6c60..e9b95d8 100644 --- a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb +++ b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb @@ -2,7 +2,7 @@ require sysstat.inc LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b -PR = r1 +PR = ${INC_PR}.1 SRC_URI[md5sum] = 0e1ed5200f31f69a3b90ff1e81c07745 SRC_URI[sha256sum] = 7c0dd172f09edaff100b33db29ef502e15e71867b505c6d519f76a24fabcc1f5 -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3] sysstat: Explicitly disable sensors support.
Saul Wold s...@linux.intel.com writes: On 08/30/2012 08:22 AM, Marc Ferland wrote: Since no lmsensors recipe exists by default in oe-core, explicitly disable support for it in sysstat. In my case sysstat would fail linking complaining about undefined references when adding my own lmsensors recipe. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-extended/sysstat/sysstat.inc |2 ++ meta/recipes-extended/sysstat/sysstat_10.0.3.bb |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) You seem to be a little behind the master branch as it's on sysstat_10.0.5 Please rebase your patch to master. I failed to mention that this patch is based on denzil. I will send another patch this time for master. BTW, what is the preferred --subject-prefix to use to identify where the patch should be merge? Marc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sysstat: Explicitly disable sensors support.
Since no lmsensors recipe exists by default in oe-core, explicitly disable support for it in sysstat. In my case sysstat would fail linking complaining about undefined references when adding my own lmsensors recipe. Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-extended/sysstat/sysstat.inc |2 ++ meta/recipes-extended/sysstat/sysstat_10.0.5.bb |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 9da40a7..287bb54 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -3,12 +3,14 @@ DESCRIPTION = The sysstat utilities are a collection of performance monitoring HOMEPAGE = http://sebastien.godard.pagesperso-orange.fr/; LICENSE = GPLv2+ SECTION = console/utils +INC_PR = r1 SRC_URI = http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ file://99_sysstat inherit autotools gettext +EXTRA_OECONF += --disable-sensors EXTRA_OEMAKE += 'LFLAGS=' do_install() { diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.5.bb b/meta/recipes-extended/sysstat/sysstat_10.0.5.bb index 233102a..1c8595a 100644 --- a/meta/recipes-extended/sysstat/sysstat_10.0.5.bb +++ b/meta/recipes-extended/sysstat/sysstat_10.0.5.bb @@ -2,7 +2,7 @@ require sysstat.inc LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b -PR = r0 +PR = ${INC_PR}.1 SRC_URI[md5sum] = 208dd236d726d20591d53d3a20124dd4 SRC_URI[sha256sum] = 1f474d6ca742af73d0f9d09a374bda64c72bccb126aef327fa74383ff438feff -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pm-utils: Add grep to RDEPENDS to avoid command failures.
Phil Blundell ph...@gnu.org writes: On Wed, 2012-01-25 at 11:29 -0800, Saul Wold wrote: +RDEPENDS = grep Don't you get a QA error for that? I didn't see any QA warnings when building with yocto (edison branch). I'll resend the patch with some corrections. Here's bitbake output on my machine (with RDEPENDS = grep): NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks NOTE: Running task 630 of 703 (ID: 4, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_fetch) NOTE: package pm-utils-1.4.1-r1: task do_fetch: Started NOTE: package pm-utils-1.4.1-r1: task do_fetch: Succeeded NOTE: Running task 693 of 703 (ID: 0, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_unpack) NOTE: package pm-utils-1.4.1-r1: task do_unpack: Started NOTE: package pm-utils-1.4.1-r1: task do_unpack: Succeeded NOTE: Running task 694 of 703 (ID: 1, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_patch) NOTE: package pm-utils-1.4.1-r1: task do_patch: Started NOTE: package pm-utils-1.4.1-r1: task do_patch: Succeeded NOTE: Running task 695 of 703 (ID: 6, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_configure) NOTE: Running task 696 of 703 (ID: 10, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_populate_lic) NOTE: package pm-utils-1.4.1-r1: task do_configure: Started NOTE: package pm-utils-1.4.1-r1: task do_populate_lic: Started NOTE: package pm-utils-1.4.1-r1: task do_populate_lic: Succeeded NOTE: package pm-utils-1.4.1-r1: task do_configure: Succeeded NOTE: Running task 697 of 703 (ID: 7, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_compile) NOTE: package pm-utils-1.4.1-r1: task do_compile: Started NOTE: package pm-utils-1.4.1-r1: task do_compile: Succeeded NOTE: Running task 698 of 703 (ID: 2, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_install) NOTE: package pm-utils-1.4.1-r1: task do_install: Started NOTE: package pm-utils-1.4.1-r1: task do_install: Succeeded NOTE: Running task 699 of 703 (ID: 9, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_package) NOTE: Running task 700 of 703 (ID: 3, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_populate_sysroot) NOTE: package pm-utils-1.4.1-r1: task do_populate_sysroot: Started NOTE: package pm-utils-1.4.1-r1: task do_package: Started NOTE: package pm-utils-1.4.1-r1: task do_populate_sysroot: Succeeded NOTE: package pm-utils-1.4.1-r1: task do_package: Succeeded NOTE: Running task 701 of 703 (ID: 11, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_package_write_rpm) NOTE: package pm-utils-1.4.1-r1: task do_package_write_rpm: Started NOTE: package pm-utils-1.4.1-r1: task do_package_write_rpm: Succeeded NOTE: Running noexec task 702 of 703 (ID: 8, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_package_write) NOTE: Running noexec task 703 of 703 (ID: 5, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_build) NOTE: Tasks Summary: Attempted 703 tasks of which 691 didn't need to be rerun and 0 failed. Marc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pm-utils: Add grep to RDEPENDS to avoid command failures.
Second version of the patch that adds grep to RDEPENDS. Fixes [YOCTO #1887] Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb index a4ac230..92d65c1 100644 --- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb @@ -1,12 +1,13 @@ SECTION = base SUMMARY = Utilities and scripts for power management -DESCRIPTION = Simple shell command line toos to suspect and hibernate. +DESCRIPTION = Simple shell command line tools to suspend and hibernate. HOMEPAGE = http://pm-utils.freedesktop.org/wiki/; LICENSE=GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147 -PR = r0 +PR = r1 +RDEPENDS_${PN} = grep SRC_URI = http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz; -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Fixes [YOCTO #1887] Signed-off-by: Marc Ferland ferla...@sonatest.com --- meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb index a4ac230..5e09f7b 100644 --- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb @@ -1,12 +1,13 @@ SECTION = base SUMMARY = Utilities and scripts for power management -DESCRIPTION = Simple shell command line toos to suspect and hibernate. +DESCRIPTION = Simple shell command line tools to suspend and hibernate. HOMEPAGE = http://pm-utils.freedesktop.org/wiki/; LICENSE=GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147 -PR = r0 +PR = r1 +RDEPENDS = grep SRC_URI = http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz; -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Phil Blundell ph...@gnu.org writes: On Tue, 2012-01-10 at 15:22 -0500, Marc Ferland wrote: -PR = r0 +PR = r1 +RDEPENDS = grep Do you not get a QA warning for that? Usually it would be RDEPENDS_${PN}. Nope. Everything looks fine. Whant me to resubmit the patch with RDEPENDS_${PN}? BTW I'm using yocto, if that makes a difference. Marc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Otavio Salvador ota...@ossystems.com.br writes: [1:multipart/alternative Hide] [1/1:text/plain Hide] On Tue, Jan 10, 2012 at 18:22, Marc Ferland ferla...@sonatest.com wrote: ... +PR = r1 +RDEPENDS = grep Busybox ought to provide it; what is missing? I was having trouble running the pm-suspend command. See: http://bugzilla.pokylinux.org/show_bug.cgi?id=1887 Basically the '-x' option is missing from busybox's grep. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Otavio Salvador ota...@ossystems.com.br writes: [1:multipart/alternative Hide] [1/1:text/plain Hide] On Tue, Jan 10, 2012 at 19:14, Marc Ferland ferla...@sonatest.com wrote: I was having trouble running the pm-suspend command. See: http://bugzilla.pokylinux.org/show_bug.cgi?id=1887 Basically the '-x' option is missing from busybox's grep. Can't pm-suspend be patched to avoid using the -x option? Maybe making the regexp more strict, for example? Looks like it uses grep to ignore some parameters that are specified in a separate file. A combination of 'sort' and 'uniq' would probably work, but we would loose the order of the parameters. Any idea? Marc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core